DESTDIR support. Fix usage of PKG_USERS.

3 files changed, 16 insertions, 16 deletions

diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index add1cbc0edc..665b1c790d8 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/02/10 19:17:45 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/07/11 18:15:47 joerg Exp $
 #
 
 DISTNAME=	munin_${VER}
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://munin.sourceforge.net/
 COMMENT=	System monitoring tool, client version
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 DEPENDS+=	p5-Net-Server>=0:../../net/p5-Net-Server
 DEPENDS+=	p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
 DEPENDS+=	munin-doc>=1.3.1:../../sysutils/munin-doc
@@ -34,12 +36,14 @@ PLIST.not-sunos= yes
 
 PKG_GROUPS_VARS+=	MUNIN_GROUP
 PKG_USERS_VARS+=	MUNIN_USER
+USERGROUP_PHASE=	pre-install
 
 MUNIN_GROUP?=	munin
 MUNIN_USER?=	munin
 
 PKG_GROUPS=	${MUNIN_GROUP}
-PKG_USERS=	${MUNIN_USER}:${MUNIN_GROUP}::Munin\\ user
+PKG_USERS=	${MUNIN_USER}:${MUNIN_GROUP}
+PKG_GECOS.${MUNIN_USER}=	Munin\\ user
 PKG_SYSCONFSUBDIR?=	munin
 REPLACE_PERL+=	node/node.d/*.in
 
@@ -67,7 +71,8 @@ BUILD_TARGET=	build
 
 #MAKE_ENV+=	PERL5_SITELIB=${PERL5_SITELIB}
 MAKE_ENV+=	PREFIX=${PREFIX}
-MAKE_ENV+=	CONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+=	CONFDIR=${DESTDIR}${PKG_SYSCONFDIR}
+INSTALL_MAKE_ENV+=	CONFDIR=${PKG_SYSCONFDIR}
 MAKE_ENV+=	MUNIN_USER=${MUNIN_USER}
 MAKE_ENV+=	MUNIN_GROUP=${MUNIN_GROUP}
 MAKE_ENV+=	PERL5=${PERL5:Q}
@@ -88,14 +93,13 @@ RCD_SCRIPTS+=	munin-node
 EGDIR=		${PREFIX}/share/examples/munin
 
 CONF_FILES+=	${EGDIR}/munin-node.conf ${PKG_SYSCONFDIR}/munin-node.conf
-
+INSTALLATION_DIRS+=	${EGDIR}
 
 pre-configure:
 	cd ${FILESDIR}; ${TAR} cf - . | (cd ${WRKSRC}; ${TAR} xfp -)
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${DESTDIR}${EGDIR}
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/munin-node/distinfo b/sysutils/munin-node/distinfo
index 8f3ff7991c6..be41829ab2e 100644
--- a/sysutils/munin-node/distinfo
+++ b/sysutils/munin-node/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2009/02/17 18:58:34 joerg Exp $
+$NetBSD: distinfo,v 1.7 2010/07/11 18:15:47 joerg Exp $
 
 SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a
 RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4
 Size (munin_1.3.2.tar.gz) = 309319 bytes
-SHA1 (patch-aa) = df9b128721166912c086a54b29b7971a00581ea0
+SHA1 (patch-aa) = 5eaf9bdf345cddb8af221b6c0bc34f84b27c4f1b
 SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80
 SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e
 SHA1 (patch-ad) = a584035e8c2f1839e6dda2a9483004753db01e87
diff --git a/sysutils/munin-node/patches/patch-aa b/sysutils/munin-node/patches/patch-aa
index cede4fe637c..4298be3c7d7 100644
--- a/sysutils/munin-node/patches/patch-aa
+++ b/sysutils/munin-node/patches/patch-aa
@@ -1,17 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2006/07/21 23:28:37 abs Exp $
+$NetBSD: patch-aa,v 1.3 2010/07/11 18:15:47 joerg Exp $
 
 --- Makefile.config.orig	2005-01-10 10:38:22.000000000 +0000
 +++ Makefile.config
-@@ -7,32 +7,36 @@
+@@ -7,32 +7,32 @@
  #
  # the base of the Munin installation.
  # 
 -PREFIX     = $(DESTDIR)/opt/munin
-+ifdef $(PREFIX)
-+UPREFIX=$(PREFIX)
-+else
-+UPREFIX=/usr/pkg
-+endif
++UPREFIX=${DESTDIR}$(PREFIX)
  
  # Where Munin keeps its configurations (server.conf, client.conf, ++)
 -CONFDIR    = $(DESTDIR)/etc/opt/munin
@@ -31,7 +27,7 @@ $NetBSD: patch-aa,v 1.2 2006/07/21 23:28:37 abs Exp $
  
  # Where to put man pages
 -MANDIR     = $(PREFIX)/man
-+MANDIR     = $(UPREFIX)/man
++MANDIR     = $(UPREFIX)/${PKGMANDIR}
  
  # Where to put internal binaries and plugin repository
 -LIBDIR     = $(PREFIX)/lib