Add configure.in patch for the configure patch.

6 files changed, 191 insertions, 64 deletions

diff --git a/net/dc_gui/distinfo b/net/dc_gui/distinfo
index a428308b023..550910477f6 100644
--- a/net/dc_gui/distinfo
+++ b/net/dc_gui/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2002/10/03 11:48:42 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/10/03 12:16:55 wiz Exp $
 
 SHA1 (dc_gui-0.62.tar.gz) = 694d927ba1bbeb1c477560a144e7b23a77d5ba94
 Size (dc_gui-0.62.tar.gz) = 441860 bytes
-SHA1 (patch-aa) = 99881d4f57e646aba7a5f03aa45939e776921f71
+SHA1 (patch-aa) = 044dd3f0c63cce32c1238cc4fe9a0c1d7c505288
+SHA1 (patch-ab) = 4150e1e0cd6dc961b87d964624ac5089e2abb2db
 SHA1 (patch-ac) = 31c81e48aecb6e06a2c4fc39073f8d9d5c2c3e30
 SHA1 (patch-ad) = 2ecdb4b6203b4d10b25dddc13fd04b0e0ed8ed41
 SHA1 (patch-ae) = f2e9fe445efea23fe52f27ff14d5dcc5c0775af0
diff --git a/net/dc_gui/patches/patch-aa b/net/dc_gui/patches/patch-aa
index d1476458177..e31231e1427 100644
--- a/net/dc_gui/patches/patch-aa
+++ b/net/dc_gui/patches/patch-aa
@@ -1,32 +1,24 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/10/03 12:16:55 wiz Exp $
 
---- configure.orig	Sat Aug  3 06:52:14 2002
-+++ configure
-@@ -4177,14 +4177,14 @@ fi
- 
- 
- if test "x$manu_db" = "xyes"; then
--      echo $ac_n "checking for db_env_create in -ldb-4.0""... $ac_c" 1>&6
--echo "configure:4182: checking for db_env_create in -ldb-4.0" >&5
--ac_lib_var=`echo db-4.0'_'db_env_create | sed 'y%./+-%__p_%'`
-+      echo $ac_n "checking for db_env_create in -ldb4""... $ac_c" 1>&6
-+echo "configure:4182: checking for db_env_create in -ldb4" >&5
-+ac_lib_var=`echo db4'_'db_env_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldb-4.0  $LIBS"
-+LIBS="-ldb4  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 4190 "configure"
- #include "confdefs.h"
-@@ -4219,7 +4219,7 @@ fi
- 
-    if test "x$HAVE_DB40" = "xyes"; then
-       
--      berkeleydb_libs="-ldb-4.0"
-+      berkeleydb_libs="-ldb4"
+--- configure.in.orig	Sun Sep 22 18:38:32 2002
++++ configure.in
+@@ -92,6 +92,11 @@ if test "x$manu_db" = "xyes"; then
+       AC_SUBST(berkeleydb_libs)
+       berkeleydb_libs="-ldb-4.0"
     else
-       echo $ac_n "checking for db_env_create in -ldb-3.3""... $ac_c" 1>&6
- echo "configure:4226: checking for db_env_create in -ldb-3.3" >&5
++   AC_CHECK_LIB(db4,db_env_create,HAVE_DB40=yes)
++   if test "x$HAVE_DB40" = "xyes"; then
++      AC_SUBST(berkeleydb_libs)
++      berkeleydb_libs="-ldb4"
++   else
+       AC_CHECK_LIB(db-3.3,db_env_create,HAVE_DB33=yes)
+       if test "x$HAVE_DB33" = "xyes"; then
+          AC_SUBST(berkeleydb_libs)
+@@ -122,6 +127,7 @@ if test "x$manu_db" = "xyes"; then
+                fi
+             fi
+          fi
++      fi
+       fi
+    fi
+ else
diff --git a/net/dc_gui/patches/patch-ab b/net/dc_gui/patches/patch-ab
new file mode 100644
index 00000000000..868d2a9189e
--- /dev/null
+++ b/net/dc_gui/patches/patch-ab
@@ -0,0 +1,66 @@
+$NetBSD: patch-ab,v 1.3 2002/10/03 12:16:56 wiz Exp $
+
+--- configure.orig	Sun Sep 22 18:38:46 2002
++++ configure
+@@ -4221,8 +4221,52 @@ fi
+       
+       berkeleydb_libs="-ldb-4.0"
+    else
++   echo $ac_n "checking for db_env_create in -ldb4""... $ac_c" 1>&6
++echo "configure:4226: checking for db_env_create in -ldb4" >&5
++ac_lib_var=`echo db4'_'db_env_create | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldb4  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 4234 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char db_env_create();
++
++int main() {
++db_env_create()
++; return 0; }
++EOF
++if { (eval echo configure:4245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  HAVE_DB40=yes
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++   if test "x$HAVE_DB40" = "xyes"; then
++      
++      berkeleydb_libs="-ldb4"
++   else
+       echo $ac_n "checking for db_env_create in -ldb-3.3""... $ac_c" 1>&6
+-echo "configure:4226: checking for db_env_create in -ldb-3.3" >&5
++echo "configure:4270: checking for db_env_create in -ldb-3.3" >&5
+ ac_lib_var=`echo db-3.3'_'db_env_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4407,6 +4451,7 @@ fi
+                fi
+             fi
+          fi
++      fi
+       fi
+    fi
+ else
diff --git a/net/dctc/distinfo b/net/dctc/distinfo
index bb43f683b31..f93524f929d 100644
--- a/net/dctc/distinfo
+++ b/net/dctc/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2002/10/03 11:24:33 wiz Exp $
+$NetBSD: distinfo,v 1.5 2002/10/03 12:19:12 wiz Exp $
 
 SHA1 (dctc-0.83.5.tar.gz) = 804e1924e5441dbcf0650971149c5d206683bf9f
 Size (dctc-0.83.5.tar.gz) = 247418 bytes
 SHA1 (patch-aa) = 68a3ca5f8b7e28717e1a294456be56c846f3c521
-SHA1 (patch-ab) = 59ae59cdcfb6a279fc241d6d55a78a64aa36ad9f
+SHA1 (patch-ab) = f08863a3f83cd556a7d48793df465c8f4b3c7bd6
+SHA1 (patch-ac) = 9f7bfd4439026a2a12a8290c0d30db91daacb666
 SHA1 (patch-ae) = 40e4f5c3929beb1b118a7a8180cdf93a2083e084
 SHA1 (patch-ag) = 61f8cc1cb35312de15dbc43e0ce7d185b7cda88e
 SHA1 (patch-ah) = 4d481b1fcb1b32debf44b4506ed39be09d64ae79
diff --git a/net/dctc/patches/patch-ab b/net/dctc/patches/patch-ab
index f82bad5a933..6bd130c0b30 100644
--- a/net/dctc/patches/patch-ab
+++ b/net/dctc/patches/patch-ab
@@ -1,32 +1,24 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2002/10/03 12:19:12 wiz Exp $
 
---- configure.orig	Thu Jul 25 14:42:18 2002
-+++ configure
-@@ -1860,14 +1860,14 @@ fi
- 
- 
- if test "x$manu_db" = "xyes"; then
--		echo $ac_n "checking for db_env_create in -ldb-4.0""... $ac_c" 1>&6
--echo "configure:1865: checking for db_env_create in -ldb-4.0" >&5
--ac_lib_var=`echo db-4.0'_'db_env_create | sed 'y%./+-%__p_%'`
-+		echo $ac_n "checking for db_env_create in -ldb4""... $ac_c" 1>&6
-+echo "configure:1865: checking for db_env_create in -ldb4" >&5
-+ac_lib_var=`echo db4'_'db_env_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldb-4.0  $LIBS"
-+LIBS="-ldb4  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1873 "configure"
- #include "confdefs.h"
-@@ -1902,7 +1902,7 @@ fi
- 
- 	if test "x$HAVE_DB40" = "xyes"; then
- 		
--		berkeleydb_libs="-ldb-4.0"
-+		berkeleydb_libs="-ldb4"
+--- configure.in.orig	Sun Sep 22 08:39:55 2002
++++ configure.in
+@@ -90,6 +90,11 @@ if test "x$manu_db" = "xyes"; then
+ 		AC_SUBST(berkeleydb_libs)
+ 		berkeleydb_libs="-ldb-4.0"
  	else
- 		echo $ac_n "checking for db_env_create in -ldb-3.3""... $ac_c" 1>&6
- echo "configure:1909: checking for db_env_create in -ldb-3.3" >&5
++	AC_CHECK_LIB(db4,db_env_create,HAVE_DB40=yes)
++	if test "x$HAVE_DB40" = "xyes"; then
++		AC_SUBST(berkeleydb_libs)
++		berkeleydb_libs="-ldb4"
++	else
+ 		AC_CHECK_LIB(db-3.3,db_env_create,HAVE_DB33=yes)
+ 		if test "x$HAVE_DB33" = "xyes"; then
+ 			AC_SUBST(berkeleydb_libs)
+@@ -120,6 +125,7 @@ if test "x$manu_db" = "xyes"; then
+ 					fi
+ 				fi
+ 			fi
++		fi
+ 		fi
+ 	fi
+ else
diff --git a/net/dctc/patches/patch-ac b/net/dctc/patches/patch-ac
new file mode 100644
index 00000000000..6f8baff9737
--- /dev/null
+++ b/net/dctc/patches/patch-ac
@@ -0,0 +1,75 @@
+$NetBSD: patch-ac,v 1.3 2002/10/03 12:19:12 wiz Exp $
+
+--- configure.orig	Sun Sep 22 18:28:09 2002
++++ configure
+@@ -873,7 +873,7 @@ fi
+   
+ 
+ 
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in mawk gawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -1904,8 +1904,52 @@ fi
+ 		
+ 		berkeleydb_libs="-ldb-4.0"
+ 	else
++	echo $ac_n "checking for db_env_create in -ldb4""... $ac_c" 1>&6
++echo "configure:1909: checking for db_env_create in -ldb4" >&5
++ac_lib_var=`echo db4'_'db_env_create | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldb4  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1917 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char db_env_create();
++
++int main() {
++db_env_create()
++; return 0; }
++EOF
++if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  HAVE_DB40=yes
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++	if test "x$HAVE_DB40" = "xyes"; then
++		
++		berkeleydb_libs="-ldb4"
++	else
+ 		echo $ac_n "checking for db_env_create in -ldb-3.3""... $ac_c" 1>&6
+-echo "configure:1909: checking for db_env_create in -ldb-3.3" >&5
++echo "configure:1953: checking for db_env_create in -ldb-3.3" >&5
+ ac_lib_var=`echo db-3.3'_'db_env_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2091,6 +2135,7 @@ fi
+ 				fi
+ 			fi
+ 		fi
++		fi
+ 	fi
+ else
+ 		echo $ac_n "checking Berkeley Database library version""... $ac_c" 1>&6