gettext and expat

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

Trying to update gtk3 to 3.16.3, configure fails with

  GNU gettext 0.18.3 or newer is required

The reason is that the test is:

$ xgettext --output=- --color=no --language=Glade ./gtkfilechooserwidget.ui 
xgettext: unknown option -- color=no
Try `xgettext --help' for more information.
quark$ /usr/pkg/bin/xgettext --output=- --color=no --language=Glade ./gtkfilechoos
/usr/pkg/bin/xgettext: Language "glade" is not supported. xgettext relies on expat.
                       This version was built without expat.


Rebuilding gettext-tools with the attached patch allows xgettext to
understand Glade files.

The reason for not just committing is, is that expat was specifically
disabled in devel/gettext-tools/Makefile:
----------------------------
revision 1.3
date: 2006-02-20 14:04:45 +0000;  author: joerg;  state: Exp;  lines: +2 -1;
Never allow configure to detect libexpat. Fixes PR 28032.
----------------------------

Commit patch?

Another question will be: in gtk3, how will I insist on gettext-tools
0.19.3nb1? Just buildlink3.mk it and not rely on TOOLS?

Cheers,

Patrick

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext-tools/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile	31 Aug 2014 10:24:02 -0000	1.26
+++ Makefile	10 Jun 2015 21:21:54 -0000
@@ -3,6 +3,7 @@
 .include "../../devel/gettext/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-tools-/}
+PKGREVISION=	1
 COMMENT=	Tools for providing messages in different languages
 
 DISTINFO_FILE=	${.CURDIR}/../../devel/gettext/distinfo
@@ -20,7 +21,6 @@
 CONFIGURE_ENV+=		HAVE_GCJ_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JAVAC_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JIKES_IN_PATH=
-CONFIGURE_ENV+=		ac_cv_libexpat=no
 LDFLAGS.AIX+=		-Wl,-brtl
 
 SHLIBTOOL_OVERRIDE=	# empty
@@ -42,5 +42,6 @@
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"