Upgrade to 2.9.26b, fixes bugs in configure script.

6 files changed, 6 insertions, 130 deletions

diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index 52f59a8deef2..002c74df6428 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -7,11 +7,13 @@
 
 PORTNAME=	mrtg
 PORTVERSION=	2.9.26
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/ \
 		${MASTER_SITE_RINGSERVER}
 MASTER_SITE_SUBDIR=	net/mrtg
+DISTNAME=	mrtg-2.9.26b
 
 MAINTAINER=	demon@FreeBSD.org
 
@@ -20,7 +22,6 @@ LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 		--with-gd-inc=${LOCALBASE}/include
 .else
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 		--with-gd-inc=${LOCALBASE}/include/gd
 .endif
diff --git a/net-mgmt/mrtg/distinfo b/net-mgmt/mrtg/distinfo
index 18369c6c3d63..d0b3b7f7197a 100644
--- a/net-mgmt/mrtg/distinfo
+++ b/net-mgmt/mrtg/distinfo
@@ -1 +1 @@
-MD5 (mrtg-2.9.26.tar.gz) = b60e5719a53ecfed278489baffba6a15
+MD5 (mrtg-2.9.26b.tar.gz) = 3b189d5c118598217dadadef4a99db10
diff --git a/net-mgmt/mrtg/files/patch-configure b/net-mgmt/mrtg/files/patch-configure
deleted file mode 100644
index d63c1fb9a42d..000000000000
--- a/net-mgmt/mrtg/files/patch-configure
+++ /dev/null
@@ -1,63 +0,0 @@
---- configure.orig	Mon Nov 18 01:18:38 2002
-+++ configure	Mon Nov 18 12:36:29 2002
-@@ -1146,7 +1146,7 @@
- 
- echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6
- echo "configure:1149: checking for unsigned long long" >&5
--if eval "test \"`echo '$''{'ac_cv_type_unsigned long long'+set}'`\" = set"; then
-+if eval "test \"`echo '$''{'ac_cv_type_unsigned_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
-@@ -1161,25 +1161,24 @@
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   egrep "(^|[^a-zA-Z_0-9])unsigned long long[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-   rm -rf conftest*
--  ac_cv_type_unsigned long long=yes
-+  ac_cv_type_unsigned_long_long=yes
- else
-   rm -rf conftest*
--  ac_cv_type_unsigned long long=no
-+  ac_cv_type_unsigned_long_long=no
- fi
- rm -f conftest*
- 
- fi
--echo "$ac_t""$ac_cv_type_unsigned long long" 1>&6
--if test $ac_cv_type_unsigned long long = no; then
-+echo "$ac_t""$ac_cv_type_unsigned_long_long" 1>&6
-+if test $ac_cv_type_unsigned_long_long = no; then
-   cat >> confdefs.h <<\EOF
--#define unsigned long long 
- EOF
- 
- fi
- 
- echo $ac_n "checking for long long""... $ac_c" 1>&6
- echo "configure:1182: checking for long long" >&5
--if eval "test \"`echo '$''{'ac_cv_type_long long'+set}'`\" = set"; then
-+if eval "test \"`echo '$''{'ac_cv_type_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
-@@ -1194,16 +1193,16 @@
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   egrep "(^|[^a-zA-Z_0-9])long long[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-   rm -rf conftest*
--  ac_cv_type_long long=yes
-+  ac_cv_type_long_long=yes
- else
-   rm -rf conftest*
--  ac_cv_type_long long=no
-+  ac_cv_type_long_long=no
- fi
- rm -f conftest*
- 
- fi
--echo "$ac_t""$ac_cv_type_long long" 1>&6
--if test $ac_cv_type_long long = no; then
-+echo "$ac_t""$ac_cv_type_long_long" 1>&6
-+if test $ac_cv_type_long_long = no; then
-   cat >> confdefs.h <<\EOF
- #define long long 
- EOF
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 52f59a8deef2..002c74df6428 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -7,11 +7,13 @@
 
 PORTNAME=	mrtg
 PORTVERSION=	2.9.26
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
 		ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/ \
 		${MASTER_SITE_RINGSERVER}
 MASTER_SITE_SUBDIR=	net/mrtg
+DISTNAME=	mrtg-2.9.26b
 
 MAINTAINER=	demon@FreeBSD.org
 
@@ -20,7 +22,6 @@ LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 		--with-gd-inc=${LOCALBASE}/include
 .else
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 		--with-gd-inc=${LOCALBASE}/include/gd
 .endif
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index 18369c6c3d63..d0b3b7f7197a 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1 +1 @@
-MD5 (mrtg-2.9.26.tar.gz) = b60e5719a53ecfed278489baffba6a15
+MD5 (mrtg-2.9.26b.tar.gz) = 3b189d5c118598217dadadef4a99db10
diff --git a/net/mrtg/files/patch-configure b/net/mrtg/files/patch-configure
deleted file mode 100644
index d63c1fb9a42d..000000000000
--- a/net/mrtg/files/patch-configure
+++ /dev/null
@@ -1,63 +0,0 @@
---- configure.orig	Mon Nov 18 01:18:38 2002
-+++ configure	Mon Nov 18 12:36:29 2002
-@@ -1146,7 +1146,7 @@
- 
- echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6
- echo "configure:1149: checking for unsigned long long" >&5
--if eval "test \"`echo '$''{'ac_cv_type_unsigned long long'+set}'`\" = set"; then
-+if eval "test \"`echo '$''{'ac_cv_type_unsigned_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
-@@ -1161,25 +1161,24 @@
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   egrep "(^|[^a-zA-Z_0-9])unsigned long long[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-   rm -rf conftest*
--  ac_cv_type_unsigned long long=yes
-+  ac_cv_type_unsigned_long_long=yes
- else
-   rm -rf conftest*
--  ac_cv_type_unsigned long long=no
-+  ac_cv_type_unsigned_long_long=no
- fi
- rm -f conftest*
- 
- fi
--echo "$ac_t""$ac_cv_type_unsigned long long" 1>&6
--if test $ac_cv_type_unsigned long long = no; then
-+echo "$ac_t""$ac_cv_type_unsigned_long_long" 1>&6
-+if test $ac_cv_type_unsigned_long_long = no; then
-   cat >> confdefs.h <<\EOF
--#define unsigned long long 
- EOF
- 
- fi
- 
- echo $ac_n "checking for long long""... $ac_c" 1>&6
- echo "configure:1182: checking for long long" >&5
--if eval "test \"`echo '$''{'ac_cv_type_long long'+set}'`\" = set"; then
-+if eval "test \"`echo '$''{'ac_cv_type_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
-@@ -1194,16 +1193,16 @@
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   egrep "(^|[^a-zA-Z_0-9])long long[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-   rm -rf conftest*
--  ac_cv_type_long long=yes
-+  ac_cv_type_long_long=yes
- else
-   rm -rf conftest*
--  ac_cv_type_long long=no
-+  ac_cv_type_long_long=no
- fi
- rm -f conftest*
- 
- fi
--echo "$ac_t""$ac_cv_type_long long" 1>&6
--if test $ac_cv_type_long long = no; then
-+echo "$ac_t""$ac_cv_type_long_long" 1>&6
-+if test $ac_cv_type_long_long = no; then
-   cat >> confdefs.h <<\EOF
- #define long long 
- EOF