Move old version of libxml++ to libxml++1 and current version to libxml++.

5 files changed, 348 insertions, 58 deletions

diff --git a/textproc/libxml++/DESCR b/textproc/libxml++/DESCR
index 00219d5b63c..b43c9319cde 100644
--- a/textproc/libxml++/DESCR
+++ b/textproc/libxml++/DESCR
@@ -1,5 +1,4 @@
-This library provides a C++ interface to XML files.  It uses libxml2
-to access the XML files, and in order to configure libxml++ you
-must have both libxml and pkg-config installed.
-
-A newer version of this library is in textproc/libxml++2.
+libxml++ is a C++ wrapper for the libxml XML parser library. It has SAX and
+DOM-like APIs, but does not attempt to conform exactly to the DOM
+specifications because they are not aimed at C++. Its API is much simpler
+than the underlying libxml C API.
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index f965e6d0548..7450e295832 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/09/03 12:53:29 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.2 2007/09/20 21:03:50 wiz Exp $
 
-DISTNAME=		libxml++-1.0.5
-CATEGORIES=		textproc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libxml++/1.0/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	libxml++-2.18.1
+CATEGORIES=	textproc
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml++/2.18/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://libxmlplusplus.sourceforge.net/
-COMMENT=		C++ wrapper for the libxml XML parser library
+MAINTAINER=	evaldo@gardenali.biz
+HOMEPAGE=	http://libxmlplusplus.sourceforge.net/
+COMMENT=	C++ wrapper for the libxml XML parser library
 
-USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		pkg-config gmake
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/libxml++-2.6.pc.in
 GNU_CONFIGURE=		yes
 
-PKGCONFIG_OVERRIDE+=	libxml++-1.0.pc.in
+CONFLICTS+=		libxml++2-[0-9]*
 
+.include "../../devel/glibmm/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxml++/PLIST b/textproc/libxml++/PLIST
index a91ad628e97..834ea7097e2 100644
--- a/textproc/libxml++/PLIST
+++ b/textproc/libxml++/PLIST
@@ -1,33 +1,321 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/09/03 12:53:29 wiz Exp $
-include/libxml++-1.0/libxml++/api_export.h
-include/libxml++-1.0/libxml++/attribute.h
-include/libxml++-1.0/libxml++/document.h
-include/libxml++-1.0/libxml++/dtd.h
-include/libxml++-1.0/libxml++/exceptions/exception.h
-include/libxml++-1.0/libxml++/exceptions/internal_error.h
-include/libxml++-1.0/libxml++/exceptions/parse_error.h
-include/libxml++-1.0/libxml++/exceptions/validity_error.h
-include/libxml++-1.0/libxml++/io/ostreamoutputbuffer.h
-include/libxml++-1.0/libxml++/io/outputbuffer.h
-include/libxml++-1.0/libxml++/keepblanks.h
-include/libxml++-1.0/libxml++/libxml++.h
-include/libxml++-1.0/libxml++/nodes/cdatanode.h
-include/libxml++-1.0/libxml++/nodes/commentnode.h
-include/libxml++-1.0/libxml++/nodes/contentnode.h
-include/libxml++-1.0/libxml++/nodes/element.h
-include/libxml++-1.0/libxml++/nodes/entityreference.h
-include/libxml++-1.0/libxml++/nodes/node.h
-include/libxml++-1.0/libxml++/nodes/processinginstructionnode.h
-include/libxml++-1.0/libxml++/nodes/textnode.h
-include/libxml++-1.0/libxml++/noncopyable.h
-include/libxml++-1.0/libxml++/parsers/domparser.h
-include/libxml++-1.0/libxml++/parsers/parser.h
-include/libxml++-1.0/libxml++/parsers/saxparser.h
-lib/libxml++-1.0.la
-lib/pkgconfig/libxml++-1.0.pc
-@dirrm include/libxml++-1.0/libxml++/parsers
-@dirrm include/libxml++-1.0/libxml++/nodes
-@dirrm include/libxml++-1.0/libxml++/io
-@dirrm include/libxml++-1.0/libxml++/exceptions
-@dirrm include/libxml++-1.0/libxml++
-@dirrm include/libxml++-1.0
+@comment $NetBSD: PLIST,v 1.2 2007/09/20 21:03:51 wiz Exp $
+include/libxml++-2.6/libxml++/attribute.h
+include/libxml++-2.6/libxml++/document.h
+include/libxml++-2.6/libxml++/dtd.h
+include/libxml++-2.6/libxml++/exceptions/exception.h
+include/libxml++-2.6/libxml++/exceptions/internal_error.h
+include/libxml++-2.6/libxml++/exceptions/parse_error.h
+include/libxml++-2.6/libxml++/exceptions/validity_error.h
+include/libxml++-2.6/libxml++/io/istreamparserinputbuffer.h
+include/libxml++-2.6/libxml++/io/ostreamoutputbuffer.h
+include/libxml++-2.6/libxml++/io/outputbuffer.h
+include/libxml++-2.6/libxml++/io/parserinputbuffer.h
+include/libxml++-2.6/libxml++/keepblanks.h
+include/libxml++-2.6/libxml++/libxml++.h
+include/libxml++-2.6/libxml++/nodes/cdatanode.h
+include/libxml++-2.6/libxml++/nodes/commentnode.h
+include/libxml++-2.6/libxml++/nodes/contentnode.h
+include/libxml++-2.6/libxml++/nodes/element.h
+include/libxml++-2.6/libxml++/nodes/entityreference.h
+include/libxml++-2.6/libxml++/nodes/node.h
+include/libxml++-2.6/libxml++/nodes/processinginstructionnode.h
+include/libxml++-2.6/libxml++/nodes/textnode.h
+include/libxml++-2.6/libxml++/noncopyable.h
+include/libxml++-2.6/libxml++/parsers/domparser.h
+include/libxml++-2.6/libxml++/parsers/parser.h
+include/libxml++-2.6/libxml++/parsers/saxparser.h
+include/libxml++-2.6/libxml++/parsers/textreader.h
+include/libxml++-2.6/libxml++/validators/dtdvalidator.h
+include/libxml++-2.6/libxml++/validators/validator.h
+lib/libxml++-2.6.la
+lib/libxml++-2.6/include/libxml++config.h
+lib/pkgconfig/libxml++-2.6.pc
+share/doc/libxml++-2.6/docs/manual/html/ar01s02.html
+share/doc/libxml++-2.6/docs/manual/html/index.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/annotated.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/attribute_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/cdatanode_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classbool.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classes.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Attribute-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Attribute.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Attribute__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Attribute__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Attribute__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CdataNode-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CdataNode.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CdataNode__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CdataNode__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CdataNode__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CommentNode-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CommentNode.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CommentNode__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CommentNode__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1CommentNode__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ContentNode-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ContentNode.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ContentNode__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ContentNode__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ContentNode__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Document-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Document.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Document__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Document__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Document__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DomParser-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DomParser.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DomParser__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DomParser__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DomParser__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Dtd-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Dtd.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DtdValidator-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DtdValidator.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DtdValidator__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DtdValidator__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1DtdValidator__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Element-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Element.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Element__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Element__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Element__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1EntityReference-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1EntityReference.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1EntityReference__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1EntityReference__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1EntityReference__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1IStreamParserInputBuffer-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1IStreamParserInputBuffer.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1KeepBlanks-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1KeepBlanks.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Node-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Node.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Node__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Node__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Node__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1NonCopyable-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1NonCopyable.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1NonCopyable__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1NonCopyable__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1NonCopyable__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OStreamOutputBuffer-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OStreamOutputBuffer.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OutputBuffer-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OutputBuffer.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OutputBuffer__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OutputBuffer__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1OutputBuffer__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Parser-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Parser.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ParserInputBuffer-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ParserInputBuffer.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Parser__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Parser__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Parser__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ProcessingInstructionNode-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1ProcessingInstructionNode.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1SaxParser-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1SaxParser.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1SaxParser__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1SaxParser__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1SaxParser__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextNode-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextNode.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextNode__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextNode__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextNode__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextReader-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextReader.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextReader__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextReader__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1TextReader__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Validator-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Validator.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Validator__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Validator__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1Validator__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1exception-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1exception.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1exception__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1exception__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1exception__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1internal__error-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1internal__error.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1internal__error__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1internal__error__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1internal__error__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1parse__error-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1parse__error.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1parse__error__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1parse__error__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1parse__error__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1validity__error-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1validity__error.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1validity__error__inherit__graph.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1validity__error__inherit__graph.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/classxmlpp_1_1validity__error__inherit__graph.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/commentnode_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/contentnode_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_060042f61ad41255a77b5a60dc66afb4.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_060042f61ad41255a77b5a60dc66afb4_dep.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_060042f61ad41255a77b5a60dc66afb4_dep.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_98cc7bcadc131313690a7320eb0caa09.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_98cc7bcadc131313690a7320eb0caa09_dep.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_98cc7bcadc131313690a7320eb0caa09_dep.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_9cc7404ab660b5374779d403c202c70c.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_9cc7404ab660b5374779d403c202c70c_dep.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_9cc7404ab660b5374779d403c202c70c_dep.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_c513157412c8384caf468454c2c3cfa9.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_c513157412c8384caf468454c2c3cfa9_dep.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_c513157412c8384caf468454c2c3cfa9_dep.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0_dep.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0_dep.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_d49b71a5503b600be72da967490472e5.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_d49b71a5503b600be72da967490472e5_dep.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/dir_d49b71a5503b600be72da967490472e5_dep.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/dirs.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/document_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/domparser_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/doxygen.css
+share/doc/libxml++-2.6/docs/reference/2.18/html/doxygen.png
+share/doc/libxml++-2.6/docs/reference/2.18/html/dtd_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/dtdvalidator_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/element_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/entityreference_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/exception_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/files.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x63.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x64.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x65.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x66.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x67.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x68.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x69.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x6b.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x6c.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x6d.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x6e.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x6f.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x70.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x72.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x73.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x74.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x76.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x77.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x78.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_0x7e.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_enum.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_eval.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x63.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x64.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x65.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x66.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x67.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x68.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x69.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x6b.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x6c.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x6d.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x6e.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x6f.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x70.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x72.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x73.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x74.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x76.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x77.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_func_0x7e.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_rela.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_type.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/functions_vars.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/globals.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/globals_defs.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/globals_enum.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/globals_eval.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/globals_type.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/graph_legend.dot
+share/doc/libxml++-2.6/docs/reference/2.18/html/graph_legend.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/graph_legend.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/hierarchy.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/index.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__0.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__0.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__0.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__1.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__1.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__1.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__2.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__2.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__2.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__3.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__3.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__3.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__4.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__4.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__4.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__5.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__5.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__5.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__6.jpg
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__6.map
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherit__graph__6.md5
+share/doc/libxml++-2.6/docs/reference/2.18/html/inherits.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/internal__error_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/istreamparserinputbuffer_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/keepblanks_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/libxml++_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/libxml++config_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/namespacemembers.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/namespacemembers_enum.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/namespacemembers_eval.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/namespacemembers_type.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/namespaces.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/namespacesigc.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/namespacestatic_01const_01std.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/namespacexmlpp.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/node_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/noncopyable_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/ostreamoutputbuffer_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/outputbuffer_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/parse__error_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/parser_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/parserinputbuffer_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/processinginstructionnode_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/saxparser_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/structxmlpp_1_1SaxParser_1_1Attribute.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/tabs.css
+share/doc/libxml++-2.6/docs/reference/2.18/html/textnode_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/textreader_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/validator_8h.html
+share/doc/libxml++-2.6/docs/reference/2.18/html/validity__error_8h.html
+@dirrm share/doc/libxml++-2.6/docs/reference/2.18/html
+@dirrm share/doc/libxml++-2.6/docs/reference/2.18
+@dirrm share/doc/libxml++-2.6/docs/reference
+@dirrm share/doc/libxml++-2.6/docs/manual/html
+@dirrm share/doc/libxml++-2.6/docs/manual
+@dirrm share/doc/libxml++-2.6/docs
+@dirrm share/doc/libxml++-2.6
+@dirrm lib/libxml++-2.6/include
+@dirrm lib/libxml++-2.6
+@dirrm include/libxml++-2.6/libxml++/validators
+@dirrm include/libxml++-2.6/libxml++/parsers
+@dirrm include/libxml++-2.6/libxml++/nodes
+@dirrm include/libxml++-2.6/libxml++/io
+@dirrm include/libxml++-2.6/libxml++/exceptions
+@dirrm include/libxml++-2.6/libxml++
+@dirrm include/libxml++-2.6
diff --git a/textproc/libxml++/buildlink3.mk b/textproc/libxml++/buildlink3.mk
index a189e1bb9c5..fc247a43e03 100644
--- a/textproc/libxml++/buildlink3.mk
+++ b/textproc/libxml++/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/09/03 12:54:29 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/09/20 21:03:51 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXMLPP_BUILDLINK3_MK:=	${LIBXMLPP_BUILDLINK3_MK}+
 
-.if ${BUILDLINK_DEPTH} == "+"
+.if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libxmlpp
 .endif
 
@@ -11,11 +11,13 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxmlpp}
 BUILDLINK_PACKAGES+=	libxmlpp
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxmlpp
 
-.if ${LIBXMLPP_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libxmlpp+=	libxml++>=1.0.5
+.if !empty(LIBXMLPP_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.libxmlpp+=	libxml++>=2.10.0
+BUILDLINK_ABI_DEPENDS.libxmlpp+=	libxml++>=2.10.0nb1
 BUILDLINK_PKGSRCDIR.libxmlpp?=	../../textproc/libxml++
 .endif	# LIBXMLPP_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/glibmm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxml++/distinfo b/textproc/libxml++/distinfo
index 21db0e948b1..23a3bb55c8a 100644
--- a/textproc/libxml++/distinfo
+++ b/textproc/libxml++/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/09/03 12:53:29 wiz Exp $
+$NetBSD: distinfo,v 1.2 2007/09/20 21:03:51 wiz Exp $
 
-SHA1 (libxml++-1.0.5.tar.bz2) = e90e66beff0af2e2f2a320ffbf8f4c1a3790bc44
-RMD160 (libxml++-1.0.5.tar.bz2) = 073cff2d7a07ca62552c001d9560a21bcc447d35
-Size (libxml++-1.0.5.tar.bz2) = 303965 bytes
+SHA1 (libxml++-2.18.1.tar.bz2) = a02fb715ad7c4c6551a77a2357584c571209913e
+RMD160 (libxml++-2.18.1.tar.bz2) = 4c72ef3a5a55bff2365813f69e8cb4d01bfc9f89
+Size (libxml++-2.18.1.tar.bz2) = 1399530 bytes