svn commit: r323680 - in head: ftp/profxp games/3dc games/p5-Games-Bingo games/pengpong games/ttraffic games/zangband graphics/cadubi graphics/gtkgraph graphics/p5-GD-Graph3d graphics/p5-Image-IPTC...
Andrej Zverev
az at FreeBSD.org
Fri Jul 26 05:33:55 UTC 2013
Author: az
Date: Fri Jul 26 05:33:51 2013
New Revision: 323680
URL: http://svnweb.freebsd.org/changeset/ports/323680
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/ftp/profxp/Makefile (contents, props changed)
head/games/3dc/Makefile (contents, props changed)
head/games/p5-Games-Bingo/Makefile (contents, props changed)
head/games/pengpong/Makefile (contents, props changed)
head/games/ttraffic/Makefile (contents, props changed)
head/games/zangband/Makefile (contents, props changed)
head/graphics/cadubi/Makefile (contents, props changed)
head/graphics/gtkgraph/Makefile
head/graphics/p5-GD-Graph3d/Makefile (contents, props changed)
head/graphics/p5-Image-IPTCInfo/Makefile (contents, props changed)
head/mail/p5-Mail-Audit/Makefile (contents, props changed)
head/mail/p5-Mail-DomainKeys/Makefile (contents, props changed)
head/mail/p5-Mail-Sender/Makefile (contents, props changed)
head/mail/premail/Makefile (contents, props changed)
Modified: head/ftp/profxp/Makefile
==============================================================================
--- head/ftp/profxp/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/ftp/profxp/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for: profxp
-# Date created: Jun 1, 2001
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= profxp
PORTVERSION= 3p2
@@ -24,9 +19,12 @@ RUN_DEPENDS= p5-SOCKS>=0:${PORTSDIR}/net
WRKSRC= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
+USES= shebangfix
+SHEBANG_FILES= profxpv3.pl
+perl_OLD_CMD= /home/tom/ActivePerl-5.6/bin/perl
-post-patch:
- @${PERL} -pi -e "s,^#!.*,#!${PERL},g" ${WRKSRC}/profxpv3.pl
+post-patch1:
+ @${REINPLACE_CMD} -i '' '1s|^\#.*|#!${PERL}|' ${WRKSRC}/profxpv3.pl
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/profxpv3.pl ${PREFIX}/bin/profxp
Modified: head/games/3dc/Makefile
==============================================================================
--- head/games/3dc/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/games/3dc/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -22,7 +22,8 @@ WRKSRC= ${WRKDIR}/3Dc/src
post-patch:
.for file in init.c main.c piece.c stack.c xif.c
- @${PERL} -pi -e "s/malloc.h/stdlib.h/g" ${WRKSRC}/${file}
+ @${REINPLACE_CMD} -i '' -e 's|malloc.h|stdlib.h|' \
+ ${WRKSRC}/${file}
.endfor
do-install:
Modified: head/games/p5-Games-Bingo/Makefile
==============================================================================
--- head/games/p5-Games-Bingo/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/games/p5-Games-Bingo/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: p5-Games-Bingo
-# Date created: 14. August 2003
-# Whom: Lars Thegler <lars at thegler.dk>
-#
+# Created by: Lars Thegler <lars at thegler.dk>
# $FreeBSD$
-#
PORTNAME= Games-Bingo
PORTVERSION= 0.15
@@ -26,6 +22,6 @@ MAN3= Games::Bingo.3 \
.include <bsd.port.pre.mk>
post-patch:
- @${PERL} -pi -e '$$_="" if m|Test::|' ${WRKSRC}/Build.PL
+ @${REINPLACE_CMD} -i '' '/Test::/d' ${WRKSRC}/Build.PL
.include <bsd.port.post.mk>
Modified: head/games/pengpong/Makefile
==============================================================================
--- head/games/pengpong/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/games/pengpong/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pengpong
-# Date created: Fri Aug 24 18:21:25 EDT 2001
-# Whom: Patrick Li <pat at databits.net>
-#
+# Created by: Patrick Li <pat at databits.net>
# $FreeBSD$
-#
PORTNAME= pengpong
PORTVERSION= 0.3
@@ -22,11 +18,9 @@ DATAFILES= 24P_Copperplate_Blue.png ball
paddle.tga red.png
pre-patch:
- @${PERL} -pi.orig -e \
- 's|/usr/local/share/games/pengpong|${DATADIR}|' \
+ @${REINPLACE_CMD} -i '' -e 's|/usr/local/share/games/pengpong|${DATADIR}|' \
${WRKSRC}/files.h
- @${PERL} -pi.orig -e 's|0.2|${PORTVERSION}|' \
- ${WRKSRC}/pengpong.cpp
+ @${REINPLACE_CMD} -i '' -e 's|V 0.2|V ${PORTVERSION}|' ${WRKSRC}/pengpong.cpp
do-install:
.ifndef(NOPORTDOCS)
Modified: head/games/ttraffic/Makefile
==============================================================================
--- head/games/ttraffic/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/games/ttraffic/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: games/ttraffic
-# Date created: 14 November 2001
-# Whom: Anton Berezin <tobez at FreeBSD.org>
-#
+# Created by: Anton Berezin <tobez at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= ttraffic
PORTVERSION= 0.8
@@ -20,11 +16,16 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-too
NO_BUILD= yes
USE_PERL5_BUILD=yes
+USES= shebangfix
+SHEBANG_FILES= ttraffic.tcl
+SHEBANG_LANG= wish
+wish_OLD_CMD= /usr/bin/wish
+wish_CMD= ${LOCALBASE}/bin/wish8.4
post-patch:
- ${PERL} -pi -e 's|/usr/local/share/ttraffic/|${DATADIR}/|g;' \
- -e 's|#!/usr/bin/wish|#!${LOCALBASE}/bin/wish8.4|g' \
+ @${REINPLACE_CMD} -i '' -e 's|/usr/local/share/ttraffic/|${DATADIR}/|' \
${WRKSRC}/ttraffic.tcl
+
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/ttraffic.tcl ${PREFIX}/bin/ttraffic
${MKDIR} ${DATADIR}
Modified: head/games/zangband/Makefile
==============================================================================
--- head/games/zangband/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/games/zangband/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: zangband
-# Date created: 29 May 2000
-# Whom: Makoto YAMAKURA <makoto at pinpott.spnet.ne.jp>
-#
+# Created by: Makoto YAMAKURA <makoto at pinpott.spnet.ne.jp>
# $FreeBSD$
-#
PORTNAME= zangband
PORTVERSION= 2.6.2
@@ -38,10 +34,11 @@ ANGBANDLIB?= lib/${PORTNAME}
ANGBANDBIN?= bin/${PORTNAME}
pre-patch:
- @${PERL} -pi.orig -e 's|^aclocal|${ACLOCAL}|; \
- s|^autoheader|${AUTOHEADER}|; \
- s|^automake|${AUTOMAKE}|; s|^autoconf|${AUTOCONF}|' \
- ${WRKSRC}/bootstrap
+ @${REINPLACE_CMD} -i '' -e 's|^aclocal|${ACLOCAL}|' \
+ -e 's|^autoheader|${AUTOHEADER}|' \
+ -e 's|^automake|${AUTOMAKE}|' \
+ -e 's|^autoconf|${AUTOCONF}|' \
+ ${WRKSRC}/bootstrap
pre-configure:
(cd ${WRKSRC} ; ${SH} bootstrap)
Modified: head/graphics/cadubi/Makefile
==============================================================================
--- head/graphics/cadubi/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/graphics/cadubi/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -25,8 +25,8 @@ PORTDOCS= *
.include <bsd.port.options.mk>
do-configure:
- @${PERL} -pi -e \
- 's|Bin/help|Bin/../share/cadubi/help|g' ${WRKSRC}/cadubi
+ @${REINPLACE_CMD} -i '' -e 's|Bin/help|Bin/../share/cadubi/help|' \
+ ${WRKSRC}/cadubi
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
Modified: head/graphics/gtkgraph/Makefile
==============================================================================
--- head/graphics/gtkgraph/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/graphics/gtkgraph/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gtkgraph
-# Date created: 12 October 1999
-# Whom: Chris D. Faulhaber <jedgar at fxp.org>
-#
+# Created by: Chris D. Faulhaber <jedgar at fxp.org>
# $FreeBSD$
-#
PORTNAME= gtkgraph
PORTVERSION= 0.6.1
@@ -24,7 +20,7 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; s|-O2|${CFLAGS}| ; \
+ @${REINPLACE_CMD} -i '' -e 's|-O2|${CFLAGS}| ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
.include <bsd.port.mk>
Modified: head/graphics/p5-GD-Graph3d/Makefile
==============================================================================
--- head/graphics/p5-GD-Graph3d/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/graphics/p5-GD-Graph3d/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: p5-GD-Graph
-# Date created: 10 April 2000
-# Whom: Dmitry Sivachenko <dima at Chg.RU>
-#
+# Created by: Dmitry Sivachenko <dima at Chg.RU>
# $FreeBSD$
-#
PORTNAME= GD-Graph3d
PORTVERSION= 0.63
@@ -19,11 +15,8 @@ BUILD_DEPENDS= p5-GD-Graph>=0:${PORTSDIR
RUN_DEPENDS:= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
+USE_DOS2UNIX= lib/GD/Graph3d.pm # pod2man doesn't work without this
MAN3= GD::Graph3d.3
-post-patch:
-# pod2man doesn't work without this
- ${PERL} -pi -e 's/\r//' ${WRKSRC}/lib/GD/Graph3d.pm
-
.include <bsd.port.mk>
Modified: head/graphics/p5-Image-IPTCInfo/Makefile
==============================================================================
--- head/graphics/p5-Image-IPTCInfo/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/graphics/p5-Image-IPTCInfo/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: p5-Image-IPTCInfo
-# Date created: 2006-08-11
-# Whom: Gea-Suan Lin <gslin at gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin at gslin.org>
# $FreeBSD$
-#
PORTNAME= Image-IPTCInfo
PORTVERSION= 1.95
@@ -15,12 +11,13 @@ MAINTAINER= perl at FreeBSD.org
COMMENT= Perl extension for extracting IPTC image meta-data
PERL_CONFIGURE= yes
+USES= shebangfix
+SHEBANG_FILES= demo.pl
MAN3= Image::IPTCInfo.3
post-patch:
- ${RM} -f ${WRKSRC}/._*
- ${PERL} -pi -e 's,/usr/bin/perl,${PERL},' ${WRKSRC}/demo.pl
+ @${RM} -f ${WRKSRC}/._*
.if !defined(NOPORTDOCS)
post-install:
Modified: head/mail/p5-Mail-Audit/Makefile
==============================================================================
--- head/mail/p5-Mail-Audit/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/mail/p5-Mail-Audit/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Mail-Audit
-# Date created: Wed Jan 3 12:31:10 2001
-# Whom: will
-#
+# Created by: will
# $FreeBSD$
-#
PORTNAME= Mail-Audit
PORTVERSION= 2.2.27
@@ -37,7 +33,8 @@ PORTDOCS= Changes FAQ README
PORTEXAMPLES= popread proc2ma
post-patch:
- @${PERL} -pi -e 's,/var/spool/mail,/var/mail,g' ${WRKSRC}/lib/Mail/Audit.pm
+ @${REINPLACE_CMD} -i '' -e 's|/var/spool/mail|/var/mail|g' \
+ ${WRKSRC}/lib/Mail/Audit.pm
post-install:
.if !defined(NOPORTDOCS)
Modified: head/mail/p5-Mail-DomainKeys/Makefile
==============================================================================
--- head/mail/p5-Mail-DomainKeys/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/mail/p5-Mail-DomainKeys/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Mail-DomainKeys
-# Date created: 23 May 2005
-# Whom: Sergey Skvortsov <skv at protey.ru>
-#
+# Created by: Sergey Skvortsov <skv at protey.ru>
# $FreeBSD$
-#
PORTNAME= Mail-DomainKeys
PORTVERSION= 1.0
@@ -25,6 +21,6 @@ PERL_CONFIGURE= yes
MAN3= Mail::DomainKeys.3
post-patch:
- @${PERL} -pi -e '$$_="" if $$.>=6 && $$.<=38' ${WRKSRC}/Makefile.PL
+ @${REINPLACE_CMD} -i '' '6,38d' ${WRKSRC}/Makefile.PL
.include <bsd.port.mk>
Modified: head/mail/p5-Mail-Sender/Makefile
==============================================================================
--- head/mail/p5-Mail-Sender/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/mail/p5-Mail-Sender/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -16,7 +16,7 @@ MAN3= Mail::Sender.3
post-patch:
.if defined(BATCH)
- @${PERL} -pi -e 's/res = <STDIN>;/res = "N";/' ${WRKSRC}/Config.PL
+ @${REINPLACE_CMD} -e 's/res = <STDIN>;/res = "N";/' ${WRKSRC}/Config.PL
.endif
.include <bsd.port.mk>
Modified: head/mail/premail/Makefile
==============================================================================
--- head/mail/premail/Makefile Fri Jul 26 05:27:28 2013 (r323679)
+++ head/mail/premail/Makefile Fri Jul 26 05:33:51 2013 (r323680)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: premail
-# Date created: 31 Jan 1997
-# Whom: ache
-#
+# Created by: ache
# $FreeBSD$
-#
PORTNAME= premail
PORTVERSION= 0.46
@@ -20,11 +16,8 @@ BUILD_DEPENDS+= pgp:${PORTSDIR}/security
WRKSRC= ${WRKDIR}/premail
USE_PERL5= yes
NO_BUILD= yes
-
-post-patch:
- cd ${WRKSRC}; \
- ${CP} premail premail.old; \
- ${SED} 's=#!/usr/local/bin/perl=#!${PERL} -w=' < premail.old > premail
+USES= shebangfix
+SHEBANG_FILES= premail
do-install:
cd ${WRKSRC} && ${INSTALL_SCRIPT} premail ${PREFIX}/bin
More information about the svn-ports-head
mailing list