Another bunch of fixes:

 - pet portlint(1)
 - add info on the rc.conf settings
 - don't reinstall files twice
 - open-vm-tools and open-vm-tools-nox11 need to CONFLICT each other
 - on 5.x, the scripts won't try to load unsupported kmods
 - kldxref should be run also on 5.x
 - bump PORTREVISION

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

3 files changed, 60 insertions, 61 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 471953c3a825..9da216fd90b3 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		emulators
 MASTER_SITES=		SF
 DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
@@ -25,6 +25,7 @@ CONFIGURE_ARGS+=	--without-procps
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=		X11="@comment "
+CONFLICTS=		open-vm-tools-[0-9]*
 .else
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -32,9 +33,11 @@ CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
 USE_XORG=		x11 ice xineramaproto xinerama xrandr xtst
 USE_GNOME=		gtk20
 PLIST_SUB+=		X11=""
+CONFLICTS=		open-vm-tools-nox11-[0-9]*
 .endif
 
-CONFLICTS=		vmware-guestd* vmware-tools*
+CONFLICTS+=		vmware-guestd[0-9]* vmware-tools[0-9]*
+SUB_FILES=		pkg-message
 
 .if defined(WITHOUT_DNET)
 CONFIGURE_ARGS+=	--without-dnet
@@ -53,9 +56,9 @@ USE_RC_SUBR=		vmware-guestd.sh vmware-kmod.sh
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 600000
-PLIST_SUB+=	FIVEONLY="@comment "
+SUB_LIST+=	NOTON5="@comment "
 .else
-PLIST_SUB+=	FIVEONLY=""
+SUB_LIST+=	NOTON5=""
 .endif
 
 post-patch:
@@ -67,22 +70,15 @@ post-build:
 	cd ${WRKSRC}/modules && make
 
 post-install:
-	${MKDIR} ${PREFIX}/lib/vmware-tools/modules/drivers
-	${MKDIR} ${PREFIX}/lib/vmware-tools/modules/input
-	${MKDIR} ${PREFIX}/share/vmware-tools
+	${MKDIR} ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers
+	${MKDIR} ${PREFIX}/${LIB32DIR}/vmware-tools/modules/input
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmmemctl.ko
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmxnet.ko
 .if ${OSREL} >= 6
-	${INSTALL} ${WRKSRC}/hgfsmounter/mount.vmhgfs ${PREFIX}/sbin/mount_vmhgfs
-.endif
-	${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
-	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko
-	${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
-.if !defined(WITHOUT_X11)
-	${INSTALL} ${WRKSRC}/toolbox/vmware-toolbox ${LOCALBASE}/sbin/vmware-toolbox
-	${INSTALL} ${WRKSRC}/vmware-user/vmware-user ${LOCALBASE}/sbin/vmware-user
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmhgfs.ko
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmblock.ko
 .endif
+	@-kldxref ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers 2>/dev/null
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/open-vm-tools/files/vmware-kmod.sh.in b/emulators/open-vm-tools/files/vmware-kmod.sh.in
index b679bb63f918..31c8cfb95da3 100644
--- a/emulators/open-vm-tools/files/vmware-kmod.sh.in
+++ b/emulators/open-vm-tools/files/vmware-kmod.sh.in
@@ -17,23 +17,23 @@ checkvm_cmd="${PREFIX}/bin/vmware-checkvm > /dev/null"
 vmware_guest_vmmemctl_start()
 {
 	echo 'Loading vmmemctl kernel module.'
-	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
+	kldload ${PREFIX}/%%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
 }
 vmware_guest_vmxnet_start()
 {
 	echo 'Loading vmxnet kernel module.'
-	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
-}
-vmware_guest_vmblock_start()
-{
-	echo 'Loading vmblock kernel module.'
-	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
-}
-vmware_guest_vmhgfs_start()
-{
-	echo 'Loading vmhgfs kernel module.'
-	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
+	kldload ${PREFIX}/%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
 }
+%%NOTON5%%vmware_guest_vmblock_start()
+%%NOTON5%%{
+%%NOTON5%%	echo 'Loading vmblock kernel module.'
+%%NOTON5%%	kldload ${PREFIX}/%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
+%%NOTON5%%}
+%%NOTON5%%vmware_guest_vmhgfs_start()
+%%NOTON5%%{
+%%NOTON5%%	echo 'Loading vmhgfs kernel module.'
+%%NOTON5%%	kldload ${PREFIX}/%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
+%%NOTON5%%}
 
 # VMware kernel module: vmmemctl
 name="vmware_guest_vmmemctl"
@@ -59,27 +59,27 @@ stop_cmd=":"
 load_rc_config $name
 [ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO"
 run_rc_command "$1"
-
-# VMware kernel module: vmblock
-name="vmware_guest_vmblock"
-rcvar=`set_rcvar`
-start_precmd="${checkvm_cmd}"
-start_cmd="vmware_guest_vmblock_start"
-stop_precmd="${checkvm_cmd}"
-stop_cmd=":"
-
-load_rc_config $name
-[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO"
-run_rc_command "$1"
-
-# VMware kernel module: vmhgfs
-name="vmware_guest_vmhgfs"
-rcvar=`set_rcvar`
-start_precmd="${checkvm_cmd}"
-start_cmd="vmware_guest_vmhgfs_start"
-stop_precmd="${checkvm_cmd}"
-stop_cmd=":"
-
-load_rc_config $name
-[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO"
-run_rc_command "$1"
+%%NOTON5%%
+%%NOTON5%%# VMware kernel module: vmblock
+%%NOTON5%%name="vmware_guest_vmblock"
+%%NOTON5%%rcvar=`set_rcvar`
+%%NOTON5%%start_precmd="${checkvm_cmd}"
+%%NOTON5%%start_cmd="vmware_guest_vmblock_start"
+%%NOTON5%%stop_precmd="${checkvm_cmd}"
+%%NOTON5%%stop_cmd=":"
+%%NOTON5%%
+%%NOTON5%%load_rc_config $name
+%%NOTON5%%[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO"
+%%NOTON5%%run_rc_command "$1"
+%%NOTON5%%
+%%NOTON5%%# VMware kernel module: vmhgfs
+%%NOTON5%%name="vmware_guest_vmhgfs"
+%%NOTON5%%rcvar=`set_rcvar`
+%%NOTON5%%start_precmd="${checkvm_cmd}"
+%%NOTON5%%start_cmd="vmware_guest_vmhgfs_start"
+%%NOTON5%%stop_precmd="${checkvm_cmd}"
+%%NOTON5%%stop_cmd=":"
+%%NOTON5%%
+%%NOTON5%%load_rc_config $name
+%%NOTON5%%[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO"
+%%NOTON5%%run_rc_command "$1"
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 3c3082ee4a98..4cf1b767dff2 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -9,11 +9,11 @@ etc/vmware-tools/tools.conf
 %%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
+%%NOTON5%%%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko
+%%NOTON5%%%%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
+%%NOTON5%%sbin/mount_vmhgfs
 sbin/vmware-guestd
 %%X11%%sbin/vmware-toolbox
 %%X11%%sbin/vmware-user
@@ -25,12 +25,15 @@ share/vmware-tools/poweron-vm-default
 share/vmware-tools/resume-vm-default
 share/vmware-tools/suspend-vm-default
 share/vmware-tools/vm-support
-%%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
 @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
-@dirrmtry %%LIB32DIR%%/vmware-tools/vmware-tools/modules
-@dirrmtry %%LIB32DIR%%/vmware-tools/vmware-tools
+@dirrmtry %%LIB32DIR%%/vmware-tools/modules/input
+@dirrmtry %%LIB32DIR%%/vmware-tools/modules/drivers
+@dirrmtry %%LIB32DIR%%/vmware-tools/modules
+@dirrmtry %%LIB32DIR%%/vmware-tools
+%%X11%%@dirrm share/pixmaps/vmware
+%%X11%%@dirrmtry share/pixmaps
 @dirrmtry etc/vmware-tools
 @dirrmtry share/vmware-tools
 %%X11%%@dirrmtry share/applications