Update to 0.9.15.3. No normal upstream changelog. Pkgsrc package reworked,

but it's not final yet. From Rumko via PR 41763.

6 files changed, 102 insertions, 42 deletions

diff --git a/security/libpreludedb/MESSAGE b/security/libpreludedb/MESSAGE
index 7e1de0fb60a..6b927ac550c 100644
--- a/security/libpreludedb/MESSAGE
+++ b/security/libpreludedb/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/06/06 12:30:02 shannonjr Exp $
+$NetBSD: MESSAGE,v 1.2 2009/08/24 13:50:03 hasso Exp $
 Instructions for setting database creation may be found in the prelude
 handbook:
 
-https://trac.prelude-ids.org/wiki/InstallingLibpreludedb
+https://trac.prelude-ids.org/wiki/InstallingPreludeDbLibrary
 
 Deletion of database entries can be quite slow unless some additional
 indices are created. The additional indices can be created by entering:
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index b3e9d93f3fb..745aa1bb1d7 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2009/03/05 18:51:31 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/08/24 13:50:03 hasso Exp $
 #
 
-DISTNAME=		libpreludedb-0.9.15
-PKGREVISION=		2
+DISTNAME=		libpreludedb-0.9.15.3
 CATEGORIES=		security
 MASTER_SITES=		http://www.prelude-ids.com/download/releases/libpreludedb/
 
@@ -10,27 +9,24 @@ MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		http://www.prelude-ids.org/download/releases/
 COMMENT=		Provides an interface to the database used to store IDMEF alerts
 
-.include "../../mk/mysql.buildlink3.mk"
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		make perl:run
-CONFIGURE_ARGS+=	-enable-mysql
+USE_TOOLS+=		make
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--enable-python
-CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
-CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
-CONFIGURE_ARGS+=	--with-pgsql=no
-LDFLAGS+=		${BUILDLINK_LDFLAGS.mysql-client}
-PY_PATCHPLIST=		yes
+USE_LANGUAGES=		c c++
+
+.include "options.mk"
+
+pre-configure:
+	${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la ${BUILDLINK_DIR}/lib/libltdlc.la
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/addIndices.sql ${PREFIX}/share/libpreludedb/classic
+	${INSTALL_DATA} ${FILESDIR}/addIndices.sql ${DESTDIR}${PREFIX}/share/libpreludedb/classic
 
 .include "../../security/libprelude/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../lang/perl5/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libpreludedb/PLIST b/security/libpreludedb/PLIST
index f22387a569d..3dfd0a03fbf 100644
--- a/security/libpreludedb/PLIST
+++ b/security/libpreludedb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:13:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/08/24 13:50:03 hasso Exp $
 bin/libpreludedb-config
 bin/preludedb-admin
 include/libpreludedb/preludedb-error.h
@@ -11,14 +11,12 @@ include/libpreludedb/preludedb-version.h
 include/libpreludedb/preludedb.h
 lib/libpreludedb.la
 lib/libpreludedb/plugins/formats/classic.la
-lib/libpreludedb/plugins/sql/mysql.la
-lib/perl5/site_perl/5.10.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/PreludeDB/.packlist
-lib/perl5/site_perl/5.10.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/PreludeDB/PreludeDB.bs
-lib/perl5/site_perl/5.10.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/PreludeDB/PreludeDB.so
-lib/perl5/site_perl/5.10.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/PreludeDB.pm
-${PYSITELIB}/_preludedb.so
-${PYSITELIB}/preludedb.py
-${PYSITELIB}/preludedb.pyc
+${PLIST.mysql}lib/libpreludedb/plugins/sql/mysql.la
+${PLIST.pgsql}lib/libpreludedb/plugins/sql/pgsql.la
+${PLIST.sqlite3}lib/libpreludedb/plugins/sql/sqlite3.la
+${PLIST.python}${PYSITELIB}/_preludedb.so
+${PLIST.python}${PYSITELIB}/preludedb.py
+${PLIST.python}${PYSITELIB}/preludedb.pyc
 share/aclocal/libpreludedb.m4
 share/gtk-doc/html/libpreludedb/ch01.html
 share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2
@@ -59,7 +57,7 @@ share/libpreludedb/classic/addIndices.sql
 share/libpreludedb/classic/pgsql.sql
 share/libpreludedb/classic/sqlite.sql
 share/libpreludedb/classic/sqlite-update-14-4.sql
-man/man1/preludedb-admin.1
 share/libpreludedb/classic/mysql-update-14-6.sql
 share/libpreludedb/classic/pgsql-update-14-6.sql
 share/libpreludedb/classic/sqlite-update-14-6.sql
+man/man1/preludedb-admin.1
diff --git a/security/libpreludedb/distinfo b/security/libpreludedb/distinfo
index 26c96f1321e..89f426f0c89 100644
--- a/security/libpreludedb/distinfo
+++ b/security/libpreludedb/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2008/08/27 22:37:09 shannonjr Exp $
+$NetBSD: distinfo,v 1.14 2009/08/24 13:50:03 hasso Exp $
 
-SHA1 (libpreludedb-0.9.15.tar.gz) = 4de780db1b623a0ed1f73f3cb56165bfa943ecd7
-RMD160 (libpreludedb-0.9.15.tar.gz) = b9eb07df2fa569e046f6f2a143e98f3845bbcfff
-Size (libpreludedb-0.9.15.tar.gz) = 810314 bytes
-SHA1 (patch-aa) = a51e3b80b09f856c6cae21b0f0773d0a8a1eb95c
+SHA1 (libpreludedb-0.9.15.3.tar.gz) = 617ca366401f461380ceff5de037efa7743ca1ec
+RMD160 (libpreludedb-0.9.15.3.tar.gz) = 70af1692966a6b31d4b18a2342a74991d3e8bfed
+Size (libpreludedb-0.9.15.3.tar.gz) = 935457 bytes
+SHA1 (patch-aa) = 11cb4f1353a5dbfc046992d862230849aeb21afa
diff --git a/security/libpreludedb/options.mk b/security/libpreludedb/options.mk
new file mode 100644
index 00000000000..f34ef701e31
--- /dev/null
+++ b/security/libpreludedb/options.mk
@@ -0,0 +1,66 @@
+# $NetBSD: options.mk,v 1.1 2009/08/24 13:50:03 hasso Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.libpreludedb
+PKG_SUPPORTED_OPTIONS=		perl python
+PKG_OPTIONS_NONEMPTY_SETS=	database
+PKG_OPTIONS_SET.database=	mysql pgsql sqlite3
+
+# hmmmm, maybe the user should be forced to select?
+PKG_SUGGESTED_OPTIONS=		sqlite3
+
+.include "../../mk/bsd.options.mk"
+
+###
+### python is needed for prewikka
+###
+
+PLIST_VARS+=		python mysql pgsql sqlite3
+.if !empty(PKG_OPTIONS:Mperl)
+CONFIGURE_ARGS+=	--with-perl=${PERL5:Q} --with-perl-installdirs=vendor
+USE_TOOLS+=		perl:run
+
+PERL5_PACKLIST=		${PERL5_VENDORARCH}auto/PreludeDB/.packlist
+PERL5_CONFIGURE=	no
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/perl5/module.mk"
+.else
+CONFIGURE_ARGS+=	--with-perl=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mpython)
+CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
+PYBINMODULE=		yes
+PLIST.python=		yes
+PY_PATCHPLIST=		yes
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.else
+CONFIGURE_ARGS+=	--with-python=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysql)
+CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config
+
+PLIST.mysql=		yes
+.include "../../mk/mysql.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-mysql=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+CONFIGURE_ARGS+=	--with-postgresql=${PGSQL_PREFIX}/bin/pg_config
+
+PLIST.pgsql=		yes
+.include "../../mk/pgsql.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-postgresql=no
+.endif
+
+.if !empty(PKG_OPTIONS:Msqlite3)
+CONFIGURE_ARGS+=	--with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
+
+PLIST.sqlite3=		yes
+.include "../../databases/sqlite3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-sqlite3=no
+.endif
diff --git a/security/libpreludedb/patches/patch-aa b/security/libpreludedb/patches/patch-aa
index ba51729ef0a..39a80e0e310 100644
--- a/security/libpreludedb/patches/patch-aa
+++ b/security/libpreludedb/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2008/08/27 22:37:09 shannonjr Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/24 13:50:04 hasso Exp $
 
---- configure.orig	2008-08-27 13:14:38.000000000 -0600
-+++ configure
-@@ -21052,7 +21052,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+--- configure.orig	2009-07-20 22:39:58 +0200
++++ configure	2009-07-20 22:40:11 +0200
+@@ -12505,7 +12505,7 @@
  
- { echo "$as_me:$LINENO: checking for cpu-specific compiler flags" >&5
- echo $ECHO_N "checking for cpu-specific compiler flags... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for cpu-specific compiler flags" >&5
+ $as_echo_n "checking for cpu-specific compiler flags... " >&6; }
 -if test "$host_cpu" == "x86_64" && test $enable_static = "yes"; then
 +if test "$host_cpu" = "x86_64" && test $enable_static = "yes"; then
-         { echo "$as_me:$LINENO: result: x86_64/static: adding -fPIC" >&5
- echo "${ECHO_T}x86_64/static: adding -fPIC" >&6; }
-         { echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+         { $as_echo "$as_me:$LINENO: result: x86_64/static: adding -fPIC" >&5
+ $as_echo "x86_64/static: adding -fPIC" >&6; }
+