[pkgsrc/trunk]: pkgsrc/devel/diffutils Let to exactly point to own diff program.

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8df769d2d84
branches:  trunk
changeset: 550561:e8df769d2d84
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Nov 24 08:02:16 2008 +0000

description:
Let to exactly point to own diff program.
Fixes PR 39941.

Bump PKGREVISION.

diffstat:

 devel/diffutils/Makefile         |   9 +++++++--
 devel/diffutils/distinfo         |   3 ++-
 devel/diffutils/patches/patch-aa |  15 +++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r 462861b188a9 -r e8df769d2d84 devel/diffutils/Makefile
--- a/devel/diffutils/Makefile  Mon Nov 24 07:39:35 2008 +0000
+++ b/devel/diffutils/Makefile  Mon Nov 24 08:02:16 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2008/06/12 02:14:22 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2008/11/24 08:02:16 obache Exp $
 #
 
 DISTNAME=              diffutils-2.8.1
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNU:=diffutils/}
 
@@ -26,5 +26,10 @@
 PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=           GNU_PROGRAM_PREFIX
 
+SUBST_CLASSES+=                diff
+SUBST_STAGE.diff=      pre-configure
+SUBST_FILES.diff=      configure
+SUBST_SED.diff=                -e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff;'
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 462861b188a9 -r e8df769d2d84 devel/diffutils/distinfo
--- a/devel/diffutils/distinfo  Mon Nov 24 07:39:35 2008 +0000
+++ b/devel/diffutils/distinfo  Mon Nov 24 08:02:16 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:12 agc Exp $
+$NetBSD: distinfo,v 1.5 2008/11/24 08:02:16 obache Exp $
 
 SHA1 (diffutils-2.8.1.tar.gz) = a4c467c3a6a08cde9f3d94d02067ec26436e7dc5
 RMD160 (diffutils-2.8.1.tar.gz) = a61b15401f140097d39dfe00cd2a8062bcdfaa0e
 Size (diffutils-2.8.1.tar.gz) = 780086 bytes
+SHA1 (patch-aa) = a1f55c41e585a9e0ba521a6272a3f1e1df803597
diff -r 462861b188a9 -r e8df769d2d84 devel/diffutils/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/diffutils/patches/patch-aa  Mon Nov 24 08:02:16 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2008/11/24 08:02:16 obache Exp $
+
+PR 39941
+
+--- configure.orig     2002-04-05 21:48:26.000000000 +0000
++++ configure
+@@ -3722,7 +3722,7 @@ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define DEFAULT_DIFF_PROGRAM "diff"
++#define DEFAULT_DIFF_PROGRAM "%DEFAULT_DIFF_PROGRAM%"
+ _ACEOF
+ 
+