diff options
| author | richard <richard@pkgsrc.org> | 2013-05-24 11:40:52 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2013-05-24 11:40:52 +0000 |
| commit | 79dbd3ccc566204db0a5fa0808533b74ed434956 (patch) | |
| tree | a12de119fb39eae3cf6b4196ec91def506f8d476 /devel/diffutils | |
| parent | d31dab14884038d3e05f910d89e618d0c18818ed (diff) | |
| download | pkgsrc-79dbd3ccc566204db0a5fa0808533b74ed434956.tar.gz | |
fix autotools problem with @mkdir_p@ in devel/diffutils
Diffstat (limited to 'devel/diffutils')
| -rw-r--r-- | devel/diffutils/Makefile | 8 | ||||
| -rw-r--r-- | devel/diffutils/distinfo | 3 | ||||
| -rw-r--r-- | devel/diffutils/patches/patch-configure.ac | 25 |
3 files changed, 34 insertions, 2 deletions
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile index 1147b16eb99..cc8b65b4ca4 100644 --- a/devel/diffutils/Makefile +++ b/devel/diffutils/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2013/05/19 03:21:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2013/05/24 11:40:52 richard Exp $ # DISTNAME= diffutils-3.3 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=diffutils/} EXTRACT_SUFX= .tar.xz @@ -13,6 +14,8 @@ LICENSE= gnu-gpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= autoreconf automake m4 + GNU_CONFIGURE= YES INFO_FILES= YES # PLIST @@ -39,5 +42,8 @@ SUBST_STAGE.diff= pre-configure SUBST_FILES.diff= src/Makefile.in SUBST_SED.diff= -e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;' +pre-configure: + cd ${WRKSRC} && autoreconf -vfi + .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/diffutils/distinfo b/devel/diffutils/distinfo index 6322923fa66..cbf16f818bf 100644 --- a/devel/diffutils/distinfo +++ b/devel/diffutils/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.8 2013/05/19 03:21:40 ryoon Exp $ +$NetBSD: distinfo,v 1.9 2013/05/24 11:40:52 richard Exp $ SHA1 (diffutils-3.3.tar.xz) = 6463cce7d3eb73489996baefd0e4425928ecd61e RMD160 (diffutils-3.3.tar.xz) = 5785f14f89923ad115957b88c0bb4766cd4ededc Size (diffutils-3.3.tar.xz) = 1197832 bytes SHA1 (patch-aa) = 20e262ca71fe9ca36933e96f790f553130efcd88 SHA1 (patch-ab) = f875decfb827c10aee02da58012a735a40f3d682 +SHA1 (patch-configure.ac) = dec1c8fa34a8657a3178d94205a1d34b849e203f diff --git a/devel/diffutils/patches/patch-configure.ac b/devel/diffutils/patches/patch-configure.ac new file mode 100644 index 00000000000..1cfec537ca6 --- /dev/null +++ b/devel/diffutils/patches/patch-configure.ac @@ -0,0 +1,25 @@ +$NetBSD: patch-configure.ac,v 1.1 2013/05/24 11:40:52 richard Exp $ + +from upstream: http://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=d1d1df8e369b0f31e5e6f2784dbfa35d7ddc3647 +The future major Automake version (2.0, ETA at least one year from now) might enable that option unconditionally, so better get prepared in due time. * configure.ac (AM_INIT_AUTOMAKE): Adjust. (AM_PROG_CC_C_O): New, required by Automake up to 1.13.x when the 'subdir-objects' is in use. + +--- configure.ac.orig jeu. mai 23 06:14:24 2013 ++++ configure.ac jeu. mai 23 06:15:34 2013 +@@ -26,7 +26,8 @@ + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip color-tests parallel-tests]) ++AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip subdir-objects ++ color-tests parallel-tests]) + AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. + + AC_CONFIG_HEADER([lib/config.h:lib/config.hin]) +@@ -33,6 +34,7 @@ + + AC_PROG_AWK + AC_PROG_CC ++AM_PROG_CC_C_O + AM_MISSING_PROG([HELP2MAN], [help2man]) + AC_PROG_RANLIB + gl_EARLY |