From owner-svn-ports-head@FreeBSD.ORG Mon Jul 28 23:46:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F02F5F94; Mon, 28 Jul 2014 23:46:40 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D141B25C9; Mon, 28 Jul 2014 23:46:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6SNkeZU088529; Mon, 28 Jul 2014 23:46:40 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6SNkeBE088525; Mon, 28 Jul 2014 23:46:40 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407282346.s6SNkeBE088525@svn.freebsd.org> From: John Marino Date: Mon, 28 Jul 2014 23:46:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363277 - head/net-mgmt/mrtg 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.18 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: Mon, 28 Jul 2014 23:46:41 -0000 Author: marino Date: Mon Jul 28 23:46:40 2014 New Revision: 363277 URL: http://svnweb.freebsd.org/changeset/ports/363277 QAT: https://qat.redports.org/buildarchive/r363277/ Log: Now let's *really* stage net-mgmt/mrtg What a mess this port was. * None of the man pages were listed in pkg-plist * It shouldn't try to remove SITE_PERL directory * Comment started with indefinite article * RUN/LIB_DEPENDS were too low for portlint * MANPAGES had extra tab (and runs over 80-columns, unfixed) * unnecessary if _RUN_DEPENDS used * install commands were all masked * several mkdir commands instead of one * install commands don't respect 80-columsn * cp (not even ${CP}) used instead of ${COPYTREE_SHARE} * Redundant post-install target still in place All of that was addressed and verified in poudriere testport. Approved by "just fix it" and staging blankets Modified: head/net-mgmt/mrtg/Makefile head/net-mgmt/mrtg/pkg-plist Modified: head/net-mgmt/mrtg/Makefile ============================================================================== --- head/net-mgmt/mrtg/Makefile Mon Jul 28 23:33:47 2014 (r363276) +++ head/net-mgmt/mrtg/Makefile Mon Jul 28 23:46:40 2014 (r363277) @@ -3,7 +3,7 @@ PORTNAME= mrtg PORTVERSION= 2.17.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \ @@ -12,14 +12,14 @@ MASTER_SITES= http://oss.oetiker.ch/mrtg ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/ MAINTAINER= ports@subnets.ru -COMMENT= The multi-router traffic grapher - -# slave ports override with languages specific gd -GD_PORT?= graphics/gd +COMMENT= Multi-router traffic grapher LIB_DEPENDS= libgd.so:${PORTSDIR}/${GD_PORT} RUN_DEPENDS= p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session +# slave ports override with languages specific gd +GD_PORT?= graphics/gd + CONFIGURE_ARGS= --with-gd-lib=${LOCALBASE}/lib \ --with-gd-inc=${LOCALBASE}/include @@ -43,7 +43,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall GNU_CONFIGURE= YES CONFIGURE_ENV= PERL=${PERL} -MANPAGE= cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \ +MANPAGE= cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \ mrtg-ipv6.1 mrtg-logfile.1 mrtg-mibhelp.1 mrtg-nt-guide.1 \ mrtg-nw-guide.1 mrtg-reference.1 mrtg-rrd.1 mrtg-squid.1 \ mrtg-unix-guide.1 mrtg-webserver.1 mrtg.1 mrtglib.1 @@ -66,19 +66,12 @@ SCRIPTS= cfgmaker indexmaker mrtg mrtg-t OPTIONS_DEFINE= DOCS EXAMPLES IPV6 SNMPV3 +IPV6_RUN_DEPENDS= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 +SNMPV3_RUN_DEPENDS= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP + PORTDOCS= * PORTEXAMPLES= * -.include - -.if ${PORT_OPTIONS:MIPV6} -RUN_DEPENDS+= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 -.endif - -.if ${PORT_OPTIONS:MSNMPV3} -RUN_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP -.endif - post-extract: @${FIND} ${WRKSRC} -type f -name "*.orig" -delete @@ -86,21 +79,24 @@ post-patch: @${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm do-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/doc ${STAGEDIR}${EXAMPLESDIR}/images - @${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${EXAMPLESDIR}/doc/ - @${INSTALL_DATA} ${IMAGES:S,^,${WRKSRC}/images/,} ${STAGEDIR}${EXAMPLESDIR}/images/ - @${MKDIR} ${STAGEDIR}${ETCDIR} - @${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${STAGEDIR}${ETCDIR}/mrtg.cfg.sample - @${INSTALL_DATA} ${MANPAGE:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${PREFIX}/man/man1 - @${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} - @${CP} -p ${WRKSRC}/lib/mrtg2/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${STAGEDIR}${PREFIX}/bin - @${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/bin/,} ${STAGEDIR}${PREFIX}/bin - -post-install: - @${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${EXAMPLESDIR}/doc \ + ${STAGEDIR}${EXAMPLESDIR}/images \ + ${STAGEDIR}${ETCDIR} \ + ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} + ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} \ + ${STAGEDIR}${EXAMPLESDIR}/doc/ + ${INSTALL_DATA} ${IMAGES:S,^,${WRKSRC}/images/,} \ + ${STAGEDIR}${EXAMPLESDIR}/images/ + ${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg \ + ${STAGEDIR}${ETCDIR}/mrtg.cfg.sample + ${INSTALL_DATA} ${MANPAGE:S,^,${WRKSRC}/doc/,} \ + ${STAGEDIR}${PREFIX}/man/man1 + cd ${WRKSRC}/lib/mrtg2 && \ + ${COPYTREE_SHARE} "*.pm" ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/bin/,} \ + ${STAGEDIR}${PREFIX}/bin .include Modified: head/net-mgmt/mrtg/pkg-plist ============================================================================== --- head/net-mgmt/mrtg/pkg-plist Mon Jul 28 23:33:47 2014 (r363276) +++ head/net-mgmt/mrtg/pkg-plist Mon Jul 28 23:46:40 2014 (r363277) @@ -3,9 +3,25 @@ bin/indexmaker bin/mrtg bin/mrtg-traffic-sum bin/rateup +%%ETCDIR%%/mrtg.cfg.sample %%SITE_PERL%%/MRTG_lib.pm %%SITE_PERL%%/Net_SNMP_util.pm %%SITE_PERL%%/locales_mrtg.pm -%%ETCDIR%%/mrtg.cfg.sample -@dirrmtry %%SITE_PERL%% +man/man1/cfgmaker.1.gz +man/man1/indexmaker.1.gz +man/man1/mrtg-contrib.1.gz +man/man1/mrtg-faq.1.gz +man/man1/mrtg-forum.1.gz +man/man1/mrtg-ipv6.1.gz +man/man1/mrtg-logfile.1.gz +man/man1/mrtg-mibhelp.1.gz +man/man1/mrtg-nt-guide.1.gz +man/man1/mrtg-nw-guide.1.gz +man/man1/mrtg-reference.1.gz +man/man1/mrtg-rrd.1.gz +man/man1/mrtg-squid.1.gz +man/man1/mrtg-unix-guide.1.gz +man/man1/mrtg-webserver.1.gz +man/man1/mrtg.1.gz +man/man1/mrtglib.1.gz @dirrmtry %%ETCDIR%%