Made configure use diff (and diff3) from diffutils instead of the

native Solaris diff which is not good enough for use in rcs.
Since configure picks up DIFF from the environment, patch-aa and patch-ab
became unnecessary.
Thanks to a patch by Stefan Pfetzing (slightly modified by me) this fixes
his PR pkg/33558.

4 files changed, 5 insertions, 71 deletions

diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index f70420a6b47..4cfc86c71ce 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:29 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/01 22:03:12 heinz Exp $
 #
 
 DISTNAME=		rcs-5.7
@@ -13,7 +13,9 @@ COMMENT=		GNU Revision Control System - version control software
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "SunOS"
 DEPENDS+=		diffutils>=2.7:../../devel/diffutils
-CONFIGURE_ARGS+=	--with-diffutils=gdiff
+CONFIGURE_ARGS+=	--with-diffutils
+# the native diff/diff3 is not sufficient for rcs
+TOOLS_PLATFORM.diff=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}diff
 .endif
 
 GNU_CONFIGURE=		yes
diff --git a/devel/rcs/distinfo b/devel/rcs/distinfo
index 9a6b0b86c3a..7c537cc3981 100644
--- a/devel/rcs/distinfo
+++ b/devel/rcs/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/05/25 11:50:43 wiz Exp $
+$NetBSD: distinfo,v 1.7 2006/07/01 22:03:12 heinz Exp $
 
 SHA1 (rcs-5.7.tar.gz) = a5c7982cf538d5e006b5db40f0aefaea5eb2cbba
 RMD160 (rcs-5.7.tar.gz) = 6ade4d835f7586416abe8b9bc768912eb722dff3
 Size (rcs-5.7.tar.gz) = 282413 bytes
-SHA1 (patch-aa) = de4a96a5375bb606dfcc068c27d511d6ef406f17
-SHA1 (patch-ab) = 7c5b37c57bbec8af55a58dc83de593509c3b3669
 SHA1 (patch-ac) = 97c7ff53604d1400319ae94b3200dd952c5db13b
diff --git a/devel/rcs/patches/patch-aa b/devel/rcs/patches/patch-aa
deleted file mode 100644
index b69da1206bd..00000000000
--- a/devel/rcs/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$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
deleted file mode 100644
index 48dedc194d0..00000000000
--- a/devel/rcs/patches/patch-ab
+++ /dev/null
@@ -1,36 +0,0 @@
-$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}