Fix ignoring configuration file, tools.conf.

* Specify sysconfdir as configure's command line option.
* Do not patch lib/guestApp/Makefile.in but lib/guestApp/Makefile.am.

Bump PKGREVISION.

4 files changed, 18 insertions, 18 deletions

diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile
index 08450872a1d..e6ae70c82da 100644
--- a/sysutils/open-vm-tools/Makefile
+++ b/sysutils/open-vm-tools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2015/04/25 14:24:54 tnn Exp $
+# $NetBSD: Makefile,v 1.52 2015/08/29 15:42:36 taca Exp $
 
 DISTNAME=	open-vm-tools-2008.08.08-109361
 PKGNAME=	open-vm-tools-2008.08.08.109361
-PKGREVISION=	40
+PKGREVISION=	41
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=open-vm-tools/}
 
@@ -19,7 +19,7 @@ USE_TOOLS+=	pkg-config autoconf automake
 
 PLIST_SRC=	PLIST.common
 
-CONFIGURE_ARGS+=		--disable-unity
+CONFIGURE_ARGS+=		--disable-unity --sysconfdir=${PKG_SYSCONFDIR:Q}
 
 INSTALLATION_DIRS+=		${PKG_SYSCONFDIR} share/examples/vmware-tools
 
@@ -29,7 +29,7 @@ CONF_FILES_PERMS+=		${EGDIR}/poweroff-vm-default ${PKG_SYSCONFDIR}/poweroff-vm-d
 CONF_FILES_PERMS+=		${EGDIR}/poweron-vm-default ${PKG_SYSCONFDIR}/poweron-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 CONF_FILES_PERMS+=		${EGDIR}/resume-vm-default ${PKG_SYSCONFDIR}/resume-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 CONF_FILES_PERMS+=		${EGDIR}/suspend-vm-default ${PKG_SYSCONFDIR}/suspend-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
-CONF_FILES_PERMS+=		${EGDIR}/tools.conf ${PKG_SYSCONFDIR}/tools.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+CONF_FILES_PERMS+=		${EGDIR}/tools.conf ${PKG_SYSCONFDIR}/tools.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
 RCD_SCRIPTS=			vmtools
 
 pre-configure:
diff --git a/sysutils/open-vm-tools/distinfo b/sysutils/open-vm-tools/distinfo
index de34e13d723..e322a4be215 100644
--- a/sysutils/open-vm-tools/distinfo
+++ b/sysutils/open-vm-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2013/11/11 16:42:38 joerg Exp $
+$NetBSD: distinfo,v 1.9 2015/08/29 15:42:36 taca Exp $
 
 SHA1 (open-vm-tools-2008.08.08-109361.tar.gz) = 1c44c3524cd9cbc5870f1c6065b03a6b31859a25
 RMD160 (open-vm-tools-2008.08.08-109361.tar.gz) = 4ea0a6aa2edda2bc404c865dc5b58f3a177ae411
@@ -12,7 +12,6 @@ SHA1 (patch-ah) = 18577d28bea81a036495d3f86b4713b8a1003fdc
 SHA1 (patch-ai) = 59cdf9ae813aa9ac0cf5920e19cbfd23b720b50b
 SHA1 (patch-aj) = ee2e2bfc5f976d00fb4a830184e37427852a90d3
 SHA1 (patch-ak) = d27cd0cbbf2db45a07a8bf4a006ad5e28feb8b3a
-SHA1 (patch-al) = 0342d300f6c27a3a523f80f06d087c60c68b9a53
 SHA1 (patch-am) = a4d678ad7e163de381a547cad1c24bca08c72a73
 SHA1 (patch-an) = abd94ec83c54e4ee1e64a34996db21ce86cf7ae3
 SHA1 (patch-ao) = 5d6457e994f559fd826811644d2e77f46ce10d1e
@@ -56,6 +55,7 @@ SHA1 (patch-checkvm_checkvm.c) = 1da596cf11ccb9af1ba39013775a3a6b3a85345f
 SHA1 (patch-configure.ac) = d39767cc2006088203341782fca7895c2710fd55
 SHA1 (patch-guestd_Makefile.am) = 4855efa62b6633e23c11e3ea184f60f4c6952244
 SHA1 (patch-hgfsclient_Makefile.am) = 3b6adf9e4d88bcce2c191260b669615537927e28
+SHA1 (patch-lib_guestApp_Makefile.am) = b6fb86b15fa58ff87285ab591be1870cf79a5d18
 SHA1 (patch-lib_hgfsServer_hgfsServer.c) = 68a3102d4f53626717f64284eb5e51bfb584e783
 SHA1 (patch-lib_hgfsServer_hgfsServerLinux.c) = ef5a3135a8e4dc9f16d93d6eb7d88b8194aa0907
 SHA1 (patch-lib_panic_panic.c) = f784479ef9000e67389c04ca80ad22da5e3a2165
diff --git a/sysutils/open-vm-tools/patches/patch-al b/sysutils/open-vm-tools/patches/patch-al
deleted file mode 100644
index 1abf9d6e092..00000000000
--- a/sysutils/open-vm-tools/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.2 2008/08/31 06:36:48 scottr Exp $
-
---- lib/guestApp/Makefile.in.orig	2008-08-08 02:02:08.000000000 -0500
-+++ lib/guestApp/Makefile.in
-@@ -248,6 +248,7 @@ libGuestApp_a_SOURCES = guestApp.c guest
- @HAVE_X11_TRUE@libGuestAppX11_a_SOURCES = $(libGuestApp_a_SOURCES) \
- @HAVE_X11_TRUE@	guestAppPosixX11.c
- @HAVE_X11_TRUE@libGuestAppX11_a_CPPFLAGS = -DGUESTAPP_HAS_X11
-+CFLAGS += -DGUESTAPP_TOOLS_INSTALL_PATH=\"$(sysconfdir)/vmware-tools\"
- all: all-am
- 
- .SUFFIXES:
diff --git a/sysutils/open-vm-tools/patches/patch-lib_guestApp_Makefile.am b/sysutils/open-vm-tools/patches/patch-lib_guestApp_Makefile.am
new file mode 100644
index 00000000000..04efee4e61c
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-lib_guestApp_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_guestApp_Makefile.am,v 1.1 2015/08/29 15:42:36 taca Exp $
+
+Honor sysconfdir.
+
+--- lib/guestApp/Makefile.am.orig	2008-08-08 07:01:49.000000000 +0000
++++ lib/guestApp/Makefile.am
+@@ -32,3 +32,5 @@ libGuestAppX11_a_SOURCES = $(libGuestApp
+ libGuestAppX11_a_SOURCES += guestAppPosixX11.c
+ libGuestAppX11_a_CPPFLAGS = -DGUESTAPP_HAS_X11
+ endif
++
++CFLAGS += -DGUESTAPP_TOOLS_INSTALL_PATH=\"$(sysconfdir)/vmware-tools\"