Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 May 2013 08:57:37 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317591 - in head: games/filters mail/delatt sysutils/rej textproc/colordiff www/bannerfilter
Message-ID:  <201305070857.r478vbdH017589@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ehaupt
Date: Tue May  7 08:57:37 2013
New Revision: 317591
URL: http://svnweb.freebsd.org/changeset/ports/317591

Log:
  Convert to use shebangfix USES flag.

Modified:
  head/games/filters/Makefile
  head/mail/delatt/Makefile
  head/sysutils/rej/Makefile
  head/textproc/colordiff/Makefile
  head/www/bannerfilter/Makefile

Modified: head/games/filters/Makefile
==============================================================================
--- head/games/filters/Makefile	Tue May  7 08:50:50 2013	(r317590)
+++ head/games/filters/Makefile	Tue May  7 08:57:37 2013	(r317591)
@@ -14,6 +14,7 @@ COMMENT=	Collection of filters, includin
 CONFLICTS=	talkfilters-[0-9]* jive-[0-9]* chef-[0-9]* kenny-[0-9]* \
 		lolcat-[0-9]*
 
+USES=		shebangfix
 USE_PERL5=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes
@@ -25,6 +26,8 @@ PERLFILTERS=	b1ff censor chef eleet fudd
 CFILTERS=	jethro kraut cockney jive nyc ken ky00te newspeak nethackify \
 		scramble
 
+SHEBANG_FILES=	${PERLFILTERS}
+
 MAN1=		filters.1
 MLINKS=	filters.1 b1ff.1 \
 		filters.1 censor.1 \
@@ -55,11 +58,6 @@ MLINKS=	filters.1 b1ff.1 \
 post-extract:
 	@${MV} ${WRKSRC}/${PORTNAME}.6 ${WRKSRC}/${MAN1}
 
-post-patch:
-.for f in ${PERLFILTERS}
-	@${REINPLACE_CMD} -e '1s|.*perl|#!${PERL}|' ${WRKSRC}/${f}
-.endfor
-
 do-install:
 .for f in ${CFILTERS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin

Modified: head/mail/delatt/Makefile
==============================================================================
--- head/mail/delatt/Makefile	Tue May  7 08:50:50 2013	(r317590)
+++ head/mail/delatt/Makefile	Tue May  7 08:57:37 2013	(r317591)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	delatt
-# Date created:				22 Jun 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
+# Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
-#
 
 PORTNAME=	delatt
 DISTVERSION=	1.1.3
@@ -18,15 +14,13 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 
+USES=		shebangfix
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
+SHEBANG_FILES=	delatt
 PLIST_FILES=	bin/delatt
 
-post-patch:
-	${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' \
-		${WRKSRC}/${PORTNAME}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 

Modified: head/sysutils/rej/Makefile
==============================================================================
--- head/sysutils/rej/Makefile	Tue May  7 08:50:50 2013	(r317590)
+++ head/sysutils/rej/Makefile	Tue May  7 08:57:37 2013	(r317591)
@@ -9,9 +9,12 @@ MASTER_SITES=	CRITICAL
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Merges patch-rejects and runs a merge program to verify the changes
 
+USES=		shebangfix
 USE_PERL5=	yes
 NO_BUILD=	yes
 
+SHEBANG_FILES=	qp mp
+
 PORTDOCS=	CHANGELOG README vimrc
 PLIST_FILES=	bin/rej bin/rej-qp bin/rej-mp
 
@@ -20,10 +23,6 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 post-patch:
-.for f in ${PORTNAME} qp mp
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/${f}
-.endfor
 	@${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \
 		${WRKSRC}/runtests.sh
 

Modified: head/textproc/colordiff/Makefile
==============================================================================
--- head/textproc/colordiff/Makefile	Tue May  7 08:50:50 2013	(r317590)
+++ head/textproc/colordiff/Makefile	Tue May  7 08:57:37 2013	(r317591)
@@ -11,16 +11,16 @@ COMMENT=	Tool to colorize diff output
 
 LICENSE=	GPLv2
 
+USES=		shebangfix
 USE_PERL5=	yes
 NO_BUILD=	yes
 
+SHEBANG_FILES=	colordiff.pl
+
 MAN1=		colordiff.1
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|/usr/local/bin/perl|${PERL}|; s|/etc|${PREFIX}/etc|' \
-			${WRKSRC}/${PORTNAME}.pl \
-			${WRKSRC}/${MAN1}
+	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/${MAN1}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}

Modified: head/www/bannerfilter/Makefile
==============================================================================
--- head/www/bannerfilter/Makefile	Tue May  7 08:50:50 2013	(r317590)
+++ head/www/bannerfilter/Makefile	Tue May  7 08:57:37 2013	(r317591)
@@ -14,6 +14,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	squid:${PORTSDIR}/www/squid
 
+USES=		shebangfix
 USE_PERL5=	yes
 NO_BUILD=	yes
 
@@ -23,11 +24,10 @@ CONFIG_FILES=	bannerfilter.conf banners.
 		exceptions.data exceptions.local.data frames.data \
 		frames.local.data popups.data popups.local.data
 
+SHEBANG_FILES=	redirector.pl
+
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/usr/local/etc|${PREFIX}/etc|; s|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/redirector.pl
-	@${REINPLACE_CMD} -e \
 		's|^;\ \(DATA\ =\ \).*|\1${PREFIX}/etc/${PORTNAME}/|' \
 		${WRKSRC}/${PORTNAME}.conf
 	@${REINPLACE_CMD} -e \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305070857.r478vbdH017589>