14 files changed, 380 insertions, 399 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 2cb5501df5e4..3941089ff7b1 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gettext
-PORTVERSION=	0.14.5
-PORTREVISION=	2
+PORTVERSION=	0.16.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gettext
@@ -28,18 +27,11 @@ CONFIGURE_ENV=	ACLOCAL="${TRUE}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		EMACS="no"
-CONFIGURE_ARGS=	--disable-csharp \
-		--mandir=${PREFIX}/man
-INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--disable-csharp --mandir=${PREFIX}/man \
+		--infodir=${PREFIX}/info
+USE_LDCONFIG=	yes
 
-.if !defined(WITHOUT_GETTEXT_OPTIONS)
-OPTIONS=	EXAMPLES "install example files" off \
-		HTMLMAN "install man pages in HTML format" off
-.endif
-PLIST=		${WRKDIR}/plist
-PLISTU=		${WRKDIR}/plist-unsorted
-PLIST_SUB=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
-		VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 MAN1=		autopoint.1 gettext.1 gettextize.1 msgattrib.1 msgcat.1 \
 		msgcmp.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 \
@@ -48,9 +40,6 @@ MAN1=		autopoint.1 gettext.1 gettextize.1 msgattrib.1 msgcat.1 \
 MAN3=		bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \
 		dcngettext.3 dgettext.3 dngettext.3 gettext.3 ngettext.3 \
 		textdomain.3
-HTML=		gettext.3 ngettext.3 textdomain.3 \
-		bindtextdomain.3 bind_textdomain_codeset.3
-
 INFO=		autosprintf gettext
 
 .ifdef USE_GETTEXT
@@ -58,11 +47,8 @@ INFO=		autosprintf gettext
 	to "make".  Please unset it and restart the build.
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-CONFIGURE_ARGS+=	--with-libexpat-prefix=${LOCALBASE}/lib
-LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
+.if defined (NOPORTDOCS)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nodocs
 .endif
 
 pre-extract:
@@ -74,6 +60,16 @@ pre-extract:
 	@sleep 5
 .endif
 
+post-patch:
+	@${FIND} ${WRKSRC} -name configure -print | ${XARGS} \
+	    ${REINPLACE_CMD} -e 's|mkdir gmkdir|mkdir|'
+.if defined (NOPORTDOCS)
+.for dir in runtime tools
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = doc|SUBDIRS =|' \
+		${WRKSRC}/gettext-${dir}/Makefile.in
+.endfor
+.endif
+
 post-build:
 .if exists(${PREFIX}/bin/kaffe)
 	-${MV} ${PREFIX}/bin/jar.backup ${PREFIX}/bin/jar
@@ -82,49 +78,12 @@ post-build:
 	@sleep 5
 .endif
 
-pre-install:
-	@${RM} -f ${PLISTU}
-	@${TOUCH} ${PLISTU}
-.if !defined (NOPORTDOCS)
-.for ii in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 foot toc
-	${ECHO_CMD} %%DOCSDIR%%/gettext_${ii}.html >> ${PLISTU}
-.endfor
-.endif
-.if defined (WITH_HTMLMAN)
-.for ii in ${MAN1} ${HTML}
-	${ECHO_CMD} %%DOCSDIR%%/${ii}.html >> ${PLISTU}
-.endfor
-.endif
-.if defined (WITH_EXAMPLES)
-	cd ${WRKSRC}/gettext-tools && \
-		${FIND} -s examples -type f | ${GREP} -vw examples/po | \
-		${GREP} -v ChangeLog | ${GREP} -v examples/Makefile | \
-		${GREP} -v examples/installpaths.in | \
-		${SED} 's:^:share/doc/gettext/:' >> ${PLISTU} && \
-		${FIND} -d examples -type d | ${GREP} -v examples/po | \
-		${GREP} / | ${SED} -e 's:^:@dirrm share/doc/gettext/:' \
-		>> ${PLISTU}
-.endif
-	@${CAT} ${.CURDIR}/pkg-plist ${PLISTU} | ${GREP} -v ^@ > ${PLIST}
-	@${SORT} -r ${.CURDIR}/pkg-plist ${PLISTU} | ${GREP} ^@dirrm >> ${PLIST}
-	@${GREP} -h ^@ ${.CURDIR}/pkg-plist ${PLISTU} | ${GREP} exec >> ${PLIST}
-
 post-install:
 .for f in po-compat.el po-mode.el
-	${INSTALL_DATA} ${WRKSRC}/gettext-tools/misc/${f} ${PREFIX}/share/emacs/site-lisp
+	@${INSTALL_DATA} ${WRKSRC}/gettext-tools/misc/${f} \
+			 ${PREFIX}/share/emacs/site-lisp
 .endfor
-	${MKDIR} ${X11BASE}/share/locale
-	cd ${WRKSRC}/gettext-tools/doc && make install-info-am
-.if !defined (NOPORTDOCS)
-	cd ${WRKSRC}/gettext-runtime/doc && make install-data
-	cd ${WRKSRC}/gettext-tools/doc && make install-data-local
-.endif
-.if defined (WITH_EXAMPLES)
-	cd ${WRKSRC}/gettext-tools/examples && make install
-.endif
-.if !defined (WITH_HTMLMAN)
-	cd ${WRKSRC}/gettext-runtime/man && make uninstall-html
-	cd ${WRKSRC}/gettext-tools/man && make uninstall-html
-.endif
+	@${MKDIR} ${X11BASE}/share/locale
+	@cd ${WRKSRC}/gettext-tools/doc && make install-info-am
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 50b2928e2c5e..e24a57ca77c1 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,3 +1,3 @@
-MD5 (gettext-0.14.5.tar.gz) = e2f6581626a22a0de66dce1d81d00de3
-SHA256 (gettext-0.14.5.tar.gz) = a8aea89f4c187f5ba57d39e68f47a4c7f4752bdd0642fe89e3e941d6378907ab
-SIZE (gettext-0.14.5.tar.gz) = 7105715
+MD5 (gettext-0.16.1.tar.gz) = 3d9ad24301c6d6b17ec30704a13fe127
+SHA256 (gettext-0.16.1.tar.gz) = 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d
+SIZE (gettext-0.16.1.tar.gz) = 8539634
diff --git a/devel/gettext/files/extra-patch-nodocs b/devel/gettext/files/extra-patch-nodocs
new file mode 100644
index 000000000000..81cf6e2a0c2a
--- /dev/null
+++ b/devel/gettext/files/extra-patch-nodocs
@@ -0,0 +1,55 @@
+--- 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-javadoc1 all-javadoc2
+-install-data-local: install-classes install-javadoc1 install-javadoc2
+-installdirs-local: installdirs-classes installdirs-javadoc1 installdirs-javadoc2
++all-local: all-classes
++install-data-local: install-classes
++installdirs-local: installdirs-classes
+ uninstall-local: uninstall-classes uninstall-javadoc1 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_configure b/devel/gettext/files/patch-gettext-runtime_configure
index bf307ffa93cf..f0c314c4075e 100644
--- a/devel/gettext/files/patch-gettext-runtime_configure
+++ b/devel/gettext/files/patch-gettext-runtime_configure
@@ -1,20 +1,10 @@
---- gettext-runtime/configure.orig	Thu Jan 29 12:12:42 2004
-+++ gettext-runtime/configure	Mon Dec 13 02:57:36 2004
-@@ -1938,7 +1938,7 @@
+--- gettext-runtime/configure.orig	Mon Nov 27 09:34:04 2006
++++ gettext-runtime/configure	Sun Dec  3 17:44:05 2006
+@@ -4663,7 +4663,3 @@
  
- docdir='${datadir}/doc/gettext'
- 
--test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
-+test "$mandir" != '${prefix}/man' || mandir='${prefix}/man'
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -3635,7 +3635,7 @@
- fi
- 
- if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+-if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
 -  BUILDJAVA=yes
-+  BUILDJAVA=no
- else
+-else
    BUILDJAVA=no
- fi
+-fi
+ 
diff --git a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
index 645d37312768..48a26872a4ad 100644
--- a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
+++ b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
@@ -1,37 +1,18 @@
---- 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
- 
+--- gettext-runtime/intl/Makefile.in.orig	Mon Nov 27 09:02:00 2006
++++ gettext-runtime/intl/Makefile.in	Sun Dec  3 17:48:38 2006
+@@ -78,3 +78,3 @@
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
---DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
-+-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL \
+--DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
++-DLIBDIR=\"$(prefix)/libdata\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
  -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
- -Dset_relocation_prefix=libintl_set_relocation_prefix \
- -Drelocate=libintl_relocate \
-@@ -154,7 +154,7 @@
- libintl.la libgnuintl.la: $(OBJECTS)
- 	$(LIBTOOL) --mode=link \
+@@ -191,3 +191,3 @@
  	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
--	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \
-+	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) \
+-	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ -lc \
++	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ \
  	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
- 	  -rpath $(libdir) \
- 	  -no-undefined
-@@ -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=3
- LTV_AGE=4
- 
-@@ -288,22 +288,6 @@
- 	  : ; \
- 	fi
+@@ -346,18 +346,2 @@
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
--	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+-	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
 -	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
 -	  dest=$(DESTDIR)$(libdir)/charset.alias; \
 -	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
@@ -47,12 +28,8 @@
 -	      rm -f $$temp; \
 -	    fi; \
 -	  fi; \
- 	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
- 	  test -f $(DESTDIR)$(localedir)/locale.alias \
- 	    && orig=$(DESTDIR)$(localedir)/locale.alias \
-@@ -389,9 +373,9 @@
- 	  : ; \
- 	fi
+ 	  $(mkdir_p) $(DESTDIR)$(localedir); \
+@@ -447,5 +431,5 @@
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 -	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 -	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
@@ -61,5 +38,3 @@
 +	    temp=$(DESTDIR)$(prefix)/libdata/t-charset.alias; \
 +	    dest=$(DESTDIR)$(prefix)/libdata/charset.alias; \
  	    sed -f ref-del.sed $$dest > $$temp; \
- 	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
- 	      rm -f $$dest; \
diff --git a/devel/gettext/files/patch-gettext-runtime_man_Makefile.in b/devel/gettext/files/patch-gettext-runtime_man_Makefile.in
new file mode 100644
index 000000000000..22be4429b9c8
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-runtime_man_Makefile.in
@@ -0,0 +1,11 @@
+--- 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
index c5cea5f0c75a..e96c41c38209 100644
--- a/devel/gettext/files/patch-gettext-tools_Makefile.in
+++ b/devel/gettext/files/patch-gettext-tools_Makefile.in
@@ -1,11 +1,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 ../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 \
+--- gettext-tools/Makefile.in.orig	Mon Nov 27 09:34:56 2006
++++ gettext-tools/Makefile.in	Sun Dec  3 17:50:43 2006
+@@ -486,3 +486,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 libuniname src libgettextpo po projects misc man m4 tests examples
++SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4
+ 
diff --git a/devel/gettext/files/patch-gettext-tools_configure b/devel/gettext/files/patch-gettext-tools_configure
index d4577a89f196..37cf35e4dc33 100644
--- a/devel/gettext/files/patch-gettext-tools_configure
+++ b/devel/gettext/files/patch-gettext-tools_configure
@@ -1,35 +1,28 @@
---- 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"
+--- gettext-tools/configure.orig	Mon Nov 27 09:34:40 2006
++++ gettext-tools/configure	Sun Dec  3 17:54:35 2006
+@@ -3962,7 +3962,3 @@
  
--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=''
+-if test -n "$HAVE_GCJ" && test "$JAVA_CHOICE" = yes; then
+-  BUILDJAVAEXE=yes
+-else
+   BUILDJAVAEXE=no
+-fi
  
- # Initialize some variables set by options.
-@@ -1977,7 +1977,7 @@
+@@ -5110,13 +5106,5 @@
  
- docdir='${datadir}/doc/gettext'
- 
--test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
-+test "$mandir" != '${prefix}/man' || mandir='${prefix}/man'
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -3786,7 +3786,7 @@
- fi
- 
- if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+-if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
 -  BUILDJAVA=yes
-+  BUILDJAVA=no
- else
+-else
    BUILDJAVA=no
- fi
-@@ -39202,6 +39202,17 @@
+-fi
  
+-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
+-  TESTJAVA=yes
+-else
+   TESTJAVA=no
+-fi
  
+@@ -50083,2 +50071,13 @@
  case "$host_os" in
 +  freebsd[5-9]*)
 +
@@ -43,5 +36,3 @@
 +
 +    ;;
    linux*)
- 
- cat >>confdefs.h <<\_ACEOF
diff --git a/devel/gettext/files/patch-gettext-tools_lib_Makefile.in b/devel/gettext/files/patch-gettext-tools_lib_Makefile.in
deleted file mode 100644
index 23ccb587b68a..000000000000
--- a/devel/gettext/files/patch-gettext-tools_lib_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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)\"
-+	-DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(prefix)/libdata\"
- DEPDIR = @DEPDIR@
- DLLTOOL = @DLLTOOL@
- DVIPS = @DVIPS@
-@@ -454,7 +454,7 @@
- # Need @LTLIBICONV@ because linebreak.c uses iconv().
- libgettextlib_la_LDFLAGS = \
-   -release @VERSION@ \
--  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
-+  @LTLIBINTL@ @LTLIBICONV@ -no-undefined
- 
- 
- # Extra files to be installed.
-@@ -736,7 +736,7 @@
- 
- install-data-am: install-examplesconfigDATA install-gettextsrcDATA
- 
--install-exec-am: install-exec-local install-libLTLIBRARIES
-+install-exec-am: install-libLTLIBRARIES
- 
- install-info: install-info-am
- 
diff --git a/devel/gettext/files/patch-gettext-tools_libgettextpo_Makefile.in b/devel/gettext/files/patch-gettext-tools_libgettextpo_Makefile.in
new file mode 100644
index 000000000000..5ec2810bf3b1
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-tools_libgettextpo_Makefile.in
@@ -0,0 +1,12 @@
+--- gettext-tools/libgettextpo/Makefile.in.orig	Mon Nov 27 09:48:21 2006
++++ gettext-tools/libgettextpo/Makefile.in	Sun Dec  3 17:58:44 2006
+@@ -601,3 +601,3 @@
+ 	$(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) -rpath $(libdir) \
+-	@LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@ $(am__append_2)
++	@LTLIBINTL@ @LTLIBICONV@ @LTNOUNDEF@ $(am__append_2)
+ libgnu_la_SOURCES = allocsa.h allocsa.c basename.h basename.c \
+@@ -989,3 +989,3 @@
+ 
+-install-exec-am: install-exec-local install-libLTLIBRARIES
++install-exec-am: install-libLTLIBRARIES
+ 
diff --git a/devel/gettext/files/patch-gettext-tools_man_Makefile.in b/devel/gettext/files/patch-gettext-tools_man_Makefile.in
new file mode 100644
index 000000000000..a9dfe1734871
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-tools_man_Makefile.in
@@ -0,0 +1,11 @@
+--- 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_Makefile.in b/devel/gettext/files/patch-gettext-tools_src_Makefile.in
index a2c0d9dc7707..5ed216ba64cf 100644
--- a/devel/gettext/files/patch-gettext-tools_src_Makefile.in
+++ b/devel/gettext/files/patch-gettext-tools_src_Makefile.in
@@ -1,39 +1,25 @@
-$FreeBSD$
-
---- gettext-tools/src/Makefile.in.orig	Thu May 22 09:41:24 2003
-+++ gettext-tools/src/Makefile.in	Wed Jun 11 14:10:48 2003
-@@ -72,7 +72,7 @@
-   -DUSEJEXE=$(USEJEXE) \
-   -DGETTEXTJEXEDIR=\"$(pkglibdir)\" \
+--- gettext-tools/src/Makefile.in.orig	Mon Nov 27 09:34:56 2006
++++ gettext-tools/src/Makefile.in	Sun Dec  3 18:02:09 2006
+@@ -489,3 +489,3 @@
    -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
 -  -DLIBDIR=\"$(libdir)\" \
 +  -DLIBDIR=\"$(prefix)/libdata\" \
    -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
-   -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
- 
-@@ -336,7 +336,7 @@
- # use iconv().
- libgettextsrc_la_LDFLAGS = \
-   -release @VERSION@ \
--  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
-+  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -no-undefined
- 
- 
- # How to build libgettextpo.la.
-@@ -1316,11 +1316,11 @@
- # Special rules for installation of auxiliary programs.
- 
+@@ -861,3 +861,3 @@
+ libgettextsrc_la_LDFLAGS = -release @VERSION@ \
+-	../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc \
++	../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ \
+ 	@LTNOUNDEF@ $(am__append_2)
+@@ -1872,7 +1872,7 @@
  install-exec-local:
--	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+-	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 -	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT)
 -	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(pkglibdir)/urlget$(EXEEXT)
 -	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(pkglibdir)/user-email
 -	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(pkglibdir)/project-id
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)
++	$(mkdir_p) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)
 +	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/hostname$(EXEEXT)
 +	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/urlget$(EXEEXT)
 +	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/user-email
 +	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/project-id
  
- installdirs-local:
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
diff --git a/devel/gettext/files/patch-gettext-tools_src_msginit.c b/devel/gettext/files/patch-gettext-tools_src_msginit.c
index 88b5db07efc1..e806cc853fd6 100644
--- a/devel/gettext/files/patch-gettext-tools_src_msginit.c
+++ b/devel/gettext/files/patch-gettext-tools_src_msginit.c
@@ -1,38 +1,22 @@
---- gettext-tools/src/msginit.c.orig	Fri May 20 00:14:54 2005
-+++ gettext-tools/src/msginit.c	Fri May 20 00:15:16 2005
-@@ -950,7 +950,7 @@
- 
-   gettextlibdir = getenv ("GETTEXTLIBDIR");
+--- gettext-tools/src/msginit.c.orig	Mon Nov 27 09:02:08 2006
++++ gettext-tools/src/msginit.c	Sun Dec  3 18:03:46 2006
+@@ -820,3 +820,3 @@
    if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
 -    gettextlibdir = relocate (LIBDIR "/gettext");
 +    gettextlibdir = relocate (LIBDIR "/gettext-tools");
  
-   prog = concatenated_pathname (gettextlibdir, "project-id", NULL);
- 
-@@ -1016,7 +1016,7 @@
- 
-   gettextlibdir = getenv ("GETTEXTLIBDIR");
+@@ -887,3 +887,3 @@
    if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
 -    gettextlibdir = relocate (LIBDIR "/gettext");
 +    gettextlibdir = relocate (LIBDIR "/gettext-tools");
  
-   prog = concatenated_pathname (gettextlibdir, "project-id", NULL);
- 
-@@ -1165,7 +1165,7 @@
- static const char *
- get_user_email ()
+@@ -1037,3 +1037,3 @@
  {
 -  const char *prog = relocate (LIBDIR "/gettext/user-email");
 +  const char *prog = relocate (LIBDIR "/gettext-tools/user-email");
    char *argv[4];
-   pid_t child;
-   int fd[1];
-@@ -1261,7 +1261,7 @@
-   argv[0] = "/bin/sh";
-   argv[1] = (char *) prog;
+@@ -1134,3 +1134,3 @@
    argv[2] = (char *) relocate (PROJECTSDIR);
 -  argv[3] = (char *) relocate (LIBDIR "/gettext");
 +  argv[3] = (char *) relocate (LIBDIR "/gettext-tools");
    argv[4] = (char *) catalogname;
-   argv[5] = (char *) language;
-   argv[6] = NULL;
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 61b6913f53e7..c29daec42327 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -19,30 +19,31 @@ bin/msgmerge
 bin/msgunfmt
 bin/msguniq
 bin/ngettext
+bin/recode-sr-latin
 bin/xgettext
 include/autosprintf.h
 include/gettext-po.h
 include/libintl.h
 @exec /bin/mkdir -p %D/lib/gettext
+lib/charset.alias
 lib/libasprintf.a
 lib/libasprintf.la
 lib/libasprintf.so
 lib/libasprintf.so.0
 lib/libgettextlib-%%VERSION%%.so
-lib/libgettextlib.a
 lib/libgettextlib.la
 lib/libgettextlib.so
 lib/libgettextpo.a
 lib/libgettextpo.la
 lib/libgettextpo.so
-lib/libgettextpo.so.1
+lib/libgettextpo.so.3
 lib/libgettextsrc.la
 lib/libgettextsrc-%%VERSION%%.so
 lib/libgettextsrc.so
 lib/libintl.a
 lib/libintl.la
 lib/libintl.so
-lib/libintl.so.6
+lib/libintl.so.8
 libdata/gettext-tools/hostname
 libdata/gettext-tools/project-id
 libdata/gettext-tools/urlget
@@ -53,173 +54,208 @@ share/aclocal/glibc2.m4
 share/aclocal/glibc21.m4
 share/aclocal/iconv.m4
 share/aclocal/intdiv0.m4
+share/aclocal/intl.m4
+share/aclocal/intldir.m4
 share/aclocal/intmax.m4
 share/aclocal/inttypes-pri.m4
-share/aclocal/inttypes.m4
 share/aclocal/inttypes_h.m4
-share/aclocal/isc-posix.m4
 share/aclocal/lcmessage.m4
 share/aclocal/lib-ld.m4
 share/aclocal/lib-link.m4
 share/aclocal/lib-prefix.m4
+share/aclocal/lock.m4
 share/aclocal/longdouble.m4
 share/aclocal/longlong.m4
 share/aclocal/nls.m4
 share/aclocal/po.m4
 share/aclocal/printf-posix.m4
 share/aclocal/progtest.m4
-share/aclocal/signed.m4
 share/aclocal/size_max.m4
 share/aclocal/stdint_h.m4
 share/aclocal/uintmax_t.m4
 share/aclocal/ulonglong.m4
+share/aclocal/visibility.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/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
-%%DOCSDIR%%/javadoc1/images/blue-ball.gif
-%%DOCSDIR%%/javadoc1/images/class-index.gif
-%%DOCSDIR%%/javadoc1/images/constructor-index.gif
-%%DOCSDIR%%/javadoc1/images/constructors.gif
-%%DOCSDIR%%/javadoc1/images/cyan-ball-small.gif
-%%DOCSDIR%%/javadoc1/images/cyan-ball.gif
-%%DOCSDIR%%/javadoc1/images/error-index.gif
-%%DOCSDIR%%/javadoc1/images/exception-index.gif
-%%DOCSDIR%%/javadoc1/images/green-ball-small.gif
-%%DOCSDIR%%/javadoc1/images/green-ball.gif
-%%DOCSDIR%%/javadoc1/images/interface-index.gif
-%%DOCSDIR%%/javadoc1/images/magenta-ball-small.gif
-%%DOCSDIR%%/javadoc1/images/magenta-ball.gif
-%%DOCSDIR%%/javadoc1/images/method-index.gif
-%%DOCSDIR%%/javadoc1/images/methods.gif
-%%DOCSDIR%%/javadoc1/images/package-index.gif
-%%DOCSDIR%%/javadoc1/images/red-ball-small.gif
-%%DOCSDIR%%/javadoc1/images/red-ball.gif
-%%DOCSDIR%%/javadoc1/images/variable-index.gif
-%%DOCSDIR%%/javadoc1/images/variables.gif
-%%DOCSDIR%%/javadoc1/images/yellow-ball-small.gif
-%%DOCSDIR%%/javadoc1/images/yellow-ball.gif
-%%DOCSDIR%%/javadoc1/packages.html
-%%DOCSDIR%%/javadoc1/tree.html
-%%DOCSDIR%%/javadoc2/allclasses-frame.html
-%%DOCSDIR%%/javadoc2/deprecated-list.html
-%%DOCSDIR%%/javadoc2/gnu/gettext/GettextResource.html
-%%DOCSDIR%%/javadoc2/gnu/gettext/package-frame.html
-%%DOCSDIR%%/javadoc2/gnu/gettext/package-summary.html
-%%DOCSDIR%%/javadoc2/gnu/gettext/package-tree.html
-%%DOCSDIR%%/javadoc2/help-doc.html
-%%DOCSDIR%%/javadoc2/index-all.html
-%%DOCSDIR%%/javadoc2/index.html
-%%DOCSDIR%%/javadoc2/overview-tree.html
-%%DOCSDIR%%/javadoc2/package-list
-%%DOCSDIR%%/javadoc2/packages.html
-%%DOCSDIR%%/javadoc2/serialized-form.html
-%%DOCSDIR%%/javadoc2/stylesheet.css
-%%DOCSDIR%%/tutorial.html
-share/doc/libasprintf/autosprintf.html
+%%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
+%%PORTDOCS%%%%DOCSDIR%%/gettext_4.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_5.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_6.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_7.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_8.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_9.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_10.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_11.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_12.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_13.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_14.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_15.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_16.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_17.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_18.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_19.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_20.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_21.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_22.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_23.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_24.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_25.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_foot.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/AllNames.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/gnu.gettext.GettextResource.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/blue-ball-small.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/blue-ball.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/class-index.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/constructor-index.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/constructors.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/cyan-ball-small.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/cyan-ball.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/error-index.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/exception-index.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/green-ball-small.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/green-ball.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/interface-index.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/magenta-ball-small.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/magenta-ball.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/method-index.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/methods.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/package-index.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/red-ball-small.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/red-ball.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/variable-index.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/variables.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/yellow-ball-small.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/images/yellow-ball.gif
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/packages.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc1/tree.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
 share/emacs/site-lisp/po-compat.el
 share/emacs/site-lisp/po-mode.el
-share/gettext/ABOUT-NLS
-share/gettext/archive.tar.gz
-share/gettext/config.rpath
-share/gettext/gettext.h
-share/gettext/intl/COPYING.LIB-2.0
-share/gettext/intl/COPYING.LIB-2.1
-share/gettext/intl/ChangeLog
-share/gettext/intl/Makefile.in
-share/gettext/intl/VERSION
-share/gettext/intl/bindtextdom.c
-share/gettext/intl/config.charset
-share/gettext/intl/dcgettext.c
-share/gettext/intl/dcigettext.c
-share/gettext/intl/dcngettext.c
-share/gettext/intl/dgettext.c
-share/gettext/intl/dngettext.c
-share/gettext/intl/eval-plural.h
-share/gettext/intl/explodename.c
-share/gettext/intl/finddomain.c
-share/gettext/intl/gettext.c
-share/gettext/intl/gettextP.h
-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
-share/gettext/intl/localcharset.c
-share/gettext/intl/localcharset.h
-share/gettext/intl/locale.alias
-share/gettext/intl/localealias.c
-share/gettext/intl/localename.c
-share/gettext/intl/log.c
-share/gettext/intl/ngettext.c
-share/gettext/intl/os2compat.c
-share/gettext/intl/os2compat.h
-share/gettext/intl/osdep.c
-share/gettext/intl/plural-exp.c
-share/gettext/intl/plural-exp.h
-share/gettext/intl/plural.c
-share/gettext/intl/plural.y
-share/gettext/intl/printf-args.c
-share/gettext/intl/printf-args.h
-share/gettext/intl/printf-parse.c
-share/gettext/intl/printf-parse.h
-share/gettext/intl/printf.c
-share/gettext/intl/ref-add.sin
-share/gettext/intl/ref-del.sin
-share/gettext/intl/relocatable.c
-share/gettext/intl/relocatable.h
-share/gettext/intl/textdomain.c
-share/gettext/intl/vasnprintf.c
-share/gettext/intl/vasnprintf.h
-share/gettext/intl/vasnwprintf.h
-share/gettext/intl/wprintf-parse.h
-share/gettext/intl/xsize.h
-share/gettext/mkinstalldirs
-share/gettext/msgunfmt.tcl
-share/gettext/po/Makefile.in.in
-share/gettext/po/Makevars.template
-share/gettext/po/Rules-quot
-share/gettext/po/boldquot.sed
-share/gettext/po/en@boldquot.header
-share/gettext/po/en@quot.header
-share/gettext/po/insert-header.sin
-share/gettext/po/quot.sed
-share/gettext/po/remove-potcdate.sin
-share/gettext/projects/GNOME/team-address
-share/gettext/projects/GNOME/teams.html
-share/gettext/projects/GNOME/teams.url
-share/gettext/projects/GNOME/trigger
-share/gettext/projects/KDE/team-address
-share/gettext/projects/KDE/teams.html
-share/gettext/projects/KDE/teams.url
-share/gettext/projects/KDE/trigger
-share/gettext/projects/TP/team-address
-share/gettext/projects/TP/teams.html
-share/gettext/projects/TP/teams.url
-share/gettext/projects/TP/trigger
-share/gettext/projects/index
-share/gettext/projects/team-address
+%%DATADIR%%/ABOUT-NLS
+%%DATADIR%%/archive.tar.gz
+%%DATADIR%%/config.rpath
+%%DATADIR%%/gettext.h
+%%DATADIR%%/intl/COPYING.LIB-2.0
+%%DATADIR%%/intl/COPYING.LIB-2.1
+%%DATADIR%%/intl/ChangeLog
+%%DATADIR%%/intl/Makefile.in
+%%DATADIR%%/intl/VERSION
+%%DATADIR%%/intl/bindtextdom.c
+%%DATADIR%%/intl/config.charset
+%%DATADIR%%/intl/dcgettext.c
+%%DATADIR%%/intl/dcigettext.c
+%%DATADIR%%/intl/dcngettext.c
+%%DATADIR%%/intl/dgettext.c
+%%DATADIR%%/intl/dngettext.c
+%%DATADIR%%/intl/eval-plural.h
+%%DATADIR%%/intl/explodename.c
+%%DATADIR%%/intl/export.h
+%%DATADIR%%/intl/finddomain.c
+%%DATADIR%%/intl/gettext.c
+%%DATADIR%%/intl/gettextP.h
+%%DATADIR%%/intl/gmo.h
+%%DATADIR%%/intl/hash-string.c
+%%DATADIR%%/intl/hash-string.h
+%%DATADIR%%/intl/intl-compat.c
+%%DATADIR%%/intl/intl-exports.c
+%%DATADIR%%/intl/l10nflist.c
+%%DATADIR%%/intl/langprefs.c
+%%DATADIR%%/intl/libgnuintl.h.in
+%%DATADIR%%/intl/loadinfo.h
+%%DATADIR%%/intl/loadmsgcat.c
+%%DATADIR%%/intl/localcharset.c
+%%DATADIR%%/intl/localcharset.h
+%%DATADIR%%/intl/locale.alias
+%%DATADIR%%/intl/localealias.c
+%%DATADIR%%/intl/localename.c
+%%DATADIR%%/intl/lock.c
+%%DATADIR%%/intl/lock.h
+%%DATADIR%%/intl/log.c
+%%DATADIR%%/intl/ngettext.c
+%%DATADIR%%/intl/os2compat.c
+%%DATADIR%%/intl/os2compat.h
+%%DATADIR%%/intl/osdep.c
+%%DATADIR%%/intl/plural-exp.c
+%%DATADIR%%/intl/plural-exp.h
+%%DATADIR%%/intl/plural.c
+%%DATADIR%%/intl/plural.y
+%%DATADIR%%/intl/printf-args.c
+%%DATADIR%%/intl/printf-args.h
+%%DATADIR%%/intl/printf-parse.c
+%%DATADIR%%/intl/printf-parse.h
+%%DATADIR%%/intl/printf.c
+%%DATADIR%%/intl/ref-add.sin
+%%DATADIR%%/intl/ref-del.sin
+%%DATADIR%%/intl/relocatable.c
+%%DATADIR%%/intl/relocatable.h
+%%DATADIR%%/intl/textdomain.c
+%%DATADIR%%/intl/vasnprintf.c
+%%DATADIR%%/intl/vasnprintf.h
+%%DATADIR%%/intl/vasnwprintf.h
+%%DATADIR%%/intl/version.c
+%%DATADIR%%/intl/wprintf-parse.h
+%%DATADIR%%/intl/xsize.h
+%%DATADIR%%/javaversion.class
+%%DATADIR%%/msgunfmt.tcl
+%%DATADIR%%/po/Makefile.in.in
+%%DATADIR%%/po/Makevars.template
+%%DATADIR%%/po/Rules-quot
+%%DATADIR%%/po/boldquot.sed
+%%DATADIR%%/po/en@boldquot.header
+%%DATADIR%%/po/en@quot.header
+%%DATADIR%%/po/insert-header.sin
+%%DATADIR%%/po/quot.sed
+%%DATADIR%%/po/remove-potcdate.sin
+%%DATADIR%%/projects/GNOME/team-address
+%%DATADIR%%/projects/GNOME/teams.html
+%%DATADIR%%/projects/GNOME/teams.url
+%%DATADIR%%/projects/GNOME/trigger
+%%DATADIR%%/projects/KDE/team-address
+%%DATADIR%%/projects/KDE/teams.html
+%%DATADIR%%/projects/KDE/teams.url
+%%DATADIR%%/projects/KDE/trigger
+%%DATADIR%%/projects/TP/team-address
+%%DATADIR%%/projects/TP/teams.html
+%%DATADIR%%/projects/TP/teams.url
+%%DATADIR%%/projects/TP/trigger
+%%DATADIR%%/projects/index
+%%DATADIR%%/projects/team-address
 share/locale/be/LC_MESSAGES/gettext-runtime.mo
 share/locale/be/LC_MESSAGES/gettext-tools.mo
 share/locale/ca/LC_MESSAGES/gettext-runtime.mo
@@ -236,6 +272,7 @@ 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
@@ -288,25 +325,26 @@ 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
-@dirrm share/gettext/projects/TP
-@dirrm share/gettext/projects/KDE
-@dirrm share/gettext/projects/GNOME
-@dirrm share/gettext/projects
-@dirrm share/gettext/po
-@dirrm share/gettext/intl
-@dirrm share/gettext
-@dirrm share/doc/libasprintf
-@dirrm %%DOCSDIR%%/javadoc2/gnu/gettext
-@dirrm %%DOCSDIR%%/javadoc2/gnu
-@dirrm %%DOCSDIR%%/javadoc2
-@dirrm %%DOCSDIR%%/javadoc1/images
-@dirrm %%DOCSDIR%%/javadoc1
-@dirrm %%DOCSDIR%%/examples/build-aux
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%/csharpdoc
-@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/projects/TP
+@dirrm %%DATADIR%%/projects/KDE
+@dirrm %%DATADIR%%/projects/GNOME
+@dirrm %%DATADIR%%/projects
+@dirrm %%DATADIR%%/po
+@dirrm %%DATADIR%%/intl
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm share/doc/libasprintf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc2/gnu/gettext
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc2/gnu
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc2
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc1/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc1
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/build-aux
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/csharpdoc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libdata/gettext-tools
 @dirrm lib/gettext
 @dirrmtry share/locale/be/LC_MESSAGES
@@ -328,6 +366,7 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
 @dirrmtry share/locale/sr/LC_MESSAGES
 @dirrmtry share/locale/uk/LC_MESSAGES
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/be
 @dirrmtry share/locale/ca
@@ -348,4 +387,5 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
 @dirrmtry share/locale/sr
 @dirrmtry share/locale/uk
 @dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/zh_TW