Index: head/cad/brlcad/files/mged.sh
===================================================================
--- head/cad/brlcad/files/mged.sh	(revision 424091)
+++ head/cad/brlcad/files/mged.sh	(revision 424092)
@@ -1,13 +1,13 @@
 #!/bin/sh
 # This is pretty lame for the time being, but it serves as a reminder
 # to set correctly your environment before attempting to run BRL CAD.
 
 BRLCAD_ROOT=%%BRLCAD_ROOT%%
 
 export BRLCAD_ROOT
 export PATH=%%BRLCAD_ROOT%%/bin:$PATH
 export MANPATH=%%BRLCAD_ROOT%%/man:$MANPATH
 export ITCL_PATH=%%BRLCAD_ROOT%%/lib/itcl3.4
 export ITK_PATH=%%BRLCAD_ROOT%%/lib/itk3.4
 
-exec %%BRLCAD_ROOT%%/bin/mged $@
+exec %%BRLCAD_ROOT%%/bin/mged "$@"
Index: head/devel/hadoop/files/hadoop.in
===================================================================
--- head/devel/hadoop/files/hadoop.in	(revision 424091)
+++ head/devel/hadoop/files/hadoop.in	(revision 424092)
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
+
 for i in `ls %%ETCDIR%%/envvars.d/*.env`
 do
    . ${i}
 done
 
-exec %%DATADIR%%/bin/hadoop $@
+exec %%DATADIR%%/bin/hadoop "$@"
Index: head/games/childsplay/Makefile
===================================================================
--- head/games/childsplay/Makefile	(revision 424091)
+++ head/games/childsplay/Makefile	(revision 424092)
@@ -1,58 +1,59 @@
 # Created by: bruno
 # $FreeBSD$
 
 PORTNAME=	childsplay
 PORTVERSION=	2.6.5
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Educative games for children
 
 LICENSE=	GPLv3 # only
 LICENSE_FILE=	${WRKSRC}/gpl-3.0.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy08>0:databases/py-sqlalchemy08 \
 		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
 
 NO_BUILD=	yes
 
 USES=		gettext shebangfix tar:tgz python:2
 USE_GNOME=	pygtk2
 
 SHEBANG_FILES=	childsplay.py
 .for i in buttons funcs text dialogs gtk_widgets base
 SHEBANG_FILES+=	SPWidgets/$i.py
 .endfor
 
 DESKTOP_ENTRIES="Childsplay" "" "" "${PORTNAME}" "Game;Education;" ""
 
 CHILDSPLAYDIR=	${PYTHONPREFIX_SITELIBDIR}/childsplay
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/NoGtk/s|True|False|' ${WRKSRC}/SPConstants.py
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${PREFIX}|' ${WRKSRC}/pangofont.py
 
 do-configure:
 	@${ECHO_CMD} "#!${SH}" > ${WRKDIR}/childsplay.sh
 	@${ECHO_CMD} >> ${WRKDIR}/childsplay.sh
 	@${ECHO_CMD} 'cd "${CHILDSPLAYDIR}"' >> ${WRKDIR}/childsplay.sh
-	@${ECHO_CMD} 'exec ${PYTHON_CMD} childsplay.py $$@' >> ${WRKDIR}/childsplay.sh
+	@${ECHO_CMD} 'exec ${PYTHON_CMD} childsplay.py "$$@"' \
+		>> ${WRKDIR}/childsplay.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/childsplay.sh ${STAGEDIR}${PREFIX}/bin/childsplay
+	${INSTALL_SCRIPT} ${WRKDIR}/childsplay.sh \
+		${STAGEDIR}${PREFIX}/bin/childsplay
 	@${MKDIR} ${STAGEDIR}${CHILDSPLAYDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.py ${STAGEDIR}${CHILDSPLAYDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "SPWidgets alphabetsounds lib" \
 		${STAGEDIR}${CHILDSPLAYDIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} locale ${STAGEDIR}${PREFIX}/share)
 	${INSTALL_DATA} ${WRKSRC}/sp_content.db ${STAGEDIR}${CHILDSPLAYDIR}
-
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
 .include <bsd.port.mk>
Index: head/games/stepmania-devel/Makefile
===================================================================
--- head/games/stepmania-devel/Makefile	(revision 424091)
+++ head/games/stepmania-devel/Makefile	(revision 424092)
@@ -1,90 +1,90 @@
 # Created by: Brad Allen <braddo@tranceaddict.net>
 # $FreeBSD$
 
 PORTNAME=	stepmania
 PORTVERSION=	5.0.11
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	games
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rhythm game simulator
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/Docs/Licenses.txt
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libpng.so:graphics/png
 
 USE_GITHUB=	yes
 
 USES=		cmake:outsource iconv jpeg perl5 pkgconfig shebangfix
 SHEBANG_FILES=	Utils/*.pl extern/zlib/zlib2ansi
 USE_XORG=	x11 xrandr xtst
 USE_GL=		glew
 USE_PERL5=	build
 CMAKE_ARGS=	-DHAVE__MKDIR:BOOL=OFF
 INSTALLS_ICONS=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		ALSA DOCS FFMPEG GTK2 JACK MAD PULSEAUDIO VAAPI VORBIS
 OPTIONS_DEFAULT=	GTK2 MAD VORBIS
 OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_OFF=		-DWITH_ALSA:BOOL=OFF
 FFMEPG_BUILD_DEPENDS=	yasm:devel/yasm
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_ON=	-DWITH_SYSTEM_FFMPEG:BOOL=ON
 FFMPEG_CMAKE_OFF=	-DWITH_FFMPEG:BOOL=OFF
 GTK2_USE=		gnome=gtk20
 GTK2_CMAKE_ON=		-DWITH_GTK2:BOOL=ON
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	-DWITH_JACK:BOOL=OFF
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CMAKE_OFF=		-DWITH_MP3:BOOL=OFF
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE:BOOL=OFF
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CMAKE_OFF=	-DVA_FOUND:BOOL=OFF
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CMAKE_OFF=	-DWITH_OGG:BOOL=OFF
 
 pre-build:
 	@${MKDIR} ${WRKDIR}/wrappers
 	@${ECHO_CMD} -n \
 		> ${WRKDIR}/wrappers/stepmania
 	@${ECHO_CMD} '#!${SH}' \
 		>> ${WRKDIR}/wrappers/stepmania
 	@${ECHO_CMD} 'cd ${PREFIX}/lib/stepmania' \
 		>> ${WRKDIR}/wrappers/stepmania
-	@${ECHO_CMD} 'exec ./stepmania $$@' \
+	@${ECHO_CMD} 'exec ./stepmania "$$@"' \
 		>> ${WRKDIR}/wrappers/stepmania
 
 do-install:
 	(cd ${WRKDIR}/wrappers && ${INSTALL_SCRIPT} stepmania \
 		${STAGEDIR}${PREFIX}/bin)
 .for i in Announcers BGAnimations BackgroundEffects BackgroundTransitions \
 	Characters Courses Data NoteSkins Scripts Songs Themes
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} \
 		${STAGEDIR}${PREFIX}/lib/stepmania)
 .endfor
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} stepmania \
 		${STAGEDIR}${PREFIX}/lib/stepmania)
 	(cd ${WRKSRC} && ${INSTALL_DATA} stepmania.desktop \
 		${STAGEDIR}${PREFIX}/share/applications)
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} icons \
 		${STAGEDIR}${PREFIX}/share)
 
 post-install-GTK2-on:
 	(cd ${WRKSRC} && ${INSTALL_LIB} GtkModule.so \
 		${STAGEDIR}${PREFIX}/lib/stepmania)
 
 post-install-DOCS-on:
 	@(cd ${WRKSRC}/Docs && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DOCSDIR} "! -name Licenses.txt")
 
 .include <bsd.port.mk>
Index: head/japanese/mozc-server/Makefile
===================================================================
--- head/japanese/mozc-server/Makefile	(revision 424091)
+++ head/japanese/mozc-server/Makefile	(revision 424092)
@@ -1,424 +1,424 @@
 # Created by: Daichi GOTO <daichi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mozc
 PORTVERSION=	2.17.2322.102
 PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	https://codeload.github.com/google/${PORTNAME}/tar.gz/9b4c9e0?dummy=/:main \
 		https://codeload.github.com/hiroyuki-komatsu/japanese-usage-dictionary/tar.gz/e5b3425?dummy=/:udic
 DISTFILES=	google-${PORTNAME}-9b4c9e0_GH0.tar.gz:main \
 		hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz:udic
 EXTRACT_ONLY=	google-${PORTNAME}-9b4c9e0_GH0.tar.gz \
 		hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT?=	Mozc Japanese Input Method, Server
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ninja:devel/ninja \
 		gyp:devel/py-gyp
 EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
 		libzinnia.so:japanese/zinnia
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++11-lang pkgconfig iconv:wchar_t gmake \
 		tar:bzip2 python:2.7,build shebangfix
 WRKSRC=		${WRKDIR}/${PORTNAME}-9b4c9e0
 SHEBANG_FILES=	src/build_mozc.py
 BUILD_WRKSRC=	${WRKSRC}/src
 
 BUILD_MOZC_LIST?=	mozc_server
 
 .if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server"
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-server
 
 LICENSE=		BSD3CLAUSE NAISTL
 LICENSE_COMB=		multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE
 LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_NAME_NAISTL=	Nara Institute of Science and Technology License
 LICENSE_PERMS_NAISTL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_FILE_NAISTL=	${WRKSRC}/src/data/dictionary_oss/README.txt
 LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX}
 .elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
 USE_GNOME=	glib20 gtk20
 USE_QT4=	corelib gui qmake_build moc_build rcc_build uic_build
 .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 USE_XORG=	xcb
 USE_GNOME=	glib20 gtk20
 .elif ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"
 USE_EMACS=	yes
 .elif ${BUILD_MOZC_LIST:Mfcitx_mozc}
 USES+=		gettext-tools
 .endif
 
 # Use GCC only when the stock clang does not have libc++.so.
 .if exists(/usr/bin/clang) && exists(/usr/lib/libc++.so)
 _CCTYPE=	clang
 .else
 USE_GCC=	yes
 _CCTYPE=	gcc
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
 BROKEN=		Does not compile: segfault
 .endif
 
 GYP_DEFINES=	use_libprotobuf=1 \
 		channel_dev=0 \
 		enable_unittest=0 \
 		compiler_host="${_CCTYPE}" \
 		compiler_target="${_CCTYPE}" \
 		use_libzinnia=1 \
 		zinnia_model_file="${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model" \
 		ibus_mozc_icon_path="${LOCALBASE}/share/ibus-mozc/icons/product_icon.png" \
 		ibus_mozc_path="${PREFIX}/libexec/ibus-engine-mozc"
 BUILD_MODE=	Release
 BUILD_CMD=	${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${MAKE_CMD}
 BUILD_MOZC_CMD=	cd ${BUILD_WRKSRC} && \
 		${SETENV} BUILD_COMMAND="${BUILD_WRKSRC}/mozcmake" \
 		    GYP_DEFINES="${GYP_DEFINES}" \
 		    PYTHONPATH=${PYTHON_SITELIBDIR}/gyp \
 		    CC_host="${CC}" \
 		    CC_target="${CC}" \
 		    CXX_host="${CXX}" \
 		    CXX_target="${CXX}" \
 		    LD_host="${CXX}" \
 		    AR_host="${AR}" \
 		    ${PYTHON_CMD} build_mozc.py
 BUILD_MOZC_CMD_BUILD=	${BUILD_MOZC_CMD} build -c ${BUILD_MODE} ${_MAKE_JOBS}
 BUILD_GYP_CMD=	${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/gyp
 
 post-patch:
 	${REINPLACE_CMD} 's,-liconv,${ICONV_LIB},g' \
 	    ${BUILD_WRKSRC}/gui/qt_libraries.gypi
 	${FIND} ${BUILD_WRKSRC} \( -name '*.gyp' -o -name '*.gypi' \) -exec \
 	    ${REINPLACE_CMD} "s,'python','${PYTHON_CMD}',g" {} \;
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
 	${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \
 	    ${BUILD_WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh
 	${REINPLACE_CMD} "s,/usr,${LOCALBASE:Q}," \
 	    ${BUILD_WRKSRC}/unix/fcitx/mozc.conf
 .endif
 
 .if !${BUILD_MOZC_LIST:Mmozc_el}
 ${BUILD_WRKSRC}/mozcmake:
-	${PRINTF} "%s\n%s\n" "#!/bin/sh" 'exec ${BUILD_CMD} $$@' \
+	${PRINTF} "%s\n\n%s\n" "#!/bin/sh" 'exec ${BUILD_CMD} "$$@"' \
 	    > ${BUILD_WRKSRC}/mozcmake
 	${CHMOD} +x ${BUILD_WRKSRC}/mozcmake
 
 post-configure: ${BUILD_WRKSRC}/mozcmake
 	${BUILD_MOZC_CMD} gyp \
 	    --gypdir=${LOCALBASE}/bin \
 	    --server_dir="${PREFIX}/bin" \
 	    --tool_dir="${PREFIX}/libexec" \
 	    --renderer_dir="${PREFIX}/libexec" \
 	    --localbase="${LOCALBASE}" \
 	    --ldflags="${LDFLAGS} -fstack-protector -L${LOCALBASE}/lib" \
 	    --cflags="${CFLAGS:Q}" \
 	    --cflags_cc="${CXXFLAGS:Q}" \
 	    --include_dirs="${LOCALBASE}/include" \
 	    ${GYP_OPTIONS}
 .endif
 
 # mozc_server
 .if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" || make(makesum)
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=0 \
 		enable_gtk_renderer=0
 
 MASTER_SITES+=	LOCAL/kuriyama:zipcode
 DISTFILES+= \
 	ken_all-20160428.zip:zipcode \
 	jigyosyo-20160428.zip:zipcode
 
 PLIST_FILES+=	bin/mozc \
 		bin/mozc_server \
 		libexec/mozc_emacs_helper
 SUB_FILES+=	mozc
 
 post-extract-mozc_server:
 	@for F in ${DISTFILES:M*\:zipcode:C/\:zipcode//}; do \
 		${UNZIP_NATIVE_CMD} -L -d ${BUILD_WRKSRC}/data/dictionary_oss \
 		    ${DISTDIR}/$$F; \
 	done
 	@cd ${BUILD_WRKSRC}/data/dictionary_oss && \
 	    ${PYTHON_CMD} ${BUILD_WRKSRC}/dictionary/gen_zip_code_seed.py \
 	    --zip_code=ken_all.csv --jigyosyo=jigyosyo.csv \
 	    >> dictionary09.txt
 	${MV} ${WRKDIR}/japanese-usage-dictionary-e5b3425/usage_dict.txt \
 	    ${BUILD_WRKSRC}/third_party/japanese_usage_dictionary
 
 post-extract: post-extract-mozc_server
 
 do-build-mozc_server:
 	${BUILD_MOZC_CMD_BUILD} server/server.gyp:mozc_server
 	${BUILD_MOZC_CMD_BUILD} unix/emacs/emacs.gyp:mozc_emacs_helper
 
 do-install-mozc_server:
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \
 	    ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \
 	    ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_SCRIPT} \
 	    ${WRKDIR}/mozc ${STAGEDIR}/${PREFIX}/bin
 .endif
 
 # mozc_tool
 .if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
 GYP_DEFINES+=	use_libibus=0 \
 		enable_gtk_renderer=1
 
 RUN_DEPENDS+=	${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model:japanese/tegaki-zinnia-japanese
 
 PLIST_FILES+=	libexec/mozc_tool \
 		bin/mozc_tool \
 		%%DATADIR%%/icons/product_logo.png \
 		%%DATADIR%%/icons/update_uptodate.png
 SUB_FILES+=	mozc_tool
 
 do-build-mozc_tool:
 	${BUILD_MOZC_CMD_BUILD} gui/gui.gyp:mozc_tool
 
 do-install-mozc_tool:
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \
 	    ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_SCRIPT} ${WRKDIR}/mozc_tool ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
 	    ${STAGEDIR}${DATADIR}/icons/product_logo.png
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
 	    ${STAGEDIR}${DATADIR}/icons/update_uptodate.png
 .endif
 
 # ibus_mozc
 .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc"
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=1 \
 		enable_gtk_renderer=1
 
 LIB_DEPENDS+=	libibus-1.0.so:textproc/ibus
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
 		mozc_tool:japanese/mozc-tool \
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify
 
 PLIST_FILES+=	libexec/mozc_renderer \
 		libexec/ibus-engine-mozc \
 		%%DATADIR%%/icons/alpha_full.png \
 		%%DATADIR%%/icons/alpha_half.png \
 		%%DATADIR%%/icons/dictionary.png \
 		%%DATADIR%%/icons/direct.png \
 		%%DATADIR%%/icons/hiragana.png \
 		%%DATADIR%%/icons/katakana_full.png \
 		%%DATADIR%%/icons/katakana_half.png \
 		%%DATADIR%%/icons/product_icon.png \
 		%%DATADIR%%/icons/properties.png \
 		%%DATADIR%%/icons/tool.png \
 		share/ibus/component/mozc.xml
 PLIST_DIRS+=	%%DATADIR%%/icons ${DATADIR_REL}
 
 do-build-ibus_mozc:
 	${BUILD_MOZC_CMD_BUILD} \
 	    unix/ibus/ibus.gyp:ibus_mozc \
 	    renderer/renderer.gyp:mozc_renderer
 
 do-install-ibus_mozc:
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_renderer \
 	    ${STAGEDIR}${PREFIX}/libexec/mozc_renderer
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/ibus_mozc \
 	    ${STAGEDIR}${PREFIX}/libexec/ibus-engine-mozc
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/ibus/component
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/ibus/mozc.xml \
 	    ${STAGEDIR}${PREFIX}/share/ibus/component/mozc.xml
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
 .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \
 	ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/${F}.png \
 	    ${STAGEDIR}${DATADIR}/icons/${F:S/^ui-//}.png
 .endfor
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
 	    ${STAGEDIR}${DATADIR}/icons/product_icon.png
 .endif
 
 # uim_mozc
 .if ${BUILD_MOZC_LIST:Muim_mozc} == "uim_mozc" || make(makesum)
 #USE_GITHUB=	yes	# XXX
 GH_ACCOUNT=	e-kato
 GH_PROJECT=	macuim
 GH_TAGNAME=	v0.6.16.2.1
 DISTFILES+=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}_GH0${EXTRACT_SUFX}:gh_uim
 EXTRACT_ONLY+=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}_GH0${EXTRACT_SUFX}
 MASTER_SITES+=	https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/:gh_uim
 WRKSRC_MU=	${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 
 LIB_DEPENDS+=	libuim.so:textproc/uim
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
 		mozc_tool:japanese/mozc-tool
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-unix-uim-mozc.cc \
 		${PATCHDIR}/extra-patch-src-unix-uim-uim.gyp
 PLIST_FILES+=	lib/uim/plugin/libuim-mozc.so \
 		%%DATADIR%%/mozc.scm \
 		%%DATADIR%%/mozc-custom.scm \
 		%%DATADIR%%/mozc-key-custom.scm \
 		%%DATADIR%%/pixmaps/mozc.png \
 		"@postexec ${LOCALBASE}/bin/uim-module-manager --register mozc" \
 		"@preunexec ${LOCALBASE}/bin/uim-module-manager --unregister mozc"
 
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=0 \
 		enable_gtk_renderer=0
 
 post-extract-uim_mozc:
 	${MV} ${WRKSRC_MU}/Mozc/uim ${BUILD_WRKSRC}/unix
 	${REINPLACE_CMD} -e "s,/usr/lib/mozc,${LOCALBASE}/libexec," \
 	    ${WRKSRC_MU}/Mozc/scm/mozc-custom.scm
 
 post-extract: post-extract-uim_mozc
 
 do-build-uim_mozc:
 	${BUILD_MOZC_CMD_BUILD} \
 	    unix/uim/uim.gyp:uim-mozc
 
 do-install-uim_mozc:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/uim/plugin
 	${INSTALL_PROGRAM} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/libuim-mozc.so \
 	    ${STAGEDIR}${PREFIX}/lib/uim/plugin
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC_MU}/Mozc/scm && \
 	    ${INSTALL_DATA} mozc.scm mozc-custom.scm mozc-key-custom.scm \
 	    ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \
 	    ${STAGEDIR}${DATADIR}/pixmaps/mozc.png
 .endif
 
 # fcitx_mozc
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" || make(makesum)
 PATCH_SITES=	http://download.fcitx-im.org/fcitx-mozc/
 PATCHFILES=	fcitx-mozc-2.17.2313.102.1.patch
 .endif
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
 PATCH_DIST_STRIP=-p1
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-unix-fcitx-eim.cc \
 	${PATCHDIR}/extra-patch-src-unix-fcitx-surrounding_text_util.cc
 
 GYP_OPTIONS+=	--noqt
 GYP_DEFINES+=	use_libibus=0 \
 		enable_gtk_renderer=0
 
 LIB_DEPENDS+=	libfcitx-core.so:chinese/fcitx
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
 		mozc_tool:japanese/mozc-tool
 
 PLIST_FILES+=	lib/fcitx/fcitx-mozc.so \
 		share/fcitx/addon/fcitx-mozc.conf \
 		share/fcitx/inputmethod/mozc.conf \
 		%%DATADIR%%/icon/mozc.png \
 		%%DATADIR%%/icon/mozc-alpha_full.png \
 		%%DATADIR%%/icon/mozc-alpha_half.png \
 		%%DATADIR%%/icon/mozc-direct.png \
 		%%DATADIR%%/icon/mozc-hiragana.png \
 		%%DATADIR%%/icon/mozc-katakana_full.png \
 		%%DATADIR%%/icon/mozc-katakana_half.png \
 		%%DATADIR%%/icon/mozc-dictionary.png \
 		%%DATADIR%%/icon/mozc-properties.png \
 		%%DATADIR%%/icon/mozc-tool.png \
 		share/locale/ja/LC_MESSAGES/fcitx-mozc.mo \
 		share/locale/zh_CN/LC_MESSAGES/fcitx-mozc.mo \
 		share/locale/zh_TW/LC_MESSAGES/fcitx-mozc.mo
 PLIST_DIRS+=	%%DATADIR%%/icon ${DATADIR_REL}
 
 post-extract-fcitx_mozc:
 	${RM} ${BUILD_WRKSRC}/unix/fcitx/fcitx.gyp
 
 post-extract: post-extract-fcitx_mozc
 
 do-build-fcitx_mozc:
 	${BUILD_MOZC_CMD_BUILD} unix/fcitx/fcitx.gyp:fcitx-mozc
 
 do-install-fcitx_mozc:
 	@${MKDIR} \
 	    ${STAGEDIR}${PREFIX}/lib/fcitx \
 	    ${STAGEDIR}${PREFIX}/share/fcitx/addon \
 	    ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod
 	${INSTALL_LIB} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/fcitx-mozc.so \
 	    ${STAGEDIR}${PREFIX}/lib/fcitx/fcitx-mozc.so
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/unix/fcitx/fcitx-mozc.conf \
 	    ${STAGEDIR}${PREFIX}/share/fcitx/addon/fcitx-mozc.conf
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/unix/fcitx/mozc.conf \
 	    ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod/mozc.conf
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icon
 .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \
 	ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/unix/${F}.png \
 	    ${STAGEDIR}${DATADIR}/icon/${F:S,^ui-,mozc-,}.png
 .endfor
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \
 	    ${STAGEDIR}${DATADIR}/icon/mozc.png
 .for L in ja zh_CN zh_TW
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/fcitx/po/${L}.mo \
 	    ${STAGEDIR}${PREFIX}/share/locale/${L}/LC_MESSAGES/fcitx-mozc.mo
 .endfor
 .endif
 
 # mozc_el
 .if ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"
 CATEGORIES+=	elisp
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server
 
 PLIST_FILES+=	${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.elc \
 		${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz \
 		${EMACS_VERSION_SITE_LISPDIR}/mozc/leim-list.el
 PLIST_DIRS+=	${EMACS_VERSION_SITE_LISPDIR}/mozc
 
 post-patch-mozc_el:
 	${REINPLACE_CMD} "s,%%PREFIX%%,${PREFIX}," \
 	    ${BUILD_WRKSRC}/unix/emacs/mozc.el
 
 post-patch: post-patch-mozc_el
 
 do-build-mozc_el:
 	cd ${BUILD_WRKSRC}/unix/emacs && \
 	    ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
 	    -f batch-byte-compile mozc.el && \
 	    ${GZIP_CMD} mozc.el
 
 do-install-mozc_el:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc
 	${INSTALL_DATA} \
 	    ${BUILD_WRKSRC}/unix/emacs/mozc.el.gz \
 	    ${BUILD_WRKSRC}/unix/emacs/mozc.elc \
 	    ${FILESDIR}/leim-list.el \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/
 .endif
 
 do-build: ${BUILD_MOZC_LIST:S/^/do-build-/}
 do-install: ${BUILD_MOZC_LIST:S/^/do-install-/}
 
 .include <bsd.port.post.mk>
Index: head/java/eclipse/files/eclipse.in
===================================================================
--- head/java/eclipse/files/eclipse.in	(revision 424091)
+++ head/java/eclipse/files/eclipse.in	(revision 424092)
@@ -1,46 +1,46 @@
 #!/bin/sh
 #
 # FreeBSD-specific startup script for Eclipse Platform
 #
 # See: http://www.eclipse.org
 #
 # $FreeBSD$
 #
 DEFAULT_JAVA_HOME=%%JAVA_HOME%%
 ECLIPSE_HOME=%%ECLIPSE_HOME%%
 DEFAULT_JAVA_CMD=java
 export GRE_HOME=%%LOCALBASE%%/lib/%%BROWSER%%
 
 #-----------------------------------------------------------------------------
 # Determine configuration settings
 #-----------------------------------------------------------------------------
 
 # Determine the JDK home directory
 if [ -z "${JAVA_HOME}" ]; then
 	JAVA_HOME=${DEFAULT_JAVA_HOME}
 fi
 
 # Determine 'java' executable
 if [ -z "${JAVACMD}" ]; then
 	if [ -n "${JAVA_HOME}"  ]; then
 		JAVACMD="${JAVA_HOME}/bin/java"
 	else
 		JAVACMD=${DEFAULT_JAVACMD}
 	fi
 fi
 
 # Check if 'java' executable can be found
 if [ ! -x "$JAVACMD" ]; then
 	echo "Error: JAVA_HOME is not defined correctly: ${JAVA_HOME}"
 	echo "       Unable to find ${JAVACMD}"
 	exit 1
 fi
 
 # Check if 'eclipse' executable can be found
 if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then
 	echo "Error: ECLIPSE_HOME is not defined correctly: ${ECLIPSE_HOME}"
 	echo "       Unable to find eclipse launcher binary"
 	exit 1
 fi
 
-JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} %%SWTGTK3OPT%% exec "${ECLIPSE_HOME}/eclipse" $@
+JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} %%SWTGTK3OPT%% exec "${ECLIPSE_HOME}/eclipse" "$@"
Index: head/java/intellij/files/idea.in
===================================================================
--- head/java/intellij/files/idea.in	(revision 424091)
+++ head/java/intellij/files/idea.in	(revision 424092)
@@ -1,2 +1,3 @@
 #!/bin/sh
-exec "%%IDEA_HOME%%/bin/idea.sh" $@
+
+exec "%%IDEA_HOME%%/bin/idea.sh" "$@"
Index: head/java/intellij-pycharm/files/pycharm.in
===================================================================
--- head/java/intellij-pycharm/files/pycharm.in	(revision 424091)
+++ head/java/intellij-pycharm/files/pycharm.in	(revision 424092)
@@ -1,2 +1,3 @@
 #!/bin/sh
-exec "%%DATADIR%%/bin/pycharm.sh" $@
+
+exec "%%DATADIR%%/bin/pycharm.sh" "$@"
Index: head/java/intellij-ultimate/files/idea.in
===================================================================
--- head/java/intellij-ultimate/files/idea.in	(revision 424091)
+++ head/java/intellij-ultimate/files/idea.in	(revision 424092)
@@ -1,2 +1,3 @@
 #!/bin/sh
-exec "%%IDEA_HOME%%/bin/idea.sh" $@
+
+exec "%%IDEA_HOME%%/bin/idea.sh" "$@"
Index: head/java/jd-gui/files/jd-gui.in
===================================================================
--- head/java/jd-gui/files/jd-gui.in	(revision 424091)
+++ head/java/jd-gui/files/jd-gui.in	(revision 424092)
@@ -1,2 +1,3 @@
 #!/bin/sh
-exec java -jar "%%JAVAJARDIR%%/jd-gui.jar" $@
+
+exec java -jar "%%JAVAJARDIR%%/jd-gui.jar" "$@"
Index: head/news/papercut/files/papercut-wrapper
===================================================================
--- head/news/papercut/files/papercut-wrapper	(revision 424091)
+++ head/news/papercut/files/papercut-wrapper	(revision 424092)
@@ -1,13 +1,12 @@
 #!/bin/sh
 
 # Change this to your getmail directory; defaults to /usr/local/share/getmail
 PPCPATH="__DATADIR__"
 
 PYTHONPATH="${PPCPATH}:${PYTHONPATH}"
 export PYTHONPATH
 
 # You can change this to point to your Python interpreter if you wish.
 PYTHON=__PYTHON__
 
-exec "$PYTHON" ${PPCPATH}/papercut.py $@
-
+exec "$PYTHON" ${PPCPATH}/papercut.py "$@"
Index: head/sysutils/namefix/Makefile
===================================================================
--- head/sysutils/namefix/Makefile	(revision 424091)
+++ head/sysutils/namefix/Makefile	(revision 424092)
@@ -1,58 +1,59 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	namefix
 PORTVERSION=	4.0.2
 PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}.pl/${PORTVERSION}
 DISTNAME=	${PORTNAME}.pl_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Batch file renamer
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-MP3-Tag>=0:audio/p5-MP3-Tag \
 		p5-Tk>=0:x11-toolkits/p5-Tk \
 		p5-Tk-JComboBox>=0:x11-toolkits/p5-Tk-JComboBox \
 		p5-Tk-DynaTabFrame>=0:x11-toolkits/p5-Tk-DynaTabFrame
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.pl
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USES=		7z perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	namefix-cli.pl namefix.pl
 
 do-configure:
 .for bin in ${PORTNAME} ${PORTNAME}-cli
 	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/${bin}.in
+	@${ECHO_CMD} >> ${WRKDIR}/${bin}.in
 	@${ECHO_CMD} 'namefix_dir=${PREFIX}/${SITE_PERL_REL}/${PORTNAME}' \
 		>> ${WRKDIR}/${bin}.in
-	@${ECHO_CMD} 'cd $${namefix_dir}; exec ./${bin}.pl $$@' \
+	@${ECHO_CMD} 'cd $${namefix_dir} && exec ./${bin}.pl "$$@"' \
 		>> ${WRKDIR}/${bin}.in
 .endfor
 
 do-install:
 .for bin in ${PORTNAME} ${PORTNAME}-cli
 	${INSTALL_SCRIPT} ${WRKDIR}/${bin}.in ${STAGEDIR}${PREFIX}/bin/${bin}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
 .for data in ${PORTNAME} ${PORTNAME}-cli
 	${INSTALL_SCRIPT} ${WRKSRC}/${data}.pl \
 		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/mem.jpg \
 		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
 .for dir in libs libs/cli libs/gui
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/${dir}
 	${INSTALL_DATA} ${WRKSRC}/${dir}/*.pm \
 		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/${dir}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/txt
 	${INSTALL_DATA} ${WRKSRC}/txt/*.txt \
 		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/txt
 
 .include <bsd.port.mk>
Index: head/www/dojo-shrinksafe/files/dojo-shrinksafe.in
===================================================================
--- head/www/dojo-shrinksafe/files/dojo-shrinksafe.in	(revision 424091)
+++ head/www/dojo-shrinksafe/files/dojo-shrinksafe.in	(revision 424092)
@@ -1,2 +1,3 @@
 #!/bin/sh
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar $@
+
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar "$@"
Index: head/www/htmlcompressor/files/htmlcompressor.in
===================================================================
--- head/www/htmlcompressor/files/htmlcompressor.in	(revision 424091)
+++ head/www/htmlcompressor/files/htmlcompressor.in	(revision 424092)
@@ -1,3 +1,4 @@
 #!/bin/sh
 # $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar $@
+
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar "$@"
Index: head/www/scloader/files/scloader.sh
===================================================================
--- head/www/scloader/files/scloader.sh	(revision 424091)
+++ head/www/scloader/files/scloader.sh	(revision 424092)
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec "%%JAVA%%" -mx512m -jar "%%JAVAJARDIR%%/scloader.jar" $@
+exec "%%JAVA%%" -mx512m -jar "%%JAVAJARDIR%%/scloader.jar" "$@"
Index: head/www/xombrero/files/xombrero.in
===================================================================
--- head/www/xombrero/files/xombrero.in	(revision 424091)
+++ head/www/xombrero/files/xombrero.in	(revision 424092)
@@ -1,22 +1,22 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # A wrapper script for xombrero
 # Created by HU Dong <itechbear@gmail.com>
 
 if [ ! -d "$HOME/.xombrero" ]; then
 	mkdir -p -m 700 $HOME/.xombrero
 fi
 
 if [ -f "%%EXAMPLESDIR%%/xombrero.conf" ] && [ ! -f "$HOME/.xombrero.conf" ]; then
 	cp %%EXAMPLESDIR%%/xombrero.conf $HOME/.xombrero.conf
 	chmod +w $HOME/.xombrero.conf
 fi
 
 if [ -f "%%EXAMPLESDIR%%/playflash.sh" ] && [ ! -f "$HOME/.xombrero/playflash.sh" ]; then
 	cp %%EXAMPLESDIR%%/playflash.sh $HOME/.xombrero/playflash.sh
 	chmod +x $HOME/.xombrero/playflash.sh
 fi
 
-exec %%PREFIX%%/bin/xombrero-bin $@
+exec %%PREFIX%%/bin/xombrero-bin "$@"
Index: head/www/yuicompressor/files/yuicompressor.in
===================================================================
--- head/www/yuicompressor/files/yuicompressor.in	(revision 424091)
+++ head/www/yuicompressor/files/yuicompressor.in	(revision 424092)
@@ -1,2 +1,3 @@
 #!/bin/sh
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar $@
+
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar "$@"