- Double-quote $@ to properly propagate parameters down the execution path

- Consistently pad (separate) shebang in wrapper scripts with an empty line

cad/brlcad/files/mged.sh

@@ -10,4 +10,4 @@ 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 "$@"

devel/hadoop/files/hadoop.in

@@ -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 "$@"

games/childsplay/Makefile

@@ -41,17 +41,18 @@ 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}/;;})
 

games/stepmania-devel/Makefile

@@ -61,7 +61,7 @@ pre-build:
 		>> ${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:

japanese/mozc-server/Makefile

@@ -110,7 +110,7 @@ post-patch:
 
 .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
 

java/eclipse/files/eclipse.in

@@ -43,4 +43,4 @@ if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then
 	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" "$@"

java/intellij-pycharm/files/pycharm.in

@@ -1,2 +1,3 @@
 #!/bin/sh
-exec "%%DATADIR%%/bin/pycharm.sh" $@
+
+exec "%%DATADIR%%/bin/pycharm.sh" "$@"

java/intellij-ultimate/files/idea.in

@@ -1,2 +1,3 @@
 #!/bin/sh
-exec "%%IDEA_HOME%%/bin/idea.sh" $@
+
+exec "%%IDEA_HOME%%/bin/idea.sh" "$@"

java/intellij/files/idea.in

@@ -1,2 +1,3 @@
 #!/bin/sh
-exec "%%IDEA_HOME%%/bin/idea.sh" $@
+
+exec "%%IDEA_HOME%%/bin/idea.sh" "$@"

java/jd-gui/files/jd-gui.in

@@ -1,2 +1,3 @@
 #!/bin/sh
-exec java -jar "%%JAVAJARDIR%%/jd-gui.jar" $@
+
+exec java -jar "%%JAVAJARDIR%%/jd-gui.jar" "$@"

news/papercut/files/papercut-wrapper

@@ -9,5 +9,4 @@ 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 "$@"

sysutils/namefix/Makefile

@@ -29,9 +29,10 @@ 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
 

www/dojo-shrinksafe/files/dojo-shrinksafe.in

@@ -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 "$@"

www/htmlcompressor/files/htmlcompressor.in

@@ -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 "$@"

www/scloader/files/scloader.sh

@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec "%%JAVA%%" -mx512m -jar "%%JAVAJARDIR%%/scloader.jar" $@
+exec "%%JAVA%%" -mx512m -jar "%%JAVAJARDIR%%/scloader.jar" "$@"

www/xombrero/files/xombrero.in

@@ -19,4 +19,4 @@ if [ -f "%%EXAMPLESDIR%%/playflash.sh" ] && [ ! -f "$HOME/.xombrero/playflash.sh
 	chmod +x $HOME/.xombrero/playflash.sh
 fi
 
-exec %%PREFIX%%/bin/xombrero-bin $@
+exec %%PREFIX%%/bin/xombrero-bin "$@"

www/yuicompressor/files/yuicompressor.in

@@ -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 "$@"