Fix DESTDIR build (OWN_DIRS specified incorrectly).

Add full lists of dirs to INSTALLATION_DIRS and patch away directory
creation from Makefile fragments.
Use dansgrdn:dansgrdn for user:group instead of nobody:nobody
Bump PKGREVISION

7 files changed, 177 insertions, 8 deletions

diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index a07883c4579..f6a3620f108 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/03/08 12:49:35 sborrill Exp $
+# $NetBSD: Makefile,v 1.9 2010/03/29 19:38:54 sborrill Exp $
 
 DISTNAME=	dansguardian-${VERSION}.source
 PKGNAME=	dansguardian-${VERSION}
 VERSION=	2.8.0.6
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://dansguardian.org/downloads/2/Stable/
 
@@ -18,6 +18,8 @@ HAS_CONFIGURE=	yes
 MANCOMPRESSED=	yes
 RCD_SCRIPTS+=	dansguardian
 
+BUILD_DEFS+=	VARBASE
+
 PKG_SYSCONFSUBDIR=	dansguardian
 
 EGDIR=		${PREFIX}/share/examples/dansguardian
@@ -36,10 +38,19 @@ SUBST_MESSAGE.perlpath=	Fixing path to perl executable
 SUBST_FILES.perlpath=	*.pl
 SUBST_SED.perlpath=	-e 's,/usr/bin,${PREFIX}/bin,g'
 
-DANSGUARDIAN_USER?=	nobody
-DANSGUARDIAN_GROUP?=	nobody
+DANSGUARDIAN_USER?=	dansgrdn
+DANSGUARDIAN_GROUP?=	dansgrdn
+
+PKG_USERS_VARS+=		DANSGUARDIAN_USER
+PKG_GROUPS_VARS+=		DANSGUARDIAN_GROUP
+
+PKG_GROUPS=			${DANSGUARDIAN_GROUP}
+PKG_USERS=			${DANSGUARDIAN_USER}:${DANSGUARDIAN_GROUP}
+PKG_GECOS.${DANSGUARDIAN_USER}=	Dansguardian webfilter pseudo-user
 
-INSTALLATION_DIRS=	share/examples/dansguardian
+INSTALLATION_DIRS=	sbin libexec/cgi-bin ${PKGMANDIR}/man8
+INSTALLATION_DIRS+=	share/examples/dansguardian/phraselists
+INSTALLATION_DIRS+=	share/examples/dansguardian/languages
 
 CONFIGURE_ARGS=		--prefix=${PREFIX:Q} \
 			--cgidir=/libexec/cgi-bin/ \
@@ -147,15 +158,17 @@ LANGUAGEDIRS=	arspanish bulgarian chinesebig5 chinesegb2312 \
 		swedish turkish ukenglish
 
 .for d in ${PHRASEDIRS}
-OWN_DIRS+=	${DESTDIR}${PKG_SYSCONFDIR}/phraselists/${d}
+OWN_DIRS+=	${PKG_SYSCONFDIR}/phraselists/${d}
+INSTALLATION_DIRS+=	share/examples/dansguardian/phraselists/${d}
 .endfor
 
 .for d in ${LANGUAGEDIRS}
-OWN_DIRS+=	${DESTDIR}${PKG_SYSCONFDIR}/languages/${d}
+OWN_DIRS+=	${PKG_SYSCONFDIR}/languages/${d}
 CONF_FILES+=	${EGDIR}/languages/${d}/messages \
 		${PKG_SYSCONFDIR}/languages/${d}/messages
 CONF_FILES+=	${EGDIR}/languages/${d}/template.html \
 		${PKG_SYSCONFDIR}/languages/${d}/template.html
+INSTALLATION_DIRS+=	share/examples/dansguardian/languages/${d}
 .endfor
 
 show-conffiles:
diff --git a/www/dansguardian/distinfo b/www/dansguardian/distinfo
index e9524f310df..60695fb490d 100644
--- a/www/dansguardian/distinfo
+++ b/www/dansguardian/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.2 2009/07/21 05:31:46 hasso Exp $
+$NetBSD: distinfo,v 1.3 2010/03/29 19:38:54 sborrill Exp $
 
 SHA1 (dansguardian-2.8.0.6.source.tar.gz) = 6d82eed13536a64a2f6711fa221756fa0bfe19f0
 RMD160 (dansguardian-2.8.0.6.source.tar.gz) = cf3493b26b4fcd5b366a6fe472e3c6c9e3cfe6d3
 Size (dansguardian-2.8.0.6.source.tar.gz) = 212737 bytes
 SHA1 (patch-aa) = c4af2622ee48dedb15f5a22874c1c1bff5ea51ef
+SHA1 (patch-fbsd.in) = c030c845e66225212052012e09d81f3b8817d97c
+SHA1 (patch-linux.in) = 2ea47d4f5c5787302cc983939ea2454df29da5ef
+SHA1 (patch-nbsd.in) = e1d4fa9d7a839b1458c0bacdea30f70112c67a75
+SHA1 (patch-obsd.in) = 0002cc48b4e7201add7546e40b0a6f4fba70fe4e
+SHA1 (patch-solaris.in) = aaa8b67f398a2b56d7679f5c636d14aee1bfe3e7
diff --git a/www/dansguardian/patches/patch-fbsd.in b/www/dansguardian/patches/patch-fbsd.in
new file mode 100644
index 00000000000..d8a8a9b8906
--- /dev/null
+++ b/www/dansguardian/patches/patch-fbsd.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-fbsd.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $
+
+--- autoconf/fbsd.in.orig	2005-08-14 00:47:57.000000000 +0100
++++ autoconf/fbsd.in	2010-03-29 20:16:46.000000000 +0100
+@@ -43,14 +43,6 @@
+ 	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
+ 
+ install:
+-	@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATION)
+-	@test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFILELOCATION)
+-	@test -d $I$(CONFFILELOCATION)phraselists || install -d $I$(CONFFILELOCATION)phraselists
+-	@test -d $I$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
+-	@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION)
+-	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
+-	@test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION)
+-	@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION)
+ 	cp -f ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist
+ 	cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf
+ 	cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
+@@ -81,10 +73,6 @@
+ 	cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
+ 	chmod o+x $I$(CGIBINLOCATION)dansguardian.pl
+ 	cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz
+-	chown -R $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION)
+-	chmod -R u+wr $I$(LOGLOCATION)
+-	chmod -R og-w $I$(LOGLOCATION)
+-	chmod u+wrx $I$(LOGLOCATION)
+ 	if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi
+ 
+ uninstall:
diff --git a/www/dansguardian/patches/patch-linux.in b/www/dansguardian/patches/patch-linux.in
new file mode 100644
index 00000000000..76e1465989f
--- /dev/null
+++ b/www/dansguardian/patches/patch-linux.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-linux.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $
+
+--- autoconf/linux.in.orig	2005-08-14 00:47:57.000000000 +0100
++++ autoconf/linux.in	2010-03-29 20:16:54.000000000 +0100
+@@ -47,14 +47,6 @@
+ 	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
+ 
+ install:
+-	@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATION)
+-	@test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFILELOCATION)
+-	@test -d $I$(CONFFILELOCATION)phraselists || install -d $I$(CONFFILELOCATION)phraselists
+-	@test -d $I$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
+-	@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION)
+-	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
+-	@test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION)
+-	@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION)
+ 	cp -f ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist
+ 	cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf
+ 	cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
+@@ -85,10 +77,6 @@
+ 	cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
+ 	chmod o+x $I$(CGIBINLOCATION)dansguardian.pl
+ 	cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz
+-	chown -R $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION)
+-	chmod -R u+wr $I$(LOGLOCATION)
+-	chmod -R og-w $I$(LOGLOCATION)
+-	chmod u+wrx $I$(LOGLOCATION)
+ 	if [ -f $(CHKCONF) ]; then $(CHKCONFIG); fi
+ 	if [ -f $(DEB_RC) ]; then $(DEB_RC) dansguardian defaults 50; fi
+ 	if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi
diff --git a/www/dansguardian/patches/patch-nbsd.in b/www/dansguardian/patches/patch-nbsd.in
new file mode 100644
index 00000000000..dc3ab0cc7cc
--- /dev/null
+++ b/www/dansguardian/patches/patch-nbsd.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-nbsd.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $
+
+--- autoconf/nbsd.in.orig	2005-08-14 00:47:57.000000000 +0100
++++ autoconf/nbsd.in	2010-03-29 20:16:51.000000000 +0100
+@@ -42,14 +42,6 @@
+ 	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
+ 
+ install:
+-	@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATION)
+-	@test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFILELOCATION)
+-	@test -d $I$(CONFFILELOCATION)phraselists || install -d $I$(CONFFILELOCATION)phraselists
+-	@test -d $I$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
+-	@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION)
+-	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
+-	@test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION)
+-	@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION)
+ 	cp -f ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist
+ 	cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf
+ 	cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
+@@ -80,10 +72,6 @@
+ 	cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
+ 	chmod o+x $I$(CGIBINLOCATION)dansguardian.pl
+ 	cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz
+-	chown -R $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION)
+-	chmod -R u+wr $I$(LOGLOCATION)
+-	chmod -R og-w $I$(LOGLOCATION)
+-	chmod u+wrx $I$(LOGLOCATION)
+ 	if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi
+ 
+ uninstall:
diff --git a/www/dansguardian/patches/patch-obsd.in b/www/dansguardian/patches/patch-obsd.in
new file mode 100644
index 00000000000..855fb337812
--- /dev/null
+++ b/www/dansguardian/patches/patch-obsd.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-obsd.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $
+
+--- autoconf/obsd.in.orig	2005-08-14 00:47:57.000000000 +0100
++++ autoconf/obsd.in	2010-03-29 20:16:49.000000000 +0100
+@@ -44,14 +44,6 @@
+ 	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
+ 
+ install:
+-	@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATION)
+-	@test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFILELOCATION)
+-	@test -d $I$(CONFFILELOCATION)phraselists || install -d $I$(CONFFILELOCATION)phraselists
+-	@test -d $I$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
+-	@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION)
+-	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
+-	@test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION)
+-	@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION)
+ 	cp -f ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist
+ 	cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf
+ 	cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
+@@ -82,10 +74,6 @@
+ 	cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
+ 	chmod o+x $I$(CGIBINLOCATION)dansguardian.pl
+ 	cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz
+-	chown -R $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION)
+-	chmod -R u+wr $I$(LOGLOCATION)
+-	chmod -R og-w $I$(LOGLOCATION)
+-	chmod u+wrx $I$(LOGLOCATION)
+ 	if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi
+ 
+ uninstall:
diff --git a/www/dansguardian/patches/patch-solaris.in b/www/dansguardian/patches/patch-solaris.in
new file mode 100644
index 00000000000..7c7d49a111f
--- /dev/null
+++ b/www/dansguardian/patches/patch-solaris.in
@@ -0,0 +1,31 @@
+$NetBSD: patch-solaris.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $
+
+--- autoconf/solaris.in.orig	2005-08-14 00:47:57.000000000 +0100
++++ autoconf/solaris.in	2010-03-29 20:17:06.000000000 +0100
+@@ -42,14 +42,6 @@
+ 	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
+ 
+ install:
+-	@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATION)
+-	@test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFILELOCATION)
+-	@test -d $I$(CONFFILELOCATION)phraselists || install -d $I$(CONFFILELOCATION)phraselists
+-	@test -d $I$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
+-	@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION)
+-	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
+-	@test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION)
+-	@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION)
+ 	cp -f ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist
+ 	cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf
+ 	cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
+@@ -80,11 +72,6 @@
+ 	cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
+ 	chmod o+x $I$(CGIBINLOCATION)dansguardian.pl
+ 	cp -f ./dansguardian.8 $I$(MANUALFILES)man8/dansguardian.8
+-	chmod -R u+wr $I$(LOGLOCATION)
+-	chmod -R og-w $I$(LOGLOCATION)
+-	chmod u+wrx $I$(LOGLOCATION)
+-	chgrp -R $(PROXYGROUP) $I$(LOGLOCATION)
+-	chown -R $(PROXYUSER) $I$(LOGLOCATION)
+ 	$(CHKCONFIG)
+ 	if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi
+