Update Prelude-IDS ports to 1.0.1 release

security/libprelude:
- Remove BROKEN, update to version 1.0.1 [1]
- Add missing deps, port requires pkg-config during build

security/libpreludedb:
- Update to version 1.0.1p1
- Add missing deps
- Make options deterministic and not dependent on what's installed

security/prelude-lml:
- Update to version 1.0.1
- Add missing deps, port requires pkg-config during build
- Convert to OptionsNG

security/prelude-manager:
- Update to version 1.0.2
- Add missing deps, port requires pkg-config during build
- Convert to OptionsNG, remove PRELUDEDB option - it can't be turned off
  by CONFIGURE_ARGS, package links to preludedb at all times if available

security/pflogger:
- Bump PORTREVISION, libprelude ABI version changed

www/py-prewikka:
- Update to version 1.0.1p1
- Convert to OptionsNG
- Sort plist

PR:		172056 [1]
Submitted by:	KATO Tsuguru <tkato432@yahoo.com> [1]

4 files changed, 96 insertions, 65 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 310fd35726cb..24f04a352ed9 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -2,27 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	libprelude
-PORTVERSION=	0.9.24.1
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	security
-MASTER_SITES=	http://www.prelude-technologies.com/download/releases/${PORTNAME}/
+MASTER_SITES=	https://www.prelude-ids.org/attachments/download/241/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework library for Prelude NIDS
 
-LIB_DEPENDS=	gnutls.47:${PORTSDIR}/security/gnutls \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
+		gnutls:${PORTSDIR}/security/gnutls \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
+		gpg-error:${PORTSDIR}/security/libgpg-error \
+		nettle:${PORTSDIR}/security/nettle \
+		p11-kit:${PORTSDIR}/security/p11-kit
 
 OPTIONS_DEFINE=	PERL PYTHON DOCS
 
-BROKEN=		does not configure
-
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool libltdl
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--enable-gtk-doc=no \
 		--with-html-dir=${PREFIX}/share/doc
+USE_GMAKE=	yes
+USE_PKGCONFIG=	build
+USE_ICONV=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	gnomehack
+USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		prelude-admin.1
 PORTDOCS=	*
@@ -30,22 +39,21 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=		yes
-.include "${PORTSDIR}/Mk/bsd.perl.mk"
-CONFIGURE_ARGS+=	--with-perl
-PLIST_SUB+=		WITH_PERL=""
+USE_PERL5=	yes
+CONFIGURE_ARGS+=--with-perl
+PLIST_SUB+=	PERL=""
 .else
-CONFIGURE_ARGS+=	--without-perl
-PLIST_SUB+=		WITH_PERL="@comment "
+CONFIGURE_ARGS+=--without-perl
+PLIST_SUB+=	PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
-CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=		WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
+CONFIGURE_ARGS+=--with-python
+PLIST_SUB+=	PYTHON="" PYTHON_VER="${PYTHON_VER}" VERSION="${PORTVERSION}"
 .else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUB+=		WITH_PYTHON="@comment "
+CONFIGURE_ARGS+=--without-python
+PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
@@ -55,38 +63,24 @@ BROKEN=		Does not compile
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^install-data-am:/s|install-data-local||' ${WRKSRC}/docs/api/Makefile.in
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1
+.for f in client.conf global.conf idmef-client.conf tls.conf
+	${INSTALL_DATA} ${WRKSRC}/${f} \
+		${PREFIX}/etc/prelude/default/${f}-dist
+.if !exists(${PREFIX}/etc/prelude/default/${f})
+	(cd ${PREFIX}/etc/prelude/default && ${CP} -p ${f}-dist ${f})
+.endif
+.endfor
+.if ${PORT_OPTIONS:MPERL}
+	-@${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod
+.endif
 .if ${PORT_OPTIONS:MDOCS}
-	${INSTALL} -d ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR}
 .endif
-	@${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/
-	@${INSTALL_DATA} ${WRKSRC}/client.conf \
-	                ${PREFIX}/etc/prelude/default/client.conf-dist
-	@${INSTALL_DATA} ${WRKSRC}/global.conf \
-	                ${PREFIX}/etc/prelude/default/global.conf-dist
-	@${INSTALL_DATA} ${WRKSRC}/tls.conf \
-	                ${PREFIX}/etc/prelude/default/tls.conf-dist
-	@${INSTALL_DATA} ${WRKSRC}/idmef-client.conf \
-	                ${PREFIX}/etc/prelude/default/idmef-client.conf-dist
-
-	@if [ ! -f ${PREFIX}/etc/prelude/default/client.conf ]; then \
-	   ${CP} -p ${PREFIX}/etc/prelude/default/client.conf-dist \
-	      ${PREFIX}/etc/prelude/default/client.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/prelude/default/global.conf ]; then \
-	   ${CP} -p ${PREFIX}/etc/prelude/default/global.conf-dist \
-	      ${PREFIX}/etc/prelude/default/global.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/prelude/default/idmef-client.conf ]; then \
-	   ${CP} -p ${PREFIX}/etc/prelude/default/idmef-client.conf-dist \
-	      ${PREFIX}/etc/prelude/default/idmef-client.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/prelude/default/tls.conf ]; then \
-	   ${CP} -p ${PREFIX}/etc/prelude/default/tls.conf-dist \
-	      ${PREFIX}/etc/prelude/default/tls.conf ; \
-	fi
 
 .include <bsd.port.post.mk>
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index 02ac72118940..69e225563e8b 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libprelude-0.9.24.1.tar.gz) = 877383ba5e51709aad22a6547dc94b2453fef92a4923661b6fd98a2869875daf
-SIZE (libprelude-0.9.24.1.tar.gz) = 2582719
+SHA256 (libprelude-1.0.1.tar.gz) = 852d981e7d23e49ec25a96a7f54c19a7ee72cd786a0d02c43a27e3e770d5cb6b
+SIZE (libprelude-1.0.1.tar.gz) = 2791973
diff --git a/security/libprelude/files/patch-src__include__prelude-plugin.h b/security/libprelude/files/patch-src__include__prelude-plugin.h
new file mode 100644
index 000000000000..be59c1f7ac4d
--- /dev/null
+++ b/security/libprelude/files/patch-src__include__prelude-plugin.h
@@ -0,0 +1,13 @@
+--- src/include/prelude-plugin.h.orig	2012-06-02 00:12:30.000000000 +0900
++++ src/include/prelude-plugin.h	2012-09-11 15:46:33.000000000 +0900
+@@ -61,9 +61,9 @@
+  */
+ #ifdef PRELUDE_APPLICATION_USE_LIBTOOL2
+ # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
+-#endif
+ 
+ extern const void *lt_preloaded_symbols[];
++#endif
+ 
+ #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS()         \
+         prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols)
diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist
index 8430c3195739..a5c6ea05b84d 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -16,9 +16,12 @@ etc/prelude/default/tls.conf-dist
 @exec if [ ! -f %D/etc/prelude/default/tls.conf ] ; then cp -p %D/%F %B/tls.conf; fi
 include/libprelude/common.h
 include/libprelude/daemonize.h
+include/libprelude/idmef.h
+include/libprelude/idmef.hxx
 include/libprelude/idmef-additional-data.h
 include/libprelude/idmef-class.h
 include/libprelude/idmef-criteria.h
+include/libprelude/idmef-criteria.hxx
 include/libprelude/idmef-criterion-value.h
 include/libprelude/idmef-data.h
 include/libprelude/idmef-message-helpers.h
@@ -27,19 +30,29 @@ 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-path.hxx
 include/libprelude/idmef-time.h
+include/libprelude/idmef-time.hxx
 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/idmef-value.hxx
+include/libprelude/idmef-value-type.h
+include/libprelude/prelude.h
+include/libprelude/prelude.hxx
 include/libprelude/prelude-async.h
-include/libprelude/prelude-client-profile.h
 include/libprelude/prelude-client.h
+include/libprelude/prelude-client.hxx
+include/libprelude/prelude-client-easy.hxx
+include/libprelude/prelude-client-profile.h
+include/libprelude/prelude-client-profile.hxx
 include/libprelude/prelude-config.h
-include/libprelude/prelude-connection-pool.h
 include/libprelude/prelude-connection.h
+include/libprelude/prelude-connection.hxx
+include/libprelude/prelude-connection-pool.h
+include/libprelude/prelude-connection-pool.hxx
 include/libprelude/prelude-error.h
+include/libprelude/prelude-error.hxx
 include/libprelude/prelude-extract.h
 include/libprelude/prelude-failover.h
 include/libprelude/prelude-hash.h
@@ -49,6 +62,7 @@ include/libprelude/prelude-io.h
 include/libprelude/prelude-linked-object.h
 include/libprelude/prelude-list.h
 include/libprelude/prelude-log.h
+include/libprelude/prelude-log.hxx
 include/libprelude/prelude-message-id.h
 include/libprelude/prelude-msg.h
 include/libprelude/prelude-msgbuf.h
@@ -58,21 +72,31 @@ include/libprelude/prelude-plugin.h
 include/libprelude/prelude-string.h
 include/libprelude/prelude-thread.h
 include/libprelude/prelude-timer.h
-include/libprelude/prelude.h
+lib/libprelude.a
 lib/libprelude.la
 lib/libprelude.so
-lib/libprelude.so.20
-%%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_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-0.9.24.1-py%%PYTHON_VER%%.egg-info
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
+lib/libprelude.so.21
+lib/libpreludecpp.a
+lib/libpreludecpp.la
+lib/libpreludecpp.so
+lib/libpreludecpp.so.3
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.so
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/.packlist
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy-%%VERSION%%-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_PreludeEasy.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
 libdata/pkgconfig/libprelude.pc
 share/aclocal/libprelude.m4
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude
 @dirrm include/libprelude
 @dirrm etc/prelude/default
 @dirrmtry etc/prelude/profile