Bug 183413 - [PATCH] dns/zonecheck: Fix WITH=CGI
Summary: [PATCH] dns/zonecheck: Fix WITH=CGI
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Mathieu Arnold
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-28 17:30 UTC by Mathieu Arnold
Modified: 2013-11-12 13:40 UTC (History)
1 user (show)

See Also:


Attachments
zonecheck-3.0.5,1.patch (4.50 KB, patch)
2013-10-28 17:30 UTC, Mathieu Arnold
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mathieu Arnold freebsd_committer freebsd_triage 2013-10-28 17:30:02 UTC
- 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.)

Port maintainer (jmohacsi@bsd.hu) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-28 17:30:11 UTC
Maintainer of dns/zonecheck,

Please note that PR ports/183413 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183413

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-28 17:30:12 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Mathieu Arnold freebsd_committer freebsd_triage 2013-10-28 17:33:20 UTC
Responsible Changed
From-To: freebsd-ports-bugs->mat

Take
Comment 4 Mathieu Arnold freebsd_committer freebsd_triage 2013-11-12 13:32:46 UTC
State Changed
From-To: feedback->closed

Committed, thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-11-12 13:33:03 UTC
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 <bsd.port.options.mk>
 
 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 <bsd.port.mk>

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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"