Quote ${CC} and similar variables in MAKE_ARGS.

Reported by:	Dominic Fandrey <kamikaze@bsdforen.de>

37 files changed, 41 insertions, 41 deletions

diff --git a/archivers/packddir/Makefile b/archivers/packddir/Makefile
index a7bbffc..d6d5dea 100644
--- a/archivers/packddir/Makefile
+++ b/archivers/packddir/Makefile
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/src
 
 PLIST_FILES=	bin/upackddir \
 		man/man1/upackddir.1.gz
-MAKE_ARGS=	CC=${CC}
+MAKE_ARGS=	CC="${CC}"
 
 post-patch:
 	${REINPLACE_CMD} -e 's|$$(DESTDIR)/usr|$$(DESTDIR)${PREFIX}|' ${WRKSRC}/Makefile
diff --git a/audio/autotalent/Makefile b/audio/autotalent/Makefile
index 268e764..338f200 100644
--- a/audio/autotalent/Makefile
+++ b/audio/autotalent/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake
 
-MAKE_ARGS=	CXX="${CXX}" CC=${CC} CPP=${CPP} \
+MAKE_ARGS=	CXX="${CXX}" CC="${CC}" CPP="${CPP}" \
 		CXXFLAGS="${CXXFLAGS} -fPIC -I${LOCALBASE}/include"
 
 ALL_TARGET=	targets
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index deafee7..8f35ba0 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw
 ALL_TARGET=	gramofile
 USES=		gmake perl5
 USE_CSTD=	gnu89
-MAKE_ARGS+=	CC=${CC}
-MAKE_ARGS+=	CXX=${CXX}
+MAKE_ARGS+=	CC="${CC}"
+MAKE_ARGS+=	CXX="${CXX}"
 
 PERLCOREDIR=	${LOCALBASE}/lib/perl5/${PERL_VER}/mach/CORE
 MAKE_ARGS+=	PERLCOREDIR=${PERLCOREDIR}
diff --git a/audio/squash/Makefile b/audio/squash/Makefile
index 9993085..1e90e80 100644
--- a/audio/squash/Makefile
+++ b/audio/squash/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	id3v2:${PORTSDIR}/audio/id3v2
 USE_BZIP2=	yes
 USES=		gmake
 USE_RUBY=	yes
-MAKE_ARGS=	CC=${CC}
+MAKE_ARGS=	CC="${CC}"
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index d42d194..e41c5e2 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	sacchi@gmail.com
 COMMENT=	System performance measurement tool
 
 ALL_TARGET=	build
-MAKE_ARGS=	CC='${CC}'
+MAKE_ARGS=	CC="${CC}"
 MAKE_ENV=	PATH=${PATH}:${WRKSRC}/scripts
 USES=		shebangfix perl5 gmake
 USE_PERL5=	run
diff --git a/biology/primer3/Makefile b/biology/primer3/Makefile
index d378442..2f294a9 100644
--- a/biology/primer3/Makefile
+++ b/biology/primer3/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Primer3 helps to choose primers for PCR reactions
 LICENSE=	GPLv2
 
 USES=		gmake
-MAKE_ARGS=	CC=${CC} CPP=${CXX}
+MAKE_ARGS=	CC="${CC}" CPP="${CXX}"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 PLIST_FILES=	bin/primer3
 
diff --git a/chinese/autoconvert/Makefile b/chinese/autoconvert/Makefile
index 3d70ef7..e68ab68 100644
--- a/chinese/autoconvert/Makefile
+++ b/chinese/autoconvert/Makefile
@@ -17,7 +17,7 @@ LICENSE_COMB=	dual
 OPTIONS_DEFINE=	DOCS
 
 MAKE_ENV=	CFLAG="${CPPFLAGS}" LIBS="${LDFLAGS}"
-MAKE_ARGS=	CC=${CC}
+MAKE_ARGS=	CC="${CC}"
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/databases/p5-Tie-LevelDB/Makefile b/databases/p5-Tie-LevelDB/Makefile
index a95d96d..dc35e94 100644
--- a/databases/p5-Tie-LevelDB/Makefile
+++ b/databases/p5-Tie-LevelDB/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libleveldb.so:${PORTSDIR}/databases/leveldb
 
-MAKE_ARGS=	CC=${CXX}
+MAKE_ARGS=	CC="${CXX}"
 USE_PERL5=	configure
 USES=		gmake perl5
 
diff --git a/devel/jna/Makefile b/devel/jna/Makefile
index 104311a..2254fc0 100644
--- a/devel/jna/Makefile
+++ b/devel/jna/Makefile
@@ -12,7 +12,7 @@ USES=		gmake
 USE_ANT=	yes
 USE_JAVA=	yes
 USE_XORG=	x11 xt
-MAKE_ARGS=	-DCC=${CC} -DLD=${LD}
+MAKE_ARGS=	-DCC="${CC}" -DLD="${LD}"
 MAKE_ENV+=      ANT_OPTS=-Drelease -DARCH=${ANT_ARCH}
 
 USE_GITHUB=	yes
diff --git a/editors/mined/Makefile b/editors/mined/Makefile
index ce0b47a..80dbd0f1 100644
--- a/editors/mined/Makefile
+++ b/editors/mined/Makefile
@@ -18,7 +18,7 @@ PORTDOCS=	*
 USES=		gmake
 MAKEFILE=	makefile
 REINPLACE_ARGS=	-i ""
-MAKE_ARGS=	GMAKE=${MAKE_CMD} CC=${CC:T} OPT="${CFLAGS}"
+MAKE_ARGS=	GMAKE="${MAKE_CMD}" CC="${CC}" OPT="${CFLAGS}"
 INSTALL_TARGET=	localinstall
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 2742584..c98cae5 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -32,7 +32,7 @@ UI_DESC=		User interface
 XTERM_SAVE_DESC=	Restore xterm screen after exit
 
 ALL_TARGET=	# empty
-MAKE_ARGS+=	CC=${CC} CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP=${STRIP_CMD} CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=termlib
+MAKE_ARGS+=	CC="${CC}" CONF_ARGS="--prefix=${PREFIX} ${CSCOPE_ARG}" STRIP="${STRIP_CMD}" CONF_OPT_MULTIBYTE=--enable-multibyte CONF_TERM_LIB=--with-tlib=termlib
 PATCH=		${LOCALBASE}/bin/gpatch
 PATCH_DIST_ARGS=--batch --directory ${WRKSRC} --forward --quiet --remove-empty-files ${PATCH_DIST_STRIP}
 REINPLACE_ARGS=	-i ''
diff --git a/emulators/adamem/Makefile b/emulators/adamem/Makefile
index c11532a..d5a13fc 100644
--- a/emulators/adamem/Makefile
+++ b/emulators/adamem/Makefile
@@ -14,7 +14,7 @@ COMMENT=	ADAMEm is a portable Coleco ADAM and ColecoVision emulator
 NO_WRKSUBDIR=	yes
 USE_XORG=	sm x11 xau xext xfixes xi xrandr
 
-MAKE_ARGS=	CC=${CC} LD=${CC}
+MAKE_ARGS=	CC="${CC}" LD="${CC}"
 ALL_TARGET=	x
 
 OPTIONS_DEFINE=	DOCS
diff --git a/ftp/ftpproxy/Makefile b/ftp/ftpproxy/Makefile
index e5c1982..ee982a9 100644
--- a/ftp/ftpproxy/Makefile
+++ b/ftp/ftpproxy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	ftp proxy
 
 USES=		gmake
 MAKE_JOBS_UNSAFE=	yes
-MAKE_ARGS=	CC=${CC}
+MAKE_ARGS=	CC="${CC}"
 
 PLIST_FILES=	sbin/ftp.proxy \
 		man/man1/ftp.proxy.1.gz
diff --git a/games/blackshadeselite/Makefile b/games/blackshadeselite/Makefile
index c650781..65e4c7b 100644
--- a/games/blackshadeselite/Makefile
+++ b/games/blackshadeselite/Makefile
@@ -17,7 +17,7 @@ USES=		tar:bzip2 gmake openal:al,alut
 USE_SDL=	sdl
 USE_GL=		yes
 
-MAKE_ARGS=	CC=${CC} CXX=${CXX}
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/qtv/Makefile b/games/qtv/Makefile
index 126ba4e..cdab403 100644
--- a/games/qtv/Makefile
+++ b/games/qtv/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	MVD demo data streaming proxy over TCP/IP for QuakeWorld servers
 
 ALL_TARGET=	${PORTNAME}
-MAKE_ARGS=	CC=${CC}
+MAKE_ARGS=	CC="${CC}"
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
 do-install:
diff --git a/graphics/alpng/Makefile b/graphics/alpng/Makefile
index 3dccf47..3e51bdb 100644
--- a/graphics/alpng/Makefile
+++ b/graphics/alpng/Makefile
@@ -17,7 +17,7 @@ HAS_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 USES=		gmake
-MAKE_ARGS=	CC=${CC}
+MAKE_ARGS=	CC="${CC}"
 CFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_FILES=	include/alpng.h \
diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index 274bcc2..0b62abc 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -15,7 +15,7 @@ USES=		gmake dos2unix zip
 DOS2UNIX_FILES=	Source/LibOpenJPEG/opj_malloc.h
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/FreeImage
-MAKE_ARGS=	CC=${CC} CPP=${CPP} CXX=${CXX}
+MAKE_ARGS=	CC="${CC}" CPP="${CPP}" CXX="${CXX}"
 
 CFLAGS+=	-fexceptions -fvisibility=hidden
 
diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile
index 668852b..2c268a5 100644
--- a/graphics/opennurbs/Makefile
+++ b/graphics/opennurbs/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	fernando.apesteguia@gmail.com
 COMMENT=	Tools to accurately transfer 3-D geometry between applications
 
 USES=		iconv:build dos2unix gmake zip
-MAKE_ARGS=	CC=${CC} CCC=${CXX}
+MAKE_ARGS=	CC="${CC}" CCC="${CXX}"
 
 MAKEFILE=	makefile
 EXAMPLESDIR=	${STAGEDIR}${PREFIX}/libexec/openNURBS
diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile
index 2949c4d..bdcb3ba 100644
--- a/graphics/sam2p/Makefile
+++ b/graphics/sam2p/Makefile
@@ -25,7 +25,7 @@ USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_pts_bash="${SH}"
 CONFIGURE_ARGS=	--enable-gif
-MAKE_ARGS=	CXXX="${CXX}" LDALL="${CXX}" CXXFLAGSB="${CXXFLAGS}" CC=${CC} CXX=${CXX}
+MAKE_ARGS=	CXXX="${CXX}" LDALL="${CXX}" CXXFLAGSB="${CXXFLAGS}" CC="${CC}" CXX="${CXX}"
 ALL_TARGET=	${PORTNAME}
 
 PORTDOCS=	*
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index cee7cc5..fbf2b64 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -22,7 +22,7 @@ USE_EFL=	imlib2
 USE_GL=		glut
 WRKSRC=		${WRKDIR}/sviewgl-src
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
-MAKE_ARGS=	CC=${CXX}
+MAKE_ARGS=	CC="${CXX}"
 
 PLIST_FILES=	bin/sviewgl
 
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index acfe3fe..2d6603e 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -57,7 +57,7 @@ CC=		clang
 CXX=		clang++
 CONFIGURE_ARGS+=	--disable-valgrind --disable-docs \
 			--enable-clang --mandir=${MANPREFIX}/man
-MAKE_ARGS+=		CC=${CC} CXX=${CXX} ARCH=x86_64
+MAKE_ARGS+=		CC="${CC}" CXX="${CXX}" ARCH=x86_64
 
 post-extract:
 	${MKDIR} ${WRKSRC}/${RUST_TARGET} && \
diff --git a/multimedia/m2vrequantiser/Makefile b/multimedia/m2vrequantiser/Makefile
index 3cdeb5ef..c786777 100644
--- a/multimedia/m2vrequantiser/Makefile
+++ b/multimedia/m2vrequantiser/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Requantize MPEG-2 streams without recompressing
 
 PATCH_STRIP=	-p1
 CFLAGS+=	-Duint=unsigned
-MAKE_ARGS+=	CC=${CC} CXX=${CXX}
+MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
 PLIST_FILES+=	bin/M2VRequantiser
 
 post-patch:
diff --git a/multimedia/szap-s2/Makefile b/multimedia/szap-s2/Makefile
index 2422bc2..a69886f 100644
--- a/multimedia/szap-s2/Makefile
+++ b/multimedia/szap-s2/Makefile
@@ -16,8 +16,8 @@ USES=		gmake tar:bzip2
 PATCH_STRIP=	-p1
 USE_CSTD=	gnu89
 MAKE_ARGS=	INCLUDE=-I"${LOCALBASE}/include"
-MAKE_ARGS+=	CC=${CC}
-MAKE_ARGS+=	CXX=${CXX}
+MAKE_ARGS+=	CC="${CC}"
+MAKE_ARGS+=	CXX="${CXX}"
 WRKSRC=		${WRKDIR}/szap-s2-e34f73b254db
 PORTDOCS=	README
 PLIST_FILES=	bin/szap-s2
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index f63649a..5485c5c 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -29,8 +29,8 @@ DIST_SUBDIR=	vdr
 PORTDOCS=	COPYING INSTALL MANUAL README HISTORY
 CONFDIR=	$(ETCDIR)
 USE_CSTD=	gnu89
-MAKE_ARGS+=	CC=${CC}
-MAKE_ARGS+=	CXX=${CXX}
+MAKE_ARGS+=	CC="${CC}"
+MAKE_ARGS+=	CXX="${CXX}"
 MAKE_ARGS+=	VDR_USER=${VDR_USER}
 MAKE_ARGS+=	CONFDIR=$(CONFDIR)
 MAKE_ARGS+=	OSTYPE=FreeBSD
diff --git a/multimedia/vdr/Makefile.plugins b/multimedia/vdr/Makefile.plugins
index fd315a8..1ed89b8 100644
--- a/multimedia/vdr/Makefile.plugins
+++ b/multimedia/vdr/Makefile.plugins
@@ -14,8 +14,8 @@ USES+=		gettext gmake
 VDRDIR=		${LOCALBASE}/include/vdr
 VDRINCDIR=	${LOCALBASE}/include
 USE_CSTD?=	gnu89
-MAKE_ARGS+=	CC=${CC}
-MAKE_ARGS+=	CXX=${CXX}
+MAKE_ARGS+=	CC="${CC}"
+MAKE_ARGS+=	CXX="${CXX}"
 MAKE_ARGS+=	DVBDIR=${LOCALBASE}/include
 MAKE_ARGS+=	VDRDIR=${VDRDIR}
 MAKE_ARGS+=	VDR_USER=${VDR_USER}
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index 55b2117..c92585e 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 USES=		gmake pkgconfig tar:bzip2
 USE_TEX=	latex
 USE_GNOME=	gtk20
-MAKE_ARGS=	CC=${CC}
+MAKE_ARGS=	CC="${CC}"
 
 PLIST_FILES=	lib/pidgin/LaTeX.so
 
diff --git a/net/empty/Makefile b/net/empty/Makefile
index 752c4f3..ef84e52 100644
--- a/net/empty/Makefile
+++ b/net/empty/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Expect-like tool for pure shell
 DOCS=		CHANGELOG COPYRIGHT README README.CYGWIN
 EXAMPLES=	README em_ssh.sh em_ssh_2.sh em_sh.sh \
 		em_telnet.sh em_telnet_2.sh emsu.sh runtests.sh
-MAKE_ARGS+=	CC=${CC}
+MAKE_ARGS+=	CC="${CC}"
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 40b5e9b..4fc1472 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=PCRE DPCRE
 
 .include <bsd.port.options.mk>
 
-MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS CC=${CC}
+MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS CC="${CC}"
 
 .if ${PORT_OPTIONS:MDPCRE}
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index c4bdcc8..0208ee2 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--with-binpathbase=${PREFIX}/sbin \
 		--with-libpath=${PREFIX}/lib
 
 MAKE_ENV=	DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}
-MAKE_ARGS+=	CC=${CC}
+MAKE_ARGS+=	CC="${CC}"
 CFLAGS+=	-DLDAP_DEPRECATED
 
 post-patch:
diff --git a/print/rtf2latex2e/Makefile b/print/rtf2latex2e/Makefile
index 6566f71..6ce4f0a 100644
--- a/print/rtf2latex2e/Makefile
+++ b/print/rtf2latex2e/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Newer filter that converts RTF (MS Rich Text Format) into LaTeX
 LICENSE=	GPLv2
 
 USES=		gmake
-MAKE_ARGS=	CC=${CC} \
+MAKE_ARGS=	CC="${CC}" \
 		mandir=${MAN1PREFIX}/man/
 
 .include <bsd.port.mk>
diff --git a/science/meep/Makefile b/science/meep/Makefile
index 0557de3..3c6b9aa 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -27,7 +27,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
-MAKE_ARGS+=	CC=${CC} CXX=${CXX}
+MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
 
 OPTIONS_DEFINE=		OPENMPI
 OPTIONS_DEFAULT=	OPENMPI
diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index 4d20feb..d250896 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	crees@FreeBSD.org
 COMMENT=	A cryptographic file system implemented as a user-space NFS server
 
 ALL_TARGET=	cfs
-MAKE_ARGS=	CC=cc
+MAKE_ARGS=	CC="${CC}"
 
 CFSD_BOOTSTRAP=	${PREFIX}/cfsd-bootstrap
 USE_RC_SUBR=	cfsd
diff --git a/security/libscrypt/Makefile b/security/libscrypt/Makefile
index 567b07c..e13f2db 100644
--- a/security/libscrypt/Makefile
+++ b/security/libscrypt/Makefile
@@ -17,7 +17,7 @@ GH_ACCOUNT=	technion
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	457ff86
 
-MAKE_ARGS+=	CC=${CC} LIBDIR=${PREFIX}/lib
+MAKE_ARGS+=	CC="${CC}" LIBDIR=${PREFIX}/lib
 
 PLIST_FILES=	include/libscrypt.h \
 		lib/libscrypt.so \
diff --git a/security/masscan/Makefile b/security/masscan/Makefile
index 6aa0fc3..0ecdfb0 100644
--- a/security/masscan/Makefile
+++ b/security/masscan/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv3
 
 USES=		gmake
 CFLAGS+=	-Wno-format
-MAKE_ARGS=	SYS=freebsd CC=${CC} CFLAGS="${CFLAGS}"
+MAKE_ARGS=	SYS=freebsd CC="${CC}" CFLAGS="${CFLAGS}"
 
 PLIST_FILES=	bin/masscan man/man8/masscan.8.gz
 
diff --git a/security/p5-Crypt-RSA-Yandex/Makefile b/security/p5-Crypt-RSA-Yandex/Makefile
index 0f96e74..0299ffd 100644
--- a/security/p5-Crypt-RSA-Yandex/Makefile
+++ b/security/p5-Crypt-RSA-Yandex/Makefile
@@ -13,6 +13,6 @@ COMMENT=	Perl binding to modified RSA (yamrsa)
 USES=	perl5
 USE_PERL5=	configure
 
-MAKE_ARGS=	CC=${CXX}
+MAKE_ARGS=	CC="${CXX}"
 
 .include <bsd.port.mk>
diff --git a/textproc/libflate/Makefile b/textproc/libflate/Makefile
index bcb6679..9f281f5 100644
--- a/textproc/libflate/Makefile
+++ b/textproc/libflate/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Template library used to deal with html code in CGI applications
 
 PLIST_FILES=	lib/${PORTNAME}.a bin/checktpl
 
-MAKE_ARGS+=	CC=${CC}
+MAKE_ARGS+=	CC="${CC}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/checktpl ${STAGEDIR}${PREFIX}/bin
diff --git a/www/p5-HTTP-HeaderParser-XS/Makefile b/www/p5-HTTP-HeaderParser-XS/Makefile
index 7cccd1b..5c4a6e0 100644
--- a/www/p5-HTTP-HeaderParser-XS/Makefile
+++ b/www/p5-HTTP-HeaderParser-XS/Makefile
@@ -13,6 +13,6 @@ COMMENT=	XS extension for processing HTTP headers
 USES=		perl5
 USE_PERL5=	configure
 
-MAKE_ARGS+=	CC=${CXX} LD=${CXX}
+MAKE_ARGS=	CC="${CXX}" LD="${CXX}"
 
 .include <bsd.port.mk>