diff options
| author | obache <obache> | 2008-11-24 08:02:16 +0000 |
|---|---|---|
| committer | obache <obache> | 2008-11-24 08:02:16 +0000 |
| commit | 51ce5cb08e9434b7a76b018687fa67d5a94cff3c (patch) | |
| tree | 5ece9532a45a2b1c8b96f52a2da0df1f5a3dfedd /devel/diffutils | |
| parent | be0d27f82114bfbb1a731d5de64c44c35fe51325 (diff) | |
| download | pkgsrc-51ce5cb08e9434b7a76b018687fa67d5a94cff3c.tar.gz | |
Let to exactly point to own diff program.
Fixes PR 39941.
Bump PKGREVISION.
Diffstat (limited to 'devel/diffutils')
| -rw-r--r-- | devel/diffutils/Makefile | 9 | ||||
| -rw-r--r-- | devel/diffutils/distinfo | 3 | ||||
| -rw-r--r-- | devel/diffutils/patches/patch-aa | 15 |
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 + + |