Remove autoconf dependency. It turns out that autoconf indirectly depends

on gettext-lib (via help2man), creating a circular dependency.

Thanks to sevan@ for noticing.

4 files changed, 19 insertions, 24 deletions

diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 0b8b4fbbdd4..a23deabf742 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2015/04/11 10:44:37 bsiegert Exp $
+# $NetBSD: Makefile,v 1.57 2015/04/11 18:27:32 bsiegert Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
@@ -11,7 +11,6 @@ CONFIGURE_ARGS+=	--disable-csharp
 CONFIGURE_ARGS+=	--disable-c++
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
-USE_TOOLS+=		autoconf
 
 CFLAGS+=		${CFLAGS.${ICONV_TYPE}-iconv}
 CFLAGS.gnu-iconv+=	-DHAVE_GNU_ICONV
@@ -27,8 +26,5 @@ LOCALEDIR=		${PREFIX}/${PKGLOCALEDIR}/locale
 REQD_DIRS+=		${LOCALEDIR}
 REQD_FILES+=		${EGDIR}/locale.alias ${LOCALEDIR}/locale.alias
 
-post-patch:
-	cd ${WRKSRC}/gettext-runtime && autoconf
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo
index a9e88c4044c..58fff108f53 100644
--- a/devel/gettext-lib/distinfo
+++ b/devel/gettext-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2015/04/11 10:44:37 bsiegert Exp $
+$NetBSD: distinfo,v 1.29 2015/04/11 18:27:32 bsiegert Exp $
 
 SHA1 (gettext-0.19.4.tar.gz) = c473f4f268501d971b913197fb07767e628644bb
 RMD160 (gettext-0.19.4.tar.gz) = ab9191c0ac33c11ee98278271defe7cecc5a567f
 Size (gettext-0.19.4.tar.gz) = 17717034 bytes
 SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7
 SHA1 (patch-ab) = bb975a36b3fe9e4411703caaf455e7eef530a0a7
-SHA1 (patch-gettext-runtime_configure.ac) = fb2bd507611ab8c7dcf62a7767fb192387fbb275
+SHA1 (patch-gettext-runtime_configure) = ca1955ca85a106b10e89e5575350372d879f7bfb
diff --git a/devel/gettext-lib/patches/patch-gettext-runtime_configure b/devel/gettext-lib/patches/patch-gettext-runtime_configure
new file mode 100644
index 00000000000..93d7c2b831c
--- /dev/null
+++ b/devel/gettext-lib/patches/patch-gettext-runtime_configure
@@ -0,0 +1,16 @@
+$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"
diff --git a/devel/gettext-lib/patches/patch-gettext-runtime_configure.ac b/devel/gettext-lib/patches/patch-gettext-runtime_configure.ac
deleted file mode 100644
index fe429b56318..00000000000
--- a/devel/gettext-lib/patches/patch-gettext-runtime_configure.ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gettext-runtime_configure.ac,v 1.1 2015/04/11 10:44:37 bsiegert Exp $
-
-Only run libasprintf configure when its build has been selected.
-http://savannah.gnu.org/bugs/index.php?44808
-
---- gettext-runtime/configure.ac.orig	Fri Apr 10 19:47:35 2015
-+++ gettext-runtime/configure.ac
-@@ -172,7 +172,9 @@ if test "$CXX" = "no"; then
- fi
- AM_CONDITIONAL([ENABLE_LIBASPRINTF], [test -n "$SUBDIR_libasprintf"])
- 
-+if [ -n "$SUBDIR_libasprintf" ]; then
- AC_CONFIG_SUBDIRS([libasprintf])
-+fi
- 
- AC_CONFIG_FILES([Makefile])
-