diff options
author | will <will@FreeBSD.org> | 2001-01-08 01:49:52 +0800 |
---|---|---|
committer | will <will@FreeBSD.org> | 2001-01-08 01:49:52 +0800 |
commit | 17fc78c61a40e51c25675da0e3d99e222c1abdd3 (patch) | |
tree | a8b19a050dd6847de35f8b185751c1b52138d171 | |
parent | 98a4931c0a8138d6f6fb6de52d4fd949a15ae520 (diff) | |
download | freebsd-ports-gnome-17fc78c61a40e51c25675da0e3d99e222c1abdd3.tar.gz freebsd-ports-gnome-17fc78c61a40e51c25675da0e3d99e222c1abdd3.tar.zst freebsd-ports-gnome-17fc78c61a40e51c25675da0e3d99e222c1abdd3.zip |
Clean up inefficient perl invocations; use multiple REs in the same call.
-rw-r--r-- | astro/pyweather/Makefile | 4 | ||||
-rw-r--r-- | audio/holyshout/Makefile | 6 | ||||
-rw-r--r-- | audio/snowstar/Makefile | 6 | ||||
-rw-r--r-- | biology/povchem/Makefile | 4 | ||||
-rw-r--r-- | chinese/big5con/Makefile | 3 | ||||
-rw-r--r-- | converters/kdesupport2/Makefile | 4 | ||||
-rw-r--r-- | devel/doxygen/Makefile | 7 | ||||
-rw-r--r-- | devel/kelp/Makefile | 4 | ||||
-rw-r--r-- | irc/kvirc-devel/Makefile | 7 | ||||
-rw-r--r-- | irc/kvirc/Makefile | 7 | ||||
-rw-r--r-- | irc/roxirc/Makefile | 4 | ||||
-rw-r--r-- | irc/tirc/Makefile | 3 | ||||
-rw-r--r-- | japanese/p5-Jcode/Makefile | 4 | ||||
-rw-r--r-- | mail/muttzilla/Makefile | 15 | ||||
-rw-r--r-- | misc/rfc/Makefile | 6 | ||||
-rw-r--r-- | net-mgmt/p0f/Makefile | 4 | ||||
-rw-r--r-- | net/p0f/Makefile | 4 | ||||
-rw-r--r-- | net/rsync/Makefile | 5 | ||||
-rw-r--r-- | security/portsentry/Makefile | 4 | ||||
-rw-r--r-- | www/bkmrkconv/Makefile | 4 | ||||
-rw-r--r-- | www/evg/Makefile | 6 | ||||
-rw-r--r-- | www/fhttpd/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/qt145/Makefile | 8 | ||||
-rw-r--r-- | x11/xbanner/Makefile | 4 |
24 files changed, 53 insertions, 74 deletions
diff --git a/astro/pyweather/Makefile b/astro/pyweather/Makefile index f99cc4759126..36b3d5358ea1 100644 --- a/astro/pyweather/Makefile +++ b/astro/pyweather/Makefile @@ -20,8 +20,8 @@ NO_BUILD= yes PYTHON?= ${LOCALBASE}/bin/python pre-install: - @${PERL} -pi -e "s:/usr/bin/python:${PYTHON}:g" ${WRKSRC}/pyWeather.py - @${PERL} -pi -e "s:pyWeather.py:pyWeather:g" ${WRKSRC}/pyWeather.py + @${PERL} -pi -e "s:/usr/bin/python:${PYTHON}:g ; \ + s:pyWeather.py:pyWeather:g" ${WRKSRC}/pyWeather.py do-install: @${INSTALL_SCRIPT} ${WRKSRC}/pyWeather.py ${PREFIX}/bin/pyWeather diff --git a/audio/holyshout/Makefile b/audio/holyshout/Makefile index 4c98541e0ddf..bffcb72fbae0 100644 --- a/audio/holyshout/Makefile +++ b/audio/holyshout/Makefile @@ -15,9 +15,7 @@ MAINTAINER= hollywar@mail.holywar.net USE_GMAKE= yes post-patch: - (cd ${WRKSRC} && find . -name Makefile | xargs ${PERL} -pi -e \ - "s@-O20@${CFLAGS}@g") - (cd ${WRKSRC} && find . -name Makefile | xargs ${PERL} -pi -e \ - "s@-O2@${CFLAGS}@g") + (find ${WRKSRC} -name Makefile | xargs ${PERL} -pi -e \ + "s@-O20@${CFLAGS}@g ; s@-O2@${CFLAGS}@g") .include <bsd.port.mk> diff --git a/audio/snowstar/Makefile b/audio/snowstar/Makefile index 864dafdcd425..a4d998c6ea3a 100644 --- a/audio/snowstar/Makefile +++ b/audio/snowstar/Makefile @@ -21,11 +21,9 @@ NO_WRKSUBDIR= true DOC_FILES= CHANGES TODO README_Snowstar LICENSE # somehow snowstar.tcl managed to get loaded with ^M's. -post-extract: - @${PERL} -pi -e "s|\r\n|\n|g" ${WRKSRC}/snowstar.tcl - post-patch: - @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/snowstar.tcl + @${PERL} -pi -e "s|\r\n|\n|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/snowstar.tcl do-install: ${INSTALL_SCRIPT} ${WRKSRC}/snowstar.tcl ${PREFIX}/bin/snowstar diff --git a/biology/povchem/Makefile b/biology/povchem/Makefile index 0c9c15d20572..4d3d5ee9c784 100644 --- a/biology/povchem/Makefile +++ b/biology/povchem/Makefile @@ -29,8 +29,8 @@ do-extract: .endfor post-patch: - @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/povchem.cfg - @${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/povchem.cfg + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g ; \ + s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/povchem.cfg do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEFS} -o povchem povchem.c -lm diff --git a/chinese/big5con/Makefile b/chinese/big5con/Makefile index bf24fd75299d..605b7f80bbcb 100644 --- a/chinese/big5con/Makefile +++ b/chinese/big5con/Makefile @@ -31,8 +31,7 @@ EXTRACT_ONLY= ${DISTNAME}.tgz .include <bsd.port.pre.mk> post-patch: .if ${OSVERSION} > 500012 - @${PERL} -pi -e 's,machine/console.h>,sys/consio.h>\n#include\t<sys/kbio.h>\n,' ${WRKSRC}/include/* - @${PERL} -pi -e 's,machine/console.h>,sys/consio.h>\n#include\t<sys/kbio.h>\n,' ${WRKSRC}/src/* + @${PERL} -pi -e 's,machine/console.h>,sys/consio.h>\n#include\t<sys/kbio.h>\n,' ${WRKSRC}/include/* ${WRKSRC}/src/* .endif pre-install: @if [ ! -f ${PREFIX}/lib/fonts/kc16.smf ]; then \ diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile index e542bf5d22cf..2b1a6fbf8ccc 100644 --- a/converters/kdesupport2/Makefile +++ b/converters/kdesupport2/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ USE_GMAKE= yes pre-configure: - ${PERL} -pi -e "s@TOPSUBDIRS libaps@TOPSUBDIRS@g" ${WRKSRC}/configure - ${PERL} -pi -e "s@odbc libaps@odbc@g" ${WRKSRC}/configure + ${PERL} -pi -e "s@TOPSUBDIRS libaps@TOPSUBDIRS@g ; \ + s@odbc libaps@odbc@g" ${WRKSRC}/configure ${PERL} -pi -e "s@-version-info 1:1@-version-info 3:0@g" ${WRKSRC}/mimelib/Makefile.in .include <bsd.port.mk> diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index a115dac01e2a..52931209c0ca 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -22,10 +22,9 @@ CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL5} --make ${GMAKE} CONFIGURE_ENV+= QTDIR=${X11BASE} pre-configure: - @${PERL} -pi -e "s:gcc:${CC}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf - @${PERL} -pi -e "s:g\+\+:${CXX}:" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf - @${PERL} -pi -e "s:%%CFLAGS%%:${CFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf - @${PERL} -pi -e "s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf + @${PERL} -pi -e "s:gcc:${CC}:g ; s:g\+\+:${CXX}:g ; \ + s:%%CFLAGS%%:${CFLAGS}:g ; \ + s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${PREFIX}/bin diff --git a/devel/kelp/Makefile b/devel/kelp/Makefile index 2ecea9ccc7cd..65ec22424730 100644 --- a/devel/kelp/Makefile +++ b/devel/kelp/Makefile @@ -29,8 +29,8 @@ INST_DIST= bin dgrid doc dock examples include kelp lib mp++ tools INST_KELP_HOME= ${LOCALBASE}/kelp post-patch: - @${PERL} -pi -e 's,API2,./API2,' ${WRKSRC}/examples/API/makefile - @${PERL} -pi -e 's,API3,./API3,' ${WRKSRC}/examples/API/makefile + @${PERL} -pi -e 's,API2,./API2, ; \ + s,API3,./API3,' ${WRKSRC}/examples/API/makefile @${PERL} -pi -e 's,%LOCALBASE%,${LOCALBASE},' ${WRKSRC}/configure do-install: diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile index 6f6570a9c21e..ea3b529a59ab 100644 --- a/irc/kvirc-devel/Makefile +++ b/irc/kvirc-devel/Makefile @@ -38,9 +38,8 @@ CONFIGURE_ARGS= --x-includes=$(X11BASE)/include \ CONFIGURE_ENV+= SS_X_EXTRA_LIBS=-lxpg4 pre-build: - for i in `find ${WRKSRC} -name Makefile` ; do \ - ${PERL} -pi -e "s@lqt @lqt2 @g" $$i ; \ - ${PERL} -pi -e "s@lpthread@pthread@g" $$i ; \ - done + @find ${WRKSRC} -name Makefile | xargs ${PERL} -pi -e \ + "s@lqt @lqt2 @g ; \ + s@lpthread@pthread@g" .include <bsd.port.mk> diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index 6f6570a9c21e..ea3b529a59ab 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -38,9 +38,8 @@ CONFIGURE_ARGS= --x-includes=$(X11BASE)/include \ CONFIGURE_ENV+= SS_X_EXTRA_LIBS=-lxpg4 pre-build: - for i in `find ${WRKSRC} -name Makefile` ; do \ - ${PERL} -pi -e "s@lqt @lqt2 @g" $$i ; \ - ${PERL} -pi -e "s@lpthread@pthread@g" $$i ; \ - done + @find ${WRKSRC} -name Makefile | xargs ${PERL} -pi -e \ + "s@lqt @lqt2 @g ; \ + s@lpthread@pthread@g" .include <bsd.port.mk> diff --git a/irc/roxirc/Makefile b/irc/roxirc/Makefile index eeafaa24865a..c5455a3c7fb0 100644 --- a/irc/roxirc/Makefile +++ b/irc/roxirc/Makefile @@ -25,7 +25,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/help ${PREFIX}/share/doc/roxirc/help post-patch: - @${PERL} -pi -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/roxirc - @${PERL} -pi -e 's,wish8.0,wish8.2,g' ${WRKSRC}/roxirc + @${PERL} -pi -e 's,/usr/local,${PREFIX},g ; \ + s,wish8.0,wish8.2,g' ${WRKSRC}/roxirc .include <bsd.port.mk> diff --git a/irc/tirc/Makefile b/irc/tirc/Makefile index 3bfe562c9541..058ddf9b603a 100644 --- a/irc/tirc/Makefile +++ b/irc/tirc/Makefile @@ -18,8 +18,7 @@ MAKE_FLAGS= CONF_ARGS="--prefix=${PREFIX}" MAN1= tirc.1 post-patch: - @${PERL} -pi -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/*.c - @${PERL} -pi -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/*.1 + @${PERL} -pi -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/*.c ${WRKSRC}/*.1 post-install: strip ${PREFIX}/bin/tirc diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile index b8b9a3862ede..d6e84c229d0d 100644 --- a/japanese/p5-Jcode/Makefile +++ b/japanese/p5-Jcode/Makefile @@ -31,8 +31,8 @@ do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ CC="${CC}" CCFLAGS="${CFLAGS}" .for DIR in Unicode Jcode - ${PERL} -pi -e "s:CCFLAGS = :CCFLAGS = ${CFLAGS}:g" ${WRKSRC}/${DIR}/Makefile - ${PERL} -pi -e "s:CC = cc:CC = ${CC}:g" ${WRKSRC}/${DIR}/Makefile + ${PERL} -pi -e "s:CCFLAGS = :CCFLAGS = ${CFLAGS}:g ; \ + s:CC = cc:CC = ${CC}:g" ${WRKSRC}/${DIR}/Makefile .endfor .include <bsd.port.post.mk> diff --git a/mail/muttzilla/Makefile b/mail/muttzilla/Makefile index a1550aa34995..d55db059da4f 100644 --- a/mail/muttzilla/Makefile +++ b/mail/muttzilla/Makefile @@ -16,19 +16,8 @@ MAINTAINER= obrien@FreeBSD.org pre-configure: @${PERL} -pi.orig \ -e "s:/etc/muttzilla.conf:${PREFIX}/etc/muttzilla.conf:g" \ - ${WRKSRC}/muttzilla.h - @${PERL} -pi.orig \ - -e "s:/etc/muttzilla.conf:${PREFIX}/etc/muttzilla.conf:g" \ - ${WRKSRC}/mzmail.sh - @${PERL} -pi.orig \ - -e "s:/etc/muttzilla.conf:${PREFIX}/etc/muttzilla.conf:g" \ - ${WRKSRC}/mzmail.py - @${PERL} -pi.orig \ - -e "s:/etc/muttzilla.conf:${PREFIX}/etc/muttzilla.conf:g" \ - ${WRKSRC}/mznews.sh - @${PERL} -pi.orig \ - -e "s:/etc/muttzilla.conf:${PREFIX}/etc/muttzilla.conf:g" \ - ${WRKSRC}/mznews.py + ${WRKSRC}/muttzilla.h ${WRKSRC}/mzmail.sh ${WRKSRC}/mzmail.py \ + ${WRKSRC}/mznews.sh ${WRKSRC}/mznews.py post-install: .if !defined(NOPORTDOCS) diff --git a/misc/rfc/Makefile b/misc/rfc/Makefile index 52e25078216e..a611c2bb71b1 100644 --- a/misc/rfc/Makefile +++ b/misc/rfc/Makefile @@ -24,9 +24,9 @@ do-extract: @${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}/${DISTNAME} do-configure: - @${PERL} -pi.orig -e 's|/usr/local/etc/rfc|${PREFIX}/etc/rfc|' ${WRKDIR}/${DISTNAME} - @${PERL} -pi.orig -e 's|/usr/local/etc/nmap|${PREFIX}/share/misc/nmap|' ${WRKDIR}/${DISTNAME} - @${PERL} -pi.orig -e 's|lynx|w3m|' ${WRKDIR}/${DISTNAME} + @${PERL} -pi.orig -e 's|/usr/local/etc/rfc|${PREFIX}/etc/rfc| ; \ + s|/usr/local/etc/nmap|${PREFIX}/share/misc/nmap| ; \ + s|lynx|w3m|' ${WRKDIR}/${DISTNAME} do-install: ${INSTALL_SCRIPT} ${WRKDIR}/rfc ${PREFIX}/bin/rfc diff --git a/net-mgmt/p0f/Makefile b/net-mgmt/p0f/Makefile index f5731c383453..af0b6cdc0c8d 100644 --- a/net-mgmt/p0f/Makefile +++ b/net-mgmt/p0f/Makefile @@ -17,8 +17,8 @@ MAINTAINER= trevor@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} post-patch: - @${PERL} -pi -e "s=/etc=${PREFIX}/etc=g" ${WRKSRC}/p0f.c - @${PERL} -pi -e "s=/etc=${PREFIX}/etc=g" ${WRKSRC}/README + @${PERL} -pi -e "s=/etc=${PREFIX}/etc=g ; \ + s=/etc=${PREFIX}/etc=g" ${WRKSRC}/README do-install: @${INSTALL_PROGRAM} ${WRKSRC}/p0f ${PREFIX}/bin diff --git a/net/p0f/Makefile b/net/p0f/Makefile index f5731c383453..af0b6cdc0c8d 100644 --- a/net/p0f/Makefile +++ b/net/p0f/Makefile @@ -17,8 +17,8 @@ MAINTAINER= trevor@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} post-patch: - @${PERL} -pi -e "s=/etc=${PREFIX}/etc=g" ${WRKSRC}/p0f.c - @${PERL} -pi -e "s=/etc=${PREFIX}/etc=g" ${WRKSRC}/README + @${PERL} -pi -e "s=/etc=${PREFIX}/etc=g ; \ + s=/etc=${PREFIX}/etc=g" ${WRKSRC}/README do-install: @${INSTALL_PROGRAM} ${WRKSRC}/p0f ${PREFIX}/bin diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 4e5048545cb2..fc451450c055 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -34,9 +34,8 @@ MAN1= rsync.1 MAN5= rsyncd.conf.5 pre-configure: - @${PERL} -pi.orig -e 's:/etc/:${PREFIX}/etc/:g' ${WRKSRC}/rsync.h - @${PERL} -pi.orig -e 's:/etc/:${PREFIX}/etc/:g' ${WRKSRC}/rsync.1 - @${PERL} -pi.orig -e 's:/etc/:${PREFIX}/etc/:g' ${WRKSRC}/rsyncd.conf.5 + @${PERL} -pi.orig -e 's:/etc/:${PREFIX}/etc/:g' + ${WRKSRC}/rsync.h ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5 .if defined(WITH_SSH) @${PERL} -pi.orig-rsh -e 's/"rsh"/"ssh"/g' ${WRKSRC}/rsync.h .endif diff --git a/security/portsentry/Makefile b/security/portsentry/Makefile index fa7180ad69c9..af71d8c92568 100644 --- a/security/portsentry/Makefile +++ b/security/portsentry/Makefile @@ -15,8 +15,8 @@ MAINTAINER= dan@freebsddiary.org ALL_TARGET= freebsd post-patch: - @${PERL} -pi -e 's,__PREFIX__,${PREFIX},g' ${WRKSRC}/portsentry.conf - @${PERL} -pi -e 's,__PREFIX__,${PREFIX},g' ${WRKSRC}/portsentry_config.h + @${PERL} -pi -e 's,__PREFIX__,${PREFIX},g' \ + ${WRKSRC}/portsentry.conf ${WRKSRC}/portsentry_config.h do-install: .if !exists($(PREFIX)/etc/portsentry.conf) diff --git a/www/bkmrkconv/Makefile b/www/bkmrkconv/Makefile index 4ba2b64f6d88..2096f3f3aa89 100644 --- a/www/bkmrkconv/Makefile +++ b/www/bkmrkconv/Makefile @@ -17,8 +17,8 @@ USE_PERL5= yes NO_BUILD= yes pre-install: - @${PERL} -pi -e "s:/usr/local/bin/perl:${PERL}:g" ${WRKSRC}/*.pl - @${PERL} -pi -e "s:/usr/local/share:${PREFIX}/share:g" ${WRKSRC}/bkmrkconv.pl + @${PERL} -pi -e "s:/usr/local/bin/perl:${PERL}:g ; \ + s:/usr/local/share:${PREFIX}/share:g" ${WRKSRC}/*.pl do-install: @${MKDIR} ${PREFIX}/share/bkmrkconv/src diff --git a/www/evg/Makefile b/www/evg/Makefile index 49ff81dbf7bf..54d6c2b4a16a 100644 --- a/www/evg/Makefile +++ b/www/evg/Makefile @@ -25,9 +25,9 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PKGNAME} post-patch: - @ ${PERL} -pi -e 's#/usr/bin/python#${PYTHON_CMD}#' ${WRKSRC}/evg - @ ${PERL} -pi -e 's#/usr/X11R6#${X11BASE}#' ${WRKSRC}/evg - @ ${PERL} -pi -e 's#/usr/bin/ee#${X11BASE}/bin/xv#' ${WRKSRC}/evg + @ ${PERL} -pi -e 's#/usr/bin/python#${PYTHON_CMD}# ; \ + s#/usr/X11R6#${X11BASE}# ; \ + s#/usr/bin/ee#${X11BASE}/bin/xv#' ${WRKSRC}/evg do-install: @ ${MKDIR} ${PYTHON_SITELIBDIR} diff --git a/www/fhttpd/Makefile b/www/fhttpd/Makefile index 29ab31076223..68e6a0d3eb09 100644 --- a/www/fhttpd/Makefile +++ b/www/fhttpd/Makefile @@ -23,9 +23,9 @@ pre-patch: pre-install: ${RM} -rf ${WRKSRC}/http-root/pub/dummy_directory - ${PERL} -pi -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" ${WRKSRC}/fhttpd.sh + ${PERL} -pi -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" \ + ${WRKSRC}/fhttpd.sh ${WRKSRC}/http-root/root-fhttpd.conf ${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/http-root/root-fhttpd.conf - ${PERL} -pi -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" ${WRKSRC}/http-root/root-fhttpd.conf do-install: ${INSTALL_SCRIPT} ${WRKSRC}/fhttpd.sh ${PREFIX}/etc/rc.d diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile index 5d84af50c082..3f9733d30a2a 100644 --- a/x11-toolkits/qt145/Makefile +++ b/x11-toolkits/qt145/Makefile @@ -48,10 +48,10 @@ post-patch: | eval `${AWK} '{print "ln -sf",$$1,"${WRKSRC}/include"}'` post-configure: - @${PERL} -pi -e "s:g\+\+:${CXX}:g" ${WRKSRC}/configs/freebsd-g++-${STATIC} - @${PERL} -pi -e "s:/usr/X11R6:${PREFIX}:g" ${WRKSRC}/configs/freebsd-g++-${STATIC} - @${PERL} -pi -e "s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/configs/freebsd-g++-${STATIC} - @${PERL} -pi -e "s:%%VERSION%%:${VERSION}:g" ${WRKSRC}/configs/freebsd-g++-${STATIC} + @${PERL} -pi -e "s:g\+\+:${CXX}:g ; \ + s:/usr/X11R6:${PREFIX}:g ; \ + s:%%CXXFLAGS%%:${CXXFLAGS}:g ; \ + s:%%VERSION%%:${VERSION}:g" ${WRKSRC}/configs/freebsd-g++-${STATIC} @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} freebsd-g++-${STATIC}) do-install: diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile index f6ee4cdf3d6d..8ef14560b78b 100644 --- a/x11/xbanner/Makefile +++ b/x11/xbanner/Makefile @@ -20,8 +20,8 @@ USE_XPM= yes #USE_IMAKE= yes post-patch: - @${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/xres.c - @${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/samples/XBanner.ad + @${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' \ + ${WRKSRC}/xres.c ${WRKSRC}/samples/XBanner.ad post-install: ${INSTALL_DATA} ${WRKSRC}/samples/XBanner.ad \ |