Date: Fri, 26 Jul 2013 12:25:46 +0000 (UTC) From: Andrej Zverev <az@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323714 - in head: sysutils/gupsc sysutils/ucspi-ssl sysutils/usermin textproc/denature textproc/diffsplit textproc/markdown textproc/p5-PPI-HTML textproc/p5-Perl-MinimumVersion textpro... Message-ID: <201307261225.r6QCPkOK020317@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: az Date: Fri Jul 26 12:25:46 2013 New Revision: 323714 URL: http://svnweb.freebsd.org/changeset/ports/323714 Log: - switch simple inline replacement from perl to sed and remove where is no need in this anymore. - trim Makefile header Approved by: bapt@ (portmrg@) Modified: head/sysutils/gupsc/Makefile (contents, props changed) head/sysutils/ucspi-ssl/Makefile (contents, props changed) head/sysutils/usermin/Makefile head/textproc/denature/Makefile (contents, props changed) head/textproc/diffsplit/Makefile head/textproc/diffsplit/pkg-descr (contents, props changed) head/textproc/markdown/Makefile (contents, props changed) head/textproc/p5-PPI-HTML/Makefile (contents, props changed) head/textproc/p5-Perl-MinimumVersion/Makefile head/textproc/p5-Plagger/Makefile (contents, props changed) head/textproc/p5-Text-ASCIITable/Makefile (contents, props changed) head/textproc/p5-UML-Class-Simple/Makefile (contents, props changed) head/textproc/p5-XML-Catalog/Makefile (contents, props changed) head/textproc/p5-XML-DBMS/Makefile (contents, props changed) head/textproc/p5-XML-FOAF/Makefile (contents, props changed) head/textproc/p5-XML-Filter-GenericChunk/Makefile (contents, props changed) head/textproc/p5-XML-Handler-Trees/Makefile (contents, props changed) head/textproc/p5-XML-SAXDriver-Sablotron/Makefile (contents, props changed) Modified: head/sysutils/gupsc/Makefile ============================================================================== --- head/sysutils/gupsc/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/sysutils/gupsc/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gupsc -# Date created: 13 March 2001 -# Whom: Dmitry Sivachenko <demon@FreeBSD.org> -# +# Created by: Dmitry Sivachenko <demon@FreeBSD.org> # $FreeBSD$ -# PORTNAME= gupsc PORTVERSION= 0.3.1 @@ -23,8 +19,8 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include pre-patch: - @${PERL} -pi -e 's|/usr/local|${PREFIX}|; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure \ - ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -i '' -e 's|/usr/local|${PREFIX}|' \ + -e 's|DATADIRNAME=lib|DATADIRNAME=share|' \ + ${WRKSRC}/configure ${WRKSRC}/src/Makefile.in .include <bsd.port.mk> Modified: head/sysutils/ucspi-ssl/Makefile ============================================================================== --- head/sysutils/ucspi-ssl/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/sysutils/ucspi-ssl/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ucspi-ssl -# Date created: 2003-07-09 -# Whom: David Thiel <lx@redundancy.redundancy.org> -# +# Created by: David Thiel <lx@redundancy.redundancy.org> # $FreeBSD$ -# PORTNAME= ucspi-ssl PORTVERSION?= 0.70 @@ -35,8 +31,7 @@ SCRIPTS_TO_INSTALL= https@ sslcat sslcon post-patch: .for x in ${SCRIPTS_TO_INSTALL} - @${PERL} -pi.orig \ - -e 's|HOME/command/|${PREFIX}/bin/|' \ + @${REINPLACE_CMD} -i '' -e 's|HOME/command/|${PREFIX}/bin/|' \ ${WRKSRC}/src/${x}.sh .endfor Modified: head/sysutils/usermin/Makefile ============================================================================== --- head/sysutils/usermin/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/sysutils/usermin/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -37,7 +37,7 @@ post-patch: @${REINPLACE_CMD} -e "s=%%PREFIX%%=${PREFIX}=" ${WRKSRC}/setup.sh .for file in filter/config commands/config htaccess/config - @${PERL} -pi -e "s|=/etc/webmin|=${PREFIX}/etc/webmin|g" ${WRKSRC}/${file} + @${REINPLACE_CMD} -i '' -e 's|=/etc/webmin|=${PREFIX}/etc/webmin|' ${WRKSRC}/${file} .endfor @${FIND} ${WRKSRC} -name config-freebsd\* \ Modified: head/textproc/denature/Makefile ============================================================================== --- head/textproc/denature/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/denature/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -26,8 +26,9 @@ MAN1= denature.1 PLIST_FILES= bin/denature post-patch: - @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}| ; \ - s|%%JAVA_HOME%%|${JAVA_HOME}|" ${WRKSRC}/denature + @${REINPLACE_CMD} -i '' -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' \ + ${WRKSRC}/denature do-build: cd ${WRKSRC} && ${POD2MAN} denature > denature.1 Modified: head/textproc/diffsplit/Makefile ============================================================================== --- head/textproc/diffsplit/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/diffsplit/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -16,14 +16,13 @@ NO_BUILD= YES NO_WRKSUBDIR= YES PLIST_FILES= bin/diffsplit USE_PERL5= YES +USES= shebangfix +SHEBANG_FILES= diffsplit do-extract: @${MKDIR} ${WRKDIR} @${CP} ${DISTDIR}/${DIST_SUBDIR}/diffsplit ${WRKDIR} -do-patch: - @${PERL} -pi -e "s:/usr/bin/perl:${PERL5}:g" ${WRKDIR}/diffsplit - do-install: @${INSTALL_SCRIPT} ${WRKDIR}/diffsplit ${PREFIX}/bin Modified: head/textproc/diffsplit/pkg-descr ============================================================================== --- head/textproc/diffsplit/pkg-descr Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/diffsplit/pkg-descr Fri Jul 26 12:25:46 2013 (r323714) @@ -1,4 +1,4 @@ This script splits up a unified diff into separate patch files, each of which patches one source file. -WWW: http://www.pathname.com/~quinlan/software/diffsplit/ +WWW: http://www.pathname.com/~quinlan/software/diffsplit/ Modified: head/textproc/markdown/Makefile ============================================================================== --- head/textproc/markdown/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/markdown/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -14,6 +14,8 @@ COMMENT= A text-to-HTML conversion tool USE_ZIP= yes USE_PERL5= yes NO_BUILD= yes +USES= shebangfix +SHEBANG_FILES= Markdown.pl .if !defined(NOPORTDOCS) PORTDOCS= License.text Markdown-Readme.text @@ -21,9 +23,6 @@ PORTDOCS= License.text Markdown-Readme.t PLIST_FILES= bin/markdown -post-patch: - ${PERL} -pi -e "s#/usr/bin/perl#${PERL}#" ${WRKSRC}/Markdown.pl - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/Markdown.pl ${PREFIX}/bin/markdown .if !defined(NOPORTDOCS) Modified: head/textproc/p5-PPI-HTML/Makefile ============================================================================== --- head/textproc/p5-PPI-HTML/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-PPI-HTML/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,9 +1,5 @@ -# New ports collection makefile for: textproc/p5-PPI-HTML -# Date created: 24 March 2005 -# Whom: Lars Thegler <lth@FreeBSD.org> -# +# Created by: Lars Thegler <lth@FreeBSD.org> # $FreeBSD$ -# PORTNAME= PPI-HTML PORTVERSION= 1.08 @@ -25,6 +21,6 @@ PERL_CONFIGURE= yes MAN3= PPI::HTML.3 post-patch: - @${PERL} -pi -e '$$_="" if m/Test::More/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' '/Test::More/d' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> Modified: head/textproc/p5-Perl-MinimumVersion/Makefile ============================================================================== --- head/textproc/p5-Perl-MinimumVersion/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-Perl-MinimumVersion/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -25,6 +25,6 @@ MAN1= perlver.1 MAN3= Perl::MinimumVersion.3 post-patch: - @${PERL} -pi -e '$$_="" if m/Test::/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e '/Test::/d' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> Modified: head/textproc/p5-Plagger/Makefile ============================================================================== --- head/textproc/p5-Plagger/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-Plagger/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -555,8 +555,8 @@ MAN3= Plagger.3 \ Plagger::Template.3 post-patch: - ${PERL} -pi -e '$$_ = "" if m|auto_install|' ${WRKSRC}/Makefile.PL - ${RM} ${WRKSRC}/lib/Plagger/Plugin/Publish/Feed.pm.orig + @${REINPLACE_CMD} -i '' '/auto_install/d' ${WRKSRC}/Makefile.PL + @${RM} ${WRKSRC}/lib/Plagger/Plugin/Publish/Feed.pm.orig post-install: .if ${PORT_OPTIONS:MEXAMPLES} Modified: head/textproc/p5-Text-ASCIITable/Makefile ============================================================================== --- head/textproc/p5-Text-ASCIITable/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-Text-ASCIITable/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,9 +1,5 @@ -# New ports collection makefile for: textproc/p5-Text-ASCIITable -# Date created: 20 April 2005 -# Whom: Lars Thegler <lth@FreeBSD.org> -# +# Created by: Lars Thegler <lth@FreeBSD.org> # $FreeBSD$ -# PORTNAME= Text-ASCIITable PORTVERSION= 0.20 @@ -22,7 +18,7 @@ MAN3= Text::ASCIITable.3 \ post-extract: @${MKDIR} ${WRKSRC}/example @${MV} ${WRKSRC}/ansi-example.pl ${WRKSRC}/example - @${PERL} -pi -e '$$_="" if m|ansi-example.pl|' ${WRKSRC}/MANIFEST + @${REINPLACE_CMD} -i '' '/ansi-example.pl/d' ${WRKSRC}/MANIFEST post-install: .if !defined(NOPORTDOCS) Modified: head/textproc/p5-UML-Class-Simple/Makefile ============================================================================== --- head/textproc/p5-UML-Class-Simple/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-UML-Class-Simple/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -26,6 +26,6 @@ MAN1= umlclass.pl.1 MAN3= UML::Class::Simple.3 post-patch: - ${PERL} -pi -e '$$_="" if /auto_install/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' '/auto_install/d' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> Modified: head/textproc/p5-XML-Catalog/Makefile ============================================================================== --- head/textproc/p5-XML-Catalog/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-XML-Catalog/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: XML::Catalog -# Date created: Jan 24, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= XML-Catalog PORTVERSION= 0.02 @@ -22,10 +17,8 @@ BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSD RUN_DEPENDS:= ${BUILD_DEPENDS} PERL_CONFIGURE= yes +USE_DOS2UNIX= Catalog.pm MAN3= XML::Catalog.3 -post-patch: - ${PERL} -pi -e 's/\r//' ${WRKSRC}/Catalog.pm - .include <bsd.port.mk> Modified: head/textproc/p5-XML-DBMS/Makefile ============================================================================== --- head/textproc/p5-XML-DBMS/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-XML-DBMS/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,9 +1,5 @@ -# New ports collection makefile for: XML::DBMS -# Date created: 18 Dec 2001 -# Whom: Sergey Skvortsov <skv@protey.ru> -# +# Created by: Sergey Skvortsov <skv@protey.ru> # $FreeBSD$ -# PORTNAME= XML-DBMS PORTVERSION= 1.03 @@ -24,10 +20,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME} PERL_CONFIGURE= yes - -post-extract: - @${FIND} ${WRKSRC} -type f | \ - ${XARGS} ${PERL} -pi -e 's/\x0D(?=\x0A)//g' +USE_DOS2UNIX= yes post-install: .ifndef(NOPORTDOCS) Modified: head/textproc/p5-XML-FOAF/Makefile ============================================================================== --- head/textproc/p5-XML-FOAF/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-XML-FOAF/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,9 +1,5 @@ -# New ports collection makefile for: textproc/p5-XML-FOAF -# Date created: 2006-09-25 -# Whom: Masahiro Teramoto <markun@onohara.to> -# +# Created by: Masahiro Teramoto <markun@onohara.to> # $FreeBSD$ -# PORTNAME= XML-FOAF PORTVERSION= 0.04 @@ -26,7 +22,4 @@ PERL_CONFIGURE= yes MAN3= XML::FOAF.3 \ XML::FOAF::Person.3 -post-patch: - ${PERL} -pi -e '$$_ = "" if m|auto_install|' ${WRKSRC}/Makefile.PL - .include <bsd.port.mk> Modified: head/textproc/p5-XML-Filter-GenericChunk/Makefile ============================================================================== --- head/textproc/p5-XML-Filter-GenericChunk/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-XML-Filter-GenericChunk/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,9 +1,5 @@ -# New ports collection makefile for: XML::Filter::GenericChunk -# Date created: 2.7.2003 -# Whom: Hansjoerg Pehofer <hansjoerg.pehofer@uibk.ac.at> -# +# Created by: Hansjoerg Pehofer <hansjoerg.pehofer@uibk.ac.at> # $FreeBSD$ -# PORTNAME= XML-Filter-GenericChunk PORTVERSION= 0.07 @@ -24,9 +20,9 @@ MAN3= XML::Filter::CharacterChunk.3 \ XML::Filter::GenericChunk.3 post-patch: - ${PERL} -pi -e '$$_="" if /use warnings/;' \ - ${WRKSRC}/t/02filter.t \ - ${WRKSRC}/CharacterChunk.pm \ - ${WRKSRC}/GenericChunk.pm + @${REINPLACE_CMD} -i '' '/use warnings/d' \ + ${WRKSRC}/t/02filter.t \ + ${WRKSRC}/CharacterChunk.pm \ + ${WRKSRC}/GenericChunk.pm .include <bsd.port.mk> Modified: head/textproc/p5-XML-Handler-Trees/Makefile ============================================================================== --- head/textproc/p5-XML-Handler-Trees/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-XML-Handler-Trees/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,9 +1,5 @@ -# New ports collection makefile for: XML::Handler::Trees -# Date created: 22 Nov 2001 -# Whom: Sergey Skvortsov <skv@protey.ru> -# +# Created by: Sergey Skvortsov <skv@protey.ru> # $FreeBSD$ -# PORTNAME= XML-Handler-Trees PORTVERSION= 0.02 @@ -15,10 +11,11 @@ MAINTAINER= perl@FreeBSD.org COMMENT= PerlSAX handlers for building tree structures PERL_CONFIGURE= yes +USE_DOS2UNIX= Trees.pm MAN3= XML::Handler::Trees.3 post-extract: - @${CHMOD} +w ${WRKSRC}/Trees.pm && ${PERL} -pi -e 's|\r||' ${WRKSRC}/Trees.pm + @${CHMOD} +w ${WRKSRC}/Trees.pm .include <bsd.port.mk> Modified: head/textproc/p5-XML-SAXDriver-Sablotron/Makefile ============================================================================== --- head/textproc/p5-XML-SAXDriver-Sablotron/Makefile Fri Jul 26 11:22:07 2013 (r323713) +++ head/textproc/p5-XML-SAXDriver-Sablotron/Makefile Fri Jul 26 12:25:46 2013 (r323714) @@ -1,9 +1,5 @@ -# New ports collection makefile for: XML-SAXDriver-Sablotron -# Date created: 30 May 2002 -# Whom: Sergey Skvortsov <skv@protey.ru> -# +# Created by: Sergey Skvortsov <skv@protey.ru> # $FreeBSD$ -# PORTNAME= XML-SAXDriver-Sablotron PORTVERSION= 0.30 @@ -23,6 +19,6 @@ PERL_CONFIGURE= yes MAN3= XML::SAXDriver::Sablotron.3 pre-patch: - @${PERL} -pi -e 's!^use warnings;!!;' ${WRKSRC}/Sablotron.pm + @${REINPLACE_CMD} -i '' '/use warnings/d' ${WRKSRC}/Sablotron.pm .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307261225.r6QCPkOK020317>