- Update to 0.9.4 (unbreaks fetching)

- Chase libprelude version bump
- Override LDCONFIG_DIRS to specify where we install shlibs [1]
- Sort pkg-plist

Obtained from:	Frank van Vliet <frank@pine.nl> [1]

4 files changed, 23 insertions, 21 deletions

diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index a2ff0a093797..66102efccc21 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -4,24 +4,22 @@
 # $FreeBSD$
 
 PORTNAME=	libpreludedb
-PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Framework library for access to Prelude NIDS database
 
-LIB_DEPENDS=	prelude.4:${PORTSDIR}/security/libprelude
-
-BROKEN=		Unfetchable
+LIB_DEPENDS=	prelude.6:${PORTSDIR}/security/libprelude
 
 USE_GPG=		yes
 SIG_SUFFIX=		.sig
-USE_REINPLACE=		yes
 USE_GMAKE=		yes
 USE_AUTOTOOLS=		libtool:15
 INSTALLS_SHLIB=		yes
+LDCONFIG_DIRS=		%%PREFIX%%/lib \
+			%%PREFIX%%/lib/libpreludedb/plugins/format
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITH_PERL)
@@ -46,6 +44,7 @@ PLIST_SUB+=		WITH_PYTHON="@comment "
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--enable-mysql
 PLIST_SUB+=		WITH_MYSQL=""
+LDCONFIG_DIRS+=		%%PREFIX%%/lib/libpreludedb/plugins/sql
 .else
 CONFIGURE_ARGS+=	--disable-mysql
 PLIST_SUB+=		WITH_MYSQL="@comment "
@@ -55,6 +54,7 @@ PLIST_SUB+=		WITH_MYSQL="@comment "
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--enable-pgsql
 PLIST_SUB+=		WITH_PGSQL=""
+LDCONFIG_DIRS+=		%%PREFIX%%/lib/libpreludedb/plugins/sql
 .else
 CONFIGURE_ARGS+=	--disable-pgsql
 PLIST_SUB+=		WITH_PGSQL="@comment "
diff --git a/security/libpreludedb/distinfo b/security/libpreludedb/distinfo
index 0bf98c280297..6329ba63a7c3 100644
--- a/security/libpreludedb/distinfo
+++ b/security/libpreludedb/distinfo
@@ -1,6 +1,6 @@
-MD5 (libpreludedb-0.9.2.tar.gz) = 896c468dee41c0f1c9197f3459d8aff5
-SHA256 (libpreludedb-0.9.2.tar.gz) = 5b930911c3048d34ffa6cb088177681e77ad3e23dc8b7e3e5916acab43664d98
-SIZE (libpreludedb-0.9.2.tar.gz) = 565906
-MD5 (libpreludedb-0.9.2.tar.gz.sig) = 24f3613747d4a9f36d8bf8d938966545
-SHA256 (libpreludedb-0.9.2.tar.gz.sig) = 545b47f03152d4b3b74a78da124820eecb675405e4775c7acdf36c95aed4e68c
-SIZE (libpreludedb-0.9.2.tar.gz.sig) = 827
+MD5 (libpreludedb-0.9.4.tar.gz) = ec824192968057e79a938748ca40b963
+SHA256 (libpreludedb-0.9.4.tar.gz) = d5b6d4e37e2ffb07bc611613cd3e1b9d8f115d35501afb8ec6ca3806cf5a5840
+SIZE (libpreludedb-0.9.4.tar.gz) = 709506
+MD5 (libpreludedb-0.9.4.tar.gz.sig) = 61b73d44351dd042c0583342756e8df3
+SHA256 (libpreludedb-0.9.4.tar.gz.sig) = c7113ffed93e1e93fd193ba8b03a359c61dcf3fa2d3f7cfa88fba960d246a859
+SIZE (libpreludedb-0.9.4.tar.gz.sig) = 827
diff --git a/security/libpreludedb/files/patch-Makefile.in b/security/libpreludedb/files/patch-Makefile.in
index 2f471375c2f3..048d2cf7c9b9 100644
--- a/security/libpreludedb/files/patch-Makefile.in
+++ b/security/libpreludedb/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Oct 14 20:45:15 2005
-+++ Makefile.in	Fri Oct 14 20:45:27 2005
-@@ -185,7 +185,7 @@ ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
+--- Makefile.in.orig	Sat Jan 21 01:56:42 2006
++++ Makefile.in	Sat Jan 21 01:56:54 2006
+@@ -291,7 +291,7 @@
+ ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
  EXTRA_DIST = LICENSE.README HACKING.README
- 
 -SUBDIRS = m4 libmissing src plugins bindings docs
-+SUBDIRS = m4 libmissing src plugins bindings 
- 
++SUBDIRS = m4 libmissing src plugins bindings
  bin_SCRIPTS = $(top_builddir)/libpreludedb-config
  distuninstallcheck_listfiles = find . -type f -print | grep -v 'perl' | grep -v '3pm'
+ AM_CPPFLAGS = @defined@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing 
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index a5bd8d19782c..4d5db3fee693 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -9,7 +9,7 @@ include/libpreludedb/preludedb-sql.h
 include/libpreludedb/preludedb-version.h
 include/libpreludedb/preludedb-error.h
 include/libpreludedb/preludedb.h
-lib/libpreludedb.so.1
+lib/libpreludedb.so.2
 lib/libpreludedb.so
 lib/libpreludedb.a
 lib/libpreludedb/plugins/formats/classic.so
@@ -25,14 +25,16 @@ lib/libpreludedb/plugins/formats/classic.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc
 share/aclocal/libpreludedb.m4
-%%DATADIR%%/classic/mysql.sql
 %%DATADIR%%/classic/mysql-update-14-1.sql
 %%DATADIR%%/classic/mysql-update-14-2.sql
 %%DATADIR%%/classic/mysql-update-14-3.sql
-%%DATADIR%%/classic/pgsql.sql
+%%DATADIR%%/classic/mysql.sql
+%%DATADIR%%/classic/mysql2sqlite.sh
 %%DATADIR%%/classic/pgsql-update-14-1.sql
 %%DATADIR%%/classic/pgsql-update-14-2.sql
 %%DATADIR%%/classic/pgsql-update-14-3.sql
+%%DATADIR%%/classic/pgsql.sql
+%%DATADIR%%/classic/sqlite.sql
 %%PORTDOCS%%%%DOCSDIR%%/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/home.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html