Install data files to share/examples to make sure they end up in the

binary package. Fixes DESTDIR installation at the same time. Bump revision.

4 files changed, 35 insertions, 20 deletions

diff --git a/security/prelude-correlator/Makefile b/security/prelude-correlator/Makefile
index 5c3b435ceb9..2d3218eb1aa 100644
--- a/security/prelude-correlator/Makefile
+++ b/security/prelude-correlator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/02/10 19:17:45 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/23 18:01:47 joerg Exp $
 #
 
 DISTNAME=	prelude-correlator-0.9.0-beta8
 PKGNAME=	prelude-correlator-${DISTNAME:S/-beta/beta/:C/.*-//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.com/download/releases/prelude-correlator/
 
@@ -38,14 +38,16 @@ FILES_SUBST+=		PRELUDE_USER=${PRELUDE_USER:Q}
 FILES_SUBST+=		PRELUDE_GROUP=${PRELUDE_USER:Q}
 
 SUBST_CLASSES+=		code
-SUBST_STAGE.code=	post-patch
+SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-correlator.c
 SUBST_FILES.code+=	${WRKSRC}/*.py
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
 SUBST_SED.code+=        -e 's,@PRELUDE_HOME@,${PRELUDE_HOME},g'
 
-CONF_FILES=		${EGDIR}/prelude-correlator.conf ${PKG_SYSCONFDIR}/prelude-correlator/prelude-correlator.conf
+CONF_FILES+=		${EGDIR}/prelude-correlator.conf ${PKG_SYSCONFDIR}/prelude-correlator/prelude-correlator.conf
+CONF_FILES+=		${EGDIR}/dshield.dat ${PRELUDE_HOME}/dshield.dat
+CONF_FILES+=		${EGDIR}/spamhaus_drop.dat ${PRELUDE_HOME}/spamhaus_drop.dat
 
 REQD_DIRS+=		${PRELUDE_HOME}
 REQD_DIRS_PERMS+=	${PRELUDE_HOME} ${PRELUDE_USER} ${PRELUDE_GROUP} 0700
@@ -63,6 +65,9 @@ post-build:
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/run-prelude-correlator ${DESTDIR}${PREFIX}/sbin/run-prelude-correlator
 	${INSTALL_DATA} ${WRKSRC}/prelude-correlator.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/PreludeCorrelator/plugins/dshield.dat \
+	    ${WRKSRC}/PreludeCorrelator/plugins/spamhaus_drop.dat \
+	    ${DESTDIR}${EGDIR}
 
 .include "../../security/libprelude-python/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/security/prelude-correlator/PLIST b/security/prelude-correlator/PLIST
index 6f81a28ec03..10b18d9343d 100644
--- a/security/prelude-correlator/PLIST
+++ b/security/prelude-correlator/PLIST
@@ -1,12 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2009/11/07 18:30:29 hasso Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/03/23 18:01:47 joerg Exp $
 bin/prelude-correlator
-sbin/run-prelude-correlator
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/PreludeCorrelator/__init__.py
 ${PYSITELIB}/PreludeCorrelator/__init__.pyc
 ${PYSITELIB}/PreludeCorrelator/__init__.pyo
@@ -64,5 +57,14 @@ ${PYSITELIB}/PreludeCorrelator/siteconfig.pyo
 ${PYSITELIB}/PreludeCorrelator/utils.py
 ${PYSITELIB}/PreludeCorrelator/utils.pyc
 ${PYSITELIB}/PreludeCorrelator/utils.pyo
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+sbin/run-prelude-correlator
+share/examples/dshield.dat
 share/examples/prelude-correlator.conf
 share/examples/rc.d/preludecorrelator
+share/examples/spamhaus_drop.dat
diff --git a/security/prelude-correlator/distinfo b/security/prelude-correlator/distinfo
index 8c00da6dc34..a109c2bcb02 100644
--- a/security/prelude-correlator/distinfo
+++ b/security/prelude-correlator/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/11/07 18:30:29 hasso Exp $
+$NetBSD: distinfo,v 1.5 2010/03/23 18:01:47 joerg Exp $
 
 SHA1 (prelude-correlator-0.9.0-beta8.tar.gz) = 962f3c899ed01b9a0efc1368687d6a914e176c73
 RMD160 (prelude-correlator-0.9.0-beta8.tar.gz) = 9ed8e35357ba1bbe6a09c6cb906df28d4f84e347
 Size (prelude-correlator-0.9.0-beta8.tar.gz) = 179713 bytes
-SHA1 (patch-aa) = 67b5e6d65044dc30528c08a3e331ddd4a90667ba
+SHA1 (patch-aa) = f6641b5a19d504716dcb51a2d1ec905fed7967f9
diff --git a/security/prelude-correlator/patches/patch-aa b/security/prelude-correlator/patches/patch-aa
index 5c820ea24e3..31393c0bd02 100644
--- a/security/prelude-correlator/patches/patch-aa
+++ b/security/prelude-correlator/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2009/11/07 18:30:29 hasso Exp $
+$NetBSD: patch-aa,v 1.5 2010/03/23 18:01:48 joerg Exp $
 
---- setup.py.orig	2009-07-09 18:55:53 +0300
-+++ setup.py	2009-09-30 09:58:19 +0300
-@@ -48,7 +48,8 @@ class my_install(install):
+--- setup.py.orig	2009-11-03 15:57:01.000000000 +0000
++++ setup.py
+@@ -52,7 +52,8 @@ class my_install(install):
  
                  root = self.root or ""
                  for dir, files in data_files:
@@ -12,7 +12,15 @@ $NetBSD: patch-aa,v 1.4 2009/11/07 18:30:29 hasso Exp $
  
                          self.mkpath(dir)
                          for f in files:
-@@ -71,7 +72,7 @@ class my_install(install):
+@@ -68,14 +69,14 @@ class my_install(install):
+                         prefix = ""
+ 
+                 self.init_siteconfig(prefix)
+-                self.__install_data()
++                #self.__install_data()
+                 install.run(self)
+                 os.remove("PreludeCorrelator/siteconfig.py")
+ 
          def init_siteconfig(self, prefix):
                  config = open("PreludeCorrelator/siteconfig.py", "w")
                  print >> config, "conf_dir = '%s'" % os.path.abspath(prefix + "/etc/prelude-correlator")
@@ -21,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2009/11/07 18:30:29 hasso Exp $
                  config.close()
  
  
-@@ -84,8 +85,7 @@ if is_egg:
+@@ -88,8 +89,7 @@ if is_egg:
          data_files = [ ("", ["prelude-correlator.conf"]) ]
  else:
          package_data = {}