Fix configure so GNU diffutils are really used.

Bump to 5.7nb1

4 files changed, 72 insertions, 3 deletions

diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index fc9d3d45063..bcedc7a3ec3 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 14:38:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/08 16:20:46 seb Exp $
 #
 
-DISTNAME=		rcs-5.7
+DISTNAME=		rcs-5.7nb1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=rcs/}
 
@@ -15,6 +15,7 @@ DEPENDS=		diffutils-2.7:../../devel/diffutils
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		PATH=${LOCALBASE}/bin:$PATH
+CONFIGURE_ARGS+=	--with-diffutils=gdiff
 
 post-install:
 	${RM} -f ${PREFIX}/bin/rcslog
diff --git a/devel/rcs/distinfo b/devel/rcs/distinfo
index 43edeb7e992..68b451ec877 100644
--- a/devel/rcs/distinfo
+++ b/devel/rcs/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/04/21 00:44:44 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/10/08 16:20:46 seb Exp $
 
 SHA1 (rcs-5.7.tar.gz) = a5c7982cf538d5e006b5db40f0aefaea5eb2cbba
 Size (rcs-5.7.tar.gz) = 282413 bytes
+SHA1 (patch-aa) = de4a96a5375bb606dfcc068c27d511d6ef406f17
+SHA1 (patch-ab) = 7c5b37c57bbec8af55a58dc83de593509c3b3669
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}