From owner-svn-ports-head@FreeBSD.ORG Sat Jul 27 16:06:33 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C37DADBE; Sat, 27 Jul 2013 16:06:33 +0000 (UTC) (envelope-from az@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AEAB72AF4; Sat, 27 Jul 2013 16:06:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6RG6Xtm038224; Sat, 27 Jul 2013 16:06:33 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6RG6PoL038173; Sat, 27 Jul 2013 16:06:25 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201307271606.r6RG6PoL038173@svn.freebsd.org> From: Andrej Zverev Date: Sat, 27 Jul 2013 16:06:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323795 - in head: audio/mp32ogg audio/p5-Shout databases/p5-DBD-InterBase databases/p5-DBIx-Class-TimeStamp databases/p5-DBIx-MySQLSequence devel/cvslines devel/cvsplot devel/cvsstat d... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jul 2013 16:06:33 -0000 Author: az Date: Sat Jul 27 16:06:25 2013 New Revision: 323795 URL: http://svnweb.freebsd.org/changeset/ports/323795 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/audio/mp32ogg/Makefile (contents, props changed) head/audio/p5-Shout/Makefile (contents, props changed) head/databases/p5-DBD-InterBase/Makefile (contents, props changed) head/databases/p5-DBIx-Class-TimeStamp/Makefile (contents, props changed) head/databases/p5-DBIx-MySQLSequence/Makefile (contents, props changed) head/devel/cvslines/Makefile (contents, props changed) head/devel/cvslines/pkg-descr (contents, props changed) head/devel/cvsplot/Makefile (contents, props changed) head/devel/cvsstat/Makefile (contents, props changed) head/devel/cvsweb/Makefile (contents, props changed) head/devel/cvsweb/pkg-descr (contents, props changed) head/devel/cvsweb3/Makefile (contents, props changed) head/devel/cvsweb3/pkg-descr (contents, props changed) head/devel/hypersrc/Makefile (contents, props changed) head/devel/p4db/Makefile (contents, props changed) head/devel/p5-Class-C3-Componentised/Makefile (contents, props changed) head/devel/p5-Class-Contract/Makefile (contents, props changed) head/devel/p5-Class-Default/Makefile (contents, props changed) head/devel/p5-Config-JFDI/Makefile (contents, props changed) head/devel/p5-Devel-Diagram/Makefile (contents, props changed) head/devel/p5-Devel-Timer/Makefile (contents, props changed) head/devel/p5-Inline-Tcl/Makefile (contents, props changed) head/devel/p5-MooseX-AttributeHelpers/Makefile (contents, props changed) head/devel/p5-MooseX-SimpleConfig/Makefile (contents, props changed) head/devel/p5-Return-Value/Makefile (contents, props changed) head/ftp/p5-POE-Component-Client-FTP/Makefile (contents, props changed) head/games/atr3d/Makefile head/games/atr3d/pkg-descr (contents, props changed) head/games/falconseye/Makefile (contents, props changed) head/games/gracer/Makefile (contents, props changed) head/graphics/p5-SWF-Builder/Makefile (contents, props changed) head/graphics/p5-SWF-File/Makefile head/mail/tlb/Makefile head/math/p5-Math-Bezier-Convert/Makefile (contents, props changed) head/misc/quotes/Makefile (contents, props changed) head/net-p2p/mldonkey-perlreactor/Makefile (contents, props changed) head/net-p2p/mldonkey-urlslave/Makefile (contents, props changed) head/textproc/p5-Pod-Stripper/Makefile (contents, props changed) Modified: head/audio/mp32ogg/Makefile ============================================================================== --- head/audio/mp32ogg/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/audio/mp32ogg/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: mp32ogg -# Date created: Nov 4, 2001 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= mp32ogg PORTVERSION= 0.11 @@ -24,6 +19,8 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mp p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote USE_PERL5= yes +USES= shebangfix +SHEBANG_FILES= mp32ogg NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # @@ -32,7 +29,7 @@ NO_BUILD= yes PLIST_FILES= bin/mp32ogg post-patch: - @${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/mp32ogg + @${REINPLACE_CMD} -i '' -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mp32ogg do-install: ${INSTALL_SCRIPT} ${WRKSRC}/mp32ogg ${PREFIX}/bin Modified: head/audio/p5-Shout/Makefile ============================================================================== --- head/audio/p5-Shout/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/audio/p5-Shout/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Shout -# Date created: 18 April 2001 -# Whom: leo -# +# Created by: leo # $FreeBSD$ -# PORTNAME= Shout PORTVERSION= 2.1 @@ -23,7 +19,7 @@ MAN3= Shout.3 DOCSDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} post-patch: - @${PERL} -i -pe 's/CCFLAGS/INC/;' ${WRKSRC}/Makefile.PL + ${REINPLACE_CMD} -i '' -e 's/CCFLAGS/INC/' ${WRKSRC}/Makefile.PL post-configure: @${PERL} -i -pe '$$_ .= " ${PTHREAD_LIBS}" if /^LDDLFLAGS/;' ${WRKSRC}/Makefile Modified: head/databases/p5-DBD-InterBase/Makefile ============================================================================== --- head/databases/p5-DBD-InterBase/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/databases/p5-DBD-InterBase/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: DBD::InterBase -# Date created: 15 Oct 2001 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= DBD-InterBase PORTVERSION= 0.48 @@ -22,8 +18,8 @@ PERL_CONFIGURE= yes USE_FIREBIRD= yes post-patch: - @${PERL} -pi -e 's,%%IB_BASE%%,${LOCALBASE},g' \ - ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e 's|%%IB_BASE%%|${LOCALBASE}|' \ + ${WRKSRC}/Makefile.PL MAN3= DBD::InterBase.3 Modified: head/databases/p5-DBIx-Class-TimeStamp/Makefile ============================================================================== --- head/databases/p5-DBIx-Class-TimeStamp/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/databases/p5-DBIx-Class-TimeStamp/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: databases/p5-DBIx-Class-TimeStamp -# Date created: 28 April 2009 -# Whom: Lars Thegler -# +# Created by: Lars Thegler # $FreeBSD$ -# PORTNAME= DBIx-Class-TimeStamp PORTVERSION= 0.14 @@ -30,6 +26,6 @@ PERL_CONFIGURE= yes MAN3= DBIx::Class::TimeStamp.3 post-patch: - ${PERL} -pi -e '$$_="" if /auto_install/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' '/auto_install/d' ${WRKSRC}/Makefile.PL .include Modified: head/databases/p5-DBIx-MySQLSequence/Makefile ============================================================================== --- head/databases/p5-DBIx-MySQLSequence/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/databases/p5-DBIx-MySQLSequence/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: databases/p5-DBIx-MySQLSequence -# Date created: 18 March 2006 -# Whom: Lars Thegler -# +# Created by: Lars Thegler # $FreeBSD$ -# PORTNAME= DBIx-MySQLSequence PORTVERSION= 1.04 @@ -27,6 +23,6 @@ PERL_CONFIGURE= yes MAN3= DBIx::MySQLSequence.3 post-patch: - @${PERL} -pi -e '$$_="" if m/Test::More/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' '/Test::More/d' ${WRKSRC}/Makefile.PL .include Modified: head/devel/cvslines/Makefile ============================================================================== --- head/devel/cvslines/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/cvslines/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cvslines -# Date created: 24 Aug 1998 -# Whom: jkoshy -# +# Created by: jkoshy # $FreeBSD$ -# PORTNAME= cvslines PORTVERSION= 1.6.9 @@ -16,6 +12,8 @@ COMMENT= Wrapper to ease merging of cha WRKSRC= ${WRKDIR}/${PORTNAME} USE_PERL5= yes NO_BUILD= yes +USES= shebangfix +SHEBANG_FILES= cvslines .for ii in s s_check s-check s-commit s-config s-status PLIST_FILES+= bin/cvsline${ii} .endfor @@ -23,8 +21,7 @@ PLIST_FILES+= bin/cvsline${ii} MAN1= cvslines.1 pre-patch: - ${PERL} -pi -e "s:usr/bin/perl5:${PERL5}:g" ${WRKSRC}/cvslines - ${PERL} -pi -e "s:the the:the:g" ${WRKSRC}/cvslines.1 + @${REINPLACE_CMD} -i '' -e 's|the the|the|' ${WRKSRC}/cvslines.1 do-install: PREFIX=${PREFIX} ${PERL5} ${WRKSRC}/INSTALL ${WRKSRC}/CONFIG Modified: head/devel/cvslines/pkg-descr ============================================================================== --- head/devel/cvslines/pkg-descr Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/cvslines/pkg-descr Sat Jul 27 16:06:25 2013 (r323795) @@ -5,4 +5,4 @@ cvslines is a "wrapper" facility that he between various cvs branches, where the branches represent different lines of development. -WWW: http://cvslines.sourceforge.net/menu.html +WWW: http://cvslines.sourceforge.net/menu.html Modified: head/devel/cvsplot/Makefile ============================================================================== --- head/devel/cvsplot/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/cvsplot/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: cvsplot -# Date created: May 31, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= cvsplot PORTVERSION= 1.7.4 @@ -22,9 +17,8 @@ RUN_DEPENDS= p5-Date-Manip>=0:${PORTSDIR USE_PERL5= yes NO_BUILD= yes PLIST_FILES= bin/cvsplot - -post-patch: - @${PERL} -pi -e "s,^#!/usr/bin/perl -w,#!/usr/bin/env perl -w,g" ${WRKSRC}/cvsplot.pl +USES= shebangfix +SHEBANG_FILES= cvsplot.pl do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cvsplot.pl ${PREFIX}/bin/cvsplot Modified: head/devel/cvsstat/Makefile ============================================================================== --- head/devel/cvsstat/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/cvsstat/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cvsstat -# Date created: 27 August 2001 -# Whom: petef -# +# Created by: petef # $FreeBSD$ -# PORTNAME= cvsstat PORTVERSION= 2.24 @@ -26,7 +22,7 @@ do-extract: @${CP} -p ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC} post-patch: - @${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/cvsstat + @${REINPLACE_CMD} -i '' -e 's|perl -S|${PERL} -S|' ${WRKSRC}/cvsstat do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cvsstat ${PREFIX}/bin Modified: head/devel/cvsweb/Makefile ============================================================================== --- head/devel/cvsweb/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/cvsweb/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cvsweb -# Date created: 27 Jun 1999 -# Whom: SADA Kenji -# +# Created by: SADA Kenji # $FreeBSD$ -# PORTNAME= cvsweb PORTVERSION= 2.0.6 @@ -55,14 +51,12 @@ SUB_FILES= pkg-message SUB_LIST= PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}" post-patch: - ${PERL} -i -pe "\ - s'!!PERL!!'${PERL}'g; \ - s'!!PREFIX!!'${PREFIX}'g;" \ + @${REINPLACE_CMD} -i '' -e 's,!!PERL!!,${PERL},' \ + -e 's,!!PREFIX!!,${PREFIX},' \ ${WRKSRC}/cvsweb.cgi - ${PERL} -i -pe "\ - s'!!PREFIX!!'${PREFIX}'g; \ - s'!!CVSROOT!!'${CVSROOT}'g; \ - s'!!TITLE!!'${TITLE}'g;" \ + @${REINPLACE_CMD} -i '' -e 's,!!PREFIX!!,${PREFIX},' \ + -e 's,!!CVSROOT!!,${CVSROOT},' \ + -e 's,!!TITLE!!,${TITLE},' \ ${WRKSRC}/cvsweb.conf do-install: Modified: head/devel/cvsweb/pkg-descr ============================================================================== --- head/devel/cvsweb/pkg-descr Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/cvsweb/pkg-descr Sat Jul 27 16:06:25 2013 (r323795) @@ -11,4 +11,4 @@ brought it back to the FreeBSD community improvements. Author: The FreeBSD Project -WWW: http://www.FreeBSD.org/projects/cvsweb.html +WWW: http://www.FreeBSD.org/projects/cvsweb.html Modified: head/devel/cvsweb3/Makefile ============================================================================== --- head/devel/cvsweb3/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/cvsweb3/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cvsweb -# Date created: 27 Jun 1999 -# Whom: SADA Kenji -# +# Created by: SADA Kenji # $FreeBSD$ -# PORTNAME= cvsweb PORTVERSION= 3.0.6 @@ -79,14 +75,12 @@ SUB_FILES= pkg-message SUB_LIST= PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}" post-patch: - ${PERL} -i -pe "\ - s'!!PERL!!'${PERL}'g; \ - s'!!PREFIX!!'${PREFIX}'g;" \ + @${REINPLACE_CMD} -i '' -e 's,!!PERL!!,${PERL},' \ + -e 's,!!PREFIX!!,${PREFIX},' \ ${WRKSRC}/cvsweb.cgi - ${PERL} -i -pe "\ - s'!!PREFIX!!'${PREFIX}'g; \ - s'!!CVSROOT!!'${CVSROOT}'g; \ - s'!!TITLE!!'${TITLE}'g;" \ + @${REINPLACE_CMD} -i '' -e 's,!!PREFIX!!,${PREFIX},' \ + -e 's,!!CVSROOT!!,${CVSROOT},' \ + -e 's,!!TITLE!!,${TITLE},' \ ${WRKSRC}/cvsweb.conf do-install: Modified: head/devel/cvsweb3/pkg-descr ============================================================================== --- head/devel/cvsweb3/pkg-descr Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/cvsweb3/pkg-descr Sat Jul 27 16:06:25 2013 (r323795) @@ -11,4 +11,4 @@ brought it back to the FreeBSD community improvements. FreeBSD-CVSweb is currently maintained by Ville Skytta. Author: The FreeBSD Project -WWW: http://www.FreeBSD.org/projects/cvsweb.html +WWW: http://www.FreeBSD.org/projects/cvsweb.html Modified: head/devel/hypersrc/Makefile ============================================================================== --- head/devel/hypersrc/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/hypersrc/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: hypersrc -# Date created: Apr 9, 2001 -# Whom: Ying-Chieh Liao -# +# Created by: Ying-Chieh Liao # $FreeBSD$ -# PORTNAME= hypersrc PORTVERSION= 5.4.21 @@ -26,13 +21,15 @@ USE_GNOME= gnomelibs USE_GMAKE= yes MAKEFILE= GNUmakefile MAKE_ARGS= CC="${CC}" C_OPTIMIZE="${CFLAGS}" +USES= shebangfix +SHEBANG_FILES= Hypersrc.pl MAN1= hypersrc.1 PLIST_FILES= bin/hypersrc bin/Hypersrc.pl bin/ctags.pl post-patch: - @${PERL} -pi -e 's|"ctags"|"${LOCALBASE}/bin/exctags"|g ; \ - s|"ctags.pl"|"${PREFIX}/bin/ctags.pl"|g' ${WRKSRC}/Hypersrc.pl + @${REINPLACE_CMD} -i '' -e 's|"ctags"|"${LOCALBASE}/bin/exctags"|' \ + -e 's|"ctags.pl"|"${PREFIX}/bin/ctags.pl"|' ${WRKSRC}/Hypersrc.pl do-install: ${INSTALL_PROGRAM} ${WRKSRC}/out/hypersrc ${PREFIX}/bin Modified: head/devel/p4db/Makefile ============================================================================== --- head/devel/p4db/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p4db/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -45,12 +45,11 @@ post-extract: done post-patch: - ${PERL} -pi \ - -e 's,!!PREFIX!!,${PREFIX},g;' \ - -e 's,!!PERFORCE_USER!!,p4admin,g;' \ - -e 's,!!PERFORCE_GROUP!!,p4admin,g;' \ - -e 's,!!PERFORCE_PORT!!,${PERFORCE_PORT},g;' \ - -e 's,!!FQDN!!,${FQDN},g;' \ + @${REINPLACE_CMD} -i '' -e 's,!!PREFIX!!,${PREFIX},' \ + -e 's,!!PERFORCE_USER!!,p4admin,' \ + -e 's,!!PERFORCE_GROUP!!,p4admin,' \ + -e 's,!!PERFORCE_PORT!!,${PERFORCE_PORT},' \ + -e 's,!!FQDN!!,${FQDN},' \ ${WRKSRC}/${PORTNAME}/P4DB.conf.sample ${FIND} ${WRKSRC}/${PORTNAME} -name '*.orig' -delete Modified: head/devel/p5-Class-C3-Componentised/Makefile ============================================================================== --- head/devel/p5-Class-C3-Componentised/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-Class-C3-Componentised/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Class-C3-Componentised -# Date created: 2007-08-13 -# Whom: Lars Balker Rasmussen -# +# Created by: Lars Balker Rasmussen # $FreeBSD$ -# PORTNAME= Class-C3-Componentised PORTVERSION= 1.0009 @@ -31,6 +27,6 @@ PERL_CONFIGURE= yes MAN3= Class::C3::Componentised.3 post-extract: - @${PERL} -i.bak -ne 'print unless m,Test::,' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e '/Test::/d' ${WRKSRC}/Makefile.PL .include Modified: head/devel/p5-Class-Contract/Makefile ============================================================================== --- head/devel/p5-Class-Contract/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-Class-Contract/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Class::Contract -# Date created: 5 Nov 2001 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= Class-Contract PORTVERSION= 1.14 @@ -15,14 +11,11 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Design-by-Contract OO in Perl PERL_CONFIGURE= yes +USE_DOS2UNIX= yes PLIST_SUB+= EXAMPLESDIR="share/examples/${PORTNAME}" MAN3= Class::Contract.3 Class::Contract::Production.3 -post-patch: - @${FIND} ${WRKSRC} -type f -name "*.p[lm]" | \ - ${XARGS} ${PERL} -pi -e 's/\x0d//g;' - pre-configure: ${MKDIR} ${WRKSRC}/examples ${MV} ${WRKSRC}/demo.pl ${WRKSRC}/examples Modified: head/devel/p5-Class-Default/Makefile ============================================================================== --- head/devel/p5-Class-Default/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-Class-Default/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Class-Default -# Date created: 10 December 2002 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= Class-Default PORTVERSION= 1.51 @@ -21,7 +17,4 @@ PERL_CONFIGURE= yes MAN3= Class::Default.3 -post-patch: - @${PERL} -pi -e 's/^auto_install.*$$//' ${WRKSRC}/Makefile.PL - .include Modified: head/devel/p5-Config-JFDI/Makefile ============================================================================== --- head/devel/p5-Config-JFDI/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-Config-JFDI/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -30,7 +30,6 @@ PERL_CONFIGURE= yes MAN3= Config::JFDI.3 post-extract: - @${PERL} -i -ne 'print unless /\.swp$$/' ${WRKSRC}/MANIFEST - @${PERL} -i.bak -ne 'print unless m,^Test::,' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' '/Test::/d' ${WRKSRC}/Makefile.PL .include Modified: head/devel/p5-Devel-Diagram/Makefile ============================================================================== --- head/devel/p5-Devel-Diagram/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-Devel-Diagram/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Devel-Diagram -# Date created: 25 January 2004 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= Devel-Diagram PORTVERSION= 1.00 @@ -15,12 +11,10 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Discover the classes of an arbitrary suite of Perl modules PERL_CONFIGURE= yes +USE_DOS2UNIX= yes MAN3= Devel::Diagram.3 Devel::Diagram::Render::UXF20.3 -post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e 's/\x0d(?=\x0a)//' - post-install: .ifndef(NOPORTDOCS) @${ECHO_MSG} "===> Installing examples for ${PKGNAME}" Modified: head/devel/p5-Devel-Timer/Makefile ============================================================================== --- head/devel/p5-Devel-Timer/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-Devel-Timer/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-Devel-Timer -# Date created: 2006-12-11 -# Whom: Cory R. King -# +# Created by: Cory R. King # $FreeBSD$ -# PORTNAME= Devel-Timer PORTVERSION= 0.04 @@ -19,7 +15,4 @@ PERL_CONFIGURE= yes MAN3= Devel::Timer.3 -post-extract: - @${PERL} -pi -e '$$_ = undef if /''OPTIMIZE''/' ${WRKSRC}/Makefile.PL - .include Modified: head/devel/p5-Inline-Tcl/Makefile ============================================================================== --- head/devel/p5-Inline-Tcl/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-Inline-Tcl/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Inline::Tcl -# Date created: 14 Dec 2001 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= Inline-Tcl PORTVERSION= 0.09 @@ -25,6 +21,6 @@ CONFIGURE_ARGS= INC="-I${PREFIX}/include MAN3= Inline::Tcl.3 post-patch: - @${PERL} -pi -e '$$_="" if $$.>1 && $$.<100' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i.bak '2,99d' ${WRKSRC}/Makefile.PL .include Modified: head/devel/p5-MooseX-AttributeHelpers/Makefile ============================================================================== --- head/devel/p5-MooseX-AttributeHelpers/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-MooseX-AttributeHelpers/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: devel/p5-MooseX-AttributeHelpers -# Date created: 27 Jul 2008 -# Whom: Lars Balker Rasmussen -# +# Created by: Lars Balker Rasmussen # $FreeBSD$ -# PORTNAME= MooseX-AttributeHelpers PORTVERSION= 0.23 @@ -53,6 +49,6 @@ MAN3= MooseX::AttributeHelpers.3 \ MooseX::AttributeHelpers::Trait::String.3 post-extract: - @${PERL} -i -ne 'print unless m,build_requires,' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' '/build_requires/d' ${WRKSRC}/Makefile.PL .include Modified: head/devel/p5-MooseX-SimpleConfig/Makefile ============================================================================== --- head/devel/p5-MooseX-SimpleConfig/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-MooseX-SimpleConfig/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: devel/MooseX-SimpleConfig -# Date created: 25 February 2009 -# Whom: Lars Thegler -# +# Created by: Lars Thegler # $FreeBSD$ -# PORTNAME= MooseX-SimpleConfig PORTVERSION= 0.09 @@ -24,6 +20,7 @@ PERL_CONFIGURE= yes MAN3= MooseX::SimpleConfig.3 post-patch: - @${PERL} -pi -e '$$_="" if m/Test::More|auto_install/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e '/auto_install/d' -e '/Test::More/d' \ + ${WRKSRC}/Makefile.PL .include Modified: head/devel/p5-Return-Value/Makefile ============================================================================== --- head/devel/p5-Return-Value/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/devel/p5-Return-Value/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -17,6 +17,6 @@ PERL_CONFIGURE= yes MAN3= Return::Value.3 post-patch: - ${PERL} -pi -e 's/^Carp::cluck/# Carp::cluck/' ${WRKSRC}/lib/Return/Value.pm + @${REINPLACE_CMD} -i '' -e 's/^Carp::cluck/# Carp::cluck/' ${WRKSRC}/lib/Return/Value.pm .include Modified: head/ftp/p5-POE-Component-Client-FTP/Makefile ============================================================================== --- head/ftp/p5-POE-Component-Client-FTP/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/ftp/p5-POE-Component-Client-FTP/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: POE-Component-Client-FTP -# Date created: 17 March 2002 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= POE-Component-Client-FTP PORTVERSION= 0.22 @@ -22,10 +18,6 @@ CONFIGURE_ENV= PERL_MM_USE_DEFAULT=yes MAN3= POE::Component::Client::FTP.3 -post-patch: - @${PERL} -pi -e '$$_="" if /^use warnings/; s/\x0d(?=\x0a)//;' \ - ${WRKSRC}/FTP.pm - post-install: .ifndef(NOPORTDOCS) @${ECHO_MSG} "===> Installing examples for ${PKGNAME}" Modified: head/games/atr3d/Makefile ============================================================================== --- head/games/atr3d/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/games/atr3d/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: atr3d -# Date created: 11 Jun 2003 -# Whom: Kirill Ponomarew -# +# Created by: Kirill Ponomarew # $FreeBSD$ -# PORTNAME= atr3d PORTVERSION= 0.6 @@ -44,8 +40,9 @@ CONFIGURE_ARGS+= --disable-sound .endif pre-patch: - @${PERL} -pi.orig -e 's|^aclocal|${ACLOCAL}|; \ - s|^autoconf|${AUTOCONF}|; s|^automake|${AUTOMAKE}|' \ + @${REINPLACE_CMD} -i '' -e 's|^aclocal|${ACLOCAL}|' \ + -e 's|^autoconf|${AUTOCONF}|' \ + -e 's|^automake|${AUTOMAKE}|' \ ${WRKSRC}/autogen.sh @${REINPLACE_CMD} -e 's|-lopenal|& -lalut|' ${WRKSRC}/Makefile.am Modified: head/games/atr3d/pkg-descr ============================================================================== --- head/games/atr3d/pkg-descr Sat Jul 27 16:06:01 2013 (r323794) +++ head/games/atr3d/pkg-descr Sat Jul 27 16:06:25 2013 (r323795) @@ -2,4 +2,3 @@ Avoid The Roid 3D is a 3D asteroids-like player flies around in a three dimensional space, shooting asteroids and other ships while trying to avoid running into any of them or being shot. - Modified: head/games/falconseye/Makefile ============================================================================== --- head/games/falconseye/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/games/falconseye/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -26,7 +26,7 @@ NO_WRKSUBDIR= yes MAKE_JOBS_UNSAFE= yes post-patch: - @${PERL} -pi -e "s@@@g" \ + @${REINPLACE_CMD} -i '' -e "s|||" \ ${WRKSRC}/include/jtp_gen.h ${WRKSRC}/win/jtp/jtp_dirx.c \ ${WRKSRC}/win/jtp/jtp_keys.c ${WRKSRC}/win/jtp/jtp_sdl.c \ ${WRKSRC}/win/Qt/qt_win.cpp Modified: head/games/gracer/Makefile ============================================================================== --- head/games/gracer/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/games/gracer/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gracer -# Date created: Fri Jul 30 20:50:16 MET DST 1999 -# Whom: nox@jelal.kn-bremen.de -# +# Created by: nox@jelal.kn-bremen.de # $FreeBSD$ -# PORTNAME= gracer PORTVERSION= 0.1.5 @@ -36,7 +32,7 @@ MAN6= gracer.6 .include pre-patch: - @${PERL} -pi -e 's,,,' \ + @${REINPLACE_CMD} -i '' -e 's|||' \ ${WRKSRC}/common/gr_memory.h .include Modified: head/graphics/p5-SWF-Builder/Makefile ============================================================================== --- head/graphics/p5-SWF-Builder/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/graphics/p5-SWF-Builder/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: SWF-Builder -# Date created: 25 December 2003 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= SWF-Builder PORTVERSION= 0.16 @@ -20,6 +16,7 @@ BUILD_DEPENDS= p5-SWF-File>=0:${PORTSDIR RUN_DEPENDS:= ${BUILD_DEPENDS} PERL_CONFIGURE= yes +USE_DOS2UNIX= yes MAN3= SWF::Builder.3 SWF::Builder::ActionScript.3 \ SWF::Builder::Character::Bitmap.3 \ @@ -31,10 +28,6 @@ MAN3= SWF::Builder.3 SWF::Builder::Acti SWF::Builder::Character::Text.3 SWF::Builder::Gradient.3 MAN1= asc.plx.1 -post-patch: - @${FIND} ${WRKSRC} -type f |\ - ${XARGS} ${PERL} -pi -e 's/\x0d(?=\x0a)//' - post-configure: @${PERL} -pi -e 's/^(POD2MAN_EXE.*)$$/\1 --lax/;' ${WRKSRC}/Makefile Modified: head/graphics/p5-SWF-File/Makefile ============================================================================== --- head/graphics/p5-SWF-File/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/graphics/p5-SWF-File/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: SWF-File -# Date created: 20 May 2003 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= SWF-File PORTVERSION= 0.42 @@ -20,15 +16,12 @@ RUN_DEPENDS= p5-Data-TemporaryBag>=0:${P BUILD_DEPENDS= p5-Data-TemporaryBag>=0:${PORTSDIR}/devel/p5-Data-TemporaryBag PERL_CONFIGURE= yes +USE_DOS2UNIX= yes MAN3= SWF::BinStream.3 SWF::BinStream::Codec.3 \ SWF::BinStream::Codec::Zlib.3 SWF::BinStream::File.3 \ SWF::Element.3 SWF::File.3 SWF::Parser.3 -post-patch: - @${FIND} ${WRKSRC} -type f |\ - ${XARGS} ${PERL} -pi -e 's/\x0d(?=\x0a)//' - post-configure: @${PERL} -pi -e 's/^(POD2MAN_EXE.*)$$/\1 --lax/;' ${WRKSRC}/Makefile Modified: head/mail/tlb/Makefile ============================================================================== --- head/mail/tlb/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/mail/tlb/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -29,7 +29,7 @@ perl_OLD_CMD= /usr/local/bin/perl5 pre-patch: .for f in ${FIXPREFIX} - @${PERL} -pi -e "s@/usr/lib/sendmail@/usr/sbin/sendmail@g" ${WRKSRC}/${f} + @${REINPLACE_CMD} -i '' -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' ${WRKSRC}/${f} .endfor do-install: Modified: head/math/p5-Math-Bezier-Convert/Makefile ============================================================================== --- head/math/p5-Math-Bezier-Convert/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/math/p5-Math-Bezier-Convert/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Math-Bezier-Convert -# Date created: 07 February 2005 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= Math-Bezier-Convert PORTVERSION= 0.02 @@ -15,12 +11,10 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Convert cubic and quadratic Bezier each other PERL_CONFIGURE= yes +USE_DOS2UNIX= yes MAN3= Math::Bezier::Convert.3 -post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e 's/\x0d(?=\x0a)//' - post-configure: @${PERL} -pi -e 's/^(POD2MAN_EXE.*)$$/\1 --lax/;' ${WRKSRC}/Makefile Modified: head/misc/quotes/Makefile ============================================================================== --- head/misc/quotes/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/misc/quotes/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -14,15 +14,14 @@ COMMENT= Quote, currency, and Slashdot h NO_BUILD= yes USE_PERL5= yes +USES= shebangfix +SHEBANG_FILES= quotes quotesmailer QuExample.pm .include post-patch: - @ ${PERL} -pi -e "s:/usr/bin/perl:${PERL}:g" ${WRKSRC}/quotes - @ ${PERL} -pi -e "s:/usr/local/lib/Quotes:${PREFIX}/etc:g" ${WRKSRC}/quotes - @ ${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/quotes - @ ${PERL} -pi -e "s:/usr/bin/perl:${PERL}:g" ${WRKSRC}/quotesmailer - @ ${PERL} -pi -e "s:/usr/bin/perl:${PERL}:g" ${WRKSRC}/QuExample.pm + @${REINPLACE_CMD} -i '' -e "s:/usr/local/lib/Quotes:${PREFIX}/etc:" \ + -e "s:/usr/local:${PREFIX}:" ${WRKSRC}/quotes do-install: @ ${INSTALL_SCRIPT} ${WRKSRC}/quotes ${PREFIX}/bin Modified: head/net-p2p/mldonkey-perlreactor/Makefile ============================================================================== --- head/net-p2p/mldonkey-perlreactor/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/net-p2p/mldonkey-perlreactor/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mldonkey perlreactor -# Date created: Sat Feb 23 13:13:08 BRT 2002 -# Whom: Mario Sergio Fujikawa Ferreira -# +# Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ -# PORTNAME= mldonkey PORTVERSION= 0.2 @@ -20,13 +16,13 @@ BUILD_DEPENDS= p5-libwww>=0:${PORTSDIR}/ USE_PERL5= yes NO_BUILD= yes NO_WRKSUBDIR= yes +USES= shebangfix +SHEBANG_FILES$=${BINARY_NAME} BINARY_NAME= perlreactor post-patch: - @${PERL} -pi -e 's|#!/usr/bin/perl\n||; \ - s|/usr/local/bin/perl|${PERL}|' \ - ${WRKSRC}/${BINARY_NAME} + @${REINPLACE_CMD} -i '' -e '1d' ${WRKSRC}/${BINARY_NAME} do-install: .ifndef(NOPORTDOCS) Modified: head/net-p2p/mldonkey-urlslave/Makefile ============================================================================== --- head/net-p2p/mldonkey-urlslave/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/net-p2p/mldonkey-urlslave/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mldonkey link submitter -# Date created: Fri Feb 21 14:11:00 UTC 2003 -# Whom: Mario Sergio Fujikawa Ferreira -# +# Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ -# PORTNAME= mldonkey PORTVERSION= 0.0.1 @@ -20,15 +16,14 @@ BUILD_DEPENDS= p5-Gtk>=0:${PORTSDIR}/x11 USE_PERL5= yes NO_BUILD= yes +USES= shebangfix +SHEBANG_FILES= ${BINARY_NAME} BINARY_NAME= mlurlslave post-extract: @${GREP} '^#' ${WRKSRC}/${BINARY_NAME} | ${GREP} -v '/usr/bin/perl' > ${WRKDIR}/README -post-patch: - @${PERL} -pi -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/${BINARY_NAME} - do-install: .ifndef(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} Modified: head/textproc/p5-Pod-Stripper/Makefile ============================================================================== --- head/textproc/p5-Pod-Stripper/Makefile Sat Jul 27 16:06:01 2013 (r323794) +++ head/textproc/p5-Pod-Stripper/Makefile Sat Jul 27 16:06:25 2013 (r323795) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Pod-Stripper -# Date created: 18 November 2003 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= Pod-Stripper PORTVERSION= 0.22 @@ -16,11 +12,9 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Strip all pod, and output what's left PERL_CONFIGURE= yes +USE_DOS2UNIX= yes MAN1= podstrip.1 MAN3= Pod::Stripper.3 -post-patch: - @${FIND} ${WRKSRC} -type f|${XARGS} ${PERL} -pi -e 's/\x0d(?=\x0a)//;' - .include