From f7291a8c528b18e3755a2651d546258ad07490dc Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Sat, 5 Jan 2013 04:03:47 +0100
Subject: main/open-vm-tools: upgrade to 9.2.2-893683

---
 main/open-vm-tools/APKBUILD | 59 ++++++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 20 deletions(-)

(limited to 'main/open-vm-tools')

diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD
index a15a97870..d457bdf2d 100644
--- a/main/open-vm-tools/APKBUILD
+++ b/main/open-vm-tools/APKBUILD
@@ -1,40 +1,58 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=open-vm-tools
-pkgver=9.2.0_p799703
+pkgver=9.2.2_p893683
 _pkgsubver=${pkgver#*_p}
 _ver=${pkgver/_p/-}
-pkgrel=1
+pkgrel=0
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
 url="http://open-vm-tools.sourceforge.net/"
 arch="all"
 license="LGPL"
 subpackages="$pkgname-gtk $pkgname-dev"
 install="$pkgname.pre-install"
-makedepends="procps-dev libdnet-dev icu-dev glib-dev pkgconfig bash
-	libtirpc-dev rpcgen icu-dev automake autoconf
-	gtk+-dev libxext-dev libxinerama-dev libxtst-dev gtkmm-dev
-	libnotify-dev libxrandr-dev libxcomposite-dev libice-dev libsm-dev
-	fuse-dev
-	"
+makedepends="procps-dev libdnet-dev icu-dev glib-dev pkgconfig bash icu-dev automake 
+	autoconf gtk+-dev libxext-dev libxinerama-dev libxtst-dev gtkmm-dev
+	libnotify-dev libxrandr-dev libxcomposite-dev libice-dev libsm-dev fuse-dev libtool m4"
 source="http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-${pkgver%.*}.x/open-vm-tools-$_ver.tar.gz
+	0001-lib-misc-Recognize-Alpine-Linux.patch
+	libm.patch
+	werror.patch
 	codeset-uclibc.patch
 	iconv-uclibc.patch
 	uclibc-stubs.patch
-	libm.patch
-	0001-lib-misc-Recognize-Alpine-Linux.patch
-	werror.patch
 	open-vm-tools.initd
 	"
 
+[ "$ALPINE_LIBC" != "eglibc" ] && makedepends="$makedepends rpcgen"
+
 _builddir="$srcdir"/$pkgname-$_ver
 
 prepare() {
 	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+
+        for patch in $source; do
+                case $patch in
+                # we concider patches with uclibc in its name
+                # only usefull on uclibc install
+                *uclibc*.patch)
+                        if [ "$ALPINE_LIBC" != "eglibc" ]; then
+                                msg "Applying patch $patch"
+                                patch -p1 -i "$srcdir"/$patch || return 1
+                        fi
+                        ;;
+		# we do the same for eglibc
+                *eglibc*.patch)
+                        if [ "$ALPINE_LIBC" = "eglibc" ]; then
+                                msg "Applying patch $patch"
+                                patch -p1 -i "$srcdir"/$patch || return 1
+                        fi
+                        ;;
+                *.patch)
+                        msg "Applying patch $patch"
+                        patch -p1 -i "$srcdir"/$patch || return 1
+                        ;;
+                esac
+        done
 
 	sed -i -e 's/__unused1/st_atim.tv_nsec/g' \
 		-e 's/__unused2/st_mtim.tv_nsec/g' \
@@ -49,6 +67,7 @@ prepare() {
 }
 
 build() {
+	export CUSTOM_PROCPS_NAME="procps"
 	export CFLAGS="$CLFAGS -Wno-unused-but-set-variable"
 	cd "$_builddir"
 	./configure --prefix=/usr \
@@ -84,11 +103,11 @@ gtk() {
 		"$subpkgdir"/usr/lib/open-vm-tools/plugins/
 }
 
-md5sums="37341978a00a1568b898a8ce024f9da9  open-vm-tools-9.2.0-799703.tar.gz
+md5sums="7af505681d736d4c9ee6493b1166689f  open-vm-tools-9.2.2-893683.tar.gz
+87b131c2208b32d9c0bb6fbacd7f75a9  0001-lib-misc-Recognize-Alpine-Linux.patch
+7d02fc25aba5c248f3d98dac238f175b  libm.patch
+e462f567cd5588d738af4cfa0dd13b3c  werror.patch
 82840b6bed002284b9bd2358707ee826  codeset-uclibc.patch
 89c7449323ddac4666b73a8467baf95a  iconv-uclibc.patch
 30a4161baf6274ac9cceb879460cd894  uclibc-stubs.patch
-7d02fc25aba5c248f3d98dac238f175b  libm.patch
-87b131c2208b32d9c0bb6fbacd7f75a9  0001-lib-misc-Recognize-Alpine-Linux.patch
-e462f567cd5588d738af4cfa0dd13b3c  werror.patch
 905ef6a3bac87c9ba2e5d3897ca230e7  open-vm-tools.initd"
-- 
cgit v1.2.3