* Use the pkginstall framework for INSTALL/DEINSTALL scripts.

* Honor PKG_SYSCONFDIR, VARBASE, and PKGMANDIR.

Bump the PKGREVISION to 1.

5 files changed, 17 insertions, 26 deletions

diff --git a/www/wwwcount/DEINSTALL b/www/wwwcount/DEINSTALL
deleted file mode 100644
index a0b1fa0b1e3..00000000000
--- a/www/wwwcount/DEINSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-DEINSTALL" ]
-then
-    echo
-    echo ========================================================
-    echo If you don\'t need wwwcount\'s logs anymore, please delete
-    echo /var/log/wwwcount.
-    echo ========================================================
-fi
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index 93606d96129..a621a8a2cf9 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/19 19:48:21 jlam Exp $
 
 DISTNAME=       wwwcount2.5
 PKGNAME=        wwwcount-2.5
+PKGREVISION=	1
 CATEGORIES=     www
 MASTER_SITES=   ${MASTER_SITE_BACKUP}
 
@@ -9,22 +10,25 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.muquit.com/muquit/software/Count/Count.html
 COMMENT=	Graphical access counter, clock and date indicator for WWW pages
 
-GNU_CONFIGURE=  yes
-INSTALLATION_DIRS=	bin man/man1 share/doc/wwwcount/Count2.5/images \
-			share/doc/wwwcount/Count2.5/eximages share/examples
+GNU_CONFIGURE=		yes
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1				\
+			share/doc/wwwcount/Count2.5/images		\
+			share/doc/wwwcount/Count2.5/eximages		\
+			share/examples
 
-DEINSTALL_SRC=	${PKGDIR}/DEINSTALL
-INSTALL_SRC=	# empty
+CONF_FILES_PERMS=	/dev/null ${VARBASE}/log/wwwcount nobody nogroup 0644
+CONF_FILES=		${PREFIX}/share/examples/wwwcount.conf		\
+			${PKG_SYSCONFDIR}/wwwcount.conf
 
 pre-configure:
-	cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} VARBASE=${VARBASE} ./Count-config
+	cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} PKG_SYSCONFDIR=${PKG_SYSCONFDIR} VARBASE=${VARBASE} ./Count-config
 
 do-install:
 	cd ${WRKSRC}; yes "" | ./Count-install
 	${INSTALL_DATA} ${FILESDIR}/wwwcount.conf ${PREFIX}/share/examples
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/extdgts/extdgts ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/mkstrip/mkstrip ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/utils/mkstrip/mkstrip.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/utils/mkstrip/mkstrip.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/blues.gif ${PREFIX}/share/doc/wwwcount
 	${INSTALL_MAN} ${WRKSRC}/docs/Count.html ${PREFIX}/share/doc/wwwcount
 	( cd ${PREFIX}/share/doc/wwwcount && ${LN} -s Count.html index.html )
diff --git a/www/wwwcount/PLIST b/www/wwwcount/PLIST
index 4e21977d197..d6c713fffba 100644
--- a/www/wwwcount/PLIST
+++ b/www/wwwcount/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:05 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/07/19 19:48:21 jlam Exp $
 bin/mkstrip
 bin/extdgts
 libdata/wwwcount/digits/A/peng.gif
@@ -83,10 +83,7 @@ share/doc/wwwcount/Count2.5/eximages/ex2_589754.gif
 share/doc/wwwcount/Count2.5/eximages/ex2_594028.gif
 share/doc/wwwcount/Count2.5/eximages/ex2_598302.gif
 share/examples/wwwcount.conf
-@exec if [ ! -f %D/etc/wwwcount.conf ]; then cp -p %D/share/examples/wwwcount.conf %D/etc/wwwcount.conf; fi
 man/man1/mkstrip.1
-@exec touch /var/log/wwwcount
-@exec ${CHOWN} nobody.nogroup /var/log/wwwcount
 @dirrm libdata/wwwcount/digits/A
 @dirrm libdata/wwwcount/digits/B
 @dirrm libdata/wwwcount/digits/C
diff --git a/www/wwwcount/distinfo b/www/wwwcount/distinfo
index 0ecce81e6b5..d70a4511625 100644
--- a/www/wwwcount/distinfo
+++ b/www/wwwcount/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/10/01 17:25:32 minskim Exp $
+$NetBSD: distinfo,v 1.5 2006/07/19 19:48:21 jlam Exp $
 
 SHA1 (wwwcount2.5.tar.gz) = 374babfc93db3092eda13bda5fd65a372beca4bb
 RMD160 (wwwcount2.5.tar.gz) = 354c92ab5e0f8ec2acd484108fa968a5bfb6e62a
 Size (wwwcount2.5.tar.gz) = 441215 bytes
-SHA1 (patch-aa) = 1a3d7bbbb3013dce2fbb0b3e4ade9ab98bdf9ba2
+SHA1 (patch-aa) = 2c1db53763365a08e32e9724efd3148994af9963
 SHA1 (patch-ab) = f6f71b1428506ab565f127c38096b65408f5bc53
 SHA1 (patch-ae) = e950e48c2f9a8f3da27c8b51267a52d7a7bd704e
diff --git a/www/wwwcount/patches/patch-aa b/www/wwwcount/patches/patch-aa
index b2a2903aa47..2cde807c0b5 100644
--- a/www/wwwcount/patches/patch-aa
+++ b/www/wwwcount/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2005/10/01 17:25:32 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2006/07/19 19:48:21 jlam Exp $
 
 --- Count-config.orig	1999-01-03 15:07:58.000000000 -0800
 +++ Count-config
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.4 2005/10/01 17:25:32 minskim Exp $
 -RgbFile="./data/rgb.txt"
 +BaseDir="${PREFIX}/etc"
 +LibDir="${PREFIX}/libdata/wwwcount"
-+ConfigDir="${PREFIX}/etc"
++ConfigDir="${PKG_SYSCONFDIR}"
 +ConfFile="wwwcount.conf"
 +DigitDir="$LibDir/digits"
 +DataDir="${VARBASE}/db/wwwcount"