diff options
| author | Felippe de Meirelles Motta <lippe@FreeBSD.org> | 2008-06-06 02:57:04 +0000 |
|---|---|---|
| committer | Felippe de Meirelles Motta <lippe@FreeBSD.org> | 2008-06-06 02:57:04 +0000 |
| commit | 8ed1cb8b7697f061833009935202ee29b5a83814 (patch) | |
| tree | 1790bd65272647b74f21b0069ebec2ec88449fdf | |
| parent | Dbmail is the name of a group of programs that enable the possibility of stor... (diff) | |
- Update to 2.16.2. [1]
- Pass maintainership to submitter. [1]
- Try to fix environment issue described on ports/116934. [2]
PR: ports/124104, ports/124116
Submitted by: "Alexey V. Panfilov" <mrtg@subnets.ru> [1], Alexander Logvinov <ports@logvinov.com> [2]
Approved by: gabor (mentor)
| -rw-r--r-- | net-mgmt/mrtg/Makefile | 13 | ||||
| -rw-r--r-- | net-mgmt/mrtg/distinfo | 6 | ||||
| -rw-r--r-- | net-mgmt/mrtg/files/mrtg_daemon.in (renamed from net-mgmt/mrtg/files/mrtg_daemon.sh.in) | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile index a2728f0c9062..1c905a6b3ec3 100644 --- a/net-mgmt/mrtg/Makefile +++ b/net-mgmt/mrtg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mrtg -PORTVERSION= 2.16.0 -PORTREVISION= 1 +PORTVERSION= 2.16.2 PORTEPOCH= 1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \ @@ -15,7 +14,7 @@ MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \ ftp://ftp.nstu.ru/pub/sources/nettools/monitoring/ \ ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@logvinov.com COMMENT= The multi-router traffic grapher LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd @@ -32,7 +31,7 @@ MRTG_UID?= 279 MRTG_GID?= 279 MRTG_RUNDIR?= /var/run/mrtg -USE_RC_SUBR= mrtg_daemon.sh +USE_RC_SUBR= mrtg_daemon SUB_FILES= pkg-install pkg-message SUB_LIST= PERL=${PERL} \ MRTG_USER=${MRTG_USER} \ @@ -80,16 +79,16 @@ RUN_DEPENDS+= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session .endif post-patch: - ${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm + @${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm pre-configure: - ${SED} -e 's,%%MRTG_USER%%,${MRTG_USER},g;' \ + @${SED} -e 's,%%MRTG_USER%%,${MRTG_USER},g;' \ -e 's,%%MRTG_GROUP%%,${MRTG_GROUP},g;' \ -e 's,%%MRTG_UID%%,${MRTG_UID},g;' \ -e 's,%%MRTG_GID%%,${MRTG_GID},g;' \ -e 's,%%MRTG_RUNDIR%%,${MRTG_RUNDIR},g;' \ < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} - ${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ + @${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ PRE-INSTALL do-install: diff --git a/net-mgmt/mrtg/distinfo b/net-mgmt/mrtg/distinfo index fab57856175d..4465d9dd6e5f 100644 --- a/net-mgmt/mrtg/distinfo +++ b/net-mgmt/mrtg/distinfo @@ -1,3 +1,3 @@ -MD5 (mrtg-2.16.0.tar.gz) = 568c8f3d7eca2d20607aa7ea7281f897 -SHA256 (mrtg-2.16.0.tar.gz) = 97b2788b82d67960260ee9366fc3f84794442fdb3d111480218c6b1560c50fa1 -SIZE (mrtg-2.16.0.tar.gz) = 1078505 +MD5 (mrtg-2.16.2.tar.gz) = 06de09c0ee0d35a0142afed5b275b4cd +SHA256 (mrtg-2.16.2.tar.gz) = ce9ec97bb6c8f94a8d8bb2d3cfa7e72b73754ed7a1081e7aca1c8cece5ce3385 +SIZE (mrtg-2.16.2.tar.gz) = 1078423 diff --git a/net-mgmt/mrtg/files/mrtg_daemon.sh.in b/net-mgmt/mrtg/files/mrtg_daemon.in index 34bc71d955cc..009ba2159674 100644 --- a/net-mgmt/mrtg/files/mrtg_daemon.sh.in +++ b/net-mgmt/mrtg/files/mrtg_daemon.in @@ -6,7 +6,7 @@ # PROVIDE: mrtg_daemon # REQUIRE: DAEMON bsnmpd snmpd -. %%RC_SUBR%% +. %%RC_SUBR%% name="mrtg_daemon" @@ -31,7 +31,7 @@ pidfile=${mrtg_daemon_pidfile} mrtg_daemon_precmd() { rm -f /var/run/mrtg/lockfile /var/run/mrtg/confcache $mrtg_daemon_pidfile + export LANG=C } run_rc_command "$1" - |