summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2008-11-24 08:02:16 +0000
committerobache <obache@pkgsrc.org>2008-11-24 08:02:16 +0000
commitc1d2806254cf8b52d19bb2181fd46d896613a809 (patch)
tree5ece9532a45a2b1c8b96f52a2da0df1f5a3dfedd /devel
parent2e4e0da9858c4414375fa302269ae5d5949630b0 (diff)
downloadpkgsrc-c1d2806254cf8b52d19bb2181fd46d896613a809.tar.gz
Let to exactly point to own diff program.
Fixes PR 39941. Bump PKGREVISION.
Diffstat (limited to 'devel')
-rw-r--r--devel/diffutils/Makefile9
-rw-r--r--devel/diffutils/distinfo3
-rw-r--r--devel/diffutils/patches/patch-aa15
3 files changed, 24 insertions, 3 deletions
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index 314c3235bc6..71d0cf802e8 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -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 @@ CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
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 --git a/devel/diffutils/distinfo b/devel/diffutils/distinfo
index 55c8072d009..269088aa6c0 100644
--- a/devel/diffutils/distinfo
+++ b/devel/diffutils/distinfo
@@ -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 --git a/devel/diffutils/patches/patch-aa b/devel/diffutils/patches/patch-aa
new file mode 100644
index 00000000000..d7fe85efb20
--- /dev/null
+++ b/devel/diffutils/patches/patch-aa
@@ -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
+
+