- Update to 0.9.24.1, unbreak

PR:		ports/138371
Submitted by:	Vladimir Korkodinov <viper@perm.raid.ru>
Approved by:	maintainer timeout (17 days)
Feature safe:	yes

4 files changed, 15 insertions, 25 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 35872b5cf1e6..e19005660a93 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 
 PORTNAME=	libprelude
-PORTVERSION=	0.9.21.2
+PORTVERSION=	0.9.24.1
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.com/download/releases/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME} ${PORTNAME}/old
@@ -14,8 +14,6 @@ COMMENT=	Framework library for Prelude NIDS
 
 LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls
 
-BROKEN=		does not configure
-
 OPTIONS=	PERL "Include Perl bindings" off \
 		PYTHON "Include Python bindings" off
 
@@ -29,7 +27,7 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 MAN1=		prelude-admin.1
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_PERL)
 USE_PERL5=		yes
@@ -42,8 +40,7 @@ PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
 .if defined(WITH_PYTHON)
-USE_PYTHON=     yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_PYTHON=	yes
 CONFIGURE_ARGS+=	--with-python
 PLIST_SUB+=		WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
 .else
@@ -51,10 +48,15 @@ CONFIGURE_ARGS+=	--without-python
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/src/Makefile.in
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d ${DOCSDIR}
@@ -69,7 +71,7 @@ post-install:
 	                ${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 ; \
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index 5e9cb85746c7..0501d2925915 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (libprelude-0.9.24.1.tar.gz) = 07868b3d54fa8243455a27da6b87239c
+SHA256 (libprelude-0.9.24.1.tar.gz) = 877383ba5e51709aad22a6547dc94b2453fef92a4923661b6fd98a2869875daf
+SIZE (libprelude-0.9.24.1.tar.gz) = 2582719
diff --git a/security/libprelude/files/patch-Makefile.in b/security/libprelude/files/patch-Makefile.in
deleted file mode 100644
index 74a7be4526a2..000000000000
--- a/security/libprelude/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/pkg-plist b/security/libprelude/pkg-plist
index c304e2f6bc6c..8430c3195739 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -61,16 +61,17 @@ include/libprelude/prelude-timer.h
 include/libprelude/prelude.h
 lib/libprelude.la
 lib/libprelude.so
-lib/libprelude.so.19
+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.21.2-py%%PYTHON_VER%%.egg-info
+%%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
+libdata/pkgconfig/libprelude.pc
 share/aclocal/libprelude.m4
 @dirrm include/libprelude
 @dirrm etc/prelude/default