Unbreak the ports

Fix PLIST for both with and without X11.
Fix some configure/build errors with WITH_UNITY option.
Eliminate use of LIB32DIR because no i386 binary is included in the distfile.

PR:		ports/132999
Submitted by:	Hiroto Kagotani <hiroto.kagotani@gmail.com>

3 files changed, 51 insertions, 54 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 04323ab37319..7523a1b7fdf8 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -26,22 +26,23 @@ LIB_DEPENDS+=		glib-2.0:${PORTSDIR}/devel/glib20
 CONFIGURE_ARGS+=	--without-x --without-gtk2 --without-gtkmm
 PLIST_SUB+=		X11="@comment "
 CONFLICTS=		open-vm-tools-[0-9]*
-BROKEN=			bad plist
 .else
 .if !defined(WITHOUT_LIBNOTIFY)
 LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
 .endif
-.if !defined(WITH_UNITY)
+.if defined(WITH_UNITY)
+CONFIGURE_ENV+=		CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
+LIB_DEPENDS+=		uriparser.1:${PORTSDIR}/net/uriparser
+.else
 CONFIGURE_ARGS+=	--disable-unity
 .endif
 CONFIGURE_ARGS+=	--with-x --without-gtkmm
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib" \
 			CPPFLAGS="-I${LOCALBASE}/include"
 USE_XORG=		x11 ice xineramaproto xinerama xrandr xtst
 USE_GNOME=		gtk20 glib20
 PLIST_SUB+=		X11=""
 CONFLICTS=		open-vm-tools-nox11-[0-9]*
-BROKEN=			does not configure
 .endif
 
 CONFLICTS+=		vmware-guestd[0-9]* vmware-tools[0-9]*
@@ -67,21 +68,17 @@ USE_RC_SUBR=		vmware-guestd.sh vmware-kmod.sh
 IGNORE=		not yet ported to sparc64
 .endif
 
-PLIST_SUB+=	LIB32DIR=${LIB32DIR}
-
-SUB_LIST+=	LIB32DIR=${LIB32DIR}
-
 post-build:
 	(cd ${WRKSRC}/modules && ${MAKE})
 
 post-install:
-	${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
-	${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
-	@-kldxref ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers 2>/dev/null
+	${MKDIR} ${PREFIX}/lib/vmware-tools/modules/drivers
+	${MKDIR} ${PREFIX}/lib/vmware-tools/modules/input
+	${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
+	${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
 	@${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 567910cb2ab6..68f6cd630296 100644
--- a/emulators/open-vm-tools/files/vmware-kmod.sh.in
+++ b/emulators/open-vm-tools/files/vmware-kmod.sh.in
@@ -16,22 +16,22 @@ checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null"
 vmware_guest_vmmemctl_start()
 {
 	echo 'Loading vmmemctl kernel module.'
-	kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
+	kldload %%PREFIX%%/lib/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
 }
 vmware_guest_vmxnet_start()
 {
 	echo 'Loading vmxnet kernel module.'
-	kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
+	kldload %%PREFIX%%/lib/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
 }
 vmware_guest_vmblock_start()
 {
 	echo 'Loading vmblock kernel module.'
-	kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
+	kldload %%PREFIX%%/lib/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
 }
 vmware_guest_vmhgfs_start()
 {
 	echo 'Loading vmhgfs kernel module.'
-	kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
+	kldload %%PREFIX%%/lib/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
 }
 
 # VMware kernel module: vmmemctl
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 1620c5db041f..df40db51fd65 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -3,55 +3,55 @@ bin/vmware-hgfsclient
 bin/vmware-xferlogs
 bin/vmtoolsd
 bin/vmware-toolbox-cmd
+bin/vmware-vmblock-fuse
 etc/vmware-tools/tools.conf
-etc/vmware-tools/plugins/vmsvc/libguestInfo.so
-etc/vmware-tools/plugins/vmsvc/libhgfsServer.so
-etc/vmware-tools/plugins/vmsvc/libpowerOps.so
-etc/vmware-tools/plugins/vmsvc/libtimeSync.so
-etc/vmware-tools/plugins/vmsvc/libvix.so
-etc/vmware-tools/plugins/vmsvc/libvmbackup.so
-%%LIB32DIR%%/libvmtools.a
-%%LIB32DIR%%/libvmtools.la
-%%LIB32DIR%%/libvmtools.so
-%%LIB32DIR%%/libvmtools.so.0
-%%LIB32DIR%%/libguestlib.a
-%%LIB32DIR%%/libguestlib.la
-%%LIB32DIR%%/libguestlib.so
-%%LIB32DIR%%/libguestlib.so.0
-%%LIB32DIR%%/vmware-tools/modules/drivers/linker.hints
-%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko
-%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko
-%%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko
-%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko
+lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
+lib/open-vm-tools/plugins/vmsvc/libhgfsServer.so
+lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
+lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
+lib/open-vm-tools/plugins/vmsvc/libvix.so
+lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
+%%X11%%lib/open-vm-tools/plugins/vmusr/libhgfsServer.so
+%%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
+%%X11%%lib/open-vm-tools/plugins/vmusr/libvix.so
+%%X11%%lib/open-vm-tools/plugins/vmusr/libvixUser.so
+lib/libvmtools.a
+lib/libvmtools.la
+lib/libvmtools.so
+lib/libvmtools.so.0
+lib/libguestlib.a
+lib/libguestlib.la
+lib/libguestlib.so
+lib/libguestlib.so.0
+lib/vmware-tools/modules/drivers/linker.hints
+lib/vmware-tools/modules/drivers/vmblock.ko
+lib/vmware-tools/modules/drivers/vmhgfs.ko
+lib/vmware-tools/modules/drivers/vmmemctl.ko
+lib/vmware-tools/modules/drivers/vmxnet.ko
+@exec mkdir -p %D/lib/vmware-tools/modules/input
 sbin/mount_vmhgfs
 sbin/vmware-guestd
 %%X11%%bin/vmware-toolbox
 %%X11%%bin/vmware-user
-%%X11%%share/applications/vmware-toolbox.desktop
+%%X11%%bin/vmware-user-suid-wrapper
 %%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
-@exec kldxref %%LIB32DIR%%/vmware-tools/modules/drivers 2>/dev/null || true
+@exec kldxref %D/lib/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
 @unexec if test -h %D/etc/vmware-tools/plugins; then rm -f %D/etc/vmware-tools/plugins; fi
-@dirrmtry %%LIB32DIR%%/vmware-tools/modules/input
-@dirrmtry %%LIB32DIR%%/vmware-tools/modules/drivers
-@dirrmtry %%LIB32DIR%%/vmware-tools/modules
-@dirrmtry %%LIB32DIR%%/vmware-tools/plugins
-@dirrmtry %%LIB32DIR%%/vmware-tools
-%%X11%%@dirrm share/pixmaps/vmware
-@dirrmtry etc/vmware-tools/plugins/vmsvc
-@dirrmtry etc/vmware-tools/plugins
+@dirrmtry lib/vmware-tools/modules/drivers
+@dirrmtry lib/vmware-tools/modules/input
+@dirrmtry lib/vmware-tools/modules
+@dirrmtry lib/vmware-tools
 @dirrmtry etc/vmware-tools
-@dirrmtry etc/open-vm-tools/plugins
-@dirrmtry etc/open-vm-tools
 @dirrmtry share/vmware-tools
 %%X11%%@dirrmtry share/applications
-@dirrm %%LIB32DIR%%/open-vm-tools/plugins/vmsvc
-@dirrm %%LIB32DIR%%/open-vm-tools/plugins
-@dirrm %%LIB32DIR%%/open-vm-tools
+@dirrm lib/open-vm-tools/plugins/vmsvc
+%%X11%%@dirrm lib/open-vm-tools/plugins/vmusr
+@dirrm lib/open-vm-tools/plugins
+@dirrm lib/open-vm-tools