Stage 1 of gettext update.

Move gettext (0.10.35) with gettext-old
Update gettext from gettext-devel (0.10.40)
Remove gettext-devel
Fix dependencies

Stage 2 will involve upgraded gettext to 0.11 and fixing issues
Stage 3 involves a de-orbit burn sequence for gettext-old

Reviewed by:	portmgr

9 files changed, 0 insertions, 255 deletions

diff --git a/devel/gettext-devel/files/patch-Makefile.in b/devel/gettext-devel/files/patch-Makefile.in
deleted file mode 100644
index 3c1a3ac9bb7c..000000000000
--- a/devel/gettext-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2001/05/29 09:22:43	1.1
-+++ Makefile.in	2001/05/29 09:23:01
-@@ -101,7 +101,7 @@
- 
- AUTOMAKE_OPTIONS = 1.3 gnits
- MAINT_CHARSET = latin1
--ACLOCAL = ./aclocal.sh @ACLOCAL@
-+ACLOCAL = /usr/bin/true
- ACLOCAL_AMFLAGS = -I m4
- 
- gettextsrcdir = $(datadir)/gettext
diff --git a/devel/gettext-devel/files/patch-ad b/devel/gettext-devel/files/patch-ad
deleted file mode 100644
index be0cbd6eb450..000000000000
--- a/devel/gettext-devel/files/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- misc/Makefile.in.orig	Sat Sep 15 03:48:07 2001
-+++ misc/Makefile.in	Mon Nov 26 13:54:29 2001
-@@ -165,10 +165,8 @@
- 	  list='$(lisp_LISP)'; for p in $$list; do \
- 	    if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
- 	    echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
--	    $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
- 	    if test -f $${p}c; then \
- 	      echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
--	      $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
- 	    else : ; fi; \
- 	  done; \
- 	else : ; fi
diff --git a/devel/gettext-devel/files/patch-ae b/devel/gettext-devel/files/patch-ae
deleted file mode 100644
index c24ab0e425cc..000000000000
--- a/devel/gettext-devel/files/patch-ae
+++ /dev/null
@@ -1,67 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Sat Sep 15 03:47:29 2001
-+++ configure	Mon Nov 26 13:56:11 2001
-@@ -1220,13 +1220,13 @@
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
--   echo "$ac_t""found" 1>&6
--else
-+#if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-+#   ACLOCAL=aclocal
-+#   echo "$ac_t""found" 1>&6
-+#else
-    ACLOCAL="$missing_dir/missing aclocal"
-    echo "$ac_t""missing" 1>&6
--fi
-+#fi
- 
- echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
- echo "configure:1233: checking for working autoconf" >&5
-@@ -1246,13 +1246,13 @@
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake
--   echo "$ac_t""found" 1>&6
--else
-+#if (automake --version) < /dev/null > /dev/null 2>&1; then
-+#   AUTOMAKE=automake
-+#   echo "$ac_t""found" 1>&6
-+#else
-    AUTOMAKE="$missing_dir/missing automake"
-    echo "$ac_t""missing" 1>&6
--fi
-+#fi
- 
- echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
- echo "configure:1259: checking for working autoheader" >&5
-@@ -8375,7 +8375,7 @@
-   ;;
- esac
- fi
--EMACS="$ac_cv_path_EMACS"
-+EMACS=no
- if test -n "$EMACS"; then
-   echo "$ac_t""$EMACS" 1>&6
- else
-@@ -8677,10 +8677,10 @@
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
--s%@ACLOCAL@%$ACLOCAL%g
--s%@AUTOCONF@%$AUTOCONF%g
--s%@AUTOMAKE@%$AUTOMAKE%g
--s%@AUTOHEADER@%$AUTOHEADER%g
-+s%@ACLOCAL@%/usr/bin/true%g
-+s%@AUTOCONF@%/usr/bin/true%g
-+s%@AUTOMAKE@%/usr/bin/true%g
-+s%@AUTOHEADER@%/usr/bin/true%g
- s%@MAKEINFO@%$MAKEINFO%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@CC@%$CC%g
diff --git a/devel/gettext-devel/files/patch-ak b/devel/gettext-devel/files/patch-ak
deleted file mode 100644
index 3cc93a5361fd..000000000000
--- a/devel/gettext-devel/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/po-mode.el.orig	Sun Jan 23 22:35:10 2000
-+++ 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-devel/files/patch-doc::Makefile.in b/devel/gettext-devel/files/patch-doc::Makefile.in
deleted file mode 100644
index 80533cd81c08..000000000000
--- a/devel/gettext-devel/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- doc/Makefile.in.orig	Wed May 23 23:48:53 2001
-+++ doc/Makefile.in	Tue May 29 11:38:28 2001
-@@ -97,7 +97,7 @@
- aclocaldir = @aclocaldir@
- lispdir = @lispdir@
- 
--docdir = $(prefix)/doc/@PACKAGE@
-+docdir = $(prefix)/share/doc/@PACKAGE@
- dvidir = $(docdir)
- psdir = $(docdir)
- pdfdir = $(docdir)
-@@ -108,7 +108,7 @@
- SED = sed
- RM = rm -f
- 
--MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
-+MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ --no-split
- 
- info_TEXINFOS = gettext.texi
- gettext_TEXINFOS = iso-639.texi iso-3166.texi
diff --git a/devel/gettext-devel/files/patch-intl::Makefile.in b/devel/gettext-devel/files/patch-intl::Makefile.in
deleted file mode 100644
index 66817ee0b75e..000000000000
--- a/devel/gettext-devel/files/patch-intl::Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- intl/Makefile.in	2001/05/29 08:54:24	1.1
-+++ intl/Makefile.in	2001/05/29 09:00:12
-@@ -51,7 +51,7 @@
- YFLAGS = --name-prefix=__gettext
- 
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
---DLIBDIR=\"$(libdir)\" @DEFS@
-+-DLIBDIR=\"$(prefix)/libdata\" @DEFS@
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-@@ -151,11 +151,11 @@
- 	  : ; \
- 	fi
- 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
--	  $(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; \
-+	  $(mkinstalldirs) $(DESTDIR)$(prefix)/libdata; \
-+	  temp=$(DESTDIR)$(prefix)/libdata/t-charset.alias; \
-+	  dest=$(DESTDIR)$(prefix)/libdata/charset.alias; \
-+	  if test -f $(DESTDIR)$(prefix)/libdata/charset.alias; then \
-+	    orig=$(DESTDIR)$(prefix)/libdata/charset.alias; \
- 	    sed -f ref-add.sed $$orig > $$temp; \
- 	    $(INSTALL_DATA) $$temp $$dest; \
- 	    rm -f $$temp; \
-@@ -217,9 +217,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-devel/files/patch-lib::Makefile.in b/devel/gettext-devel/files/patch-lib::Makefile.in
deleted file mode 100644
index d2b83eca79fd..000000000000
--- a/devel/gettext-devel/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
-
-$FreeBSD$
-
---- lib/Makefile.in	2001/05/29 08:54:24	1.1
-+++ lib/Makefile.in	2001/05/29 08:59:30
-@@ -116,11 +116,11 @@
- noinst_HEADERS = c-ctype.h error.h fstrcmp.h getline.h getopt.h hash.h lbrkprop.h linebreak.h mbswidth.h obstack.h printf-parse.h printf.h system.h pathmax.h
- 
- 
--DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
-+DEFS = -DLIBDIR=\"$(prefix)/libdata\" @DEFS@
- INCLUDES = -I. -I$(srcdir) -I.. -I../intl
- 
--charset_alias = $(DESTDIR)$(libdir)/charset.alias
--charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
-+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
- 
- SUFFIXES = .sed .sin
- 
-@@ -349,7 +349,7 @@
- mostlyclean distclean maintainer-clean
- 
- 
--# The following is needed in order to install a simple file in $(libdir)
-+# The following is needed in order to install a simple file in $(prefix)/libdata
- # which is shared with other installed packages. We use a list of referencing
- # packages so that "make uninstall" will remove the file if and only if it
- # is not used by another installed package.
-@@ -358,7 +358,7 @@
- 
- all-local: charset.alias ref-add.sed ref-del.sed
- install-exec-local: all-local
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/libdata
- 	if test -f $(charset_alias); then \
- 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
- 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
diff --git a/devel/gettext-devel/files/patch-ltmain.sh b/devel/gettext-devel/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/devel/gettext-devel/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,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-devel/files/patch-man::Makefile.in b/devel/gettext-devel/files/patch-man::Makefile.in
deleted file mode 100644
index 860777a595d7..000000000000
--- a/devel/gettext-devel/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- man/Makefile.in	2001/05/29 08:45:39	1.1
-+++ man/Makefile.in	2001/05/29 08:46:06
-@@ -101,7 +101,7 @@
- 
- VERSION = @VERSION@
- mandir = @mandir@
--docdir = $(prefix)/doc/@PACKAGE@
-+docdir = $(prefix)/share/doc/@PACKAGE@
- htmldir = $(docdir)
- 
- AUTOMAKE_OPTIONS = 1.2 gnits