From owner-svn-ports-head@FreeBSD.ORG Tue Nov 12 13:32:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E567A1; Tue, 12 Nov 2013 13:32:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6E9182C5C; Tue, 12 Nov 2013 13:32:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACDWtqn051367; Tue, 12 Nov 2013 13:32:55 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACDWtHZ051365; Tue, 12 Nov 2013 13:32:55 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201311121332.rACDWtHZ051365@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 12 Nov 2013 13:32:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333571 - head/dns/zonecheck X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 13:32:55 -0000 Author: mat Date: Tue Nov 12 13:32:54 2013 New Revision: 333571 URL: http://svnweb.freebsd.org/changeset/ports/333571 Log: - Fix when WITH=CGI - USES=gmake - Stagify - Use OPTIONS_SUB - Install whatever docs would be installed by the installer. Ruby 1.9 is encoding aware, and it can't open a non US-ASCII file if LANG is unset (or if LANG mismatches the encoding of the file.) maintainer timeout. PR: ports/183413 Submitted by: mat Modified: head/dns/zonecheck/Makefile head/dns/zonecheck/pkg-plist Modified: head/dns/zonecheck/Makefile ============================================================================== --- head/dns/zonecheck/Makefile Tue Nov 12 13:30:22 2013 (r333570) +++ head/dns/zonecheck/Makefile Tue Nov 12 13:32:54 2013 (r333571) @@ -17,42 +17,36 @@ LICENSE_FILE= ${WRKSRC}/GPL RUN_DEPENDS= rubygem-dnsruby>=1.47:${PORTSDIR}/dns/rubygem-dnsruby -USE_GMAKE= yes +USES= gmake USE_RUBY= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} -MAN1= zonecheck.1 -DOCS= BUGS INSTALL README TODO +DOCS= BUGS CREDITS HISTORY INSTALL README TODO OPTIONS_DEFINE= CGI -OPTIONS_DEFAULT= +OPTIONS_DEFAULT= +OPTIONS_SUB= CGI_DESC= Install with CGI support -NO_STAGE= yes .include ZONECHECK_TARGET= common cli .if ${PORT_OPTIONS:MCGI} ZONECHECK_TARGET+= cgi -PLIST_SUB+= ZONECHECK_CGI="" -.else -PLIST_SUB+= ZONECHECK_CGI="@comment " .endif do-install: - @cd ${INSTALL_WRKSRC} && \ - ${RUBY} ./installer.rb ${ZONECHECK_TARGET} \ + cd ${INSTALL_WRKSRC} && \ + ${SETENV} LANG=en_US.UTF-8 ${RUBY} ./installer.rb ${ZONECHECK_TARGET} \ -DETCDIST='-dist' -DRUBY="${RUBY}" -DPREFIX="${PREFIX}" \ - -DWWWDIR="${PREFIX}/www/${PORTNAME}" + -DWWWDIR="${PREFIX}/www/${PORTNAME}" -DCHROOT="${STAGEDIR}" -.if ${PORT_OPTIONS:MDOCS} post-install: - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/dns/zonecheck/pkg-plist ============================================================================== --- head/dns/zonecheck/pkg-plist Tue Nov 12 13:30:22 2013 (r333570) +++ head/dns/zonecheck/pkg-plist Tue Nov 12 13:32:54 2013 (r333571) @@ -6,9 +6,10 @@ etc/zonecheck-dist/afnic.profile etc/zonecheck-dist/reverse.profile etc/zonecheck-dist/rootservers etc/zonecheck-dist/zc.conf +man/man1/zonecheck.1.gz @dirrm etc/zonecheck-dist -%%ZONECHECK_CGI%%libexec/zonecheck/cgi-bin/zc.cgi -%%ZONECHECK_CGI%%@dirrm libexec/zonecheck/cgi-bin +%%CGI%%libexec/zonecheck/cgi-bin/zc.cgi +%%CGI%%@dirrm libexec/zonecheck/cgi-bin libexec/zonecheck/lib/textfmt.rb libexec/zonecheck/locale/cgi.en libexec/zonecheck/locale/cgi.fr @@ -101,35 +102,37 @@ libexec/zonecheck/zc/zonecheck.rb @dirrm libexec/zonecheck/zc @dirrm libexec/zonecheck %%PORTDOCS%%%%DOCSDIR%%/BUGS +%%PORTDOCS%%%%DOCSDIR%%/CREDITS +%%PORTDOCS%%%%DOCSDIR%%/HISTORY %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%ZONECHECK_CGI%%www/zonecheck/html/form.html.en -%%ZONECHECK_CGI%%www/zonecheck/html/form.html.fr -%%ZONECHECK_CGI%%www/zonecheck/zonecheck.conf.in -%%ZONECHECK_CGI%%www/zonecheck/img/details.png -%%ZONECHECK_CGI%%www/zonecheck/img/element.png -%%ZONECHECK_CGI%%www/zonecheck/img/fatal.png -%%ZONECHECK_CGI%%www/zonecheck/img/gear.png -%%ZONECHECK_CGI%%www/zonecheck/img/info.png -%%ZONECHECK_CGI%%www/zonecheck/img/light.png -%%ZONECHECK_CGI%%www/zonecheck/img/logo.png -%%ZONECHECK_CGI%%www/zonecheck/img/loupe.png -%%ZONECHECK_CGI%%www/zonecheck/img/notepad.png -%%ZONECHECK_CGI%%www/zonecheck/img/ok.png -%%ZONECHECK_CGI%%www/zonecheck/img/primary.png -%%ZONECHECK_CGI%%www/zonecheck/img/ref.png -%%ZONECHECK_CGI%%www/zonecheck/img/secondary.png -%%ZONECHECK_CGI%%www/zonecheck/img/warning.png -%%ZONECHECK_CGI%%www/zonecheck/img/zc-fav.png -%%ZONECHECK_CGI%%www/zonecheck/img/zone.png -%%ZONECHECK_CGI%%www/zonecheck/js/formvalidation.js -%%ZONECHECK_CGI%%www/zonecheck/js/popupmenu.js -%%ZONECHECK_CGI%%www/zonecheck/js/progress.js -%%ZONECHECK_CGI%%www/zonecheck/style/zc.css -%%ZONECHECK_CGI%%@dirrm www/zonecheck/html -%%ZONECHECK_CGI%%@dirrm www/zonecheck/img -%%ZONECHECK_CGI%%@dirrm www/zonecheck/js -%%ZONECHECK_CGI%%@dirrm www/zonecheck/style -%%ZONECHECK_CGI%%@dirrm www/zonecheck +%%CGI%%www/zonecheck/html/form.html.en +%%CGI%%www/zonecheck/html/form.html.fr +%%CGI%%www/zonecheck/zonecheck.conf.in +%%CGI%%www/zonecheck/img/details.png +%%CGI%%www/zonecheck/img/element.png +%%CGI%%www/zonecheck/img/fatal.png +%%CGI%%www/zonecheck/img/gear.png +%%CGI%%www/zonecheck/img/info.png +%%CGI%%www/zonecheck/img/light.png +%%CGI%%www/zonecheck/img/logo.png +%%CGI%%www/zonecheck/img/loupe.png +%%CGI%%www/zonecheck/img/notepad.png +%%CGI%%www/zonecheck/img/ok.png +%%CGI%%www/zonecheck/img/primary.png +%%CGI%%www/zonecheck/img/ref.png +%%CGI%%www/zonecheck/img/secondary.png +%%CGI%%www/zonecheck/img/warning.png +%%CGI%%www/zonecheck/img/zc-fav.png +%%CGI%%www/zonecheck/img/zone.png +%%CGI%%www/zonecheck/js/formvalidation.js +%%CGI%%www/zonecheck/js/popupmenu.js +%%CGI%%www/zonecheck/js/progress.js +%%CGI%%www/zonecheck/style/zc.css +%%CGI%%@dirrm www/zonecheck/html +%%CGI%%@dirrm www/zonecheck/img +%%CGI%%@dirrm www/zonecheck/js +%%CGI%%@dirrm www/zonecheck/style +%%CGI%%@dirrm www/zonecheck