The package textproc/p5-XML-SAX-Base is at version 1.02, on CPAN

the module XML::SAX:Base is at version 1.04 since 2002, no newer
release is available.

Since about the same time the Perl 5 module XML::SAX includes the
XML::SAX::Base module, the CHANGES file says:

0.11  03 Sep 2002  Matt Sergeant
    - Base: Merged in XML::SAX::Base 1.04 (including memory leak fixes)

Hence the packages textproc/p5-XML-SAX-Base and textproc/p5-XML-SAX
are conflicting.

To resolve this situation and as discussed with he@:

- Remove the package textproc/p5-XML-SAX-Base.

- Make textproc/p5-XML-SAX conflicting with the now defunct
textproc/p5-XML-SAX-Base.
Bump PKGREVISION of textproc/p5-XML-SAX to 2.

- Adjust accordingly the dependencies of textproc/p5-XML-SAX-Writer:
make it depend on textproc/p5-XML-SAX.
Bump PKGREVISION of textproc/p5-XML-SAX-Writer to 1.

6 files changed, 8 insertions, 49 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 49048953f66..56b5c30c961 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.469 2009/03/01 21:26:20 wiz Exp $
+# $NetBSD: Makefile,v 1.470 2009/03/08 13:30:46 seb Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -308,7 +308,6 @@ SUBDIR+=	p5-XML-RSS
 SUBDIR+=	p5-XML-RSS-Parser
 SUBDIR+=	p5-XML-RegExp
 SUBDIR+=	p5-XML-SAX
-SUBDIR+=	p5-XML-SAX-Base
 SUBDIR+=	p5-XML-SAX-Expat
 SUBDIR+=	p5-XML-SAX-Writer
 SUBDIR+=	p5-XML-Sablotron
diff --git a/textproc/p5-XML-SAX-Base/DESCR b/textproc/p5-XML-SAX-Base/DESCR
deleted file mode 100644
index 4bba938460c..00000000000
--- a/textproc/p5-XML-SAX-Base/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-This module has a very simple task - to be a base class for PerlSAX
-drivers and filters. It's default behaviour is to pass the input directly
-to the output unchanged. It can be useful to use this module as a base class
-so you don't have to, for example, implement the characters() callback.
-
-The main advantages that it provides are easy dispatching of events the right
-way (ie it takes care for you of checking that the handler has implemented
-that method, or has defined an AUTOLOAD), and the guarantee that filters
-will pass along events that they aren't implementing to handlers downstream
-that might nevertheless be interested in them.
diff --git a/textproc/p5-XML-SAX-Base/Makefile b/textproc/p5-XML-SAX-Base/Makefile
deleted file mode 100644
index 63099ae8967..00000000000
--- a/textproc/p5-XML-SAX-Base/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/28 14:32:55 he Exp $
-
-DISTNAME=	XML-SAX-Base-1.02
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://search.cpan.org/dist/XML-SAX-Base/
-COMMENT=	Base class SAX Drivers and Filters
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-#MAKE_ENV=	SKIP_SAX_INSTALL=yes
-#EGSUBDIR=	share/examples/p5-XML-SAX
-#CONF_FILES=	${EGSUBDIR}/ParserDetails.ini \
-#			${PERL5_INSTALLVENDORLIB}/XML/SAX/ParserDetails.ini
-
-PERL5_PACKLIST=	auto/XML/SAX/Base/.packlist
-
-#INSTALLATION_DIRS+=	${EGSUBDIR}
-
-#post-install:
-#	${ECHO} > ${DESTDIR:Q}${PREFIX:Q}/${EGSUBDIR}/ParserDetails.ini
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-SAX-Base/distinfo b/textproc/p5-XML-SAX-Base/distinfo
deleted file mode 100644
index befefdebf87..00000000000
--- a/textproc/p5-XML-SAX-Base/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/28 14:32:55 he Exp $
-
-SHA1 (XML-SAX-Base-1.02.tar.gz) = ba7def460301b818dc49db197720c8b032e7fe24
-RMD160 (XML-SAX-Base-1.02.tar.gz) = 67b6de607022f9b008ecb3803f6a17c443daced5
-Size (XML-SAX-Base-1.02.tar.gz) = 21148 bytes
diff --git a/textproc/p5-XML-SAX-Writer/Makefile b/textproc/p5-XML-SAX-Writer/Makefile
index 54e717dcf52..b90208e4784 100644
--- a/textproc/p5-XML-SAX-Writer/Makefile
+++ b/textproc/p5-XML-SAX-Writer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/11/28 14:39:59 he Exp $
+# $NetBSD: Makefile,v 1.10 2009/03/08 13:30:47 seb Exp $
 
 DISTNAME=	XML-SAX-Writer-0.52
+PKGREVISION=	1
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
@@ -10,7 +11,7 @@ HOMEPAGE=	http://search.cpan.org/dist/XML-SAX-Writer/
 COMMENT=	SAX2 (XML) Writer
 
 DEPENDS+=	p5-Text-Iconv>=1.2:../../converters/p5-Text-Iconv
-DEPENDS+=	p5-XML-SAX-Base>=1.01:../../textproc/p5-XML-SAX-Base
+DEPENDS+=	p5-XML-SAX>=0.11:../../textproc/p5-XML-SAX
 DEPENDS+=	p5-XML-NamespaceSupport>=1.00:../../textproc/p5-XML-NamespaceSupport
 DEPENDS+=	p5-XML-Filter-BufferText>=1.00:../../textproc/p5-XML-Filter-BufferText
 
diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile
index 6d9ad406031..0f6397707d1 100644
--- a/textproc/p5-XML-SAX/Makefile
+++ b/textproc/p5-XML-SAX/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2008/10/19 19:18:59 he Exp $
+# $NetBSD: Makefile,v 1.24 2009/03/08 13:30:47 seb Exp $
 
 DISTNAME=	XML-SAX-0.96
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
@@ -13,6 +13,8 @@ COMMENT=	Perl interface to the SAX2 XML Parser
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+CONFLICTS+=	p5-XML-SAX-Base-[0-9]*
+
 DEPENDS+=	p5-XML-NamespaceSupport>=0.03:../../textproc/p5-XML-NamespaceSupport
 # included in perl>=5.6.1
 #DEPENDS+=	p5-File-Temp-[0-9]*:../../devel/p5-File-Temp