Fix configure so GNU diffutils are really used.

Bump to 5.7nb1

2 files changed, 66 insertions, 0 deletions

diff --git a/devel/rcs/patches/patch-aa b/devel/rcs/patches/patch-aa
new file mode 100644
index 00000000000..b69da1206bd
--- /dev/null
+++ b/devel/rcs/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1 2001/10/08 16:20:46 seb Exp $
+
+--- configure.in.orig	Fri Jun 16 08:19:24 1995
++++ configure.in
+@@ -15,15 +15,22 @@
+ 1
+ EOF
+ 
++# configure's patch is hand-trimmed after regen from patched configure.in
++
+ AC_ARG_WITH(diffutils,
+   [  --with-diffutils        assume GNU diffutils is similarly installed],
+-  [with_diffutils=$withval],
++  [case $withval in
++    yes) with_diffutils=diff;;
++    *) with_diffutils=$withval;;
++   esac],
+   [with_diffutils=no]
+ )
+ 
+ case $with_diffutils in
+-yes)
+-  : ${DIFF='$(bindir)/diff'}
++no)
++  :;;
++*)
++  : ${DIFF='$(bindir)/'$with_diffutils}
+   : ${DIFF3=${DIFF}3}
+   : ${DIFF3_BIN=1}
+   : ${DIFFFLAGS=-an}
diff --git a/devel/rcs/patches/patch-ab b/devel/rcs/patches/patch-ab
new file mode 100644
index 00000000000..48dedc194d0
--- /dev/null
+++ b/devel/rcs/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1 2001/10/08 16:20:46 seb Exp $
+
+--- configure.orig	Fri Jun 16 08:57:50 1995
++++ configure
+@@ -411,10 +534,15 @@
+ 1
+ EOF
+ 
++# configure's patch is hand-trimmed after regen from patched configure.in
++
+ # Check whether --with-diffutils or --without-diffutils was given.
+-withval="$with_diffutils"
+-if test -n "$withval"; then
+-  with_diffutils=$withval
++if test "${with_diffutils+set}" = set; then
++  withval="$with_diffutils"
++  case $withval in
++    yes) with_diffutils=diff;;
++    *) with_diffutils=$withval;;
++   esac
+ else
+   with_diffutils=no
+ 
+@@ -422,8 +550,10 @@
+ 
+ 
+ case $with_diffutils in
+-yes)
+-  : ${DIFF='$(bindir)/diff'}
++no)
++  :;;
++*)
++  : ${DIFF='$(bindir)/'$with_diffutils}
+   : ${DIFF3=${DIFF}3}
+   : ${DIFF3_BIN=1}
+   : ${DIFFFLAGS=-an}