From 0c1ad728a189f79100f9f5d23e51c4316d2ea8d0 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 2 Mar 2011 08:36:28 +0000
Subject: [PATCH] bugfix update to 2.17.1

---
 net/mrtg/Makefile                   |  6 ++---
 net/mrtg/distinfo                   | 10 ++++----
 net/mrtg/patches/patch-configure_in | 40 ++++++++++++-----------------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 69eb49ac134..f1cd7fcc5f7 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -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
 
-DISTNAME=	mrtg-2.17.0
+DISTNAME=	mrtg-2.17.1
 CATEGORIES=	net
 
-REVISION=	1
-
 HOMEPAGE=	http://oss.oetiker.ch/mrtg/
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index ca2077d66cb..84224be7ec5 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1,5 +1,5 @@
-MD5 (mrtg-2.17.0.tar.gz) = 1YvYeDVEWji5s29Q3Mj21g==
-RMD160 (mrtg-2.17.0.tar.gz) = 3r1ZnU6rmMlc+KVWt/gB/85avs0=
-SHA1 (mrtg-2.17.0.tar.gz) = UthFDhA+HkN1nf8c3I9rzvtrKig=
-SHA256 (mrtg-2.17.0.tar.gz) = iAle14mlCxcfRwADOL8/45gNOP6L4QUP4H+45/Oai1M=
-SIZE (mrtg-2.17.0.tar.gz) = 1093864
+MD5 (mrtg-2.17.1.tar.gz) = J+jph33mweJdflKE9u3dzQ==
+RMD160 (mrtg-2.17.1.tar.gz) = 7qhrGrVEa3LjnRyvxpZbYi2ghy4=
+SHA1 (mrtg-2.17.1.tar.gz) = mS8X+90I05WmyT/YPYN3NIIcFp8=
+SHA256 (mrtg-2.17.1.tar.gz) = yLGa3gg08eMVPJXOP0p+PVLsbS6aLznC6elPTiInE54=
+SIZE (mrtg-2.17.1.tar.gz) = 1095682
diff --git a/net/mrtg/patches/patch-configure_in b/net/mrtg/patches/patch-configure_in
index 0dfe84e5798..1a64e162f45 100644
--- a/net/mrtg/patches/patch-configure_in
+++ b/net/mrtg/patches/patch-configure_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.4 2010/01/05 16:36:33 okan Exp $
---- configure.in.orig	Wed May  2 16:31:06 2007
-+++ configure.in	Mon Jan  4 12:14:57 2010
-@@ -113,6 +113,11 @@ AC_CHECK_LIB(gd,gdImagePng,[
+$OpenBSD: patch-configure_in,v 1.5 2011/03/02 08:36:28 sthen Exp $
+--- configure.in.orig	Mon Jan 10 07:00:47 2011
++++ configure.in	Fri Feb 18 18:15:39 2011
+@@ -114,6 +114,11 @@ AC_CHECK_LIB(gd,gdImagePng,[
     GLIBS="-lgd -lpng -lz"
          ],:,[-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,[
     GDFORM_EXT=png
     GLIBS="-lgd -lpng -lz -ljpeg"
-@@ -128,8 +133,8 @@ if test x$GDFORM_EXT = xgif; then
- 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)
+@@ -198,17 +203,17 @@ 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
--echo $ECHO_N ".$ECHO_C" 1>&6
++#sleep 1
+ echo $ECHO_N ".$ECHO_C" 1>&6
 -sleep 1
--echo $ECHO_N ".$ECHO_C" 1>&6
++#sleep 1
+ echo $ECHO_N ".$ECHO_C" 1>&6
 -sleep 1
--echo $ECHO_N ".$ECHO_C" 1>&6
++#sleep 1
+ echo $ECHO_N ".$ECHO_C" 1>&6
 -sleep 1
--echo $ECHO_N ".$ECHO_C" 1>&6
++#sleep 1
+ echo $ECHO_N ".$ECHO_C" 1>&6
 -sleep 1
--AC_MSG_RESULT([ just kidding ;-)])
++#sleep 1
+ AC_MSG_RESULT([ just kidding ;-)])
 -sleep 2
++#sleep 2
  echo
  echo "----------------------------------------------------------------"
  echo "Config is DONE!"