Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Dec 2012 07:52:56 +0000 (UTC)
From:      Daichi GOTO <daichi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308885 - head/japanese/mozc-server
Message-ID:  <201212140752.qBE7qusC017335@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: daichi
Date: Fri Dec 14 07:52:55 2012
New Revision: 308885
URL: http://svnweb.freebsd.org/changeset/ports/308885

Log:
  fixed build error related to OPENSSL_LDFLAGS
  
  PR:		ports/174406
  Submitted by:	Mamoru Sakaue <sakaue.mamoru@mwghennndo.com>

Modified:
  head/japanese/mozc-server/Makefile

Modified: head/japanese/mozc-server/Makefile
==============================================================================
--- head/japanese/mozc-server/Makefile	Fri Dec 14 07:16:20 2012	(r308884)
+++ head/japanese/mozc-server/Makefile	Fri Dec 14 07:52:55 2012	(r308885)
@@ -73,8 +73,9 @@ LOCALBASE_REPLACE_FILES=	\
 		third_party/gyp/pylib/gyp/generator/make.py
 SSL_REINPLACE_STR=
 .for V in OPENSSL_CFLAGS OPENSSLLIB OPENSSLINC OPENSSL_LDFLAGS
-SSL_REINPLACE_STR+=	-e "s,%%${V}%%,${${V}},"
+SSL_REINPLACE_STR+=	-e "s,%%${V}%%,${${V}:S/\\/\\\\/g:S/"/\"/g:S/\$/\\$/g:S/,/\,/g},"
 .endfor
+LOCALBASE_PTN=	${LOCALBASE:S/\\/\\\\/g:S/"/\"/g:S/\$/\\$/g:S/,/\,/g}
 
 GYP_DEFINES="use_libprotobuf=1"
 
@@ -88,7 +89,7 @@ BUILD_GYP_CMD=	cd ${WRKSRC}/third_party/
 
 post-patch:
 	cd ${WRKSRC} && \
-		${REINPLACE_CMD} "s,@@LOCALBASE@@,${LOCALBASE},g" \
+		${REINPLACE_CMD} "s,@@LOCALBASE@@,${LOCALBASE_PTN},g" \
 		${LOCALBASE_REPLACE_FILES}
 	cd ${WRKSRC} && \
 		${REINPLACE_CMD} ${SSL_REINPLACE_STR} base/base.gyp
@@ -97,7 +98,7 @@ post-patch:
 		${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \
 		unix/fcitx/gen_fcitx_mozc_i18n.sh
 	cd ${WRKSRC} && \
-		${REINPLACE_CMD} "s,/usr,${LOCALBASE}," \
+		${REINPLACE_CMD} "s,/usr,${LOCALBASE_PTN}," \
 		unix/fcitx/mozc.conf
 .endif
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212140752.qBE7qusC017335>