- Update to 3.0.5

PR:		ports/159920
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu> (maintainer)

4 files changed, 31 insertions, 56 deletions

diff --git a/dns/zonecheck/Makefile b/dns/zonecheck/Makefile
index c780628a7309..54269bc0f778 100644
--- a/dns/zonecheck/Makefile
+++ b/dns/zonecheck/Makefile
@@ -6,25 +6,23 @@
 #
 
 PORTNAME=	zonecheck
-PORTVERSION=	2.1.1
+PORTVERSION=	3.0.5
 PORTEPOCH=	1
 CATEGORIES=	dns ipv6 ruby
-MASTER_SITES=	ftp://ftp.nic.fr/pub/mirror/zonecheck/src/ \
-		${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}/src
+MASTER_SITES=	http://www.zonecheck.fr/download/ \
+		ftp://ftp.nic.fr/pub/mirror/zonecheck/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Perform consistency checks on DNS zones
 
-.if defined(WITH_X11)
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
-.endif
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/GPL
+
+RUN_DEPENDS=	rubygem-dnsruby>=1.47:${PORTSDIR}/dns/rubygem-dnsruby
 
 USE_GMAKE=	yes
 USE_RUBY=	yes
-RUBY_VER=	1.8
-USE_RUBY_FEATURES=	ruby18
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -32,6 +30,10 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 MAN1=		zonecheck.1
 DOCS=		BUGS INSTALL README TODO
 
+OPTIONS=	ZONECHECK_CGI	"Install with CGI support" off
+
+.include <bsd.port.pre.mk>
+
 ZONECHECK_TARGET=	common cli
 
 .if defined(WITH_ZONECHECK_CGI)
@@ -39,9 +41,6 @@ ZONECHECK_TARGET+=	cgi
 PLIST_SUB+=	ZONECHECK_CGI=""
 .else
 PLIST_SUB+=	ZONECHECK_CGI="@comment "
-
-pre-everything::
-	@${ECHO_MSG} "Use WITH_ZONECHECK_CGI=yes to install with CGI support"
 .endif
 
 do-install:
@@ -56,4 +55,4 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/dns/zonecheck/distinfo b/dns/zonecheck/distinfo
index 8a23a1daec38..938ed672cc73 100644
--- a/dns/zonecheck/distinfo
+++ b/dns/zonecheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zonecheck-2.1.1.tgz) = cef19fbbb6ebe3a9dde9f0f958edd3c415047d01f600959685e54e4f7a965fcb
-SIZE (zonecheck-2.1.1.tgz) = 254894
+SHA256 (zonecheck-3.0.5.tgz) = 887ea8f355f84ee41f8093551ea29bdf0b467397e53db046d5f79e18e59d881f
+SIZE (zonecheck-3.0.5.tgz) = 238695
diff --git a/dns/zonecheck/pkg-descr b/dns/zonecheck/pkg-descr
index 1a03acc7a133..7a5e4cce0e8a 100644
--- a/dns/zonecheck/pkg-descr
+++ b/dns/zonecheck/pkg-descr
@@ -1,16 +1,19 @@
 ZoneCheck is intended to help solving misconfigurations or inconsistencies 
 of DNS zone files. 
 Features
-
-    * Powerful configuration file 
-    * Does not depend on policies
-    * Fine grained test selection (by test, by categories, by zones)
-    * Full IPv6 support (connectivity and AAAA records)
-    * Supports several input/output interfaces such as CLI, GUI, CGI
-    * Dedicated mode for use inside shell scripts
-    * Batch mode available (ideal when dealing with several domains)
-    * Multi-threaded application in order to cut down checking time
-    * Extensible: new tests, new interfaces, new reports, ...
-    * Exception and cache mechanisms to simplify test writting
+* Powerful XML based configuration file (allowing changes in test severity, 
+  order, zone of application, ...)
+* Does not depend on policies
+* Fine grained test selection (by test, by categories, by zones)
+* Full IPv6 support (connectivity and AAAA records)
+* Supports several input/output interfaces such as CLI, CGI
+* Dedicated mode for use inside shell scripts
+* Batch mode available (ideal when dealing with several domains)
+* Use of stylesheets for easy integration and javascript for enhancement only
+* Generates reports either by severity or by hosts
+* I18N and L10N support (available: French, English)
+* Multi-threaded application in order to cut down checking time
+* Extensible: new tests, new interfaces, new reports, ...
+* Exception and cache mechanisms to simplify test writting
 
 WWW: http://www.zonecheck.fr/
diff --git a/dns/zonecheck/pkg-plist b/dns/zonecheck/pkg-plist
index b8d623b5f009..edb77f5d4220 100644
--- a/dns/zonecheck/pkg-plist
+++ b/dns/zonecheck/pkg-plist
@@ -9,38 +9,17 @@ etc/zonecheck-dist/zc.conf
 @dirrm etc/zonecheck-dist
 %%ZONECHECK_CGI%%libexec/zonecheck/cgi-bin/zc.cgi
 %%ZONECHECK_CGI%%@dirrm libexec/zonecheck/cgi-bin
-libexec/zonecheck/lib/address.rb
-libexec/zonecheck/lib/address/common.rb
-libexec/zonecheck/lib/address/ipv4.rb
-libexec/zonecheck/lib/address/ipv6.rb
-libexec/zonecheck/lib/nresolv.rb
-libexec/zonecheck/lib/nresolv/compatibility.rb
-libexec/zonecheck/lib/nresolv/config.rb
-libexec/zonecheck/lib/nresolv/constants.rb
-libexec/zonecheck/lib/nresolv/dbg.rb
-libexec/zonecheck/lib/nresolv/dig_output.rb
-libexec/zonecheck/lib/nresolv/dns.rb
-libexec/zonecheck/lib/nresolv/dns_message.rb
-libexec/zonecheck/lib/nresolv/dns_name.rb
-libexec/zonecheck/lib/nresolv/dns_resource.rb
-libexec/zonecheck/lib/nresolv/host.rb
-libexec/zonecheck/lib/nresolv/resolver.rb
-libexec/zonecheck/lib/nresolv/transport.rb
-libexec/zonecheck/lib/nresolv/wire.rb
 libexec/zonecheck/lib/textfmt.rb
-libexec/zonecheck/lib/whois.rb
 libexec/zonecheck/locale/cgi.en
 libexec/zonecheck/locale/cgi.fr
 libexec/zonecheck/locale/cli.en
 libexec/zonecheck/locale/cli.fr
-libexec/zonecheck/locale/gtk.en
-libexec/zonecheck/locale/gtk.fr
-libexec/zonecheck/locale/inetd.en
-libexec/zonecheck/locale/inetd.fr
 libexec/zonecheck/locale/test/axfr.en
 libexec/zonecheck/locale/test/axfr.fr
 libexec/zonecheck/locale/test/connectivity.en
 libexec/zonecheck/locale/test/connectivity.fr
+libexec/zonecheck/locale/test/dnssec.en
+libexec/zonecheck/locale/test/dnssec.fr
 libexec/zonecheck/locale/test/generic.en
 libexec/zonecheck/locale/test/generic.fr
 libexec/zonecheck/locale/test/interop.en
@@ -65,6 +44,7 @@ libexec/zonecheck/locale/zc.en
 libexec/zonecheck/locale/zc.fr
 libexec/zonecheck/test/axfr.rb
 libexec/zonecheck/test/connectivity.rb
+libexec/zonecheck/test/dnssec.rb
 libexec/zonecheck/test/generic.rb
 libexec/zonecheck/test/interop.rb
 libexec/zonecheck/test/loopback.rb
@@ -89,12 +69,10 @@ libexec/zonecheck/zc/data/logo.png
 libexec/zonecheck/zc/dbg.rb
 libexec/zonecheck/zc/ext/array.rb
 libexec/zonecheck/zc/ext/file.rb
-libexec/zonecheck/zc/ext/gtk.rb
 libexec/zonecheck/zc/ext/myxml.rb
 libexec/zonecheck/zc/framework.rb
 libexec/zonecheck/zc/input/cgi.rb
 libexec/zonecheck/zc/input/cli.rb
-libexec/zonecheck/zc/input/gtk.rb
 libexec/zonecheck/zc/input/inetd.rb
 libexec/zonecheck/zc/instructions.rb
 libexec/zonecheck/zc/locale.rb
@@ -102,7 +80,6 @@ libexec/zonecheck/zc/mail.rb
 libexec/zonecheck/zc/msgcat.rb
 libexec/zonecheck/zc/param.rb
 libexec/zonecheck/zc/publisher.rb
-libexec/zonecheck/zc/publisher/gtk.rb
 libexec/zonecheck/zc/publisher/html.rb
 libexec/zonecheck/zc/publisher/text.rb
 libexec/zonecheck/zc/publisher/xml.rb
@@ -112,8 +89,6 @@ libexec/zonecheck/zc/report/byseverity.rb
 libexec/zonecheck/zc/testmanager.rb
 libexec/zonecheck/zc/zc.rb
 libexec/zonecheck/zc/zonecheck.rb
-@dirrm libexec/zonecheck/lib/address
-@dirrm libexec/zonecheck/lib/nresolv
 @dirrm libexec/zonecheck/lib
 @dirrm libexec/zonecheck/locale/test
 @dirrm libexec/zonecheck/locale
@@ -130,8 +105,6 @@ libexec/zonecheck/zc/zonecheck.rb
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%ZONECHECK_CGI%%www/zonecheck/html/batch.html.en
-%%ZONECHECK_CGI%%www/zonecheck/html/batch.html.fr
 %%ZONECHECK_CGI%%www/zonecheck/html/form.html.en
 %%ZONECHECK_CGI%%www/zonecheck/html/form.html.fr
 %%ZONECHECK_CGI%%www/zonecheck/zonecheck.conf.in