1 files changed, 176 insertions, 88 deletions

diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 36cac4a3689d..554390f9c73a 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -17,21 +17,26 @@ bin/msgunfmt
 bin/msguniq
 bin/ngettext
 bin/xgettext
+include/autosprintf.h
+include/gettext-po.h
 include/libintl.h
-@unexec install-info --delete %D/info/gettext.info %D/info/dir
-info/gettext.info
-@exec install-info %D/info/gettext.info %D/info/dir
+lib/libasprintf.a
+lib/libasprintf.so
+lib/libasprintf.so.0
 lib/libgettextlib-%%VERSION%%.so
 lib/libgettextlib.so
+lib/libgettextpo.a
+lib/libgettextpo.so
+lib/libgettextpo.so.0
 lib/libgettextsrc-%%VERSION%%.so
 lib/libgettextsrc.so
 lib/libintl.a
 lib/libintl.so
-lib/libintl.so.4
-libdata/gettext/hostname
-libdata/gettext/project-id
-libdata/gettext/urlget
-libdata/gettext/user-email
+lib/libintl.so.5
+libdata/gettext-tools/hostname
+libdata/gettext-tools/project-id
+libdata/gettext-tools/urlget
+libdata/gettext-tools/user-email
 share/aclocal/codeset.m4
 share/aclocal/gettext.m4
 share/aclocal/glibc21.m4
@@ -45,58 +50,102 @@ share/aclocal/lcmessage.m4
 share/aclocal/lib-ld.m4
 share/aclocal/lib-link.m4
 share/aclocal/lib-prefix.m4
+share/aclocal/nls.m4
+share/aclocal/po.m4
 share/aclocal/progtest.m4
 share/aclocal/stdint_h.m4
 share/aclocal/uintmax_t.m4
 share/aclocal/ulonglong.m4
-share/doc/gettext/autopoint.1.html
-share/doc/gettext/bind_textdomain_codeset.3.html
-share/doc/gettext/bindtextdomain.3.html
-share/doc/gettext/gettext.1.html
-share/doc/gettext/gettext.3.html
-share/doc/gettext/gettext_1.html
-share/doc/gettext/gettext_10.html
-share/doc/gettext/gettext_11.html
-share/doc/gettext/gettext_12.html
-share/doc/gettext/gettext_13.html
-share/doc/gettext/gettext_14.html
-share/doc/gettext/gettext_15.html
-share/doc/gettext/gettext_16.html
-share/doc/gettext/gettext_17.html
-share/doc/gettext/gettext_18.html
-share/doc/gettext/gettext_19.html
-share/doc/gettext/gettext_2.html
-share/doc/gettext/gettext_20.html
-share/doc/gettext/gettext_21.html
-share/doc/gettext/gettext_22.html
-share/doc/gettext/gettext_3.html
-share/doc/gettext/gettext_4.html
-share/doc/gettext/gettext_5.html
-share/doc/gettext/gettext_6.html
-share/doc/gettext/gettext_7.html
-share/doc/gettext/gettext_8.html
-share/doc/gettext/gettext_9.html
-share/doc/gettext/gettext_foot.html
-share/doc/gettext/gettext_toc.html
-share/doc/gettext/gettextize.1.html
-share/doc/gettext/msgattrib.1.html
-share/doc/gettext/msgcat.1.html
-share/doc/gettext/msgcmp.1.html
-share/doc/gettext/msgcomm.1.html
-share/doc/gettext/msgconv.1.html
-share/doc/gettext/msgen.1.html
-share/doc/gettext/msgexec.1.html
-share/doc/gettext/msgfilter.1.html
-share/doc/gettext/msgfmt.1.html
-share/doc/gettext/msggrep.1.html
-share/doc/gettext/msginit.1.html
-share/doc/gettext/msgmerge.1.html
-share/doc/gettext/msgunfmt.1.html
-share/doc/gettext/msguniq.1.html
-share/doc/gettext/ngettext.1.html
-share/doc/gettext/ngettext.3.html
-share/doc/gettext/textdomain.3.html
-share/doc/gettext/xgettext.1.html
+%%DOCSDIR%%/autopoint.1.html
+%%DOCSDIR%%/bind_textdomain_codeset.3.html
+%%DOCSDIR%%/bindtextdomain.3.html
+%%DOCSDIR%%/gettext.1.html
+%%DOCSDIR%%/gettext.3.html
+%%DOCSDIR%%/gettext_1.html
+%%DOCSDIR%%/gettext_10.html
+%%DOCSDIR%%/gettext_11.html
+%%DOCSDIR%%/gettext_12.html
+%%DOCSDIR%%/gettext_13.html
+%%DOCSDIR%%/gettext_14.html
+%%DOCSDIR%%/gettext_15.html
+%%DOCSDIR%%/gettext_16.html
+%%DOCSDIR%%/gettext_17.html
+%%DOCSDIR%%/gettext_18.html
+%%DOCSDIR%%/gettext_19.html
+%%DOCSDIR%%/gettext_2.html
+%%DOCSDIR%%/gettext_20.html
+%%DOCSDIR%%/gettext_21.html
+%%DOCSDIR%%/gettext_22.html
+%%DOCSDIR%%/gettext_3.html
+%%DOCSDIR%%/gettext_4.html
+%%DOCSDIR%%/gettext_5.html
+%%DOCSDIR%%/gettext_6.html
+%%DOCSDIR%%/gettext_7.html
+%%DOCSDIR%%/gettext_8.html
+%%DOCSDIR%%/gettext_9.html
+%%DOCSDIR%%/gettext_foot.html
+%%DOCSDIR%%/gettext_toc.html
+%%DOCSDIR%%/gettextize.1.html
+%%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%%/msgattrib.1.html
+%%DOCSDIR%%/msgcat.1.html
+%%DOCSDIR%%/msgcmp.1.html
+%%DOCSDIR%%/msgcomm.1.html
+%%DOCSDIR%%/msgconv.1.html
+%%DOCSDIR%%/msgen.1.html
+%%DOCSDIR%%/msgexec.1.html
+%%DOCSDIR%%/msgfilter.1.html
+%%DOCSDIR%%/msgfmt.1.html
+%%DOCSDIR%%/msggrep.1.html
+%%DOCSDIR%%/msginit.1.html
+%%DOCSDIR%%/msgmerge.1.html
+%%DOCSDIR%%/msgunfmt.1.html
+%%DOCSDIR%%/msguniq.1.html
+%%DOCSDIR%%/ngettext.1.html
+%%DOCSDIR%%/ngettext.3.html
+%%DOCSDIR%%/textdomain.3.html
+%%DOCSDIR%%/xgettext.1.html
+share/doc/libasprintf/autosprintf.html
 share/emacs/site-lisp/po-compat.el
 share/emacs/site-lisp/po-mode.el
 share/gettext/ABOUT-NLS
@@ -124,13 +173,15 @@ 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/libgnuintl.h
+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
@@ -141,11 +192,13 @@ share/gettext/intl/plural.c
 share/gettext/intl/plural.y
 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/mkinstalldirs
 share/gettext/msgunfmt.tcl
 share/gettext/po/Makefile.in.in
-share/gettext/po/Makevars
+share/gettext/po/Makevars.template
 share/gettext/po/Rules-quot
 share/gettext/po/boldquot.sed
 share/gettext/po/en@boldquot.header
@@ -167,36 +220,65 @@ share/gettext/projects/TP/teams.url
 share/gettext/projects/TP/trigger
 share/gettext/projects/index
 share/gettext/projects/team-address
-share/locale/be/LC_MESSAGES/gettext.mo
-share/locale/ca/LC_MESSAGES/gettext.mo
-share/locale/cs/LC_MESSAGES/gettext.mo
-share/locale/da/LC_MESSAGES/gettext.mo
-share/locale/de/LC_MESSAGES/gettext.mo
-share/locale/el/LC_MESSAGES/gettext.mo
-share/locale/en@boldquot/LC_MESSAGES/gettext.mo
-share/locale/en@quot/LC_MESSAGES/gettext.mo
-share/locale/es/LC_MESSAGES/gettext.mo
-share/locale/et/LC_MESSAGES/gettext.mo
-share/locale/fi/LC_MESSAGES/gettext.mo
-share/locale/fr/LC_MESSAGES/gettext.mo
-share/locale/gl/LC_MESSAGES/gettext.mo
-share/locale/id/LC_MESSAGES/gettext.mo
-share/locale/it/LC_MESSAGES/gettext.mo
-share/locale/ja/LC_MESSAGES/gettext.mo
-share/locale/ko/LC_MESSAGES/gettext.mo
+share/locale/be/LC_MESSAGES/gettext-runtime.mo
+share/locale/be/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/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/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/gl/LC_MESSAGES/gettext-runtime.mo
+share/locale/gl/LC_MESSAGES/gettext-tools.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/nl/LC_MESSAGES/gettext.mo
-share/locale/nn/LC_MESSAGES/gettext.mo
-share/locale/no/LC_MESSAGES/gettext.mo
-share/locale/pl/LC_MESSAGES/gettext.mo
-share/locale/pt/LC_MESSAGES/gettext.mo
-share/locale/pt_BR/LC_MESSAGES/gettext.mo
-share/locale/ru/LC_MESSAGES/gettext.mo
-share/locale/sk/LC_MESSAGES/gettext.mo
-share/locale/sl/LC_MESSAGES/gettext.mo
-share/locale/sv/LC_MESSAGES/gettext.mo
-share/locale/tr/LC_MESSAGES/gettext.mo
-share/locale/zh_TW/LC_MESSAGES/gettext.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/no/LC_MESSAGES/gettext-runtime.mo
+share/locale/no/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/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/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/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
@@ -204,8 +286,14 @@ share/locale/zh_TW/LC_MESSAGES/gettext.mo
 @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 share/doc/gettext
-@dirrm libdata/gettext
+@dirrm libdata/gettext-tools
 @unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/* 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true