Unbreak open-vm-tools. Fix pkg-lists.

Submitted by:	olgeni, Angelo Turetta <aturetta@bestunion.it>

3 files changed, 35 insertions, 65 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index d52d15e1e275..471953c3a825 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -7,24 +7,24 @@
 
 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		emulators
-DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
 MASTER_SITES=		SF
+DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
 
 MAINTAINER=		mbr@freebsd.org
 COMMENT?=		Open VMware tools for FreeBSD VMware guests
 
-BROKEN=			leaves files behind on deinstall
-
 RELEASE_DATE=		2008.07.01
 BUILD_VER=		102166
 
 GNU_CONFIGURE=		yes
+USE_LDCONFIG=		yes
 
 CONFIGURE_ARGS+=	--without-procps
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--without-x
+PLIST_SUB+=		X11="@comment "
 .else
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -32,7 +32,6 @@ CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
 USE_XORG=		x11 ice xineramaproto xinerama xrandr xtst
 USE_GNOME=		gtk20
 PLIST_SUB+=		X11=""
-PLIST=			${PKGDIR}/pkg-plist-x11
 .endif
 
 CONFLICTS=		vmware-guestd* vmware-tools*
@@ -61,16 +60,16 @@ PLIST_SUB+=	FIVEONLY=""
 
 post-patch:
 .if defined(WITHOUT_X11)
-	cd ${WRKSRC} && patch < ${FILESDIR}/optpatch-nox11
+	cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/optpatch-nox11
 .endif
 
 post-build:
 	cd ${WRKSRC}/modules && make
 
 post-install:
-	${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/drivers
-	${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/input
-	${MKDIR} -p ${PREFIX}/share/vmware-tools
+	${MKDIR} ${PREFIX}/lib/vmware-tools/modules/drivers
+	${MKDIR} ${PREFIX}/lib/vmware-tools/modules/input
+	${MKDIR} ${PREFIX}/share/vmware-tools
 .if ${OSREL} >= 6
 	${INSTALL} ${WRKSRC}/hgfsmounter/mount.vmhgfs ${PREFIX}/sbin/mount_vmhgfs
 .endif
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 98444b3c0abc..3c3082ee4a98 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -1,29 +1,36 @@
-lib/libguestlib.a
-lib/libguestlib.la
-lib/libguestlib.so
-lib/libguestlib.so.0
-lib/vmware-tools/modules/drivers/vmmemctl.ko
-lib/vmware-tools/modules/drivers/vmxnet.ko
-%%FIVEONLY%%lib/vmware-tools/modules/drivers/vmhgfs.ko
-%%FIVEONLY%%lib/vmware-tools/modules/drivers/vmblock.ko
-@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
+bin/vmware-checkvm
+bin/vmware-hgfsclient
+%%X11%%bin/vmware-toolbox
+%%X11%%bin/vmware-user
+bin/vmware-xferlogs
+etc/vmware-tools/tools.conf
+%%LIB32DIR%%/libguestlib.a
+%%LIB32DIR%%/libguestlib.la
+%%LIB32DIR%%/libguestlib.so
+%%LIB32DIR%%/libguestlib.so.0
+%%LIB32DIR%%/vmware-tools/modules/drivers/linker.hints
+%%FIVEONLY%%%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko
+%%FIVEONLY%%%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko
+%%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko
+%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko
+%%FIVEONLY%%sbin/mount_vmhgfs
+sbin/vmware-guestd
+%%X11%%sbin/vmware-toolbox
+%%X11%%sbin/vmware-user
+%%X11%%share/applications/vmware-toolbox.desktop
+%%X11%%share/applications/vmware-user.desktop
+%%X11%%share/pixmaps/vmware/vmware-toolbox.xpm
 share/vmware-tools/poweroff-vm-default
 share/vmware-tools/poweron-vm-default
 share/vmware-tools/resume-vm-default
 share/vmware-tools/suspend-vm-default
 share/vmware-tools/vm-support
-bin/vmware-checkvm
-bin/vmware-xferlogs
-bin/vmware-hgfsclient
-sbin/vmware-guestd
-etc/vmware-tools/tools.conf
-%%FIVEONLY%%sbin/mount_vmhgfs
+%%X11%%@dirrm share/pixmaps/vmware
+@exec kldxref %%LIB32DIR%%/vmware-tools/modules/drivers 2>/dev/null || true
 @unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
-@dirrmtry lib/vmware-tools/modules/drivers
-@dirrmtry lib/vmware-tools/modules/input
 @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
-@dirrmtry lib/vmware-tools/modules
-@dirrmtry lib/vmware-tools
+@dirrmtry %%LIB32DIR%%/vmware-tools/vmware-tools/modules
+@dirrmtry %%LIB32DIR%%/vmware-tools/vmware-tools
 @dirrmtry etc/vmware-tools
 @dirrmtry share/vmware-tools
-@dirrmtry share/applications
+%%X11%%@dirrmtry share/applications
diff --git a/emulators/open-vm-tools/pkg-plist-x11 b/emulators/open-vm-tools/pkg-plist-x11
index c588916ecf5d..e69de29bb2d1 100644
--- a/emulators/open-vm-tools/pkg-plist-x11
+++ b/emulators/open-vm-tools/pkg-plist-x11
@@ -1,36 +0,0 @@
-lib/libguestlib.a
-lib/libguestlib.la
-lib/libguestlib.so
-lib/libguestlib.so.0
-lib/vmware-tools/modules/drivers/vmmemctl.ko
-lib/vmware-tools/modules/drivers/vmxnet.ko
-%%FIVEONLY%%lib/vmware-tools/modules/drivers/vmhgfs.ko
-%%FIVEONLY%%lib/vmware-tools/modules/drivers/vmblock.ko
-@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
-share/vmware-tools/poweroff-vm-default
-share/vmware-tools/poweron-vm-default
-share/vmware-tools/resume-vm-default
-share/vmware-tools/suspend-vm-default
-share/vmware-tools/vm-support
-share/pixmaps/vmware/vmware-toolbox.xpm
-bin/vmware-toolbox
-bin/vmware-user
-bin/vmware-checkvm
-bin/vmware-xferlogs
-bin/vmware-hgfsclient
-sbin/vmware-guestd
-etc/vmware-tools/tools.conf
-%%FIVEONLY%%sbin/mount_vmhgfs
-%%X11%%sbin/vmware-toolbox
-%%X11%%sbin/vmware-user
-share/applications/vmware-user.desktop
-share/applications/vmware-toolbox.desktop
-@unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
-@dirrmtry lib/vmware-tools/modules/drivers
-@dirrmtry lib/vmware-tools/modules/input
-@unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
-@dirrmtry lib/vmware-tools/modules
-@dirrmtry lib/vmware-tools
-@dirrmtry etc/vmware-tools
-@dirrmtry share/vmware-tools
-@dirrmtry share/applications