5 files changed, 22 insertions, 29 deletions

diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index fa70e6a8ff0d..745eb2148ba8 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	opendnssec
-PORTVERSION=	1.3.7
+PORTVERSION=	1.3.9
 CATEGORIES=	dns
-MASTER_SITES=	http://www.opendnssec.org/files/source/
+MASTER_SITES=	http://www.opendnssec.org/files/source/ \
+		http://dist.opendnssec.org/source/
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
@@ -23,6 +24,9 @@ USE_PERL5=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
+
 MAN1=		ods-hsmspeed.1 ods-hsmutil.1 ods-ksmutil.1
 MAN5=		ods-timing.5
 MAN7=		opendnssec.7
@@ -66,10 +70,16 @@ RUN_DEPENDS+=	softhsm>=1.2.0:${PORTSDIR}/security/softhsm
 
 PKGMESSAGE=	${WRKSRC}/MIGRATION
 
+pre-install:
+.if defined(WITH_MYSQL)
+	@${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec
+.endif
+
 post-install:
 .if !defined(BATCH)
 	@${CAT} ${PKGMESSAGE}
 .endif
+	${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec
 
 .include <bsd.port.pre.mk>
 .if defined(WITH_AUDITOR) && ${RUBY_VER} == 1.9
diff --git a/dns/opendnssec/distinfo b/dns/opendnssec/distinfo
index f92f8b33c70d..409e3dc20fed 100644
--- a/dns/opendnssec/distinfo
+++ b/dns/opendnssec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendnssec-1.3.7.tar.gz) = 04893a8a92537c9e7b52fb2d6e84e724aa31df7cf8194922248fa46886d0afd1
-SIZE (opendnssec-1.3.7.tar.gz) = 1085010
+SHA256 (opendnssec-1.3.9.tar.gz) = 64c1b86c8a873409c32a90470914705c5562e81cc642e0355f4e655f2ef54968
+SIZE (opendnssec-1.3.9.tar.gz) = 1153929
diff --git a/dns/opendnssec/files/opendnssec.in b/dns/opendnssec/files/opendnssec.in
index f7554411550b..63320707366d 100644
--- a/dns/opendnssec/files/opendnssec.in
+++ b/dns/opendnssec/files/opendnssec.in
@@ -3,8 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: opendnssec
-# REQUIRE: LOGIN
-# REQUIRE: DAEMON
+# REQUIRE: LOGIN DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable opendnssec:
diff --git a/dns/opendnssec/files/patch-conf__Makefile.in b/dns/opendnssec/files/patch-conf__Makefile.in
deleted file mode 100644
index 271abf45079e..000000000000
--- a/dns/opendnssec/files/patch-conf__Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./conf/Makefile.in.orig	2011-03-20 23:41:56.000000000 +0100
-+++ ./conf/Makefile.in	2011-03-20 23:42:26.000000000 +0100
-@@ -531,17 +531,9 @@
- 
- install-data-hook:
- 	test -d ${DESTDIR}${sysconfdir} || mkdir -p ${DESTDIR}${sysconfdir}
--	test -f ${DESTDIR}${sysconfdir}/conf.xml || \
--		${INSTALL_DATA} -m 0640 conf.xml ${DESTDIR}${sysconfdir}
- 	${INSTALL_DATA} -m 640 conf.xml ${DESTDIR}${sysconfdir}/conf.xml.sample
--	test -f ${DESTDIR}${sysconfdir}/zonelist.xml || \
--		${INSTALL_DATA} zonelist.xml ${DESTDIR}${sysconfdir}
- 	${INSTALL_DATA} zonelist.xml ${DESTDIR}${sysconfdir}/zonelist.xml.sample
--	test -f ${DESTDIR}${sysconfdir}/zonefetch.xml || \
--		${INSTALL_DATA} -m 0640 zonefetch.xml ${DESTDIR}${sysconfdir}
- 	${INSTALL_DATA} -m 640 zonefetch.xml ${DESTDIR}${sysconfdir}/zonefetch.xml.sample
--	test -f ${DESTDIR}${sysconfdir}/kasp.xml || \
--		${INSTALL_DATA} kasp.xml ${DESTDIR}${sysconfdir}
- 	${INSTALL_DATA} kasp.xml ${DESTDIR}${sysconfdir}/kasp.xml.sample
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dns/opendnssec/pkg-plist b/dns/opendnssec/pkg-plist
index 1924745c96ce..b774565b6295 100644
--- a/dns/opendnssec/pkg-plist
+++ b/dns/opendnssec/pkg-plist
@@ -4,9 +4,13 @@ bin/ods-hsmutil
 bin/ods-ksmutil
 %%AUDITOR%%bin/ods-kaspcheck
 bin/ods-kasp2html
+@unexec if cmp -s %D/etc/opendnssec/conf.xml %D/etc/opendnssec/conf.xml.sample; then rm -f %D/etc/opendnssec/conf.xml; fi
 %%ETCDIR%%/conf.xml.sample
+@unexec if cmp -s %D/etc/opendnssec/kasp.xml %D/etc/opendnssec/kasp.xml.sample; then rm -f %D/etc/opendnssec/kasp.xml; fi
 %%ETCDIR%%/kasp.xml.sample
+@unexec if cmp -s %D/etc/opendnssec/zonefetch.xml %D/etc/opendnssec/zonefetch.xml.sample; then rm -f %D/etc/opendnssec/zonefetch.xml; fi
 %%ETCDIR%%/zonefetch.xml.sample
+@unexec if cmp -s %D/etc/opendnssec/zonelist.xml %D/etc/opendnssec/zonelist.xml.sample; then rm -f %D/etc/opendnssec/zonelist.xml; fi
 %%ETCDIR%%/zonelist.xml.sample
 %%AUDITOR%%lib/opendnssec/kasp_auditor/auditor.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/changed_config.rb
@@ -36,14 +40,11 @@ sbin/ods-signerd
 %%DATADIR%%/zonefetch.rng
 %%DATADIR%%/zonelist.rnc
 %%DATADIR%%/zonelist.rng
-@dirrm var/run/opendnssec
-@dirrm var/run
 @dirrm var/opendnssec/unsigned
 @dirrm var/opendnssec/tmp
 @dirrm var/opendnssec/signed
 @dirrm var/opendnssec/signconf
 @dirrm var/opendnssec
-@dirrm var
 @dirrm %%DATADIR%%
 @dirrm lib/opendnssec/kasp_auditor
 @dirrm lib/opendnssec
@@ -53,3 +54,6 @@ sbin/ods-signerd
 @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