Fri May 24 11:40:52 2013 UTC ()
fix autotools problem with @mkdir_p@ in devel/diffutils


(richard)
diff -r1.31 -r1.32 pkgsrc/devel/diffutils/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/diffutils/distinfo
diff -r0 -r1.1 pkgsrc/devel/diffutils/patches/patch-configure.ac
cvs diff -r1.31 -r1.32 pkgsrc/devel/diffutils/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/diffutils/Makefile 2013/05/19 03:21:40 1.31
+++ pkgsrc/devel/diffutils/Makefile 2013/05/24 11:40:52 1.32
@@ -1,43 +1,49 @@ @@ -1,43 +1,49 @@
1# $NetBSD: Makefile,v 1.31 2013/05/19 03:21:40 ryoon Exp $ 1# $NetBSD: Makefile,v 1.32 2013/05/24 11:40:52 richard Exp $
2# 2#
3 3
4DISTNAME= diffutils-3.3 4DISTNAME= diffutils-3.3
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNU:=diffutils/} 7MASTER_SITES= ${MASTER_SITE_GNU:=diffutils/}
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/diffutils/diffutils.html 11HOMEPAGE= http://www.gnu.org/software/diffutils/diffutils.html
11COMMENT= GNU diff utilities - find the differences between files 12COMMENT= GNU diff utilities - find the differences between files
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
15 16
 17USE_TOOLS+= autoreconf automake m4
 18
16GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
17INFO_FILES= YES # PLIST 20INFO_FILES= YES # PLIST
18 21
19CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes 22CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes
20 23
21.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
22 25
23.if ${OPSYS} == "SunOS" 26.if ${OPSYS} == "SunOS"
24CONFIGURE_ENV+= ac_cv_sys_xsi_stack_overflow_heuristic=no 27CONFIGURE_ENV+= ac_cv_sys_xsi_stack_overflow_heuristic=no
25.endif 28.endif
26 29
27AUTO_MKDIRS= yes 30AUTO_MKDIRS= yes
28 31
29post-install: 32post-install:
30.for f in cmp diff diff3 sdiff 33.for f in cmp diff diff3 sdiff
31 ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f} 34 ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
32 ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1 35 ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
33.endfor 36.endfor
34 37
35CONFIGURE_ARGS+= --program-prefix=g 38CONFIGURE_ARGS+= --program-prefix=g
36 39
37SUBST_CLASSES+= diff 40SUBST_CLASSES+= diff
38SUBST_STAGE.diff= pre-configure 41SUBST_STAGE.diff= pre-configure
39SUBST_FILES.diff= src/Makefile.in 42SUBST_FILES.diff= src/Makefile.in
40SUBST_SED.diff= -e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;' 43SUBST_SED.diff= -e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;'
41 44
 45pre-configure:
 46 cd ${WRKSRC} && autoreconf -vfi
 47
42.include "../../devel/gettext-lib/buildlink3.mk" 48.include "../../devel/gettext-lib/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/devel/diffutils/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/diffutils/distinfo 2013/05/19 03:21:40 1.8
+++ pkgsrc/devel/diffutils/distinfo 2013/05/24 11:40:52 1.9
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.8 2013/05/19 03:21:40 ryoon Exp $ 1$NetBSD: distinfo,v 1.9 2013/05/24 11:40:52 richard Exp $
2 2
3SHA1 (diffutils-3.3.tar.xz) = 6463cce7d3eb73489996baefd0e4425928ecd61e 3SHA1 (diffutils-3.3.tar.xz) = 6463cce7d3eb73489996baefd0e4425928ecd61e
4RMD160 (diffutils-3.3.tar.xz) = 5785f14f89923ad115957b88c0bb4766cd4ededc 4RMD160 (diffutils-3.3.tar.xz) = 5785f14f89923ad115957b88c0bb4766cd4ededc
5Size (diffutils-3.3.tar.xz) = 1197832 bytes 5Size (diffutils-3.3.tar.xz) = 1197832 bytes
6SHA1 (patch-aa) = 20e262ca71fe9ca36933e96f790f553130efcd88 6SHA1 (patch-aa) = 20e262ca71fe9ca36933e96f790f553130efcd88
7SHA1 (patch-ab) = f875decfb827c10aee02da58012a735a40f3d682 7SHA1 (patch-ab) = f875decfb827c10aee02da58012a735a40f3d682
 8SHA1 (patch-configure.ac) = dec1c8fa34a8657a3178d94205a1d34b849e203f
File Added: pkgsrc/devel/diffutils/patches/Attic/patch-configure.ac
$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