Stage 2 gettext update

Upgrade to 0.11.1, remove NO_LATEST_LINK.

Reviewed by:	portmgr

7 files changed, 58 insertions, 148 deletions

diff --git a/devel/gettext/files/patch-Makefile.in b/devel/gettext/files/patch-Makefile.in
index c517c45..f8296f0 100644
--- a/devel/gettext/files/patch-Makefile.in
+++ b/devel/gettext/files/patch-Makefile.in
@@ -1,14 +1,12 @@
-
-$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-Makefile.in,v 1.1 2002-03-15 19:43:48 ade Exp $
-
---- Makefile.in	2001/05/29 09:22:43	1.1
-+++ Makefile.in	2001/05/29 09:23:01
-@@ -101,7 +101,7 @@
+--- Makefile.in.orig	Tue Mar 12 14:51:22 2002
++++ Makefile.in	Fri Mar 15 18:42:49 2002
+@@ -40,3 +40,3 @@
  
- AUTOMAKE_OPTIONS = 1.3 gnits
- MAINT_CHARSET = latin1
--ACLOCAL = ./aclocal.sh @ACLOCAL@
+-ACLOCAL = @ACLOCAL@
 +ACLOCAL = /usr/bin/true
- ACLOCAL_AMFLAGS = -I m4
+ AUTOCONF = @AUTOCONF@
+@@ -152,3 +152,3 @@
+ 
+-SUBDIRS = doc intl intl-java lib libuniname src po man m4 projects misc tests
++SUBDIRS = doc intl lib libuniname src po man m4 projects misc tests
  
- gettextsrcdir = $(datadir)/gettext
diff --git a/devel/gettext/files/patch-ad b/devel/gettext/files/patch-ad
index be0cbd6..1e938c8 100644
--- a/devel/gettext/files/patch-ad
+++ b/devel/gettext/files/patch-ad
@@ -1,16 +1,9 @@
-
-$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; \
+--- misc/Makefile.in.orig	Tue Mar 12 13:04:40 2002
++++ misc/Makefile.in	Fri Mar 15 17:33:23 2002
+@@ -223,6 +223,4 @@
+ 	    echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$f"; \
+-	    $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$f; \
  	    if test -f $${p}c; then \
- 	      echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
--	      $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
+ 	      echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${f}c"; \
+-	      $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${f}c; \
  	    else : ; fi; \
- 	  done; \
- 	else : ; fi
diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae
index c24ab0e..bed0ca9 100644
--- a/devel/gettext/files/patch-ae
+++ b/devel/gettext/files/patch-ae
@@ -1,67 +1,7 @@
-
-$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
+--- configure.orig	Tue Mar 12 13:03:57 2002
++++ configure	Fri Mar 15 18:15:51 2002
+@@ -11776,3 +11775,3 @@
  fi
--EMACS="$ac_cv_path_EMACS"
+-EMACS="$ac_cv_prog_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/files/patch-intl::Makefile.in b/devel/gettext/files/patch-intl::Makefile.in
index 66817ee..dbed976 100644
--- a/devel/gettext/files/patch-intl::Makefile.in
+++ b/devel/gettext/files/patch-intl::Makefile.in
@@ -1,37 +1,24 @@
-
-$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
- 
+--- intl/Makefile.in.orig	Thu Jan 31 08:11:48 2002
++++ intl/Makefile.in	Fri Mar 15 17:38:20 2002
+@@ -54,3 +54,3 @@
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
---DLIBDIR=\"$(libdir)\" @DEFS@
-+-DLIBDIR=\"$(prefix)/libdata\" @DEFS@
+--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
++-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL @DEFS@
  CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-@@ -151,11 +151,11 @@
- 	  : ; \
- 	fi
+@@ -155,7 +155,7 @@
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
--	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+-	  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; \
-+	  $(mkinstalldirs) $(DESTDIR)$(prefix)/libdata; \
++	  test @GLIBC21@ != no || $(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
+@@ -242,5 +242,5 @@
  	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 -	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 -	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
@@ -40,5 +27,3 @@ $FreeBSD$
 +	    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-lib::Makefile.in b/devel/gettext/files/patch-lib::Makefile.in
index d2b83ec..c67503a 100644
--- a/devel/gettext/files/patch-lib::Makefile.in
+++ b/devel/gettext/files/patch-lib::Makefile.in
@@ -1,38 +1,19 @@
-
-$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
- 
+--- lib/Makefile.in.orig	Tue Mar 12 13:04:16 2002
++++ lib/Makefile.in	Fri Mar 15 17:41:01 2002
+@@ -240,3 +240,3 @@
  
 -DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 +DEFS = -DLIBDIR=\"$(prefix)/libdata\" @DEFS@
- INCLUDES = -I. -I$(srcdir) -I.. -I../intl
+ INCLUDES = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
+@@ -246,4 +246,4 @@
  
 -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
+@@ -524,3 +524,3 @@
  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/files/patch-man::Makefile.in b/devel/gettext/files/patch-man::Makefile.in
index d8bead5..a666636 100644
--- a/devel/gettext/files/patch-man::Makefile.in
+++ b/devel/gettext/files/patch-man::Makefile.in
@@ -1,14 +1,7 @@
-
-$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-man::Makefile.in,v 1.1 2002-03-15 19:43:48 ade Exp $
-
---- man/Makefile.in	2001/05/29 08:45:39	1.1
-+++ man/Makefile.in	2001/05/29 08:46:06
-@@ -101,7 +101,7 @@
- 
+--- man/Makefile.in.orig	Tue Mar 12 13:04:22 2002
++++ man/Makefile.in	Fri Mar 15 17:41:43 2002
+@@ -144,3 +144,3 @@
  VERSION = @VERSION@
- mandir = @mandir@
 -docdir = $(prefix)/doc/@PACKAGE@
 +docdir = $(prefix)/share/doc/@PACKAGE@
  htmldir = $(docdir)
- 
- AUTOMAKE_OPTIONS = 1.2 gnits
diff --git a/devel/gettext/files/patch-src::Makefile.in b/devel/gettext/files/patch-src::Makefile.in
new file mode 100644
index 0000000..7e3c14d
--- /dev/null
+++ b/devel/gettext/files/patch-src::Makefile.in
@@ -0,0 +1,20 @@
+--- src/Makefile.in.orig	Tue Mar 12 13:04:19 2002
++++ src/Makefile.in	Fri Mar 15 19:04:22 2002
+@@ -175,3 +175,3 @@
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
+--DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
++-DLIBDIR=\"$(prefix)/libdata\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
+ -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
+@@ -728,7 +728,7 @@
+ install-exec-local:
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE)
+-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/hostname$(EXEEXT)
+-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/urlget$(EXEEXT)
+-	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(libdir)/$(PACKAGE)/user-email
+-	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(libdir)/$(PACKAGE)/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
+