Update gettext to 0.14.5. Many bugfixes and improvements,

including support for relocable programs, Qt support,
separation of the PO processing functions into a separate
library and more.

Reorganise the gettext infrastructure by splitting of the
tools into devel/gettext-tools, which will be used by the tools
framework. The remaining devel/gettext package contains
gettextize and autopoint aka the infrastructure to embbed gettext
into a package.

Due to the ABI and API changes, a recursive revision bump will
follow.

Take blaim by receiving the maintainer hat.

With input from jlam@, reed@ and wiz@.

6 files changed, 29 insertions, 50 deletions

diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 7413cb181ad..a13ff48c535 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.41 2005/12/29 06:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/02/05 22:45:54 joerg Exp $
 
-DISTNAME=		gettext-0.11.5
-PKGNAME=		gettext-lib-0.11.5
+DISTNAME=		gettext-0.14.5
+PKGNAME=		gettext-lib-0.14.5
 SVR4_PKGNAME=		gttli
-PKGREVISION=		6
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
 
-MAINTAINER=		tech-pkg@NetBSD.org
+MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/gettext/gettext.html
 COMMENT=		Internationalized Message Handling Library (libintl)
 
@@ -15,30 +14,25 @@ CONFLICTS=		gettext<=0.10.35
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/gettext-runtime
+
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
+
 CONFIGURE_ARGS+=	--with-included-gettext
 
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 
-BUILD_TARGET=		all-yes
-INSTALL_TARGET=		install-exec
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} localedir=${EGDIR}
 
-BUILD_DIRS=		${WRKSRC}/intl
+BUILD_DIRS=		intl
 EGDIR=			${PREFIX}/share/examples/gettext
 LOCALEDIR=		${PREFIX}/${PKGLOCALEDIR}/locale
 
 REQD_DIRS+=		${LOCALEDIR}
 REQD_FILES+=		${EGDIR}/locale.alias ${LOCALEDIR}/locale.alias
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CPPFLAGS+=		-D_INTL_REDIRECT_MACROS=1 -DSTATIC=static
-.endif
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index a2a5df03042..d4f037aafd3 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2006/02/05 22:45:54 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngettext}
 BUILDLINK_PACKAGES+=	gettext
 
 .if !empty(GETTEXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.10.35nb1
-BUILDLINK_RECOMMENDED.gettext+=	gettext-lib>=0.11.5nb4
+BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.14.5
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 .endif	# GETTEXT_BUILDLINK3_MK
 
diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo
index c53170db70a..721115807a2 100644
--- a/devel/gettext-lib/distinfo
+++ b/devel/gettext-lib/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 22:24:14 agc Exp $
+$NetBSD: distinfo,v 1.10 2006/02/05 22:45:54 joerg Exp $
 
-SHA1 (gettext-0.11.5.tar.gz) = 4d17534afac106bc0f2310a9fd77a291d433234b
-RMD160 (gettext-0.11.5.tar.gz) = 1de10790d1b8257717bc9c8a2a6fb451de5136c8
-Size (gettext-0.11.5.tar.gz) = 3724099 bytes
-SHA1 (patch-aa) = f246e85f695e5999aac270e7e5f2cceb31e7b7ed
-SHA1 (patch-ab) = 421d2de8f375bc28fca1b6ed4672e89317f44935
-SHA1 (patch-ac) = f594c03c3d43df19c5fc27efbea6b87b7d54aaeb
+SHA1 (gettext-0.14.5.tar.gz) = 68737eee1a6427044eef901dc88e4144d371fb6b
+RMD160 (gettext-0.14.5.tar.gz) = d31c8e49671f00623ce1e6f73716a5abcd1c7ec2
+Size (gettext-0.14.5.tar.gz) = 7105715 bytes
+SHA1 (patch-ab) = 2195304902fe17cd97c243a6bc395de1484a50c4
+SHA1 (patch-ac) = f7695a44cdb85a4f6d9b97872425acb4b74519c9
diff --git a/devel/gettext-lib/patches/patch-aa b/devel/gettext-lib/patches/patch-aa
deleted file mode 100644
index 98d2826c7dc..00000000000
--- a/devel/gettext-lib/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/12/12 08:59:11 schmonz Exp $
-
---- intl/libgnuintl.h.orig	Tue Jul 23 08:27:52 2002
-+++ intl/libgnuintl.h
-@@ -93,7 +93,7 @@ extern "C" {
-    If he doesn't, we choose the method.  A third possible method is
-    _INTL_REDIRECT_ASM, supported only by GCC.  */
- #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
--# if __GNUC__ >= 2 && (defined __STDC__ || defined __cplusplus)
-+# if __GNUC__ >= 2 && !defined __APPLE_CC__ && (defined __STDC__ || defined __cplusplus)
- #  define _INTL_REDIRECT_ASM
- # else
- #  ifdef __cplusplus
diff --git a/devel/gettext-lib/patches/patch-ab b/devel/gettext-lib/patches/patch-ab
index 5a924bb5bf6..66204e62039 100644
--- a/devel/gettext-lib/patches/patch-ab
+++ b/devel/gettext-lib/patches/patch-ab
@@ -1,23 +1,23 @@
-$NetBSD: patch-ab,v 1.2 2004/04/20 19:50:35 tv Exp $
+$NetBSD: patch-ab,v 1.3 2006/02/05 22:45:54 joerg Exp $
 
 --- intl/Makefile.in.orig	Thu Jul 25 08:49:57 2002
 +++ intl/Makefile.in	Mon Mar 15 14:39:58 2004
-@@ -121,8 +121,7 @@
+@@ -156,8 +156,7 @@ libintl.la libgnuintl.la: $(OBJECTS)
  	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
- 	  $(OBJECTS) @LTLIBICONV@ -lc \
+ 	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \
  	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
 -	  -rpath $(libdir) \
 -	  -no-undefined
 +	  -rpath $(libdir)
  
- libintl.h: libgnuintl.h
- 	cp $(srcdir)/libgnuintl.h libintl.h
-@@ -148,7 +147,7 @@
+ # Libtool's library version information for libintl.
+ # Before making a gettext release, the gettext maintainer must change this
+@@ -264,7 +263,7 @@ install-exec: all
  	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
  	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
  	  $(LIBTOOL) --mode=install \
 -	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
-+	    $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
- 	else \
- 	  : ; \
- 	fi
++	    $(BSD_INSTALL_LIB) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+ 	  if test "@RELOCATABLE@" = yes; then \
+ 	    dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
+ 	    if test -n "$$dependencies"; then \
diff --git a/devel/gettext-lib/patches/patch-ac b/devel/gettext-lib/patches/patch-ac
index f9f9918e4b8..5db9975417a 100644
--- a/devel/gettext-lib/patches/patch-ac
+++ b/devel/gettext-lib/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2004/12/18 14:28:04 grant Exp $
+$NetBSD: patch-ac,v 1.2 2006/02/05 22:45:54 joerg Exp $
 
---- intl/dcigettext.c.orig	2002-07-23 22:27:52.000000000 +1000
+--- intl/dcigettext.c.orig	2005-05-20 20:06:17.000000000 +0000
 +++ intl/dcigettext.c
-@@ -234,7 +234,9 @@ struct known_translation_t
+@@ -243,7 +243,9 @@ struct known_translation_t
  /* Root of the search tree with known translations.  We can use this
     only if the system provides the `tsearch' function family.  */
  #if defined HAVE_TSEARCH || defined _LIBC