bite the bullet and upgrade to 0.11.5

There are too many changes to list in a sensible way.
The most visible change for me is that libintl requires libiconv now.
Also untangled the 3 sub-pkgs -- a common patch dir makes it too complex.

This pkg used to expose buildlink2 problems - the pkg libintl was
pulled in in cases where USE_GNU_GETTEXT was not set. There were
some improvements to libtool filtering, and x11/gtk builds now, so
I hope this is settled.

11 files changed, 76 insertions, 337 deletions

diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index 2eb0197f563..3a7c90b55ff 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,24 +1,24 @@
-$NetBSD: patch-aa,v 1.8 2002/08/19 19:20:32 seb Exp $
+$NetBSD: patch-aa,v 1.9 2002/11/27 17:41:06 drochner Exp $
 
-Build shared libintl. And force directory for locale date.
-
---- configure.orig	Fri May  1 07:48:25 1998
-+++ configure
-@@ -3690,7 +3690,7 @@ fi
- 		 USE_INCLUDED_LIBINTL=yes
- 		 CATOBJEXT=.cat
- 		 INSTOBJEXT=.cat
--		 DATADIRNAME=lib
-+		 DATADIRNAME=${PKGLOCALEDIR}
- 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
- 		 INTLLIBS=$INTLDEPS
- 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-@@ -3958,7 +3958,7 @@ fi
-    fi
-    
+--- configure.orig	Tue Aug  6 15:57:16 2002
++++ configure	Sun Sep  1 16:06:20 2002
+@@ -14293,10 +14293,6 @@
+       if test "$nls_cv_use_gnu_gettext" = "yes"; then
+                 INTLOBJS="\$(GETTOBJS)"
+         BUILD_INCLUDED_LIBINTL=yes
+-        USE_INCLUDED_LIBINTL=yes
+-        LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV"
+-        LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV"
+-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+       fi
+ 
+       if test "$gt_use_preinstalled_gnugettext" = "yes" \
+@@ -14369,7 +14365,7 @@
+         nls_cv_header_intl=
+     nls_cv_header_libgt=
+ 
+-        DATADIRNAME=share
++        DATADIRNAME=${PKGLOCALEDIR}
  
--      l=
-+      l=l
-    
+         INSTOBJEXT=.mo
  
-          test -d po || mkdir po
diff --git a/devel/gettext/patches/patch-ab b/devel/gettext/patches/patch-ab
index 04132e10225..eedd52a4d49 100644
--- a/devel/gettext/patches/patch-ab
+++ b/devel/gettext/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 1998/12/28 20:18:13 tron Exp $
+$NetBSD: patch-ab,v 1.5 2002/11/27 17:41:06 drochner Exp $
 
---- misc/Makefile.in.orig	Fri May  1 08:47:40 1998
-+++ misc/Makefile.in	Tue Dec 22 23:49:22 1998
-@@ -232,7 +232,7 @@
- install-exec: install-binSCRIPTS
- 	@$(NORMAL_INSTALL)
+--- misc/Makefile.in.orig	Tue Aug  6 16:00:33 2002
++++ misc/Makefile.in	Sun Sep  1 14:12:13 2002
+@@ -342,7 +342,7 @@
  
--install-data: install-lispLISP install-localeDATA
-+install-data: install-localeDATA
- 	@$(NORMAL_INSTALL)
+ info-am:
+ 
+-install-data-am: install-gettextsrcDATA install-lispLISP
++install-data-am: install-gettextsrcDATA
+ 
+ install-exec-am: install-binSCRIPTS
  
- install: install-exec install-data all
diff --git a/devel/gettext/patches/patch-ac b/devel/gettext/patches/patch-ac
index ea4848e55d9..4174a7f8dc6 100644
--- a/devel/gettext/patches/patch-ac
+++ b/devel/gettext/patches/patch-ac
@@ -1,18 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2002/08/19 19:20:32 seb Exp $
+$NetBSD: patch-ac,v 1.4 2002/11/27 17:41:06 drochner Exp $
 
---- intl/Makefile.in.orig	Mon Apr 27 23:53:18 1998
-+++ intl/Makefile.in
-@@ -119,11 +119,11 @@ install-exec: all
- 	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
- 	  fi; \
- 	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
--	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-+	  $(LIBTOOL) --mode=install ${INSTALL_DATA} libintl.la $(libdir); \
+--- intl/Makefile.in.orig	Thu Jul 25 14:49:57 2002
++++ intl/Makefile.in	Sun Sep  1 14:13:47 2002
+@@ -181,7 +181,7 @@
  	else \
  	  : ; \
  	fi
 -install-data: all
 +install-data:
  	if test "$(PACKAGE)" = "gettext"; then \
- 	  if test -r $(MKINSTALLDIRS); then \
- 	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+ 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
diff --git a/devel/gettext/patches/patch-ad b/devel/gettext/patches/patch-ad
deleted file mode 100644
index 896a8f32f59..00000000000
--- a/devel/gettext/patches/patch-ad
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2000/06/30 17:07:36 danw Exp $
-
-Fixes from glibc
-
---- intl/dcgettext.c.orig	Fri Jun 23 03:13:56 2000
-+++ intl/dcgettext.c	Fri Jun 23 03:42:33 2000
-@@ -217,6 +217,17 @@
- # define DCGETTEXT dcgettext__
- #endif
- 
-+static int enable_secure;
-+# define ENABLE_SECURE (enable_secure == 1)
-+# define DETERMINE_SECURE \
-+  if (enable_secure == 0)						     \
-+    {									     \
-+      if (getuid () != geteuid () || getgid () != getegid ())		     \
-+	enable_secure = 1;						     \
-+      else								     \
-+	enable_secure = -1;						     \
-+    }
-+
- /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-    locale.  */
- char *
-@@ -241,6 +252,9 @@
-   if (msgid == NULL)
-     return NULL;
- 
-+  /* See whether this is a SUID binary or not.  */
-+  DETERMINE_SECURE;
-+
-   /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-      CATEGORY is not LC_MESSAGES this might not make much sense but the
-      defintion left this undefined.  */
-@@ -339,6 +353,15 @@
- 	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
- 	    *cp++ = *categoryvalue++;
- 	  *cp = '\0';
-+
-+	  /* When this is a SUID binary we must not allow accessing files
-+	     outside the dedicated directories.  */
-+	  if (ENABLE_SECURE
-+	      && (memchr (single_locale, '/',
-+			  _nl_find_language (single_locale) - single_locale)
-+		  != NULL))
-+	    /* Ignore this entry.  */
-+	    continue;
- 	}
- 
-       /* If the current locale value is C (or POSIX) we don't load a
-@@ -396,7 +419,8 @@
-      struct loaded_l10nfile *domain_file;
-      const char *msgid;
- {
--  size_t top, act, bottom;
-+  size_t act = 0;
-+  size_t top, bottom;
-   struct loaded_domain *domain;
- 
-   if (domain_file->decided == 0)
diff --git a/devel/gettext/patches/patch-ae b/devel/gettext/patches/patch-ae
deleted file mode 100644
index 80a7b1fecb1..00000000000
--- a/devel/gettext/patches/patch-ae
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/06/30 17:07:36 danw Exp $
-
---- intl/explodename.c.orig	Fri Jun 23 03:21:26 2000
-+++ intl/explodename.c	Fri Jun 23 03:50:55 2000
-@@ -43,6 +43,17 @@
- 
- /* @@ end of prolog @@ */
- 
-+char *
-+_nl_find_language (const char *name)
-+{
-+  while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
-+	&& name[0] != '+' && name[0] != ',')
-+    ++name;
-+
-+  return (char *) name;
-+}
-+
-+
- int
- _nl_explode_name (name, language, modifier, territory, codeset,
- 		  normalized_codeset, special, sponsor, revision)
-@@ -51,7 +62,7 @@
-      const char **modifier;
-      const char **territory;
-      const char **codeset;
--     const char **normalized_codeset;
-+     char **normalized_codeset;
-      const char **special;
-      const char **sponsor;
-      const char **revision;
-@@ -74,9 +85,7 @@
-   mask = 0;
-   syntax = undecided;
-   *language = cp = name;
--  while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@'
--	 && cp[0] != '+' && cp[0] != ',')
--    ++cp;
-+  cp = _nl_find_language (*language);
- 
-   if (*language == cp)
-     /* This does not make sense: language has to be specified.  Use
-@@ -111,7 +120,7 @@
- 	      *normalized_codeset = _nl_normalize_codeset (*codeset,
- 							   cp - *codeset);
- 	      if (strcmp (*codeset, *normalized_codeset) == 0)
--		free ((char *) *normalized_codeset);
-+		free (*normalized_codeset);
- 	      else
- 		mask |= XPG_NORM_CODESET;
- 	    }
diff --git a/devel/gettext/patches/patch-af b/devel/gettext/patches/patch-af
deleted file mode 100644
index ab643a92474..00000000000
--- a/devel/gettext/patches/patch-af
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/06/30 17:07:36 danw Exp $
-
-Fixes from glibc
-
---- intl/finddomain.c.orig	Fri Jun 23 03:23:00 2000
-+++ intl/finddomain.c	Fri Jun 23 04:18:34 2000
-@@ -81,7 +81,7 @@
-   const char *modifier;
-   const char *territory;
-   const char *codeset;
--  const char *normalized_codeset;
-+  char *normalized_codeset;
-   const char *special;
-   const char *sponsor;
-   const char *revision;
-@@ -192,6 +192,10 @@
-   if (alias_value != NULL)
-     free (locale);
- 
-+  /* The space for normalized_codeset is dynamically allocated.  Free it.  */
-+  if (mask & XPG_NORM_CODESET)
-+    free (normalized_codeset);
-+
-   return retval;
- }
- 
-@@ -208,6 +212,7 @@
-       if (runp->data != NULL)
- 	_nl_unload_domain ((struct loaded_domain *) runp->data);
-       runp = runp->next;
-+      free (here->filename);
-       free (here);
-     }
- }
diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag
deleted file mode 100644
index 7d858048d19..00000000000
--- a/devel/gettext/patches/patch-ag
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2002/07/21 19:26:30 schmonz Exp $
- 
-Fix inspired by glibc, which gets it wrong.
-
---- intl/l10nflist.c.orig	Wed Apr 29 12:38:06 1998
-+++ intl/l10nflist.c
-@@ -349,8 +349,9 @@ _nl_make_l10nflist (l10nfile_list, dirli
- 
- /* Normalize codeset name.  There is no standard for the codeset
-    names.  Normalization allows the user to use any of the common
--   names.  */
--const char *
-+   names.  The return value is dynamically allocated and has to be
-+   freed by the caller.  */
-+char *
- _nl_normalize_codeset (codeset, name_len)
-      const unsigned char *codeset;
-      size_t name_len;
-@@ -388,7 +389,7 @@ _nl_normalize_codeset (codeset, name_len
-       *wp = '\0';
-     }
- 
--  return (const char *) retval;
-+  return retval;
- }
- 
- 
diff --git a/devel/gettext/patches/patch-ah b/devel/gettext/patches/patch-ah
deleted file mode 100644
index c1c0e229d41..00000000000
--- a/devel/gettext/patches/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2000/06/30 17:07:36 danw Exp $
-
---- intl/loadinfo.h.orig	Fri Jun 23 03:27:25 2000
-+++ intl/loadinfo.h	Fri Jun 23 03:52:01 2000
-@@ -50,8 +50,8 @@
- };
- 
- 
--extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
--						  size_t name_len));
-+extern char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
-+					    size_t name_len));
- 
- extern struct loaded_l10nfile *
- _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
-@@ -70,7 +70,9 @@
- 				     const char **modifier,
- 				     const char **territory,
- 				     const char **codeset,
--				     const char **normalized_codeset,
-+				     char **normalized_codeset,
- 				     const char **special,
- 				     const char **sponsor,
- 				     const char **revision));
-+
-+extern char *_nl_find_language PARAMS ((const char *name));
diff --git a/devel/gettext/patches/patch-ai b/devel/gettext/patches/patch-ai
index 473b39a007e..6771c00f6c4 100644
--- a/devel/gettext/patches/patch-ai
+++ b/devel/gettext/patches/patch-ai
@@ -1,63 +1,26 @@
-$NetBSD: patch-ai,v 1.1 2000/10/31 17:06:18 itojun Exp $
+$NetBSD: patch-ai,v 1.2 2002/11/27 17:41:07 drochner Exp $
 
-use already-installed libintl, not in-tree libintl
-
---- src/Makefile.in.orig	Fri May  1 15:47:25 1998
-+++ src/Makefile.in	Wed Nov  1 01:25:11 2000
-@@ -108,7 +108,7 @@
- 
- INCLUDES = -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
--LDADD = ../lib/libnlsut.a ../intl/libintl.$la
-+LDADD = ../lib/libnlsut.a 
+--- src/Makefile.in.orig	Tue Aug  6 15:59:06 2002
++++ src/Makefile.in	Sun Sep  1 16:27:46 2002
+@@ -267,9 +267,7 @@
+ msgexec_LDADD = libgettextsrc.la
+ msgfilter_LDADD = libgettextsrc.la
+ msggrep_LDADD = libgettextsrc.la
+-msginit_LDADD = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
+-                ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
+-                libgettextsrc.la
++msginit_LDADD = libgettextsrc.la
  
- SED = sed
- YACC = @YACC@
-@@ -136,39 +136,39 @@
+ msguniq_LDADD = libgettextsrc.la
  
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lintl
- gettext_OBJECTS =  gettextp.o
- gettext_LDADD = $(LDADD)
--gettext_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
-+gettext_DEPENDENCIES =  ../lib/libnlsut.a 
- gettext_LDFLAGS = 
- msgcmp_OBJECTS =  message.o msgcmp.o open-po.o po-gram.gen.o \
- po-hash.gen.o po-lex.o po.o str-list.o dir-list.o
- msgcmp_LDADD = $(LDADD)
--msgcmp_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
-+msgcmp_DEPENDENCIES =  ../lib/libnlsut.a 
- msgcmp_LDFLAGS = 
- msgfmt_OBJECTS =  msgfmt.o open-po.o po-gram.gen.o po-hash.gen.o \
- po-lex.o po.o str-list.o message.o dir-list.o
- msgfmt_LDADD = $(LDADD)
--msgfmt_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
-+msgfmt_DEPENDENCIES =  ../lib/libnlsut.a 
- msgfmt_LDFLAGS = 
- msgmerge_OBJECTS =  message.o msgmerge.o open-po.o po-gram.gen.o \
- po-hash.gen.o po-lex.o po.o str-list.o dir-list.o
- msgmerge_LDADD = $(LDADD)
--msgmerge_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
-+msgmerge_DEPENDENCIES =  ../lib/libnlsut.a 
- msgmerge_LDFLAGS = 
- msgunfmt_OBJECTS =  message.o msgunfmt.o str-list.o
- msgunfmt_LDADD = $(LDADD)
--msgunfmt_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
-+msgunfmt_DEPENDENCIES =  ../lib/libnlsut.a 
- msgunfmt_LDFLAGS = 
- xgettext_OBJECTS =  message.o open-po.o po-gram.gen.o po-hash.gen.o \
- po-lex.o po.o str-list.o xget-lex.o xgettext.o dir-list.o
- xgettext_LDADD = $(LDADD)
--xgettext_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
-+xgettext_DEPENDENCIES =  ../lib/libnlsut.a 
- xgettext_LDFLAGS = 
- msgcomm_OBJECTS =  msgcomm.o message.o po-gram.gen.o po-hash.gen.o \
- po-lex.o open-po.o po.o str-list.o dir-list.o
- msgcomm_LDADD = $(LDADD)
--msgcomm_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
-+msgcomm_DEPENDENCIES =  ../lib/libnlsut.a 
- msgcomm_LDFLAGS = 
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+@@ -367,9 +365,7 @@
+ msggrep_LDFLAGS =
+ am_msginit_OBJECTS = msginit.$(OBJEXT)
+ msginit_OBJECTS = $(am_msginit_OBJECTS)
+-msginit_DEPENDENCIES = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
+-	../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
+-	libgettextsrc.la
++msginit_DEPENDENCIES = libgettextsrc.la
+ msginit_LDFLAGS =
+ am_msgmerge_OBJECTS = msgmerge.$(OBJEXT)
+ msgmerge_OBJECTS = $(am_msgmerge_OBJECTS)
diff --git a/devel/gettext/patches/patch-aj b/devel/gettext/patches/patch-aj
index d0fe6906ef3..f21b3f02d3a 100644
--- a/devel/gettext/patches/patch-aj
+++ b/devel/gettext/patches/patch-aj
@@ -1,13 +1,20 @@
-$NetBSD: patch-aj,v 1.2 2001/06/16 03:34:39 jlam Exp $
+$NetBSD: patch-aj,v 1.3 2002/11/27 17:41:07 drochner Exp $
 
---- Makefile.in-	Wed Nov  1 01:32:40 2000
-+++ Makefile.in	Wed Nov  1 01:32:49 2000
-@@ -103,7 +103,7 @@
+--- Makefile.in.orig	Tue Aug  6 15:57:07 2002
++++ Makefile.in	Sun Sep  1 16:51:37 2002
+@@ -149,13 +149,13 @@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
++MAKEINFO = env LANG= LANGUAGE= /usr/bin/makeinfo
+ 
+ gettextsrcdir = $(datadir)/gettext
  gettextsrc_DATA = ABOUT-NLS
+ gettextsrc_SCRIPTS = config.rpath mkinstalldirs
  
- EXTRA_DIST = BUGS DISCLAIM README.gemtext
--SUBDIRS = doc lib intl src po m4 misc tests
-+SUBDIRS = doc lib src po misc tests
+-SUBDIRS = doc intl intl-java lib libuniname src po projects misc man m4 tests
++SUBDIRS = doc lib libuniname src po misc man
  
- DISTCLEANFILES = intl/libintl.h
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ EXTRA_DIST = config.rpath BUGS DISCLAIM PACKAGING README.gemtext \
+              djgpp/COPYING.DJ djgpp/Makefile.maint djgpp/README.DJ \
diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak
deleted file mode 100644
index fd605336be6..00000000000
--- a/devel/gettext/patches/patch-ak
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2002/08/19 19:20:33 seb Exp $
-
-Use locally-built msgfmt. And fix locale directory.
-
---- po/Makefile.in.in.orig	Wed Apr 29 03:53:09 1998
-+++ po/Makefile.in.in
-@@ -20,7 +20,7 @@ prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
- localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
- 
-@@ -30,9 +30,9 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALL
- 
- CC = @CC@
- GENCAT = @GENCAT@
--GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
--MSGFMT = @MSGFMT@
--XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-+GMSGFMT = PATH=../src:$$PATH msgfmt
-+MSGFMT = PATH=../src:$$PATH msgfmt
-+XGETTEXT = PATH=../src:$$PATH xgettext
- MSGMERGE = PATH=../src:$$PATH msgmerge
- 
- DEFS = @DEFS@