cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to mrtg 2.10.13

Browse Source 
--
Based on a diff from Robert Nagy <thuglife at bsd dot hu>
with additional changes from me.
This commit is contained in:
brad 2004-01-25 19:27:26 +00:00
parent f3791b71db
commit bcb2afa4e7
6 changed files with 92 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/mrtg/Makefile
View File

@ -1,33 +1,35 @@
# $OpenBSD: Makefile,v 1.42 2002/10/28 01:38:45 naddy Exp $
# $OpenBSD: Makefile,v 1.43 2004/01/25 19:27:26 brad Exp $
COMMENT= "multi-router traffic grapher"
DISTNAME= mrtg-2.9.12a
DISTNAME= mrtg-2.10.13
CATEGORIES= net
MASTER_SITES= ftp://ftp.ou.edu/mirrors/mrtg/ \
ftp://ftp.sunet.se/pub/network/monitoring/mrtg/ \
http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/
${HOMEPAGE}pub/
HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
HOMEPAGE= http://people.ee.ethz.ch/~oetiker/webtools/mrtg/
LIB_DEPENDS= gd.18::graphics/gd
RUN_DEPENDS= ::net/p5-SNMP_Session
RUN_DEPENDS= ::net/p5-SNMP_Session \
::textproc/p5-Pod-Simple
MAINTAINER= Brad Smith <brad@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.57
CONFIGURE_ARGS= --with-gd-inc="${LOCALBASE}/include" \
--with-gd-lib="${LOCALBASE}/lib" \
--with-png-inc="${LOCALBASE}/include" \
--with-png-lib="${LOCALBASE}/lib"
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -ljpeg -lttf"
NO_REGRESS= Yes
@ -36,10 +38,10 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/libdata/perl5/site_perl/Pod
${INSTALL_DATA_DIR} ${PREFIX}/share/mrtg
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mrtg
${INSTALL_DATA} ${WRKSRC}/images/*.png ${PREFIX}/share/mrtg
${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/share/mrtg
${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin
cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.pod *.txt \
cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.pod *.txt *.png *.wml \
${PREFIX}/share/doc/mrtg
cd ${WRKSRC}/bin; ${INSTALL_SCRIPT} cfgmaker indexmaker mrtg \
${PREFIX}/bin
@ -48,6 +50,6 @@ do-install:
cd ${WRKSRC}/lib/mrtg2/Pod; ${INSTALL_DATA} *.pm \
${PREFIX}/libdata/perl5/site_perl/Pod
${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg \
${PREFIX}/share/examples/mrtg/mrtg.cfg.sample
${PREFIX}/share/examples/mrtg
.include <bsd.port.mk>

6
net/mrtg/distinfo
View File

@ -1,3 +1,3 @@
MD5 (mrtg-2.9.12a.tar.gz) = f12c13ca8615cd41e212e5084630fb59
RMD160 (mrtg-2.9.12a.tar.gz) = 9d9a8e1ba55b578599483dab4c93facadb1cbe80
SHA1 (mrtg-2.9.12a.tar.gz) = 59f64fdce9b1e87d705d5ead6db9792ea7d4f294
MD5 (mrtg-2.10.13.tar.gz) = 978f2b55d74e6485662c9bd9a65c2f23
RMD160 (mrtg-2.10.13.tar.gz) = 5149c0a71bea2a2ba9b8fecfc8669cd9bc68c231
SHA1 (mrtg-2.10.13.tar.gz) = 246705e3b49b24a6985defe3db8a42c786bebdc9

15
net/mrtg/patches/patch-configure_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-configure_in,v 1.1 2004/01/25 19:27:26 brad Exp $
--- configure.in.orig 2004-01-19 18:56:24.000000000 -0500
+++ configure.in 2004-01-19 19:01:47.000000000 -0500
@@ -113,6 +113,11 @@ AC_CHECK_LIB(gd,gdImagePng,[
GLIBS="-lgd -lpng -lz"
],:,[-lgd -lpng -lz ${MATHLIBS}])
+AC_CHECK_LIB(gd,gdImageStringTTF,[
+ GDFORM_EXT=png
+ GLIBS="-lgd -lpng -lz -ljpeg -lttf"
+ ],:,[-lgd -lpng -lz -ljpeg -lttf ${MATHLIBS}])
+
AC_CHECK_LIB(gd,gdImagePng_jpg,[
GDFORM_EXT=png
GLIBS="-lgd -lpng -lz -ljpeg"

5
net/mrtg/pkg/DEINSTALL
View File

@ -1,14 +1,13 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.6 2001/02/17 22:22:46 brad Exp $
# $OpenBSD: DEINSTALL,v 1.7 2004/01/25 19:27:26 brad Exp $
#
# mrtg de-installation
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=${SYSCONFDIR}/mrtg.cfg
if [ -f $CONFIG_FILE ]; then
if [ "$PKG_DELETE_EXTRA" != Yes -a -f $CONFIG_FILE ]; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need to perform"

15
net/mrtg/pkg/INSTALL
View File

@ -1,18 +1,13 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.6 2002/04/26 03:35:34 pvalchev Exp $
# $OpenBSD: INSTALL,v 1.7 2004/01/25 19:27:26 brad Exp $
#
# Pre/post-installation setup of mrtg
# exit on errors, use a sane path and install prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=${SYSCONFDIR}/mrtg.cfg
SAMPLE_CONFIG_FILE=$PREFIX/share/examples/mrtg/mrtg.cfg.sample
SAMPLE_CONFIG_FILE=$PREFIX/share/examples/mrtg/mrtg.cfg
# Function: tell the user what s/he needs to do to use the port just installed
#
do_notice()
{
echo
@ -25,8 +20,6 @@ do_notice()
echo
}
# Function: install the system mrtg.cfg from the sample
#
do_install()
{
install -o root -g wheel -m 644 $SAMPLE_CONFIG_FILE $CONFIG_FILE
@ -40,15 +33,11 @@ do_install()
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
: nothing to pre-install for this port

90
net/mrtg/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2003/03/06 01:40:32 margarida Exp $
@comment $OpenBSD: PLIST,v 1.16 2004/01/25 19:27:26 brad Exp $
bin/cfgmaker
bin/indexmaker
bin/mrtg
@ -12,61 +12,87 @@ libdata/perl5/site_perl/Pod/Usage.pm
libdata/perl5/site_perl/locales_mrtg.pm
man/man1/cfgmaker.1
man/man1/indexmaker.1
man/man1/mrtg-contrib.1
man/man1/mrtg-faq.1
man/man1/mrtg-forum.1
man/man1/mrtg-ipv6.1
man/man1/mrtg-logfile.1
man/man1/mrtg-mibhelp.1
man/man1/mrtg-nt-guide.1
man/man1/mrtg-reference.1
man/man1/mrtg-rrd.1
man/man1/mrtg-squid.1
man/man1/mrtg-unix-guide.1
man/man1/mrtg-webserver.1
man/man1/mrtg.1
man/man1/mrtglib.1
share/doc/mrtg/cfgmaker.html
share/doc/mrtg/cfgmaker.pod
share/doc/mrtg/cfgmaker.txt
share/doc/mrtg/contrib.html
share/doc/mrtg/contrib.pod
share/doc/mrtg/contrib.txt
share/doc/mrtg/faq.html
share/doc/mrtg/faq.pod
share/doc/mrtg/faq.txt
share/doc/mrtg/forum.html
share/doc/mrtg/forum.pod
share/doc/mrtg/forum.txt
share/doc/mrtg/index.html
share/doc/mrtg/index.txt
share/doc/mrtg/index.wml
share/doc/mrtg/indexmaker.html
share/doc/mrtg/indexmaker.pod
share/doc/mrtg/indexmaker.txt
share/doc/mrtg/logfile.html
share/doc/mrtg/logfile.pod
share/doc/mrtg/logfile.txt
share/doc/mrtg/mibhelp.html
share/doc/mrtg/mibhelp.pod
share/doc/mrtg/mibhelp.txt
share/doc/mrtg/mrtg-contrib.html
share/doc/mrtg/mrtg-contrib.pod
share/doc/mrtg/mrtg-contrib.txt
share/doc/mrtg/mrtg-faq.html
share/doc/mrtg/mrtg-faq.pod
share/doc/mrtg/mrtg-faq.txt
share/doc/mrtg/mrtg-forum.html
share/doc/mrtg/mrtg-forum.pod
share/doc/mrtg/mrtg-forum.txt
share/doc/mrtg/mrtg-ipv6.html
share/doc/mrtg/mrtg-ipv6.pod
share/doc/mrtg/mrtg-ipv6.txt
share/doc/mrtg/mrtg-l.png
share/doc/mrtg/mrtg-logfile.html
share/doc/mrtg/mrtg-logfile.pod
share/doc/mrtg/mrtg-logfile.txt
share/doc/mrtg/mrtg-m.png
share/doc/mrtg/mrtg-mibhelp.html
share/doc/mrtg/mrtg-mibhelp.pod
share/doc/mrtg/mrtg-mibhelp.txt
share/doc/mrtg/mrtg-nt-guide.html
share/doc/mrtg/mrtg-nt-guide.pod
share/doc/mrtg/mrtg-nt-guide.txt
share/doc/mrtg/mrtg-r.png
share/doc/mrtg/mrtg-reference.html
share/doc/mrtg/mrtg-reference.pod
share/doc/mrtg/mrtg-reference.txt
share/doc/mrtg/mrtg-rrd.html
share/doc/mrtg/mrtg-rrd.pod
share/doc/mrtg/mrtg-rrd.txt
share/doc/mrtg/mrtg-squid.html
share/doc/mrtg/mrtg-squid.pod
share/doc/mrtg/mrtg-squid.txt
share/doc/mrtg/mrtg-ti.png
share/doc/mrtg/mrtg-unix-guide.html
share/doc/mrtg/mrtg-unix-guide.pod
share/doc/mrtg/mrtg-unix-guide.txt
share/doc/mrtg/mrtg-webserver.html
share/doc/mrtg/mrtg-webserver.pod
share/doc/mrtg/mrtg-webserver.txt
share/doc/mrtg/mrtg.html
share/doc/mrtg/mrtg.pod
share/doc/mrtg/mrtg.txt
share/doc/mrtg/mrtglib.html
share/doc/mrtg/mrtglib.pod
share/doc/mrtg/mrtglib.txt
share/doc/mrtg/nt-guide.html
share/doc/mrtg/nt-guide.pod
share/doc/mrtg/nt-guide.txt
share/doc/mrtg/reference.html
share/doc/mrtg/reference.pod
share/doc/mrtg/reference.txt
share/doc/mrtg/squid.html
share/doc/mrtg/squid.pod
share/doc/mrtg/squid.txt
share/doc/mrtg/unix-guide.html
share/doc/mrtg/unix-guide.pod
share/doc/mrtg/unix-guide.txt
share/doc/mrtg/webserver.html
share/doc/mrtg/webserver.pod
share/doc/mrtg/webserver.txt
share/examples/mrtg/mrtg.cfg.sample
share/examples/mrtg/mrtg.cfg
share/mrtg/favicon.ico
share/mrtg/mrtg-l.gif
share/mrtg/mrtg-l.png
share/mrtg/mrtg-m.gif
share/mrtg/mrtg-m.png
share/mrtg/mrtg-r.gif
share/mrtg/mrtg-r.png
share/mrtg/mrtg-ti.gif
share/mrtg/mrtg-ti.png
@dirrm share/mrtg
@dirrm share/examples/mrtg
@dirrm share/doc/mrtg
@cwd ${SYSCONFDIR}
@extra mrtg.cfg