- Update to 0.9.0

- libprelude now always depends on GnuTLS
- Add two new knobs - WITH_PERL and WITH_PYTHON - to install Perl and Python
  bindings, respectively (both knobs are off by default)
- Remove patch we no longer need

4 files changed, 124 insertions, 130 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 2b788a296fb2..3d3f522292f6 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -4,14 +4,17 @@
 # $FreeBSD$
 
 PORTNAME=	libprelude
-PORTVERSION=	0.8.10
-PORTREVISION=	1
+DISTVERSION=	0.9.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Prelude Network Intrusion Detection System librairies
 
+LIB_DEPENDS=	gnutls.12:${PORTSDIR}/security/gnutls
+
+USE_GPG=		yes
+SIG_SUFFIX=		.sig
 USE_REINPLACE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL_VER=	13
@@ -19,23 +22,26 @@ INSTALLS_SHLIB=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc --localstatedir=/var
 
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=	--disable-openssl
+.if defined(WITH_PERL)
+USE_PERL5=		yes
+CONFIGURE_ARGS+=	--enable-perl
+PLIST_SUB+=		WITH_PERL=""
 .else
-USE_OPENSSL=		YES
+CONFIGURE_ARGS+=	--disable-perl
+PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	NOPORTDOCS=yes
+.if defined(WITH_PYTHON)
+USE_PYTHON=		yes
+CONFIGURE_ARGS+=	--enable-python
+PLIST_SUB+=		WITH_PYTHON=""
+.else
+CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
-post-extract:
-	@${ECHO} ""
-	@${ECHO} "*------------------------------------------------------------------*"
-	@${ECHO} "Options:"
-	@${ECHO} ""
-	@${ECHO} "      WITHOUT_SSL=yes         Disable SSL support in libprelude"
-	@${ECHO} "*------------------------------------------------------------------*"
-	@${ECHO} ""
+#.if defined(NOPORTDOCS)
+#MAKE_ENV+=	NOPORTDOCS=yes
+#.endif
 
 .include <bsd.port.mk>
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index bd4001f2a38a..2eea27839f1f 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,2 +1,4 @@
-MD5 (libprelude-0.8.10.tar.gz) = 68171b170d1f8ad7e38f949391e6b227
-SIZE (libprelude-0.8.10.tar.gz) = 898214
+MD5 (libprelude-0.9.0.tar.gz) = 95fe75b77b8be8992bc87274d6e2283a
+SIZE (libprelude-0.9.0.tar.gz) = 1672391
+MD5 (libprelude-0.9.0.tar.gz.sig) = cb1900bcd87857157598334de7dafba6
+SIZE (libprelude-0.9.0.tar.gz.sig) = 827
diff --git a/security/libprelude/files/patch-Makefile.in b/security/libprelude/files/patch-Makefile.in
deleted file mode 100644
index 336c27112e46..000000000000
--- a/security/libprelude/files/patch-Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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;
--	@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;                                                                                             		\
--                echo "********************************************************************************";          		\
--		$(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)/;        			\
--        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 ec09260cd8b0..e2074964acff 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -1,85 +1,116 @@
-bin/sensor-adduser
+@comment $FreeBSD$
 bin/libprelude-config
-@unexec [ -f %D/etc/prelude-sensors/sensors-default.conf-dist ] && rm %D/etc/prelude-sensors/sensors-default.conf-dist || true
-include/libprelude/config-engine.h
-include/libprelude/idmef-message-id.h
-include/libprelude/idmef-tree.h
-include/libprelude/idmef-tree-func.h
-include/libprelude/idmef-msg-send.h
-include/libprelude/plugin-common.h
-include/libprelude/plugin-common-prv.h
-include/libprelude/ssl-gencrypto.h
-include/libprelude/ssl-settings.h
-include/libprelude/ssl-registration-msg.h
+bin/prelude-adduser
+etc/prelude/default/client.conf
+etc/prelude/default/global.conf
+etc/prelude/default/idmef-client.conf
+etc/prelude/default/tls.conf
+include/libprelude/common.h
 include/libprelude/daemonize.h
-include/libprelude/timer.h
-include/libprelude/list.h
-include/libprelude/variable.h
-include/libprelude/prelude-auth.h
-include/libprelude/prelude-list.h
-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
-include/libprelude/prelude-message-id.h
+include/libprelude/idmef-additional-data.h
+include/libprelude/idmef-class.h
+include/libprelude/idmef-criteria.h
+include/libprelude/idmef-criterion-value.h
+include/libprelude/idmef-data.h
+include/libprelude/idmef-message-id.h
+include/libprelude/idmef-message-print.h
+include/libprelude/idmef-message-read.h
+include/libprelude/idmef-message-write.h
+include/libprelude/idmef-path.h
+include/libprelude/idmef-time.h
+include/libprelude/idmef-tree-data.h
+include/libprelude/idmef-tree-wrap.h
+include/libprelude/idmef-value-type.h
+include/libprelude/idmef-value.h
+include/libprelude/idmef.h
 include/libprelude/prelude-async.h
+include/libprelude/prelude-client-profile.h
+include/libprelude/prelude-client.h
+include/libprelude/prelude-config.h
+include/libprelude/prelude-connection-pool.h
+include/libprelude/prelude-connection.h
+include/libprelude/prelude-error.h
+include/libprelude/prelude-extract.h
+include/libprelude/prelude-failover.h
+include/libprelude/prelude-hash.h
 include/libprelude/prelude-ident.h
-include/libprelude/prelude-path.h
+include/libprelude/prelude-inttypes.h
+include/libprelude/prelude-io.h
+include/libprelude/prelude-linked-object.h
+include/libprelude/prelude-list.h
 include/libprelude/prelude-log.h
-include/libprelude/sensor.h
-include/libprelude/threads.h
-include/libprelude/extract.h
-include/libprelude/common.h
-include/libprelude/config.h
+include/libprelude/prelude-message-id.h
+include/libprelude/prelude-msg.h
+include/libprelude/prelude-msgbuf.h
+include/libprelude/prelude-option-wide.h
+include/libprelude/prelude-option.h
+include/libprelude/prelude-plugin.h
+include/libprelude/prelude-string.h
+include/libprelude/prelude-timer.h
+include/libprelude/prelude.h
+include/libprelude/variable.h
 lib/libprelude.a
 lib/libprelude.la
 lib/libprelude.so
-lib/libprelude.so.1
-%%PORTDOCS%%%%DOCSDIR%%/c4.html
+lib/libprelude.so.2
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.py
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.pyc
+share/aclocal/libprelude.m4
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%/ch04.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
 %%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%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-additional-data.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-criteria.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-criterion-value.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-data.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-message-print.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-message-read.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-message-write.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-path.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-time.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-tree-wrap.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-value.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-profile.html
 %%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-client.html
-%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-getopt-wide.html
-%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-getopt.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-connection-pool.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-connection.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-error.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-extract.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-failover.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-hash.html
 %%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-ident.html
 %%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-inet.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-inttypes.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-io.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-linked-object.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
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-msg.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-msgbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-option-wide.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-option.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-plugin.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-string.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-timer.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/pt01.html
+%%PORTDOCS%%%%DOCSDIR%%/pt02.html
+%%PORTDOCS%%%%DOCSDIR%%/pt03.html
+%%PORTDOCS%%%%DOCSDIR%%/pt04.html
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up.png
 %%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
+@dirrm include/libprelude