- Update from 2.0.0b9 to 2.0.0

- Add WITH_ZONECHECK_CGI knob

While I'm here:
- Bump PORTEPOCH
- Re-sort pkg-plist

PR:		59899
Submitted by:	maintainer

6 files changed, 157 insertions, 96 deletions

diff --git a/dns/zonecheck/Makefile b/dns/zonecheck/Makefile
index 70d39ad99c77..78328563d79c 100644
--- a/dns/zonecheck/Makefile
+++ b/dns/zonecheck/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	zonecheck
-PORTVERSION=	2.0.0b9
+PORTVERSION=	2.0.0
+PORTEPOCH=	1
 CATEGORIES=	dns ipv6 ruby
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITES=	ftp://ftp.nic.fr/pub/mirror/zonecheck/src/ \
+		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/src
 EXTRACT_SUFX=	.tgz
 
@@ -30,6 +32,23 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 MAN1=		zonecheck.1
 DOCS=		BUGS INSTALL README TODO
 
+ZONECHECK_TARGET=	common cli
+
+.if defined(WITH_ZONECHECK_CGI)
+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:
+	@cd ${INSTALL_WRKSRC} && \
+		${RUBY} ./installer.rb ${ZONECHECK_TARGET} \
+		-DETCDIST='-dist' -DRUBY="${RUBY}" -DPREFIX="${PREFIX}"
+
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
diff --git a/dns/zonecheck/distinfo b/dns/zonecheck/distinfo
index d88813688ede..338196de374b 100644
--- a/dns/zonecheck/distinfo
+++ b/dns/zonecheck/distinfo
@@ -1 +1 @@
-MD5 (zonecheck-2.0.0b9.tgz) = fb3e21e94d155a3a949498d513a829ae
+MD5 (zonecheck-2.0.0.tgz) = 7723f2ed626bf17f5fe1de34d9fa42d6
diff --git a/dns/zonecheck/files/patch-Makefile b/dns/zonecheck/files/patch-Makefile
deleted file mode 100644
index a5425f6f99d1..000000000000
--- a/dns/zonecheck/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Fri Oct 24 15:55:25 2003
-+++ Makefile	Tue Nov  4 10:07:49 2003
-@@ -9,7 +9,7 @@
- # DATE        : $Date: 2003/10/24 13:55:25 $ 
- # 
- 
--RUBY ?=ruby
-+RUBY ?=ruby18
- ZC_INSTALLER=$(RUBY) ./installer.rb
- 
- 
diff --git a/dns/zonecheck/files/patch-installer.rb b/dns/zonecheck/files/patch-installer.rb
index 2faad7073d4f..91540bdb7325 100644
--- a/dns/zonecheck/files/patch-installer.rb
+++ b/dns/zonecheck/files/patch-installer.rb
@@ -1,11 +1,32 @@
---- installer.rb.orig	Mon Oct 27 17:42:01 2003
-+++ installer.rb	Tue Nov  4 13:06:14 2003
-@@ -190,8 +190,6 @@
-     def rule_all
- 	inst_common ; patch_common 
- 	inst_cli
--	inst_cgi    ; patch_cgi
--	inst_doc
+--- installer.rb.orig	Mon Nov 17 18:59:32 2003
++++ installer.rb	Tue Dec  2 00:46:09 2003
+@@ -55,16 +55,19 @@
+ 	ENV['DOCDIR'    ] ||= "#{ENV['PREFIX']}/share/doc"
+ 	ENV['ETCDIR'    ] ||= "#{ENV['PREFIX']}/etc"
+ 	ENV['CGIDIR'    ] ||= "#{ENV['LIBEXEC']}/#{ENV['PROGNAME']}/cgi-bin"
++	ENV['WWWDIR'    ] ||= "#{ENV['PREFIX']}/www"
+ 
+ 	ENV['VERSION'	] ||= VERSION
+ 
+ 	@installdir    = "#{ENV['LIBEXEC']}/#{ENV['PROGNAME']}"
+ 	@confdir       = "#{ENV['ETCDIR']}/#{ENV['PROGNAME']}#{ENV['ETCDIST']}"
+ 	@zc            = "#{@installdir}/zc/zc.rb"
++	@wwwdir    = "#{ENV['WWWDIR']}/#{ENV['PROGNAME']}"
+ 
+ 	@ch_installdir = "#{ENV['CHROOT']}#{@installdir}"
+ 	@ch_confdir    = "#{ENV['CHROOT']}#{@confdir}"
+ 	@ch_zc         = "#{ENV['CHROOT']}#{@zc}"
++	@ch_wwwdir = "#{ENV['CHROOT']}#{@wwwdir}"
+ 
+ 	@verbose       = true
      end
-     def rule_cli
- 	inst_common ; patch_common
+@@ -185,7 +188,8 @@
+ 
+     def inst_cgi
+ 	puts "==> Installing HTML pages"
+-	cp_r "www", @ch_installdir,			:verbose => @verbose
++	mkdir_p	@ch_wwwdir,				:verbose => @verbose
++	cp_r "www", @ch_wwwdir,			:verbose => @verbose
+ 	puts
+ 
+ 	puts "==> Installing CGI"
diff --git a/dns/zonecheck/pkg-descr b/dns/zonecheck/pkg-descr
index a4353bb65855..1a03acc7a133 100644
--- a/dns/zonecheck/pkg-descr
+++ b/dns/zonecheck/pkg-descr
@@ -6,7 +6,7 @@ Features
     * 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
+    * 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
diff --git a/dns/zonecheck/pkg-plist b/dns/zonecheck/pkg-plist
index f5997187e70e..81ae1539b604 100644
--- a/dns/zonecheck/pkg-plist
+++ b/dns/zonecheck/pkg-plist
@@ -1,47 +1,19 @@
 @comment $FreeBSD$
 bin/zonecheck
-libexec/zonecheck/zc/config/lexer.rb
-libexec/zonecheck/zc/config/parser.rb
-libexec/zonecheck/zc/config/pos.rb
-libexec/zonecheck/zc/config/token.rb
-libexec/zonecheck/zc/cache.rb
-libexec/zonecheck/zc/cachemanager.rb
-libexec/zonecheck/zc/config.rb
-libexec/zonecheck/zc/console.rb
-libexec/zonecheck/zc/dbg.rb
-libexec/zonecheck/zc/framework.rb
-libexec/zonecheck/zc/instructions.rb
-libexec/zonecheck/zc/locale.rb
-libexec/zonecheck/zc/mail.rb
-libexec/zonecheck/zc/msgcat.rb
-libexec/zonecheck/zc/param.rb
-libexec/zonecheck/zc/publisher.rb
-libexec/zonecheck/zc/report.rb
-libexec/zonecheck/zc/testmanager.rb
-libexec/zonecheck/zc/zc.rb
-libexec/zonecheck/zc/zonecheck.rb
-libexec/zonecheck/zc/data/logo.rb
-libexec/zonecheck/zc/data/xpm.rb
-libexec/zonecheck/zc/data/zonecheck.dtd
-libexec/zonecheck/zc/ext/array.rb
-libexec/zonecheck/zc/ext/gtk.rb
-libexec/zonecheck/zc/input/inetd.rb
-libexec/zonecheck/zc/input/cgi.rb
-libexec/zonecheck/zc/input/cli.rb
-libexec/zonecheck/zc/input/gtk.rb
-libexec/zonecheck/zc/publisher/html.rb
-libexec/zonecheck/zc/publisher/gtk.rb
-libexec/zonecheck/zc/publisher/text.rb
-libexec/zonecheck/zc/publisher/xml.rb
-libexec/zonecheck/zc/report/byhost.rb
-libexec/zonecheck/zc/report/byseverity.rb
+etc/zonecheck-dist/de.profile
+etc/zonecheck-dist/default.profile
+etc/zonecheck-dist/afnic.profile
+etc/zonecheck-dist/reverse.profile
+etc/zonecheck-dist/rootservers
+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/address.rb
 libexec/zonecheck/lib/nresolv.rb
-libexec/zonecheck/lib/textfmt.rb
-libexec/zonecheck/lib/whois.rb
 libexec/zonecheck/lib/nresolv/compatibility.rb
 libexec/zonecheck/lib/nresolv/config.rb
 libexec/zonecheck/lib/nresolv/constants.rb
@@ -55,25 +27,16 @@ 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/test/axfr.rb
-libexec/zonecheck/test/connectivity.rb
-libexec/zonecheck/test/generic.rb
-libexec/zonecheck/test/interop.rb
-libexec/zonecheck/test/loopback.rb
-libexec/zonecheck/test/mail.rb
-libexec/zonecheck/test/misc.rb
-libexec/zonecheck/test/mx.rb
-libexec/zonecheck/test/nameserver.rb
-libexec/zonecheck/test/ns.rb
-libexec/zonecheck/test/rootserver.rb
-libexec/zonecheck/test/soa.rb
-libexec/zonecheck/locale/inetd.en
+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
@@ -98,32 +61,101 @@ libexec/zonecheck/locale/test/rootserver.en
 libexec/zonecheck/locale/test/rootserver.fr
 libexec/zonecheck/locale/test/soa.en
 libexec/zonecheck/locale/test/soa.fr
-libexec/zonecheck/locale/inetd.fr
 libexec/zonecheck/locale/zc.en
 libexec/zonecheck/locale/zc.fr
-etc/zonecheck-dist/zc.conf
-etc/zonecheck-dist/rootservers
-etc/zonecheck-dist/de.rules
-etc/zonecheck-dist/default.rules
-etc/zonecheck-dist/fr.rules
-etc/zonecheck-dist/reverse.rules
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/zonecheck/zc/config
+libexec/zonecheck/test/axfr.rb
+libexec/zonecheck/test/connectivity.rb
+libexec/zonecheck/test/generic.rb
+libexec/zonecheck/test/interop.rb
+libexec/zonecheck/test/loopback.rb
+libexec/zonecheck/test/mail.rb
+libexec/zonecheck/test/misc.rb
+libexec/zonecheck/test/mx.rb
+libexec/zonecheck/test/nameserver.rb
+libexec/zonecheck/test/ns.rb
+libexec/zonecheck/test/rootserver.rb
+libexec/zonecheck/test/soa.rb
+libexec/zonecheck/zc/cache.rb
+libexec/zonecheck/zc/cachemanager.rb
+libexec/zonecheck/zc/config.rb
+libexec/zonecheck/zc/console.rb
+libexec/zonecheck/zc/data/config.dtd
+libexec/zonecheck/zc/data/logo.rb
+libexec/zonecheck/zc/data/msgcat.dtd
+libexec/zonecheck/zc/data/xpm.rb
+libexec/zonecheck/zc/data/zonecheck.dtd
+libexec/zonecheck/zc/dbg.rb
+libexec/zonecheck/zc/ext/array.rb
+libexec/zonecheck/zc/ext/gtk.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
+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
+libexec/zonecheck/zc/report.rb
+libexec/zonecheck/zc/report/byhost.rb
+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
+@dirrm libexec/zonecheck/test
 @dirrm libexec/zonecheck/zc/data
 @dirrm libexec/zonecheck/zc/ext
 @dirrm libexec/zonecheck/zc/input
 @dirrm libexec/zonecheck/zc/publisher
 @dirrm libexec/zonecheck/zc/report
 @dirrm libexec/zonecheck/zc
-@dirrm libexec/zonecheck/lib/address
-@dirrm libexec/zonecheck/lib/nresolv
-@dirrm libexec/zonecheck/lib
-@dirrm libexec/zonecheck/test
-@dirrm libexec/zonecheck/locale/test
-@dirrm libexec/zonecheck/locale
 @dirrm libexec/zonecheck
-@dirrm etc/zonecheck-dist/
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%ZONECHECK_CGI%%www/zonecheck/www/html/batch.html.en
+%%ZONECHECK_CGI%%www/zonecheck/www/html/batch.html.fr
+%%ZONECHECK_CGI%%www/zonecheck/www/html/batch.html.jp
+%%ZONECHECK_CGI%%www/zonecheck/www/html/form.html.en
+%%ZONECHECK_CGI%%www/zonecheck/www/html/form.html.fr
+%%ZONECHECK_CGI%%www/zonecheck/www/html/form.html.jp
+%%ZONECHECK_CGI%%www/zonecheck/www/zonecheck.conf.in
+%%ZONECHECK_CGI%%www/zonecheck/www/img/details.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/element.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/fatal.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/gear.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/info.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/light.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/logo.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/loupe.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/notepad.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/ok.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/primary.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/ref.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/secondary.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/warning.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/zc-fav.png
+%%ZONECHECK_CGI%%www/zonecheck/www/img/zone.png
+%%ZONECHECK_CGI%%www/zonecheck/www/js/formvalidation.js
+%%ZONECHECK_CGI%%www/zonecheck/www/js/popupmenu.js
+%%ZONECHECK_CGI%%www/zonecheck/www/js/progress.js
+%%ZONECHECK_CGI%%www/zonecheck/www/style/zc.css
+%%ZONECHECK_CGI%%@dirrm www/zonecheck/www/html
+%%ZONECHECK_CGI%%@dirrm www/zonecheck/www/img
+%%ZONECHECK_CGI%%@dirrm www/zonecheck/www/js
+%%ZONECHECK_CGI%%@dirrm www/zonecheck/www/style
+%%ZONECHECK_CGI%%@dirrm www/zonecheck/www
+%%ZONECHECK_CGI%%@dirrm www/zonecheck