4 files changed, 17 insertions, 20 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index fe441e7e4e21..bd9d02d3357b 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -5,7 +5,7 @@ PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
 PORTREVISION=		4
 PORTEPOCH=		1
-CATEGORIES=		emulators kld
+CATEGORIES=		emulators
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
 DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 
@@ -20,10 +20,11 @@ BUILD_VER=		425873
 
 WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 GNU_CONFIGURE=		yes
-USES=			pkgconfig
+USES=			pkgconfig kmod
 USE_GNOME=		glib20
 USE_LDCONFIG=		yes
 CPPFLAGS+=		-Wno-deprecated-declarations
+KMODDIR=		${PREFIX}/lib/vmware-tools/modules/drivers
 
 SSP_UNSAFE=		kernel module does not support ssp
 
@@ -75,7 +76,6 @@ LIB_DEPENDS+=		libicuuc.so:${PORTSDIR}/devel/icu
 
 USE_RC_SUBR=		vmware-guestd vmware-kmod
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
@@ -83,16 +83,17 @@ IGNORE=		not yet ported to sparc64
 .endif
 
 post-build:
-	(cd ${WRKSRC}/modules && ${MAKE})
+	(cd ${WRKSRC}/modules && env ${MAKE_ENV} ${MAKE} ${MAKE_ARGS})
 
 post-install:
-	${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}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/
 
 .include <bsd.port.post.mk>
diff --git a/emulators/open-vm-tools/files/patch-libguestlib-Makefile b/emulators/open-vm-tools/files/patch-libguestlib-Makefile
index ab5d4d2d6609..7fd8c0c448bd 100644
--- a/emulators/open-vm-tools/files/patch-libguestlib-Makefile
+++ b/emulators/open-vm-tools/files/patch-libguestlib-Makefile
@@ -5,7 +5,7 @@
  EXTRA_DIST = vmguestlib.pc.in
  
 -pkgconfigdir   = $(libdir)/pkgconfig
-+pkgconfigdir   = $(DESTDIR)$(prefix)/libdata/pkgconfig
++pkgconfigdir   = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = vmguestlib.pc
  
  $(pkgconfig_DATA): $(top_builddir)/config.status
@@ -16,7 +16,7 @@
  	$(top_srcdir)/lib/include/vm_basic_types.h
  EXTRA_DIST = vmguestlib.pc.in
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = vmguestlib.pc
  all: all-am
  
diff --git a/emulators/open-vm-tools/files/patch-services-Makefile b/emulators/open-vm-tools/files/patch-services-Makefile
index cd7731d6d470..8010d3b1a214 100644
--- a/emulators/open-vm-tools/files/patch-services-Makefile
+++ b/emulators/open-vm-tools/files/patch-services-Makefile
@@ -6,7 +6,7 @@
  install-exec-local:
 -	mkdir -p $(DESTDIR)/etc/vmware-tools
 -	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
-+	mkdir -p $(prefix)/etc/vmware-tools
++	mkdir -p $(DESTDIR)$(prefix)/etc/vmware-tools
  
 --- services/Makefile.in.orig	2009-02-28 20:48:52.000000000 +0100
 +++ services/Makefile.in	2009-02-28 20:49:46.000000000 +0100
@@ -16,7 +16,7 @@
  install-exec-local:
 -	mkdir -p $(DESTDIR)/etc/vmware-tools
 -	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
-+	mkdir -p $(prefix)/etc/vmware-tools
++	mkdir -p $(DESTDIR)$(prefix)/etc/vmware-tools
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 2836829fd8f4..c579d30dc89c 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -30,7 +30,6 @@ lib/libguestlib.la
 lib/libguestlib.so
 lib/libguestlib.so.0
 libdata/pkgconfig/vmguestlib.pc
-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
@@ -53,11 +52,8 @@ share/open-vm-tools/messages/ja/toolbox.vmsg
 share/open-vm-tools/messages/zh_CN/toolbox.vmsg
 share/vmware-tools/statechange.subr
 share/vmware-tools/scripts/vmware/network
-@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 lib/vmware-tools/modules/drivers
 @dirrmtry lib/vmware-tools/modules/input
 @dirrmtry lib/vmware-tools/modules
 @dirrmtry lib/vmware-tools