Date: Wed, 14 Oct 2015 23:21:24 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399301 - branches/2015Q4/net/openldap24-server Message-ID: <201510142321.t9ENLOFq040948@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510142321.t9ENLOFq040948>