- Update to 0.9.21.2

PR:		131286
Submitted by:	Vladimir Korkodinov <viper at perm dot raid dot ru>
Approved by:	Robin Gruyters <r dot gruyters at snow dot nl> (maintainer)

5 files changed, 36 insertions, 160 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 1f18157bc444..977363f9f52b 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -4,8 +4,7 @@
 # $FreeBSD$
 
 PORTNAME=	libprelude
-PORTVERSION=	0.9.20.2
-PORTREVISION=	1
+PORTVERSION=	0.9.21.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.com/download/releases/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME} ${PORTNAME}/old
@@ -18,11 +17,12 @@ LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
 OPTIONS=	PERL "Include Perl bindings" off \
 		PYTHON "Include Python bindings" off
 
-USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
-USE_LDCONFIG=		yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
-			--enable-gtk-doc=no
+		--enable-gtk-doc=no \
+		--with-html-dir=${PREFIX}/share/doc
 
 MAN1=		prelude-admin.1
 PORTDOCS=	*
@@ -31,6 +31,7 @@ PORTDOCS=	*
 
 .if defined(WITH_PERL)
 USE_PERL5=		yes
+.include "${PORTSDIR}/Mk/bsd.perl.mk"
 CONFIGURE_ARGS+=	--with-perl
 PLIST_SUB+=		WITH_PERL=""
 .else
@@ -39,7 +40,8 @@ PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
 .if defined(WITH_PYTHON)
-USE_PYTHON=		2.3+
+USE_PYTHON=     yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
 CONFIGURE_ARGS+=	--with-python
 PLIST_SUB+=		WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
 .else
@@ -47,10 +49,6 @@ CONFIGURE_ARGS+=	--without-python
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
-.if !defined(NOPORTDOCS)
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-.endif
-
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile
 .endif
@@ -60,24 +58,28 @@ post-install:
 	${INSTALL} -d ${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 ; \
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index ad3a563c3c5e..5e9cb85746c7 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,3 +1,3 @@
-MD5 (libprelude-0.9.20.2.tar.gz) = 4980065cc9fc7f8d6f0ca25e902b745d
-SHA256 (libprelude-0.9.20.2.tar.gz) = e6df8831fe9b8f12bd12cac92ac2a891b4dfaefedbb4e8c703a696272e188e06
-SIZE (libprelude-0.9.20.2.tar.gz) = 2407849
+MD5 (libprelude-0.9.21.2.tar.gz) = 767ea378580caab14ebb4df0ee5e4129
+SHA256 (libprelude-0.9.21.2.tar.gz) = cc8c05f0855bfea1e02bb938547a7be4d81465bfe2d89f180e3a17325978bf19
+SIZE (libprelude-0.9.21.2.tar.gz) = 2484552
diff --git a/security/libprelude/files/patch-Makefile.in b/security/libprelude/files/patch-Makefile.in
index ef5239dded2c..74a7be4526a2 100644
--- a/security/libprelude/files/patch-Makefile.in
+++ b/security/libprelude/files/patch-Makefile.in
@@ -1,68 +1,13 @@
---- Makefile.in.orig	2008-09-09 04:55:27.000000000 -0400
-+++ Makefile.in	2008-09-09 04:55:27.000000000 -0400
-@@ -1174,61 +1174,10 @@
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR);
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;
- 	$(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/profile;
--	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf; then							\
--		echo;														\
--		echo "********************************************************************************";          		\
--                echo;														\
--                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf already exist...";					\
--                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist";		\
--                echo;														\
--                echo "********************************************************************************";			\
--		echo;														\
--		$(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist;		\
--        else															\
--                $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;				\
--        fi
--
--	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf; then							\
--		echo;														\
--		echo "********************************************************************************";          		\
--                echo;														\
--                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf already exist...";					\
--                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist";		\
--                echo;														\
--                echo "********************************************************************************";			\
--		echo;														\
--		$(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist;		\
--        else															\
--                $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;				\
--        fi															
--
--	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf; then						\
--		echo;														\
--		echo "********************************************************************************";          		\
--                echo;														\
--                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf already exist...";					\
--                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist";		\
--                echo;														\
--                echo "********************************************************************************";			\
--		echo;														\
--		$(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;\
--        else															\
--                $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;			\
--        fi
--
--	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf; then								\
--		echo;														\
--		echo "********************************************************************************";          		\
--                echo;														\
--                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf already exist...";						\
--                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist";			\
--                echo;														\
--                echo "********************************************************************************";			\
--		echo;														\
--		$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist;			\
--        else															\
--                $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;					\
--	fi
-+	$(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist;
-+	$(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist;
-+	$(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;
-+	$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist;
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf
+--- Makefile.in.orig	2008-10-13 19:04:05.000000000 +0600
++++ Makefile.in	2009-02-11 13:26:51.000000000 +0500
+@@ -725,8 +725,8 @@
+ target_vendor = @target_vendor@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --without-system-ltdl --enable-easy-bindings
+ ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
+-@HAVE_SYSTEM_LIBLTDL_FALSE@SUBDIRS = libltdl libmissing m4 src prelude-admin bindings docs tests
+-@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libmissing m4 src prelude-admin bindings docs tests
++@HAVE_SYSTEM_LIBLTDL_FALSE@SUBDIRS = libltdl libmissing m4 src prelude-admin bindings tests
++@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libmissing m4 src prelude-admin bindings tests
+ DIST_SUBDIRS = $(SUBDIRS)
+ EXTRA_DIST = HACKING.README LICENSE.README tls.conf
+ bin_SCRIPTS = $(top_builddir)/libprelude-config
diff --git a/security/libprelude/files/patch-libmissing_Makefile.in b/security/libprelude/files/patch-libmissing_Makefile.in
deleted file mode 100644
index a3eb53616b12..000000000000
--- a/security/libprelude/files/patch-libmissing_Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
---- libmissing/Makefile.in.orig	2008-09-09 04:55:25.000000000 -0400
-+++ libmissing/Makefile.in	2008-09-09 04:55:25.000000000 -0400
-@@ -686,7 +686,7 @@
- 	sys/time.h-t time.h time.h-t unistd.h unistd.h-t wchar.h \
- 	wchar.h-t wctype.h wctype.h-t
- MOSTLYCLEANDIRS = arpa netinet sys sys
--CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
-+CLEANFILES = configmake.h configmake.h-t ref-add.sed \
- 	ref-del.sed
- DISTCLEANFILES = 
- MAINTAINERCLEANFILES = 
-@@ -709,8 +709,6 @@
- 	vsnprintf.c
- libmissing_la_LDFLAGS = $(AM_LDFLAGS)
- LINK_WARNING_H = $(top_srcdir)/./link-warning.h
--charset_alias = $(DESTDIR)$(libdir)/charset.alias
--charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-@@ -1247,44 +1245,6 @@
- 	} > $@-t
- 	mv $@-t $@
- 
--# We need the following in order to install a simple file in $(libdir)
--# which is shared with other installed packages. We use a list of referencing
--# packages so that "make uninstall" will remove the file if and only if it
--# is not used by another installed package.
--# On systems with glibc-2.1 or newer, the file is redundant, therefore we
--# avoid installing it.
--
--all-local: charset.alias ref-add.sed ref-del.sed
--install-exec-local: all-local
--	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
--	if test -f $(charset_alias); then \
--	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
--	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
--	  rm -f $(charset_tmp) ; \
--	else \
--	  if test $(GLIBC21) = no; then \
--	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
--	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
--	    rm -f $(charset_tmp) ; \
--	  fi ; \
--	fi
--
--uninstall-local: all-local
--	if test -f $(charset_alias); then \
--	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
--	  if grep '^# Packages using this file: $$' $(charset_tmp) \
--	      > /dev/null; then \
--	    rm -f $(charset_alias); \
--	  else \
--	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
--	  fi; \
--	  rm -f $(charset_tmp); \
--	fi
--
--charset.alias: config.charset
--	rm -f t-$@ $@
--	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
--	mv t-$@ $@
- .sin.sed:
- 	rm -f t-$@ $@
- 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist
index e0ce5ece3632..c304e2f6bc6c 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -59,22 +59,16 @@ include/libprelude/prelude-string.h
 include/libprelude/prelude-thread.h
 include/libprelude/prelude-timer.h
 include/libprelude/prelude.h
-include/libprelude/variable.h
 lib/libprelude.la
 lib/libprelude.so
-lib/libprelude.so.17
+lib/libprelude.so.19
 %%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_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/PreludeEasy.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/PreludeEasy.bs
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/PreludeEasy.so
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-0.0.0-py%%PYTHON_VER%%.egg-info
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-0.9.21.2-py%%PYTHON_VER%%.egg-info
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
 share/aclocal/libprelude.m4