textproc/p5-XML-LibXML-Common merged into textproc/p5-XML-LibXML.

7 files changed, 3 insertions, 45 deletions

diff --git a/MOVED b/MOVED
index 9d8c0696df9a..dbc76d74c5cc 100644
--- a/MOVED
+++ b/MOVED
@@ -4192,3 +4192,4 @@ graphics/libwpcg||2009-10-25|Unmaintained upstream, depends on an old version of
 databases/ruby-dbd_msql||2009-10-29|Has expired: no longer under development
 databases/ruby-dbd_proxy||2009-10-29|Has expired: no longer under development
 databases/ruby-dbd_interbase||2009-10-29|Has expired: no longer under development
+textproc/p5-XML-LibXML-Common|textproc/p5-XML-LibXML|2009-10-30|merged
diff --git a/textproc/Makefile b/textproc/Makefile
index 49e304de9d15..ce5ae8b06579 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -777,7 +777,6 @@
     SUBDIR += p5-XML-Handler-YAWriter
     SUBDIR += p5-XML-LibRSVG
     SUBDIR += p5-XML-LibXML
-    SUBDIR += p5-XML-LibXML-Common
     SUBDIR += p5-XML-LibXML-Iterator
     SUBDIR += p5-XML-LibXML-Simple
     SUBDIR += p5-XML-LibXSLT
diff --git a/textproc/p5-XML-GDOME/Makefile b/textproc/p5-XML-GDOME/Makefile
index bb6bf0fe1d24..e50b261ac1b1 100644
--- a/textproc/p5-XML-GDOME/Makefile
+++ b/textproc/p5-XML-GDOME/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XML-GDOME
 PORTVERSION=	0.86
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,7 +17,7 @@ COMMENT=	Perl module that provides the DOM Level 2 Core API for XML documents
 
 LIB_DEPENDS=	gdome.8:${PORTSDIR}/textproc/gdome2
 RUN_DEPENDS=	${SITE_PERL}/XML/SAX/Base.pm:${PORTSDIR}/textproc/p5-XML-SAX \
-		${SITE_PERL}/${PERL_ARCH}/XML/LibXML/Common.pm:${PORTSDIR}/textproc/p5-XML-LibXML-Common
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXML/Common.pm:${PORTSDIR}/textproc/p5-XML-LibXML
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-XML-LibXML-Common/Makefile b/textproc/p5-XML-LibXML-Common/Makefile
deleted file mode 100644
index 093a6632578a..000000000000
--- a/textproc/p5-XML-LibXML-Common/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	XML::LibXML::Common
-# Date created:		27 February 2003
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	XML-LibXML-Common
-PORTVERSION=	0.13
-CATEGORIES=	textproc perl5
-MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
-
-# Feel free to update this port when the CPAN module is updated
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Routines and Constants common for XML::LibXML and XML::GDOME
-
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
-
-PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INC='-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2'
-
-MAN3=		XML::LibXML::Common.3
-
-.include <bsd.port.mk>
diff --git a/textproc/p5-XML-LibXML-Common/distinfo b/textproc/p5-XML-LibXML-Common/distinfo
deleted file mode 100644
index 9cd5020308dd..000000000000
--- a/textproc/p5-XML-LibXML-Common/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (XML-LibXML-Common-0.13.tar.gz) = 13b6d93f53375d15fd11922216249659
-SHA256 (XML-LibXML-Common-0.13.tar.gz) = 83925d54c7d1dec5575117d11cf4de3cd52e76b7888d6b800cd604b6de2764f2
-SIZE (XML-LibXML-Common-0.13.tar.gz) = 12930
diff --git a/textproc/p5-XML-LibXML-Common/pkg-descr b/textproc/p5-XML-LibXML-Common/pkg-descr
deleted file mode 100644
index 60ec3b0f7a96..000000000000
--- a/textproc/p5-XML-LibXML-Common/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-XML::LibXML and XML::GDOME share some of the same functionality.  This
-package should bundle some shared constansts and functions, so both
-modules may coexist within the same scripts.
-
-Author:	Christian Glahn <christian.glahn@uibk.ac.at>
diff --git a/textproc/p5-XML-LibXML-Common/pkg-plist b/textproc/p5-XML-LibXML-Common/pkg-plist
deleted file mode 100644
index c8ed94e6d69a..000000000000
--- a/textproc/p5-XML-LibXML-Common/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.so
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Common.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML