Corrected my misunderstanding of CONF_FILES

infrastrure. Fixed several configuration file
installation problems.

3 files changed, 100 insertions, 44 deletions

diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index db37b0c3e85..87714e33161 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/09/03 13:46:04 shannonjr Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/05 18:58:41 shannonjr Exp $
 #
 
 DISTNAME=		prelude-lml-0.9.10.1
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://www.prelude-ids.org/download/releases/ \
 			http://www.prelude-ids.org/download/releases/old/
@@ -33,8 +34,13 @@ BUILD_DEFS+=		VARBASE
 PRELUDE_LML_PID_DIR=	${VARBASE}/run/prelude-lml
 PRELUDE_HOME=		${VARBASE}/prelude-lml
 
-PKG_GROUPS=	${PRELUDE_GROUP}
-PKG_USERS=	${PRELUDE_USER}:${PRELUDE_GROUP}
+PKG_GROUPS=		${PRELUDE_GROUP}
+PKG_USERS=		${PRELUDE_USER}:${PRELUDE_GROUP}
+
+EGDIR=			${PREFIX}/share/examples/prelude-lml
+REQD_DIRS=		${EGDIR}
+MAKE_DIRS+=		${VARBASE}/prelude-lml PKG_SYSCONFDIR
+MAKE_DIRS_PERMS+=	${VARBASE}/prelude-lml	${PRELUDE_USER} ${PRELUDE_GROUP} 0700
 
 PKG_GECOS.${PRELUDE_USER}=	Prelude IDS
 PKG_HOME.${PRELUDE_USER}=	${PRELUDE_HOME}
@@ -49,23 +55,72 @@ SUBST_FILES.code=	run-prelude-lml.c
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
 
+SUBST_CLASSES+=		make
+SUBST_STAGE.make=	post-patch
+SUBST_FILES.make=	Makefile.in
+SUBST_SED.make=		-e 's,@EGDIR@,${EGDIR},g'
+
 PKG_SYSCONFSUBDIR=	prelude-lml
-EGDIR=		share/examples/prelude-lml/
 CONF_FILES_PERMS+=	${EGDIR}/plugins.rules ${PKG_SYSCONFDIR}/plugins.rules \
 			${ROOT_USER} ${ROOT_GROUP} 0644
 CONF_FILES_PERMS+=	${EGDIR}/prelude-lml.conf ${PKG_SYSCONFDIR}/prelude-lml.conf \
 			${ROOT_USER} ${ROOT_GROUP} 0644
-.for f in apc-emu.rules arbor.rules arpwatch.rules checkpoint.rules \
-	cisco-pix.rules cisco-router.rules cisco-vpn.rules clamav.rules \
-	dell-om.rules f5-bigip.rules grsecurity.rules honeyd.rules \
-	httpd.rules ipchains.rules ipfw.rules ipso.rules linksys-wap11.rules \
-	modsecurity.rules ms-sql.rules nagios.rules navce.rules \
-	netapp-ontap.rules netfilter.rules netscreen.rules ntsyslog.rules \
-	openhostapd.rules pam.rules pcanywhere.rules pcre.rules \
-	portsentry.rules postfix.rules proftpd.rules qpopper.rules \
-	selinux.rules sendmail.rules shadow-utils.rules single.rules \
-	squid.rules ssh.rules sudo.rules tripwire.rules vigor.rules \
-	vpopmail.rules webmin.rules wu-ftp.rules zywall.rules zyxel.rules
+
+# From plugins/pcre/ruleset/Makefile.in
+ruleset_DATA = \
+	apc-emu.rules           \
+	arbor.rules             \
+	arpwatch.rules          \
+	bonding.rules           \
+	cacti-thold.rules       \
+	checkpoint.rules        \
+	cisco-asa.rules         \
+	cisco-common.rules      \
+	cisco-css.rules         \
+	cisco-ips.rules         \
+	cisco-router.rules      \
+	cisco-vpn.rules         \
+	clamav.rules            \
+	dell-om.rules           \
+	f5-bigip.rules          \
+	grsecurity.rules        \
+	honeyd.rules            \
+	httpd.rules             \
+	ipchains.rules          \
+	ipfw.rules              \
+	modsecurity.rules       \
+	ms-cluster.rules        \
+	ms-sql.rules            \
+	nagios.rules            \
+	navce.rules             \
+	netapp-ontap.rules      \
+	netfilter.rules         \
+	netscreen.rules         \
+	ntsyslog.rules          \
+	openhostapd.rules       \
+	pam.rules               \
+	pcanywhere.rules        \
+	pcre.rules              \
+	portsentry.rules        \
+	postfix.rules           \
+	proftpd.rules           \
+	qpopper.rules           \
+	selinux.rules           \
+	sendmail.rules          \
+	shadow-utils.rules      \
+	single.rules            \
+	sonicwall.rules         \
+	spamassassin.rules      \
+	squid.rules             \
+	ssh.rules               \
+	sudo.rules              \
+	tripwire.rules          \
+	vigor.rules             \
+	vpopmail.rules          \
+	linksys-wap11.rules     \
+	webmin.rules            \
+	wu-ftp.rules
+.for f in ${ruleset_DATA}
 CONF_FILES+=	${EGDIR}/ruleset/${f:Q} ${PKG_SYSCONFDIR}/ruleset/${f:Q}
 .endfor
 
diff --git a/security/prelude-lml/distinfo b/security/prelude-lml/distinfo
index 2cc7f09442b..b571ea7c144 100644
--- a/security/prelude-lml/distinfo
+++ b/security/prelude-lml/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2007/09/03 13:46:04 shannonjr Exp $
+$NetBSD: distinfo,v 1.12 2007/09/05 18:58:41 shannonjr Exp $
 
 SHA1 (prelude-lml-0.9.10.1.tar.gz) = 9edffdb2bcddd6ed03a6c1d1a8e8df347d7693d9
 RMD160 (prelude-lml-0.9.10.1.tar.gz) = 87700d74e9dc04b9344c38933b1d88d5a3e27a81
 Size (prelude-lml-0.9.10.1.tar.gz) = 658499 bytes
 SHA1 (patch-aa) = fbb7dcd864ea1bfc39e02c01a451a7992419dfcb
-SHA1 (patch-ab) = 6cfb8e41b822be4bc616f217da85e0f1af458b5b
+SHA1 (patch-ab) = 41ecade30abfb985c3dabfbb43b2cf0bd44a6d9d
 SHA1 (patch-ac) = 0980dcf3d203ad759997bd3d1efb36ea6722a4af
 SHA1 (patch-ad) = 971e0360ff3732c2fc0e5fce33946d6060c54713
diff --git a/security/prelude-lml/patches/patch-ab b/security/prelude-lml/patches/patch-ab
index 2883ab1164f..cda7ccc0854 100644
--- a/security/prelude-lml/patches/patch-ab
+++ b/security/prelude-lml/patches/patch-ab
@@ -1,42 +1,43 @@
-$NetBSD: patch-ab,v 1.2 2006/05/20 19:12:32 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2007/09/05 18:58:41 shannonjr Exp $
 
---- Makefile.in.orig	2006-05-20 18:51:30.000000000 +0000
+--- Makefile.in.orig	2007-08-08 09:48:58.000000000 -0600
 +++ Makefile.in
-@@ -695,27 +695,27 @@ uninstall-info: uninstall-info-recursive
+@@ -872,34 +872,12 @@ uninstall-info: uninstall-info-recursive
+ 	uninstall uninstall-am uninstall-info-am uninstall-local
  
- install-data-local:
- 	$(INSTALL) -m 700 -d $(DESTDIR)$(metadata_dir)
+ 
+-install-data-local:
+-	$(INSTALL) -m 700 -d $(DESTDIR)$(metadata_dir)
 -	@if test -f $(DESTDIR)$(configdir)/prelude-lml.conf; then         					\
-+	@if test -f $(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf; then         					\
- 		echo "********************************************************************************"; 	\
-                 echo;                                                                                    	\
+-		echo "********************************************************************************"; 	\
+-                echo;                                                                                    	\
 -                echo "$(DESTDIR)$(configdir)/prelude-lml.conf already exist...";				\
 -                echo "Installing default configuration in $(DESTDIR)$(configdir)/prelude-lml.conf-dist";        \
-+                echo "$(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf already exist...";				\
-+                echo "Installing default configuration in $(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf-dist";        \
-                 echo;                                                                                    	\
-                 echo "********************************************************************************"; 	\
+-                echo;                                                                                    	\
+-                echo "********************************************************************************"; 	\
 -		$(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/prelude-lml.conf-dist;  \
-+		$(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf-dist;  \
-         else                                                                                             	\
+-        else                                                                                             	\
 -                $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/;                       \
-+                $(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(prefix)/share/examples/prelude-lml/;                       \
-         fi
+-        fi
 -	@if test -f $(DESTDIR)$(configdir)/plugins.rules; then         					\
-+	@if test -f $(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules; then         					\
- 		echo "********************************************************************************"; 	\
-                 echo;                                                                                    	\
+-		echo "********************************************************************************"; 	\
+-                echo;                                                                                    	\
 -                echo "$(DESTDIR)$(configdir)/plugins.rules already exist...";					\
 -                echo "Installing default configuration in $(DESTDIR)$(configdir)/plugins.rules-dist";	        \
-+                echo "$(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules already exist...";					\
-+                echo "Installing default configuration in $(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules-dist";	        \
-                 echo;                                                                                    	\
-                 echo "********************************************************************************"; 	\
+-                echo;                                                                                    	\
+-                echo "********************************************************************************"; 	\
 -		$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/plugins.rules-dist;	\
-+		$(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules $(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules-dist;	\
-         else                                                                                             	\
+-        else                                                                                             	\
 -		$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/;				\
-+		$(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules $(DESTDIR)$(prefix)/share/examples/prelude-lml/;				\
-         fi
+-        fi
++install-data-local:
++	$(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf @EGDIR@
++	$(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules @EGDIR@
  
  uninstall-local:
+-	rm -f $(DESTDIR)$(configdir)/prelude-lml.conf;	\
+-	rm -f $(DESTDIR)$(configdir)/plugin.rules;
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: