5 files changed, 43 insertions, 16 deletions

diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index 446c2e5566c2..437d9fc0d668 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -4,8 +4,7 @@
 # $FreeBSD$
 
 PORTNAME=	libpreludedb
-PORTVERSION=	0.9.7.1
-PORTREVISION=	1
+PORTVERSION=	0.9.8
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 		http://www.prelude-ids.org/download/releases/old/
@@ -13,7 +12,7 @@ MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 MAINTAINER=	r.gruyters@yirdis.nl
 COMMENT=	Framework library for access to Prelude NIDS database
 
-LIB_DEPENDS=	prelude.[6-?]:${PORTSDIR}/security/libprelude
+LIB_DEPENDS=	prelude.[8-9]:${PORTSDIR}/security/libprelude
 
 USE_GPG=		yes
 SIG_SUFFIX=		.sig
@@ -26,50 +25,50 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITH_PERL)
 USE_PERL5=		yes
-CONFIGURE_ARGS+=	--enable-perl
+CONFIGURE_ARGS+=	--with-perl
 PLIST_SUB+=		WITH_PERL=""
 .else
-CONFIGURE_ARGS+=	--disable-perl
+CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=		yes
-CONFIGURE_ARGS+=	--enable-python
+CONFIGURE_ARGS+=	--with-python
 PLIST_SUB+=		WITH_PYTHON=""
 .else
-CONFIGURE_ARGS+=	--disable-python
+CONFIGURE_ARGS+=	--without-python
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--enable-mysql
+CONFIGURE_ARGS+=	--with-mysql
 PLIST_SUB+=		WITH_MYSQL=""
 LDCONFIG_DIRS+=		%%PREFIX%%/lib/libpreludedb/plugins/sql
 .else
-CONFIGURE_ARGS+=	--disable-mysql
+CONFIGURE_ARGS+=	--without-mysql
 PLIST_SUB+=		WITH_MYSQL="@comment "
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=		yes
-CONFIGURE_ARGS+=	--enable-pgsql
+CONFIGURE_ARGS+=	--with-pgsql
 PLIST_SUB+=		WITH_PGSQL=""
 LDCONFIG_DIRS+=		%%PREFIX%%/lib/libpreludedb/plugins/sql
 .else
-CONFIGURE_ARGS+=	--disable-pgsql
+CONFIGURE_ARGS+=	--without-pgsql
 PLIST_SUB+=		WITH_PGSQL="@comment "
 .endif
 
 .if defined(WITH_SQLITE)
 USE_SQLITE=		yes
-CONFIGURE_ARGS+=	--enable-sqlite3
+CONFIGURE_ARGS+=	--with-sqlite3
 PLIST_SUB+=		WITH_SQLITE=""
 LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 LDCONFIG_DIRS+=		%%PREFIX%%/lib/libpreludedb/plugins/sql
 .else
-CONFIGURE_ARGS+=	--disable-sqlite3
+CONFIGURE_ARGS+=	--without-sqlite3
 PLIST_SUB+=		WITH_SQLITE="@comment "
 .endif
 
diff --git a/security/libpreludedb/distinfo b/security/libpreludedb/distinfo
index f1c8ced27dcf..1e9e5d9e61ea 100644
--- a/security/libpreludedb/distinfo
+++ b/security/libpreludedb/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpreludedb-0.9.7.1.tar.gz) = 7137575a3c907348296a386206ecc941
-SHA256 (libpreludedb-0.9.7.1.tar.gz) = f7af760a9a2c51224a0c51a30938d49eed820f5216787fb832ca275ced05f0a5
-SIZE (libpreludedb-0.9.7.1.tar.gz) = 716862
+MD5 (libpreludedb-0.9.8.tar.gz) = a9bd45d4d578d1fe8b8865ba066781db
+SHA256 (libpreludedb-0.9.8.tar.gz) = 8481939745a9a89403bd728934cd29300c39c93c58d8f6af6e2f9c1453ddeeb1
+SIZE (libpreludedb-0.9.8.tar.gz) = 719497
diff --git a/security/libpreludedb/files/patch-bindings_Makefile.in b/security/libpreludedb/files/patch-bindings_Makefile.in
new file mode 100644
index 000000000000..a0b68f85ad62
--- /dev/null
+++ b/security/libpreludedb/files/patch-bindings_Makefile.in
@@ -0,0 +1,11 @@
+--- bindings/Makefile.in.orig	Wed Jun  7 10:02:49 2006
++++ bindings/Makefile.in	Wed Jun  7 10:03:02 2006
+@@ -446,7 +446,7 @@
+ #
+ # Workaround for invalid Makefile generated by MakeMaker when UTF-8 is enabled.
+ #
+-@HAVE_PERL_TRUE@	cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) LD_RUN_PATH="" install
++@HAVE_PERL_TRUE@	cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) LD_RUN_PATH="" pure_install
+ 
+ @HAVE_PYTHON_TRUE@	cd python && $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
+ 
diff --git a/security/libpreludedb/files/patch-bindings_perl_PreludeDB.c b/security/libpreludedb/files/patch-bindings_perl_PreludeDB.c
new file mode 100644
index 000000000000..21b3a2cfd4ab
--- /dev/null
+++ b/security/libpreludedb/files/patch-bindings_perl_PreludeDB.c
@@ -0,0 +1,13 @@
+--- bindings/perl/PreludeDB.c.orig	Tue Jun  6 10:46:03 2006
++++ bindings/perl/PreludeDB.c	Tue Jun  6 10:46:46 2006
+@@ -14,6 +14,10 @@
+  *  declarations/attributes, and other compiler dependent labels.
+  *
+  ************************************************************************/
++/* workaround to build with perl-5.005 */
++#ifndef INT2PTR
++#  define INT2PTR(type, pointer) (type)(pointer)
++#endif
+ 
+ /* template workaround for compilers that cannot correctly implement the C++ standard */
+ #ifndef SWIGTEMPLATEDISAMBIGUATOR
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index 5f5b7c066b90..3d03905e9e28 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -24,6 +24,7 @@ lib/libpreludedb/plugins/formats/classic.la
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/.packlist
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/PreludeDB.bs
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/PreludeDB.so
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc
@@ -32,6 +33,7 @@ share/aclocal/libpreludedb.m4
 %%DATADIR%%/classic/mysql-update-14-2.sql
 %%DATADIR%%/classic/mysql-update-14-3.sql
 %%DATADIR%%/classic/mysql-update-14-4.sql
+%%DATADIR%%/classic/mysql-update-14-5.sql
 %%DATADIR%%/classic/mysql.sql
 %%DATADIR%%/classic/mysql2pgsql.sh
 %%DATADIR%%/classic/mysql2sqlite.sh
@@ -39,8 +41,10 @@ share/aclocal/libpreludedb.m4
 %%DATADIR%%/classic/pgsql-update-14-2.sql
 %%DATADIR%%/classic/pgsql-update-14-3.sql
 %%DATADIR%%/classic/pgsql-update-14-4.sql
+%%DATADIR%%/classic/pgsql-update-14-5.sql
 %%DATADIR%%/classic/pgsql.sql
 %%DATADIR%%/classic/sqlite-update-14-4.sql
+%%DATADIR%%/classic/sqlite-update-14-5.sql
 %%DATADIR%%/classic/sqlite.sql
 %%PORTDOCS%%%%DOCSDIR%%/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/home.png