Add gettext, and update to 0.14.1 (needed for C# translation support).

This update does *not* bump the shared library version, so a complete
rebuild of ports is not required.  Please test thoroughly.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3247 df743ca5-7f9a-e211-a948-0013205c9059

11 files changed, 319 insertions, 0 deletions

diff --git a/devel/gettext/files/patch-ad b/devel/gettext/files/patch-ad
new file mode 100644
index 000000000..a5e2a7e10
--- /dev/null
+++ b/devel/gettext/files/patch-ad
@@ -0,0 +1,15 @@
+$FreeBSD: ports/devel/gettext/files/patch-ad,v 1.6 2004/01/23 18:12:16 trevor Exp $
+
+--- 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 @@
+ 	    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; \
+ 	    if test -f $${p}c; then \
+ 	      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-ak b/devel/gettext/files/patch-ak
new file mode 100644
index 000000000..e6d0da74f
--- /dev/null
+++ b/devel/gettext/files/patch-ak
@@ -0,0 +1,13 @@
+$FreeBSD: ports/devel/gettext/files/patch-ak,v 1.3 2004/01/23 18:12:16 trevor Exp $
+
+--- gettext-tools/misc/po-mode.el.orig	Sun Jan 23 22:35:10 2000
++++ gettext-tools/misc/po-mode.el	Sun Jan 23 22:35:39 2000
+@@ -330,7 +330,7 @@
+   :type 'face
+   :group 'po)
+ 
+-(defcustom po-gzip-uuencode-command "gzip -9 | uuencode -m"
++(defcustom po-gzip-uuencode-command "gzip -9 | uuencode"
+   "*The filter to use for preparing a mail invoice of the PO file.
+ Normally \"gzip -9 | uuencode -m\", remove the -9 for lesser compression,
+ or remove the -m if you are not using the GNU version of `uuencode'."
diff --git a/devel/gettext/files/patch-config_ltmain.sh b/devel/gettext/files/patch-config_ltmain.sh
new file mode 100644
index 000000000..c3dcb4723
--- /dev/null
+++ b/devel/gettext/files/patch-config_ltmain.sh
@@ -0,0 +1,53 @@
+$FreeBSD: ports/devel/gettext/files/patch-config_ltmain.sh,v 1.2 2004/01/23 18:12:16 trevor Exp $
+
+--- config/ltmain.sh.orig	Tue Apr 15 19:22:56 2003
++++ config/ltmain.sh	Wed Jun 11 14:15:07 2003
+@@ -1279,7 +1279,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1289,8 +1289,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -3001,6 +3009,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5429,10 +5440,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/gettext/files/patch-gettext-runtime_configure b/devel/gettext/files/patch-gettext-runtime_configure
new file mode 100644
index 000000000..bf307ffa9
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-runtime_configure
@@ -0,0 +1,20 @@
+--- 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 @@
+ 
+ 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
+-  BUILDJAVA=yes
++  BUILDJAVA=no
+ else
+   BUILDJAVA=no
+ fi
diff --git a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
new file mode 100644
index 000000000..05be764cc
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
@@ -0,0 +1,65 @@
+--- 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
+@@ -52,7 +52,7 @@
+ YFLAGS = --name-prefix=__gettext
+ 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
++-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL \
+ -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+ -Dset_relocation_prefix=libintl_set_relocation_prefix \
+ -Drelocate=libintl_relocate \
+@@ -152,7 +152,7 @@
+ libintl.la libgnuintl.la: $(OBJECTS)
+ 	$(LIBTOOL) --mode=link \
+ 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
+-	  $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
++	  $(OBJECTS) @LTLIBICONV@ $(LIBS) \
+ 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
+ 	  -rpath $(libdir) \
+ 	  -no-undefined
+@@ -162,7 +162,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_AGE=4
+ 
+@@ -283,22 +283,6 @@
+ 	  : ; \
+ 	fi
+ 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+-	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
+-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+-	    orig=$(DESTDIR)$(libdir)/charset.alias; \
+-	    sed -f ref-add.sed $$orig > $$temp; \
+-	    $(INSTALL_DATA) $$temp $$dest; \
+-	    rm -f $$temp; \
+-	  else \
+-	    if test @GLIBC21@ = no; then \
+-	      orig=charset.alias; \
+-	      sed -f ref-add.sed $$orig > $$temp; \
+-	      $(INSTALL_DATA) $$temp $$dest; \
+-	      rm -f $$temp; \
+-	    fi; \
+-	  fi; \
+ 	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+ 	  test -f $(DESTDIR)$(localedir)/locale.alias \
+ 	    && orig=$(DESTDIR)$(localedir)/locale.alias \
+@@ -382,9 +366,9 @@
+ 	  : ; \
+ 	fi
+ 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+-	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+-	    dest=$(DESTDIR)$(libdir)/charset.alias; \
++	  if test -f $(DESTDIR)$(prefix)/libdata/charset.alias; then \
++	    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-tools_Makefile.in b/devel/gettext/files/patch-gettext-tools_Makefile.in
new file mode 100644
index 000000000..a619db7d2
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-tools_Makefile.in
@@ -0,0 +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 @@
+ 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
+ # 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
diff --git a/devel/gettext/files/patch-gettext-tools_config.h.in b/devel/gettext/files/patch-gettext-tools_config.h.in
new file mode 100644
index 000000000..cab5933fd
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-tools_config.h.in
@@ -0,0 +1,12 @@
+--- gettext-tools/config.h.in.orig	Sat Aug 28 11:50:21 2004
++++ gettext-tools/config.h.in	Sat Aug 28 11:51:26 2004
+@@ -45,6 +45,9 @@
+ /* Define to 1 if you have the `atexit' function. */
+ #undef HAVE_ATEXIT
+ 
++/* Define if the expat library is bsdxml. */
++#undef HAVE_BSDXML
++
+ /* Define to 1 if you have the `btowc' function. */
+ #undef HAVE_BTOWC
+ 
diff --git a/devel/gettext/files/patch-gettext-tools_configure b/devel/gettext/files/patch-gettext-tools_configure
new file mode 100644
index 000000000..971342a41
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-tools_configure
@@ -0,0 +1,47 @@
+--- gettext-tools/configure.orig	Thu Jan 29 12:13:22 2004
++++ gettext-tools/configure	Mon Dec 13 02:56:59 2004
+@@ -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 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 @@
+ 
+ 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'
+@@ -3764,7 +3764,7 @@
+ fi
+ 
+ if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+-  BUILDJAVA=yes
++  BUILDJAVA=no
+ else
+   BUILDJAVA=no
+ fi
+@@ -36704,6 +36704,17 @@
+ 
+ 
+ case "$host_os" in
++  freebsd[5-9]*)
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_BSDXML 1
++#define HAVE_LIBEXPAT 1
++_ACEOF
++
++    LIBEXPAT="-lbsdxml"
++    LTLIBEXPAT="-lbsdxml"
++
++    ;;
+   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
new file mode 100644
index 000000000..4644ecaa6
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-tools_lib_Makefile.in
@@ -0,0 +1,29 @@
+--- 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@
+ 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\"
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ DVIPS = @DVIPS@
+@@ -451,7 +451,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.
+@@ -725,7 +725,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_src_Makefile.in b/devel/gettext/files/patch-gettext-tools_src_Makefile.in
new file mode 100644
index 000000000..b3fab3024
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-tools_src_Makefile.in
@@ -0,0 +1,39 @@
+$FreeBSD: ports/devel/gettext/files/patch-gettext-tools_src_Makefile.in,v 1.2 2004/01/23 18:12:16 trevor Exp $
+
+--- 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)\" \
+   -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.
+ 
+ install-exec-local:
+-	$(mkinstalldirs) $(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)
++	$(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_x-glade.c b/devel/gettext/files/patch-gettext-tools_src_x-glade.c
new file mode 100644
index 000000000..a482cd98d
--- /dev/null
+++ b/devel/gettext/files/patch-gettext-tools_src_x-glade.c
@@ -0,0 +1,15 @@
+--- gettext-tools/src/x-glade.c.orig	Sat Aug 28 11:53:08 2004
++++ gettext-tools/src/x-glade.c	Sat Aug 28 11:53:48 2004
+@@ -30,7 +30,11 @@
+ # include <dlfcn.h>
+ #else
+ # if HAVE_LIBEXPAT
+-#  include <expat.h>
++#  if HAVE_BSDXML
++#   include <bsdxml.h>
++#  else
++#   include <expat.h>
++#  endif
+ # endif
+ #endif
+