3 files changed, 38 insertions, 31 deletions

diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index ce7b63cd11e0..0b82644d22c4 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	opendnssec
-PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTVERSION=	1.4.5
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/dns/ldns
 LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
@@ -27,40 +26,38 @@ CONFLICTS=	opendnssec-1.[0-3]*
 USERS=		opendnssec
 GROUPS=		opendnssec
 
-MAN1=		ods-hsmspeed.1 ods-hsmutil.1 ods-ksmutil.1 ods-kaspcheck.1
-MAN5=		ods-timing.5
-MAN7=		opendnssec.7
-MAN8=		ods-control.8 ods-enforcerd.8 ods-signer.8 ods-signerd.8
+PORTDOCS=	KNOWN_ISSUES MIGRATION NEWS README.md
 
-PORTDOCS=	KNOWN_ISSUES MIGRATION NEWS README
+OPTIONS_DEFINE=		SOFTHSM
+OPTIONS_SUB=		yes
 
-OPTIONS_DEFINE=		SOFTHSM MYSQL
-SOFTHSM_DESC=		SoftHSM cryptographic store for PKCS \#11 interface
+OPTIONS_SINGLE=		DB
+OPTIONS_SINGLE_DB=	MYSQL SQLITE
 OPTIONS_DEFAULT=	MYSQL
 
-NO_STAGE=	yes
+SOFTHSM_DESC=		SoftHSM cryptographic store for PKCS \#11 interface
+
+MYSQL_DESC=		Use MYSQL backend
+SQLITE_DESC=		Use SQLite backend
+
+SQLITE_USE=	yes
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-database-backend=mysql
 USE_MYSQL=	compat
-PLIST_SUB+=	SQLITE="@comment "
-PLIST_SUB+=	MYSQL=""
 PORTDATA=	migrate_adapters_1.mysql migrate_keyshare_mysql.pl \
 		migrate_zone_delete.mysql migrate_id_mysql.pl migrate_to_ng_mysql.pl
-.else
-CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
+.endif
+
+.if ${PORT_OPTIONS:MSQLITE}
 BUILD_DEPENDS+=	sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
-PLIST_SUB+=	SQLITE=""
-PLIST_SUB+=	MYSQL="@comment "
 PORTDATA=	database_create.sqlite3 migrate_keyshare_sqlite3.pl \
 		migrate_adapters_1.sqlite3 migrate_to_ng_sqlite.pl
 .endif
 
 .if ${PORT_OPTIONS:MSOFTHSM}
-CONFIGURE_ARGS+=	--with-softhsm
 CONFIGURE_ARGS+=	--with-pkcs11-softhsm=${LOCALBASE}/lib/libsofthsm.so
 RUN_DEPENDS+=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
 .endif
@@ -74,13 +71,13 @@ pre-install:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+		@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 .if !defined(BATCH)
 	@${CAT} ${PKGMESSAGE}
 .endif
-	${INSTALL_DATA} ${PORTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${DATADIR}
-	${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec
+	${INSTALL_DATA} ${PORTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${STAGEDIR}${DATADIR}
+#	${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec
 
 .include <bsd.port.mk>
diff --git a/dns/opendnssec/distinfo b/dns/opendnssec/distinfo
index 3bfece6b0f16..8ff3180c791c 100644
--- a/dns/opendnssec/distinfo
+++ b/dns/opendnssec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendnssec-1.4.3.tar.gz) = 22979b53851a1ec74a242ca89bbd1fc58a170272f33c6a395f0ab14f6244e491
-SIZE (opendnssec-1.4.3.tar.gz) = 1012398
+SHA256 (opendnssec-1.4.5.tar.gz) = c4d4366497ab096c6887c51f7518d546a0419a44dfad1f57d4ec9e67bb95019b
+SIZE (opendnssec-1.4.5.tar.gz) = 1009953
diff --git a/dns/opendnssec/pkg-plist b/dns/opendnssec/pkg-plist
index d33aa392ed2b..e6e71e58874a 100644
--- a/dns/opendnssec/pkg-plist
+++ b/dns/opendnssec/pkg-plist
@@ -30,6 +30,21 @@ sbin/ods-signerd
 %%DATADIR%%/signconf.rng
 %%DATADIR%%/zonelist.rnc
 %%DATADIR%%/zonelist.rng
+man/man1/ods-hsmspeed.1.gz
+man/man1/ods-hsmutil.1.gz
+man/man1/ods-ksmutil.1.gz
+man/man1/ods-kaspcheck.1.gz
+man/man5/ods-timing.5.gz
+man/man7/opendnssec.7.gz
+man/man8/ods-control.8.gz
+man/man8/ods-enforcerd.8.gz
+man/man8/ods-signer.8.gz
+man/man8/ods-signerd.8.gz
+@exec chown opendnssec:opendnssec %D/var/opendnssec/unsigned
+@exec chown opendnssec:opendnssec %D/var/opendnssec/tmp
+@exec chown opendnssec:opendnssec %D/var/opendnssec/signed
+@exec chown opendnssec:opendnssec %D/var/opendnssec/signconf
+@dirrm var/opendnssec
 @dirrm var/opendnssec/unsigned
 @dirrm var/opendnssec/tmp
 @dirrm var/opendnssec/signed
@@ -37,11 +52,6 @@ sbin/ods-signerd
 @dirrm var/opendnssec
 @dirrm %%DATADIR%%
 @dirrm %%ETCDIR%%
-@exec mkdir -p %D/var/run/opendnssec
-@exec mkdir -p %D/var/opendnssec/unsigned
-@exec mkdir -p %D/var/opendnssec/tmp
-@exec mkdir -p %D/var/opendnssec/signed
-@exec mkdir -p %D/var/opendnssec/signconf
 @dirrmtry var/run/opendnssec
 @dirrmtry var/run
 @dirrmtry var