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@.

3 files changed, 28 insertions, 15 deletions

diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile
index ae9d3f9ec55..167ca015af1 100644
--- a/devel/gettext-m4/Makefile
+++ b/devel/gettext-m4/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:04 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/05 22:45:54 joerg Exp $
 
-DISTNAME=		gettext-0.11.5
-PKGNAME=		gettext-m4-0.11.5
+DISTNAME=		gettext-0.14.5
+PKGNAME=		gettext-m4-0.14.5
 SVR4_PKGNAME=		gttm4
 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=		Autoconf/automake m4 files for GNU NLS library
 
@@ -14,12 +14,12 @@ CONFLICTS=		gettext<=0.10.35nb1
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=		yes
+NO_BUILD=		yes
+NO_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--with-included-gettext
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-
-BUILD_DIRS=		${WRKSRC}/m4
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal
+	${INSTALL_DATA} ${WRKSRC:Q}/gettext-runtime/m4/*.m4 ${PREFIX}/share/aclocal
+	${INSTALL_DATA} ${WRKSRC:Q}/autoconf-lib-link/m4/*.m4 ${PREFIX}/share/aclocal
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext-m4/PLIST b/devel/gettext-m4/PLIST
index 3f64cbfcc17..e1275a42bc5 100644
--- a/devel/gettext-m4/PLIST
+++ b/devel/gettext-m4/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/27 17:41:07 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/02/05 22:45:54 joerg Exp $
+share/aclocal/ansi-c++.m4
 share/aclocal/codeset.m4
 share/aclocal/gettext.m4
+share/aclocal/glibc2.m4
 share/aclocal/glibc21.m4
 share/aclocal/iconv.m4
 share/aclocal/intdiv0.m4
+share/aclocal/intmax.m4
 share/aclocal/inttypes-pri.m4
 share/aclocal/inttypes.m4
 share/aclocal/inttypes_h.m4
@@ -12,7 +15,17 @@ share/aclocal/lcmessage.m4
 share/aclocal/lib-ld.m4
 share/aclocal/lib-link.m4
 share/aclocal/lib-prefix.m4
+share/aclocal/longdouble.m4
+share/aclocal/longlong.m4
+share/aclocal/nls.m4
+share/aclocal/po.m4
+share/aclocal/printf-posix.m4
 share/aclocal/progtest.m4
+share/aclocal/signed.m4
+share/aclocal/size_max.m4
 share/aclocal/stdint_h.m4
 share/aclocal/uintmax_t.m4
 share/aclocal/ulonglong.m4
+share/aclocal/wchar_t.m4
+share/aclocal/wint_t.m4
+share/aclocal/xsize.m4
diff --git a/devel/gettext-m4/distinfo b/devel/gettext-m4/distinfo
index fa869f4f507..8b35ceae45d 100644
--- a/devel/gettext-m4/distinfo
+++ b/devel/gettext-m4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:14 agc Exp $
+$NetBSD: distinfo,v 1.3 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 (gettext-0.14.5.tar.gz) = 68737eee1a6427044eef901dc88e4144d371fb6b
+RMD160 (gettext-0.14.5.tar.gz) = d31c8e49671f00623ce1e6f73716a5abcd1c7ec2
+Size (gettext-0.14.5.tar.gz) = 7105715 bytes