Update intltool to 0.30. This closes PR pkg/24315.

Approved by wiz@.

Changes since 0.28:

Version 0.30

* added missing [] quotation macro name defined in AC_DEFUN()
 (Tomasz Kloczko)
* Handle embedded newlines thereby avoiding the silent corruption of
  files. (Morten Welinder)
* Now intltool-merge does not compress whitespace in attributes
  and CDATA. (Brian Cameron)
* Now intltool-merge supports dashes in attribute names, and  supports
  attributes delimited by single quotes. (Brian Cameron)
* Misc small fixes (Kenneth Chr., Danilo Segan)

Version 0.29

* Removed OrigTree in favor of more simply setting handlers directly
  in intltool-merge (Brian Cameron)
* Work correctly with AC_CONFIG_AUX_DIR (Thomas Vander Stichele,
  Chee Bin HOH and Kees Cook)
* Make intltoolize return a correct exit status (Thomas Vander Stichele)
* Fix usage of a bash-ism (Morten Welinder, Jonathan Blandford)
* Translate GenericName in .desktop files (Kenneth Rohde Christiansen)
* Framework to allow each format have inline comments (Denis Barbier)
* Add $XGETTEXT_ARGS to allow passing extra args to xgettext (Danilo Segan)
* Added support for .kbd files (Kenneth Rohde Christiansen)
* Add $XGETTEXT_KEYWORDS to allow the use of other keywords (Danilo Segan)
* Misc bug fixes (Noah Levitt, Tommi Komulainen)

4 files changed, 23 insertions, 11 deletions

diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 88422a979a0..320ba630e40 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/06 18:26:49 minskim Exp $
 #
 
-DISTNAME=		intltool-0.28
+DISTNAME=		intltool-0.30
 CATEGORIES=		textproc devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/intltool/0.28/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/intltool/0.30/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -18,5 +18,7 @@ USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
+CONFIGURE_ENV+=		PERL=${PERL5}
+
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/intltool/PLIST b/textproc/intltool/PLIST
index 14c71f8cf21..49fd626e46c 100644
--- a/textproc/intltool/PLIST
+++ b/textproc/intltool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/12/13 17:19:26 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/02/06 18:26:49 minskim Exp $
 bin/intltool-extract
 bin/intltool-merge
 bin/intltool-prepare
@@ -10,7 +10,6 @@ man/man8/intltool-prepare.8
 man/man8/intltool-update.8
 man/man8/intltoolize.8
 share/aclocal/intltool.m4
-share/intltool/XML/Parser/Style/OrigTree.pm
 share/intltool/intltool-extract.in
 share/intltool/intltool-merge.in
 share/intltool/intltool-po-Makefile.in.in-patch-1
@@ -22,7 +21,4 @@ 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
-@dirrm share/intltool/XML/Parser/Style
-@dirrm share/intltool/XML/Parser
-@dirrm share/intltool/XML
 @dirrm share/intltool
diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo
index 952f57ddd17..72ab2b01f05 100644
--- a/textproc/intltool/distinfo
+++ b/textproc/intltool/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2003/12/13 17:19:26 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2004/02/06 18:26:49 minskim Exp $
 
-SHA1 (intltool-0.28.tar.bz2) = ee24509428a3e18fadc807e213248cecd2871e7d
-Size (intltool-0.28.tar.bz2) = 110417 bytes
+SHA1 (intltool-0.30.tar.bz2) = b65453d9abf8a59c41afa9cbcf9724852244730a
+Size (intltool-0.30.tar.bz2) = 112806 bytes
 SHA1 (patch-aa) = aba562310b77979a029b7c708e7f9e982774a8f5
+SHA1 (patch-ab) = eee8068e4130abc5438a985802a933137a4a4d66
diff --git a/textproc/intltool/patches/patch-ab b/textproc/intltool/patches/patch-ab
new file mode 100644
index 00000000000..58ad50b080c
--- /dev/null
+++ b/textproc/intltool/patches/patch-ab
@@ -0,0 +1,13 @@
+$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])