4 files changed, 36 insertions, 54 deletions

diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index 03154d0f8c62..094c9fb2c3b1 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -4,30 +4,30 @@
 # $FreeBSD$
 
 PORTNAME=	libpreludedb
-PORTVERSION=	0.9.14.1
-PORTREVISION=	2
+PORTVERSION=	0.9.15.1
 CATEGORIES=	security
-MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
-		http://www.prelude-ids.org/download/releases/old/
+MASTER_SITES=	http://www.prelude-ids.com/download/releases/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTNAME} ${PORTNAME}/old
 
 MAINTAINER=	r.gruyters@yirdis.nl
 COMMENT=	Framework library for access to Prelude NIDS database
 
-LIB_DEPENDS=	prelude.14:${PORTSDIR}/security/libprelude
+LIB_DEPENDS=	prelude.17:${PORTSDIR}/security/libprelude
 
-USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
-LDCONFIG_DIRS=		%%PREFIX%%/lib \
-			%%PREFIX%%/lib/libpreludedb/plugins/formats
-USE_LDCONFIG=		yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
-OPTIONS=		PERL "Include Perl bindings" off \
-			PYTHON "Include Python bindings" off \
-			MYSQL "Use MySQL backend" on \
-			PGSQL "Use PostgreSQL backend" off \
-			SQLITE "Use SQLite backend" off
+CONFIGURE_ARGS=	--enable-gtk-doc=no
+USE_LDCONFIG=	yes
 
-MAN1=			preludedb-admin.1
+MAN1=		preludedb-admin.1
+PORTDOCS=	*
+
+OPTIONS=	PERL "Include Perl bindings" off \
+		PYTHON "Include Python bindings" off \
+		MYSQL "Use MySQL backend" on \
+		PGSQL "Use PostgreSQL backend" off \
+		SQLITE "Use SQLite backend" off
 
 .include <bsd.port.pre.mk>
 
@@ -42,41 +42,36 @@ PLIST_SUB+=		WITH_PERL="@comment "
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=		2.3+
-# Need to manually include bsd.python.mk, because USE_PYTHON is defined
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=		WITH_PYTHON=""
+PLIST_SUB+=		WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
 .else
 CONFIGURE_ARGS+=	--without-python
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
-.if !defined(WITHOUT_MYSQL)
+.if defined(WITH_MYSQL) || exists(${LOCALBASE}/bin/mysql_config)
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql
 PLIST_SUB+=		WITH_MYSQL=""
-LDCONFIG_DIRS+=		%%PREFIX%%/lib/libpreludedb/plugins/sql
 .else
 CONFIGURE_ARGS+=	--without-mysql
 PLIST_SUB+=		WITH_MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if defined(WITH_PGSQL) || exists(${LOCALBASE}/bin/pg_config)
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql
 PLIST_SUB+=		WITH_PGSQL=""
-LDCONFIG_DIRS+=		%%PREFIX%%/lib/libpreludedb/plugins/sql
 .else
 CONFIGURE_ARGS+=	--without-pgsql
 PLIST_SUB+=		WITH_PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if defined(WITH_SQLITE) || exists(${LOCALBASE}/lib/libsqlite3.so)
 USE_SQLITE=		yes
 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+=	--without-sqlite3
 PLIST_SUB+=		WITH_SQLITE="@comment "
@@ -84,11 +79,14 @@ PLIST_SUB+=		WITH_SQLITE="@comment "
 
 .if !defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
+.endif
 
 post-install:
-	@${MKDIR} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+	@${INSTALL} -d ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/
 .endif
 
+	@${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/
+
 .include <bsd.port.post.mk>
diff --git a/security/libpreludedb/distinfo b/security/libpreludedb/distinfo
index 19196e7b4690..116cce6e8a3a 100644
--- a/security/libpreludedb/distinfo
+++ b/security/libpreludedb/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpreludedb-0.9.14.1.tar.gz) = d5e37cccc32ca54fece68b7eee589f01
-SHA256 (libpreludedb-0.9.14.1.tar.gz) = f52cd9a386f36b85410e071a5ee2f90baceb527402707f2c1165265a2259e9dc
-SIZE (libpreludedb-0.9.14.1.tar.gz) = 757477
+MD5 (libpreludedb-0.9.15.1.tar.gz) = 792b6ce058e4b9db44279409dbc662a3
+SHA256 (libpreludedb-0.9.15.1.tar.gz) = 711b453b3528944bed1baa6c4f7fac823c141f0777a8c9c58437b1eb4e11756c
+SIZE (libpreludedb-0.9.15.1.tar.gz) = 810742
diff --git a/security/libpreludedb/files/patch-Makefile.in b/security/libpreludedb/files/patch-Makefile.in
index 048d2cf7c9b9..7a953caef57e 100644
--- a/security/libpreludedb/files/patch-Makefile.in
+++ b/security/libpreludedb/files/patch-Makefile.in
@@ -1,11 +1,13 @@
---- Makefile.in.orig	Sat Jan 21 01:56:42 2006
-+++ Makefile.in	Sat Jan 21 01:56:54 2006
-@@ -291,7 +291,7 @@
+--- Makefile.in.orig	2008-09-09 04:18:38.000000000 -0800
++++ Makefile.in	2008-09-29 20:14:33.000000000 -0800
+@@ -517,9 +517,8 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
  ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+-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
  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 
+ AM_CPPFLAGS = @PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing @LIBPRELUDE_CFLAGS@
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index 46955f80145e..90ac980e8993 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -26,6 +26,7 @@ lib/libpreludedb/plugins/formats/classic.la
 %%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-0.0.0-py%%PYTHON_VER%%.egg-info
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc
 share/aclocal/libpreludedb.m4
@@ -52,28 +53,9 @@ share/aclocal/libpreludedb.m4
 %%DATADIR%%/classic/sqlite-update-14-6.sql
 %%DATADIR%%/classic/sqlite-update-14-7.sql
 %%DATADIR%%/classic/sqlite.sql
-%%PORTDOCS%%%%DOCSDIR%%/ch01.html
-%%PORTDOCS%%%%DOCSDIR%%/home.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/left.png
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb-preludedb-error.html
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb-preludedb-path-selection.html
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb-preludedb-plugin-format.html
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb-preludedb-plugin-sql.html
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb-preludedb-sql-settings.html
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb-preludedb-sql.html
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb-preludedb-version.html
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb-preludedb.html
-%%PORTDOCS%%%%DOCSDIR%%/right.png
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/up.png
-%%PORTDOCS%%%%DOCSDIR%%/libpreludedb.devhelp2
 %%WITH_MYSQL%%@dirrmtry lib/libpreludedb/plugins/sql
 %%WITH_PGSQL%%@dirrmtry lib/libpreludedb/plugins/sql
 %%WITH_SQLITE%%@dirrmtry lib/libpreludedb/plugins/sql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/classic
 @dirrm %%DATADIR%%
 @dirrmtry lib/libpreludedb/plugins/sql