Index: devel/gettext/Makefile.common
===================================================================
--- devel/gettext/Makefile.common	(revision 393644)
+++ devel/gettext/Makefile.common	(working copy)
@@ -4,7 +4,7 @@
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 
-PORTVERSION=	0.19.4
+PORTVERSION=	0.19.5.1
 PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
 CATEGORIES=	devel
 MASTER_SITES=	GNU/gettext
Index: devel/gettext/distinfo
===================================================================
--- devel/gettext/distinfo	(revision 393640)
+++ devel/gettext/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (gettext-0.19.4.tar.xz) = 719adadb8bf3e36bac52c243a01c0add18d23506a3a40437e6f5899ceab18d20
-SIZE (gettext-0.19.4.tar.xz) = 6656168
+SHA256 (gettext-0.19.5.1.tar.xz) = 66da00dc2c810d733b1f55a2a4af5cb669e2ee4259937d50a51d5614cdad323d
+SIZE (gettext-0.19.5.1.tar.xz) = 6873540
Index: devel/gettext-tools/Makefile
===================================================================
--- devel/gettext-tools/Makefile	(revision 393640)
+++ devel/gettext-tools/Makefile	(working copy)
@@ -31,22 +31,18 @@ WRKSRC_SUBDIR=	gettext-tools
 CPE_PRODUCT=	gettext
 CPE_VENDOR=	gnu
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS THREADS
+OPTIONS_DEFAULT=THREADS
+OPTIONS_EXCLUDE_DragonFly=	THREADS
 
-.include <bsd.port.options.mk>
+DOCS_INFO=	gettext
 
-.if ${PORT_OPTIONS:MDOCS}
-INFO+=		gettext
-.endif
+THREADS_CONFIGURE_ENABLE=	threads
 
-.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 900506)
-CONFIGURE_ARGS+=--disable-threads
-.endif
+post-patch-DOCS-off:
+	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' ${WRKSRC}/Makefile.in
 
 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
Index: devel/gettext-tools/pkg-plist
===================================================================
--- devel/gettext-tools/pkg-plist	(revision 393640)
+++ devel/gettext-tools/pkg-plist	(working copy)
@@ -17,14 +17,15 @@ bin/msguniq
 bin/recode-sr-latin
 bin/xgettext
 include/gettext-po.h
-lib/libgettextlib-0.19.4.so
+lib/libgettextlib-0.19.5.1.so
 lib/libgettextlib.so
 lib/libgettextpo.a
 lib/libgettextpo.so
 lib/libgettextpo.so.0
 lib/libgettextpo.so.0.5.3
-lib/libgettextsrc-0.19.4.so
+lib/libgettextsrc-0.19.5.1.so
 lib/libgettextsrc.so
+lib/gettext/cldr-plurals
 lib/gettext/hostname
 lib/gettext/project-id
 lib/gettext/urlget