Update to 0.31. While here, make this package also install the xml-i18n-tools

utility to obsolete the standalone xml-i18n-tools package.

Changes since 0.30:
* Usage of [no-xml] option in AC_PROG_INTLTOOL to avoid requiring
  XML::Parser Perl module. (Rodney Dawes)
* Support for C#. (Rodney)
* Support for running intltool-update without autoconf, or with
  po/Makevars file (as used in gettext). (Danilo Segan)
* New XML merging (compatible with pre-0.27.2 intltool) -- bug
  #130802 -- entity decoding and encoding is not done anymore for
  XML. (Danilo)
* Multiple-output XML merging now produces simpler files, and sets
  "xml:lang" only when translation is used -- bug #46650. (Danilo)
* Support for passing comments to translators from XML and GConf
  schema files. (Danilo)
* Many bug fixes (Rodney, Danilo, Callum McKenzie)

6 files changed, 20 insertions, 56 deletions

diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 5c2a287da84..61aac28fa6f 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2004/06/04 23:52:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2004/06/27 17:27:12 jmmv Exp $
 #
 
-DISTNAME=		intltool-0.30
+DISTNAME=		intltool-0.31
 CATEGORIES=		textproc devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/intltool/0.30/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/intltool/0.31/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -14,13 +14,18 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DEPENDS=		p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
 
-CONFLICTS=		xml-i18n-tools<=0.9
+CONFLICTS=		xml-i18n-tools-[0-9]*
 
+AUTOMAKE_REQD=		1.4
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ENV+=		PERL=${PERL5}
 
+pre-configure:
+	cd ${WRKSRC} && ${AUTOMAKE} --add-missing
+
 .include "../../lang/perl5/buildlink3.mk"
+.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/intltool/PLIST b/textproc/intltool/PLIST
index 49fd626e46c..f6be10ced2e 100644
--- a/textproc/intltool/PLIST
+++ b/textproc/intltool/PLIST
@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2004/02/06 18:26:49 minskim Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/06/27 17:27:12 jmmv Exp $
 bin/intltool-extract
 bin/intltool-merge
 bin/intltool-prepare
 bin/intltool-update
 bin/intltoolize
+bin/xml-i18n-toolize
 man/man8/intltool-extract.8
 man/man8/intltool-merge.8
 man/man8/intltool-prepare.8
 man/man8/intltool-update.8
 man/man8/intltoolize.8
 share/aclocal/intltool.m4
+share/aclocal/xml-i18n-tools.m4
 share/intltool/intltool-extract.in
 share/intltool/intltool-merge.in
 share/intltool/intltool-po-Makefile.in.in-patch-1
@@ -21,4 +23,7 @@ share/intltool/intltool-po-Makefile.in.in-patch-6
 share/intltool/intltool-po-Makefile.in.in-patch-7
 share/intltool/intltool-po-Makefile.in.in-patch-8
 share/intltool/intltool-update.in
+share/intltool/xml-i18n-po-Makefile.in.in-patch-1
+share/intltool/xml-i18n-po-Makefile.in.in-patch-2
+share/intltool/xml-i18n-po-Makefile.in.in-patch-5
 @dirrm share/intltool
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
index 0c4e85fffe1..730da0c65b1 100644
--- a/textproc/intltool/buildlink3.mk
+++ b/textproc/intltool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/06/27 17:27:12 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 INTLTOOL_BUILDLINK3_MK:=	${INTLTOOL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nintltool}
 BUILDLINK_PACKAGES+=	intltool
 
 .if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.intltool+=	intltool>=0.30
+BUILDLINK_DEPENDS.intltool+=	intltool>=0.31
 BUILDLINK_PKGSRCDIR.intltool?=	../../textproc/intltool
 BUILDLINK_DEPMETHOD.intltool?=	build
 .endif	# INTLTOOL_BUILDLINK3_MK
diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo
index 72ab2b01f05..2292b73cba1 100644
--- a/textproc/intltool/distinfo
+++ b/textproc/intltool/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/02/06 18:26:49 minskim Exp $
+$NetBSD: distinfo,v 1.11 2004/06/27 17:27:12 jmmv Exp $
 
-SHA1 (intltool-0.30.tar.bz2) = b65453d9abf8a59c41afa9cbcf9724852244730a
-Size (intltool-0.30.tar.bz2) = 112806 bytes
-SHA1 (patch-aa) = aba562310b77979a029b7c708e7f9e982774a8f5
-SHA1 (patch-ab) = eee8068e4130abc5438a985802a933137a4a4d66
+SHA1 (intltool-0.31.tar.bz2) = de9faf90350b93581e56b42413a0977556d016cc
+Size (intltool-0.31.tar.bz2) = 118172 bytes
diff --git a/textproc/intltool/patches/patch-aa b/textproc/intltool/patches/patch-aa
deleted file mode 100644
index 9f9246a4086..00000000000
--- a/textproc/intltool/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/12/13 17:19:26 jmmv Exp $
-
---- Makefile.in.orig	2003-12-08 23:47:27.000000000 +0100
-+++ Makefile.in
-@@ -70,7 +70,7 @@ SUBDIRS = . tests doc doc-i18n-tool modu
- 
- NULL = 
- 
--aclocal_macros = intltool.m4 xml-i18n-tools.m4
-+aclocal_macros = intltool.m4
- 
- CLEANFILES = \
- 	intltoolize				\
-@@ -99,9 +99,6 @@ pkgdata_DATA = \
- 	intltool-po-Makefile.in.in-patch-6	\
- 	intltool-po-Makefile.in.in-patch-7	\
- 	intltool-po-Makefile.in.in-patch-8	\
--	xml-i18n-po-Makefile.in.in-patch-1	\
--	xml-i18n-po-Makefile.in.in-patch-2	\
--	xml-i18n-po-Makefile.in.in-patch-5	\
- 	$(NULL)
- 
- 
-@@ -112,7 +109,6 @@ aclocal_DATA = $(aclocal_macros)
- 
- bin_SCRIPTS = \
- 	intltoolize				\
--	xml-i18n-toolize			\
- 	intltool-update				\
- 	intltool-merge				\
- 	intltool-extract			\
diff --git a/textproc/intltool/patches/patch-ab b/textproc/intltool/patches/patch-ab
deleted file mode 100644
index 58ad50b080c..00000000000
--- a/textproc/intltool/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/02/06 18:26:49 minskim Exp $
-
---- intltool.m4.orig	2004-01-31 15:57:20.000000000 -0600
-+++ intltool.m4
-@@ -95,7 +95,7 @@ fi
- if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-    AC_MSG_ERROR([perl 5.x required for intltool])
- fi
--if `perl -e "require XML::Parser" 2>/dev/null`; then
-+if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- :
- else
-    AC_MSG_ERROR([XML::Parser perl module is required for intltool])