Change GTK12 dependency to GTK20 to fix the package build.

Fix package lists.
Bump portrevision.

4 files changed, 33 insertions, 15 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index f75854fd6bc0..4433530b83d7 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
+PORTREVISION=		1
 CATEGORIES=		emulators
 DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
 MASTER_SITES=		SF
@@ -27,7 +28,7 @@ CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
 			CPPFLAGS="-I${LOCALBASE}/include"
 USE_XORG=		x11 ice xineramaproto xinerama xrandr xtst
-USE_GNOME=		gtk12
+USE_GNOME=		gtk20
 PLIST_SUB+=		X11=""
 PLIST=			${PKGDIR}/pkg-plist-x11
 .endif
@@ -68,12 +69,10 @@ post-install:
 	${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/drivers
 	${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/input
 	${MKDIR} -p ${PREFIX}/share/vmware-tools
-	${INSTALL} ${WRKSRC}/guestd/vmware-guestd ${PREFIX}/sbin/vmware-guestd
-	${INSTALL} ${WRKSRC}/checkvm/vmware-checkvm ${PREFIX}/sbin/vmware-checkvm
+	${INSTALL} ${WRKSRC}/guestd/vmware-guestd ${PREFIX}/bin/vmware-guestd
 .if ${OSREL} >= 6
-	${INSTALL} ${WRKSRC}/hgfsmounter/mount.vmhgfs ${PREFIX}/sbin/mount.vmhgfs
+	${INSTALL} ${WRKSRC}/hgfsmounter/mount.vmhgfs ${PREFIX}/sbin/mount_vmhgfs
 .endif
-	${INSTALL} ${WRKSRC}/xferlogs/vmware-xferlogs ${PREFIX}/sbin/vmware-xferlogs
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko
 .if ${OSREL} >= 6
@@ -81,10 +80,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
 	@-kldxref ${PREFIX}/lib/vmware-tools/modules/drivers 2>/dev/null
 .endif
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/poweroff-vm-default ${PREFIX}/share/vmware-tools/poweroff-vm-default
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/poweron-vm-default ${PREFIX}/share/vmware-tools/poweron-vm-default
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/resume-vm-default ${PREFIX}/share/vmware-tools/resume-vm-default
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/suspend-vm-default ${PREFIX}/share/vmware-tools/suspend-vm-default
 .if !defined(WITHOUT_X11)
 	${INSTALL} ${WRKSRC}/toolbox/vmware-toolbox ${LOCALBASE}/sbin/vmware-toolbox
 	${INSTALL} ${WRKSRC}/vmware-user/vmware-user ${LOCALBASE}/sbin/vmware-user
diff --git a/emulators/open-vm-tools/files/patch-scripts-Makefile b/emulators/open-vm-tools/files/patch-scripts-Makefile
new file mode 100644
index 000000000000..414ec61bda53
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-scripts-Makefile
@@ -0,0 +1,19 @@
+--- scripts/Makefile.am.orig	2008-07-22 01:13:49.000000000 +0200
++++ scripts/Makefile.am	2008-07-22 01:17:50.000000000 +0200
+@@ -1,4 +1,4 @@
+-confdir = /etc/vmware-tools
++confdir = ${prefix}/share/vmware-tools
+ 
+ conf_SCRIPTS = ./common/vm-support
+ conf_SCRIPTS += $(MODULES_OS)/poweron-vm-default
+--- scripts/Makefile.in.orig	2008-07-22 01:13:57.000000000 +0200
++++ scripts/Makefile.in	2008-07-22 01:18:30.000000000 +0200
+@@ -186,7 +186,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-confdir = /etc/vmware-tools
++confdir = ${prefix}/share/vmware-tools
+ conf_SCRIPTS = ./common/vm-support $(MODULES_OS)/poweron-vm-default \
+ 	$(MODULES_OS)/poweroff-vm-default \
+ 	$(MODULES_OS)/suspend-vm-default \
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 43b18b6c04ab..f5640d65b909 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -11,10 +11,12 @@ 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
 sbin/vmware-guestd
-sbin/vmware-checkvm
-%%FIVEONLY%%sbin/mount.vmhgfs
-sbin/vmware-xferlogs
+bin/vmware-checkvm
+bin/vmware-xferlogs
+bin/vmware-hgfsclient
+%%FIVEONLY%%sbin/mount_vmhgfs
 @dirrm share/vmware-tools
 @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
diff --git a/emulators/open-vm-tools/pkg-plist-x11 b/emulators/open-vm-tools/pkg-plist-x11
index fa321fb4a80c..88fa659d8bca 100644
--- a/emulators/open-vm-tools/pkg-plist-x11
+++ b/emulators/open-vm-tools/pkg-plist-x11
@@ -11,10 +11,12 @@ 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
 sbin/vmware-guestd
-sbin/vmware-checkvm
-%%FIVEONLY%%sbin/mount.vmhgfs
-sbin/vmware-xferlogs
+bin/vmware-checkvm
+bin/vmware-xferlogs
+bin/vmware-hgfsclient
+%%FIVEONLY%%sbin/mount_vmhgfs
 %%X11%%sbin/vmware-toolbox
 %%X11%%sbin/vmware-user
 @dirrm share/vmware-tools