On Wed, Jul 01, 2015 at 10:38:46PM +0200, Alexander Bluhm wrote:
> Hi,
>
> - update p5-XML-LibXML to 2.0121
> - take maintainer
>
> - remove p5-XML-LibXML-Common
> - it has been merged into p5-XML-LibXML
> - mark package obsolete in quirks
>
> - update p5-XML-LibXSLT to 1.94
> - old version is not compatible with new p5-XML-LibXML
> - take maintainer
>
> ok?
>
> bluhm
>
> Index: textproc/Makefile
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/textproc/Makefile,v
> retrieving revision 1.457
> diff -u -p -r1.457 Makefile
> --- textproc/Makefile 25 Jun 2015 16:24:40 -0000 1.457
> +++ textproc/Makefile 1 Jul 2015 19:39:49 -0000
> @@ -152,7 +152,6 @@
> SUBDIR += p5-LaTeX-Encode
> SUBDIR += p5-LaTeX-Pod
> SUBDIR += p5-LaTeX-TOM
> - SUBDIR += p5-LibXML-Common
> SUBDIR += p5-Libxml
> SUBDIR += p5-Lingua-EN-Fathom
> SUBDIR += p5-Lingua-EN-FindNumber
> Index: textproc/p5-LibXML-Common/Makefile
> ===================================================================
> RCS file: textproc/p5-LibXML-Common/Makefile
> diff -N textproc/p5-LibXML-Common/Makefile
> --- textproc/p5-LibXML-Common/Makefile 14 Jun 2014 23:26:01 -0000
> 1.21
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -# $OpenBSD: Makefile,v 1.21 2014/06/14 23:26:01 sthen Exp $
> -
> -SHARED_ONLY= Yes
> -
> -COMMENT= perl interface for several perl XML modules
> -
> -DISTNAME= XML-LibXML-Common-0.13
> -REVISION= 7
> -CATEGORIES= textproc
> -
> -LIB_DEPENDS= textproc/libxml
> -
> -# perl
> -PERMIT_PACKAGE_CDROM= Yes
> -
> -WANTLIB += c m z xml2>=7
> -
> -MODULES= cpan \
> - converters/libiconv
> -
> -.include <bsd.port.mk>
> Index: textproc/p5-LibXML-Common/distinfo
> ===================================================================
> RCS file: textproc/p5-LibXML-Common/distinfo
> diff -N textproc/p5-LibXML-Common/distinfo
> --- textproc/p5-LibXML-Common/distinfo 18 Jan 2015 03:15:23 -0000
> 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -SHA256 (XML-LibXML-Common-0.13.tar.gz) =
> g5JdVMfR3sVXURfRHPTePNUudreIjWuADNYEtt4nZPI=
> -SIZE (XML-LibXML-Common-0.13.tar.gz) = 12930
> Index: textproc/p5-LibXML-Common/pkg/DESCR
> ===================================================================
> RCS file: textproc/p5-LibXML-Common/pkg/DESCR
> diff -N textproc/p5-LibXML-Common/pkg/DESCR
> --- textproc/p5-LibXML-Common/pkg/DESCR 14 Jun 2003 10:22:42 -0000
> 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -XML::LibXML::Common contains several constants and functions that
> -are shared by XML::LibXML, XML::GDOME and XML::LibXSLT (not all
> -done, yet)
> Index: textproc/p5-LibXML-Common/pkg/PLIST
> ===================================================================
> RCS file: textproc/p5-LibXML-Common/pkg/PLIST
> diff -N textproc/p5-LibXML-Common/pkg/PLIST
> --- textproc/p5-LibXML-Common/pkg/PLIST 14 Jun 2014 23:26:01 -0000
> 1.6
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -@comment $OpenBSD: PLIST,v 1.6 2014/06/14 23:26:01 sthen Exp $
> -${P5ARCH}/
> -${P5ARCH}/XML/
> -${P5ARCH}/XML/LibXML/
> -${P5ARCH}/XML/LibXML/Common.pm
> -${P5ARCH}/auto/
> -${P5ARCH}/auto/XML/
> -${P5ARCH}/auto/XML/LibXML/
> -${P5ARCH}/auto/XML/LibXML/Common/
> -@comment ${P5ARCH}/auto/XML/LibXML/Common/Common.bs
> -${P5ARCH}/auto/XML/LibXML/Common/Common.so
> -@man man/man3p/XML::LibXML::Common.3p
> Index: textproc/p5-XML-LibXML/Makefile
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/textproc/p5-XML-LibXML/Makefile,v
> retrieving revision 1.42
> diff -u -p -r1.42 Makefile
> --- textproc/p5-XML-LibXML/Makefile 21 Jan 2015 14:41:38 -0000 1.42
> +++ textproc/p5-XML-LibXML/Makefile 1 Jul 2015 20:10:05 -0000
> @@ -2,16 +2,16 @@
>
> SHARED_ONLY= Yes
>
> -COMMENT= perl interface to the libxml2 library
> +COMMENT= perl binding for libxml2
>
> -DISTNAME= XML-LibXML-1.69
> +DISTNAME= XML-LibXML-2.0121
> EPOCH= 0
>
> -REVISION= 3
> -
> CATEGORIES= textproc
>
> -# GPL/Artistic
> +MAINTAINER = Alexander Bluhm <[email protected]>
> +
> +# perl
> PERMIT_PACKAGE_CDROM= Yes
>
> WANTLIB += m xml2 z
> @@ -19,9 +19,10 @@ WANTLIB += m xml2 z
> MODULES= converters/libiconv \
> cpan
>
> -LIB_DEPENDS= textproc/libxml
> -RUN_DEPENDS= textproc/p5-LibXML-Common \
> - textproc/p5-XML-SAX
> +LIB_DEPENDS= textproc/libxml>=2.7.6
> +RUN_DEPENDS= textproc/p5-XML-NamespaceSupport>=1.07 \
> + textproc/p5-XML-SAX>=0.11
> BUILD_DEPENDS= ${RUN_DEPENDS}
> +TEST_DEPENDS = devel/p5-Test-LeakTrace
>
> .include <bsd.port.mk>
> Index: textproc/p5-XML-LibXML/distinfo
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/textproc/p5-XML-LibXML/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- textproc/p5-XML-LibXML/distinfo 18 Jan 2015 03:15:27 -0000 1.12
> +++ textproc/p5-XML-LibXML/distinfo 1 Jul 2015 15:57:13 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (XML-LibXML-1.69.tar.gz) =
> x9zDKgYXjFNCW3FShr6FMxuBm5thIRoDlrCOhek3H9E=
> -SIZE (XML-LibXML-1.69.tar.gz) = 312095
> +SHA256 (XML-LibXML-2.0121.tar.gz) =
> 7EMQEcs3oEZA/SMW9k0EBaJ07s4sbzhH9/vTNuscDck=
> +SIZE (XML-LibXML-2.0121.tar.gz) = 464562
> Index: textproc/p5-XML-LibXML/patches/patch-Makefile_PL
> ===================================================================
> RCS file:
> /data/mirror/openbsd/cvs/ports/textproc/p5-XML-LibXML/patches/patch-Makefile_PL,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile_PL
> --- textproc/p5-XML-LibXML/patches/patch-Makefile_PL 7 Nov 2006 18:16:02
> -0000 1.4
> +++ textproc/p5-XML-LibXML/patches/patch-Makefile_PL 1 Jul 2015 18:30:43
> -0000
> @@ -1,13 +1,14 @@
> ---- Makefile.PL.orig Sun Sep 24 17:27:58 2006
> -+++ Makefile.PL Mon Nov 6 18:30:01 2006
> -@@ -314,8 +314,8 @@ sub MY::install {
> +$OpenBSD$
> +--- Makefile.PL.orig Sun May 3 14:05:11 2015
> ++++ Makefile.PL Wed Jul 1 20:26:32 2015
> +@@ -485,8 +485,8 @@ sub MY::install {
> $script .= <<"INSTALL";
>
> install_sax_driver :
> --\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
> --\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
> -+#\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
> -+#\t\@\$(PERL) -I\$(INSTALLSITELIB) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
> +-\t-\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
> +-\t-\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
> ++#\t-\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
> ++#\t-\@\$(PERL) -I\$(INSTALLSITELIB) -I\$(INSTALLSITEARCH) -MXML::SAX -e
> "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()"
>
> INSTALL
> } else {
> Index: textproc/p5-XML-LibXML/pkg/DESCR
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/textproc/p5-XML-LibXML/pkg/DESCR,v
> retrieving revision 1.2
> diff -u -p -r1.2 DESCR
> --- textproc/p5-XML-LibXML/pkg/DESCR 28 Oct 2008 14:07:43 -0000 1.2
> +++ textproc/p5-XML-LibXML/pkg/DESCR 1 Jul 2015 18:58:58 -0000
> @@ -1,4 +1,4 @@
> -This module is an interface to the GNOME libxml2 DOM parser (no SAX
> -parser support yet), and the DOM tree. It also provides an
> -XML::XPath-like findnodes() interface, providing access to the XPath
> -API in libxml2.
> +This module is an interface to libxml2, providing XML and HTML
> +parsers with DOM, SAX and XMLReader interfaces, a large subset of
> +DOM Layer 3 interface and a XML::XPath-like interface to XPath API
> +of libxml2.
> Index: textproc/p5-XML-LibXML/pkg/PLIST
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/textproc/p5-XML-LibXML/pkg/PLIST,v
> retrieving revision 1.19
> diff -u -p -r1.19 PLIST
> --- textproc/p5-XML-LibXML/pkg/PLIST 14 Jun 2014 23:26:02 -0000 1.19
> +++ textproc/p5-XML-LibXML/pkg/PLIST 1 Jul 2015 19:09:42 -0000
> @@ -1,11 +1,19 @@
> @comment $OpenBSD: PLIST,v 1.19 2014/06/14 23:26:02 sthen Exp $
> +@conflict p5-XML-LibXML-Common-*
You are missing:
@pkgpath textproc/p5-LibXML-Common
> +${P5ARCH}/
> +${P5ARCH}/XML/
> +${P5ARCH}/XML/LibXML/
> ${P5ARCH}/XML/LibXML.pm
> ${P5ARCH}/XML/LibXML.pod
> ${P5ARCH}/XML/LibXML/Attr.pod
> +${P5ARCH}/XML/LibXML/AttributeHash.pm
> ${P5ARCH}/XML/LibXML/Boolean.pm
> ${P5ARCH}/XML/LibXML/CDATASection.pod
> ${P5ARCH}/XML/LibXML/Comment.pod
> +${P5ARCH}/XML/LibXML/Common.pm
> +${P5ARCH}/XML/LibXML/Common.pod
> ${P5ARCH}/XML/LibXML/DOM.pod
> +${P5ARCH}/XML/LibXML/Devel.pm
> ${P5ARCH}/XML/LibXML/Document.pod
> ${P5ARCH}/XML/LibXML/DocumentFragment.pod
> ${P5ARCH}/XML/LibXML/Dtd.pod
> @@ -25,6 +33,7 @@ ${P5ARCH}/XML/LibXML/Parser.pod
> ${P5ARCH}/XML/LibXML/Pattern.pod
> ${P5ARCH}/XML/LibXML/Reader.pm
> ${P5ARCH}/XML/LibXML/Reader.pod
> +${P5ARCH}/XML/LibXML/RegExp.pod
> ${P5ARCH}/XML/LibXML/RelaxNG.pod
> ${P5ARCH}/XML/LibXML/SAX/
> ${P5ARCH}/XML/LibXML/SAX.pm
> @@ -38,14 +47,19 @@ ${P5ARCH}/XML/LibXML/Text.pod
> ${P5ARCH}/XML/LibXML/XPathContext.pm
> ${P5ARCH}/XML/LibXML/XPathContext.pod
> ${P5ARCH}/XML/LibXML/XPathExpression.pod
> -@comment ${P5ARCH}/auto/XML/LibXML/LibXML.bs
> +${P5ARCH}/auto/
> +${P5ARCH}/auto/XML/
> +${P5ARCH}/auto/XML/LibXML/
> ${P5ARCH}/auto/XML/LibXML/LibXML.so
> @man man/man3p/XML::LibXML.3p
> @man man/man3p/XML::LibXML::Attr.3p
> +@man man/man3p/XML::LibXML::AttributeHash.3p
> @man man/man3p/XML::LibXML::Boolean.3p
> @man man/man3p/XML::LibXML::CDATASection.3p
> @man man/man3p/XML::LibXML::Comment.3p
> +@man man/man3p/XML::LibXML::Common.3p
> @man man/man3p/XML::LibXML::DOM.3p
> +@man man/man3p/XML::LibXML::Devel.3p
> @man man/man3p/XML::LibXML::Document.3p
> @man man/man3p/XML::LibXML::DocumentFragment.3p
> @man man/man3p/XML::LibXML::Dtd.3p
> @@ -62,6 +76,7 @@ ${P5ARCH}/auto/XML/LibXML/LibXML.so
> @man man/man3p/XML::LibXML::Parser.3p
> @man man/man3p/XML::LibXML::Pattern.3p
> @man man/man3p/XML::LibXML::Reader.3p
> +@man man/man3p/XML::LibXML::RegExp.3p
> @man man/man3p/XML::LibXML::RelaxNG.3p
> @man man/man3p/XML::LibXML::SAX.3p
> @man man/man3p/XML::LibXML::SAX::Builder.3p
> Index: textproc/p5-XML-LibXSLT/Makefile
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/textproc/p5-XML-LibXSLT/Makefile,v
> retrieving revision 1.43
> diff -u -p -r1.43 Makefile
> --- textproc/p5-XML-LibXSLT/Makefile 14 Jun 2014 23:26:02 -0000 1.43
> +++ textproc/p5-XML-LibXSLT/Makefile 1 Jul 2015 20:21:26 -0000
> @@ -2,22 +2,23 @@
>
> SHARED_ONLY= Yes
>
> -COMMENT= fast XSLT module for perl
> +COMMENT= interface to the GNOME libxslt library
>
> MODULES= cpan devel/gettext
>
> -DISTNAME= XML-LibXSLT-1.68
> -REVISION= 5
> +DISTNAME= XML-LibXSLT-1.94
> CATEGORIES= textproc
>
> -HOMEPAGE= http://www.axkit.org/
> +MAINTAINER = Alexander Bluhm <[email protected]>
>
> -RUN_DEPENDS= textproc/p5-XML-LibXML>=1.60
> +RUN_DEPENDS= textproc/p5-XML-LibXML>=1.70
> BUILD_DEPENDS= ${RUN_DEPENDS}
> LIB_DEPENDS= textproc/libxml \
> - textproc/libxslt
> + textproc/libxslt>1.1.27
> +TEST_DEPENDS = devel/p5-Test-Pod \
> + devel/p5-Test-TrailingSpace
>
> -# GPL/Artistic
> +# perl_5
> PERMIT_PACKAGE_CDROM= Yes
>
> WANTLIB= c gcrypt gpg-error m util z xml2>=6 xslt>=1 exslt>=7
> Index: textproc/p5-XML-LibXSLT/distinfo
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/textproc/p5-XML-LibXSLT/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- textproc/p5-XML-LibXSLT/distinfo 18 Jan 2015 03:15:27 -0000 1.10
> +++ textproc/p5-XML-LibXSLT/distinfo 1 Jul 2015 19:35:51 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (XML-LibXSLT-1.68.tar.gz) =
> YLKOW/SlFHF8Lpti4A53S+y54eibSk+rZGK+wLz6yEM=
> -SIZE (XML-LibXSLT-1.68.tar.gz) = 77213
> +SHA256 (XML-LibXSLT-1.94.tar.gz) =
> ucDU3gaXKEw/RocoPy7WsoE5sIji3Cxzvjew97XpSuU=
> +SIZE (XML-LibXSLT-1.94.tar.gz) = 114015
> Index: textproc/p5-XML-LibXSLT/pkg/DESCR
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/textproc/p5-XML-LibXSLT/pkg/DESCR,v
> retrieving revision 1.3
> diff -u -p -r1.3 DESCR
> --- textproc/p5-XML-LibXSLT/pkg/DESCR 28 Oct 2008 14:07:43 -0000 1.3
> +++ textproc/p5-XML-LibXSLT/pkg/DESCR 1 Jul 2015 19:58:58 -0000
> @@ -1 +1,3 @@
> -This module is a fast XSLT library, based on the GNOME libxslt engine.
> +This module is an interface to the GNOME project's libxslt. This
> +is an extremely good XSLT engine, highly compliant and also very
> +fast.
> Index: textproc/p5-XML-LibXSLT/pkg/PLIST
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/textproc/p5-XML-LibXSLT/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- textproc/p5-XML-LibXSLT/pkg/PLIST 14 Jun 2014 23:26:02 -0000 1.12
> +++ textproc/p5-XML-LibXSLT/pkg/PLIST 1 Jul 2015 19:57:56 -0000
> @@ -1,7 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.12 2014/06/14 23:26:02 sthen Exp $
> ${P5ARCH}/XML/LibXSLT.pm
> -${P5ARCH}/XML/benchmark.pl
> ${P5ARCH}/auto/XML/LibXSLT/
> -@comment ${P5ARCH}/auto/XML/LibXSLT/LibXSLT.bs
> ${P5ARCH}/auto/XML/LibXSLT/LibXSLT.so
> @man man/man3p/XML::LibXSLT.3p
> Index: devel/quirks/Makefile
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.248
> diff -u -p -r1.248 Makefile
> --- devel/quirks/Makefile 28 Jun 2015 06:54:56 -0000 1.248
> +++ devel/quirks/Makefile 1 Jul 2015 20:29:46 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-2.94
> +PKGNAME = quirks-2.95
> PKG_ARCH = *
> MAINTAINER = Marc Espie <[email protected]>
>
> Index: devel/quirks/files/Quirks.pm
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.258
> diff -u -p -r1.258 Quirks.pm
> --- devel/quirks/files/Quirks.pm 28 Jun 2015 06:54:56 -0000 1.258
> +++ devel/quirks/files/Quirks.pm 1 Jul 2015 20:30:52 -0000
> @@ -559,6 +559,7 @@ my $obsolete_reason = {
> 'pear-PHPUnit2' => 3,
> 'pear-HTML-Common2' => 5,
> 'pear-HTML-QuickForm' => 5,
> + 'p5-XML-LibXML-Common' => 5,
> };
>
> # ->is_base_system($handle, $state):
>
--
Antoine
