bugfix update to 2.17.1

This commit is contained in:
sthen 2011-03-02 08:36:28 +00:00
parent 8641f94629
commit 0c1ad728a1
3 changed files with 24 additions and 32 deletions

View File

@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.74 2010/12/27 14:50:23 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.75 2011/03/02 08:36:28 sthen Exp $
COMMENT= multi-router traffic grapher COMMENT= multi-router traffic grapher
DISTNAME= mrtg-2.17.0 DISTNAME= mrtg-2.17.1
CATEGORIES= net CATEGORIES= net
REVISION= 1
HOMEPAGE= http://oss.oetiker.ch/mrtg/ HOMEPAGE= http://oss.oetiker.ch/mrtg/
MAINTAINER= Stuart Henderson <sthen@openbsd.org> MAINTAINER= Stuart Henderson <sthen@openbsd.org>

View File

@ -1,5 +1,5 @@
MD5 (mrtg-2.17.0.tar.gz) = 1YvYeDVEWji5s29Q3Mj21g== MD5 (mrtg-2.17.1.tar.gz) = J+jph33mweJdflKE9u3dzQ==
RMD160 (mrtg-2.17.0.tar.gz) = 3r1ZnU6rmMlc+KVWt/gB/85avs0= RMD160 (mrtg-2.17.1.tar.gz) = 7qhrGrVEa3LjnRyvxpZbYi2ghy4=
SHA1 (mrtg-2.17.0.tar.gz) = UthFDhA+HkN1nf8c3I9rzvtrKig= SHA1 (mrtg-2.17.1.tar.gz) = mS8X+90I05WmyT/YPYN3NIIcFp8=
SHA256 (mrtg-2.17.0.tar.gz) = iAle14mlCxcfRwADOL8/45gNOP6L4QUP4H+45/Oai1M= SHA256 (mrtg-2.17.1.tar.gz) = yLGa3gg08eMVPJXOP0p+PVLsbS6aLznC6elPTiInE54=
SIZE (mrtg-2.17.0.tar.gz) = 1093864 SIZE (mrtg-2.17.1.tar.gz) = 1095682

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.4 2010/01/05 16:36:33 okan Exp $ $OpenBSD: patch-configure_in,v 1.5 2011/03/02 08:36:28 sthen Exp $
--- configure.in.orig Wed May 2 16:31:06 2007 --- configure.in.orig Mon Jan 10 07:00:47 2011
+++ configure.in Mon Jan 4 12:14:57 2010 +++ configure.in Fri Feb 18 18:15:39 2011
@@ -113,6 +113,11 @@ AC_CHECK_LIB(gd,gdImagePng,[ @@ -114,6 +114,11 @@ AC_CHECK_LIB(gd,gdImagePng,[
GLIBS="-lgd -lpng -lz" GLIBS="-lgd -lpng -lz"
],:,[-lgd -lpng -lz ${MATHLIBS}]) ],:,[-lgd -lpng -lz ${MATHLIBS}])
@ -13,33 +13,27 @@ $OpenBSD: patch-configure_in,v 1.4 2010/01/05 16:36:33 okan Exp $
AC_CHECK_LIB(gd,gdImagePng_jpg,[ AC_CHECK_LIB(gd,gdImagePng_jpg,[
GDFORM_EXT=png GDFORM_EXT=png
GLIBS="-lgd -lpng -lz -ljpeg" GLIBS="-lgd -lpng -lz -ljpeg"
@@ -128,8 +133,8 @@ if test x$GDFORM_EXT = xgif; then @@ -198,17 +203,17 @@ AC_OUTPUT(Makefile)
fi
AC_CHECK_LIB(gd,gdImageGd,[
- GLIBS="-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic"
- ],:,[-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic])
+ GLIBS="${GLIBS}"
+ ],:,[${GLIBS}])
if test x$GDFORM_EXT = xpng; then
CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImagePng"
@@ -201,18 +206,6 @@ AC_CONFIG_HEADERS(config.h)
AC_OUTPUT(Makefile)
-echo $ECHO_N "ordering CD from http://tobi.oetiker.ch/wish $ECHO_C" 1>&6 echo $ECHO_N "ordering CD from http://tobi.oetiker.ch/wish $ECHO_C" 1>&6
-sleep 1 -sleep 1
-echo $ECHO_N ".$ECHO_C" 1>&6 +#sleep 1
echo $ECHO_N ".$ECHO_C" 1>&6
-sleep 1 -sleep 1
-echo $ECHO_N ".$ECHO_C" 1>&6 +#sleep 1
echo $ECHO_N ".$ECHO_C" 1>&6
-sleep 1 -sleep 1
-echo $ECHO_N ".$ECHO_C" 1>&6 +#sleep 1
echo $ECHO_N ".$ECHO_C" 1>&6
-sleep 1 -sleep 1
-echo $ECHO_N ".$ECHO_C" 1>&6 +#sleep 1
echo $ECHO_N ".$ECHO_C" 1>&6
-sleep 1 -sleep 1
-AC_MSG_RESULT([ just kidding ;-)]) +#sleep 1
AC_MSG_RESULT([ just kidding ;-)])
-sleep 2 -sleep 2
+#sleep 2
echo echo
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
echo "Config is DONE!" echo "Config is DONE!"