Sat Apr 11 18:27:32 2015 UTC ()
Remove autoconf dependency. It turns out that autoconf indirectly depends
on gettext-lib (via help2man), creating a circular dependency.

Thanks to sevan@ for noticing.


(bsiegert)
diff -r1.56 -r1.57 pkgsrc/devel/gettext-lib/Makefile
diff -r1.28 -r1.29 pkgsrc/devel/gettext-lib/distinfo
diff -r0 -r1.1 pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_configure
diff -r1.1 -r0 pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_configure.ac
cvs diff -r1.56 -r1.57 pkgsrc/devel/gettext-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gettext-lib/Makefile 2015/04/11 10:44:37 1.56
+++ pkgsrc/devel/gettext-lib/Makefile 2015/04/11 18:27:32 1.57
@@ -1,34 +1,30 @@ @@ -1,34 +1,30 @@
1# $NetBSD: Makefile,v 1.56 2015/04/11 10:44:37 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.57 2015/04/11 18:27:32 bsiegert Exp $
2 2
3.include "../../devel/gettext/Makefile.common" 3.include "../../devel/gettext/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/-/-lib-/} 5PKGNAME= ${DISTNAME:S/-/-lib-/}
6COMMENT= Internationalized Message Handling Library (libintl) 6COMMENT= Internationalized Message Handling Library (libintl)
7 7
8USE_LANGUAGES= c 8USE_LANGUAGES= c
9CONFIGURE_ARGS+= --with-included-gettext 9CONFIGURE_ARGS+= --with-included-gettext
10CONFIGURE_ARGS+= --disable-csharp 10CONFIGURE_ARGS+= --disable-csharp
11CONFIGURE_ARGS+= --disable-c++ 11CONFIGURE_ARGS+= --disable-c++
12CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 12CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
13MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 13MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
14USE_TOOLS+= autoconf 
15 14
16CFLAGS+= ${CFLAGS.${ICONV_TYPE}-iconv} 15CFLAGS+= ${CFLAGS.${ICONV_TYPE}-iconv}
17CFLAGS.gnu-iconv+= -DHAVE_GNU_ICONV 16CFLAGS.gnu-iconv+= -DHAVE_GNU_ICONV
18 17
19INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} localedir=${EGDIR} 18INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} localedir=${EGDIR}
20INSTALL_MAKE_FLAGS+= includedir=${PREFIX}/include/gettext 19INSTALL_MAKE_FLAGS+= includedir=${PREFIX}/include/gettext
21 20
22#CONFIGURE_DIRS= gettext-runtime 21#CONFIGURE_DIRS= gettext-runtime
23BUILD_DIRS= gettext-runtime/intl 22BUILD_DIRS= gettext-runtime/intl
24EGDIR= ${PREFIX}/share/examples/gettext 23EGDIR= ${PREFIX}/share/examples/gettext
25LOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale 24LOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale
26 25
27REQD_DIRS+= ${LOCALEDIR} 26REQD_DIRS+= ${LOCALEDIR}
28REQD_FILES+= ${EGDIR}/locale.alias ${LOCALEDIR}/locale.alias 27REQD_FILES+= ${EGDIR}/locale.alias ${LOCALEDIR}/locale.alias
29 28
30post-patch: 
31 cd ${WRKSRC}/gettext-runtime && autoconf 
32 
33.include "../../converters/libiconv/buildlink3.mk" 29.include "../../converters/libiconv/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/devel/gettext-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gettext-lib/distinfo 2015/04/11 10:44:37 1.28
+++ pkgsrc/devel/gettext-lib/distinfo 2015/04/11 18:27:32 1.29
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.28 2015/04/11 10:44:37 bsiegert Exp $ 1$NetBSD: distinfo,v 1.29 2015/04/11 18:27:32 bsiegert Exp $
2 2
3SHA1 (gettext-0.19.4.tar.gz) = c473f4f268501d971b913197fb07767e628644bb 3SHA1 (gettext-0.19.4.tar.gz) = c473f4f268501d971b913197fb07767e628644bb
4RMD160 (gettext-0.19.4.tar.gz) = ab9191c0ac33c11ee98278271defe7cecc5a567f 4RMD160 (gettext-0.19.4.tar.gz) = ab9191c0ac33c11ee98278271defe7cecc5a567f
5Size (gettext-0.19.4.tar.gz) = 17717034 bytes 5Size (gettext-0.19.4.tar.gz) = 17717034 bytes
6SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7 6SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7
7SHA1 (patch-ab) = bb975a36b3fe9e4411703caaf455e7eef530a0a7 7SHA1 (patch-ab) = bb975a36b3fe9e4411703caaf455e7eef530a0a7
8SHA1 (patch-gettext-runtime_configure.ac) = fb2bd507611ab8c7dcf62a7767fb192387fbb275 8SHA1 (patch-gettext-runtime_configure) = ca1955ca85a106b10e89e5575350372d879f7bfb
File Added: pkgsrc/devel/gettext-lib/patches/Attic/patch-gettext-runtime_configure
$NetBSD: patch-gettext-runtime_configure,v 1.1 2015/04/11 18:27:32 bsiegert Exp $

Only run libasprintf configure when its build has been selected.
http://savannah.gnu.org/bugs/index.php?44808

--- gettext-runtime/configure.orig	Wed Dec 24 07:00:41 2014
+++ gettext-runtime/configure
@@ -31734,7 +31734,7 @@ fi
 
 
 
-subdirs="$subdirs libasprintf"
+subdirs="$subdirs $SUBDIR_libasprintf"
 
 
 ac_config_files="$ac_config_files Makefile"
File Deleted: pkgsrc/devel/gettext-lib/patches/Attic/patch-gettext-runtime_configure.ac