libprelude

- update to 0.8.10
- use NOPORTDOCS
prelude-lml
- chase shlib version, bump portrevision
prelude-manager
- update to 0.8.10
prelude-nids
- update to 0.8.6

PR:		ports/60113
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org> (maintainer)

4 files changed, 72 insertions, 49 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