diff options
-rw-r--r-- | archivers/xdms/Makefile | 3 | ||||
-rw-r--r-- | benchmarks/tmetric/Makefile | 3 | ||||
-rw-r--r-- | comms/plp/Makefile | 3 | ||||
-rw-r--r-- | editors/mp/Makefile | 3 | ||||
-rw-r--r-- | games/conquest/Makefile | 9 | ||||
-rw-r--r-- | games/deal/Makefile | 4 | ||||
-rw-r--r-- | games/quakeserver/Makefile | 3 | ||||
-rw-r--r-- | graphics/dc20pack/Makefile | 3 | ||||
-rw-r--r-- | irc/gruftistats/Makefile | 4 | ||||
-rw-r--r-- | math/jacal/Makefile | 1 | ||||
-rw-r--r-- | net-mgmt/ehnt/Makefile | 2 | ||||
-rw-r--r-- | net/ehnt/Makefile | 2 | ||||
-rw-r--r-- | security/keyprint/Makefile | 3 | ||||
-rw-r--r-- | security/opieprint/Makefile | 3 | ||||
-rw-r--r-- | security/pgp5/Makefile | 2 | ||||
-rw-r--r-- | sysutils/ndir/Makefile | 3 | ||||
-rw-r--r-- | textproc/dadadodo/Makefile | 4 | ||||
-rw-r--r-- | textproc/mguesser/Makefile | 4 | ||||
-rw-r--r-- | textproc/tclExpat/Makefile | 3 | ||||
-rw-r--r-- | textproc/ua-ispell/Makefile | 1 | ||||
-rw-r--r-- | ukrainian/ispell/Makefile | 1 | ||||
-rw-r--r-- | www/cgichk/Makefile | 6 |
22 files changed, 50 insertions, 20 deletions
diff --git a/archivers/xdms/Makefile b/archivers/xdms/Makefile index 3f8969ca3251..6e2bc320c2a2 100644 --- a/archivers/xdms/Makefile +++ b/archivers/xdms/Makefile @@ -14,11 +14,12 @@ DISTNAME= xdms MAINTAINER= markp@FreeBSD.org USE_ZIP= yes +USE_REINPLACE= yes WRKSRC= ${WRKDIR}/xdms/src ALL_TARGET= xdms pre-build: - ${PERL} -pi -e "s@gcc@${CC}@g; s@-O3 -Wall@${CFLAGS} -Wall@g" ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e "s@gcc@${CC}@g; s@-O3 -Wall@${CFLAGS} -Wall@g" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdms ${PREFIX}/bin diff --git a/benchmarks/tmetric/Makefile b/benchmarks/tmetric/Makefile index 1f3fb3ae0bef..217789fe3184 100644 --- a/benchmarks/tmetric/Makefile +++ b/benchmarks/tmetric/Makefile @@ -16,10 +16,11 @@ MAINTAINER= mbac@nyct.net HAS_CONFIGURE= yes ALL_TARGET= ${PORTNAME} USE_BZIP2= yes +USE_REINPLACE= yes MAN8= tmetric.8 post-patch: - @${PERL5} -pi -e 's%/usr/local%${PREFIX}%' ${WRKSRC}/* + @${REINPLACE_CMD} -e 's%/usr/local%${PREFIX}%' ${WRKSRC}/* .include <bsd.port.mk> diff --git a/comms/plp/Makefile b/comms/plp/Makefile index cc2105b3e406..7aaf892ab420 100644 --- a/comms/plp/Makefile +++ b/comms/plp/Makefile @@ -16,10 +16,11 @@ DISTNAME= ${PORTNAME}_1_8 MAINTAINER= maurice@serc.rmit.edu.au USE_GMAKE= yes +USE_REINPLACE= yes pre-patch: .for files in packet.cc socketchan.cc - @${PERL} -pi -e 's|malloc.h|stdlib.h|' ${WRKSRC}/ncp/${files} + @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/ncp/${files} .endfor do-install: diff --git a/editors/mp/Makefile b/editors/mp/Makefile index 59a1b4c86c79..1b67fc9f335d 100644 --- a/editors/mp/Makefile +++ b/editors/mp/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= http://triptico.dhis.org/download/ MAINTAINER= markp@FreeBSD.org USE_GMAKE= yes +USE_REINPLACE= yes MAKE_ARGS+= PREFIX="${PREFIX}" MAKEFILE= makefile pre-configure: - ${PERL} -pi -e "s@gcc -g -Wall@${CC} ${CFLAGS} -Wall@g" ${WRKSRC}/makefile + ${REINPLACE_CMD} -e "s@gcc -g -Wall@${CC} ${CFLAGS} -Wall@g" ${WRKSRC}/makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mp ${PREFIX}/bin diff --git a/games/conquest/Makefile b/games/conquest/Makefile index 228dd83a72f4..d30b914d1bfc 100644 --- a/games/conquest/Makefile +++ b/games/conquest/Makefile @@ -14,16 +14,17 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= markp@FreeBSD.org GNU_CONFIGURE= yes +USE_REINPLACE= yes BINGRP= conquest SHAREGRP= conquest post-patch: - ${PERL} -pi -e "s|\@prefix\@/conquest|\@prefix\@|g; \ + ${REINPLACE_CMD} -e "s|\@prefix\@/conquest|\@prefix\@|g; \ s|^.+\@chgrp .\(CONQGROUP\) conq.+||g; \ s|^.+\@chmod 2771 conq.+||g;" ${WRKSRC}/Makefile.in - ${PERL} -pi -e "s/# include <termio.h>//g" ${WRKSRC}/c_defs.h - ${PERL} -pi -e "s/-O2 -fPIC//g" ${WRKSRC}/configure - ${PERL} -pi -e "s|/opt/conquest|${PREFIX}|g; \ + ${REINPLACE_CMD} -e "s/# include <termio.h>//g" ${WRKSRC}/c_defs.h + ${REINPLACE_CMD} -e "s/-O2 -fPIC//g" ${WRKSRC}/configure + ${REINPLACE_CMD} -e "s|/opt/conquest|${PREFIX}|g; \ s|etc/conquestrc|etc/conquest/conquestrc|g; \ s|bin/conqdriv|libexec/conqdriv|g; \ s|etc/conquest_common.img|etc/conquest/conquest_common.img|g; \ diff --git a/games/deal/Makefile b/games/deal/Makefile index 213ff7cec59d..4ec132ca61ef 100644 --- a/games/deal/Makefile +++ b/games/deal/Makefile @@ -13,10 +13,12 @@ MASTER_SITES= http://www.tuxedo.org/~esr/deal/ MAINTAINER= markp@FreeBSD.org ALL_TARGET= deal +USE_REINPLACE= yes + MAN1= deal.1 pre-build: - ${PERL} -pi -e "s@-g@${CFLAGS}@g" ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e "s@-g@${CFLAGS}@g" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/deal ${PREFIX}/bin diff --git a/games/quakeserver/Makefile b/games/quakeserver/Makefile index 50c606b9acf4..25f1c68ffba0 100644 --- a/games/quakeserver/Makefile +++ b/games/quakeserver/Makefile @@ -21,6 +21,7 @@ BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ NO_WRKSUBDIR= YES NO_BUILD= YES NO_CDROM= "This software is shareware" +USE_REINPLACE= yes do-extract: @ ${RM} -rf ${WRKDIR} @@ -35,7 +36,7 @@ do-configure: @ ${CP} ${FILESDIR}/quakeserver.sh ${WRKSRC} @ ${CP} ${FILESDIR}/qserver.sh ${WRKSRC} @ ${CP} ${FILESDIR}/stopserver.sh ${WRKSRC} - @ ${SETENV} ${MAKE_ENV} ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/readme.port ${WRKSRC}/quakeserver.sh ${WRKSRC}/qserver.sh ${WRKSRC}/stopserver.sh + @ ${SETENV} ${MAKE_ENV} ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/readme.port ${WRKSRC}/quakeserver.sh ${WRKSRC}/qserver.sh ${WRKSRC}/stopserver.sh pre-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/graphics/dc20pack/Makefile b/graphics/dc20pack/Makefile index b3291e7284a5..59f7a9e41741 100644 --- a/graphics/dc20pack/Makefile +++ b/graphics/dc20pack/Makefile @@ -15,9 +15,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= maurice@serc.rmit.edu.au WRKSRC= ${WRKDIR} +USE_REINPLACE= yes post-extract: - @ /usr/bin/find ${WRKSRC} -type f | xargs /usr/bin/perl -pi -e 's/\r//g' + @ /usr/bin/find ${WRKSRC} -type f | xargs ${REINPLACE_CMD} -e 's/\r//g' do-install: ${INSTALL_SCRIPT} ${WRKSRC}/dc20dump ${PREFIX}/bin diff --git a/irc/gruftistats/Makefile b/irc/gruftistats/Makefile index 34c9b7ea5100..83be62922b1c 100644 --- a/irc/gruftistats/Makefile +++ b/irc/gruftistats/Makefile @@ -15,6 +15,7 @@ MAINTAINER= mwest@uct.ac.za GNU_CONFIGURE= YES USE_GMAKE= YES +USE_REINPLACE= yes .if defined(NOPORTDOCS) MAKE_ARGS= NOPORTDOCS=1 @@ -23,7 +24,8 @@ MAKE_ARGS= NOPORTDOCS=1 MAN1= gruftistats.1 post-patch: - @${PERL} -pi -e 's,strcasestr,strcasestr_x,g' ${WRKSRC}/ircstats.h \ + @${REINPLACE_CMD} -e \ + 's,strcasestr,strcasestr_x,g' ${WRKSRC}/ircstats.h \ ${WRKSRC}/lib.c .include <bsd.port.mk> diff --git a/math/jacal/Makefile b/math/jacal/Makefile index a318174ae2c5..da04f777c32d 100644 --- a/math/jacal/Makefile +++ b/math/jacal/Makefile @@ -19,6 +19,7 @@ WRKSRC= ${WRKDIR}/jacal USE_ZIP= yes USE_GMAKE= yes +USE_PERL5= yes NO_BUILD= yes MAN1= jacal.1 diff --git a/net-mgmt/ehnt/Makefile b/net-mgmt/ehnt/Makefile index 7299a2dc29ea..e02f1594367e 100644 --- a/net-mgmt/ehnt/Makefile +++ b/net-mgmt/ehnt/Makefile @@ -18,6 +18,8 @@ DISTFILES+= ${PORTNAME}_data-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= marck@rinet.ru +USE_PERL5= yes + MAN1= ehnt.1 MAN8= ehntserv.8 diff --git a/net/ehnt/Makefile b/net/ehnt/Makefile index 7299a2dc29ea..e02f1594367e 100644 --- a/net/ehnt/Makefile +++ b/net/ehnt/Makefile @@ -18,6 +18,8 @@ DISTFILES+= ${PORTNAME}_data-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= marck@rinet.ru +USE_PERL5= yes + MAN1= ehnt.1 MAN8= ehntserv.8 diff --git a/security/keyprint/Makefile b/security/keyprint/Makefile index ddbe71c927d9..8dbcf0039105 100644 --- a/security/keyprint/Makefile +++ b/security/keyprint/Makefile @@ -14,9 +14,10 @@ MASTER_SITE_SUBDIR= mharo MAINTAINER= mharo@FreeBSD.org NO_BUILD= yes +USE_REINPLACE= yes post-patch: - ${PERL} -pi -e 's,__PREFIX__,${PREFIX},' ${WRKSRC}/keyprint + ${REINPLACE_CMD} -e 's,__PREFIX__,${PREFIX},' ${WRKSRC}/keyprint do-install: ${MKDIR} ${PREFIX}/share/keyprint diff --git a/security/opieprint/Makefile b/security/opieprint/Makefile index ddbe71c927d9..8dbcf0039105 100644 --- a/security/opieprint/Makefile +++ b/security/opieprint/Makefile @@ -14,9 +14,10 @@ MASTER_SITE_SUBDIR= mharo MAINTAINER= mharo@FreeBSD.org NO_BUILD= yes +USE_REINPLACE= yes post-patch: - ${PERL} -pi -e 's,__PREFIX__,${PREFIX},' ${WRKSRC}/keyprint + ${REINPLACE_CMD} -e 's,__PREFIX__,${PREFIX},' ${WRKSRC}/keyprint do-install: ${MKDIR} ${PREFIX}/share/keyprint diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile index 1383bb940a14..0d8e9bb480b7 100644 --- a/security/pgp5/Makefile +++ b/security/pgp5/Makefile @@ -18,7 +18,9 @@ MAINTAINER= markm@FreeBSD.org WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes +USE_PERL5= yes RESTRICTED= "Crypto" + MAN1= pgp5.1 pgpe.1 pgpk.1 pgps.1 pgpv.1 MAN5= pgp.cfg.5 MAN7= pgp-integration.7 pgp-intro.7 diff --git a/sysutils/ndir/Makefile b/sysutils/ndir/Makefile index 448a111b97b8..78a3d8ddfac6 100644 --- a/sysutils/ndir/Makefile +++ b/sysutils/ndir/Makefile @@ -15,13 +15,14 @@ EXTRACT_SUFX= -1.tar.gz MAINTAINER= markp@FreeBSD.org USE_GMAKE= yes +USE_REINPLACE= yes ALL_TARGET= compile CFLAGS+= -DNO_THOUSANDS_GROUPING MAN1= ndir.1 MLINKS= ndir.1 lv.1 ndir.1 lw.1 post-patch: - @${PERL} -pi -e "s/^export GLOBAL.+//g" ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e "s/^export GLOBAL.+//g" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ndir ${PREFIX}/bin diff --git a/textproc/dadadodo/Makefile b/textproc/dadadodo/Makefile index 1a20c5755df7..7937a016555e 100644 --- a/textproc/dadadodo/Makefile +++ b/textproc/dadadodo/Makefile @@ -12,8 +12,10 @@ MASTER_SITES= http://www.jwz.org/dadadodo/ MAINTAINER= markp@FreeBSD.org +USE_REINPLACE= yes + pre-patch: - ${PERL} -pi -e "s/^(CC|CFLAGS).+//" ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e "s/^(CC|CFLAGS).+//" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dadadodo ${PREFIX}/bin diff --git a/textproc/mguesser/Makefile b/textproc/mguesser/Makefile index e59965a41729..29b5e27966ba 100644 --- a/textproc/mguesser/Makefile +++ b/textproc/mguesser/Makefile @@ -15,9 +15,11 @@ MAINTAINER= markp@FreeBSD.org WRKSRC= ${WRKDIR}/guesser CFLAGS+= -DUDM_GUESSER_STANDALONG -DLMDIR=\"${PREFIX}/share/mguesser\" MAKE_ENV+= CFLAGS="${$CFLAGS}" +USE_REINPLACE= yes post-patch: - ${PERL} -pi -e "s/^CC=.+//g; s|^CFLAGS=|CFLAGS+=|g; s|-Wall -g||g; \ + ${REINPLACE_CMD} -e \ + "s/^CC=.+//g; s|^CFLAGS=|CFLAGS+=|g; s|-Wall -g||g; \ s|./maps|${PREFIX}/share/mguesser|g" ${WRKSRC}/Makefile do-install: diff --git a/textproc/tclExpat/Makefile b/textproc/tclExpat/Makefile index eed7a6e8aa85..5ceef9f244ad 100644 --- a/textproc/tclExpat/Makefile +++ b/textproc/tclExpat/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= tcl${TCL_DVER}:${PORTSDIR}/lang/tcl${TCL_DVER} \ expat.4:${PORTSDIR}/textproc/expat2 INSTALLS_SHLIB= yes +USE_REINPLACE= yes TCL_VERSION= 8.3 TCL_DVER= ${TCL_VERSION:S/.//} @@ -29,7 +30,7 @@ post-extract: ${RM} -rf ${WRKSRC}/expat post-patch: - ${PERL} -pi -e 's/TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0/TCL_MAJOR_VERSION >= 8/;' \ + ${REINPLACE_CMD} -e 's/TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0/TCL_MAJOR_VERSION >= 8/;' \ -e 's/xmlparse.h/expat.h/;' ${WRKSRC}/tclexpat.c test: build diff --git a/textproc/ua-ispell/Makefile b/textproc/ua-ispell/Makefile index 7639bd636a7f..701d21e49820 100644 --- a/textproc/ua-ispell/Makefile +++ b/textproc/ua-ispell/Makefile @@ -18,6 +18,7 @@ BUILD_DEPENDS= buildhash:${PORTSDIR}/textproc/ispell USE_BZIP2= YES ALL_TARGET= koi USE_GMAKE= YES +USE_PERL5= yes # Still need gmake for other reasons :-\ #post-patch: diff --git a/ukrainian/ispell/Makefile b/ukrainian/ispell/Makefile index 7639bd636a7f..701d21e49820 100644 --- a/ukrainian/ispell/Makefile +++ b/ukrainian/ispell/Makefile @@ -18,6 +18,7 @@ BUILD_DEPENDS= buildhash:${PORTSDIR}/textproc/ispell USE_BZIP2= YES ALL_TARGET= koi USE_GMAKE= YES +USE_PERL5= yes # Still need gmake for other reasons :-\ #post-patch: diff --git a/www/cgichk/Makefile b/www/cgichk/Makefile index 906dd5b8dc01..c12669ecda56 100644 --- a/www/cgichk/Makefile +++ b/www/cgichk/Makefile @@ -16,10 +16,12 @@ MAINTAINER= markp@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= cgichk +USE_REINPLACE= yes pre-patch: - ${PERL} -pi -e "s/^(CC|CFLAGS).+//g" ${WRKSRC}/Makefile - ${PERL} -pi -e "s@/etc/@${PREFIX}/etc/@g; s/#include <getopt.h>//g; \ + ${REINPLACE_CMD} -e "s/^(CC|CFLAGS).+//g" ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e \ + "s@/etc/@${PREFIX}/etc/@g; s/#include <getopt.h>//g; \ s@^(?=.+sys/socket.h)@#include <sys/types.h>\n@g;" \ ${WRKSRC}/cgichk.h |