Update to 0.28 and take maintainership:

* made intltool-merge use XML::Parser (#116526 and others) [Brian Cameron]

  - added and updated tests
  - updated so that intltool-merge doesn't add a trailing '\n'
    character to CDATA values.
  - Corrected the logic of encoding/decoding the string
    before/after translation.
  - Added it to build, made it install (Kenneth Christiansen)
    - Added missing DESTDIR (Abel Cheung)
    - Also nstall OrigTree.pm in the distribution tree (Malcolm Tredinnick)
    - Check for the XML::Parser module at build time (Malcolm Tredinnick)

* Added INTLTOOL_KBD_RULE for GOK\s *.kdb files (Bill Haneman)
* Added --multiple-output option (Kenneth Christiansen)
* Avoid bashism in xgettext version check. (#120267) (Abel Cheung)
* Handle standard GNU gettext 0.12 and 0.13 installations (Malcolm Tredinnick)
* Fix the running of test 18 (multiple output test) (Malcolm Tredinnick)

5 files changed, 41 insertions, 32 deletions

diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 9c2db8693f8..83a92262fd5 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.11 2003/12/03 02:27:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/13 17:19:26 jmmv Exp $
 #
 
-DISTNAME=		intltool-0.27.2
+DISTNAME=		intltool-0.28
 CATEGORIES=		textproc devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/intltool/0.27/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/intltool/0.28/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		tech-pkg@NetBSD.org
+MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Toolbox for internationalisation
 
+DEPENDS=		p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
+
 CONFLICTS=		xml-i18n-tools<=0.9
 
 USE_GMAKE=		YES
diff --git a/textproc/intltool/PLIST b/textproc/intltool/PLIST
index c004a6e0328..14c71f8cf21 100644
--- a/textproc/intltool/PLIST
+++ b/textproc/intltool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/08/17 19:47:39 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/12/13 17:19:26 jmmv Exp $
 bin/intltool-extract
 bin/intltool-merge
 bin/intltool-prepare
@@ -10,6 +10,7 @@ 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
@@ -19,5 +20,9 @@ share/intltool/intltool-po-Makefile.in.in-patch-4
 share/intltool/intltool-po-Makefile.in.in-patch-5
 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/buildlink2.mk b/textproc/intltool/buildlink2.mk
index 8abe206db29..a7e397a08da 100644
--- a/textproc/intltool/buildlink2.mk
+++ b/textproc/intltool/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/09/11 10:52:49 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/13 17:19:26 jmmv Exp $
 
 .if !defined(INTLTOOL_BUILDLINK2_MK)
 INTLTOOL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		intltool
-BUILDLINK_DEPENDS.intltool?=	intltool>=0.27.1
+BUILDLINK_DEPENDS.intltool?=	intltool>=0.28
 BUILDLINK_PKGSRCDIR.intltool?=	../../textproc/intltool
 BUILDLINK_DEPMETHOD.intltool?=	build
 
diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo
index 7a581ecc007..952f57ddd17 100644
--- a/textproc/intltool/distinfo
+++ b/textproc/intltool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2003/12/03 02:27:11 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2003/12/13 17:19:26 jmmv Exp $
 
-SHA1 (intltool-0.27.2.tar.bz2) = 0aa4a8cde3d7bdc31601e3c46dce187e2cde3547
-Size (intltool-0.27.2.tar.bz2) = 129412 bytes
-SHA1 (patch-aa) = 583e49a6891c861c0620308d4ceee40f174a738b
+SHA1 (intltool-0.28.tar.bz2) = ee24509428a3e18fadc807e213248cecd2871e7d
+Size (intltool-0.28.tar.bz2) = 110417 bytes
+SHA1 (patch-aa) = aba562310b77979a029b7c708e7f9e982774a8f5
diff --git a/textproc/intltool/patches/patch-aa b/textproc/intltool/patches/patch-aa
index c46eeab6e78..9f9246a4086 100644
--- a/textproc/intltool/patches/patch-aa
+++ b/textproc/intltool/patches/patch-aa
@@ -1,29 +1,31 @@
-$NetBSD: patch-aa,v 1.3 2003/08/17 19:47:39 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2003/12/13 17:19:26 jmmv Exp $
 
---- Makefile.in.orig	2003-08-12 02:07:57.000000000 +0200
+--- Makefile.in.orig	2003-12-08 23:47:27.000000000 +0100
 +++ Makefile.in
-@@ -75,13 +75,13 @@ SUBDIRS = . tests doc doc-i18n-tool
+@@ -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					xml-i18n-toolize				intltool-extract.in				intltool-merge.in				intltool-update.in				intltool-extract				intltool-merge					intltool-prepare				intltool-update					*.gz						$(NULL)
- 
- 
- # These are required by intltoolize and xml-i18n-toolize.
--pkgdata_DATA =  	intltool-extract.in				intltool-merge.in				intltool-update.in				intltool-po-Makefile.in.in-patch-1		intltool-po-Makefile.in.in-patch-2		intltool-po-Makefile.in.in-patch-3		intltool-po-Makefile.in.in-patch-4		intltool-po-Makefile.in.in-patch-5		intltool-po-Makefile.in.in-patch-6		intltool-po-Makefile.in.in-patch-7		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)
-+pkgdata_DATA =  	intltool-extract.in				intltool-merge.in				intltool-update.in				intltool-po-Makefile.in.in-patch-1		intltool-po-Makefile.in.in-patch-2		intltool-po-Makefile.in.in-patch-3		intltool-po-Makefile.in.in-patch-4		intltool-po-Makefile.in.in-patch-5		intltool-po-Makefile.in.in-patch-6		intltool-po-Makefile.in.in-patch-7	$(NULL)
- 
- 
- # This macro file should be visible to Automake's aclocal.
-@@ -89,7 +89,7 @@ aclocal_DATA = $(aclocal_macros)
- 
- # The intltool distributor and installed versions of scripts
- 
--bin_SCRIPTS =  	intltoolize					xml-i18n-toolize				intltool-update					intltool-merge					intltool-extract				intltool-prepare				$(NULL)
-+bin_SCRIPTS =  	intltoolize					intltool-update					intltool-merge					intltool-extract				intltool-prepare				$(NULL)
- 
- 
- EXTRA_DIST =  	$(aclocal_macros)				intltoolize.in					xml-i18n-toolize.in				intltool-extract.in.in				intltool-merge.in.in				intltool-update.in.in				intltool-prepare.in				intltool.spec.in				$(pkgdata_DATA)					$(NULL)
+ 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			\