The libvmCheck functionality is needed inside libguestlib, so make it

and the required libvmSignal a convience library. Sort out users.
Bump revision.

11 files changed, 186 insertions, 12 deletions

diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile
index 28f808cadc3..b8928f8fa52 100644
--- a/sysutils/open-vm-tools/Makefile
+++ b/sysutils/open-vm-tools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2013/02/16 11:24:34 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2013/04/01 12:25:16 joerg Exp $
 
 DISTNAME=	open-vm-tools-2008.08.08-109361
 PKGNAME=	open-vm-tools-2008.08.08.109361
-PKGREVISION=	26
+PKGREVISION=	27
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=open-vm-tools/}
 
@@ -15,7 +15,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-x86_64
 GNU_CONFIGURE=	yes
 USE_LANGUAGES+=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config autoconf automake
 
 PLIST_SRC=	PLIST.common
 
@@ -32,12 +32,8 @@ CONF_FILES_PERMS+=		${EGDIR}/suspend-vm-default ${PKG_SYSCONFDIR}/suspend-vm-def
 CONF_FILES_PERMS+=		${EGDIR}/tools.conf ${PKG_SYSCONFDIR}/tools.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 RCD_SCRIPTS=			vmtools
 
-SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		pre-configure
-SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
-SUBST_FILES.fix-paths=		scripts/Makefile.in
-SUBST_SED.fix-paths=		-e 's|/etc/vmware-tools|${EGDIR}|g'
-SUBST_SED.fix-paths+=		-e '/^conf_SCRIPTS/s|./common/vm-support ||'
+pre-configure:
+	cd ${WRKSRC} && autoreconf -f
 
 .include "../../net/libdnet/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/sysutils/open-vm-tools/distinfo b/sysutils/open-vm-tools/distinfo
index 3d92ac1ce92..d0fffa72344 100644
--- a/sysutils/open-vm-tools/distinfo
+++ b/sysutils/open-vm-tools/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.6 2012/12/25 21:02:14 joerg Exp $
+$NetBSD: distinfo,v 1.7 2013/04/01 12:25:16 joerg Exp $
 
 SHA1 (open-vm-tools-2008.08.08-109361.tar.gz) = 1c44c3524cd9cbc5870f1c6065b03a6b31859a25
 RMD160 (open-vm-tools-2008.08.08-109361.tar.gz) = 4ea0a6aa2edda2bc404c865dc5b58f3a177ae411
 Size (open-vm-tools-2008.08.08-109361.tar.gz) = 2971141 bytes
-SHA1 (patch-aa) = 113fdbeafe3131558167fb6c4abc9c44786d420b
-SHA1 (patch-ab) = 66ab38809e1ab7b1b0dfd51b88d93a8f0faa2fad
 SHA1 (patch-ac) = 141db2136d1068408ca3470e11d35233f936a11c
 SHA1 (patch-ad) = 4ec9292667918c23ef182ae05d5f8417d9af7673
 SHA1 (patch-ae) = 785a5d5d27ce6f8281caa56a27f90a3b200ac082
@@ -55,9 +53,18 @@ SHA1 (patch-bw) = c242890caa3cc720d18eec612aca6e46c69c5b04
 SHA1 (patch-bx) = deeea5eefae750b046d7a9c81679125e26fb82fa
 SHA1 (patch-by) = c6018a330fdabefd3fc60d3e6e6c95bdf4f7f2bc
 SHA1 (patch-checkvm_checkvm.c) = 142e34b40937add51db4f2255f47da23402a3720
+SHA1 (patch-configure.ac) = d39767cc2006088203341782fca7895c2710fd55
+SHA1 (patch-guestd_Makefile.am) = 4855efa62b6633e23c11e3ea184f60f4c6952244
+SHA1 (patch-hgfsclient_Makefile.am) = 3b6adf9e4d88bcce2c191260b669615537927e28
 SHA1 (patch-lib_hgfsServer_hgfsServer.c) = 68a3102d4f53626717f64284eb5e51bfb584e783
 SHA1 (patch-lib_hgfsServer_hgfsServerLinux.c) = ef5a3135a8e4dc9f16d93d6eb7d88b8194aa0907
 SHA1 (patch-lib_panic_panic.c) = f784479ef9000e67389c04ca80ad22da5e3a2165
+SHA1 (patch-lib_vmCheck_Makefile.am) = 5956c6e81d6ea5679d949083fcf60066d8374672
+SHA1 (patch-lib_vmSignal_Makefile.am) = 6c562e558f846666ed9da3298f15a9cd489bd75f
+SHA1 (patch-libguestlib_Makefile.am) = d46ae6b600831b3f7ecd39f675fbf480a7882e60
+SHA1 (patch-scripts_Makefile.am) = 18bac57a5bfed9883734fdc58a4d6214b6614d92
+SHA1 (patch-toolbox_Makefile.am) = cc0d0f3a0b2b269da903ff6918d329ce74158d17
 SHA1 (patch-toolbox_toolboxcmd-stat.c) = 17d1188de53cea4897fc1d08a02d9db06f6bbc28
+SHA1 (patch-vmware-user_Makefile.am) = 20c389aa42c5419106e1d6619e812725602ead6c
 SHA1 (patch-vmware-user_copyPaste.c) = 58286d54e72d9290fc9392212d37c0c406a4e6f8
 SHA1 (patch-vmware-user_dnd.c) = 9d2b242b5e5042f12440ccbf44b10367a8184b0b
diff --git a/sysutils/open-vm-tools/patches/patch-configure.ac b/sysutils/open-vm-tools/patches/patch-configure.ac
new file mode 100644
index 00000000000..958520b2ec3
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-configure.ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure.ac,v 1.1 2013/04/01 12:25:17 joerg Exp $
+
+--- configure.ac.orig	2008-08-08 07:01:58.000000000 +0000
++++ configure.ac
+@@ -111,6 +111,9 @@ case "$host_os" in
+    [linux*])
+       os="linux"
+       ;;
++   [netbsd*])
++      os="netbsd"
++      ;;
+    [freebsd*])
+       os="freebsd"
+       ;;
+@@ -573,7 +576,7 @@ if test "$with_dnet" = "yes"; then
+ 
+ 		GUESTD_LDADD="$GUESTD_LDADD $DNET_LIBS"
+ 		VMWARE_USER_LDADD="$VMWARE_USER_LDADD $DNET_LIBS"
+-		if test "$DNET_CONFIG" == dumbnet-config; then
++		if test "$DNET_CONFIG" = dumbnet-config; then
+ 		AC_DEFINE([DNET_IS_DUMBNET], 1, [Define to 1 if substituting Debian's libdumbnet for libdnet.])
+ 		fi
+ 	else
diff --git a/sysutils/open-vm-tools/patches/patch-guestd_Makefile.am b/sysutils/open-vm-tools/patches/patch-guestd_Makefile.am
new file mode 100644
index 00000000000..33998dc0b4f
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-guestd_Makefile.am
@@ -0,0 +1,39 @@
+$NetBSD: patch-guestd_Makefile.am,v 1.1 2013/04/01 12:25:17 joerg Exp $
+
+--- guestd/Makefile.am.orig	2008-08-08 07:01:56.000000000 +0000
++++ guestd/Makefile.am
+@@ -50,8 +50,8 @@ vmware_guestd_LDADD += ../lib/system/lib
+ vmware_guestd_LDADD += ../lib/user/libUser.a
+ vmware_guestd_LDADD += ../lib/vixTools/libVixTools.a
+ vmware_guestd_LDADD += ../lib/vmBackupLib/libVmBackupLib.a
+-vmware_guestd_LDADD += ../lib/vmCheck/libVmCheck.a
+-vmware_guestd_LDADD += ../lib/vmSignal/libVmSignal.a
++vmware_guestd_LDADD += ../lib/vmCheck/libVmCheck.la
++vmware_guestd_LDADD += ../lib/vmSignal/libVmSignal.la
+ vmware_guestd_LDADD += ../lib/wiper/libWiper.a
+ # In the absence of the linker options --start-group and --end-group (which
+ # can't be put in LDADD), we need to bring the following libraries out of the
+@@ -92,19 +92,11 @@ else
+    vmware_guestd_LINK = $(LINK)
+ endif
+ 
+-if LINUX
+-if PAMD
+-if THIRTY_TWO_BIT_USERSPACE
+-pam_SCRIPTS = ../scripts/linux/pam.d/vmware-guestd
+-else
+-pam_SCRIPTS = ../scripts/linux/pam.d/vmware-guestd-x64
+-endif !THIRTY_TWO_BIT_USERSPACE
+-endif PAMD
+-endif LINUX
++EGDIR = @datarootdir@/examples
+ 
+ install-exec-hook:
+-	$(INSTALL) -d $(DESTDIR)/etc/vmware-tools
+-	echo 'disable-tools-version = "true"' > $(DESTDIR)/etc/vmware-tools/tools.conf
++	$(INSTALL) -d $(DESTDIR)${EGDIR}/vmware-tools
++	echo 'disable-tools-version = "true"' > $(DESTDIR)${EGDIR}/vmware-tools/tools.conf
+ 
+ uninstall-hook:
+-	$(RM) -rf $(DESTDIR)/etc/vmware-tools
++	$(RM) -rf $(DESTDIR)${EGDIR}/vmware-tools
diff --git a/sysutils/open-vm-tools/patches/patch-hgfsclient_Makefile.am b/sysutils/open-vm-tools/patches/patch-hgfsclient_Makefile.am
new file mode 100644
index 00000000000..02f6833ca02
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-hgfsclient_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-hgfsclient_Makefile.am,v 1.1 2013/04/01 12:25:17 joerg Exp $
+
+--- hgfsclient/Makefile.am.orig	2008-08-08 07:01:57.000000000 +0000
++++ hgfsclient/Makefile.am
+@@ -25,8 +25,8 @@ vmware_hgfsclient_LDADD += ../lib/hgfsBd
+ vmware_hgfsclient_LDADD += ../lib/rpcOut/libRpcOut.a
+ vmware_hgfsclient_LDADD += ../lib/string/libString.a
+ vmware_hgfsclient_LDADD += ../lib/toolsLogger/libToolsLogger.a
+-vmware_hgfsclient_LDADD += ../lib/vmCheck/libVmCheck.a
+-vmware_hgfsclient_LDADD += ../lib/vmSignal/libVmSignal.a
++vmware_hgfsclient_LDADD += ../lib/vmCheck/libVmCheck.la
++vmware_hgfsclient_LDADD += ../lib/vmSignal/libVmSignal.la
+ # In the absence of the linker options --start-group and --end-group (which can't
+ # be put in LDADD), we need to bring the following libraries out of the alphebetical
+ # order so their symbols are properly resolved.
diff --git a/sysutils/open-vm-tools/patches/patch-lib_vmCheck_Makefile.am b/sysutils/open-vm-tools/patches/patch-lib_vmCheck_Makefile.am
new file mode 100644
index 00000000000..b78c6873a66
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-lib_vmCheck_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_vmCheck_Makefile.am,v 1.1 2013/04/01 12:25:17 joerg Exp $
+
+--- lib/vmCheck/Makefile.am.orig	2008-08-08 07:01:50.000000000 +0000
++++ lib/vmCheck/Makefile.am
+@@ -15,7 +15,6 @@
+ ### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ ################################################################################
+ 
+-noinst_LIBRARIES = libVmCheck.a
++noinst_LTLIBRARIES = libVmCheck.la
+ 
+-libVmCheck_a_SOURCES =
+-libVmCheck_a_SOURCES += vmcheck.c
++libVmCheck_la_SOURCES = vmcheck.c
diff --git a/sysutils/open-vm-tools/patches/patch-lib_vmSignal_Makefile.am b/sysutils/open-vm-tools/patches/patch-lib_vmSignal_Makefile.am
new file mode 100644
index 00000000000..04cf525adb3
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-lib_vmSignal_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_vmSignal_Makefile.am,v 1.1 2013/04/01 12:25:17 joerg Exp $
+
+--- lib/vmSignal/Makefile.am.orig	2013-03-31 21:45:43.000000000 +0000
++++ lib/vmSignal/Makefile.am
+@@ -15,7 +15,7 @@
+ ### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ ################################################################################
+ 
+-noinst_LIBRARIES = libVmSignal.a
++noinst_LTLIBRARIES = libVmSignal.la
+ 
+-libVmSignal_a_SOURCES =
+-libVmSignal_a_SOURCES += vmsignal.c
++libVmSignal_la_SOURCES =
++libVmSignal_la_SOURCES += vmsignal.c
diff --git a/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am b/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am
new file mode 100644
index 00000000000..d8d3bfe61eb
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am
@@ -0,0 +1,20 @@
+$NetBSD: patch-libguestlib_Makefile.am,v 1.1 2013/04/01 12:25:17 joerg Exp $
+
+--- libguestlib/Makefile.am.orig	2008-08-08 07:01:57.000000000 +0000
++++ libguestlib/Makefile.am
+@@ -26,12 +26,14 @@ libguestlib_la_LIBADD += ../lib/stubs/sh
+ # order so their symbols are properly resolved.
+ libguestlib_la_LIBADD += ../lib/message/shared/libMessage.la
+ libguestlib_la_LIBADD += ../lib/backdoor/shared/libBackdoor.la
++libguestlib_la_LIBADD += ../lib/vmCheck/libVmCheck.la
++libguestlib_la_LIBADD += ../lib/vmSignal/libVmSignal.la
+ 
+ libguestlib_la_SOURCES =
+ libguestlib_la_SOURCES += vmGuestLib.c
+ libguestlib_la_SOURCES += vmGuestLibPanic.c
+ 
+-libguestlib_la_LDFLAGS =
++libguestlib_la_LDFLAGS = -no-undefined
+ # We require GCC, so we're fine passing compiler-specific flags.
+ # Needed for OS's that don't link shared libraries against libc by default, e.g. FreeBSD
+ libguestlib_la_LDFLAGS += -Wl,-lc
diff --git a/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am b/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am
new file mode 100644
index 00000000000..285189f54ba
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-scripts_Makefile.am,v 1.1 2013/04/01 12:25:17 joerg Exp $
+
+--- scripts/Makefile.am.orig	2008-08-08 07:01:58.000000000 +0000
++++ scripts/Makefile.am
+@@ -1,7 +1,7 @@
+-confdir = /etc/vmware-tools
++EGDIR = @datarootdir@/examples
++confdir = ${EGDIR}/vmware-tools
+ 
+-conf_SCRIPTS = ./common/vm-support
+-conf_SCRIPTS += $(MODULES_OS)/poweron-vm-default
++conf_SCRIPTS = $(MODULES_OS)/poweron-vm-default
+ conf_SCRIPTS += $(MODULES_OS)/poweroff-vm-default
+ conf_SCRIPTS += $(MODULES_OS)/suspend-vm-default
+ conf_SCRIPTS += $(MODULES_OS)/resume-vm-default
diff --git a/sysutils/open-vm-tools/patches/patch-toolbox_Makefile.am b/sysutils/open-vm-tools/patches/patch-toolbox_Makefile.am
new file mode 100644
index 00000000000..12054e8a712
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-toolbox_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-toolbox_Makefile.am,v 1.1 2013/04/01 12:25:17 joerg Exp $
+
+--- toolbox/Makefile.am.orig	2008-08-08 07:01:57.000000000 +0000
++++ toolbox/Makefile.am
+@@ -26,8 +26,8 @@ COMMON += ../lib/rpcOut/libRpcOut.a
+ COMMON += ../lib/string/libString.a
+ COMMON += ../lib/system/libSystem.a
+ COMMON += ../lib/user/libUser.a
+-COMMON += ../lib/vmCheck/libVmCheck.a
+-COMMON += ../lib/vmSignal/libVmSignal.a
++COMMON += ../lib/vmCheck/libVmCheck.la
++COMMON += ../lib/vmSignal/libVmSignal.la
+ COMMON += ../lib/wiper/libWiper.a
+ # In the absence of the linker options --start-group and --end-group (which
+ # can't be put in LDADD), we need to bring the following libraries out of
diff --git a/sysutils/open-vm-tools/patches/patch-vmware-user_Makefile.am b/sysutils/open-vm-tools/patches/patch-vmware-user_Makefile.am
new file mode 100644
index 00000000000..0d7b6f0e375
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-vmware-user_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-vmware-user_Makefile.am,v 1.1 2013/04/01 12:25:17 joerg Exp $
+
+--- vmware-user/Makefile.am.orig	2013-03-31 21:25:01.000000000 +0000
++++ vmware-user/Makefile.am
+@@ -60,8 +60,8 @@ else
+ endif
+ vmware_user_LDADD += ../lib/user/libUser.a
+ vmware_user_LDADD += ../lib/vixTools/libVixTools.a
+-vmware_user_LDADD += ../lib/vmCheck/libVmCheck.a
+-vmware_user_LDADD += ../lib/vmSignal/libVmSignal.a
++vmware_user_LDADD += ../lib/vmCheck/libVmCheck.la
++vmware_user_LDADD += ../lib/vmSignal/libVmSignal.la
+ vmware_user_LDADD += ../lib/wiper/libWiper.a
+ # In the absence of the linker options --start-group and --end-group (which
+ # can't be put in LDADD), we need to bring the following libraries out of