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.

4 files changed, 15 insertions, 11 deletions

diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 272fd1ad34c..db0aa411268 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2002/08/23 01:22:40 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/11/27 17:41:07 drochner Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
-DISTNAME=		gettext-0.10.35
-PKGNAME=		gettext-lib-0.10.35
-PKGREVISION=		1
+DISTNAME=		gettext-0.11.5
+PKGNAME=		gettext-lib-0.11.5
 SVR4_PKGNAME=		gttli
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
@@ -14,6 +13,7 @@ HOMEPAGE=		http://www.gnu.org/software/gettext/gettext.html
 COMMENT=		tools for providing messages in different languages, libintl only
 
 CONFLICTS=		gettext<=0.10.35
+DEPENDS+=		libiconv-*:../../converters/libiconv
 
 # gettext-lib is needed to bootstrap shell/bash2, which is needed to
 # bootstrap buildlink2.
@@ -22,15 +22,14 @@ USE_BUILDLINK2=		no
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ARGS+=	--with-included-gettext
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
-PATCHDIR=		${.CURDIR}/../../devel/gettext/patches
-DISTINFO_FILE=		${.CURDIR}/../../devel/gettext/distinfo
+ALL_TARGET=		all-yes
 INSTALL_TARGET=		install-exec
 
 do-build:
diff --git a/devel/gettext-lib/PLIST b/devel/gettext-lib/PLIST
index 2a86ab32113..42cded69ad0 100644
--- a/devel/gettext-lib/PLIST
+++ b/devel/gettext-lib/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/27 17:41:07 drochner Exp $
 include/libintl.h
 lib/libintl.a
 lib/libintl.la
 lib/libintl.so
-lib/libintl.so.1
-lib/libintl.so.1.0
+lib/libintl.so.4
+lib/libintl.so.4.0
diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk
index 02671ca464c..f1b7add348f 100644
--- a/devel/gettext-lib/buildlink2.mk
+++ b/devel/gettext-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2002/11/26 21:56:07 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2002/11/27 17:41:07 drochner Exp $
 
 .if !defined(GETTEXT_BUILDLINK2_MK)
 GETTEXT_BUILDLINK2_MK=	# defined
@@ -50,6 +50,7 @@ _NEED_GNU_GETTEXT=	YES
 BUILDLINK_PACKAGES+=			gettext
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gettext=gettext-lib
 BUILDLINK_PREFIX.gettext_DEFAULT=	${LOCALBASE}
+.include "../../converters/libiconv/buildlink2.mk"
 .else
 BUILDLINK_PREFIX.gettext=	/usr
 .endif
diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo
new file mode 100644
index 00000000000..e559668b615
--- /dev/null
+++ b/devel/gettext-lib/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.4 2002/11/27 17:41:07 drochner Exp $
+
+SHA1 (gettext-0.11.5.tar.gz) = 4d17534afac106bc0f2310a9fd77a291d433234b
+Size (gettext-0.11.5.tar.gz) = 3724099 bytes