[pkgsrc/trunk]: pkgsrc/devel/gettext-lib Fix gettext build in the absence of ...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee0bcdc16e2a
branches:  trunk
changeset: 649846:ee0bcdc16e2a
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Apr 11 10:44:37 2015 +0000

description:
Fix gettext build in the absence of a C++ compiler, such as on MirBSD-current.
Bug submitted upstream as
http://savannah.gnu.org/bugs/index.php?44808.

Why was this not caught by USE_LANGUAGES=c?

diffstat:

 devel/gettext-lib/Makefile                                   |   9 ++++-
 devel/gettext-lib/distinfo                                   |   3 +-
 devel/gettext-lib/patches/patch-gettext-runtime_configure.ac |  17 ++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (72 lines):

diff -r 3f181cacc6d4 -r ee0bcdc16e2a devel/gettext-lib/Makefile
--- a/devel/gettext-lib/Makefile        Sat Apr 11 10:02:10 2015 +0000
+++ b/devel/gettext-lib/Makefile        Sat Apr 11 10:44:37 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2014/10/09 13:44:36 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2015/04/11 10:44:37 bsiegert Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
@@ -8,8 +8,10 @@
 USE_LANGUAGES=         c
 CONFIGURE_ARGS+=       --with-included-gettext
 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
@@ -17,7 +19,7 @@
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} localedir=${EGDIR}
 INSTALL_MAKE_FLAGS+=   includedir=${PREFIX}/include/gettext
 
-CONFIGURE_DIRS=                gettext-runtime
+#CONFIGURE_DIRS=               gettext-runtime
 BUILD_DIRS=            gettext-runtime/intl
 EGDIR=                 ${PREFIX}/share/examples/gettext
 LOCALEDIR=             ${PREFIX}/${PKGLOCALEDIR}/locale
@@ -25,5 +27,8 @@
 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 -r 3f181cacc6d4 -r ee0bcdc16e2a devel/gettext-lib/distinfo
--- a/devel/gettext-lib/distinfo        Sat Apr 11 10:02:10 2015 +0000
+++ b/devel/gettext-lib/distinfo        Sat Apr 11 10:44:37 2015 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.27 2015/01/03 18:04:06 spz Exp $
+$NetBSD: distinfo,v 1.28 2015/04/11 10:44:37 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
diff -r 3f181cacc6d4 -r ee0bcdc16e2a devel/gettext-lib/patches/patch-gettext-runtime_configure.ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gettext-lib/patches/patch-gettext-runtime_configure.ac      Sat Apr 11 10:44:37 2015 +0000
@@ -0,0 +1,17 @@
+$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])
+