mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

Now let's *really* stage net-mgmt/mrtg

Browse Source 
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)
  * <options> unnecessary if <opt>_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
This commit is contained in:
John Marino 2014-07-28 23:46:40 +00:00
parent a14c066872
commit ff3e33cfcc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=363277
2 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
net-mgmt/mrtg/Makefile
View File

@ -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/pub/ \
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-traffic-sum
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 <bsd.port.options.mk>
.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 <bsd.port.mk>

20
net-mgmt/mrtg/pkg-plist
View File

@ -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%%