diff options
| -rw-r--r-- | net-mgmt/mrtg/Makefile | 9 | ||||
| -rw-r--r-- | net-mgmt/mrtg/distinfo | 6 | ||||
| -rw-r--r-- | net-mgmt/mrtg/files/mrtg_daemon.sh.in | 2 | ||||
| -rw-r--r-- | net-mgmt/mrtg/pkg-plist | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile index 88af61cd28a7..c328a1b5d568 100644 --- a/net-mgmt/mrtg/Makefile +++ b/net-mgmt/mrtg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mrtg -PORTVERSION= 2.15.1 -PORTREVISION= 1 +PORTVERSION= 2.15.2 PORTEPOCH= 1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \ @@ -55,7 +54,7 @@ pre-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: - ${MKDIR} -m 755 ${PREFIX}/etc/mrtg + ${MKDIR} -m 755 ${ETCDIR} ${MKDIR} -m 755 ${DATADIR} .if !defined(NOPORTDOCS) ${MKDIR} -m 755 ${DOCSDIR} @@ -64,7 +63,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \ done .endif - ${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${PREFIX}/etc/mrtg/mrtg.cfg.sample + ${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${ETCDIR}/mrtg.cfg.sample ${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/*.pm ${SITE_PERL} @@ -78,7 +77,7 @@ post-install: .if !defined(BATCH) @${ECHO} "" @${ECHO} "############################################################################" - @${ECHO} "# Please create a MRTG config file in ${PREFIX}/etc/mrtg #" + @${ECHO} "# Please create a MRTG config file in ${ETCDIR} #" @${ECHO} "# A configuration file can be automatically generated with cfgmaker #" @${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample #" @${ECHO} "# #" diff --git a/net-mgmt/mrtg/distinfo b/net-mgmt/mrtg/distinfo index 9e1e1530f1d8..af2eed8187ed 100644 --- a/net-mgmt/mrtg/distinfo +++ b/net-mgmt/mrtg/distinfo @@ -1,3 +1,3 @@ -MD5 (mrtg-2.15.1.tar.gz) = 32f5c62c0b6fc9b2f9cb00fe3098811d -SHA256 (mrtg-2.15.1.tar.gz) = 6d9bd56d511939268b17100b98937f599f1c6c49a4f40b3df16fcf5b0a3b07bc -SIZE (mrtg-2.15.1.tar.gz) = 1069188 +MD5 (mrtg-2.15.2.tar.gz) = 5827175dd5ee941c2ae894369f0c9071 +SHA256 (mrtg-2.15.2.tar.gz) = 3456f358c1ea5ae5182153169c3effd2cd4b071c4d12f36e03947a62372f87ab +SIZE (mrtg-2.15.2.tar.gz) = 1070900 diff --git a/net-mgmt/mrtg/files/mrtg_daemon.sh.in b/net-mgmt/mrtg/files/mrtg_daemon.sh.in index a3ad075b0786..34bc71d955cc 100644 --- a/net-mgmt/mrtg/files/mrtg_daemon.sh.in +++ b/net-mgmt/mrtg/files/mrtg_daemon.sh.in @@ -18,7 +18,7 @@ load_rc_config $name : ${mrtg_daemon_pidfile="/var/run/mrtg/mrtg.pid"} : ${mrtg_daemon_user="mrtg"} : ${mrtg_daemon_group="mrtg"} -: ${mrtg_daemon_config="%%PREFIX%%/etc/mrtg/mrtg.cfg"} +: ${mrtg_daemon_config="%%ETCDIR%%/mrtg.cfg"} : ${mrtg_daemon_flags="--pid-file $mrtg_daemon_pidfile --lock-file /var/run/mrtg/lockfile --confcache-file /var/run/mrtg/confcache --user $mrtg_daemon_user --group $mrtg_daemon_group --daemon $mrtg_daemon_config"} diff --git a/net-mgmt/mrtg/pkg-plist b/net-mgmt/mrtg/pkg-plist index a78797b462e4..96b6f2701e80 100644 --- a/net-mgmt/mrtg/pkg-plist +++ b/net-mgmt/mrtg/pkg-plist @@ -2,7 +2,7 @@ bin/cfgmaker bin/indexmaker bin/mrtg bin/rateup -etc/mrtg/mrtg.cfg.sample +%%ETCDIR%%/mrtg.cfg.sample %%SITE_PERL%%/MRTG_lib.pm %%SITE_PERL%%/Net_SNMP_util.pm %%SITE_PERL%%/locales_mrtg.pm @@ -57,7 +57,7 @@ etc/mrtg/mrtg.cfg.sample %%DATADIR%%/mrtg-r.png %%DATADIR%%/mrtg-ti.gif %%DATADIR%%/mrtg-ti.png -@dirrmtry etc/mrtg +@dirrmtry %%ETCDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%% @dirrmtry /var/run/mrtg |