Update gettext-old to 0.12.1, re-add and reconnect to build.

9 files changed, 248 insertions, 0 deletions

diff --git a/devel/gettext-old/files/patch-config_ltmain.sh b/devel/gettext-old/files/patch-config_ltmain.sh
new file mode 100644
index 000000000000..fade35fc2d52
--- /dev/null
+++ b/devel/gettext-old/files/patch-config_ltmain.sh
@@ -0,0 +1,53 @@
+$FreeBSD$
+
+--- 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-old/files/patch-gettext-runtime_configure b/devel/gettext-old/files/patch-gettext-runtime_configure
new file mode 100644
index 000000000000..2318d6c70086
--- /dev/null
+++ b/devel/gettext-old/files/patch-gettext-runtime_configure
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- gettext-runtime/configure.orig	Wed Jun 11 17:21:41 2003
++++ gettext-runtime/configure	Wed Jun 11 17:21:56 2003
+@@ -1875,7 +1875,7 @@
+           ac_config_headers="$ac_config_headers config.h"
+ 
+ 
+-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
++test "$mandir" != '${prefix}/man' || mandir='${prefix}/man'
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
diff --git a/devel/gettext-old/files/patch-gettext-runtime_intl_Makefile.in b/devel/gettext-old/files/patch-gettext-runtime_intl_Makefile.in
new file mode 100644
index 000000000000..17e36a8e30ec
--- /dev/null
+++ b/devel/gettext-old/files/patch-gettext-runtime_intl_Makefile.in
@@ -0,0 +1,58 @@
+$FreeBSD$
+
+--- gettext-runtime/intl/Makefile.in.orig	Wed May 21 06:55:18 2003
++++ gettext-runtime/intl/Makefile.in	Wed Jun 11 14:28:58 2003
+@@ -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 \
+@@ -145,7 +145,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
+@@ -270,22 +270,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 \
+@@ -369,9 +353,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-old/files/patch-gettext-tools_Makefile.in b/devel/gettext-old/files/patch-gettext-tools_Makefile.in
new file mode 100644
index 000000000000..ccb82ccabc8c
--- /dev/null
+++ b/devel/gettext-old/files/patch-gettext-tools_Makefile.in
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- gettext-tools/Makefile.in.orig	Wed Jun 11 13:55:17 2003
++++ gettext-tools/Makefile.in	Wed Jun 11 13:55:27 2003
+@@ -207,7 +207,7 @@
+ 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
++SUBDIRS = doc 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.
diff --git a/devel/gettext-old/files/patch-gettext-tools_configure b/devel/gettext-old/files/patch-gettext-tools_configure
new file mode 100644
index 000000000000..cc9de9caff58
--- /dev/null
+++ b/devel/gettext-old/files/patch-gettext-tools_configure
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- gettext-tools/configure.orig	Wed Jun 11 17:11:46 2003
++++ gettext-tools/configure	Wed Jun 11 17:12:02 2003
+@@ -1887,7 +1887,7 @@
+           ac_config_headers="$ac_config_headers config.h"
+ 
+ 
+-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
++test "$mandir" != '${prefix}/man' || mandir='${prefix}/man'
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
diff --git a/devel/gettext-old/files/patch-gettext-tools_lib_Makefile.in b/devel/gettext-old/files/patch-gettext-tools_lib_Makefile.in
new file mode 100644
index 000000000000..b617875d7d7e
--- /dev/null
+++ b/devel/gettext-old/files/patch-gettext-tools_lib_Makefile.in
@@ -0,0 +1,31 @@
+$FreeBSD$
+
+--- gettext-tools/lib/Makefile.in.orig	Thu May 22 09:41:20 2003
++++ gettext-tools/lib/Makefile.in	Wed Jun 11 14:05:44 2003
+@@ -67,7 +67,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\"
+ DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ DVIPS = @DVIPS@
+@@ -317,7 +317,7 @@
+ # Need @LTLIBICONV@ because linebreak.c uses iconv().
+ libgettextlib_la_LDFLAGS = \
+   -release @VERSION@ \
+-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
++  @LTLIBINTL@ @LTLIBICONV@ -no-undefined
+ 
+ 
+ 
+@@ -599,7 +599,7 @@
+ 
+ install-data-am: 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-old/files/patch-gettext-tools_misc_Makefile.in b/devel/gettext-old/files/patch-gettext-tools_misc_Makefile.in
new file mode 100644
index 000000000000..819178bc503a
--- /dev/null
+++ b/devel/gettext-old/files/patch-gettext-tools_misc_Makefile.in
@@ -0,0 +1,15 @@
+$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 @@
+ 	    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-old/files/patch-gettext-tools_misc_po-mode.el b/devel/gettext-old/files/patch-gettext-tools_misc_po-mode.el
new file mode 100644
index 000000000000..bcd527f88f69
--- /dev/null
+++ b/devel/gettext-old/files/patch-gettext-tools_misc_po-mode.el
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- 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-old/files/patch-gettext-tools_src_Makefile.in b/devel/gettext-old/files/patch-gettext-tools_src_Makefile.in
new file mode 100644
index 000000000000..a2c0d9dc7707
--- /dev/null
+++ b/devel/gettext-old/files/patch-gettext-tools_src_Makefile.in
@@ -0,0 +1,39 @@
+$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)\" \
+   -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)