From owner-svn-ports-head@FreeBSD.ORG Thu Jul 25 17:45:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 062BE79E; Thu, 25 Jul 2013 17:45:13 +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 D8F72261C; Thu, 25 Jul 2013 17:45:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6PHjCTN020562; Thu, 25 Jul 2013 17:45:12 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6PHjA8D020541; Thu, 25 Jul 2013 17:45:10 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201307251745.r6PHjA8D020541@svn.freebsd.org> From: Andrej Zverev Date: Thu, 25 Jul 2013 17:45:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323655 - in head: devel/p5-Search-Binary devel/p5-Storable devel/p5-Test-SubCalls devel/p5-Test-YAML-Valid devel/p5-prefork dns/sleuth finance/ledgersmb finance/ledgersmb/files finance... 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: Thu, 25 Jul 2013 17:45:13 -0000 Author: az Date: Thu Jul 25 17:45:09 2013 New Revision: 323655 URL: http://svnweb.freebsd.org/changeset/ports/323655 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@) Added: - copied unchanged from r323639, head/finance/ledgersmb/pkg-message Directory Properties: head/finance/ledgersmb/files/pkg-message.in (props changed) Deleted: head/finance/ledgersmb/pkg-message Modified: head/devel/p5-Search-Binary/Makefile (contents, props changed) head/devel/p5-Storable/Makefile (contents, props changed) head/devel/p5-Test-SubCalls/Makefile (contents, props changed) head/devel/p5-Test-YAML-Valid/Makefile (contents, props changed) head/devel/p5-prefork/Makefile (contents, props changed) head/dns/sleuth/Makefile (contents, props changed) head/finance/ledgersmb/Makefile head/finance/p5-Business-OnlinePayment-PaymenTech/Makefile (contents, props changed) head/finance/sql-ledger/Makefile (contents, props changed) head/ftp/ftplocate/Makefile (contents, props changed) head/ftp/ftpmirror/Makefile (contents, props changed) Modified: head/devel/p5-Search-Binary/Makefile ============================================================================== --- head/devel/p5-Search-Binary/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/devel/p5-Search-Binary/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -1,9 +1,5 @@ -# New ports collection makefile for: devel/p5-Search-Binary -# Date created: 03 January 2001 -# Whom: Anton Berezin -# +# Created by: Anton Berezin # $FreeBSD$ -# PORTNAME= Search-Binary PORTVERSION= 0.95 @@ -19,6 +15,7 @@ PERL_CONFIGURE= yes MAN3= Search::Binary.3 pre-patch: - @${PERL} -pi -e 's|Seach|Search|' ${WRKSRC}/Binary.pm + @${REINPLACE_CMD} -i '' -e 's|Seach|Search|' \ + ${WRKSRC}/Binary.pm .include Modified: head/devel/p5-Storable/Makefile ============================================================================== --- head/devel/p5-Storable/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/devel/p5-Storable/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -15,6 +15,6 @@ PERL_CONFIGURE= yes MAN3= Storable.3 post-patch: - @${PERL} -pi -e '$$_="" if /MAN3PODS|INSTALLDIRS/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e 's|INSTALLDIRS|' ${WRKSRC}/Makefile.PL .include Modified: head/devel/p5-Test-SubCalls/Makefile ============================================================================== --- head/devel/p5-Test-SubCalls/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/devel/p5-Test-SubCalls/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -1,9 +1,5 @@ -# New ports collection makefile for: devel/p5-Test-SubCalls -# Date created: 08 October 2005 -# Whom: Lars Thegler -# +# Created by: Lars Thegler # $FreeBSD$ -# PORTNAME= Test-SubCalls PORTVERSION= 1.09 @@ -23,7 +19,4 @@ PERL_CONFIGURE= yes MAN3= Test::SubCalls.3 -post-patch: - @${PERL} -pi -e '$$_="" if m/Test::More/' ${WRKSRC}/Makefile.PL - .include Modified: head/devel/p5-Test-YAML-Valid/Makefile ============================================================================== --- head/devel/p5-Test-YAML-Valid/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/devel/p5-Test-YAML-Valid/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -22,7 +22,8 @@ OPTIONS_DEFINE= YAMLSYCK YAMLSYCK_DESC= Use YAML::Syck for testing post-patch: - ${PERL} -pi -e '$$_="" if /auto_install/' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -i '' -e '/auto_install.*/d' \ + ${WRKSRC}/Makefile.PL .include Modified: head/devel/p5-prefork/Makefile ============================================================================== --- head/devel/p5-prefork/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/devel/p5-prefork/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -1,9 +1,5 @@ -# New ports collection makefile for: prefork -# Date created: 14 November 2004 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= prefork PORTVERSION= 1.04 @@ -22,7 +18,4 @@ PERL_CONFIGURE= yes MAN3= prefork.3 -post-patch: - @${PERL} -pi -e 's/^auto_install.*$$//' ${WRKSRC}/Makefile.PL - .include Modified: head/dns/sleuth/Makefile ============================================================================== --- head/dns/sleuth/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/dns/sleuth/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sleuth -# Date created: Jun 15, 2001 -# Whom: Mark Pulford -# +# Created by: Mark Pulford # $FreeBSD$ -# PORTNAME= sleuth PORTVERSION= 1.4.4 @@ -16,12 +12,14 @@ COMMENT= A tool for checking DNS zones RUN_DEPENDS= p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS USE_PERL5= yes +USES= shebangfix +SHEBANG_FILES= sleuth PLIST_FILES= bin/sleuth etc/sleuth.conf.sample post-patch: - ${PERL} -pi -e "s|/etc/sleuth.conf|${PREFIX}/etc/sleuth.conf|g; \ - s|#!/usr/bin/perl|#!${PERL}|g;" ${WRKSRC}/sleuth + @${REINPLACE_CMD} -i '' -e 's|/etc/sleuth.conf|${PREFIX}/etc/sleuth.conf|' \ + ${WRKSRC}/sleuth do-install: ${INSTALL_SCRIPT} ${WRKSRC}/sleuth ${PREFIX}/bin Modified: head/finance/ledgersmb/Makefile ============================================================================== --- head/finance/ledgersmb/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/finance/ledgersmb/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -17,16 +17,9 @@ NO_BUILD= yes USE_PERL5= yes WRKSRC= ${WRKDIR}/${PORTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message - -post-patch: - @${PERL} -pi -e 's|/usr/bin/perl|${PERL}|' \ - `${FIND} ${WRKSRC} -name \*.pl` - @${PERL} -pe 's|%%PREFIX%%|${PREFIX}|g' \ - ${FILESDIR}/${PORTNAME}-httpd.conf.in \ - > ${WRKDIR}/${PORTNAME}-httpd.conf - @${PERL} -pe 's|%%PREFIX%%|${PREFIX}|g' \ - ${PKGDIR}/pkg-message \ - > ${PKGMESSAGE} +USES= shebangfix +SHEBANG_FILES= *.pl locale/*/*.pl bin/*/*.pl utils/*/*.pl +SUB_FILES= ${PORTNAME}-httpd.conf.in pkg-message.in do-install: @cd ${WRKDIR} ; \ Copied: head/finance/ledgersmb/files/pkg-message.in (from r323639, head/finance/ledgersmb/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/ledgersmb/files/pkg-message.in Thu Jul 25 17:45:09 2013 (r323655, copy of r323639, head/finance/ledgersmb/pkg-message) @@ -0,0 +1,12 @@ +================================================================= + +LedgerSMB has now been installed. + +To enable Apache web access, add the following to your +%%PREFIX%%/etc/apache/httpd.conf: + + Include %%PREFIX%%/etc/ledger-smb-httpd.conf + +Enjoy! + +================================================================= Modified: head/finance/p5-Business-OnlinePayment-PaymenTech/Makefile ============================================================================== --- head/finance/p5-Business-OnlinePayment-PaymenTech/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/finance/p5-Business-OnlinePayment-PaymenTech/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -20,7 +20,4 @@ PERL_CONFIGURE= yes MAN3= Business::OnlinePayment::PaymenTech.3 -post-extract: - @${PERL} -i.bak -ne 'print unless /^(test_requires|auto_install|recommends|configure_requires)/' ${WRKSRC}/Makefile.PL - .include Modified: head/finance/sql-ledger/Makefile ============================================================================== --- head/finance/sql-ledger/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/finance/sql-ledger/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -18,10 +18,8 @@ NO_BUILD= yes USE_PERL5= yes WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= pkg-message sql-ledger-httpd.conf - -post-patch: - @${PERL} -pi -e 's|/usr/bin/perl|${PERL}|' \ - `${FIND} ${WRKSRC} -name \*.pl` +USES= shebangfix +SHEBANG_FILES= *.pl locale/*/*.pl bin/*/*.pl do-install: @cd ${WRKDIR} ; \ Modified: head/ftp/ftplocate/Makefile ============================================================================== --- head/ftp/ftplocate/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/ftp/ftplocate/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Ftplocate -# Date created: 7 December 1999 -# Whom: tung@turtle.ee.ncku.edu.tw -# +# Created by: tung@turtle.ee.ncku.edu.tw # $FreeBSD$ -# PORTNAME= ftplocate PORTVERSION= 2.02 @@ -19,19 +15,14 @@ RUN_DEPENDS= glimpse:${PORTSDIR}/textpro USE_PERL5= yes NO_BUILD= yes -PL_FILES= install.pl bin/dcollect.pl bin/dindex.pl bin/dsearch.pl \ - bin/flcollect.pl bin/flfilter.pl bin/flhistory.pl \ - bin/flindex.pl bin/flmap.pl bin/flsearch.pl \ - bin/flserv.pl bin/flsummary.pl bin/fltop.pl \ - bin/fltrain.pl bin/flcatsite.pl template/ftplocate +USES= shebangfix +SHEBANG_FILES= bin/*.pl template/ftplocate post-extract: -.for f in ${PL_FILES} - @${PERL} -pi -e 's,/usr/bin/perl,${PERL},' ${WRKSRC}/${f} -.endfor - @${PERL} -pi -e 's,(/usr/local/www|/usr/local/apache/share),${PREFIX}/www,g' ${WRKSRC}/install.pl - @${PERL} -pi -e 's,/usr/local/bin/ftplocate,${PREFIX}/bin/ftplocate,g' ${WRKSRC}/install.pl - @${PERL} -pi -e 's,htdocs,data,g' ${WRKSRC}/install.pl + @${REINPLACE_CMD} -i '' -e 's|/usr/local/www|${PREFIX}/www|' \ + -e 's|/usr/local/apache/share|${PREFIX}/www|' ${WRKSRC}/install.pl + @${REINPLACE_CMD} -i '' -e 's|/usr/local/bin/ftplocate|${PREFIX}/bin/ftplocate|' \ + -e 's|htdocs|data|' -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/install.pl do-install: @${MKDIR} ${PREFIX}/www/data ${PREFIX}/www/cgi-bin Modified: head/ftp/ftpmirror/Makefile ============================================================================== --- head/ftp/ftpmirror/Makefile Thu Jul 25 17:21:59 2013 (r323654) +++ head/ftp/ftpmirror/Makefile Thu Jul 25 17:45:09 2013 (r323655) @@ -18,15 +18,15 @@ USE_PERL5= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes +USES= shebangfix +SHEBANG_FILES= ftpmirror rotate + CONFIGURE_ENV+= PERL="${PERL}" INSTALL_PROGRAM="${INSTALL_SCRIPT}" PORTDOCS= README.jis RELEASE.jis post-configure: - @${PERL} -i.bak -pe 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Fan/Fan.pm -.for f in ftpmirror rotate - @${PERL} -i.bak -pe 's,^#!.*$$,#!${PERL}, if $$. == 1' ${WRKSRC}/${f} -.endfor + @${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Fan/Fan.pm .include