Update prelude ports to latest version:

libprelude: 0.8.5 -> 0.8.6
prelude-lml: 0.8.3 -> 0.8.4
prelude-manager: 0.8.7 -> 0.8.8
prelude-nids: 0.8.1 -> 0.8.3

PR:		57168
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>

15 files changed, 134 insertions, 142 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index fa64e39d3b8b..9e32f4f5007a 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -4,26 +4,24 @@
 # $FreeBSD$
 
 PORTNAME=	libprelude
-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 librairies
 
 USE_REINPLACE=		yes
-GNU_MAKE=		yes
-GNU_CONFIGURE=		yes
-USE_AUTOCONF=		yes
-WANT_AUTOCONF_VER=	253
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
 INSTALLS_SHLIB=		yes
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc \
 			--program-prefix="" --localstatedir=/var
 
 .if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+= 	--disable-openssl
+CONFIGURE_ARGS+=	--disable-openssl
 .else
-USE_OPENSSL=            YES
+USE_OPENSSL=		YES
 .endif
 
 post-extract:
@@ -38,7 +36,5 @@ post-extract:
 pre-configure:
 	@${REINPLACE_CMD} 's!\$(prefix)/libprelude/include!\$(prefix)/include/libprelude!' \
 			${WRKSRC}/Makefile.in
-	@${ECHO} "===> Regenerating libltdl configure script (Please wait...)"
-	@(cd ${WRKSRC}/libltdl ; autoconf)
 
 .include <bsd.port.mk>
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index f30e13afad38..859bb6e0620d 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1 +1 @@
-MD5 (libprelude-0.8.5.tar.gz) = 058a375229af13e30761c45f0d76adbe
+MD5 (libprelude-0.8.6.tar.gz) = 307e7f0b8e9ac0b1d9f52d0dbe6abe95
diff --git a/security/libprelude/files/patch-Makefile.in b/security/libprelude/files/patch-Makefile.in
index 89f5d1a6dc61..ecf01894775a 100644
--- a/security/libprelude/files/patch-Makefile.in
+++ b/security/libprelude/files/patch-Makefile.in
@@ -1,21 +1,22 @@
---- Makefile.in.orig	Sat Jun  7 09:55:05 2003
-+++ Makefile.in	Sat Jun  7 09:56:20 2003
-@@ -429,17 +429,7 @@
- 	$(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;
--	@if test -f $(DESTDIR)/$(sensors_config_dir)/sensors-default.conf; then                                   		\
+--- Makefile.in.orig	Mon Sep 22 13:36:05 2003
++++ Makefile.in	Mon Sep 22 13:35:14 2003
+@@ -633,17 +633,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;
+-	@if test -f $(DESTDIR)$(sensors_config_dir)/sensors-default.conf; then                                   		\
 -		echo "********************************************************************************";          		\
 -                echo;                                                                                             		\
--                echo "$(DESTDIR)/$(sensors_config_dir)/sensors-default.conf already exist...";					\
--                echo "Installing default configuration in $(DESTDIR)/$(sensors_config_dir)/sensors-default.conf-dist";		\
+-                echo "$(DESTDIR)$(sensors_config_dir)/sensors-default.conf already exist...";					\
+-                echo "Installing default configuration in $(DESTDIR)$(sensors_config_dir)/sensors-default.conf-dist";		\
 -                echo;                                                                                             		\
 -                echo "********************************************************************************";          		\
--		$(INSTALL) -m 644 $(top_srcdir)/sensors-default.conf $(DESTDIR)/$(sensors_config_dir)/sensors-default.conf-dist;\
+-		$(INSTALL) -m 644 $(top_srcdir)/sensors-default.conf $(DESTDIR)$(sensors_config_dir)/sensors-default.conf-dist;\
 -        else                                                                                                      		\
--                $(INSTALL) -m 644 $(top_srcdir)/sensors-default.conf $(DESTDIR)/$(sensors_config_dir)/;        			\
+-                $(INSTALL) -m 644 $(top_srcdir)/sensors-default.conf $(DESTDIR)$(sensors_config_dir)/;        			\
 -        fi
 +	$(INSTALL) -m 644 $(top_srcdir)/sensors-default.conf $(DESTDIR)/$(sensors_config_dir)/sensors-default.conf-dist;
- 
++
  # 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:
diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist
index 7a3489305c21..154d2aef1ca7 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -12,7 +12,6 @@ include/libprelude/ssl-gencrypto.h
 include/libprelude/ssl-settings.h
 include/libprelude/ssl-registration-msg.h
 include/libprelude/daemonize.h
-include/libprelude/string-matching.h
 include/libprelude/timer.h
 include/libprelude/list.h
 include/libprelude/variable.h
@@ -22,6 +21,7 @@ include/libprelude/prelude-client.h
 include/libprelude/prelude-client-mgr.h
 include/libprelude/prelude-getopt.h
 include/libprelude/prelude-getopt-wide.h
+include/libprelude/prelude-inet.h
 include/libprelude/prelude-io.h
 include/libprelude/prelude-message.h
 include/libprelude/prelude-message-buffered.h
@@ -38,49 +38,13 @@ include/libprelude/config.h
 lib/libprelude.so.0
 lib/libprelude.so
 lib/libprelude.la
-share/doc/libprelude/c4.html
-share/doc/libprelude/index.html
-share/doc/libprelude/libprelude-client-ident.html
-share/doc/libprelude/libprelude-common.html
-share/doc/libprelude/libprelude-config-engine.html
-share/doc/libprelude/libprelude-daemonize.html
-share/doc/libprelude/libprelude-extract.html
-share/doc/libprelude/libprelude-idmef-message-id.html
-share/doc/libprelude/libprelude-idmef-msg-send.html
-share/doc/libprelude/libprelude-idmef-tree-func.html
-share/doc/libprelude/libprelude-idmef-tree.html
-share/doc/libprelude/libprelude-list.html
-share/doc/libprelude/libprelude-plugin-common-prv.html
-share/doc/libprelude/libprelude-prelude-io.html
-share/doc/libprelude/libprelude-plugin-common.html
-share/doc/libprelude/libprelude-prelude-async.html
-share/doc/libprelude/libprelude-prelude-auth.html
-share/doc/libprelude/libprelude-prelude-client-mgr.html
-share/doc/libprelude/libprelude-prelude-client.html
-share/doc/libprelude/libprelude-prelude-getopt-wide.html
-share/doc/libprelude/libprelude-prelude-getopt.html
-share/doc/libprelude/libprelude-prelude-ident.html
-share/doc/libprelude/libprelude-prelude-list.html
-share/doc/libprelude/libprelude-prelude-log.html
-share/doc/libprelude/libprelude-prelude-message-buffered.html
-share/doc/libprelude/libprelude-prelude-message-id.html
-share/doc/libprelude/libprelude-prelude-message.html
-share/doc/libprelude/libprelude-prelude-path.html
-share/doc/libprelude/libprelude-sensor.html
-share/doc/libprelude/libprelude-ssl-gencrypto.html
-share/doc/libprelude/libprelude-ssl-registration-msg.html
-share/doc/libprelude/libprelude-ssl-settings.html
-share/doc/libprelude/libprelude-ssl.html
-share/doc/libprelude/libprelude-string-matching.html
-share/doc/libprelude/libprelude-threads.html
-share/doc/libprelude/libprelude-timer.html
-share/doc/libprelude/libprelude-variable.html
-share/doc/libprelude/index.sgml
+%%DOCSDIR%%/c4.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/libprelude-prelude-io.html
+%%DOCSDIR%%/index.sgml
 @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 share/doc/libprelude
+@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
-@exec /sbin/ldconfig -m 
-@unexec /sbin/ldconfig  -R
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index d09a7c23c11e..ad3070ffac2e 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	prelude-lml
-PORTVERSION=	0.8.3
+PORTVERSION=	0.8.4
 CATEGORIES=	security
 MASTER_SITES=   http://www.prelude-ids.org/download/releases/
 
@@ -15,8 +15,8 @@ COMMENT=	Prelude Network Intrusion Detection System Log Monitoring Lackey
 LIB_DEPENDS+=	prelude.0:${PORTSDIR}/security/libprelude \
 		pcre.0:${PORTSDIR}/devel/pcre
 
-GNU_MAKE=		yes
-GNU_CONFIGURE=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc \
 			--program-prefix=""
 
diff --git a/security/prelude-lml/distinfo b/security/prelude-lml/distinfo
index 2eda314cb74d..7935132b7bb9 100644
--- a/security/prelude-lml/distinfo
+++ b/security/prelude-lml/distinfo
@@ -1 +1 @@
-MD5 (prelude-lml-0.8.3.tar.gz) = 2dd22a105da2c93a529202d2621e9c1c
+MD5 (prelude-lml-0.8.4.tar.gz) = 7d28baf005e337f55b627f71d12cf038
diff --git a/security/prelude-lml/files/patch-Makefile.in b/security/prelude-lml/files/patch-Makefile.in
index b500e3127f12..64d405d82cd8 100644
--- a/security/prelude-lml/files/patch-Makefile.in
+++ b/security/prelude-lml/files/patch-Makefile.in
@@ -1,37 +1,33 @@
---- Makefile.in.orig	Sat Apr 26 16:39:13 2003
-+++ Makefile.in	Sat Jun  7 10:38:05 2003
-@@ -172,11 +172,11 @@
- 	$(mkinstalldirs) $(DESTDIR)$(preludeconfdir)
- 	@list='$(preludeconf_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(preludeconfdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(preludeconfdir)/$$p; \
-+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(preludeconfdir)/$$p-dist"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(preludeconfdir)/$$p-dist; \
- 	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(preludeconfdir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(preludeconfdir)/$$p; \
-+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(preludeconfdir)/$$p-dist"; \
-+	    $(INSTALL_DATA) $$p $(DESTDIR)$(preludeconfdir)/$$p-dist; \
- 	  fi; fi; \
- 	done
- 
-@@ -413,17 +413,7 @@
+--- Makefile.in.orig	Mon Sep 22 10:08:39 2003
++++ Makefile.in	Mon Sep 22 15:21:05 2003
+@@ -593,28 +593,8 @@
  
  install-data-local:
- 	$(INSTALL) -m 700 -d $(DESTDIR)/$(configdir)/metadata;							
--	@if test -f $(DESTDIR)/$(configdir)/prelude-lml.conf; then         					\
+ 	$(INSTALL) -m 700 -d $(DESTDIR)$(configdir)/metadata;							
+-	@if test -f $(DESTDIR)$(configdir)/prelude-lml.conf; then         					\
+-		echo "********************************************************************************"; 	\
+-                echo;                                                                                    	\
+-                echo "$(DESTDIR)$(configdir)/prelude-lml.conf already exist...";				\
+-                echo "Installing default configuration in $(DESTDIR)$(configdir)/prelude-lml.conf-dist";        \
+-                echo;                                                                                    	\
+-                echo "********************************************************************************"; 	\
+-		$(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/prelude-lml.conf-dist;  \
+-        else                                                                                             	\
+-                $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/;                       \
+-        fi
+-	@if test -f $(DESTDIR)$(configdir)/plugins.rules; then         					\
 -		echo "********************************************************************************"; 	\
 -                echo;                                                                                    	\
--                echo "$(DESTDIR)/$(configdir)/prelude-lml.conf already exist...";				\
--                echo "Installing default configuration in $(DESTDIR)/$(configdir)/prelude-lml.conf-dist";       \
+-                echo "$(DESTDIR)$(configdir)/plugins.rules already exist...";					\
+-                echo "Installing default configuration in $(DESTDIR)$(configdir)/plugins.rules-dist";	        \
 -                echo;                                                                                    	\
 -                echo "********************************************************************************"; 	\
--		$(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)/$(configdir)/prelude-lml.conf-dist; \
+-		$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/plugins.rules-dist;	\
 -        else                                                                                             	\
--                $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)/$(configdir)/;                      \
+-		$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/;				\
 -        fi
-+	$(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)/$(configdir)/prelude-lml.conf-dist;
++	$(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/prelude-lml.conf-dist;  \
++	$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/plugins.rules-dist;	\
  
- nickel: distclean
- 	@find . -type f -name Makefile.in | xargs rm
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(configdir)/prelude-lml.conf;	\
diff --git a/security/prelude-lml/pkg-plist b/security/prelude-lml/pkg-plist
index c3ca441bb924..d308445de3d9 100644
--- a/security/prelude-lml/pkg-plist
+++ b/security/prelude-lml/pkg-plist
@@ -3,15 +3,18 @@ etc/prelude-lml/ruleset/checkpoint.rules
 etc/prelude-lml/ruleset/cisco.rules
 etc/prelude-lml/ruleset/exim.rules
 etc/prelude-lml/ruleset/grsecurity.rules
+etc/prelude-lml/ruleset/ipchains.rules
 etc/prelude-lml/ruleset/ipfw.rules
 etc/prelude-lml/ruleset/ipso.rules
 etc/prelude-lml/ruleset/netfilter.rules
 etc/prelude-lml/ruleset/ntsyslog.rules
+etc/prelude-lml/ruleset/portsentry.rules
 etc/prelude-lml/ruleset/proftpd.rules
 etc/prelude-lml/ruleset/qpopper.rules
 etc/prelude-lml/ruleset/simple.rules
 etc/prelude-lml/ruleset/squid.rules
 etc/prelude-lml/ruleset/ssh.rules
+etc/prelude-lml/ruleset/vigor.rules
 etc/prelude-lml/ruleset/vpopmail.rules
 etc/prelude-lml/ruleset/zywall.rules
 etc/prelude-lml/ruleset/zyxel.rules
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index f1cd63d67f11..5c25f2158f07 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	prelude-manager
-PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTVERSION=	0.8.8
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
@@ -16,7 +15,7 @@ COMMENT=	Prelude Network Intrusion Detection System central logging point
 LIB_DEPENDS+=		prelude.0:${PORTSDIR}/security/libprelude \
 			xml2.5:${PORTSDIR}/textproc/libxml2
 
-GNU_MAKE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc \
 			--program-prefix="" --localstatedir=/var
diff --git a/security/prelude-manager/distinfo b/security/prelude-manager/distinfo
index e6d606042128..896797280838 100644
--- a/security/prelude-manager/distinfo
+++ b/security/prelude-manager/distinfo
@@ -1 +1 @@
-MD5 (prelude-manager-0.8.7.tar.gz) = c36667a893abecd731eac5d8b6157e02
+MD5 (prelude-manager-0.8.8.tar.gz) = b567855251693bc54bf892f4f6ca59e2
diff --git a/security/prelude-manager/files/patch-Makefile.in b/security/prelude-manager/files/patch-Makefile.in
index decc3582c755..0624360d0424 100644
--- a/security/prelude-manager/files/patch-Makefile.in
+++ b/security/prelude-manager/files/patch-Makefile.in
@@ -1,21 +1,22 @@
---- Makefile.in.orig	Sat Jun  7 11:01:57 2003
-+++ Makefile.in	Sat Jun  7 11:02:54 2003
-@@ -420,17 +420,7 @@
+--- Makefile.in.orig	Mon Sep 22 15:45:29 2003
++++ Makefile.in	Mon Sep 22 15:47:15 2003
+@@ -628,17 +628,8 @@
  install-data-local:
- 	$(INSTALL) -d -m 700 $(DESTDIR)/$(configdir);
- 	$(INSTALL) -d -m 700 $(DESTDIR)/$(manager_fifo_dir)
--	@if test -f $(DESTDIR)/$(configdir)/prelude-manager.conf; then                                                  \
--		$(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)/$(configdir)/prelude-manager.conf-dist; \
+ 	$(INSTALL) -d -m 700 $(DESTDIR)$(configdir);
+ 	$(INSTALL) -d -m 700 $(DESTDIR)$(manager_fifo_dir)
+-	@if test -f $(DESTDIR)$(configdir)/prelude-manager.conf; then                                                  \
+-		$(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \
 -		echo "********************************************************************************";     		\
 -		echo;											     		\
--		echo "$(DESTDIR)/$(configdir)/prelude-manager.conf already exist...";                                   \
--		echo "Installing default configuration in $(DESTDIR)/$(configdir)/prelude-manager.conf-dist";           \
+-		echo "$(DESTDIR)$(configdir)/prelude-manager.conf already exist...";                                   \
+-		echo "Installing default configuration in $(DESTDIR)$(configdir)/prelude-manager.conf-dist";           \
 -		echo;                                                                                        		\
 -		echo "********************************************************************************";     		\
 -	else                                                                                                 		\
--		$(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)/$(configdir)/;                          \
+-		$(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(configdir)/;                          \
 -	fi                                                                                                   
-+	$(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)/$(configdir)/prelude-manager.conf-dist; 
- 
++	$(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist
++
  # 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:
diff --git a/security/prelude-manager/pkg-plist b/security/prelude-manager/pkg-plist
index bd21794cefe0..040374e3b946 100644
--- a/security/prelude-manager/pkg-plist
+++ b/security/prelude-manager/pkg-plist
@@ -26,16 +26,35 @@ lib/prelude-manager/reports/xmlmod.la
 share/prelude-manager/mysql/mysql.sql
 share/prelude-manager/pgsql/postgres.sql
 share/prelude-manager/xmlmod/idmef-message.dtd
-%%MYSQL%%share/prelude-manager/mysql/mysql.sql
-%%PGSQL%%share/prelude-manager/pgsql/postgres.sql
+%%DOCSDIR%%/c4.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/prelude-manager-admin-server.html
+%%DOCSDIR%%/prelude-manager-auth.html
+%%DOCSDIR%%/prelude-manager-idmef-db-output.html
+%%DOCSDIR%%/prelude-manager-idmef-message-read.html
+%%DOCSDIR%%/prelude-manager-idmef-message-scheduler.html
+%%DOCSDIR%%/prelude-manager-idmef-util.html
+%%DOCSDIR%%/prelude-manager-ntp.html
+%%DOCSDIR%%/prelude-manager-pconfig.html
+%%DOCSDIR%%/prelude-manager-plugin-db.html
+%%DOCSDIR%%/prelude-manager-plugin-decode.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/prelude-manager-plugin-filter.html
+%%DOCSDIR%%/prelude-manager-plugin-report.html
+%%DOCSDIR%%/prelude-manager-plugin-util.html
+%%DOCSDIR%%/prelude-manager-report-infos.html
+%%DOCSDIR%%/prelude-manager-sensor-server.html
+%%DOCSDIR%%/prelude-manager-server-generic.html
+%%DOCSDIR%%/prelude-manager-server-logic.html
+%%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/decodes
 @dirrm lib/prelude-manager/reports
 @dirrm lib/prelude-manager
-@dirrm share/doc/prelude-manager
 @dirrm share/prelude-manager/mysql
 @dirrm share/prelude-manager/pgsql
 @dirrm share/prelude-manager/xmlmod
 @dirrm share/prelude-manager
+@dirrm %%DOCSDIR%%
 @unexec rmdir /var/spool/prelude-manager 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf /var/spool/prelude-manager`` to remove any files left." | fmt
diff --git a/security/prelude-nids/Makefile b/security/prelude-nids/Makefile
index 75167b91e1ec..839f9d5d357a 100644
--- a/security/prelude-nids/Makefile
+++ b/security/prelude-nids/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	prelude-nids
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.3
 CATEGORIES=	security
 MASTER_SITES=   http://www.prelude-ids.org/download/releases/
 
@@ -14,9 +14,8 @@ COMMENT=	Prelude Network Intrusion Detection System sensor
 
 LIB_DEPENDS=		prelude.0:${PORTSDIR}/security/libprelude
 
-GNU_MAKE=	yes
-GNU_CONFIGURE=	yes
-
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--with-html-dir=${PREFIX}/share/doc \
 			--program-prefix=""
diff --git a/security/prelude-nids/distinfo b/security/prelude-nids/distinfo
index a99e1e14e772..efb9bb9a638f 100644
--- a/security/prelude-nids/distinfo
+++ b/security/prelude-nids/distinfo
@@ -1 +1 @@
-MD5 (prelude-nids-0.8.1.tar.gz) = ffaa17e6694f12b8d5ede91c1fbdf22d
+MD5 (prelude-nids-0.8.3.tar.gz) = 7169709920f15a414e14d50587feb0c5
diff --git a/security/prelude-nids/pkg-plist b/security/prelude-nids/pkg-plist
index fb4424ba46fd..8883b90974a7 100644
--- a/security/prelude-nids/pkg-plist
+++ b/security/prelude-nids/pkg-plist
@@ -1,41 +1,55 @@
 bin/prelude-nids
+etc/prelude-nids/ruleset/attack-responses.rules
+etc/prelude-nids/ruleset/backdoor.rules
+etc/prelude-nids/ruleset/bad-traffic.rules
+etc/prelude-nids/ruleset/chat.rules
+etc/prelude-nids/ruleset/ddos.rules
+etc/prelude-nids/ruleset/deleted.rules
+etc/prelude-nids/ruleset/dns.rules
+etc/prelude-nids/ruleset/dos.rules
+etc/prelude-nids/ruleset/experimental.rules
 etc/prelude-nids/ruleset/exploit.rules
-etc/prelude-nids/ruleset/scan.rules
 etc/prelude-nids/ruleset/finger.rules
-etc/prelude-nids/ruleset/shellcode.rules
 etc/prelude-nids/ruleset/ftp.rules
-etc/prelude-nids/ruleset/smtp.rules
 etc/prelude-nids/ruleset/icmp-info.rules
-etc/prelude-nids/ruleset/sql.rules
 etc/prelude-nids/ruleset/icmp.rules
-etc/prelude-nids/ruleset/telnet.rules
+etc/prelude-nids/ruleset/imap.rules
 etc/prelude-nids/ruleset/info.rules
-etc/prelude-nids/ruleset/tftp.rules
-etc/prelude-nids/ruleset/attack-responses.rules
 etc/prelude-nids/ruleset/local.rules
-etc/prelude-nids/ruleset/virus.rules
-etc/prelude-nids/ruleset/backdoor.rules
 etc/prelude-nids/ruleset/misc.rules
-etc/prelude-nids/ruleset/web-attacks.rules
-etc/prelude-nids/ruleset/bad-traffic.rules
+etc/prelude-nids/ruleset/multimedia.rules
+etc/prelude-nids/ruleset/mysql.rules
 etc/prelude-nids/ruleset/netbios.rules
-etc/prelude-nids/ruleset/web-cgi.rules
-etc/prelude-nids/ruleset/classification.config
+etc/prelude-nids/ruleset/nntp.rules
+etc/prelude-nids/ruleset/oracle.rules
+etc/prelude-nids/ruleset/other-ids.rules
+etc/prelude-nids/ruleset/p2p.rules
 etc/prelude-nids/ruleset/policy.rules
-etc/prelude-nids/ruleset/web-coldfusion.rules
+etc/prelude-nids/ruleset/pop3.rules
 etc/prelude-nids/ruleset/porn.rules
-etc/prelude-nids/ruleset/web-frontpage.rules
-etc/prelude-nids/ruleset/ddos.rules
 etc/prelude-nids/ruleset/prelude.rules
-etc/prelude-nids/ruleset/web-iis.rules
-etc/prelude-nids/ruleset/dns.rules
 etc/prelude-nids/ruleset/rpc.rules
-etc/prelude-nids/ruleset/web-misc.rules
-etc/prelude-nids/ruleset/dos.rules
 etc/prelude-nids/ruleset/rservices.rules
+etc/prelude-nids/ruleset/scan.rules
+etc/prelude-nids/ruleset/shellcode.rules
+etc/prelude-nids/ruleset/smtp.rules
+etc/prelude-nids/ruleset/snmp.rules
+etc/prelude-nids/ruleset/sql.rules
+etc/prelude-nids/ruleset/telnet.rules
+etc/prelude-nids/ruleset/tftp.rules
+etc/prelude-nids/ruleset/virus.rules
+etc/prelude-nids/ruleset/web-attacks.rules
+etc/prelude-nids/ruleset/web-cgi.rules
+etc/prelude-nids/ruleset/web-client.rules
+etc/prelude-nids/ruleset/web-coldfusion.rules
+etc/prelude-nids/ruleset/web-frontpage.rules
+etc/prelude-nids/ruleset/web-iis.rules
+etc/prelude-nids/ruleset/web-misc.rules
+etc/prelude-nids/ruleset/web-php.rules
 etc/prelude-nids/ruleset/x11.rules
-etc/prelude-nids/ruleset/reference.config
+etc/prelude-nids/ruleset/pop2.rules
 etc/prelude-nids/unitable.txt
+etc/prelude-nids/prelude-nids.conf-dist
 @unexec [ -f %D/etc/prelude-nids/prelude-nids.conf-dist ] && rm %D/etc/prelude-nids/prelude-nids.conf-dist || true
 include/prelude-nids/nids-alert.h
 include/prelude-nids/nids-alert-id.h