Fix directory handling in PLIST. Bump PKGREVISION.

2 files changed, 34 insertions, 32 deletions

diff --git a/security/pflkm/Makefile b/security/pflkm/Makefile
index cbbe6b66d29..ffc47bc560c 100644
--- a/security/pflkm/Makefile
+++ b/security/pflkm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:11 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/20 23:03:56 wiz Exp $
 
 DISTNAME=		pflkm-20050511
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://nedbsd.nl/~ppostma/pf/
 
@@ -16,15 +17,30 @@ PKG_USERS=		_pflogd:nogroup::pflogd\ pseudo-user:${VARBASE}/chroot/pflogd:${NOLO
 
 RCD_SCRIPTS=		pf pflogd
 PKG_SYSCONFSUBDIR=	pf
-CONF_FILES=		${PREFIX}/share/examples/${PKGBASE}/pf.conf \
+CONF_FILES=		${PREFIX}/share/examples/pflkm/pf.conf \
 			${PKG_SYSCONFDIR}/pf.conf
-CONF_FILES+=		${PREFIX}/share/examples/${PKGBASE}/pf.os \
+CONF_FILES+=		${PREFIX}/share/examples/pflkm/pf.os \
 			${PKG_SYSCONFDIR}/pf.os
 CONF_FILES_MODE=	0600
 
 OWN_DIRS=		${VARBASE}/chroot/pflogd
-OWN_DIRS+=		${PREFIX}/share/examples/${PKGBASE}
-INSTALLATION_DIRS=	lkm include/net
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	post-patch
+SUBST_FILES.path=	man/pfsync.4 man/pf.conf.5
+SUBST_FILES.path+=	sbin/pfctl/pfctl.8 sbin/pfctl/pfctl_parser.h
+SUBST_FILES.path+=	usr.sbin/authpf/authpf.8 usr.sbin/authpf/pathnames.h
+SUBST_SED.path=		-e 's,/etc/pf.os,${PKG_SYSCONFDIR}/pf.os,g'
+SUBST_SED.path+=	-e 's,/etc/pf.conf,${PKG_SYSCONFDIR}/pf.conf,g'
+SUBST_SED.path+=	-e 's,/etc/authpf/authpf.conf,${PKG_SYSCONFDIR}/authpf.conf,g'
+SUBST_SED.path+=	-e 's,/etc/authpf/authpf.allow,${PKG_SYSCONFDIR}/authpf.allow,g'
+SUBST_SED.path+=	-e 's,/etc/authpf/authpf.rules,${PKG_SYSCONFDIR}/authpf.rules,g'
+SUBST_SED.path+=	-e 's,/etc/authpf/authpf.problem,${PKG_SYSCONFDIR}/authpf.problem,g'
+SUBST_SED.path+=	-e 's,/etc/authpf/authpf.message,${PKG_SYSCONFDIR}/authpf.message,g'
+SUBST_SED.path+=	-e 's,/etc/authpf/users,${PKG_SYSCONFDIR}/users,g'
+SUBST_SED.path+=	-e 's,/etc/authpf/banned,${PKG_SYSCONFDIR}/banned,g'
+SUBST_SED.path+=	-e 's,/usr/sbin/authpf,${PREFIX}/sbin/authpf,g'
+SUBST_SED.path+=	-e 's,/sbin/pfctl,${PREFIX}/sbin/pfctl,g'
+SUBST_MESSAGE.path=	Fixing hardcoded dirs.
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pf
 PKG_SUPPORTED_OPTIONS=	altq ifevents
@@ -54,19 +70,15 @@ PKG_FAIL_REASON+=	"Please see: http://nedbsd.nl/~ppostma/pf/\#if_events"
 .endif
 .endif
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/etc/pf.conf \
-		${PREFIX}/share/examples/${PKGBASE}/pf.conf
-	${INSTALL_DATA} ${WRKSRC}/etc/pf.os \
-		${PREFIX}/share/examples/${PKGBASE}/pf.os
-
 do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/include/net
 	${INSTALL_DATA} ${WRKSRC}/include/net/if_pflog.h ${PREFIX}/include/net/if_pflog.h
 	${INSTALL_DATA} ${WRKSRC}/include/net/if_pfsync.h ${PREFIX}/include/net/if_pfsync.h
 	${INSTALL_DATA} ${WRKSRC}/include/net/pfvar.h ${PREFIX}/include/net/pfvar.h
 	${INSTALL_PROGRAM} ${WRKSRC}/libexec/ftp-proxy/ftp-proxy ${PREFIX}/libexec/ftp-proxy
 	${INSTALL_MAN} ${WRKSRC}/libexec/ftp-proxy/ftp-proxy.cat8 ${PREFIX}/man/cat8/ftp-proxy.0
 	${INSTALL_MAN} ${WRKSRC}/libexec/ftp-proxy/ftp-proxy.8 ${PREFIX}/man/man8/ftp-proxy.8
+	${INSTALL_DATA_DIR} ${PREFIX}/lkm
 	${INSTALL_DATA} ${WRKSRC}/lkm/pf.o ${PREFIX}/lkm/pf.o
 	${INSTALL_MAN} ${WRKSRC}/man/pf.cat4 ${PREFIX}/man/cat4/pf.0
 	${INSTALL_MAN} ${WRKSRC}/man/pflog.cat4 ${PREFIX}/man/cat4/pflog.0
@@ -90,23 +102,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/usr.sbin/tcpdump/pftcpdump ${PREFIX}/sbin/pftcpdump
 	${INSTALL_MAN} ${WRKSRC}/usr.sbin/tcpdump/pftcpdump.cat8 ${PREFIX}/man/cat8/pftcpdump.0
 	${INSTALL_MAN} ${WRKSRC}/usr.sbin/tcpdump/pftcpdump.8 ${PREFIX}/man/man8/pftcpdump.8
-
-SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	man/pfsync.4 man/pf.conf.5
-SUBST_FILES.path+=	sbin/pfctl/pfctl.8 sbin/pfctl/pfctl_parser.h
-SUBST_FILES.path+=	usr.sbin/authpf/authpf.8 usr.sbin/authpf/pathnames.h
-SUBST_SED.path=		-e 's,/etc/pf.os,${PKG_SYSCONFDIR}/pf.os,g'
-SUBST_SED.path+=	-e 's,/etc/pf.conf,${PKG_SYSCONFDIR}/pf.conf,g'
-SUBST_SED.path+=	-e 's,/etc/authpf/authpf.conf,${PKG_SYSCONFDIR}/authpf.conf,g'
-SUBST_SED.path+=	-e 's,/etc/authpf/authpf.allow,${PKG_SYSCONFDIR}/authpf.allow,g'
-SUBST_SED.path+=	-e 's,/etc/authpf/authpf.rules,${PKG_SYSCONFDIR}/authpf.rules,g'
-SUBST_SED.path+=	-e 's,/etc/authpf/authpf.problem,${PKG_SYSCONFDIR}/authpf.problem,g'
-SUBST_SED.path+=	-e 's,/etc/authpf/authpf.message,${PKG_SYSCONFDIR}/authpf.message,g'
-SUBST_SED.path+=	-e 's,/etc/authpf/users,${PKG_SYSCONFDIR}/users,g'
-SUBST_SED.path+=	-e 's,/etc/authpf/banned,${PKG_SYSCONFDIR}/banned,g'
-SUBST_SED.path+=	-e 's,/usr/sbin/authpf,${PREFIX}/sbin/authpf,g'
-SUBST_SED.path+=	-e 's,/sbin/pfctl,${PREFIX}/sbin/pfctl,g'
-SUBST_MESSAGE.path=	"Fixing hardcoded dirs."
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pflkm
+	${INSTALL_DATA} ${WRKSRC}/etc/pf.conf \
+		${PREFIX}/share/examples/pflkm/pf.conf
+	${INSTALL_DATA} ${WRKSRC}/etc/pf.os \
+		${PREFIX}/share/examples/pflkm/pf.os
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pflkm/PLIST b/security/pflkm/PLIST
index f687c1332f6..2f1f47efa29 100644
--- a/security/pflkm/PLIST
+++ b/security/pflkm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/03 15:49:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/02/20 23:03:56 wiz Exp $
 include/net/if_pflog.h
 include/net/if_pfsync.h
 include/net/pfvar.h
@@ -28,7 +28,10 @@ sbin/authpf
 sbin/pfctl
 sbin/pflogd
 sbin/pftcpdump
-share/examples/${PKGBASE}/pf.conf
-share/examples/${PKGBASE}/pf.os
+share/examples/pflkm/pf.conf
+share/examples/pflkm/pf.os
 share/examples/rc.d/pf
 share/examples/rc.d/pflogd
+@dirrm share/examples/pflkm
+@dirrm include/net
+@unexec ${RMDIR} %D/lkm 2>/dev/null || ${TRUE}