34 files changed, 414 insertions, 292 deletions

diff --git a/devel/appdata-tools/Makefile b/devel/appdata-tools/Makefile
index e1087d95f2be..8dbda5f4601a 100644
--- a/devel/appdata-tools/Makefile
+++ b/devel/appdata-tools/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	appdata-tools
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	devel
 DIST_SUBDIR=	gnome3
 
@@ -24,8 +25,8 @@ GNU_CONFIGURE=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
 #CONFIGURE_ARGS=	--enable-introspection=yes
 USE_GITHUB=	yes
-USES=		autoreconf:build gmake libtool pathfix pkgconfig
-USE_GNOME=	gdkpixbuf2 glib20 intlhack introspection:build
+USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig
+USE_GNOME=	gdkpixbuf2 glib20 intltool introspection:build
 USE_LDCONFIG=	yes
 
 post-patch:
@@ -37,6 +38,8 @@ post-patch:
 		${WRKSRC}/configure.ac
 
 pre-configure:
-	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
+	(cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh)
+	${REINPLACE_CMD} 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/devel/appdata-tools/pkg-plist b/devel/appdata-tools/pkg-plist
index a472e86a4e2c..85be8b92e00d 100644
--- a/devel/appdata-tools/pkg-plist
+++ b/devel/appdata-tools/pkg-plist
@@ -1,7 +1,7 @@
 bin/appdata-validate
-lib/locale/en_GB/LC_MESSAGES/appdata-tools.mo
 share/aclocal/appdata-xml.m4
 share/appdata/schema/appdata.rnc
 share/appdata/schema/appdata.xsd
 share/appdata/schema/schema-locating-rules.xml
 share/emacs/site-lisp/site-start.d/appdata-rng-init.el
+share/locale/en_GB/LC_MESSAGES/appdata-tools.mo
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile
index 62500eb64bf5..ecdc228607c3 100644
--- a/devel/appstream-glib/Makefile
+++ b/devel/appstream-glib/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	appstream-glib
 PORTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	devel
 DIST_SUBDIR=	gnome3
 
@@ -20,8 +21,8 @@ GH_PROJECT=	appstream-glib
 GH_COMMIT=      f4f3230
 GH_TAGNAME=	${GH_COMMIT}
 
-USES=		autoreconf:build gmake libtool pathfix pkgconfig
-USE_GNOME=	gdkpixbuf2 glib20 gtk30 intlhack
+USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig
+USE_GNOME=	gdkpixbuf2 glib20 gtk30
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
@@ -42,6 +43,8 @@ post-patch:
 		${WRKSRC}/configure.ac
 
 pre-configure:
-	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
+	(cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh)
+	${REINPLACE_CMD} 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/devel/appstream-glib/pkg-plist b/devel/appstream-glib/pkg-plist
index 9a9ffe90ab82..8bc0d2508ff8 100644
--- a/devel/appstream-glib/pkg-plist
+++ b/devel/appstream-glib/pkg-plist
@@ -59,7 +59,6 @@ lib/libappstream-glib.a
 lib/libappstream-glib.so
 lib/libappstream-glib.so.1
 lib/libappstream-glib.so.1.5.6
-lib/locale/ru/LC_MESSAGES/appstream-glib.mo
 libdata/pkgconfig/appstream-builder.pc
 libdata/pkgconfig/appstream-glib.pc
 share/aclocal/appstream-xml.m4
@@ -69,3 +68,4 @@ share/gir-1.0/AppStreamBuilder-1.0.gir
 share/gir-1.0/AppStreamGlib-1.0.gir
 share/installed-tests/appstream-glib/appdata-validate.test
 share/installed-tests/appstream-glib/destdir-check.test
+share/locale/ru/LC_MESSAGES/appstream-glib.mo
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 055113d51703..0da5527f37b2 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -38,7 +38,7 @@ BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
 		dvips:${PORTSDIR}/print/tex-dvipsk
 .endif
 
-USES=		gettext:build tar:bzip2 gmake
+USES=		gettext-tools tar:bzip2 gmake
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ENV=	CC=avr-gcc PREFIX=${PREFIX}
diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common
index 4253bf0bc851..3608ecf1a8be 100644
--- a/devel/geany-plugins/files/Makefile.common
+++ b/devel/geany-plugins/files/Makefile.common
@@ -24,6 +24,7 @@ NLS_DIR=	po
 NLS_SWITCH=	--enable-nls
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
+USES+=		gettext
 .endif
 
 GEANY_PLUGIN?=			${PORTNAME:S,geany-plugin-,,}
diff --git a/devel/gettext-lint/Makefile b/devel/gettext-lint/Makefile
index da3753c88d1e..079925fd0cae 100644
--- a/devel/gettext-lint/Makefile
+++ b/devel/gettext-lint/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gettext-lint
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
 
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 NO_BUILD=	yes
 
-USES=		gettext:run python:run shebangfix
+USES=		gettext-tools:run python:run shebangfix
 SHEBANG_FILES=	src/POFileEquiv.in src/POFileGlossary.in
 
 post-patch:
diff --git a/devel/gettext-runtime/Makefile b/devel/gettext-runtime/Makefile
new file mode 100644
index 000000000000..6535480433df
--- /dev/null
+++ b/devel/gettext-runtime/Makefile
@@ -0,0 +1,52 @@
+# $FreeBSD$
+
+# NOTE: before committing to this port, contact portmgr to arrange for an
+# experimental ports run.  Untested commits may be backed out at portmgr's
+# discretion.
+
+PORTNAME=	gettext-runtime
+PORTREVISION=	0
+
+COMMENT=	GNU gettext runtime libraries and programs
+
+LICENSE=	LGPL21 GPLv3
+LICENSE_COMB=	multi
+LICENSE_FILE_LGPL21=	${WRKSRC}/intl/COPYING.LIB
+LICENSE_FILE_GPLv3=	${WRKSRC}/../COPYING
+
+.include "${.CURDIR}/../gettext/Makefile.common"
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-csharp --disable-java --with-included-gettext \
+		ac_cv_lib_rt_sched_yield=no
+INSTALL_TARGET=	install-strip
+USES=		charsetfix iconv libtool tar:xz
+USE_LDCONFIG=	yes
+WRKSRC_SUBDIR=	gettext-runtime
+
+INFO=		autosprintf
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 900506)
+CONFIGURE_ARGS+=--disable-threads
+.endif
+
+post-patch:
+# Do not install csharp and java documentation.
+	@${REINPLACE_CMD} -E '/^SUBDIRS =/s/(intl-csharp|intl-java)//g' \
+		${WRKSRC}/Makefile.in
+# Do not install html copies of manpages.
+	@${REINPLACE_CMD} \
+		-e '/^all-local:/s/html-local//' \
+		-e '/^install-data-local:/s/install-html//' \
+		-e '/^installdirs-local:/s/installdirs-html//' \
+		${WRKSRC}/libasprintf/Makefile.in ${WRKSRC}/man/Makefile.in
+
+post-install:
+	${LN} -s libintl.so.8 ${STAGEDIR}${PREFIX}/lib/libintl.so.9
+
+regression-test: build
+	@(cd ${WRKSRC} && ${MAKE_CMD} check)
+
+.include <bsd.port.mk>
diff --git a/devel/gettext-runtime/files/patch-configure b/devel/gettext-runtime/files/patch-configure
new file mode 100644
index 000000000000..d7c3b9c960e1
--- /dev/null
+++ b/devel/gettext-runtime/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2014-07-14 07:30:12 UTC
++++ configure
+@@ -16277,7 +16277,7 @@
+              # thread: pthread_create from libc will fail, whereas
+              # pthread_create will actually create a thread.
+              case "$host_os" in
+-               solaris* | hpux*)
++               solaris* | hpux* | freebsd*)
+ 
+ $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
+ 
diff --git a/devel/gettext-runtime/files/patch-intl-threadlib.c b/devel/gettext-runtime/files/patch-intl-threadlib.c
new file mode 100644
index 000000000000..8de65d9244f0
--- /dev/null
+++ b/devel/gettext-runtime/files/patch-intl-threadlib.c
@@ -0,0 +1,39 @@
+--- intl/threadlib.c.orig	2013-03-07 08:44:37 UTC
++++ intl/threadlib.c
+@@ -29,11 +29,10 @@
+ 
+ # if PTHREAD_IN_USE_DETECTION_HARD
+ 
+-/* The function to be executed by a dummy thread.  */
+-static void *
+-dummy_thread_func (void *arg)
++static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT;
++static void
++dummy_once_func (void)
+ {
+-  return arg;
+ }
+ 
+ int
+@@ -44,19 +43,10 @@ glthread_in_use (void)
+ 
+   if (!tested)
+     {
+-      pthread_t thread;
+-
+-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
+-        /* Thread creation failed.  */
++      if (pthread_once (&dummy_once_control, dummy_once_func) != 0)
+         result = 0;
+       else
+-        {
+-          /* Thread creation works.  */
+-          void *retval;
+-          if (pthread_join (thread, &retval) != 0)
+-            abort ();
+-          result = 1;
+-        }
++        result = 1;
+       tested = 1;
+     }
+   return result;
diff --git a/devel/gettext-runtime/pkg-descr b/devel/gettext-runtime/pkg-descr
new file mode 100644
index 000000000000..ac084016ae59
--- /dev/null
+++ b/devel/gettext-runtime/pkg-descr
@@ -0,0 +1,6 @@
+GNU gettext is a framework of libraries and tools for internationalisation
+and localisation of software.
+
+This package contains the runtime libraries and programs.
+
+WWW: http://www.gnu.org/software/gettext/
diff --git a/devel/gettext-runtime/pkg-plist b/devel/gettext-runtime/pkg-plist
new file mode 100644
index 000000000000..6cb2b44697f5
--- /dev/null
+++ b/devel/gettext-runtime/pkg-plist
@@ -0,0 +1,69 @@
+bin/envsubst
+bin/gettext
+bin/gettext.sh
+bin/ngettext
+include/autosprintf.h
+include/libintl.h
+lib/libasprintf.a
+lib/libasprintf.so
+lib/libasprintf.so.0
+lib/libasprintf.so.0.0.0
+lib/libintl.a
+lib/libintl.so
+lib/libintl.so.8
+lib/libintl.so.8.1.2
+lib/libintl.so.9
+man/man1/envsubst.1.gz
+man/man1/gettext.1.gz
+man/man1/ngettext.1.gz
+man/man3/bind_textdomain_codeset.3.gz
+man/man3/bindtextdomain.3.gz
+man/man3/dcgettext.3.gz
+man/man3/dcngettext.3.gz
+man/man3/dgettext.3.gz
+man/man3/dngettext.3.gz
+man/man3/gettext.3.gz
+man/man3/ngettext.3.gz
+man/man3/textdomain.3.gz
+%%DATADIR%%/ABOUT-NLS
+share/locale/be/LC_MESSAGES/gettext-runtime.mo
+share/locale/bg/LC_MESSAGES/gettext-runtime.mo
+share/locale/ca/LC_MESSAGES/gettext-runtime.mo
+share/locale/cs/LC_MESSAGES/gettext-runtime.mo
+share/locale/da/LC_MESSAGES/gettext-runtime.mo
+share/locale/de/LC_MESSAGES/gettext-runtime.mo
+share/locale/el/LC_MESSAGES/gettext-runtime.mo
+share/locale/en@boldquot/LC_MESSAGES/gettext-runtime.mo
+share/locale/en@quot/LC_MESSAGES/gettext-runtime.mo
+share/locale/eo/LC_MESSAGES/gettext-runtime.mo
+share/locale/es/LC_MESSAGES/gettext-runtime.mo
+share/locale/et/LC_MESSAGES/gettext-runtime.mo
+share/locale/fi/LC_MESSAGES/gettext-runtime.mo
+share/locale/fr/LC_MESSAGES/gettext-runtime.mo
+share/locale/ga/LC_MESSAGES/gettext-runtime.mo
+share/locale/gl/LC_MESSAGES/gettext-runtime.mo
+share/locale/hr/LC_MESSAGES/gettext-runtime.mo
+share/locale/hu/LC_MESSAGES/gettext-runtime.mo
+share/locale/id/LC_MESSAGES/gettext-runtime.mo
+share/locale/it/LC_MESSAGES/gettext-runtime.mo
+share/locale/ja/LC_MESSAGES/gettext-runtime.mo
+share/locale/ko/LC_MESSAGES/gettext-runtime.mo
+share/locale/locale.alias
+share/locale/nb/LC_MESSAGES/gettext-runtime.mo
+share/locale/nl/LC_MESSAGES/gettext-runtime.mo
+share/locale/nn/LC_MESSAGES/gettext-runtime.mo
+share/locale/pl/LC_MESSAGES/gettext-runtime.mo
+share/locale/pt/LC_MESSAGES/gettext-runtime.mo
+share/locale/pt_BR/LC_MESSAGES/gettext-runtime.mo
+share/locale/ro/LC_MESSAGES/gettext-runtime.mo
+share/locale/ru/LC_MESSAGES/gettext-runtime.mo
+share/locale/sk/LC_MESSAGES/gettext-runtime.mo
+share/locale/sl/LC_MESSAGES/gettext-runtime.mo
+share/locale/sr/LC_MESSAGES/gettext-runtime.mo
+share/locale/sv/LC_MESSAGES/gettext-runtime.mo
+share/locale/tr/LC_MESSAGES/gettext-runtime.mo
+share/locale/uk/LC_MESSAGES/gettext-runtime.mo
+share/locale/vi/LC_MESSAGES/gettext-runtime.mo
+share/locale/zh_CN/LC_MESSAGES/gettext-runtime.mo
+share/locale/zh_HK/LC_MESSAGES/gettext-runtime.mo
+share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
new file mode 100644
index 000000000000..ce80cb0e9e08
--- /dev/null
+++ b/devel/gettext-tools/Makefile
@@ -0,0 +1,72 @@
+# $FreeBSD$
+
+# NOTE: before committing to this port, contact portmgr to arrange for an
+# experimental ports run.  Untested commits may be backed out at portmgr's
+# discretion.
+
+PORTNAME=	gettext-tools
+PORTREVISION=	0
+
+COMMENT=	GNU gettext development and translation tools
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/../COPYING    
+
+.include "${.CURDIR}/../gettext/Makefile.common"
+
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-csharp --disable-java --disable-openmp \
+		--with-included-glib --with-included-libcroco \
+		--with-included-libunistring --with-included-libxml \
+		--without-emacs --without-git ac_cv_lib_rt_sched_yield=no
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
+USES=		charsetfix gettext-runtime iconv libtool tar:xz
+USE_LDCONFIG=	yes
+WRKSRC_SUBDIR=	gettext-tools
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+INFO+=		gettext
+.endif
+
+.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 900506)
+CONFIGURE_ARGS+=--disable-threads
+.endif
+
+post-patch:
+.if ! ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' ${WRKSRC}/Makefile.in
+.endif
+# Exclude examples and gnulib-tests.
+	@${REINPLACE_CMD} -E '/^SUBDIRS =/s/(examples|gnulib-tests)//g' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} \
+		'/^install-data-am:/s/install-examplesbuildauxDATA//' \
+		${WRKSRC}/Makefile.in ${WRKSRC}/m4/Makefile.in
+# Do not install html copies of manpages.
+	@${REINPLACE_CMD} \
+		-e '/^all-local:/s/html-local//' \
+		-e '/^install-data-local:/s/install-html//' \
+		-e '/^installdirs-local:/s/installdirs-html//' \
+		${WRKSRC}/man/Makefile.in
+# Do not patch system float.h.
+	@${REINPLACE_CMD} 's/FLOAT_H=float\.h//' \
+		${WRKSRC}/configure
+# Use libintl installed by gettext-runtime.
+	@${REINPLACE_CMD} '/^LDADD_no =/s,\.\./intl/libgnuintl.la,,' \
+		${WRKSRC}/tests/Makefile.in
+# Use libasprintf installed by gettext-runtime.
+	@${REINPLACE_CMD} 's,[^ ]*libasprintf.la,-lasprintf,' \
+		${WRKSRC}/tests/lang-c++
+
+regression-test: build
+	@(cd ${WRKSRC} && ${MAKE_CMD} check)
+
+.include <bsd.port.mk>
diff --git a/devel/gettext-tools/files/patch-configure b/devel/gettext-tools/files/patch-configure
new file mode 100644
index 000000000000..aae0d524d9f9
--- /dev/null
+++ b/devel/gettext-tools/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2014-07-14 07:30:23 UTC
++++ configure
+@@ -18293,7 +18293,7 @@
+              # thread: pthread_create from libc will fail, whereas
+              # pthread_create will actually create a thread.
+              case "$host_os" in
+-               solaris* | hpux*)
++               solaris* | hpux* | freebsd*)
+ 
+ $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
+ 
+@@ -21679,7 +21679,7 @@
+                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                 && test "$PACKAGE" != gettext-runtime \
+-                && test "$PACKAGE" != gettext-tools; }; then
++                ; }; then
+           gt_use_preinstalled_gnugettext=yes
+         else
+                     LIBINTL=
diff --git a/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c b/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c
new file mode 100644
index 000000000000..c8a29d7ab5ac
--- /dev/null
+++ b/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c
@@ -0,0 +1,39 @@
+--- gnulib-lib/glthread/threadlib.c.orig	2014-07-14 07:28:34 UTC
++++ gnulib-lib/glthread/threadlib.c
+@@ -29,11 +29,10 @@
+ 
+ # if PTHREAD_IN_USE_DETECTION_HARD
+ 
+-/* The function to be executed by a dummy thread.  */
+-static void *
+-dummy_thread_func (void *arg)
++static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT;
++static void
++dummy_once_func (void)
+ {
+-  return arg;
+ }
+ 
+ int
+@@ -44,19 +43,10 @@ glthread_in_use (void)
+ 
+   if (!tested)
+     {
+-      pthread_t thread;
+-
+-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
+-        /* Thread creation failed.  */
++      if (pthread_once (&dummy_once_control, dummy_once_func) != 0)
+         result = 0;
+       else
+-        {
+-          /* Thread creation works.  */
+-          void *retval;
+-          if (pthread_join (thread, &retval) != 0)
+-            abort ();
+-          result = 1;
+-        }
++        result = 1;
+       tested = 1;
+     }
+   return result;
diff --git a/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c b/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c
new file mode 100644
index 000000000000..ac8184e478c3
--- /dev/null
+++ b/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c
@@ -0,0 +1,39 @@
+--- libgettextpo/glthread/threadlib.c.orig	2014-07-14 07:29:10 UTC
++++ libgettextpo/glthread/threadlib.c
+@@ -29,11 +29,10 @@
+ 
+ # if PTHREAD_IN_USE_DETECTION_HARD
+ 
+-/* The function to be executed by a dummy thread.  */
+-static void *
+-dummy_thread_func (void *arg)
++static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT;
++static void
++dummy_once_func (void)
+ {
+-  return arg;
+ }
+ 
+ int
+@@ -44,19 +43,10 @@ glthread_in_use (void)
+ 
+   if (!tested)
+     {
+-      pthread_t thread;
+-
+-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
+-        /* Thread creation failed.  */
++      if (pthread_once (&dummy_once_control, dummy_once_func) != 0)
+         result = 0;
+       else
+-        {
+-          /* Thread creation works.  */
+-          void *retval;
+-          if (pthread_join (thread, &retval) != 0)
+-            abort ();
+-          result = 1;
+-        }
++        result = 1;
+       tested = 1;
+     }
+   return result;
diff --git a/devel/gettext-tools/pkg-descr b/devel/gettext-tools/pkg-descr
new file mode 100644
index 000000000000..c8d3f39b8e11
--- /dev/null
+++ b/devel/gettext-tools/pkg-descr
@@ -0,0 +1,6 @@
+GNU gettext is a framework of libraries and tools for internationalisation 
+and localisation of software.
+
+This package contains development and translation tools.
+
+WWW: http://www.gnu.org/software/gettext/
diff --git a/devel/gettext/pkg-plist b/devel/gettext-tools/pkg-plist
index 86ad58294453..23043d9bc218 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext-tools/pkg-plist
@@ -1,7 +1,4 @@
 bin/autopoint
-bin/envsubst
-bin/gettext
-bin/gettext.sh
 bin/gettextize
 bin/msgattrib
 bin/msgcat
@@ -17,37 +14,22 @@ bin/msginit
 bin/msgmerge
 bin/msgunfmt
 bin/msguniq
-bin/ngettext
 bin/recode-sr-latin
 bin/xgettext
-include/autosprintf.h
 include/gettext-po.h
-include/libintl.h
-lib/libasprintf.a
-lib/libasprintf.la
-lib/libasprintf.so
-lib/libasprintf.so.0
-lib/libgettextlib-0.18.3.so
-lib/libgettextlib.la
+lib/libgettextlib-0.19.3.so
 lib/libgettextlib.so
 lib/libgettextpo.a
-lib/libgettextpo.la
 lib/libgettextpo.so
-lib/libgettextpo.so.5
-lib/libgettextsrc.la
-lib/libgettextsrc-0.18.3.so
+lib/libgettextpo.so.0
+lib/libgettextpo.so.0.5.2
+lib/libgettextsrc-0.19.3.so
 lib/libgettextsrc.so
-lib/libintl.a
-lib/libintl.la
-lib/libintl.so
-lib/libintl.so.9
 lib/gettext/hostname
 lib/gettext/project-id
 lib/gettext/urlget
 lib/gettext/user-email
 man/man1/autopoint.1.gz
-man/man1/envsubst.1.gz
-man/man1/gettext.1.gz
 man/man1/gettextize.1.gz
 man/man1/msgattrib.1.gz
 man/man1/msgcat.1.gz
@@ -63,19 +45,10 @@ man/man1/msginit.1.gz
 man/man1/msgmerge.1.gz
 man/man1/msgunfmt.1.gz
 man/man1/msguniq.1.gz
-man/man1/ngettext.1.gz
 man/man1/recode-sr-latin.1.gz
 man/man1/xgettext.1.gz
-man/man3/bind_textdomain_codeset.3.gz
-man/man3/bindtextdomain.3.gz
-man/man3/dcgettext.3.gz
-man/man3/dcngettext.3.gz
-man/man3/dgettext.3.gz
-man/man3/dngettext.3.gz
-man/man3/gettext.3.gz
-man/man3/ngettext.3.gz
-man/man3/textdomain.3.gz
 share/aclocal/codeset.m4
+share/aclocal/extern-inline.m4
 share/aclocal/gettext.m4
 share/aclocal/fcntl-o.m4
 share/aclocal/glibc2.m4
@@ -107,22 +80,6 @@ share/aclocal/wchar_t.m4
 share/aclocal/wint_t.m4
 share/aclocal/xsize.m4
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext.html
-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceManager.html
-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceSet.html
-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/begin.html
-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/namespaces.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpcomp.m4
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpcomp.sh.in
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpexec.m4
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpexec.sh.in
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpexec-test.exe
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/gcj.m4
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/javacomp.m4
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/javacomp.sh.in
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/javaexec.m4
-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/javaexec.sh.in
 %%PORTDOCS%%%%DOCSDIR%%/gettext_1.html
 %%PORTDOCS%%%%DOCSDIR%%/gettext_2.html
 %%PORTDOCS%%%%DOCSDIR%%/gettext_3.html
@@ -150,28 +107,11 @@ share/aclocal/xsize.m4
 %%PORTDOCS%%%%DOCSDIR%%/gettext_25.html
 %%PORTDOCS%%%%DOCSDIR%%/gettext_foot.html
 %%PORTDOCS%%%%DOCSDIR%%/gettext_toc.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/allclasses-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/deprecated-list.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/GettextResource.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/help-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/index-all.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/index.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/overview-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/package-list
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/packages.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/serialized-form.html
-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/stylesheet.css
 %%PORTDOCS%%%%DOCSDIR%%/tutorial.html
-%%PORTDOCS%%share/doc/libasprintf/autosprintf_all.html
-%%DATADIR%%/ABOUT-NLS
 %%DATADIR%%/archive.dir.tar.xz
 %%DATADIR%%/config.rpath
 %%DATADIR%%/gettext.h
 %%DATADIR%%/intl/COPYING.LIB
-%%DATADIR%%/intl/ChangeLog
 %%DATADIR%%/intl/Makefile.in
 %%DATADIR%%/intl/VERSION
 %%DATADIR%%/intl/bindtextdom.c
@@ -267,80 +207,40 @@ share/aclocal/xsize.m4
 %%DATADIR%%/styles/po-emacs-xterm16.css
 %%DATADIR%%/styles/po-emacs-xterm256.css
 %%DATADIR%%/styles/po-vim.css
-share/locale/be/LC_MESSAGES/gettext-runtime.mo
 share/locale/be/LC_MESSAGES/gettext-tools.mo
-share/locale/bg/LC_MESSAGES/gettext-runtime.mo
 share/locale/bg/LC_MESSAGES/gettext-tools.mo
-share/locale/ca/LC_MESSAGES/gettext-runtime.mo
 share/locale/ca/LC_MESSAGES/gettext-tools.mo
-share/locale/cs/LC_MESSAGES/gettext-runtime.mo
 share/locale/cs/LC_MESSAGES/gettext-tools.mo
-share/locale/da/LC_MESSAGES/gettext-runtime.mo
 share/locale/da/LC_MESSAGES/gettext-tools.mo
-share/locale/de/LC_MESSAGES/gettext-runtime.mo
 share/locale/de/LC_MESSAGES/gettext-tools.mo
-share/locale/el/LC_MESSAGES/gettext-runtime.mo
 share/locale/el/LC_MESSAGES/gettext-tools.mo
-share/locale/en@boldquot/LC_MESSAGES/gettext-runtime.mo
 share/locale/en@boldquot/LC_MESSAGES/gettext-tools.mo
-share/locale/en@quot/LC_MESSAGES/gettext-runtime.mo
 share/locale/en@quot/LC_MESSAGES/gettext-tools.mo
-share/locale/eo/LC_MESSAGES/gettext-runtime.mo
-share/locale/es/LC_MESSAGES/gettext-runtime.mo
 share/locale/es/LC_MESSAGES/gettext-tools.mo
-share/locale/et/LC_MESSAGES/gettext-runtime.mo
 share/locale/et/LC_MESSAGES/gettext-tools.mo
 share/locale/eu/LC_MESSAGES/gettext-tools.mo
-share/locale/fi/LC_MESSAGES/gettext-runtime.mo
 share/locale/fi/LC_MESSAGES/gettext-tools.mo
-share/locale/fr/LC_MESSAGES/gettext-runtime.mo
 share/locale/fr/LC_MESSAGES/gettext-tools.mo
-share/locale/ga/LC_MESSAGES/gettext-runtime.mo
-share/locale/gl/LC_MESSAGES/gettext-runtime.mo
 share/locale/gl/LC_MESSAGES/gettext-tools.mo
-share/locale/hr/LC_MESSAGES/gettext-runtime.mo
-share/locale/id/LC_MESSAGES/gettext-runtime.mo
 share/locale/id/LC_MESSAGES/gettext-tools.mo
-share/locale/it/LC_MESSAGES/gettext-runtime.mo
 share/locale/it/LC_MESSAGES/gettext-tools.mo
-share/locale/ja/LC_MESSAGES/gettext-runtime.mo
 share/locale/ja/LC_MESSAGES/gettext-tools.mo
-share/locale/ko/LC_MESSAGES/gettext-runtime.mo
 share/locale/ko/LC_MESSAGES/gettext-tools.mo
-share/locale/locale.alias
-share/locale/nb/LC_MESSAGES/gettext-runtime.mo
 share/locale/nb/LC_MESSAGES/gettext-tools.mo
-share/locale/nl/LC_MESSAGES/gettext-runtime.mo
 share/locale/nl/LC_MESSAGES/gettext-tools.mo
-share/locale/nn/LC_MESSAGES/gettext-runtime.mo
 share/locale/nn/LC_MESSAGES/gettext-tools.mo
 share/locale/pa/LC_MESSAGES/gettext-tools.mo
-share/locale/pl/LC_MESSAGES/gettext-runtime.mo
 share/locale/pl/LC_MESSAGES/gettext-tools.mo
-share/locale/pt/LC_MESSAGES/gettext-runtime.mo
 share/locale/pt/LC_MESSAGES/gettext-tools.mo
-share/locale/pt_BR/LC_MESSAGES/gettext-runtime.mo
 share/locale/pt_BR/LC_MESSAGES/gettext-tools.mo
-share/locale/ro/LC_MESSAGES/gettext-runtime.mo
 share/locale/ro/LC_MESSAGES/gettext-tools.mo
-share/locale/ru/LC_MESSAGES/gettext-runtime.mo
 share/locale/ru/LC_MESSAGES/gettext-tools.mo
-share/locale/sk/LC_MESSAGES/gettext-runtime.mo
 share/locale/sk/LC_MESSAGES/gettext-tools.mo
-share/locale/sl/LC_MESSAGES/gettext-runtime.mo
 share/locale/sl/LC_MESSAGES/gettext-tools.mo
-share/locale/sr/LC_MESSAGES/gettext-runtime.mo
 share/locale/sr/LC_MESSAGES/gettext-tools.mo
-share/locale/sv/LC_MESSAGES/gettext-runtime.mo
 share/locale/sv/LC_MESSAGES/gettext-tools.mo
-share/locale/tr/LC_MESSAGES/gettext-runtime.mo
 share/locale/tr/LC_MESSAGES/gettext-tools.mo
-share/locale/uk/LC_MESSAGES/gettext-runtime.mo
 share/locale/uk/LC_MESSAGES/gettext-tools.mo
-share/locale/vi/LC_MESSAGES/gettext-runtime.mo
 share/locale/vi/LC_MESSAGES/gettext-tools.mo
-share/locale/zh_CN/LC_MESSAGES/gettext-runtime.mo
 share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
-share/locale/zh_HK/LC_MESSAGES/gettext-runtime.mo
-share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
 share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 728ef30f7612..c387cdb74ded 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,50 +1,20 @@
-# Created by: Yukihiro Nakai <Nakai@technologist.com>
 # $FreeBSD$
 
-PORTNAME=	gettext
-PORTVERSION=	0.18.3.1
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gettext
-
-# note: before committing to this port, contact portmgr to arrange for an
+# NOTE: before committing to this port, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
-MAINTAINER=	autotools@FreeBSD.org
-COMMENT=	GNU gettext package
-
-USES=		charsetfix iconv libtool:oldver
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-csharp --disable-java \
-		--disable-openmp --disable-threads \
-		--with-included-gettext --with-included-glib \
-		--with-included-libcroco --with-included-libunistring \
-		--with-included-libxml ${ICONV_CONFIGURE_ARG} \
-		--without-emacs --without-git
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
 
-INFO=		autosprintf gettext
-
-OPTIONS_DEFINE=	DOCS
+PORTNAME=	gettext
+PORTREVISION=	0
+DISTFILES=
 
-.include <bsd.port.options.mk>
+COMMENT=	GNU gettext meta package
 
-.if ! ${PORT_OPTIONS:MDOCS}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nodocs
-.endif
+.include "${.CURDIR}/../gettext/Makefile.common"
 
-post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
-.for dir in runtime tools
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = doc|SUBDIRS =|' \
-		${WRKSRC}/gettext-${dir}/Makefile.in
-.endfor
-.endif
+USES=		gettext-runtime:run gettext-tools:run
 
-post-install:
-	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/gettext-tools/doc \
-		${MAKE_ARGS} install-info-am
+NO_BUILD=	yes
+NO_INSTALL=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common
new file mode 100644
index 000000000000..ad0c17a7a12b
--- /dev/null
+++ b/devel/gettext/Makefile.common
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+# NOTE: before committing to this port, contact portmgr to arrange for an
+# experimental ports run.  Untested commits may be backed out at portmgr's
+# discretion.
+
+PORTVERSION=	0.19.3
+PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
+CATEGORIES=	devel
+MASTER_SITES=	GNU/gettext
+DISTNAME=	gettext-${PORTVERSION}
+
+MAINTAINER=	autotools@FreeBSD.org
+
+DISTINFO_FILE=	${.CURDIR}/../gettext/distinfo
+
+DATADIR=	${PREFIX}/share/gettext
+DOCSDIR=	${PREFIX}/share/doc/gettext
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index efe7b1da6a33..70c42117363f 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gettext-0.18.3.1.tar.gz) = 0d8f9a33531b77776b3dc473e7940019ca19bfca5b4c06db6e96065eeb07245d
-SIZE (gettext-0.18.3.1.tar.gz) = 16341773
+SHA256 (gettext-0.19.3.tar.xz) = f6fdb29c9ee8ce85c7e574f60ff64fa91cf0f4f018437dfe800227d15595db46
+SIZE (gettext-0.19.3.tar.xz) = 6628460
diff --git a/devel/gettext/files/extra-patch-nodocs b/devel/gettext/files/extra-patch-nodocs
deleted file mode 100644
index 58acc18a9f6e..000000000000
--- a/devel/gettext/files/extra-patch-nodocs
+++ /dev/null
@@ -1,55 +0,0 @@
---- gettext-runtime/intl-java/Makefile.in.orig	Mon May 23 04:23:40 2005
-+++ gettext-runtime/intl-java/Makefile.in	Tue Jan 30 20:02:41 2007
-@@ -464,5 +464,5 @@
- 
--all-local: all-classes all-javadoc2
--install-data-local: install-classes install-javadoc2
--installdirs-local: installdirs-classes installdirs-javadoc2
-+all-local: all-classes
-+install-data-local: install-classes
-+installdirs-local: installdirs-classes
- uninstall-local: uninstall-classes uninstall-javadoc2
-
---- gettext-runtime/intl-csharp/Makefile.in.orig	Mon May 23 04:23:39 2005
-+++ gettext-runtime/intl-csharp/Makefile.in	Tue Jan 30 20:11:08 2007
-@@ -432,5 +432,5 @@
- 
--all-local: all-dll all-doc
--install-data-local: install-dll install-doc
--installdirs-local: installdirs-dll installdirs-doc
-+all-local: all-dll
-+install-data-local: install-dll
-+installdirs-local: installdirs-dll
- uninstall-local: uninstall-dll uninstall-doc
-
---- gettext-runtime/libasprintf/Makefile.in.orig	Mon May 23 04:23:55 2005
-+++ gettext-runtime/libasprintf/Makefile.in	Tue Jan 30 20:24:01 2007
-@@ -882,5 +882,5 @@
- 
--all-local: html-local
--install-data-local: install-html
--installdirs-local: installdirs-html
-+all-local:
-+install-data-local:
-+installdirs-local:
- uninstall-local: uninstall-html
-
---- gettext-tools/Makefile.in.orig	Mon Nov 27 09:34:56 2006
-+++ gettext-tools/Makefile.in	Tue Jan 30 23:15:59 2007
-@@ -944,3 +944,3 @@
- 
--install-data-am: install-examplesbuildauxDATA \
-+install-data-am: \
- 	install-gettextsrcSCRIPTS
-
---- gettext-tools/m4/Makefile.in.orig	Mon May 23 04:24:27 2005
-+++ gettext-tools/m4/Makefile.in	Tue Jan 30 20:19:34 2007
-@@ -530,3 +530,3 @@
- installdirs:
--	for dir in "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(examplesbuildauxdir)"; do \
-+	for dir in "$(DESTDIR)$(aclocaldir)" ; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-@@ -575,3 +575,3 @@
- 
--install-data-am: install-aclocalDATA install-examplesbuildauxDATA
-+install-data-am: install-aclocalDATA
diff --git a/devel/gettext/files/patch-gettext-runtime_man_Makefile.in b/devel/gettext/files/patch-gettext-runtime_man_Makefile.in
deleted file mode 100644
index 22be4429b9c8..000000000000
--- a/devel/gettext/files/patch-gettext-runtime_man_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-runtime/man/Makefile.in.orig	Mon May 23 04:23:40 2005
-+++ gettext-runtime/man/Makefile.in	Tue Jan 30 22:30:58 2007
-@@ -576,5 +576,5 @@
- 
--all-local: html-local
--install-data-local: install-html
--installdirs-local: installdirs-html
-+all-local:
-+install-data-local:
-+installdirs-local:
- uninstall-local: uninstall-html
diff --git a/devel/gettext/files/patch-gettext-tools_Makefile.in b/devel/gettext/files/patch-gettext-tools_Makefile.in
deleted file mode 100644
index 73174661ba6f..000000000000
--- a/devel/gettext/files/patch-gettext-tools_Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- gettext-tools/Makefile.in.orig	2007-11-06 23:40:19.000000000 +0000
-+++ gettext-tools/Makefile.in	2007-12-12 03:30:36.000000000 +0000
-@@ -726,3 +726,3 @@
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
-+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4
- 
diff --git a/devel/gettext/files/patch-gettext-tools_config.h.in b/devel/gettext/files/patch-gettext-tools_config.h.in
deleted file mode 100644
index 88d513ca7e14..000000000000
--- a/devel/gettext/files/patch-gettext-tools_config.h.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- gettext-tools/config.h.in.orig	2013-03-05 08:43:50.000000000 +0000
-+++ gettext-tools/config.h.in	2013-05-23 19:14:44.000000000 +0000
-@@ -524,2 +524,5 @@
- 
-+/* Define to 1 if the expat library is bsdxml. */
-+#undef HAVE_BSDXML
-+
- /* Define to 1 if you have the 'btowc' function. */
diff --git a/devel/gettext/files/patch-gettext-tools_configure b/devel/gettext/files/patch-gettext-tools_configure
deleted file mode 100644
index 811a93225422..000000000000
--- a/devel/gettext/files/patch-gettext-tools_configure
+++ /dev/null
@@ -1,16 +0,0 @@
---- gettext-tools/configure.orig	Mon Nov 27 09:34:40 2006
-+++ gettext-tools/configure	Sun Dec  3 17:54:35 2006
-@@ -50083,2 +50071,13 @@
- case "$host_os" in
-+  freebsd*)
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_BSDXML 1
-+#define HAVE_LIBEXPAT 1
-+_ACEOF
-+
-+    LIBEXPAT="-lbsdxml"
-+    LTLIBEXPAT="-lbsdxml"
-+
-+    ;;
-   linux*)
diff --git a/devel/gettext/files/patch-gettext-tools_man_Makefile.in b/devel/gettext/files/patch-gettext-tools_man_Makefile.in
deleted file mode 100644
index a9dfe1734871..000000000000
--- a/devel/gettext/files/patch-gettext-tools_man_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-tools/man/Makefile.in.orig	Mon May 23 04:24:28 2005
-+++ gettext-tools/man/Makefile.in	Tue Jan 30 22:12:40 2007
-@@ -576,5 +576,5 @@
- 
--all-local: html-local
--install-data-local: install-html
--installdirs-local: installdirs-html
-+all-local:
-+install-data-local:
-+installdirs-local:
- uninstall-local: uninstall-html
diff --git a/devel/gettext/files/patch-gettext-tools_src_x-glade.c b/devel/gettext/files/patch-gettext-tools_src_x-glade.c
deleted file mode 100644
index a482cd98d36d..000000000000
--- a/devel/gettext/files/patch-gettext-tools_src_x-glade.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- gettext-tools/src/x-glade.c.orig	Sat Aug 28 11:53:08 2004
-+++ gettext-tools/src/x-glade.c	Sat Aug 28 11:53:48 2004
-@@ -30,7 +30,11 @@
- # include <dlfcn.h>
- #else
- # if HAVE_LIBEXPAT
--#  include <expat.h>
-+#  if HAVE_BSDXML
-+#   include <bsdxml.h>
-+#  else
-+#   include <expat.h>
-+#  endif
- # endif
- #endif
- 
diff --git a/devel/gettext/pkg-descr b/devel/gettext/pkg-descr
index 38165c0868e7..c2f69ee3903c 100644
--- a/devel/gettext/pkg-descr
+++ b/devel/gettext/pkg-descr
@@ -1,7 +1,4 @@
-This is the GNU gettext package.  It is interesting for authors or
-maintainers of other packages or programs which they want to see
-internationalized.  As one step the handling of messages in different
-languages should be implemented.  For this task GNU gettext provides
-the needed tools and library functions.
+GNU gettext is a framework of libraries and tools for internationalisation 
+and localisation of software.
 
 WWW: http://www.gnu.org/software/gettext/
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index 5736a39f331c..928b79478503 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection
-USES=		gmake libtool pathfix pkgconfig python:2
+USES=		gettext gmake libtool pathfix pkgconfig python:2
 USE_LDCONFIG=	yes
 USE_GNOME=	intlhack introspection
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/poxml/Makefile b/devel/poxml/Makefile
index eeb992c1d016..150e7b37e0ca 100644
--- a/devel/poxml/Makefile
+++ b/devel/poxml/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	poxml
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -12,7 +13,7 @@ COMMENT=	Tools to translate Docbook XML using gettext
 BUILD_DEPENDS=	${LOCALBASE}/lib/libantlr.a:${PORTSDIR}/devel/antlr
 
 USE_KDE4=	kdelibs kdeprefix automoc4
-USES=		cmake:outsource tar:xz
+USES=		cmake:outsource gettext-tools:build,run tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		corelib xml
 
diff --git a/devel/py-itools/Makefile b/devel/py-itools/Makefile
index 13d085e41c9a..926e18d49eac 100644
--- a/devel/py-itools/Makefile
+++ b/devel/py-itools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	itools
 PORTVERSION=	0.75.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,6 @@ BUILD_DEPENDS=  ${LOCALBASE}/include/poppler/goo/gtypes.h:${PORTSDIR}/graphics/p
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \
 		${PYTHON_PKGNAMEPREFIX}gobject>=2.16.1:${PORTSDIR}/devel/py-gobject \
-		gettext:${PORTSDIR}/devel/gettext \
 		python:${PORTSDIR}/lang/python
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20 \
@@ -30,7 +29,7 @@ LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20 \
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/poppler
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-USES=	pkgconfig python:2.7+
+USES=		gettext-tools:run pkgconfig python:2.7+
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	DOCS
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 46d5f924bdb2..247342f6a2c4 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -68,7 +68,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
 .if ${PORT_OPTIONS:MSTATIC}
 .  if ${PORT_OPTIONS:MNLS}
-USES+=			gettext:build
+USES+=			gettext-tools
 .  endif
 .  if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
diff --git a/devel/subversion17/Makefile b/devel/subversion17/Makefile
index 5af550ee8797..4de91d548e41 100644
--- a/devel/subversion17/Makefile
+++ b/devel/subversion17/Makefile
@@ -90,7 +90,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
 .if ${PORT_OPTIONS:MSTATIC}
 .  if ${PORT_OPTIONS:MNLS}
-USES+=			gettext:build
+USES+=			gettext-tools
 .  endif
 .  if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes