12 files changed, 109 insertions, 60 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 359fd3722281..af970b58f23b 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 
 PORTNAME=	libprelude
-PORTVERSION=	0.8.8
+PORTVERSION=	0.8.10
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
@@ -24,6 +24,10 @@ CONFIGURE_ARGS+=	--disable-openssl
 USE_OPENSSL=		YES
 .endif
 
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	NOPORTDOCS=yes
+.endif
+
 post-extract:
 	@${ECHO} ""
 	@${ECHO} "*------------------------------------------------------------------*"
@@ -33,8 +37,4 @@ post-extract:
 	@${ECHO} "*------------------------------------------------------------------*"
 	@${ECHO} ""
 
-pre-configure:
-	@${REINPLACE_CMD} 's!\$(prefix)/libprelude/include!\$(prefix)/include/libprelude!' \
-			${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index 94e04b6cd94c..822d26c025d3 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1 +1 @@
-MD5 (libprelude-0.8.8.tar.gz) = 985a823102ec34ac44fc566bc721a558
+MD5 (libprelude-0.8.10.tar.gz) = 68171b170d1f8ad7e38f949391e6b227
diff --git a/security/libprelude/files/patch-Makefile.in b/security/libprelude/files/patch-Makefile.in
index ecf01894775a..336c27112e46 100644
--- a/security/libprelude/files/patch-Makefile.in
+++ b/security/libprelude/files/patch-Makefile.in
@@ -1,6 +1,29 @@
---- Makefile.in.orig	Mon Sep 22 13:36:05 2003
-+++ Makefile.in	Mon Sep 22 13:35:14 2003
-@@ -633,17 +633,8 @@
+--- Makefile.in.orig	Tue Dec  9 04:08:29 2003
++++ Makefile.in	Tue Dec  9 22:42:59 2003
+@@ -65,7 +65,7 @@
+ OBJEXT = @OBJEXT@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ 
+-includedir = $(prefix)/libprelude/include
++includedir = $(prefix)/include/libprelude
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -108,9 +108,12 @@
+ sensors_config_dir = @sensors_config_dir@
+ sensors_ident_file = @sensors_ident_file@
+ sensors_spool_dir = @sensors_spool_dir@
++ifndef NOPORTDOCS
+ SUBDIRS = libltdl src sensor-adduser docs
++else
++SUBDIRS = libltdl src sensor-adduser
++endif
+ include_HEADERS = config.h
+-
+ EXTRA_DIST = COPYING.OpenSSL sensors-default.conf
+ bin_SCRIPTS = $(top_srcdir)/libprelude-config
+ subdir = .
+@@ -522,17 +525,8 @@
  	$(INSTALL) -d -m 755 $(DESTDIR)$(sensors_config_dir);
  	$(INSTALL) -d -m 755 $(DESTDIR)$(sensors_config_dir)/ssl;
  	$(INSTALL) -d -m 755 $(DESTDIR)$(sensors_config_dir)/plaintext;
diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist
index 25bbd0b8515a..b7a536822135 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -35,50 +35,50 @@ include/libprelude/threads.h
 include/libprelude/extract.h
 include/libprelude/common.h
 include/libprelude/config.h
-lib/libprelude.so.0
+lib/libprelude.so.1
 lib/libprelude.so
 lib/libprelude.la
-%%DOCSDIR%%/c4.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/libprelude-prelude-io.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/libprelude-client-ident.html
-%%DOCSDIR%%/libprelude-common.html
-%%DOCSDIR%%/libprelude-config-engine.html
-%%DOCSDIR%%/libprelude-daemonize.html
-%%DOCSDIR%%/libprelude-extract.html
-%%DOCSDIR%%/libprelude-idmef-message-id.html
-%%DOCSDIR%%/libprelude-idmef-msg-send.html
-%%DOCSDIR%%/libprelude-idmef-tree-func.html
-%%DOCSDIR%%/libprelude-idmef-tree.html
-%%DOCSDIR%%/libprelude-list.html
-%%DOCSDIR%%/libprelude-plugin-common-prv.html
-%%DOCSDIR%%/libprelude-plugin-common.html
-%%DOCSDIR%%/libprelude-prelude-async.html
-%%DOCSDIR%%/libprelude-prelude-auth.html
-%%DOCSDIR%%/libprelude-prelude-client-mgr.html
-%%DOCSDIR%%/libprelude-prelude-client.html
-%%DOCSDIR%%/libprelude-prelude-getopt-wide.html
-%%DOCSDIR%%/libprelude-prelude-getopt.html
-%%DOCSDIR%%/libprelude-prelude-ident.html
-%%DOCSDIR%%/libprelude-prelude-inet.html
-%%DOCSDIR%%/libprelude-prelude-list.html
-%%DOCSDIR%%/libprelude-prelude-log.html
-%%DOCSDIR%%/libprelude-prelude-message-buffered.html
-%%DOCSDIR%%/libprelude-prelude-message-id.html
-%%DOCSDIR%%/libprelude-prelude-message.html
-%%DOCSDIR%%/libprelude-prelude-path.html
-%%DOCSDIR%%/libprelude-sensor.html
-%%DOCSDIR%%/libprelude-ssl-gencrypto.html
-%%DOCSDIR%%/libprelude-ssl-registration-msg.html
-%%DOCSDIR%%/libprelude-ssl-settings.html
-%%DOCSDIR%%/libprelude-ssl.html
-%%DOCSDIR%%/libprelude-threads.html
-%%DOCSDIR%%/libprelude-timer.html
-%%DOCSDIR%%/libprelude-variable.html
+%%PORTDOCS%%%%DOCSDIR%%/c4.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-io.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-client-ident.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-common.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-config-engine.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-daemonize.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-extract.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-message-id.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-msg-send.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-tree-func.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-list.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-plugin-common-prv.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-plugin-common.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-async.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-auth.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-client-mgr.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-client.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-getopt-wide.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-getopt.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-ident.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-inet.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-list.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-log.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-message-buffered.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-message-id.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-message.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-path.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-sensor.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-ssl-gencrypto.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-ssl-registration-msg.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-ssl-settings.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-ssl.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-threads.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-timer.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-variable.html
 @unexec rmdir %D/etc/prelude-sensors/ssl 2>/dev/null || true
 @unexec rmdir %D/etc/prelude-sensors/plaintext 2>/dev/null || true
 @unexec rmdir %D/etc/prelude-sensors 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/prelude-sensors`` to remove any configuration files left." | fmt
 @dirrm include/libprelude
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir /var/spool/prelude-sensors 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf /var/spool/prelude-sensors`` to remove any files left." | fmt
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 63edb02f652d..26118368b5d4 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -6,13 +6,14 @@
 
 PORTNAME=	prelude-lml
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=   http://www.prelude-ids.org/download/releases/
+MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Prelude Network Intrusion Detection System Log Monitoring Lackey
 
-LIB_DEPENDS+=	prelude.0:${PORTSDIR}/security/libprelude \
+LIB_DEPENDS+=	prelude.1:${PORTSDIR}/security/libprelude \
 		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GMAKE=		yes
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 7fb893e0e96e..4ca5903e540d 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -5,15 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	prelude-manager
-PORTVERSION=	0.8.9
+PORTVERSION=	0.8.10
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Prelude Network Intrusion Detection System central logging point
 
-LIB_DEPENDS+=		prelude.0:${PORTSDIR}/security/libprelude \
-			xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS+=	prelude.1:${PORTSDIR}/security/libprelude \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -37,7 +37,7 @@ PLIST_SUB+=		MYSQL="@comment "
 .endif
 
 .if defined(WITH_POSTGRES)
-LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql7
+LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql-client
 CONFIGURE_ARGS+=	--enable-pgsql
 PLIST_SUB+=		PGSQL=""
 .else
diff --git a/security/prelude-manager/distinfo b/security/prelude-manager/distinfo
index aee19022e704..49e4df44001c 100644
--- a/security/prelude-manager/distinfo
+++ b/security/prelude-manager/distinfo
@@ -1 +1 @@
-MD5 (prelude-manager-0.8.9.tar.gz) = b236090f281c7fb6f8975391c382c448
+MD5 (prelude-manager-0.8.10.tar.gz) = 2cdd10740e8840978ad5a2b41d6e13e1
diff --git a/security/prelude-manager/pkg-plist b/security/prelude-manager/pkg-plist
index 040374e3b946..45c040fe6448 100644
--- a/security/prelude-manager/pkg-plist
+++ b/security/prelude-manager/pkg-plist
@@ -49,6 +49,7 @@ share/prelude-manager/xmlmod/idmef-message.dtd
 %%DOCSDIR%%/prelude-manager-ssl.html
 @unexec rmdir %D/etc/prelude-manager 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/prelude-manager`` to remove any configuration files left." | fmt
 @dirrm include/prelude-manager
+@dirrm lib/prelude-manager/db
 @dirrm lib/prelude-manager/decodes
 @dirrm lib/prelude-manager/reports
 @dirrm lib/prelude-manager
diff --git a/security/prelude-nids/Makefile b/security/prelude-nids/Makefile
index 5c129cb5647d..6f50cd3b717c 100644
--- a/security/prelude-nids/Makefile
+++ b/security/prelude-nids/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	prelude-nids
-PORTVERSION=	0.8.5
+PORTVERSION=	0.8.6
 CATEGORIES=	security
-MASTER_SITES=   http://www.prelude-ids.org/download/releases/
+MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Prelude Network Intrusion Detection System sensor
 
-LIB_DEPENDS=		prelude.0:${PORTSDIR}/security/libprelude
+LIB_DEPENDS=	prelude.1:${PORTSDIR}/security/libprelude
 
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
@@ -22,4 +22,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 
 MAN8=			prelude-nids.8
 
+post-patch:
+	${CP} ${FILESDIR}/libpcap.diff ${WRKSRC}
+
 .include <bsd.port.mk>
diff --git a/security/prelude-nids/distinfo b/security/prelude-nids/distinfo
index 3b691b177b41..66c34370b953 100644
--- a/security/prelude-nids/distinfo
+++ b/security/prelude-nids/distinfo
@@ -1 +1 @@
-MD5 (prelude-nids-0.8.5.tar.gz) = 02c6d7cbbbd57df4a16b3a3e1b80f20d
+MD5 (prelude-nids-0.8.6.tar.gz) = 5be38d1cd8085c6a5555b4975ab81345
diff --git a/security/prelude-nids/files/libpcap.diff b/security/prelude-nids/files/libpcap.diff
new file mode 100644
index 000000000000..8fa5d768864a
--- /dev/null
+++ b/security/prelude-nids/files/libpcap.diff
@@ -0,0 +1,11 @@
+--- libpcap/pcap-null.c.orig	Sun Dec  7 19:03:41 2003
++++ libpcap/pcap-null.c	Sun Dec  7 19:03:52 2003
+@@ -54,7 +54,7 @@
+ }
+ 
+ pcap_t *
+-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
++pcap_open_live(const char *device, int snaplen, int promisc, int to_ms, char *ebuf)
+ {
+ 	(void)strlcpy(ebuf, nosup, PCAP_ERRBUF_SIZE);
+ 	return (NULL);
diff --git a/security/prelude-nids/files/patch-src::Makefile.in b/security/prelude-nids/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..0ce9e2dc2ec6
--- /dev/null
+++ b/security/prelude-nids/files/patch-src::Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	Sun Dec  7 19:04:39 2003
++++ src/Makefile.in	Sun Dec  7 19:05:27 2003
+@@ -640,6 +640,7 @@
+ libpcap-unpack: .libpcap-unpack
+ .libpcap-unpack: $(top_srcdir)/libpcap.tar
+ 	tar xf $(top_srcdir)/libpcap.tar
++	patch -p0 < $(top_srcdir)/libpcap.diff
+ 	@touch .libpcap-unpack
+ 
+ libpcap-configure: libpcap/Makefile