Regen some patches so Solaris' /usr/bin/gpatch is happier with them.

3 files changed, 12 insertions, 26 deletions

diff --git a/devel/cscope/distinfo b/devel/cscope/distinfo
index 668be6a7963..7b990d3a2c2 100644
--- a/devel/cscope/distinfo
+++ b/devel/cscope/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/10/03 14:57:21 seb Exp $
+$NetBSD: distinfo,v 1.5 2002/06/12 13:16:50 seb Exp $
 
 SHA1 (cscope-15.3.tar.gz) = ece72d2ede173dec0536003c4f8ab0fe7b0b3f11
 Size (cscope-15.3.tar.gz) = 196580 bytes
-SHA1 (patch-aa) = 15313e836e264c4a124090c93685d33d8b293326
-SHA1 (patch-ab) = ff72389fbf0d87d1b7eda51297275fc8a213600f
+SHA1 (patch-aa) = 0212dd5ee9777bb2987cc57dca3747299b065f4f
+SHA1 (patch-ab) = 6390a64ebb7b03b9b29af1f71fac3137b5d7957c
 SHA1 (patch-ac) = 46fb2edc1ddec03c0ac50f87acde2b59f907e12b
 SHA1 (patch-ad) = 4864f8afa7b6090d60d5509d1544b913cb4fcd51
diff --git a/devel/cscope/patches/patch-aa b/devel/cscope/patches/patch-aa
index f4a69769f6c..865739e5cc1 100644
--- a/devel/cscope/patches/patch-aa
+++ b/devel/cscope/patches/patch-aa
@@ -1,14 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2001/10/03 14:57:21 seb Exp $
+$NetBSD: patch-aa,v 1.8 2002/06/12 13:16:50 seb Exp $
 
 --- configure.in.orig	Mon Jul  2 17:48:55 2001
 +++ configure.in
-@@ -48,12 +48,12 @@
- ])
- 
- 
-+# configure's patch is hand-trimmed after regen from patched configure.in
-+
- dnl === BEGIN aclocal REPLACEMENT MACROS
+@@ -52,8 +52,6 @@
  dnl 
  # ACNU_PROG_LEX fm AC_PROG_LEX 
  # -----------  
@@ -17,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2001/10/03 14:57:21 seb Exp $
  AC_DEFUN(ACNU_PROG_LEX,[
  dnl   autoconf-2.14a
  dnl    AH_CHECK_LIB(fl)dnl
-@@ -65,9 +65,7 @@
+@@ -65,9 +63,7 @@
        flex*) ac_lib=fl ;;
        *) ac_lib=l ;;
        esac
diff --git a/devel/cscope/patches/patch-ab b/devel/cscope/patches/patch-ab
index fb94462b4fe..079202aa6ec 100644
--- a/devel/cscope/patches/patch-ab
+++ b/devel/cscope/patches/patch-ab
@@ -1,27 +1,19 @@
-$NetBSD: patch-ab,v 1.6 2001/10/03 14:57:21 seb Exp $
+$NetBSD: patch-ab,v 1.7 2002/06/12 13:16:50 seb Exp $
 
---- configure.orig	Mon Jul  2 17:50:46 2001
+--- configure.orig	Wed Jun 12 12:47:17 2002
 +++ configure
-@@ -829,6 +829,8 @@
- 
- 
- 
-+# configure's patch is hand-trimmed after regen from patched configure.in
-+
- # ACNU_PROG_LEX fm AC_PROG_LEX 
- # -----------  
- 
-@@ -1344,9 +1346,8 @@
+@@ -1344,9 +1344,8 @@
        flex*) ac_lib=fl ;;
        *) ac_lib=l ;;
        esac
 -      LDFLAGS='-L/usr/local/lib'
        echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
- echo "configure:1350: checking for yywrap in -l$ac_lib" >&5
+-echo "configure:1350: checking for yywrap in -l$ac_lib" >&5
++echo "configure:1349: checking for yywrap in -l$ac_lib" >&5
  ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1380,12 +1381,11 @@
+@@ -1380,12 +1379,11 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6