Date: Tue, 1 Jun 2004 22:04:45 +0800 (CST) From: Yen-Ming Lee <leeym@utopia.leeym.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67451: fix port: net-mgmt/mrtg Message-ID: <20040601140445.2D8B83EA4AC@utopia.leeym.com> Resent-Message-ID: <200406011410.i51EALVA062725@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67451 >Category: ports >Synopsis: fix port: net-mgmt/mrtg >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jun 01 07:10:21 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 5.2.1-RELEASE-p8 i386 >Organization: >Environment: System: FreeBSD utopia.leeym.com 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #105: Sat May 29 05:19:25 CST 2004 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386 >Description: - depends on Pod::Parser conditionally - bump PORTREVISION - some cosmetic fixes which make portlint happier >How-To-Repeat: >Fix: --- mrtg.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/mrtg/Makefile,v retrieving revision 1.73 diff -u -r1.73 Makefile --- Makefile 15 Mar 2004 13:14:18 -0000 1.73 +++ Makefile 1 Jun 2004 13:58:29 -0000 @@ -7,6 +7,7 @@ PORTNAME= mrtg PORTVERSION= 2.10.13 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \ @@ -21,15 +22,14 @@ COMMENT= The multi-router traffic grapher RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \ ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 .if defined(WITH_GD1) -LIB_DEPENDS= gd1.2:${PORTSDIR}/graphics/gd1 +LIB_DEPENDS+= gd1.2:${PORTSDIR}/graphics/gd1 CONFIGURE_ARGS= --with-gd-lib=${LOCALBASE}/lib \ --with-gd-inc=${LOCALBASE}/include/gd .else -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd CONFIGURE_ARGS= --with-gd-lib=${LOCALBASE}/lib \ --with-gd-inc=${LOCALBASE}/include .endif @@ -46,6 +46,12 @@ mrtg-reference.1 mrtg-rrd.1 mrtg-squid.1 mrtg-unix-guide.1 \ mrtg-webserver.1 mrtg.1 mrtglib.1 +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500600 +RUN_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser +.endif + post-patch: ${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm .if defined(WITH_GD1) @@ -59,9 +65,9 @@ ${MKDIR} -m 755 ${DATADIR} .if !defined(NOPORTDOCS) ${MKDIR} -m 755 ${DOCSDIR} - for file in ANNOUNCE CHANGES COPYRIGHT MANIFEST README \ + for f in ANNOUNCE CHANGES COPYRIGHT MANIFEST README \ doc/*.html doc/*.pod doc/*.txt doc/*wml doc/*.png ; do \ - ${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ done .endif ${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${PREFIX}/etc/mrtg/mrtg.cfg.sample @@ -69,8 +75,8 @@ ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/*.pm ${SITE_PERL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin/ - for file in mrtg cfgmaker indexmaker; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file ${PREFIX}/bin/; \ + for f in mrtg cfgmaker indexmaker; do \ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$f ${PREFIX}/bin/; \ done post-install: @@ -83,4 +89,4 @@ @${ECHO} "############################################################################" .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-mgmt/mrtg/pkg-plist,v retrieving revision 1.16 diff -u -r1.16 pkg-plist --- pkg-plist 19 Jan 2004 08:57:31 -0000 1.16 +++ pkg-plist 1 Jun 2004 13:58:30 -0000 @@ -5,66 +5,66 @@ etc/mrtg/mrtg.cfg.sample %%SITE_PERL%%/MRTG_lib.pm %%SITE_PERL%%/locales_mrtg.pm -%%PORTDOCS%%share/doc/mrtg/ANNOUNCE -%%PORTDOCS%%share/doc/mrtg/CHANGES -%%PORTDOCS%%share/doc/mrtg/COPYRIGHT -%%PORTDOCS%%share/doc/mrtg/MANIFEST -%%PORTDOCS%%share/doc/mrtg/README -%%PORTDOCS%%share/doc/mrtg/cfgmaker.html -%%PORTDOCS%%share/doc/mrtg/cfgmaker.pod -%%PORTDOCS%%share/doc/mrtg/cfgmaker.txt -%%PORTDOCS%%share/doc/mrtg/index.html -%%PORTDOCS%%share/doc/mrtg/index.txt -%%PORTDOCS%%share/doc/mrtg/index.wml -%%PORTDOCS%%share/doc/mrtg/indexmaker.html -%%PORTDOCS%%share/doc/mrtg/indexmaker.pod -%%PORTDOCS%%share/doc/mrtg/indexmaker.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-contrib.html -%%PORTDOCS%%share/doc/mrtg/mrtg-contrib.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-contrib.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-faq.html -%%PORTDOCS%%share/doc/mrtg/mrtg-faq.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-faq.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-forum.html -%%PORTDOCS%%share/doc/mrtg/mrtg-forum.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-forum.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-ipv6.html -%%PORTDOCS%%share/doc/mrtg/mrtg-ipv6.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-ipv6.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-l.png -%%PORTDOCS%%share/doc/mrtg/mrtg-logfile.html -%%PORTDOCS%%share/doc/mrtg/mrtg-logfile.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-logfile.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-m.png -%%PORTDOCS%%share/doc/mrtg/mrtg-mibhelp.html -%%PORTDOCS%%share/doc/mrtg/mrtg-mibhelp.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-mibhelp.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-nt-guide.html -%%PORTDOCS%%share/doc/mrtg/mrtg-nt-guide.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-nt-guide.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-r.png -%%PORTDOCS%%share/doc/mrtg/mrtg-reference.html -%%PORTDOCS%%share/doc/mrtg/mrtg-reference.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-reference.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-rrd.html -%%PORTDOCS%%share/doc/mrtg/mrtg-rrd.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-rrd.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-squid.html -%%PORTDOCS%%share/doc/mrtg/mrtg-squid.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-squid.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-ti.png -%%PORTDOCS%%share/doc/mrtg/mrtg-unix-guide.html -%%PORTDOCS%%share/doc/mrtg/mrtg-unix-guide.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-unix-guide.txt -%%PORTDOCS%%share/doc/mrtg/mrtg-webserver.html -%%PORTDOCS%%share/doc/mrtg/mrtg-webserver.pod -%%PORTDOCS%%share/doc/mrtg/mrtg-webserver.txt -%%PORTDOCS%%share/doc/mrtg/mrtg.html -%%PORTDOCS%%share/doc/mrtg/mrtg.pod -%%PORTDOCS%%share/doc/mrtg/mrtg.txt -%%PORTDOCS%%share/doc/mrtg/mrtglib.html -%%PORTDOCS%%share/doc/mrtg/mrtglib.pod -%%PORTDOCS%%share/doc/mrtg/mrtglib.txt +%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%PORTDOCS%%%%DOCSDIR%%/MANIFEST +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/cfgmaker.html +%%PORTDOCS%%%%DOCSDIR%%/cfgmaker.pod +%%PORTDOCS%%%%DOCSDIR%%/cfgmaker.txt +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/index.txt +%%PORTDOCS%%%%DOCSDIR%%/index.wml +%%PORTDOCS%%%%DOCSDIR%%/indexmaker.html +%%PORTDOCS%%%%DOCSDIR%%/indexmaker.pod +%%PORTDOCS%%%%DOCSDIR%%/indexmaker.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-contrib.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-contrib.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-contrib.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-faq.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-faq.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-faq.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-forum.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-forum.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-forum.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-ipv6.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-ipv6.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-ipv6.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-l.png +%%PORTDOCS%%%%DOCSDIR%%/mrtg-logfile.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-logfile.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-logfile.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-m.png +%%PORTDOCS%%%%DOCSDIR%%/mrtg-mibhelp.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-mibhelp.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-mibhelp.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-nt-guide.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-nt-guide.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-nt-guide.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-r.png +%%PORTDOCS%%%%DOCSDIR%%/mrtg-reference.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-reference.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-reference.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-rrd.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-rrd.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-rrd.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-squid.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-squid.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-squid.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-ti.png +%%PORTDOCS%%%%DOCSDIR%%/mrtg-unix-guide.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-unix-guide.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-unix-guide.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg-webserver.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg-webserver.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg-webserver.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtg.html +%%PORTDOCS%%%%DOCSDIR%%/mrtg.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtg.txt +%%PORTDOCS%%%%DOCSDIR%%/mrtglib.html +%%PORTDOCS%%%%DOCSDIR%%/mrtglib.pod +%%PORTDOCS%%%%DOCSDIR%%/mrtglib.txt share/mrtg/favicon.ico share/mrtg/mrtg-l.gif share/mrtg/mrtg-l.png @@ -75,5 +75,5 @@ share/mrtg/mrtg-ti.gif share/mrtg/mrtg-ti.png @dirrm etc/mrtg -%%PORTDOCS%%@dirrm share/doc/mrtg +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm share/mrtg --- mrtg.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040601140445.2D8B83EA4AC>