From owner-svn-ports-all@freebsd.org  Wed Oct 14 23:21:25 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB3ECA15578;
 Wed, 14 Oct 2015 23:21:25 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 93F6BD96;
 Wed, 14 Oct 2015 23:21:25 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9ENLOAF040949;
 Wed, 14 Oct 2015 23:21:24 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9ENLOFq040948;
 Wed, 14 Oct 2015 23:21:24 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201510142321.t9ENLOFq040948@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 14 Oct 2015 23:21:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r399301 - branches/2015Q4/net/openldap24-server
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2015 23:21:25 -0000

Author: delphij
Date: Wed Oct 14 23:21:24 2015
New Revision: 399301
URL: https://svnweb.freebsd.org/changeset/ports/399301

Log:
  MFH: r399232
  
  Use pipe sign (|) instead of comma (,) when doing sed.  This fixes a
  problem when the variable portion of sed command contains comma, for
  instance, when USE_GCC=4.9.
  
  PR:		192297
  Submitted by:	marino
  Requested by:	koobs
  Approved by:	ports-secteam

Modified:
  branches/2015Q4/net/openldap24-server/Makefile
Directory Properties:
  branches/2015Q4/   (props changed)

Modified: branches/2015Q4/net/openldap24-server/Makefile
==============================================================================
--- branches/2015Q4/net/openldap24-server/Makefile	Wed Oct 14 21:37:22 2015	(r399300)
+++ branches/2015Q4/net/openldap24-server/Makefile	Wed Oct 14 23:21:24 2015	(r399301)
@@ -512,10 +512,10 @@ PLIST_SUB+=		SHLIB_MINOR=${OPENLDAP_SHLI
 PLIST_SUB+=		OPENLDAP_MAJOR=${OPENLDAP_MAJOR}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/run/,${LDAP_RUN_DIR}/,g' \
+	@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
 		${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf
-	@${REINPLACE_CMD} -e 's,^OPT =.*,OPT = ${CFLAGS},g' \
-		-e 's,^CC =.*,CC = ${CC},g' \
+	@${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \
+		-e 's|^CC =.*|CC = ${CC}|g' \
 		${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \
 		${WRKSRC}/contrib/slapd-modules/*/*/Makefile
 .if defined(CONFIGURE_SED)