2 files changed, 59 insertions, 91 deletions

diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index a69442ac991c..5221df2c8185 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -3,13 +3,15 @@
 
 PORTNAME=	libpreludedb
 PORTVERSION=	1.0.1p1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	https://www.prelude-ids.org/attachments/download/287/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework library for access to Prelude NIDS database
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
 		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
@@ -18,84 +20,56 @@ LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
 		libnettle.so:${PORTSDIR}/security/nettle \
 		libp11-kit.so:${PORTSDIR}/security/p11-kit
 
+USES=		gettext gmake iconv libtool
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
-USES=		gettext iconv gmake
-
-CONFIGURE_ARGS=	--enable-gtk-doc=no
+CONFIGURE_ARGS=	--enable-gtk-doc=no \
+		--with-html-dir=${PREFIX}/share/doc
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-MAN1=		preludedb-admin.1
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS MYSQL PERL PGSQL PYTHON SQLITE
-OPTIONS_DEFAULT=MYSQL
-PERL_DESC=	Perl bindings
-MYSQL_DESC=	MySQL plugin
-PQSQL_DESC=	PostgreSQL plugin
-SQLITE_DESC=	SQLite3 plugin
+OPTIONS_DEFINE=		DOCS PERL PYTHON
+OPTIONS_MULTI=		DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=	MYSQL
+OPTIONS_SUB=		yes
+
+MYSQL_DESC=		MySQL plugin
+MYSQL_USE=		mysql=yes
+MYSQL_CONFIGURE_WITH=	mysql
+PERL_DESC=		Perl bindings
+PERL_USES=		perl5
+PERL_USE=		perl5=build,fixpacklist,run
+PERL_CONFIGURE_WITH=	perl
+PGSQL_DESC=		PostgreSQL plugin
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_WITH=	postgresql
+PYTHON_USES=		python
+PYTHON_CONFIGURE_WITH=	python
+PYTHON_PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
+SQLITE_DESC=		SQLite3 plugin
+SQLITE_USE=		sqlite=yes
+SQLITE_CONFIGURE_WITH=	sqlite3
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
+post-install:
+	(cd ${WRKSRC}/docs/manpages && ${INSTALL_MAN} *.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs/api/html && ${INSTALL_DATA} * \
+		${STAGEDIR}${DOCSDIR})
 .if ${PORT_OPTIONS:MPERL}
-USES+=			perl5
-CONFIGURE_ARGS+=	--with-perl
-PLIST_SUB+=		WITH_PERL=""
-.else
-CONFIGURE_ARGS+=	--without-perl
-PLIST_SUB+=		WITH_PERL="@comment "
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \
+		-name "*.so" | ${XARGS} ${STRIP_CMD}
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \
+		-name "perllocal.pod*" -delete
 .endif
-
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
-CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=		WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
-.else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUB+=		WITH_PYTHON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--with-mysql
-PLIST_SUB+=		WITH_MYSQL=""
-.else
-CONFIGURE_ARGS+=	--without-mysql
-PLIST_SUB+=		WITH_MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
-CONFIGURE_ARGS+=	--with-postgresql
-PLIST_SUB+=		WITH_PGSQL=""
-.else
-CONFIGURE_ARGS+=	--without-postgresql
-PLIST_SUB+=		WITH_PGSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=		yes
-CONFIGURE_ARGS+=	--with-sqlite3
-PLIST_SUB+=		WITH_SQLITE=""
-LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3
-.else
-CONFIGURE_ARGS+=	--without-sqlite3
-PLIST_SUB+=		WITH_SQLITE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-.endif
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -d ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MPERL}
-	@${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
+	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
+		-name "*.so" | ${XARGS} ${STRIP_CMD}
 .endif
-	@${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/
 
 .include <bsd.port.mk>
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index 6b2ca7e42388..53916e9c7bec 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -1,32 +1,29 @@
-bin/preludedb-admin
 bin/libpreludedb-config
+bin/preludedb-admin
+include/libpreludedb/preludedb.h
+include/libpreludedb/preludedb-error.h
 include/libpreludedb/preludedb-path-selection.h
-include/libpreludedb/preludedb-plugin-sql.h
 include/libpreludedb/preludedb-plugin-format.h
+include/libpreludedb/preludedb-plugin-sql.h
 include/libpreludedb/preludedb-sql-settings.h
 include/libpreludedb/preludedb-sql.h
 include/libpreludedb/preludedb-version.h
-include/libpreludedb/preludedb-error.h
-include/libpreludedb/preludedb.h
-lib/libpreludedb.so.4
 lib/libpreludedb.so
-lib/libpreludedb.la
+lib/libpreludedb.so.0
+lib/libpreludedb.so.0.4.10
 lib/libpreludedb/plugins/formats/classic.so
-lib/libpreludedb/plugins/formats/classic.la
-%%WITH_MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
-%%WITH_MYSQL%%lib/libpreludedb/plugins/sql/mysql.la
-%%WITH_PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
-%%WITH_PGSQL%%lib/libpreludedb/plugins/sql/pgsql.la
-%%WITH_SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so
-%%WITH_SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.la
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/PreludeDB.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/.packlist
-%%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
+%%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
+%%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
+%%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/PreludeDB.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/.packlist
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/PreludeDB.so
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-0.0.0-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc
+man/man1/preludedb-admin.1.gz
 share/aclocal/libpreludedb.m4
 %%DATADIR%%/classic/mysql-update-14-1.sql
 %%DATADIR%%/classic/mysql-update-14-2.sql
@@ -51,9 +48,6 @@ share/aclocal/libpreludedb.m4
 %%DATADIR%%/classic/sqlite-update-14-6.sql
 %%DATADIR%%/classic/sqlite-update-14-7.sql
 %%DATADIR%%/classic/sqlite.sql
-%%WITH_MYSQL%%@dirrmtry lib/libpreludedb/plugins/sql
-%%WITH_PGSQL%%@dirrmtry lib/libpreludedb/plugins/sql
-%%WITH_SQLITE%%@dirrmtry lib/libpreludedb/plugins/sql
 @dirrm %%DATADIR%%/classic
 @dirrm %%DATADIR%%
 @dirrmtry lib/libpreludedb/plugins/sql