From owner-svn-ports-all@freebsd.org Sat Jun 4 09:03:51 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5B10B68F7C; Sat, 4 Jun 2016 09:03:51 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82AD3109B; Sat, 4 Jun 2016 09:03:51 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5493ohB067966; Sat, 4 Jun 2016 09:03:50 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5493oao067964; Sat, 4 Jun 2016 09:03:50 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201606040903.u5493oao067964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 4 Jun 2016 09:03:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416349 - in head/dns/bindgraph: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2016 09:03:51 -0000 Author: amdmi3 Date: Sat Jun 4 09:03:50 2016 New Revision: 416349 URL: https://svnweb.freebsd.org/changeset/ports/416349 Log: - Add NO_ARCH - Switch to options helpers - Regenerate patches with `make makepatch` - Simplify DOCS installation Modified: head/dns/bindgraph/Makefile head/dns/bindgraph/files/patch-bindgraph.cgi Modified: head/dns/bindgraph/Makefile ============================================================================== --- head/dns/bindgraph/Makefile Sat Jun 4 08:38:50 2016 (r416348) +++ head/dns/bindgraph/Makefile Sat Jun 4 09:03:50 2016 (r416349) @@ -16,9 +16,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= rrdtool>=0:databases/rrdtool \ p5-File-Tail>=0:devel/p5-File-Tail -NO_BUILD= yes USES= perl5 shebangfix tar:tgz SHEBANG_FILES= bindgraph.pl bindgraph.cgi +NO_BUILD= yes +NO_ARCH= yes CGIDIR?= ${PREFIX}/www/cgi-bin DATADIR?= /var/db/bindgraph @@ -31,8 +32,7 @@ PLIST_SUB= CGIDIR=${CGIDIR:S,${PREFIX}/, BINDGRAPH_USER="${BINDGRAPH_USER}" \ BINDGRAPH_GROUP="${BINDGRAPH_GROUP}" -DOCS= README ChangeLog -PORTDOCS= ${DOCS} +PORTDOCS= README ChangeLog OPTIONS_DEFINE= DOCS @@ -49,13 +49,15 @@ post-patch: @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/bindgraph.cgi do-install: - ${MKDIR} ${STAGEDIR}${CGIDIR} - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${CGIDIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/bindgraph.pl ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_SCRIPT} ${WRKSRC}/bindgraph.cgi ${STAGEDIR}${CGIDIR}/ - ${MKDIR} ${STAGEDIR}${DOCSDIR} - for f in ${DOCS}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}/; \ - done + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for f in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ +.endfor .include Modified: head/dns/bindgraph/files/patch-bindgraph.cgi ============================================================================== --- head/dns/bindgraph/files/patch-bindgraph.cgi Sat Jun 4 08:38:50 2016 (r416348) +++ head/dns/bindgraph/files/patch-bindgraph.cgi Sat Jun 4 09:03:50 2016 (r416349) @@ -1,5 +1,5 @@ ---- bindgraph.cgi.orig 2003-05-05 06:26:18.000000000 +0800 -+++ bindgraph.cgi 2008-03-30 18:04:38.000000000 +0800 +--- bindgraph.cgi.orig 2016-05-23 13:30:02 UTC ++++ bindgraph.cgi @@ -8,13 +8,14 @@ use RRDs; @@ -17,7 +17,7 @@ # temporary directory where the images will be saved my $tmp_dir = '/tmp/bindgraph'; -@@ -89,6 +90,10 @@ +@@ -89,6 +90,10 @@ sub graph($$$;$) { } } @@ -28,7 +28,7 @@ my ($text, $xs, $ys) = RRDs::graph( $file, '--imgformat', 'PNG', -@@ -102,8 +107,7 @@ +@@ -102,8 +107,7 @@ sub graph($$$;$) { @rrdef, @rrprint, 'COMMENT:\s', @@ -38,7 +38,7 @@ ); my $err = RRDs::error; die_fatal("RRDs::graph($file, ...): $err") if $err; -@@ -209,6 +213,7 @@ +@@ -209,6 +213,7 @@ sub main { $uri =~ s#/#,#g; $uri =~ s#~#tilde,#g;