Correctly use config file framework for wwwoffle.conf, also move

it under share/examples/wwwoffle like all other packages do.
Bump revision.

4 files changed, 30 insertions, 12 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index d9f17345022..fdea6caab7b 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2006/04/11 08:10:40 joerg Exp $
 
 DISTNAME=	wwwoffle-2.8e
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.gedanken.freeserve.co.uk/download-wwwoffle/ \
 		ftp://ftp.ibiblio.org/pub/Linux/apps/www/servers/
@@ -18,6 +18,8 @@ CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle
 
 PKG_SYSCONFSUBDIR= 	wwwoffle
+CONF_FILES+=		${PREFIX}/share/examples/wwwoffle/wwwoffle.conf ${PKG_SYSCONFDIR}/wwwoffle.conf
+CONF_FILES_MODE=	0640
 PLIST_SUBST+=		GZIP_CMD=${GZIP_CMD:Q}
 
 RCD_SCRIPTS=		wwwoffled
@@ -41,13 +43,6 @@ pre-install:
 	${MKDIR} ${VARBASE}/wwwoffle/prevtime1
 
 post-install:
-	if [ -f ${PKG_SYSCONFDIR}/wwwoffle.conf.install ]; then \
-		${CP} -p ${PKG_SYSCONFDIR}/wwwoffle.conf.install \
-		  ${PREFIX}/share/examples/wwwoffle.conf; \
-	elif [ -f ${PKG_SYSCONFDIR}/wwwoffle.conf ]; then \
-		${CP} -p ${PKG_SYSCONFDIR}/wwwoffle.conf \
-		  ${PREFIX}/share/examples/wwwoffle.conf; \
-	fi
 	${INSTALL_PROGRAM} ${WRKSRC}/src/convert-cache \
 	  ${PREFIX}/sbin/wwwoffle-convert-cache
 	${INSTALL_PROGRAM} ${WRKSRC}/src/uncompress-cache \
diff --git a/www/wwwoffle/PLIST b/www/wwwoffle/PLIST
index 7ab9877fac9..a74cea8e2b0 100644
--- a/www/wwwoffle/PLIST
+++ b/www/wwwoffle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/11/01 12:22:24 abs Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/04/11 08:10:41 joerg Exp $
 bin/wwwoffle
 bin/wwwoffle-hash
 bin/wwwoffle-ls
@@ -60,7 +60,7 @@ share/doc/wwwoffle/pl/LSM
 share/doc/wwwoffle/pl/README.1st
 share/doc/wwwoffle/pl/README.lang
 share/examples/rc.d/wwwoffled
-share/examples/wwwoffle.conf
+share/examples/wwwoffle/wwwoffle.conf
 @unexec ${RMDIR} %D/share/doc/wwwoffle/ru 2>/dev/null || ${TRUE}
 @dirrm share/doc/wwwoffle/pl
 @unexec ${RMDIR} %D/share/doc/wwwoffle/nl 2>/dev/null || ${TRUE}
@@ -69,6 +69,7 @@ share/examples/wwwoffle.conf
 @dirrm share/doc/wwwoffle/es
 @dirrm share/doc/wwwoffle/de
 @dirrm share/doc/wwwoffle
+@dirrm share/examples/wwwoffle
 @exec gzip -d -c %D/libdata/wwwoffle-spool.tar.gz | tar xzCf /
 @unexec cd /var/wwwoffle && ${RM} -rf html* search*
 @unexec ${RMDIR} /var/wwwoffle/* 2>/dev/null && ${RMDIR} /var/wwwoffle 2>/dev/null || ${TRUE}
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index ed7d306de05..587417dcd1f 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.22 2005/05/07 11:02:48 abs Exp $
+$NetBSD: distinfo,v 1.23 2006/04/11 08:10:41 joerg Exp $
 
 SHA1 (wwwoffle-2.8e.tgz) = 719cc53a2c66c14aa7dfcb6ca0ef9f033b454bd9
 RMD160 (wwwoffle-2.8e.tgz) = a9243f0c2aab2c735ce355ee81d3a802e8d797dc
 Size (wwwoffle-2.8e.tgz) = 1015694 bytes
 SHA1 (patch-aa) = 897de385a47826e16a8a09b1bc1c207a2d350f94
+SHA1 (patch-ab) = 7f73e34c6f80ee5febadbe2da3fbda9499226490
diff --git a/www/wwwoffle/patches/patch-ab b/www/wwwoffle/patches/patch-ab
new file mode 100644
index 00000000000..1b4735b6dfb
--- /dev/null
+++ b/www/wwwoffle/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.11 2006/04/11 08:10:41 joerg Exp $
+
+--- conf/Makefile.in.orig	2006-04-10 16:42:27.000000000 +0000
++++ conf/Makefile.in
+@@ -23,7 +23,7 @@ SHELL=/bin/sh
+ prefix=@prefix@
+ 
+ SPOOLDIR=$(DESTDIR)@SPOOLDIR@
+-CONFDIR=$(DESTDIR)@CONFDIR@
++CONFDIR=$(DESTDIR)$(prefix)/share/examples/wwwoffle
+ 
+ REAL_SPOOLDIR=@SPOOLDIR@
+ REAL_CONFDIR=@CONFDIR@
+@@ -45,6 +45,7 @@ compile : conf-file
+ ######## INSTALLATION ########
+ 
+ install : compile
++	
+ 	sed -e 's%SPOOLDIR%$(REAL_SPOOLDIR)%' -e 's%CONFDIR%$(REAL_CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install
+ 	[ -x $(CONFDIR) ] || $(INSTALL) -d -m 750 $(CONFDIR)
+ 	@[ ! -f $(DESTDIR)/etc/wwwoffle.conf ] || \