8 files changed, 59 insertions, 52 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 598f2c1952dc..3325fedc0f84 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gettext
-PORTVERSION=	0.14.1
+PORTVERSION=	0.14.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gettext
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index aad848b86f57..b6cb8d641e76 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,2 +1,2 @@
-MD5 (gettext-0.14.1.tar.gz) = 78f4b862510beb2e5d43223dd610e77d
-SIZE (gettext-0.14.1.tar.gz) = 6550874
+MD5 (gettext-0.14.4.tar.gz) = 7580b2d77ef26cafa248f525dcb960c3
+SIZE (gettext-0.14.4.tar.gz) = 7034035
diff --git a/devel/gettext/files/patch-ad b/devel/gettext/files/patch-ad
index 819178bc503a..4bd832b13da3 100644
--- a/devel/gettext/files/patch-ad
+++ b/devel/gettext/files/patch-ad
@@ -1,15 +1,14 @@
-$FreeBSD$
-
---- gettext-tools/misc/Makefile.in.orig	Thu May 22 09:41:22 2003
-+++ gettext-tools/misc/Makefile.in	Wed Jun 11 14:00:52 2003
-@@ -332,10 +332,8 @@
+--- gettext-tools/misc/Makefile.in.orig	Mon Mar 14 07:24:11 2005
++++ gettext-tools/misc/Makefile.in	Mon Mar 14 20:40:33 2005
+@@ -447,11 +447,9 @@
+ 	  list='$(lisp_LISP)'; for p in $$list; do \
  	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
- 	    echo " $(lispLISP_INSTALL) $$d$$p $(DESTDIR)$(lispdir)/$$f"; \
--	    $(lispLISP_INSTALL) $$d$$p $(DESTDIR)$(lispdir)/$$f; \
+ 	    f=$(am__strip_dir) \
+-	    echo " $(lispLISP_INSTALL) '$$d$$p' '$(DESTDIR)$(lispdir)/$$f'"; \
+ 	    $(lispLISP_INSTALL) "$$d$$p" "$(DESTDIR)$(lispdir)/$$f"; \
  	    if test -f $${p}c; then \
- 	      echo " $(lispLISP_INSTALL) $${p}c $(DESTDIR)$(lispdir)/$${f}c"; \
--	      $(lispLISP_INSTALL) $${p}c $(DESTDIR)$(lispdir)/$${f}c; \
+ 	      echo " $(lispLISP_INSTALL) '$${p}c' '$(DESTDIR)$(lispdir)/$${f}c'"; \
+-	      $(lispLISP_INSTALL) "$${p}c" "$(DESTDIR)$(lispdir)/$${f}c"; \
  	    else : ; fi; \
  	  done; \
  	else : ; fi
diff --git a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
index 05be764cc626..645d37312768 100644
--- a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
+++ b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
@@ -1,5 +1,5 @@
---- gettext-runtime/intl/Makefile.in.orig	Sat Jan 17 10:54:06 2004
-+++ gettext-runtime/intl/Makefile.in	Mon Dec 13 02:46:25 2004
+--- gettext-runtime/intl/Makefile.in.orig	Mon Apr 11 14:34:59 2005
++++ gettext-runtime/intl/Makefile.in	Mon Apr 18 19:10:08 2005
 @@ -52,7 +52,7 @@
  YFLAGS = --name-prefix=__gettext
  
@@ -9,25 +9,25 @@
  -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
  -Dset_relocation_prefix=libintl_set_relocation_prefix \
  -Drelocate=libintl_relocate \
-@@ -152,7 +152,7 @@
+@@ -154,7 +154,7 @@
  libintl.la libgnuintl.la: $(OBJECTS)
  	$(LIBTOOL) --mode=link \
  	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
--	  $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
-+	  $(OBJECTS) @LTLIBICONV@ $(LIBS) \
+-	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \
++	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) \
  	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
  	  -rpath $(libdir) \
  	  -no-undefined
-@@ -162,7 +162,7 @@
+@@ -164,7 +164,7 @@
  # according to the libtool documentation, section "Library interface versions".
  # Maintainers of other packages that include the intl directory must *not*
  # change these values.
 -LTV_CURRENT=7
 +LTV_CURRENT=6
- LTV_REVISION=0
+ LTV_REVISION=3
  LTV_AGE=4
  
-@@ -283,22 +283,6 @@
+@@ -288,22 +288,6 @@
  	  : ; \
  	fi
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
@@ -50,7 +50,7 @@
  	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
  	  test -f $(DESTDIR)$(localedir)/locale.alias \
  	    && orig=$(DESTDIR)$(localedir)/locale.alias \
-@@ -382,9 +366,9 @@
+@@ -389,9 +373,9 @@
  	  : ; \
  	fi
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
diff --git a/devel/gettext/files/patch-gettext-tools_Makefile.in b/devel/gettext/files/patch-gettext-tools_Makefile.in
index a619db7d254b..c5cea5f0c75a 100644
--- a/devel/gettext/files/patch-gettext-tools_Makefile.in
+++ b/devel/gettext/files/patch-gettext-tools_Makefile.in
@@ -1,11 +1,11 @@
---- gettext-tools/Makefile.in.orig	Thu Jan 29 12:13:35 2004
-+++ gettext-tools/Makefile.in	Mon Dec 13 02:21:20 2004
-@@ -328,7 +328,7 @@
+--- gettext-tools/Makefile.in.orig	Mon Apr 11 15:15:55 2005
++++ gettext-tools/Makefile.in	Mon Apr 18 19:12:07 2005
+@@ -348,7 +348,7 @@
  target_alias = @target_alias@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../config/m4
--SUBDIRS = doc intl lib libuniname src po projects misc man m4 tests examples
-+SUBDIRS = intl lib libuniname src po projects misc man m4
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4
+-SUBDIRS = doc intl lib libgrep libuniname src po projects misc man m4 tests examples
++SUBDIRS = doc intl lib libgrep libuniname src po projects misc man m4
  # vms_jackets.h is a header that comes with Compaq's "porting library".
  # KEEP_CRTL_SETLOCALE tells it to not override the native locale support.
- EXTRA_DIST = misc/DISCLAIM Makefile.vms config.h_vms README.woe32 Makefile.msvc config.h.msvc windows/alloca.h windows/fnmatch.h windows/stdbool.h windows/gettextlib.def windows/gettextsrc.def windows/gettextpo.def windows/gettextlib.rc windows/gettextsrc.rc windows/gettextpo.rc
+ EXTRA_DIST = misc/DISCLAIM Makefile.vms config.h_vms README.woe32 \
diff --git a/devel/gettext/files/patch-gettext-tools_configure b/devel/gettext/files/patch-gettext-tools_configure
index 971342a41090..d4577a89f196 100644
--- a/devel/gettext/files/patch-gettext-tools_configure
+++ b/devel/gettext/files/patch-gettext-tools_configure
@@ -1,15 +1,15 @@
---- gettext-tools/configure.orig	Thu Jan 29 12:13:22 2004
-+++ gettext-tools/configure	Mon Dec 13 02:56:59 2004
+--- gettext-tools/configure.orig	Mon Mar 14 07:23:55 2005
++++ gettext-tools/configure	Mon Mar 14 21:06:06 2005
 @@ -463,7 +463,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot localedir docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA CSHARP_CHOICE HAVE_CSCC_IN_PATH HAVE_MCS_IN_PATH HAVE_CSC_IN_PATH HAVE_CSCC HAVE_MCS HAVE_CSC BUILDCSHARP HAVE_ILRUN_IN_PATH HAVE_MONO_IN_PATH MONO_PATH MONO_PATH_SEPARATOR HAVE_ILRUN HAVE_MONO TESTCSHARP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE STDBOOL_H HAVE__BOOL ALLOCA ALLOCA_H FNMATCH_H MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR TESTLIBASPRINTF LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar localedir docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA CSHARP_CHOICE HAVE_CSCC_IN_PATH HAVE_MCS_IN_PATH HAVE_CSC_IN_PATH HAVE_CSCC HAVE_MCS HAVE_CSC BUILDCSHARP HAVE_ILRUN_IN_PATH HAVE_MONO_IN_PATH MONO_PATH MONO_PATH_SEPARATOR HAVE_ILRUN HAVE_MONO TESTCSHARP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE STDBOOL_H HAVE__BOOL ALLOCA ALLOCA_H FNMATCH_H GETOPT_H LIBGREPOBJS MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR LOCALE_FR_UTF8 TESTLIBASPRINTF LTLIBOBJS'
 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot localedir docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA CSHARP_CHOICE HAVE_CSCC_IN_PATH HAVE_MCS_IN_PATH HAVE_CSC_IN_PATH HAVE_CSCC HAVE_MCS HAVE_CSC BUILDCSHARP HAVE_ILRUN_IN_PATH HAVE_MONO_IN_PATH MONO_PATH MONO_PATH_SEPARATOR HAVE_ILRUN HAVE_MONO TESTCSHARP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE STDBOOL_H HAVE__BOOL ALLOCA ALLOCA_H FNMATCH_H MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT HAVE_BSDXML EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR TESTLIBASPRINTF LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -1962,7 +1962,7 @@
+@@ -1977,7 +1977,7 @@
  
  docdir='${datadir}/doc/gettext'
  
@@ -18,7 +18,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -3764,7 +3764,7 @@
+@@ -3786,7 +3786,7 @@
  fi
  
  if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
@@ -27,7 +27,7 @@
  else
    BUILDJAVA=no
  fi
-@@ -36704,6 +36704,17 @@
+@@ -39202,6 +39202,17 @@
  
  
  case "$host_os" in
diff --git a/devel/gettext/files/patch-gettext-tools_lib_Makefile.in b/devel/gettext/files/patch-gettext-tools_lib_Makefile.in
index 4644ecaa64e3..23ccb587b68a 100644
--- a/devel/gettext/files/patch-gettext-tools_lib_Makefile.in
+++ b/devel/gettext/files/patch-gettext-tools_lib_Makefile.in
@@ -1,15 +1,15 @@
---- gettext-tools/lib/Makefile.in.orig	Thu Jan 29 12:13:36 2004
-+++ gettext-tools/lib/Makefile.in	Mon Dec 13 02:27:59 2004
-@@ -174,7 +174,7 @@
- CXXFLAGS = @CXXFLAGS@
+--- gettext-tools/lib/Makefile.in.orig	Mon Mar 14 07:24:09 2005
++++ gettext-tools/lib/Makefile.in	Mon Mar 14 21:10:57 2005
+@@ -192,7 +192,7 @@
  CYGPATH_W = @CYGPATH_W@
  DATADIRNAME = @DATADIRNAME@
--DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(libdir)\"
-+DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(prefix)/libdata\"
+ DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 \
+-	-DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(libdir)\"
++	-DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(prefix)/libdata\"
  DEPDIR = @DEPDIR@
  DLLTOOL = @DLLTOOL@
  DVIPS = @DVIPS@
-@@ -451,7 +451,7 @@
+@@ -454,7 +454,7 @@
  # Need @LTLIBICONV@ because linebreak.c uses iconv().
  libgettextlib_la_LDFLAGS = \
    -release @VERSION@ \
@@ -18,7 +18,7 @@
  
  
  # Extra files to be installed.
-@@ -725,7 +725,7 @@
+@@ -736,7 +736,7 @@
  
  install-data-am: install-examplesconfigDATA install-gettextsrcDATA
  
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 9031d0779a42..0ed3bfcb6419 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -44,6 +44,7 @@ libdata/gettext-tools/urlget
 libdata/gettext-tools/user-email
 share/aclocal/codeset.m4
 share/aclocal/gettext.m4
+share/aclocal/glibc2.m4
 share/aclocal/glibc21.m4
 share/aclocal/iconv.m4
 share/aclocal/intdiv0.m4
@@ -70,21 +71,22 @@ share/aclocal/ulonglong.m4
 share/aclocal/wchar_t.m4
 share/aclocal/wint_t.m4
 share/aclocal/xsize.m4
+%%DOCSDIR%%/FAQ.html
 %%DOCSDIR%%/csharpdoc/GNU_Gettext.html
 %%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceManager.html
 %%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceSet.html
 %%DOCSDIR%%/csharpdoc/begin.html
 %%DOCSDIR%%/csharpdoc/index.html
 %%DOCSDIR%%/csharpdoc/namespaces.html
-%%DOCSDIR%%/examples/config/csharpcomp.m4
-%%DOCSDIR%%/examples/config/csharpcomp.sh.in
-%%DOCSDIR%%/examples/config/csharpexec.m4
-%%DOCSDIR%%/examples/config/csharpexec.sh.in
-%%DOCSDIR%%/examples/config/gcj.m4
-%%DOCSDIR%%/examples/config/javacomp.m4
-%%DOCSDIR%%/examples/config/javacomp.sh.in
-%%DOCSDIR%%/examples/config/javaexec.m4
-%%DOCSDIR%%/examples/config/javaexec.sh.in
+%%DOCSDIR%%/examples/build-aux/csharpcomp.m4
+%%DOCSDIR%%/examples/build-aux/csharpcomp.sh.in
+%%DOCSDIR%%/examples/build-aux/csharpexec.m4
+%%DOCSDIR%%/examples/build-aux/csharpexec.sh.in
+%%DOCSDIR%%/examples/build-aux/gcj.m4
+%%DOCSDIR%%/examples/build-aux/javacomp.m4
+%%DOCSDIR%%/examples/build-aux/javacomp.sh.in
+%%DOCSDIR%%/examples/build-aux/javaexec.m4
+%%DOCSDIR%%/examples/build-aux/javaexec.sh.in
 %%DOCSDIR%%/javadoc1/AllNames.html
 %%DOCSDIR%%/javadoc1/gnu.gettext.GettextResource.html
 %%DOCSDIR%%/javadoc1/images/blue-ball-small.gif
@@ -126,6 +128,7 @@ share/aclocal/xsize.m4
 %%DOCSDIR%%/javadoc2/packages.html
 %%DOCSDIR%%/javadoc2/serialized-form.html
 %%DOCSDIR%%/javadoc2/stylesheet.css
+%%DOCSDIR%%/tutorial.html
 share/doc/libasprintf/autosprintf.html
 share/emacs/site-lisp/po-compat.el
 share/emacs/site-lisp/po-mode.el
@@ -154,6 +157,7 @@ share/gettext/intl/gmo.h
 share/gettext/intl/hash-string.h
 share/gettext/intl/intl-compat.c
 share/gettext/intl/l10nflist.c
+share/gettext/intl/langprefs.c
 share/gettext/intl/libgnuintl.h.in
 share/gettext/intl/loadinfo.h
 share/gettext/intl/loadmsgcat.c
@@ -235,6 +239,7 @@ 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/id/LC_MESSAGES/gettext-runtime.mo
@@ -273,6 +278,8 @@ 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/zh_CN/LC_MESSAGES/gettext-runtime.mo
 share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
 share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
@@ -290,6 +297,7 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
 @dirrm %%DOCSDIR%%/javadoc2
 @dirrm %%DOCSDIR%%/javadoc1/images
 @dirrm %%DOCSDIR%%/javadoc1
+@dirrm %%DOCSDIR%%/examples/build-aux
 @dirrm %%DOCSDIR%%/examples/config
 @dirrm %%DOCSDIR%%/examples
 @dirrm %%DOCSDIR%%/csharpdoc