Thu May 30 16:31:33 2013 UTC ()
let us backout and not be hasty to use autotools in devel/diffutils


(richard)
diff -r1.32 -r1.33 pkgsrc/devel/diffutils/Makefile
diff -r1.9 -r1.10 pkgsrc/devel/diffutils/distinfo
cvs diff -r1.32 -r1.33 pkgsrc/devel/diffutils/Makefile (expand / switch to unified diff)

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

--- pkgsrc/devel/diffutils/distinfo 2013/05/24 11:40:52 1.9
+++ pkgsrc/devel/diffutils/distinfo 2013/05/30 16:31:33 1.10
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.9 2013/05/24 11:40:52 richard Exp $ 1$NetBSD: distinfo,v 1.10 2013/05/30 16:31:33 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