--- a/components/gettext/Makefile Fri Feb 27 14:35:08 2015 -0800
+++ b/components/gettext/Makefile Fri Feb 27 13:00:59 2015 -0800
@@ -53,9 +53,8 @@
# Fixes coredump in gnulib-test/test-localename test
CONFIGURE_OPTIONS += ac_cv_func_newlocale=no
-# Everything is under /usr/bin and /usr/lib so set bindir and libdir correctly.
+# Commands go under /usr/bin so set bindir correctly.
CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
-CONFIGURE_LIBDIR.64 = $(CONFIGURE_PREFIX)/lib
# Tests should run in a clean environment
COMPONENT_TEST_ENV = -i
@@ -84,6 +83,9 @@
REQUIRED_PACKAGES += developer/vala
REQUIRED_PACKAGES += library/expat
REQUIRED_PACKAGES += library/icu
+REQUIRED_PACKAGES += library/libcroco
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/ncurses
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += source/locale/localedef
REQUIRED_PACKAGES += system/library
--- a/components/gettext/gettext.p5m Fri Feb 27 14:35:08 2015 -0800
+++ b/components/gettext/gettext.p5m Fri Feb 27 13:00:59 2015 -0800
@@ -68,10 +68,10 @@
file usr/share/man/man1/gettext.1 path=usr/gnu/share/man/man1/gettext.1
file usr/share/man/man1/msgfmt.1 path=usr/gnu/share/man/man1/msgfmt.1
file usr/share/man/man1/xgettext.1 path=usr/gnu/share/man/man1/xgettext.1
-file path=usr/lib/gettext/hostname mode=0555
-file path=usr/lib/gettext/project-id mode=0555
-file path=usr/lib/gettext/urlget mode=0555
-file path=usr/lib/gettext/user-email mode=0555
+file path=usr/lib/$(MACH64)/gettext/hostname mode=0555
+file path=usr/lib/$(MACH64)/gettext/project-id mode=0555
+file path=usr/lib/$(MACH64)/gettext/urlget mode=0555
+file path=usr/lib/$(MACH64)/gettext/user-email mode=0555
# not needed for runtime, used in the development of gettext tools
#file path=usr/lib/gettextpo.a
file path=usr/share/aclocal/codeset.m4
--- a/components/gettext/test/results-64.master Fri Feb 27 14:35:08 2015 -0800
+++ b/components/gettext/test/results-64.master Fri Feb 27 13:00:59 2015 -0800
@@ -412,13 +412,13 @@
PASS: xgettext-csharp-7
PASS: xgettext-elisp-1
PASS: xgettext-elisp-2
-SKIP: xgettext-glade-1
-SKIP: xgettext-glade-2
-SKIP: xgettext-glade-3
-SKIP: xgettext-glade-4
-SKIP: xgettext-glade-5
-SKIP: xgettext-glade-6
-SKIP: xgettext-glade-7
+PASS: xgettext-glade-1
+PASS: xgettext-glade-2
+PASS: xgettext-glade-3
+PASS: xgettext-glade-4
+PASS: xgettext-glade-5
+PASS: xgettext-glade-6
+PASS: xgettext-glade-7
PASS: xgettext-java-1
PASS: xgettext-java-2
PASS: xgettext-java-3
@@ -480,7 +480,7 @@
PASS: xgettext-javascript-5
PASS: xgettext-javascript-6
PASS: xgettext-vala-1
-SKIP: xgettext-gsettings-1
+PASS: xgettext-gsettings-1
PASS: xgettext-desktop-1
PASS: format-awk-1
PASS: format-awk-2
@@ -576,8 +576,8 @@
Testsuite summary for gettext-tools 0.19.3
============================================================================
# TOTAL: 391
-# PASS: 363
-# SKIP: 28
+# PASS: 371
+# SKIP: 20
# XFAIL: 0
# FAIL: 0
# XPASS: 0