Thu Apr 7 03:09:43 UTC 2011

3 files changed, 25 insertions, 27 deletions

diff --git a/community-testing/open-vm-tools-modules/PKGBUILD b/community-testing/open-vm-tools-modules/PKGBUILD
index eb85e4e9c..7c9125ade 100644
--- a/community-testing/open-vm-tools-modules/PKGBUILD
+++ b/community-testing/open-vm-tools-modules/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 42477 2011-03-16 21:51:11Z spupykin $
+# $Id: PKGBUILD 44312 2011-04-05 15:06:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
-pkgver=2011.02.23
-_pkgsubver=368700
+pkgver=2011.03.28
+_pkgsubver=387002
 pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64')
@@ -14,27 +14,25 @@ makedepends=('libdnet' 'icu' 'uriparser' 'kernel26-headers')
 depends=("kernel26")
 install=$pkgname.install
 source=(http://easynews.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz)
-md5sums=('488601e384daeab2c6ffd81e1a95cad7')
+md5sums=('a9c72ab0b8f7778d444e69e9d3b95527')
 
 build() {
-_kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -`
-depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`")
-
-  KERNEL_VERSION="2.6.${_kernver}-ARCH"
-  msg "Kernel = $KERNEL_VERSION"
-
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
-
   sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure
-
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
-
   (cd modules && make modules)
+}
+
+package() {
+  _kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -`
+  depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`")
+  KERNEL_VERSION="2.6.${_kernver}-ARCH"
+  msg "Kernel = $KERNEL_VERSION"
 
+  cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
   mkdir -p $pkgdir/lib/modules/$KERNEL_VERSION/misc/
   for MOD in `find -type f -name '*.ko'`; do
     install -D -m644 $MOD $pkgdir/lib/modules/$KERNEL_VERSION/misc/
   done
-
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install
 }
diff --git a/community-testing/open-vm-tools-modules/open-vm-tools-modules.install b/community-testing/open-vm-tools-modules/open-vm-tools-modules.install
index 6ebc18c36..7f44b03ef 100644
--- a/community-testing/open-vm-tools-modules/open-vm-tools-modules.install
+++ b/community-testing/open-vm-tools-modules/open-vm-tools-modules.install
@@ -32,4 +32,3 @@ post_remove() {
   echo ">>> Remember to un-blacklist pcnet32 driver in /etc/rc.conf."
   echo ">>>"
 }
-
diff --git a/community-testing/open-vm-tools/PKGBUILD b/community-testing/open-vm-tools/PKGBUILD
index 8dbb03d5f..4102311d9 100644
--- a/community-testing/open-vm-tools/PKGBUILD
+++ b/community-testing/open-vm-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 42480 2011-03-16 21:57:43Z spupykin $
+# $Id: PKGBUILD 44320 2011-04-05 15:30:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
-pkgver=2011.02.23
-_pkgsubver=368700
+pkgver=2011.03.28
+_pkgsubver=387002
 pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}
 	tools.conf
 	vmware-guestd
 	xautostart.conf)
-md5sums=('488601e384daeab2c6ffd81e1a95cad7'
+md5sums=('a9c72ab0b8f7778d444e69e9d3b95527'
          '06f7448e274db2a911f582e276088fc9'
          'b183ec265200d68431a5e4eb1b0c8cf5'
          '8c333a979578bdc0c3134c1dd6bb7353'
@@ -36,16 +36,17 @@ md5sums=('488601e384daeab2c6ffd81e1a95cad7'
 
 build() {
   cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
-
-#  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i $srcdir/open-vm-tools-X11Bool.patch
-
-  [ $NOEXTRACT -eq 1 ] || sed -i 's#3.2.7#3.2.8#' configure
-  [ $NOEXTRACT -eq 1 ] || sed -i 's#3.2.7#3.2.8#' configure.ac
-
-  unset LDFLAGS
-
+  [ $NOEXTRACT -eq 1 ] || {
+    sed -i 's#3.2.7#3.2.8#' configure configure.ac
+    sed -i 's#CFLAGS="$CFLAGS -Werror"##' configure configure.ac
+  }
   [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
+
   make install DESTDIR=$pkgdir
   install -D -m 755 scripts/common/vmware-xdg-detect-de $pkgdir/usr/bin/vmware-xdg-detect-de
   chmod 07755 $pkgdir/usr/bin/vmware-user-suid-wrapper