Attachment 37691 Details for Bug 59899 – file.diff

[patch] file.diff

file.diff (text/plain), 7.73 KB, created by Mohacsi Janos on 2003-12-02 11:00:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mohacsi Janos

Created: 2003-12-02 11:00:42 UTC

Size: 7.73 KB

patch

obsolete

>diff -ruN zonecheck.bak/Makefile zonecheck/Makefile
>--- zonecheck.bak/Makefile	Tue Nov  4 16:03:13 2003
>+++ zonecheck/Makefile	Tue Dec  2 00:27:55 2003
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	zonecheck
>-PORTVERSION=	2.0.0b9
>+PORTVERSION=	2.0.0b10
> CATEGORIES=	dns ipv6 ruby
> MASTER_SITES=	${MASTER_SITE_SAVANNAH}
> MASTER_SITE_SUBDIR=	${PORTNAME}/src
>@@ -29,6 +29,24 @@
> 
> 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 "
>+.endif
>+
>+pre-everything::
>+.if !defined(WITH_ZONECHECK_CGI)
>+	@${ECHO_MSG}	You can install with CGI support if enable it with WITH_ZONECHECK_CGI
>+.endif
>+
>+do-install:
>+	@(cd ${INSTALL_WRKSRC} && \
>+	  ${RUBY} ./installer.rb ${ZONECHECK_TARGET} \
>+		-DETCDIST='-dist' -DRUBY="${RUBY}" -DPREFIX="${PREFIX}" )
> 
> .if !defined(NOPORTDOCS)
> post-install:
>diff -ruN zonecheck.bak/distinfo zonecheck/distinfo
>--- zonecheck.bak/distinfo	Tue Nov  4 09:57:11 2003
>+++ zonecheck/distinfo	Sun Nov 30 00:24:23 2003
>@@ -1 +1 @@
>-MD5 (zonecheck-2.0.0b9.tgz) = fb3e21e94d155a3a949498d513a829ae
>+MD5 (zonecheck-2.0.0b10.tgz) = 43c6d85662d02377c029703b6d41f737
>diff -ruN zonecheck.bak/files/patch-Makefile zonecheck/files/patch-Makefile
>--- zonecheck.bak/files/patch-Makefile	Tue Nov  4 10:09:04 2003
>+++ zonecheck/files/patch-Makefile	Thu Jan  1 01:00:00 1970
>@@ -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 -ruN zonecheck.bak/files/patch-installer.rb zonecheck/files/patch-installer.rb
>--- zonecheck.bak/files/patch-installer.rb	Tue Nov  4 13:07:29 2003
>+++ zonecheck/files/patch-installer.rb	Tue Dec  2 00:46:38 2003
>@@ -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 -ruN zonecheck.bak/pkg-descr zonecheck/pkg-descr
>--- zonecheck.bak/pkg-descr	Tue Nov  4 09:36:12 2003
>+++ zonecheck/pkg-descr	Tue Dec  2 01:02:03 2003
>@@ -6,7 +6,7 @@
>     * 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 -ruN zonecheck.bak/pkg-plist zonecheck/pkg-plist
>--- zonecheck.bak/pkg-plist	Tue Nov  4 16:03:13 2003
>+++ zonecheck/pkg-plist	Tue Dec  2 00:56:26 2003
>@@ -1,9 +1,9 @@
>-@comment $FreeBSD: ports/dns/zonecheck/pkg-plist,v 1.3 2003/11/04 15:03:13 sergei Exp $
> 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/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/cache.rb
> libexec/zonecheck/zc/cachemanager.rb
> libexec/zonecheck/zc/config.rb
>@@ -20,9 +20,6 @@
> 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
>@@ -101,18 +98,6 @@
> 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
> @dirrm libexec/zonecheck/zc/data
> @dirrm libexec/zonecheck/zc/ext
> @dirrm libexec/zonecheck/zc/input
>@@ -125,5 +110,51 @@
> @dirrm libexec/zonecheck/test
> @dirrm libexec/zonecheck/locale/test
> @dirrm libexec/zonecheck/locale
>-@dirrm libexec/zonecheck
>+etc/zonecheck-dist/de.profile
>+etc/zonecheck-dist/default.profile
>+etc/zonecheck-dist/fr.profile
>+etc/zonecheck-dist/reverse.profile
>+etc/zonecheck-dist/rootservers
>+etc/zonecheck-dist/zc.conf
> @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/
>+%%ZONECHECK_CGI%%libexec/zonecheck/cgi-bin/zc.cgi
>+%%ZONECHECK_CGI%%@dirrm libexec/zonecheck/cgi-bin/
>+@dirrm libexec/zonecheck/

Actions: View | Diff

Attachments on bug 59899: 37691