From 1f422119bfda61e5c3b77bf9ca0b72ddbbe25925 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 23 Jun 2003 07:54:39 +0000
Subject: Update textproc/xerces-p to 1.7.0.3, and rename package to
 p5-XML-Xerces to better match other perl5 module packages.  This release
 mirrors the Xerces-C 1.7.0 releases and implements a DOM API (though that
 seems to be broken).  Also, several major memory leaks were fixed.

---
 textproc/xerces-p/Makefile         | 16 +++++++++-------
 textproc/xerces-p/distinfo         |  7 ++++---
 textproc/xerces-p/patches/patch-aa | 24 ++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 textproc/xerces-p/patches/patch-aa

(limited to 'textproc/xerces-p')

diff --git a/textproc/xerces-p/Makefile b/textproc/xerces-p/Makefile
index c877da98470..0528a94c140 100644
--- a/textproc/xerces-p/Makefile
+++ b/textproc/xerces-p/Makefile
@@ -1,24 +1,26 @@
-# $NetBSD: Makefile,v 1.9 2003/03/22 00:40:49 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/06/23 07:54:39 jlam Exp $
 #
 
-DISTNAME=	XML-Xerces-1.3.5
-PKGREVISION=	1
+DISTNAME=	XML-Xerces-1.7.0-3
+PKGNAME=	p5-${DISTNAME:C/-([0-9]*)$/.\1/}
 CATEGORIES=	textproc
-MASTER_SITES=	http://xml.apache.org/dist/xerces-p/
+MASTER_SITES=	http://xml.apache.org/dist/xerces-p/stable/archives/
 
 MAINTAINER=	manu@netbsd.org
 HOMEPAGE=	http://xml.apache.org/xerces-p/
 COMMENT=	Validating XML parser API for Perl
 
-DEPENDS+=	swig-1.1p5:../../devel/swig
+CONFLICTS+=	XML-Xerces-[0-9]*
 
 USE_BUILDLINK2=	YES
+USE_GMAKE=	YES
 PERL5_REQD=	5.6.0
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Xerces/.packlist
 
-MAKE_ENV+=	XERCES_LIB=${BUILDLINK_PREFIX.xerces-c}/lib
-MAKE_ENV+=	XERCES_INCLUDE=${BUILDLINK_PREFIX.xerces-c}/include
+MAKE_ENV+=	XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}"
+MAKE_ENV+=	ICUROOT="${BUILDLINK_PREFIX.icu}"
 
+# Xerces-C is built unthreaded in pkgsrc (for now).
 BUILDLINK_TRANSFORM+=	s:-lpthread:
 
 .include "../../lang/perl5/module.mk"
diff --git a/textproc/xerces-p/distinfo b/textproc/xerces-p/distinfo
index bf2e7bc3ed5..b762289dc15 100644
--- a/textproc/xerces-p/distinfo
+++ b/textproc/xerces-p/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/04/20 15:05:14 skrll Exp $
+$NetBSD: distinfo,v 1.4 2003/06/23 07:54:39 jlam Exp $
 
-SHA1 (XML-Xerces-1.3.5.tar.gz) = c0f7a91c670b9073b4796dec8a35aa2b62cb9e48
-Size (XML-Xerces-1.3.5.tar.gz) = 183293 bytes
+SHA1 (XML-Xerces-1.7.0-3.tar.gz) = dc86f655be431a0900dbb632bb86d59118bf54ea
+Size (XML-Xerces-1.7.0-3.tar.gz) = 148103 bytes
+SHA1 (patch-aa) = ad9dbf00b84cdad0ea5357ecb2261b65a0f4026c
diff --git a/textproc/xerces-p/patches/patch-aa b/textproc/xerces-p/patches/patch-aa
new file mode 100644
index 00000000000..5341b6b6b6c
--- /dev/null
+++ b/textproc/xerces-p/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2003/06/23 07:54:40 jlam Exp $
+
+--- Makefile.PL.orig	Fri Oct 11 14:25:00 2002
++++ Makefile.PL
+@@ -4,6 +4,7 @@ use Env qw(XERCES_LIB 
+ 	   XERCES_INCLUDE
+ 	   XERCESCROOT
+ 	   XERCES_DEVEL
++	   ICUROOT
+ 	   SWIG);
+ use strict;
+ use vars qw($INCLUDES);
+@@ -130,6 +131,11 @@ my $XERCES_VERSION = "$XERCES_LIB_VERSIO
+ $XERCES_LIB_VERSION =~ s/\./_/g;
+ my $LIBXERCES = "-lxerces-c$XERCES_LIB_VERSION";
+ $LIBS .= " $LIBXERCES";
++
++if (defined $ICUROOT) {
++  my $ICULIBS = "-L$ICUROOT/lib -licudata -licuuc -lm";
++  $LIBS .= " $ICULIBS";
++} 
+ 
+ # now we ensure that libxerces is in the library path
+ # if not we die()
-- 
cgit v1.2.3