honor PKG_SYSCONFDIR - increment PKGREVISION

5 files changed, 21 insertions, 19 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 7396649a1d5..2940a63a64e 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2002/05/15 06:18:52 tron Exp $
+# $NetBSD: Makefile,v 1.34 2002/07/11 10:23:13 abs Exp $
 
 DISTNAME=       analog-5.23
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=   ${HOMEPAGE} \
 		http://www.web42.com/analog/ \
@@ -12,10 +13,13 @@ HOMEPAGE=	http://www.analog.cx/
 COMMENT=	Extremely fast program for analysing WWW logfiles
 
 ALL_TARGET=	analog
-MAKE_ENV+=	PREFIX=${PREFIX}
+MAKE_ENV+=	PREFIX=${PREFIX} SYSCONFDIR=${PKG_SYSCONFDIR}
 WRKDISTDIR=	${WRKDIR}/${DISTNAME}
 WRKSRC=		${WRKDISTDIR}/src
 
+EGDIR=		${PREFIX}/share/examples
+CONF_FILES=	${EGDIR}/analog.cfg ${PKG_SYSCONFDIR}/analog.cfg
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKDISTDIR}/analog ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDISTDIR}/analog.man ${PREFIX}/man/man1/analog.1
@@ -26,9 +30,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDISTDIR}/images/* ${PREFIX}/lib/analog/images
 	${INSTALL_DATA} ${WRKDISTDIR}/lang/* ${PREFIX}/lib/analog/lang
 	${INSTALL_DATA} -m 644 ${WRKDISTDIR}/analog.cfg \
-	  ${PREFIX}/etc/analog.cfg.default
-	${TEST} -f ${PREFIX}/etc/analog.cfg || \
-	${INSTALL_DATA} -m 644 ${WRKDISTDIR}/analog.cfg \
-	  ${PREFIX}/etc/analog.cfg
+	  ${PREFIX}/share/examples/analog.cfg
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/analog/PLIST b/www/analog/PLIST
index 5fcaf393104..a3662a7a767 100644
--- a/www/analog/PLIST
+++ b/www/analog/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2002/05/15 06:18:52 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/07/11 10:23:13 abs Exp $
 bin/analog
-etc/analog.cfg.default
+share/examples/analog.cfg
 @exec test -f %D/etc/analog.cfg || cp -p %D/%F %D/etc/analog.cfg
 lib/analog/images/analogo.gif
 lib/analog/images/analogo.png
diff --git a/www/analog/distinfo b/www/analog/distinfo
index bc4791d7f75..0a63d5094f3 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2002/05/15 06:18:52 tron Exp $
+$NetBSD: distinfo,v 1.13 2002/07/11 10:23:13 abs Exp $
 
 SHA1 (analog-5.23.tar.gz) = 323a6baf050d9e452d481305581338d2483b3b24
 Size (analog-5.23.tar.gz) = 980399 bytes
-SHA1 (patch-aa) = cc7879420cf9233db58908958f5380636d256656
-SHA1 (patch-ab) = f11c9d3f5dec5b9cd04de0d114752c58484a648a
+SHA1 (patch-aa) = 50134d5f7a35aecdf1704b22126e07df5c0104ef
+SHA1 (patch-ab) = 46e51dbfe117e7ced6ee44321da82d291bebff24
diff --git a/www/analog/patches/patch-aa b/www/analog/patches/patch-aa
index 5cb92167640..9ec347b800c 100644
--- a/www/analog/patches/patch-aa
+++ b/www/analog/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.21 2002/02/13 13:03:14 tron Exp $
+$NetBSD: patch-aa,v 1.22 2002/07/11 10:23:13 abs Exp $
 
---- Makefile.orig	Wed Feb 13 10:45:52 2002
-+++ Makefile	Wed Feb 13 13:54:55 2002
+--- Makefile.orig	Tue May 14 21:20:07 2002
++++ Makefile
 @@ -2,15 +2,20 @@
  # Please read docs/Readme.html, or http://www.analog.cx/
  # This is a general Unix-like Makefile: Makefiles for other OS's can be found
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.21 2002/02/13 13:03:14 tron Exp $
  #                 NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp 
 -DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
 +DEFS =	-DANALOGDIR=\"${PREFIX}/lib/analog/\" \
-+	-DDEFAULTCONFIGFILE=\"${PREFIX}/etc/analog.cfg\" \
++	-DDEFAULTCONFIGFILE=\"${SYSCONFDIR}/analog.cfg\" \
 +	-DIMAGEDIR=\"/images/\" \
 +	-DLANGDIR=\"${PREFIX}/lib/analog/lang/\" \
 +	-DLOGFILE=\"/var/log/httpd-access.log\"
diff --git a/www/analog/patches/patch-ab b/www/analog/patches/patch-ab
index f494813826c..69573406d64 100644
--- a/www/analog/patches/patch-ab
+++ b/www/analog/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 1999/11/23 13:20:10 agc Exp $
+$NetBSD: patch-ab,v 1.5 2002/07/11 10:23:13 abs Exp $
 
---- tree.c	1999/11/23 13:06:38	1.1
-+++ tree.c	1999/11/23 13:08:49
-@@ -781,8 +781,16 @@
+--- tree.c.orig	Tue May 14 21:20:08 2002
++++ tree.c
+@@ -883,8 +883,16 @@
      }
      else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL)
        *name = "Unix:Linux";