svn commit: r372399 - in head/textproc/p5-XML-SAX-ExpatXS: . files

[Mathieu Arnold]

Author: mat
Date: Mon Nov 10 15:30:11 2014
New Revision: 372399
URL: https://svnweb.freebsd.org/changeset/ports/372399
QAT: https://qat.redports.org/buildarchive/r372399/

Log:
  Fix build as non root.
  
  Sponsored by:	Absolight

Modified:
  head/textproc/p5-XML-SAX-ExpatXS/Makefile
  head/textproc/p5-XML-SAX-ExpatXS/files/patch-Makefile.PL

Modified: head/textproc/p5-XML-SAX-ExpatXS/Makefile
==============================================================================
--- head/textproc/p5-XML-SAX-ExpatXS/Makefile	Mon Nov 10 15:10:06 2014	(r372398)
+++ head/textproc/p5-XML-SAX-ExpatXS/Makefile	Mon Nov 10 15:30:11 2014	(r372399)
@@ -17,6 +17,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	EXPATLIBPATH=${LOCALBASE}/lib \
-		EXPATINCPATH=${LOCALBASE}/include </dev/null
+		EXPATINCPATH=${LOCALBASE}/include
 
 .include <bsd.port.mk>

Modified: head/textproc/p5-XML-SAX-ExpatXS/files/patch-Makefile.PL
==============================================================================
--- head/textproc/p5-XML-SAX-ExpatXS/files/patch-Makefile.PL	Mon Nov 10 15:10:06 2014	(r372398)
+++ head/textproc/p5-XML-SAX-ExpatXS/files/patch-Makefile.PL	Mon Nov 10 15:30:11 2014	(r372399)
@@ -1,11 +1,27 @@
---- Makefile.PL.orig	2013-11-07 09:32:26.000000000 +0800
-+++ Makefile.PL	2013-11-07 09:32:53.000000000 +0800
-@@ -111,7 +111,7 @@ sub MY::install {
-         $script .= <<"INSTALL";
+--- Makefile.PL.orig	2011-04-13 08:20:54 UTC
++++ Makefile.PL
+@@ -103,24 +103,6 @@ WriteMakefile(
+ );
  
- install_expat_xs :
--\t\@\$(PERL) -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::ExpatXS))->save_parsers()"
-+\t\@\$(PERL) -I\$(DESTDIR)\$(INSTALLSITELIB)/mach -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::ExpatXS))->save_parsers()"
- 
- INSTALL
  
+-sub MY::install {
+-    package MY;
+-    my $script = shift->SUPER::install(@_);
+-    if (ExtUtils::MakeMaker::prompt("Do you want to alter ParserDetails.ini?", "Y") =~ /^y/i) {
+-        $script =~ s/install :: (.*)$/install :: $1 install_expat_xs/m;
+-        $script .= <<"INSTALL";
+-
+-install_expat_xs :
+-\t\@\$(PERL) -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::ExpatXS))->save_parsers()"
+-
+-INSTALL
+-
+-    }
+-
+-    return $script;
+-}
+-
+-
+ sub build_xml_sax_expatxs_preload {
+     
+     print "Writing XML::SAX::ExpatXS::Preload\n";