3 files changed, 13 insertions, 49 deletions

diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index a8032fedfb56..4d920c674dc9 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	opendnssec
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	dns
 MASTER_SITES=	http://www.opendnssec.org/files/source/
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 
-BUILD_DEPENDS=	ldns>=1.6.6:${PORTSDIR}/dns/ldns \
-		${PYTHON_SITELIBDIR}/Ft/Xml/__init__.py:${PORTSDIR}/textproc/py-4suite-xml \
-		rubygem-dnsruby>=1.49:${PORTSDIR}/dns/rubygem-dnsruby \
+BUILD_DEPENDS=	ldns>=1.6.7:${PORTSDIR}/dns/ldns \
+		rubygem-dnsruby>=1.51:${PORTSDIR}/dns/rubygem-dnsruby \
 		sqlite3>=3.4.2:${PORTSDIR}/databases/sqlite3
 LIB_DEPENDS=	ldns:${PORTSDIR}/dns/ldns \
 		sqlite3:${PORTSDIR}/databases/sqlite3
@@ -24,7 +22,6 @@ LIB_DEPENDS=	ldns:${PORTSDIR}/dns/ldns \
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
 USE_PERL5=	yes
-USE_PYTHON=	2.4+
 USE_RUBY=	yes
 USE_LDCONFIG=	yes
 
@@ -34,7 +31,11 @@ MAN5=		ods-timing.5
 MAN7=		opendnssec.7
 MAN8=		ods-control.8 ods-enforcerd.8 ods-signer.8 ods-signerd.8
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's/ Ft.Xml.XPath//' ${WRKSRC}/signer/configure
+PKGMESSAGE=	${WRKSRC}/MIGRATION
+
+post-install:
+.if !defined(BATCH)
+	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/dns/opendnssec/distinfo b/dns/opendnssec/distinfo
index 1c318a559aeb..e61b952bdfdf 100644
--- a/dns/opendnssec/distinfo
+++ b/dns/opendnssec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendnssec-1.1.3.tar.gz) = bd6616e724fec0b95829b6ccc364b919e460786bd4deda9b80ac005d325c166c
-SIZE (opendnssec-1.1.3.tar.gz) = 2207087
+SHA256 (opendnssec-1.2.0.tar.gz) = adef63bae6cca53e4144cfe0d555be11a26447c787e2155ce60d11abe979f1be
+SIZE (opendnssec-1.2.0.tar.gz) = 1614858
diff --git a/dns/opendnssec/pkg-plist b/dns/opendnssec/pkg-plist
index 977e9fb34991..391f7fbb1ee7 100644
--- a/dns/opendnssec/pkg-plist
+++ b/dns/opendnssec/pkg-plist
@@ -12,14 +12,9 @@ bin/ods-kasp2html
 %%ETCDIR%%/zonefetch.xml.sample
 %%ETCDIR%%/zonelist.xml
 %%ETCDIR%%/zonelist.xml.sample
-include/hsmtest.h
-include/libhsm.h
-include/libhsmdns.h
-lib/libhsm.a
-lib/libhsm.la
-lib/libhsm.so
-lib/libhsm.so.1
 lib/opendnssec/kasp_auditor/auditor.rb
+lib/opendnssec/kasp_auditor/changed_config.rb
+lib/opendnssec/kasp_auditor/commands.rb
 lib/opendnssec/kasp_auditor/config.rb
 lib/opendnssec/kasp_auditor/key_tracker.rb
 lib/opendnssec/kasp_auditor/parse.rb
@@ -27,41 +22,11 @@ lib/opendnssec/kasp_auditor/preparser.rb
 lib/opendnssec/kasp_auditor.rb
 lib/opendnssec/kasp_auditor/partial_auditor.rb
 lib/opendnssec/kasp_checker.rb
-lib/opendnssec/signer/Engine.py
-lib/opendnssec/signer/Engine.pyc
-lib/opendnssec/signer/Engine.pyo
-lib/opendnssec/signer/EngineConfig.py
-lib/opendnssec/signer/EngineConfig.pyc
-lib/opendnssec/signer/EngineConfig.pyo
-lib/opendnssec/signer/Util.py
-lib/opendnssec/signer/Util.pyc
-lib/opendnssec/signer/Util.pyo
-lib/opendnssec/signer/Worker.py
-lib/opendnssec/signer/Worker.pyc
-lib/opendnssec/signer/Worker.pyo
-lib/opendnssec/signer/Zone.py
-lib/opendnssec/signer/Zone.pyc
-lib/opendnssec/signer/Zone.pyo
-lib/opendnssec/signer/ZoneConfig.py
-lib/opendnssec/signer/ZoneConfig.pyc
-lib/opendnssec/signer/ZoneConfig.pyo
-lib/opendnssec/signer/ZoneList.py
-lib/opendnssec/signer/ZoneList.pyc
-lib/opendnssec/signer/ZoneList.pyo
 lib/opendnssec/time_shift.rb
-libexec/opendnssec/create_dnskey
-libexec/opendnssec/finalizer
-libexec/opendnssec/get_class
-libexec/opendnssec/get_serial
-libexec/opendnssec/quicksorter
-libexec/opendnssec/signer
-libexec/opendnssec/zone_fetcher
-libexec/opendnssec/zone_reader
 sbin/ods-control
 sbin/ods-enforcerd
 sbin/ods-signer
 sbin/ods-signerd
-%%DATADIR%%.spec
 %%DATADIR%%/conf.rnc
 %%DATADIR%%/conf.rng
 %%DATADIR%%/database_create.sqlite3
@@ -83,9 +48,7 @@ sbin/ods-signerd
 @dirrm var/opendnssec
 @dirrm var
 @dirrm %%DATADIR%%
-@dirrm libexec/opendnssec
 @dirrm lib/opendnssec/kasp_auditor
-@dirrm lib/opendnssec/signer
 @dirrm lib/opendnssec
 @dirrm %%ETCDIR%%
 @exec mkdir -p %D/var/run/opendnssec