From 744ecfac3352a5a89c9b0731e7782ef6aa337244 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Thu, 10 Oct 2002 12:59:36 +0000 Subject: CC, CXX, CFLAGS, PTHREAD_CFLAGS and PTHREAD_LIBS may contain `/' in them when using a non-default compiler/linker, so do not use `/' as delimiter for s///. (I picked `|' instead) --- biology/p5-AcePerl/Makefile | 2 +- devel/cppadvio/Makefile | 2 +- devel/gnustep-make/Makefile | 2 +- devel/ptl/Makefile | 2 +- ftp/axel/Makefile | 4 ++-- games/smiley/Makefile | 2 +- graphics/avidemux/Makefile | 2 +- graphics/seejpeg/Makefile | 2 +- mail/autorespond/Makefile | 2 +- mail/kiltdown/Makefile | 4 ++-- mail/mreport/Makefile | 2 +- math/linalg/Makefile | 4 ++-- multimedia/avidemux/Makefile | 2 +- net-im/konverse/Makefile | 4 ++-- net/generic-nqs/Makefile | 4 ++-- net/konverse/Makefile | 4 ++-- net/libosip/Makefile | 2 +- net/libosip2/Makefile | 2 +- net/passlogd/Makefile | 2 +- textproc/p5-XML-Parser/Makefile | 4 ++-- x11-toolkits/p5-Tk/Makefile | 4 ++-- x11/twin/Makefile | 2 +- 22 files changed, 30 insertions(+), 30 deletions(-) diff --git a/biology/p5-AcePerl/Makefile b/biology/p5-AcePerl/Makefile index 7fff41cc3db4..9cefe7670932 100644 --- a/biology/p5-AcePerl/Makefile +++ b/biology/p5-AcePerl/Makefile @@ -38,7 +38,7 @@ MAN3= Ace.3 Ace::Browser::AceSubs.3 Ace::Browser::SearchSubs.3 \ MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} post-patch: - @ ${SED} -e 's/XX__CC__XX/${CC}/' < ${FILESDIR}/FREEBSD_DEF \ + @ ${SED} -e 's|XX__CC__XX|${CC}|' < ${FILESDIR}/FREEBSD_DEF \ > ${WRKSRC}/ace/wmake/FREEBSD_DEF .include diff --git a/devel/cppadvio/Makefile b/devel/cppadvio/Makefile index 661456da4dd0..91e657578e34 100644 --- a/devel/cppadvio/Makefile +++ b/devel/cppadvio/Makefile @@ -20,7 +20,7 @@ USE_GMAKE= yes post-patch: @( cd ${WRKSRC}; ${MV} c++ c++.orig; \ - ${SED} -e 's/^ *gcc/${CXX} ${CXXFLAGS}/' c++.orig > c++; ${CHMOD} +x c++ ) + ${SED} -e 's|^ *gcc|${CXX} ${CXXFLAGS}|' c++.orig > c++; ${CHMOD} +x c++ ) do-install: $(INSTALL_DATA) ${WRKSRC}/libcppadvio.a ${PREFIX}/lib diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 6d4d5ad06940..1f23c31af938 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -43,7 +43,7 @@ post-patch: .endfor post-configure: - ${SED} -e "s/\(objc_threaded:=\).*/\1 ${PTHREAD_LIBS}/" \ + ${SED} -e "s|\(objc_threaded:=\).*|\1 ${PTHREAD_LIBS}|" \ < ${WRKSRC}/config.make > ${WRKSRC}/config.make.new ${MV} ${WRKSRC}/config.make.new ${WRKSRC}/config.make diff --git a/devel/ptl/Makefile b/devel/ptl/Makefile index aff5fce8c45d..edb1330df00f 100644 --- a/devel/ptl/Makefile +++ b/devel/ptl/Makefile @@ -31,7 +31,7 @@ DOCS= COPYING ChangeLog FAQ NEWS \ WISHLIST doc/manual.ps.gz post-patch: - ${PERL} -i -pe 's/-O[2-6]/${CFLAGS}/g' \ + ${PERL} -i -pe 's|-O[2-6]|${CFLAGS}|g' \ ${WRKSRC}/Util/Makefile.in \ ${WRKSRC}/Util/configure \ ${WRKSRC}/libaltsys/utils/configure diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile index ad274b2bb091..af3c6a93f3d1 100644 --- a/ftp/axel/Makefile +++ b/ftp/axel/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --i18n=1 MAN1= axel.1 post-configure: - @${REINPLACE_CMD} -e 's,-O3,${CFLAGS},; s/gcc/${CC}/; \ - s/-pthread/${PTHREAD_LIBS}/' ${WRKSRC}/Makefile.settings + @${REINPLACE_CMD} -e 's,-O3,${CFLAGS},; s|gcc|${CC}|; \ + s|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.settings .include diff --git a/games/smiley/Makefile b/games/smiley/Makefile index d22d025e792b..6c31bd322b50 100644 --- a/games/smiley/Makefile +++ b/games/smiley/Makefile @@ -18,7 +18,7 @@ MAN1= "smiley.1" post-patch: ${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.input - ${SED} "s/%CFLAGS%/${CFLAGS}/" ${WRKSRC}/Makefile.input > ${WRKSRC}/Makefile + ${SED} "s|%CFLAGS%|${CFLAGS}|" ${WRKSRC}/Makefile.input > ${WRKSRC}/Makefile ${RM} -f ${WRKSRC}/Makefile.input do-install: diff --git a/graphics/avidemux/Makefile b/graphics/avidemux/Makefile index 2d8b79bbf60e..40799eceac2f 100644 --- a/graphics/avidemux/Makefile +++ b/graphics/avidemux/Makefile @@ -35,6 +35,6 @@ CONFIGURE_ARGS= --with-xvid-as-decoder USE_GMAKE= yes post-patch: - @${REINPLACE_CMD} 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure + @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure .include diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile index d2c2480de587..bb00bf36ef58 100644 --- a/graphics/seejpeg/Makefile +++ b/graphics/seejpeg/Makefile @@ -29,6 +29,6 @@ post-extract: post-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.prev - ${SED} "s/-O3/${CFLAGS}/g" ${WRKSRC}/Makefile.prev > ${WRKSRC}/Makefile + ${SED} "s|-O3|${CFLAGS}|g" ${WRKSRC}/Makefile.prev > ${WRKSRC}/Makefile .include diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile index a71644a03f01..11e0594957b9 100644 --- a/mail/autorespond/Makefile +++ b/mail/autorespond/Makefile @@ -19,7 +19,7 @@ CFLAGS+= -DNEED_STRCASESTR .endif post-patch: - ${PERL} -pi.fbsd -e "s/^(DEFS =.*)/\1 ${CFLAGS}/" ${WRKSRC}/Makefile + ${PERL} -pi.fbsd -e "s|^(DEFS =.*)|\1 ${CFLAGS}|" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/autorespond ${PREFIX}/bin/ diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile index e6323d262fa8..18a7a961289c 100644 --- a/mail/kiltdown/Makefile +++ b/mail/kiltdown/Makefile @@ -27,8 +27,8 @@ BUILD_ENV+= PATH=${PATH}:${X11BASE}/bin post-patch: @${MV} ${WRKSRC}/configs/bsd-generic ${WRKSRC}/configs/bsd-generic.sed ${SED} \ - -e "s/SYS_CFLAGS=-pthread/SYS_CFLAGS=${PTHREAD_CFLAGS} ${CFLAGS}/" \ - -e "s/SYS_LDFLAGS=-pthread/SYS_LDFLAGS=${PTHREAD_LIBS} ${LDFLAGS}/" \ + -e "s|SYS_CFLAGS=-pthread|SYS_CFLAGS=${PTHREAD_CFLAGS} ${CFLAGS}|" \ + -e "s|SYS_LDFLAGS=-pthread|SYS_LDFLAGS=${PTHREAD_LIBS} ${LDFLAGS}|" \ ${WRKSRC}/configs/bsd-generic.sed \ > ${WRKSRC}/configs/bsd-generic diff --git a/mail/mreport/Makefile b/mail/mreport/Makefile index 1e51b056c77e..41a029f139e5 100644 --- a/mail/mreport/Makefile +++ b/mail/mreport/Makefile @@ -19,7 +19,7 @@ MAN8= mreport.8 post-patch: @${REINPLACE_CMD} -e "s/^.TH mreport 1/.TH mreport 8/g; s/^.LO 1/.LO 8/g;" \ ${WRKSRC}/mreport.1 - @${REINPLACE_CMD} -E -e "s/^CC.+//g; s/-Wall -c -O2/${CFLAGS} -c/g;" \ + @${REINPLACE_CMD} -E -e "s/^CC.+//g; s|-Wall -c -O2|${CFLAGS} -c|g;" \ ${WRKSRC}/Makefile do-install: diff --git a/math/linalg/Makefile b/math/linalg/Makefile index 41275671ab9e..e4a25153f7ed 100644 --- a/math/linalg/Makefile +++ b/math/linalg/Makefile @@ -19,8 +19,8 @@ INSTALL_TARGET= lib USE_GMAKE= yes post-patch: - @( cd ${WRKSRC}; ${SED} -e 's/%%CXXFLAGS%%/${CXXFLAGS}/g' \ - -e 's/%%CXX%%/${CXX}/g' c++ > c++.sed; mv c++.sed c++; ${CHMOD} +x c++ ) + @( cd ${WRKSRC}; ${SED} -e 's|%%CXXFLAGS%%|${CXXFLAGS}|g' \ + -e 's|%%CXX%%|${CXX}|g' c++ > c++.sed; mv c++.sed c++; ${CHMOD} +x c++ ) post-install: $(INSTALL_DATA) ${WRKSRC}/libla.a ${PREFIX}/lib diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 2d8b79bbf60e..40799eceac2f 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -35,6 +35,6 @@ CONFIGURE_ARGS= --with-xvid-as-decoder USE_GMAKE= yes post-patch: - @${REINPLACE_CMD} 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure + @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure .include diff --git a/net-im/konverse/Makefile b/net-im/konverse/Makefile index 1b42f0d44ceb..36d6283801b3 100644 --- a/net-im/konverse/Makefile +++ b/net-im/konverse/Makefile @@ -25,10 +25,10 @@ CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \ --with-qt-libraries=${QT_PREFIX}/lib pre-patch: - ${REINPLACE_CMD} -e 's/-lqt/-lqt-mt '${PTHREAD_LIBS}'/' \ + ${REINPLACE_CMD} -e 's|-lqt|-lqt-mt ${PTHREAD_LIBS}|' \ -e 's/libqt\.\*/libqt-mt.*/' ${WRKSRC}/configure ${REINPLACE_CMD} -e 's/\(LDADD.*\)-ldl/\1/' \ - -e 's/-lqt/'${PTHREAD_LIBS}'/' ${WRKSRC}/konverse/Makefile.in + -e 's|-lqt|${PTHREAD_LIBS}|' ${WRKSRC}/konverse/Makefile.in ${REINPLACE_CMD} -e 's/\(QDateTime.*\)timezone/\1local-\>tm_gmtoff/g' \ ${WRKSRC}/konverse/jabbercore.cpp .for f in konverse/rostertree.h konverse/dlgchat.h diff --git a/net/generic-nqs/Makefile b/net/generic-nqs/Makefile index d6391c15981f..c24bb32cf974 100644 --- a/net/generic-nqs/Makefile +++ b/net/generic-nqs/Makefile @@ -98,12 +98,12 @@ MAN1= nmapmgr.1 nqs.1 nqsconfig.1 nqsgs.1 nqsrn.1\ post-patch: @${MV} ${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh \ ${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh.orig ; \ - ${SED} -e 's/-O6 -fno-strength-reduce/${CFLAGS}/' \ + ${SED} -e 's|-O6 -fno-strength-reduce|${CFLAGS}|' \ ${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh.orig \ > ${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh pre-configure: - @ ${SED} -e 's/XX_CFLAGS_XX/${CFLAGS}/' ${FILESDIR}/${TEMPLATE} > ${PLATFORMDIR}/${PLATFORM}; \ + @ ${SED} -e 's|XX_CFLAGS_XX|${CFLAGS}|' ${FILESDIR}/${TEMPLATE} > ${PLATFORMDIR}/${PLATFORM}; \ ${CP} ${FILESDIR}/${DUMMYMAKE} ${WRKSRC}; \ ${CHMOD} 555 ${WRKSRC}/Source-Tree/SETUP/all-systems/* ${RM} -f ${MANDIR}/*.man ; \ diff --git a/net/konverse/Makefile b/net/konverse/Makefile index 1b42f0d44ceb..36d6283801b3 100644 --- a/net/konverse/Makefile +++ b/net/konverse/Makefile @@ -25,10 +25,10 @@ CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \ --with-qt-libraries=${QT_PREFIX}/lib pre-patch: - ${REINPLACE_CMD} -e 's/-lqt/-lqt-mt '${PTHREAD_LIBS}'/' \ + ${REINPLACE_CMD} -e 's|-lqt|-lqt-mt ${PTHREAD_LIBS}|' \ -e 's/libqt\.\*/libqt-mt.*/' ${WRKSRC}/configure ${REINPLACE_CMD} -e 's/\(LDADD.*\)-ldl/\1/' \ - -e 's/-lqt/'${PTHREAD_LIBS}'/' ${WRKSRC}/konverse/Makefile.in + -e 's|-lqt|${PTHREAD_LIBS}|' ${WRKSRC}/konverse/Makefile.in ${REINPLACE_CMD} -e 's/\(QDateTime.*\)timezone/\1local-\>tm_gmtoff/g' \ ${WRKSRC}/konverse/jabbercore.cpp .for f in konverse/rostertree.h konverse/dlgchat.h diff --git a/net/libosip/Makefile b/net/libosip/Makefile index 3d5804791d36..0bb49f816236 100644 --- a/net/libosip/Makefile +++ b/net/libosip/Makefile @@ -20,6 +20,6 @@ INSTALLS_SHLIB= yes PLIST_SUB= PORTVERSION=${PORTVERSION} post-patch: - @${REINPLACE_CMD} -e "s/-lpthread/${PTHREAD_LIBS}/g" ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure .include diff --git a/net/libosip2/Makefile b/net/libosip2/Makefile index 3d5804791d36..0bb49f816236 100644 --- a/net/libosip2/Makefile +++ b/net/libosip2/Makefile @@ -20,6 +20,6 @@ INSTALLS_SHLIB= yes PLIST_SUB= PORTVERSION=${PORTVERSION} post-patch: - @${REINPLACE_CMD} -e "s/-lpthread/${PTHREAD_LIBS}/g" ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure .include diff --git a/net/passlogd/Makefile b/net/passlogd/Makefile index 36da170a0b4e..1bae91dca26c 100644 --- a/net/passlogd/Makefile +++ b/net/passlogd/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.morphine.com/src/ MAINTAINER= petef@FreeBSD.org post-patch: - ${PERL} -pi -e "s/.\(CXX\)/${CC} ${CFLAGS}/g" ${WRKSRC}/Makefile + ${PERL} -pi -e "s|.\(CXX\)|${CC} ${CFLAGS}|g" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/passlogd ${PREFIX}/sbin diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile index aace4925d7da..0721b822c931 100644 --- a/textproc/p5-XML-Parser/Makefile +++ b/textproc/p5-XML-Parser/Makefile @@ -47,7 +47,7 @@ post-patch: .endif post-configure: - @${PERL} -i -pe 's/^(CC = ).*/$$1 ${CC}/;' \ - -e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' ${WRKSRC}/Expat/Makefile + @${PERL} -i -pe 's|^(CC = ).*|$$1 ${CC}|;' \ + -e 's|^(CCFLAGS = ).*|$$1 ${CFLAGS}|' ${WRKSRC}/Expat/Makefile .include diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile index 152114fe2037..6c4729e468c1 100644 --- a/x11-toolkits/p5-Tk/Makefile +++ b/x11-toolkits/p5-Tk/Makefile @@ -128,8 +128,8 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} post-configure: @${PERL} -i -p \ - -e 's/^(CC = ).*/$$1 ${CC}/;' \ - -e 's/^(CCFLAGS = ).*/$$1 ${CFLAGS}/' \ + -e 's|^(CC = ).*|$$1 ${CC}|;' \ + -e 's|^(CCFLAGS = ).*|$$1 ${CFLAGS}|' \ `${FIND} ${WRKSRC} -name Makefile` .include diff --git a/x11/twin/Makefile b/x11/twin/Makefile index cc71b606b73b..76308201b068 100644 --- a/x11/twin/Makefile +++ b/x11/twin/Makefile @@ -24,6 +24,6 @@ INSTALLS_SHLIB= yes MAN1= twin.1 post-patch: - @${REINPLACE_CMD} -e "s/-lpthread/${PTHREAD_LIBS}/g" ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure .include -- cgit v1.2.3