From aaeb4b1425bfe845ae22767084c03c14edda9e76 Mon Sep 17 00:00:00 2001
From: knu <knu@FreeBSD.org>
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)

---
 net/generic-nqs/Makefile | 4 ++--
 net/konverse/Makefile    | 4 ++--
 net/libosip/Makefile     | 2 +-
 net/libosip2/Makefile    | 2 +-
 net/passlogd/Makefile    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'net')

diff --git a/net/generic-nqs/Makefile b/net/generic-nqs/Makefile
index d6391c1..c24bb32 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 1b42f0d..36d6283 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 3d58047..0bb49f8 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 <bsd.port.mk>
diff --git a/net/libosip2/Makefile b/net/libosip2/Makefile
index 3d58047..0bb49f8 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 <bsd.port.mk>
diff --git a/net/passlogd/Makefile b/net/passlogd/Makefile
index 36da170..1bae91d 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
-- 
cgit v1.1