- Using "gcc -o /dev/null" has led to /dev/null being unlinked on

  Solaris. Enhanced patch-aa with a work-around. Fixes PR 32089.
- Fixed invalid variable names (having dashes instead of underscores).
- Added patch-ab, which is the same as patch-aa, except it is intended to
  be reported upstream.

3 files changed, 94 insertions, 5 deletions

diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index 28f4d0ad8b5..8494bcab51e 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/10/26 15:43:08 adam Exp $
+$NetBSD: distinfo,v 1.7 2005/11/18 13:03:53 rillig Exp $
 
 SHA1 (ntop-3.2.tgz) = ab17e871890bc490746fe03f171523073b54e1e8
 RMD160 (ntop-3.2.tgz) = 18ea4b535826e6d7bdf56c071c271869653cba8d
 Size (ntop-3.2.tgz) = 3910593 bytes
-SHA1 (patch-aa) = 07f8619e951f9237f5e1211ac085bea2aad2d1a8
+SHA1 (patch-aa) = bb7aa0c3e935373ec128bb9453b8991edc54fdb6
+SHA1 (patch-ab) = 47cfa325fbf5570e238d290004c9c4a772f10aed
diff --git a/net/ntop/patches/patch-aa b/net/ntop/patches/patch-aa
index 19c915413e8..aa0ec65eaa1 100644
--- a/net/ntop/patches/patch-aa
+++ b/net/ntop/patches/patch-aa
@@ -1,7 +1,21 @@
-$NetBSD: patch-aa,v 1.8 2005/10/26 15:43:08 adam Exp $
+$NetBSD: patch-aa,v 1.9 2005/11/18 13:03:53 rillig Exp $
 
---- configure.orig	2005-10-26 16:57:21.000000000 +0200
-+++ configure
+The "gcc -o /dev/null" led to /dev/null be unlinked on Solaris.
+
+--- configure.orig	Thu Oct 20 22:07:43 2005
++++ configure	Fri Nov 18 13:59:35 2005
+@@ -21625,9 +21625,9 @@ fi;
+ # Check whether --enable-jumbo-frames or --disable-jumbo-frames was given.
+ if test "${enable_jumbo_frames+set}" = set; then
+   enableval="$enable_jumbo_frames"
+-  ac_enable_jumbo-frames="yes"
++  ac_enable_jumbo_frames="yes"
+ else
+-  ac_enable_jumbo-frames="no"
++  ac_enable_jumbo_frames="no"
+ fi;
+ 
+ # Check whether --enable-ipv6 or --disable-ipv6 was given.
 @@ -22985,6 +22985,15 @@ case "${target}:${CC}" in
          echo "* This appears to be ${DEFINEOS} (release not checked)"
        ;;
@@ -18,3 +32,31 @@ $NetBSD: patch-aa,v 1.8 2005/10/26 15:43:08 adam Exp $
      * )
          echo "* ${target} is an unknown/unsupported OS"
          echo "*"
+@@ -41690,8 +41699,6 @@ fi
+ done
+ 
+ 
+-case "${CC}" in
+-  *gcc* )
+         echo "$as_me:$LINENO: checking for mallinfo in malloc.h" >&5
+ echo $ECHO_N "checking for mallinfo in malloc.h... $ECHO_C" >&6
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -41709,9 +41716,7 @@ struct mallinfo memStats = mallinfo();
+   return 0;
+ }
+ _ACEOF
+-    gcc conftest.c -o /dev/null > /dev/null 2> /dev/null
+-    rc=$?
+-    if test ".${rc}" = ".0"; then
++    if eval "$ac_link"; then
+         echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+@@ -41723,7 +41728,6 @@ _ACEOF
+         echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+     fi
+-esac
+ 
+ # Expansion of NTOPCONFIGDEBUG_SETTINGS()
+ if test ".${NTOPCONFIGDEBUG}" = ".yes"; then
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
new file mode 100644
index 00000000000..07add5a68ce
--- /dev/null
+++ b/net/ntop/patches/patch-ab
@@ -0,0 +1,46 @@
+$NetBSD: patch-ab,v 1.11 2005/11/18 13:03:53 rillig Exp $
+
+The "gcc -o /dev/null" led to /dev/null be unlinked on Solaris.
+
+This patch does not affect the build and is only intended to be reported
+upstream.
+
+--- configure.in.orig	Thu Oct 20 22:07:37 2005
++++ configure.in	Fri Nov 18 13:56:53 2005
+@@ -715,8 +715,8 @@ AC_ARG_ENABLE(i18n,
+ 
+ AC_ARG_ENABLE(jumbo-frames,
+               [  --enable-jumbo-frames       Enable Jumbo (9K) Ethernet frames [[default=disabled]]],
+-              ac_enable_jumbo-frames="yes",
+-              ac_enable_jumbo-frames="no")
++              ac_enable_jumbo_frames="yes",
++              ac_enable_jumbo_frames="no")
+ 
+ AC_ARG_ENABLE(ipv6,
+               [  --disable-ipv6              use IPv6 [[default=enabled]]],
+@@ -1988,16 +1988,12 @@ AC_CHECK_FUNCS([uname])
+ dnl> Test for strtok_r (we have our own defn if it's not available)C_CHECK_FUNCS([strtok_r])
+ AC_CHECK_FUNCS([strtok_r])
+ 
+-case "${CC}" in
+-  *gcc* )
+     dnl> Check if malloc.h has mallinfo...
+     AC_MSG_CHECKING([for mallinfo in malloc.h])
+     AC_LANG_CONFTEST(
+     [AC_LANG_PROGRAM([[#include <malloc.h>]],
+                      [[struct mallinfo memStats = mallinfo();]])])
+-    gcc conftest.c -o /dev/null > /dev/null 2> /dev/null
+-    rc=$?
+-    if test ".${rc}" = ".0"; then
++    if (eval "$ac_link"); then
+         AC_MSG_RESULT(yes)
+         AC_DEFINE_UNQUOTED(HAVE_MALLINFO_MALLOC_H,
+                                1,
+@@ -2005,7 +2001,6 @@ case "${CC}" in
+     else
+         AC_MSG_RESULT(no)
+     fi
+-esac
+ 
+ NTOPCONFIGDEBUG_SETTINGS([After all tests])
+