Date: Fri, 8 Nov 2013 17:11:58 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333249 - in head/textproc: p5-XML-SAX p5-XML-SAX-ExpatXS p5-XML-SAX/files Message-ID: <201311081711.rA8HBwj0072803@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Fri Nov 8 17:11:58 2013 New Revision: 333249 URL: http://svnweb.freebsd.org/changeset/ports/333249 Log: 1: remove WRITE_INI_OK config from p5-XML-SAX, force to write ini now. 2: fix install/deinstall problem of p5-XML-SAX-ExpatXS, will cause md5 checksum error of p5-XML-SAX. PR: ports/183781 Submitted by: Ryan Frederick <ryanrfrederick@gmail.com> Modified: head/textproc/p5-XML-SAX-ExpatXS/pkg-deinstall head/textproc/p5-XML-SAX-ExpatXS/pkg-install head/textproc/p5-XML-SAX/Makefile head/textproc/p5-XML-SAX/files/patch-Makefile.PL head/textproc/p5-XML-SAX/pkg-plist Modified: head/textproc/p5-XML-SAX-ExpatXS/pkg-deinstall ============================================================================== --- head/textproc/p5-XML-SAX-ExpatXS/pkg-deinstall Fri Nov 8 17:03:02 2013 (r333248) +++ head/textproc/p5-XML-SAX-ExpatXS/pkg-deinstall Fri Nov 8 17:11:58 2013 (r333249) @@ -1,6 +1,6 @@ #!/bin/sh -case $1 in +case $2 in POST-DEINSTALL) perl -MXML::SAX -e 'XML::SAX->remove_parser(q(XML::SAX::ExpatXS))->save_parsers();' ;; Modified: head/textproc/p5-XML-SAX-ExpatXS/pkg-install ============================================================================== --- head/textproc/p5-XML-SAX-ExpatXS/pkg-install Fri Nov 8 17:03:02 2013 (r333248) +++ head/textproc/p5-XML-SAX-ExpatXS/pkg-install Fri Nov 8 17:11:58 2013 (r333249) @@ -1,6 +1,6 @@ #!/bin/sh -case $1 in +case $2 in POST-INSTALL) perl -MXML::SAX -e 'XML::SAX->add_parser(q(XML::SAX::ExpatXS))->save_parsers();' ;; Modified: head/textproc/p5-XML-SAX/Makefile ============================================================================== --- head/textproc/p5-XML-SAX/Makefile Fri Nov 8 17:03:02 2013 (r333248) +++ head/textproc/p5-XML-SAX/Makefile Fri Nov 8 17:11:58 2013 (r333249) @@ -3,6 +3,7 @@ PORTNAME= XML-SAX PORTVERSION= 0.99 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,29 +13,11 @@ COMMENT= Simple API for XML BUILD_DEPENDS= p5-XML-NamespaceSupport>=0.03:${PORTSDIR}/textproc/p5-XML-NamespaceSupport \ p5-XML-SAX-Base>=1.05:${PORTSDIR}/textproc/p5-XML-SAX-Base -RUN_DEPENDS= p5-XML-NamespaceSupport>=0.03:${PORTSDIR}/textproc/p5-XML-NamespaceSupport \ - p5-XML-SAX-Base>=1.05:${PORTSDIR}/textproc/p5-XML-SAX-Base +RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure -OPTIONS_DEFINE= WRITE_INI_OK - -WRITE_INI_OK_DESC= Alter ParserDetails.ini information - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MWRITE_INI_OK} -WRITE_INI_OK= 1 -.else -WRITE_INI_OK= 0 -.endif - -post-patch: -# dirty hack to stop asking for confirmation to alter ParserDetails.ini - @${REINPLACE_CMD} -e 's/%%WRITE_INI_OK%%/${WRITE_INI_OK}/' \ - ${WRKSRC}/Makefile.PL - post-configure: # dirty hack to deceive irritable pod2man @${PERL} -e 's/^(POD2MAN_EXE.*)$$/\1 --lax/;' ${WRKSRC}/Makefile Modified: head/textproc/p5-XML-SAX/files/patch-Makefile.PL ============================================================================== --- head/textproc/p5-XML-SAX/files/patch-Makefile.PL Fri Nov 8 17:03:02 2013 (r333248) +++ head/textproc/p5-XML-SAX/files/patch-Makefile.PL Fri Nov 8 17:11:58 2013 (r333249) @@ -1,18 +1,23 @@ ---- Makefile.PL.orig 2013-11-07 09:23:43.000000000 +0800 -+++ Makefile.PL 2013-11-07 09:25:19.000000000 +0800 -@@ -28,10 +28,7 @@ sub MY::install { +--- Makefile.PL.orig 2011-09-05 05:37:48.000000000 +0800 ++++ Makefile.PL 2013-11-09 01:00:33.000000000 +0800 +@@ -27,15 +27,7 @@ sub MY::install { + } else { my $dir = File::Basename::dirname($INC{'XML/SAX.pm'}); - if (-e File::Spec->catfile($dir, 'SAX', 'ParserDetails.ini')) { +- if (-e File::Spec->catfile($dir, 'SAX', 'ParserDetails.ini')) { - $write_ini_ok = - ExtUtils::MakeMaker::prompt( - "Do you want XML::SAX to alter ParserDetails.ini?", "Y" - ) =~ /^y/i; -+ $write_ini_ok = %%WRITE_INI_OK%%; - } - else { - $write_ini_ok = 1; -@@ -43,7 +40,7 @@ sub MY::install { +- } +- else { +- $write_ini_ok = 1; +- } ++ $write_ini_ok = 1; + } + + if ($write_ini_ok) { +@@ -43,7 +35,7 @@ sub MY::install { $script .= <<"INSTALL"; install_sax_pureperl : Modified: head/textproc/p5-XML-SAX/pkg-plist ============================================================================== --- head/textproc/p5-XML-SAX/pkg-plist Fri Nov 8 17:03:02 2013 (r333248) +++ head/textproc/p5-XML-SAX/pkg-plist Fri Nov 8 17:11:58 2013 (r333249) @@ -1,3 +1,9 @@ +%%PERL5_MAN3%%/XML::SAX.3.gz +%%PERL5_MAN3%%/XML::SAX::DocumentLocator.3.gz +%%PERL5_MAN3%%/XML::SAX::Intro.3.gz +%%PERL5_MAN3%%/XML::SAX::ParserFactory.3.gz +%%PERL5_MAN3%%/XML::SAX::PurePerl.3.gz +%%PERL5_MAN3%%/XML::SAX::PurePerl::Reader.3.gz %%SITE_PERL%%/XML/SAX.pm %%SITE_PERL%%/XML/SAX/DocumentLocator.pm %%SITE_PERL%%/XML/SAX/Intro.pod @@ -11,18 +17,18 @@ %%SITE_PERL%%/XML/SAX/PurePerl/Exception.pm %%SITE_PERL%%/XML/SAX/PurePerl/NoUnicodeExt.pm %%SITE_PERL%%/XML/SAX/PurePerl/Productions.pm -%%SITE_PERL%%/XML/SAX/PurePerl/UnicodeExt.pm %%SITE_PERL%%/XML/SAX/PurePerl/Reader.pm %%SITE_PERL%%/XML/SAX/PurePerl/Reader/NoUnicodeExt.pm %%SITE_PERL%%/XML/SAX/PurePerl/Reader/Stream.pm %%SITE_PERL%%/XML/SAX/PurePerl/Reader/String.pm %%SITE_PERL%%/XML/SAX/PurePerl/Reader/URI.pm %%SITE_PERL%%/XML/SAX/PurePerl/Reader/UnicodeExt.pm +%%SITE_PERL%%/XML/SAX/PurePerl/UnicodeExt.pm %%SITE_PERL%%/XML/SAX/PurePerl/XMLDecl.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/.packlist @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML -@dirrm %%SITE_PERL%%/XML/SAX/PurePerl/Reader +@dirrmtry %%SITE_PERL%%/XML/SAX/PurePerl/Reader @dirrmtry %%SITE_PERL%%/XML/SAX/PurePerl @dirrmtry %%SITE_PERL%%/XML/SAX @dirrmtry %%SITE_PERL%%/XML
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311081711.rA8HBwj0072803>