svn commit: r323702 - in head: graphics/pvmpov graphics/springgraph graphics/xmandel irc/xchat1 japanese/tkhonyaku korean/eterm mail/mailagent mail/mb2md mail/spamstats mail/tlb math/algotutor math...
Andrej Zverev
az at FreeBSD.org
Fri Jul 26 07:33:46 UTC 2013
Author: az
Date: Fri Jul 26 07:33:41 2013
New Revision: 323702
URL: http://svnweb.freebsd.org/changeset/ports/323702
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/graphics/pvmpov/Makefile (contents, props changed)
head/graphics/springgraph/Makefile (contents, props changed)
head/graphics/xmandel/Makefile (contents, props changed)
head/irc/xchat1/Makefile
head/japanese/tkhonyaku/Makefile (contents, props changed)
head/korean/eterm/Makefile (contents, props changed)
head/mail/mailagent/Makefile
head/mail/mb2md/Makefile (contents, props changed)
head/mail/spamstats/Makefile (contents, props changed)
head/mail/tlb/Makefile (contents, props changed)
head/math/algotutor/Makefile
head/math/naturalmath/Makefile (contents, props changed)
head/math/p5-Set-Window/Makefile (contents, props changed)
head/misc/chord2html/Makefile (contents, props changed)
head/misc/explosions/Makefile (contents, props changed)
head/misc/p5-Array-IntSpan/Makefile (contents, props changed)
head/misc/qlas/Makefile (contents, props changed)
head/net-p2p/torrentsniff/Makefile
head/net/ip6_int/Makefile (contents, props changed)
Modified: head/graphics/pvmpov/Makefile
==============================================================================
--- head/graphics/pvmpov/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/graphics/pvmpov/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pvmpov
-# Date created: 22 March 2000
-# Whom: Maxim Sobolev <sobomax at FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= pvmpov
PORTVERSION= 3.1g.2
@@ -41,7 +37,7 @@ pre-configure:
${TAR} -c -f - povray31 ) \
| (cd ${WRKSRC} && ${TAR} --unlink -x -f -)
@ cd ${WRKSRC} && ${PATCH} -p0 -s < pvmpov.patch
- @ ${PERL} -pi -e "s|%LOCALBASE%|${LOCALBASE}|" \
+ @${REINPLACE_CMD} -i '' -e 's|%LOCALBASE%|${LOCALBASE}|' \
${BUILDBASE}/Makefile.aimk
do-build:
Modified: head/graphics/springgraph/Makefile
==============================================================================
--- head/graphics/springgraph/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/graphics/springgraph/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: springgraph
-# Date created: Aug 8, 2002
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= springgraph
PORTVERSION= 0.88
@@ -28,9 +23,8 @@ EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= ${WRKDIR}
NO_WRKSUBDIR= yes
NO_BUILD= yes
-
-post-patch:
- @${PERL} -pi -e "s|/usr/bin/perl|${PERL}|g" ${WRKSRC}/springgraph.pl
+USES= shebangfix
+SHEBANG_FILES= springgraph.pl
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/springgraph.pl ${PREFIX}/bin/springgraph
Modified: head/graphics/xmandel/Makefile
==============================================================================
--- head/graphics/xmandel/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/graphics/xmandel/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -25,6 +25,6 @@ MAN1= xmandel.1
PLIST_FILES= bin/xmandel
pre-patch:
- @${PERL} -pi.orig -e 's|malloc.h|stdlib.h|' ${WRKSRC}/mandel.c
+ @${REINPLACE_CMD} -i '' -e 's|malloc.h|stdlib.h|' ${WRKSRC}/mandel.c
.include <bsd.port.mk>
Modified: head/irc/xchat1/Makefile
==============================================================================
--- head/irc/xchat1/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/irc/xchat1/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xchat
-# Date created: 17 Nov 1998
-# Whom: Jim Mock <jim at FreeBSD.org>
-#
+# Created by: Jim Mock <jim at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= xchat
PORTVERSION= 1.8.11
@@ -66,8 +62,7 @@ CONFIGURE_ARGS+= --disable-gnome --disab
.endif
post-patch:
- @${PERL} -pi \
- -e 's|-lpthread|${PTHREAD_LIBS}|g;' \
+ @${REINPLACE_CMD} -i '' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/configure
post-install:
Modified: head/japanese/tkhonyaku/Makefile
==============================================================================
--- head/japanese/tkhonyaku/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/japanese/tkhonyaku/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: tkhonyaku
-# Date created: 10 July 2000
-# Whom: Daichi GOTO
-#
+# Created by: Daichi GOTO
# $FreeBSD$
-#
PORTNAME= tkhonyaku
PORTVERSION= 1.8
@@ -22,7 +18,7 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
post-patch:
- ${PERL} -i -pe 's,/usr/local/tkhonyaku,${PREFIX}/tkhonyaku,g' \
+ @${REINPLACE_CMD} -i '' -e 's|/usr/local/tkhonyaku|${PREFIX}/tkhonyaku|g' \
${WRKSRC}/tkhonyaku ${WRKSRC}/tkhonyaku-readme
do-install:
Modified: head/korean/eterm/Makefile
==============================================================================
--- head/korean/eterm/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/korean/eterm/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ko-eterm-0.8.9
-# Date created: 8 Jun 1999
-# Whom: Oh Junseon <hollywar at mail.holywar.net>
-#
+# Created by: Oh Junseon <hollywar at mail.holywar.net>
# $FreeBSD$
-#
PORTNAME= eterm
PORTVERSION= 0.8.9
@@ -36,7 +32,7 @@ BROKEN= fails to build with new utmpx
.endif
pre-patch:
- @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+ @${REINPLACE_CMD} -i '' -e 's|<malloc.h>|<stdlib.h>|' \
${WRKSRC}/libmej/debug.c ${WRKSRC}/libmej/strings.c
post-install:
Modified: head/mail/mailagent/Makefile
==============================================================================
--- head/mail/mailagent/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/mail/mailagent/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -47,8 +47,7 @@ pre-extract:
post-patch:
@(cd ${WRKSRC}; \
- ${PERL} -pi.bak \
- -e 's|exec perl -S|exec ${PERL} -S|' \
+ ${REINPLACE_CMD} -i '' -e 's|exec perl -S|exec ${PERL} -S|' \
agent/edusers.SH agent/magent.sh agent/maildist.SH \
agent/mailhelp.SH agent/maillist.SH agent/mailpatch.SH \
agent/package.SH agent/test/TEST agent/test/atail \
Modified: head/mail/mb2md/Makefile
==============================================================================
--- head/mail/mb2md/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/mail/mb2md/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -21,12 +21,11 @@ EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNA
NO_WRKSUBDIR= yes
NO_BUILD= yes
USE_PERL5= yes
+USES= shebangfix
+SHEBANG_FILES= mb2md
PLIST_FILES= bin/mb2md
-post-patch:
- @${PERL} -pi -e 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/${PORTNAME}
-
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
Modified: head/mail/spamstats/Makefile
==============================================================================
--- head/mail/spamstats/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/mail/spamstats/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -19,9 +19,12 @@ USE_PERL5= yes
NO_BUILD= yes
PORTDOCS= QUICK README copyright
PLIST_FILES= bin/spamstats.pl
+USES= shebangfix
+SHEBANG_FILES= ${PORTNAME}${PORTVERSION}.pl
post-patch:
- @${PERL} -pi.bak -e 's,/mail.log,/maillog,g' ${WRKSRC}/${PORTNAME}${PORTVERSION}.pl
+ @${REINPLACE_CMD} -i '' -e 's|mail.log|maillog|g' \
+ ${WRKSRC}/${PORTNAME}${PORTVERSION}.pl
.include <bsd.port.options.mk>
Modified: head/mail/tlb/Makefile
==============================================================================
--- head/mail/tlb/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/mail/tlb/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: tlb
-# Date created: 01 July 2001
-# Whom: Anders Nordby <anders at fix.no>
-#
+# Created by: Anders Nordby <anders at fix.no>
# $FreeBSD$
-#
PORTNAME= tlb
PORTVERSION= 0.11a
@@ -27,10 +23,13 @@ DOCS= FAQ INSTALL README README.loglevel
complete.tlb mj.tlb simple.tlb
FIXPREFIX= tlb mungelist complete.tlb mj.tlb simple.tlb
+USES= shebangfix
+SHEBANG_FILES= ${FIXPREFIX}
+perl_OLD_CMD= /usr/local/bin/perl5
+
pre-patch:
.for f in ${FIXPREFIX}
- ${PERL} -pi -e "s@^#!/usr/local/bin/perl5@#!${PERL}@g;\
- s@/usr/lib/sendmail@/usr/sbin/sendmail at g" ${WRKSRC}/${f}
+ @${PERL} -pi -e "s@/usr/lib/sendmail@/usr/sbin/sendmail at g" ${WRKSRC}/${f}
.endfor
do-install:
Modified: head/math/algotutor/Makefile
==============================================================================
--- head/math/algotutor/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/math/algotutor/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -23,11 +23,13 @@ LIBFILES= BST.pm Board.pm Collection.pm
RecCanvas.pm RecDialog.pm TreeNode.pm Vector.pm Vector2.pm \
Vector3.pm Vertex.pm basic.pl utilalgo
+USES= shebangfix
+SHEBANG_FILES= algotutor
+
post-patch:
- ${REINPLACE_CMD} -e 's,#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/algotutor
- ${PERL} -pi -e "s'!!PREFIX!!'${PREFIX}'g" ${WRKSRC}/algotutor
- ${REINPLACE_CMD} -e 's,!!SITE_PERL!!,${SITE_PERL},' \
- ${WRKSRC}/algotutor
+ @${REINPLACE_CMD} -e 's,!!SITE_PERL!!,${SITE_PERL},' \
+ -e 's|!!PREFIX!!|${PREFIX}|g' \
+ ${WRKSRC}/algotutor
do-install:
${MKDIR} ${SITE_PERL}/algotutor
Modified: head/math/naturalmath/Makefile
==============================================================================
--- head/math/naturalmath/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/math/naturalmath/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: naturalmath
-# Date created: 1 November 2001
-# Whom: Stephen Montgomery-Smith
-#
+# Created by: Stephen Montgomery-Smith
# $FreeBSD$
-#
PORTNAME= naturalmath
PORTVERSION= 0.5
@@ -16,9 +12,8 @@ COMMENT= Script to turn intuitively writ
USE_PERL5= yes
USE_TEX= latex:build dvipsk:build
-
-post-patch:
- @${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/naturalmath
+USES= shebangfix
+SHEBANG_FILES= naturalmath
do-build:
(cd ${WRKSRC}; ./naturalmath tutor.nat; \
Modified: head/math/p5-Set-Window/Makefile
==============================================================================
--- head/math/p5-Set-Window/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/math/p5-Set-Window/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: math/p5-Set-Window
-# Date created: 03 January 2001
-# Whom: Anton Berezin <tobez at tobez.org>
-#
+# Created by: Anton Berezin <tobez at tobez.org>
# $FreeBSD$
-#
PORTNAME= Set-Window
PORTVERSION= 1.01
@@ -19,6 +15,6 @@ PERL_CONFIGURE= yes
MAN3= Set::Window.3
post-patch:
- ${PERL} -pi -e '$$_="" if /use 5/;' ${WRKSRC}/Window.pm
+ @${REINPLACE_CMD} -i '' '/use 5/d' ${WRKSRC}/Window.pm
.include <bsd.port.mk>
Modified: head/misc/chord2html/Makefile
==============================================================================
--- head/misc/chord2html/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/misc/chord2html/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,11 +1,5 @@
-# Ports collection makefile for: chord2html
-# Date created: Sep 11, 2002
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
-# $Tecnik: ports/misc/chord2html/Makefile,v 1.3 2005/12/14 11:41:25 itetcu Exp $
-#
PORTNAME= chord2html
PORTVERSION= 1.3
@@ -20,6 +14,8 @@ RUN_DEPENDS= p5-GD>=0:${PORTSDIR}/graphi
USE_PERL5= yes
NO_BUILD= yes
+USES= shebangfix
+SHEBANG_FILES= chord2html
MAN1= chord2html.1
@@ -27,8 +23,7 @@ PLIST_FILES= bin/chord2html share/chord2
PLIST_DIRS= share/chord2html
post-patch:
- @${PERL} -pi -e "s,/usr/bin/perl,${PERL},g ; \
- s,%%PREFIX%%,${PREFIX},g ; \
+ @${REINPLACE_CMD} -i '' -e "s,%%PREFIX%%,${PREFIX},g ; \
s,chord2html.css,${PREFIX}/share/chord2html/chord2html.css," \
${WRKSRC}/chord2html
Modified: head/misc/explosions/Makefile
==============================================================================
--- head/misc/explosions/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/misc/explosions/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -18,10 +18,10 @@ USE_PERL5_BUILD=yes
.include <bsd.port.options.mk>
post-patch:
- @${PERL} -pi -e 's!CFLAGS=-Wall -O2!CFLAGS+=-Wall!; \
- s!sdl-config!${SDL_CONFIG}!' \
+ @${REINPLACE_CMD} -i '' -e 's!CFLAGS=-Wall -O2!CFLAGS+=-Wall!; \
+ s!sdl-config!${SDL_CONFIG}!' \
${WRKSRC}/Makefile
- @${PERL} -pi -e 's!spark%d.png!${DATADIR}/spark%d.png!' \
+ @${REINPLACE_CMD} -i '' -e 's!spark%d.png!${DATADIR}/spark%d.png!' \
${WRKSRC}/explosions.c
do-install:
Modified: head/misc/p5-Array-IntSpan/Makefile
==============================================================================
--- head/misc/p5-Array-IntSpan/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/misc/p5-Array-IntSpan/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: p5-Array-IntSpan
-# Date created: 30 Dec 2001
-# Whom: Seamus Venasse <svenasse at polaris.ca>
-#
+# Created by: Seamus Venasse <svenasse at polaris.ca>
# $FreeBSD$
-#
PORTNAME= Array-IntSpan
PORTVERSION= 2.002
@@ -19,6 +15,6 @@ PERL_CONFIGURE= yes
MAN3= Array::IntSpan.3 Array::IntSpan::Fields.3
post-patch:
- @${PERL} -pi -e 's/3pm/3/g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -i '' -e 's/3pm/3/g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
Modified: head/misc/qlas/Makefile
==============================================================================
--- head/misc/qlas/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/misc/qlas/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: qlas
-# Date created: 14 Oct 2000
-# Whom: Denis Shaposhnikov <dsh at vlink.ru>
-#
+# Created by: Denis Shaposhnikov <dsh at vlink.ru>
# $FreeBSD$
-#
PORTNAME= qlas
PORTVERSION= 1.93
@@ -16,10 +12,9 @@ COMMENT= Qico FIDO mailer log analyzer a
USE_PERL5= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
-
-post-patch:
- @ ${PERL} -pi -e 's!/usr/bin/perl!${PERL}!; tr/\r//d' ${WRKSRC}/qlas
- @ ${PERL} -pi -e 'tr/\r//d' ${WRKSRC}/qlas.conf.default
+USES= shebangfix
+SHEBANG_FILES= qlas
+USE_DOS2UNIX= qlas qlas.conf.default
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/qlas ${PREFIX}/bin/
Modified: head/net-p2p/torrentsniff/Makefile
==============================================================================
--- head/net-p2p/torrentsniff/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/net-p2p/torrentsniff/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -14,9 +14,8 @@ RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/ww
USE_PERL5= yes
NO_BUILD= yes
-
-post-patch:
- ${PERL} -pi -e "s#/usr/local/bin/perl#${PERL5}#" ${WRKSRC}/torrentsniff
+USES= shebangfix
+SHEBANG_FILES= torrentsniff
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/torrentsniff ${LOCALBASE}/bin
Modified: head/net/ip6_int/Makefile
==============================================================================
--- head/net/ip6_int/Makefile Fri Jul 26 07:06:30 2013 (r323701)
+++ head/net/ip6_int/Makefile Fri Jul 26 07:33:41 2013 (r323702)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ip6_int
-# Date created: 22 November 2001
-# Whom: Jean-Yves Lefort <jylefort at brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort at brutele.be>
# $FreeBSD$
-#
PORTNAME= ip6_int
PORTVERSION= 1.0
@@ -19,14 +15,13 @@ COMMENT= Convert an IPv4/IPv6 address to
PLIST_FILES= bin/ip6_int
NO_BUILD= yes
USE_PERL5= yes
+USES= shebangfix
+SHEBANG_FILES= ip6_int
do-extract:
@${MKDIR} ${WRKSRC}
@${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}
-post-patch:
- @${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/ip6_int
-
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/ip6_int ${PREFIX}/bin
More information about the svn-ports-head
mailing list