Date: Fri, 26 Jul 2013 10:46:37 +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: r323711 - in head: net/p5-Filesys-SmbClient net/p5-Net-Google net/p5-Net-Google-SafeBrowsing2 net/p5-Net-SNPP net/p5-POE-Component-Server-Twirc net/p5-PlRPC net/p5-Samba-LDAP net/p5-Zer... Message-ID: <201307261046.r6QAkbBB089776@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: az Date: Fri Jul 26 10:46:37 2013 New Revision: 323711 URL: http://svnweb.freebsd.org/changeset/ports/323711 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/net/p5-Filesys-SmbClient/Makefile (contents, props changed) head/net/p5-Net-Google-SafeBrowsing2/Makefile head/net/p5-Net-Google/Makefile (contents, props changed) head/net/p5-Net-SNPP/Makefile (contents, props changed) head/net/p5-POE-Component-Server-Twirc/Makefile (contents, props changed) head/net/p5-PlRPC/Makefile (contents, props changed) head/net/p5-Samba-LDAP/Makefile (contents, props changed) head/net/p5-ZeroMQ/Makefile (contents, props changed) head/net/tightvnc/Makefile head/net/tridiavnc/Makefile (contents, props changed) head/news/p5-News-Newsrc/Makefile (contents, props changed) head/ports-mgmt/portcheckout/Makefile (contents, props changed) head/security/l0phtcrack/Makefile head/security/p5-Digest-MD5-M4p/Makefile (contents, props changed) head/security/sig2dot/Makefile (contents, props changed) head/security/snort-rep/Makefile head/security/tripwire12/Makefile (contents, props changed) head/sysutils/colorize/Makefile (contents, props changed) Modified: head/net/p5-Filesys-SmbClient/Makefile ============================================================================== --- head/net/p5-Filesys-SmbClient/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/p5-Filesys-SmbClient/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sysutils/p5-Filesys-SmbClient -# Date created: August 10, 2003 -# Whom: Erwin Lansing <erwin@FreeBSD.org> -# +# Created by: Erwin Lansing <erwin@FreeBSD.org> # $FreeBSD$ -# PORTNAME= Filesys-SmbClient PORTVERSION= 3.2 @@ -22,7 +18,7 @@ PERL_CONFIGURE= yes MAN3= Filesys::SmbClient.3 post-patch: - ${PERL} -pi -e 's!%%LOCALBASE%%!${LOCALBASE}!g' \ + @${REINPLACE_CMD} -i '' -e 's!%%LOCALBASE%%!${LOCALBASE}!g' \ ${WRKSRC}/Makefile.PL .include <bsd.port.mk> Modified: head/net/p5-Net-Google-SafeBrowsing2/Makefile ============================================================================== --- head/net/p5-Net-Google-SafeBrowsing2/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/p5-Net-Google-SafeBrowsing2/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -58,7 +58,4 @@ BUILD_DEPENDS+= p5-DBD-Pg>=2:${PORTSDIR} RUN_DEPENDS+= p5-DBD-Pg>=2:${PORTSDIR}/databases/p5-DBD-Pg .endif -post-patch: - @${PERL} -pi -e 's/CPAN/ExtUtils/' ${WRKSRC}/Makefile.PL - .include <bsd.port.mk> Modified: head/net/p5-Net-Google/Makefile ============================================================================== --- head/net/p5-Net-Google/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/p5-Net-Google/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Net-Google -# Date created: 04 June 2002 -# Whom: Sergey Skvortsov <skv@protey.ru> -# +# Created by: Sergey Skvortsov <skv@protey.ru> # $FreeBSD$ -# PORTNAME= Net-Google PORTVERSION= 1.0.1 @@ -24,6 +20,6 @@ MAN3= Net::Google.3 Net::Google::Cache. Net::Google::Spelling.3 Net::Google::tool.3 post-patch: - @${PERL} -pi -e 's/CPAN/ExtUtils/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e 's/CPAN/ExtUtils/g' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> Modified: head/net/p5-Net-SNPP/Makefile ============================================================================== --- head/net/p5-Net-SNPP/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/p5-Net-SNPP/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Net-SNPP -# Date created: 6 Jun 2002 -# Whom: devin@spamcop.net -# +# Created by: devin@spamcop.net # $FreeBSD$ -# PORTNAME= Net-SNPP PORTVERSION= 1.17 @@ -20,8 +16,7 @@ MAN3= Net::SNPP.3 \ Net::SNPP::Server.3 post-patch: - @${PERL} -pi -e '$$_="" if /warnings/;' \ + @${REINPLACE_CMD} -i '' -e '/warnings/d' \ ${WRKSRC}/lib/Net/SNPP/Server.pm - @${RM} ${WRKSRC}/lib/Net/SNPP/Server.pm.orig .include <bsd.port.mk> Modified: head/net/p5-POE-Component-Server-Twirc/Makefile ============================================================================== --- head/net/p5-POE-Component-Server-Twirc/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/p5-POE-Component-Server-Twirc/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -42,6 +42,6 @@ MAN3= App::Twirc.3 \ POE::Component::Server::Twirc.3 post-patch: - @${PERL} -pi -e '$$_="" if m/auto_install/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e '/auto_install/d' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> Modified: head/net/p5-PlRPC/Makefile ============================================================================== --- head/net/p5-PlRPC/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/p5-PlRPC/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-PlRPC -# Date Created: 27 Feb 2000 -# Whom: Vanilla I. Shu <vanilla@FreeBSD.org> -# +# Created by: Vanilla I. Shu <vanilla@FreeBSD.org> # $FreeBSD$ -# PORTNAME= PlRPC PORTVERSION= 0.2020 @@ -28,6 +24,7 @@ MAN3= Bundle::PlRPC.3 \ post-patch: @${FIND} ${WRKSRC} -name ".svn" | ${XARGS} ${RM} -rf - @${PERL} -pi -e 's/perldoc -t/echo perldoc -t/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e 's/perldoc -t/echo perldoc -t/' \ + ${WRKSRC}/Makefile.PL .include <bsd.port.mk> Modified: head/net/p5-Samba-LDAP/Makefile ============================================================================== --- head/net/p5-Samba-LDAP/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/p5-Samba-LDAP/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-Samba-LDAP -# Date created: 2006-09-18 -# Whom: Gea-Suan Lin <gslin@gslin.org> -# +# Created by: Gea-Suan Lin <gslin@gslin.org> # $FreeBSD$ -# PORTNAME= Samba-LDAP PORTVERSION= 0.05 @@ -35,6 +31,6 @@ MAN3= Samba::LDAP.3 Samba::LDAP::Base.3 Samba::LDAP::User.3 post-patch: - ${PERL} -pi -e '$$_ = "" if m|auto_install|' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e '/auto_install/d' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> Modified: head/net/p5-ZeroMQ/Makefile ============================================================================== --- head/net/p5-ZeroMQ/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/p5-ZeroMQ/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -47,6 +47,6 @@ TEST_DEPENDS+= p5-Test-Simple>=0.98:${PO .endif post-patch: - @${PERL} -pi -e "s/lib => 'zmq',//" ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e "s/lib => 'zmq',//" ${WRKSRC}/Makefile.PL .include <bsd.port.post.mk> Modified: head/net/tightvnc/Makefile ============================================================================== --- head/net/tightvnc/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/tightvnc/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -22,7 +22,8 @@ CONFLICTS= tridiavnc-[0-9]* vnc-[0-9]* WRKSRC= ${WRKDIR}/vnc_unixsrc -USES= imake +USES= imake shebangfix +SHEBANG_FILES= vncserver CFLAGS+= -Wno-return-type USE_GCC= yes USE_BZIP2= yes @@ -61,11 +62,11 @@ IGNORE= vnc has already been installed, post-patch: .for file in vncviewer/Imakefile Xvnc/config/cf/vnclibs.def - @${PERL} -pi -e "s,%%LOCALBASE%%,${PREFIX},g" ${WRKSRC}/${file} + @${REINPLACE_CMD} -i '' -e "s|%%LOCALBASE%%|${PREFIX}|g" ${WRKSRC}/${file} .endfor - @${PERL} -pi -e "s,/usr/local/vnc/classes,${DATADIR}/classes,g ; \ - s,^#!/usr/bin/perl,#!${PERL},g" ${WRKSRC}/vncserver - @${PERL} -pi -e "s,%%CC%%,${CC},g ; \ + @${REINPLACE_CMD} -i '' -e "s|/usr/local/vnc/classes|${DATADIR}/classes|g" \ + ${WRKSRC}/vncserver + @${REINPLACE_CMD} -i '' -e "s|%%CC%%|${CC}|g ; \ s|%%CFLAGS%%|${CFLAGS}|g" ${WRKSRC}/Xvnc/config/cf/FreeBSD.cf do-install: Modified: head/net/tridiavnc/Makefile ============================================================================== --- head/net/tridiavnc/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/net/tridiavnc/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: tridiavnc -# Date created: 14 June 2001 -# Whom: dwcjr -# +# Created by: dwcjr # $FreeBSD$ -# PORTNAME= tridiavnc PORTVERSION= 1.4 @@ -21,7 +17,8 @@ LICENSE= GPLv2 USE_PERL5= yes WRKSRC= ${WRKDIR}/unix/vnc_unixsrc -USES= imake +USES= imake shebangfix +SHEBANG_FILES= vncserver USE_XORG= ice sm x11 xaw xext xmu xt xpm ALL_TARGET= World NO_INSTALL_MANPAGES= yes @@ -47,10 +44,10 @@ PLIST_SUB+= XVNC="" post-patch: .for file in vncviewer/Imakefile Xvnc/config/cf/vnclibs.def Xvnc/config/cf/Imake.tmpl - @${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file} + ${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${file} .endfor - @${PERL} -pi -e "s,/usr/local/vnc/classes,${DATADIR}/classes,g ; \ - s,^#!/usr/bin/perl,#!${PERL},g" ${WRKSRC}/vncserver + ${REINPLACE_CMD} -i '' -e 's|/usr/local/vnc/classes|${DATADIR}/classes|' \ + ${WRKSRC}/vncserver # We have to frob a few things, and we want our own permissions, so it's easier # to do the install ourselves. Modified: head/news/p5-News-Newsrc/Makefile ============================================================================== --- head/news/p5-News-Newsrc/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/news/p5-News-Newsrc/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -17,7 +17,4 @@ PERL_CONFIGURE= yes MAN3= News::Newsrc.3 -pre-patch: - @${PERL} -pi -e '$$_ = "" if /^use 5.6/' ${WRKSRC}/Newsrc.pm - .include <bsd.port.mk> Modified: head/ports-mgmt/portcheckout/Makefile ============================================================================== --- head/ports-mgmt/portcheckout/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/ports-mgmt/portcheckout/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: portcheckout -# Date created: 1 November 1998 -# Whom: wosch -# +# Created by: wosch # $FreeBSD$ -# PORTNAME= portcheckout PORTVERSION= 2.0 @@ -15,11 +11,10 @@ MAINTAINER= wosch@FreeBSD.org COMMENT= Checkout and build ports and all depending ports USE_PERL5= yes +USES= shebangfix +SHEBANG_FILES= portcheckout.pl MAN1= portcheckout.1 MANCOMPRESSED= maybe PLIST_FILES= bin/portcheckout -post-patch: - ${PERL} -pi -e 's^\#\!${PREFIX}/bin/perl^#!${PERL5}^' ${WRKSRC}/portcheckout.pl - .include <bsd.port.mk> Modified: head/security/l0phtcrack/Makefile ============================================================================== --- head/security/l0phtcrack/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/security/l0phtcrack/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -18,11 +18,11 @@ NO_WRKSUBDIR= yes PLIST= ${WRKDIR}/pkg-plist USE_PERL5_BUILD=yes USE_ZIP= yes +USE_DOS2UNIX= yes post-extract: ${RM} ${WRKDIR}/*exe - ${PERL} -pi -e "s:\r::g" ${WRKDIR}/* - ${PERL} -pi -e "s:ommited:omitted:g" ${WRKDIR}/util.c + ${REINPLACE_CMD} -i '' -e 's|ommited|omitted|' ${WRKDIR}/util.c do-build: cd ${WRKDIR} && ${CC} ${CFLAGS} -DMPU8086 *.c -o lc_CLI Modified: head/security/p5-Digest-MD5-M4p/Makefile ============================================================================== --- head/security/p5-Digest-MD5-M4p/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/security/p5-Digest-MD5-M4p/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-Digest-MD5-M4p -# Date created: 27 June 2004 -# Whom: Lars Thegler <lth@FreeBSD.org> -# +# Created by: Lars Thegler <lth@FreeBSD.org> # $FreeBSD$ -# PORTNAME= Digest-MD5-M4p PORTVERSION= 0.01 @@ -19,7 +15,4 @@ PERL_CONFIGURE= yes MAN3= Digest::MD5::M4p.3 -post-extract: - @${PERL} -pi -e 's/\r//g' ${WRKSRC}/M4p.xs - .include <bsd.port.mk> Modified: head/security/sig2dot/Makefile ============================================================================== --- head/security/sig2dot/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/security/sig2dot/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: sig2dot -# Date created: Aug 8, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= sig2dot PORTVERSION= 0.35 @@ -25,9 +20,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}/sig2dot.pl +USES= shebangfix +SHEBANG_FILES= sig2dot.pl do-install: ${INSTALL_SCRIPT} ${WRKSRC}/sig2dot.pl ${PREFIX}/bin/sig2dot Modified: head/security/snort-rep/Makefile ============================================================================== --- head/security/snort-rep/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/security/snort-rep/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -12,10 +12,8 @@ COMMENT= A Snort reporting tool that can USE_PERL5= yes MAN1= snort-rep.1 - -post-patch: - @${PERL} -pi -e "s|#!/usr/bin/perl|#!${PERL}|" \ - ${WRKSRC}/snort-rep ${WRKSRC}/snort-rep-mail +USES= shebangfix +SHEBANG_FILES= snort-rep snort-rep-mail do-build: cd ${BUILD_WRKSRC} ; pod2man --lax snort-rep > snort-rep.1 Modified: head/security/tripwire12/Makefile ============================================================================== --- head/security/tripwire12/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/security/tripwire12/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -23,8 +23,8 @@ post-extract: @ (cd ${WRKDIR}; tar xpf T1.2.tar) post-patch: - @${PERL} -pi -e 's|/secureplace/bin|${PREFIX}/bin|g;' \ - -e 's|/usr/man|${PREFIX}/man|g;' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -i '' -e 's|/secureplace/bin|${PREFIX}/bin|' \ + -e 's|/usr/man|${PREFIX}/man|' ${WRKSRC}/Makefile ${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|bs_ntohl|ntohl|g;s|bs_htonl|htonl|g' Modified: head/sysutils/colorize/Makefile ============================================================================== --- head/sysutils/colorize/Makefile Fri Jul 26 09:46:53 2013 (r323710) +++ head/sysutils/colorize/Makefile Fri Jul 26 10:46:37 2013 (r323711) @@ -1,9 +1,5 @@ -# New ports collection makefile for: colorize -# Date created: 12 June 2001 -# Whom: petef@FreeBSD.org -# +# Created by: petef@FreeBSD.org # $FreeBSD$ -# PORTNAME= colorize PORTVERSION= 0.3.4 @@ -22,13 +18,15 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} NO_BUILD= yes USE_PERL5= yes SUB_FILES= pkg-message +USES= shebangfix +SHEBANG_FILES= colorize MAN1= colorize.1 MANCOMPRESSED= yes post-patch: - @${PERL} -pi -e "s|/etc/colorizerc|${PREFIX}/etc/colorizerc|; \ - s|#!/usr/bin/perl|#!${PERL}|g" ${WRKSRC}/colorize + @${REINPLACE_CMD} -i '' -e 's|/etc/colorizerc|${PREFIX}/etc/colorizerc|' \ + ${WRKSRC}/colorize do-install: @${INSTALL_SCRIPT} ${WRKSRC}/colorize ${PREFIX}/bin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307261046.r6QAkbBB089776>