Honour PKG_SYSCONFDIR. Bump PKGREVISION to 1.

5 files changed, 27 insertions, 18 deletions

diff --git a/security/tripwire/MESSAGE b/security/tripwire/MESSAGE
index a6336e2ec79..44490050e0b 100644
--- a/security/tripwire/MESSAGE
+++ b/security/tripwire/MESSAGE
@@ -1,12 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 01:18:00 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2003/05/01 21:47:42 jmmv Exp $
 
 To use tripwire to protect your systems, you should first initialise
 the databases:
 
-	(cd ${PREFIX}/etc/tripwire; ${PREFIX}/sbin/tripwire -initialize)
+	(cd ${PKG_SYSCONFDIR}; ${PREFIX}/sbin/tripwire -initialize)
 
-which creates the database in the ${PREFIX}/etc/tripwire/databases
+which creates the database in the ${PKG_SYSCONFDIR}/databases
 directory.
 
 ===========================================================================
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 17bbf983fca..2c03e4a7932 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/04/10 20:10:20 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/01 21:47:42 jmmv Exp $
 #
 
 DISTNAME=       tripwire-1.2
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=   ftp://coast.cs.purdue.edu/pub/tools/unix/ids/tripwire/
 EXTRACT_SUFX=	.tar.Z
@@ -10,23 +11,32 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cerias.purdue.edu/coast/coast-library.html
 COMMENT=	File and directory integrity checker
 
+USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
+
+PKG_SYSCONFSUBDIR=	tripwire
+OWN_DIRS=		${PKG_SYSCONFDIR}/databases
+EGDIR=			${PREFIX}/share/examples/tripwire
+CONF_FILES=		${EGDIR}/tripwire.conf ${PKG_SYSCONFDIR}/tripwire.conf
+
 post-extract:
 	cd ${WRKDIR} && ${PAX} -O -rf T1.2.tar
 	${CP} ${FILESDIR}/conf-${LOWER_OPSYS}.h ${WRKSRC}/configs
 
-post-patch:
+pre-configure:
 	${MV} ${WRKSRC}/include/config.h ${WRKSRC}/include/config.h.in
 	${SED} -e 's|@localbase@|${LOCALBASE}|g'			\
 		-e 's|@LOWER_OPSYS@|${LOWER_OPSYS}|g'			\
+		-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'		\
 		${WRKSRC}/include/config.h.in > ${WRKSRC}/include/config.h
 
 PRE_ROOT_CMD=	${CHMOD} -R go+rwx ${WRKDIR}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tripwire
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/tripwire/databases
+	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/designdoc.ps ${PREFIX}/share/doc/tripwire
 	${SED} -e 's|@localbase@|${LOCALBASE}|g' -e 's|@x11base@|${X11BASE}|g' \
-		${FILESDIR}/tw.conf.${LOWER_OPSYS} > ${PREFIX}/etc/tripwire/tripwire.conf
+		${FILESDIR}/tw.conf.${LOWER_OPSYS} > ${EGDIR}/tripwire.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/tripwire/PLIST b/security/tripwire/PLIST
index 5e0bfd3a05b..c7b9eed6a6f 100644
--- a/security/tripwire/PLIST
+++ b/security/tripwire/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:30:02 seb Exp $
-etc/tripwire/tripwire.conf
-sbin/tripwire
-share/doc/tripwire/designdoc.ps
+@comment $NetBSD: PLIST,v 1.4 2003/05/01 21:47:42 jmmv Exp $
 man/man5/tw.config.5
 man/man8/siggen.8
 man/man8/tripwire.8
-@exec ${MKDIR} %D/etc/tripwire/databases
-@unexec /bin/rm -rf %D/etc/tripwire || /usr/bin/true
+sbin/tripwire
+share/doc/tripwire/designdoc.ps
+share/examples/tripwire/tripwire.conf
+@dirrm share/examples/tripwire
 @dirrm share/doc/tripwire
diff --git a/security/tripwire/distinfo b/security/tripwire/distinfo
index 359a0c24e5a..9e792f60163 100644
--- a/security/tripwire/distinfo
+++ b/security/tripwire/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2002/08/20 17:19:34 seb Exp $
+$NetBSD: distinfo,v 1.4 2003/05/01 21:47:42 jmmv Exp $
 
 SHA1 (tripwire-1.2.tar.Z) = 5acf8e1b12547f98171ff5fdb9bf239b21275d70
 Size (tripwire-1.2.tar.Z) = 462187 bytes
 SHA1 (patch-aa) = 37e41b99fbd437cc62b1446545f963d03e91e819
-SHA1 (patch-ab) = a71a44eeecb84e3453dfb3e4e03258ce47ccd999
+SHA1 (patch-ab) = 186edaa504e6e1a7edadb2168982b9b8a2482bac
 SHA1 (patch-ac) = 35b3fe52f497e6cbbf7edfeaee398f0d24aff219
 SHA1 (patch-ad) = 92fe68b5cb929dfc16b767e28d72852428246a32
diff --git a/security/tripwire/patches/patch-ab b/security/tripwire/patches/patch-ab
index 0b1dbb57e99..c64ddaa6f95 100644
--- a/security/tripwire/patches/patch-ab
+++ b/security/tripwire/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 1999/07/06 11:29:41 agc Exp $
+$NetBSD: patch-ab,v 1.4 2003/05/01 21:47:43 jmmv Exp $
 
 NetBSD and Solaris specific paths for tripwire.
 
@@ -20,8 +20,8 @@ NetBSD and Solaris specific paths for tripwire.
 -
 -#define CONFIG_PATH     "/tmp/genek"
 -#define DATABASE_PATH   "/tmp/genek"
-+# define CONFIG_PATH     "@localbase@/etc/tripwire"
-+# define DATABASE_PATH   "@localbase@/etc/tripwire/databases"
++# define CONFIG_PATH     "@PKG_SYSCONFDIR@"
++# define DATABASE_PATH   "@PKG_SYSCONFDIR@/databases"
  
  /******* name of Tripwire files **************************************
   *