Index: Mk/Scripts/do-fetch.sh
===================================================================
--- Mk/Scripts/do-fetch.sh
+++ Mk/Scripts/do-fetch.sh
@@ -11,9 +11,7 @@
 	dp_DIST_SUBDIR dp_ECHO_MSG dp_FETCH_AFTER_ARGS dp_FETCH_BEFORE_ARGS \
 	dp_FETCH_CMD dp_FETCH_ENV dp_FORCE_FETCH_ALL dp_FORCE_FETCH_LIST \
 	dp_MASTER_SITE_BACKUP dp_MASTER_SITE_OVERRIDE dp_MASTER_SORT_AWK \
-	dp_NO_CHECKSUM dp_RANDOMIZE_SITES dp_SITE_FLAVOR dp_SCRIPTSDIR \
-	dp_SORTED_MASTER_SITES_DEFAULT_CMD dp_SORTED_PATCH_SITES_DEFAULT_CMD \
-	dp_TARGET
+	dp_NO_CHECKSUM dp_RANDOMIZE_SITES dp_SITE_FLAVOR dp_TARGET
 
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DO_FETCH}" ] && set -x
 
@@ -28,7 +26,7 @@
 
 	# If this files has groups
 	if [ "$_file" = "$file" ]; then
-		select=''
+		select=DEFAULT
 	else
 		select=$(echo "${_file##*:}" | sed -e 's/,/ /g')
 	fi
@@ -71,44 +69,34 @@
 			fi
 			;;
 		esac
-		if [ -n "$select" ] ; then
-			__MASTER_SITES_TMP=
-			for group in $select; do
-				# Disable nounset for this, it may come up empty.
-				set +u
-				eval ___MASTER_SITES_TMP="\${_${dp_SITE_FLAVOR}_SITES_${group}}"
-				set -u
-				if [ -n "${___MASTER_SITES_TMP}" ] ; then
-					__MASTER_SITES_TMP="${__MASTER_SITES_TMP} ${___MASTER_SITES_TMP}"
-				else
-					case ${dp_TARGET} in
-					do-fetch|makesum)
-						if [ -n "${dp_DEVELOPER}" ]; then
-							${dp_ECHO_MSG} "===> /!\\ Error /!\\"
-						else
-							${dp_ECHO_MSG} "===> /!\\ Warning /!\\"
-						fi
-						${dp_ECHO_MSG} "     The :${group} group used for $file is missing"
-						${dp_ECHO_MSG} "     from ${dp_SITE_FLAVOR}_SITES. Check for typos, or errors."
-						if [ -n "${dp_DEVELOPER}" ]; then
-							exit 1
-						fi
-						;;
-					esac
-
-				fi
-			done
-			___MASTER_SITES_TMP=
-			SORTED_MASTER_SITES_CMD_TMP="echo ${dp_MASTER_SITE_OVERRIDE} $(echo -n "${__MASTER_SITES_TMP}" | awk "${dp_MASTER_SORT_AWK}") ${dp_MASTER_SITE_BACKUP}"
-		else
-			if [ ${dp_SITE_FLAVOR} = "MASTER" ]; then
-				SORTED_MASTER_SITES_CMD_TMP="${dp_SORTED_MASTER_SITES_DEFAULT_CMD}"
+		__MASTER_SITES_TMP=
+		for group in $select; do
+			# Disable nounset for this, it may come up empty.
+			set +u
+			eval ___MASTER_SITES_TMP="\${_${dp_SITE_FLAVOR}_SITES_${group}}"
+			set -u
+			if [ -n "${___MASTER_SITES_TMP}" ] ; then
+				__MASTER_SITES_TMP="${__MASTER_SITES_TMP} ${___MASTER_SITES_TMP}"
 			else
-				SORTED_MASTER_SITES_CMD_TMP="${dp_SORTED_PATCH_SITES_DEFAULT_CMD}"
+				case ${dp_TARGET} in
+				do-fetch|makesum)
+					if [ -n "${dp_DEVELOPER}" ]; then
+						${dp_ECHO_MSG} "===> /!\\ Error /!\\"
+					else
+						${dp_ECHO_MSG} "===> /!\\ Warning /!\\"
+					fi
+					${dp_ECHO_MSG} "     The :${group} group used for $file is missing"
+					${dp_ECHO_MSG} "     from ${dp_SITE_FLAVOR}_SITES. Check for typos, or errors."
+					if [ -n "${dp_DEVELOPER}" ]; then
+						exit 1
+					fi
+					;;
+				esac
+
 			fi
-			# Having this set when the next eval runs creates double entries.
-			unset _${dp_SITE_FLAVOR}_SITES_DEFAULT
-		fi
+		done
+		___MASTER_SITES_TMP=
+		SORTED_MASTER_SITES_CMD_TMP="echo ${dp_MASTER_SITE_OVERRIDE} $(echo -n "${__MASTER_SITES_TMP}" | awk "${dp_MASTER_SORT_AWK}") ${dp_MASTER_SITE_BACKUP}"
 		case ${dp_TARGET} in
 			fetch-list)
 				echo -n "mkdir -p ${dp_DISTDIR} && "
@@ -123,25 +111,26 @@
 		for site in ${sites}; do
 			sites_remaining=$((sites_remaining - 1))
 			CKSIZE=$(distinfo_data SIZE "${full_file}")
-			# The site may contain special shell characters, they
-			# need to be escaped.
-			site=$(escape "${site}")
 			# There is a lot of escaping, but the " needs to survive echo/eval.
 			case ${file} in
 				*/*)
 					mkdir -p "${file%/*}"
-					args="-o \\\"${file}\\\" \\\"${site}${file}\\\""
+					args="-o ${file} ${site}${file}"
 					;;
 				*)
-					args="\\\"${site}${file}\\\""
+					args="${site}${file}"
 					;;
 			esac
-			_fetch_cmd=$(eval "echo ${dp_FETCH_ENV} ${dp_FETCH_CMD} ${dp_FETCH_BEFORE_ARGS} ${args} ${dp_FETCH_AFTER_ARGS}")
+			_fetch_cmd="${dp_FETCH_ENV} ${dp_FETCH_CMD} ${dp_FETCH_BEFORE_ARGS}"
+			if [ -z "${dp_DISABLE_SIZE}" ]; then
+				_fetch_cmd="${_fetch_cmd} -S ${CKSIZE}"
+			fi
+			_fetch_cmd="${_fetch_cmd} ${args} ${dp_FETCH_AFTER_ARGS}"
 			case ${dp_TARGET} in
 			do-fetch|makesum)
 				${dp_ECHO_MSG} "=> Attempting to fetch ${site}${file}"
-				if eval "env ${_fetch_cmd}"; then
-					actual_size=$(eval stat -f %z "${file}")
+				if env ${_fetch_cmd}; then
+					actual_size=$(eval stat -f %z "$(escape ${file})")
 					if [ -n "${dp_DISABLE_SIZE}" ] || [ -z "${CKSIZE}" ] || [ "${actual_size}" -eq "${CKSIZE}" ]; then
 						continue 2
 					else
@@ -154,10 +143,10 @@
 				fi
 				;;
 			fetch-list)
-				echo -n "env ${_fetch_cmd} || "
+				echo -n "env $(escape "${_fetch_cmd}") || "
 				;;
 			fetch-url-list-int)
-				eval "echo $(eval "echo ${args}")"
+				echo ${args}
 				;;
 			esac
 		done
@@ -168,7 +157,7 @@
 			exit 1
 			;;
 		fetch-list)
-			echo "echo ${file} not fetched; }" ; \
+			echo "echo \"${file}\" not fetched; }" ; \
 			;;
 		esac
 	fi
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -2057,9 +2057,6 @@
 FETCH_BINARY?=	/usr/bin/fetch
 FETCH_ARGS?=	-Fpr
 FETCH_REGET?=	1
-.if !defined(DISABLE_SIZE)
-FETCH_BEFORE_ARGS+=	$${CKSIZE:+-S $$CKSIZE}
-.endif
 FETCH_CMD?=		${FETCH_BINARY} ${FETCH_ARGS}
 
 .if defined(RANDOMIZE_MASTER_SITES)
@@ -2468,88 +2465,32 @@
 .endfor
 MASTER_SORT_AWK+=	{ rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; }
 
-SORTED_MASTER_SITES_DEFAULT_CMD=	cd ${.CURDIR} && ${MAKE} master-sites-DEFAULT
-SORTED_PATCH_SITES_DEFAULT_CMD=		cd ${.CURDIR} && ${MAKE} patch-sites-DEFAULT
-SORTED_MASTER_SITES_ALL_CMD=	cd ${.CURDIR} && ${MAKE} master-sites-ALL
-SORTED_PATCH_SITES_ALL_CMD=	cd ${.CURDIR} && ${MAKE} patch-sites-ALL
-
-# has similar effect to old targets, i.e., access only {MASTER,PATCH}_SITES, not working with the new _n variables
-master-sites-DEFAULT:
-	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_DEFAULT}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
-patch-sites-DEFAULT:
-	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_DEFAULT}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
-
-#
-# Sort the master site list according to the patterns in MASTER_SORT
-# according to grouping rules (:something)
-#
-# for use in the fetch targets
-.for _S in ${MASTER_SITES}
-_S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//}
-.	if !empty(_S_TEMP)
-.		for _group in ${_S_TEMP:S/^://:S/,/ /g}
-.			if !target(master-sites-${_group})
-SORTED_MASTER_SITES_${_group}_CMD=	cd ${.CURDIR} && ${MAKE} master-sites-${_group}
-master-sites-${_group}:
-	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
-.			endif
-.		endfor
-.	endif
-.endfor
-.for _S in ${PATCH_SITES}
-_S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//}
-.	if !empty(_S_TEMP)
-.		for _group in ${_S_TEMP:S/^://:S/,/ /g}
-.			if !target(patch-sites-${_group})
-SORTED_PATCH_SITES_${_group}_CMD=	cd ${.CURDIR} && ${MAKE} patch-sites-${_group}
-patch-sites-${_group}:
-	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
-.			endif
-.		endfor
-.	endif
-.endfor
-
 #
 # Hackery to enable simple fetch targets with several dynamic MASTER_SITES
 #
-_MASTER_SITES_ENV=	_MASTER_SITES_DEFAULT="${_MASTER_SITES_DEFAULT}"
+_MASTER_SITES_ENV=	_MASTER_SITES_DEFAULT="${_MASTER_SITES_DEFAULT:Q}"
 .for _F in ${DISTFILES}
 _F_TEMP=	${_F:S/^${_F:C/:[^:]+$//}//:S/^://}
 .	if !empty(_F_TEMP)
 .		for _group in ${_F_TEMP:S/,/ /g}
 .			if defined(_MASTER_SITES_${_group})
-_MASTER_SITES_ENV+=	_MASTER_SITES_${_group}="${_MASTER_SITES_${_group}}"
+_MASTER_SITES_ENV+=	_MASTER_SITES_${_group}="${_MASTER_SITES_${_group}:Q}"
 .			endif
 .		endfor
 .	endif
 .endfor
-_PATCH_SITES_ENV=	_PATCH_SITES_DEFAULT="${_PATCH_SITES_DEFAULT}"
+_PATCH_SITES_ENV=	_PATCH_SITES_DEFAULT="${_PATCH_SITES_DEFAULT:Q}"
 .for _F in ${PATCHFILES}
 _F_TEMP=	${_F:S/^${_F:C/:[^-:][^:]*$//}//:S/^://}
 .	if !empty(_F_TEMP)
 .		for _group in ${_F_TEMP:S/,/ /g}
 .			if defined(_PATCH_SITES_${_group})
-_PATCH_SITES_ENV+=	_PATCH_SITES_${_group}="${_PATCH_SITES_${_group}}"
+_PATCH_SITES_ENV+=	_PATCH_SITES_${_group}="${_PATCH_SITES_${_group}:Q}"
 .			endif
 .		endfor
 .	endif
 .endfor
 
-master-sites-ALL:
-	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_ALL}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
-patch-sites-ALL:
-	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_ALL}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
-
-# synonyms, mnemonics
-master-sites-all: master-sites-ALL
-patch-sites-all: patch-sites-ALL
-master-sites-default: master-sites-DEFAULT
-patch-sites-default: patch-sites-DEFAULT
-
-# compatibility with old behavior
-master-sites: master-sites-DEFAULT
-patch-sites: patch-sites-DEFAULT
-
 CKSUMFILES=		${ALLFILES}
 
 # List of all files, with ${DIST_SUBDIR} in front.  Used for checksum.
@@ -3085,7 +3026,7 @@
 			dp_FETCH_AFTER_ARGS='${FETCH_AFTER_ARGS}' \
 			dp_FETCH_BEFORE_ARGS='${FETCH_BEFORE_ARGS}' \
 			dp_FETCH_CMD='${FETCH_CMD}' \
-			dp_FETCH_ENV=${FETCH_ENV:Q:Q} \
+			dp_FETCH_ENV=${FETCH_ENV:Q} \
 			dp_FORCE_FETCH_ALL='${FORCE_FETCH_ALL}' \
 			dp_FORCE_FETCH_LIST='${FORCE_FETCH_LIST}' \
 			dp_MASTER_SITE_BACKUP='${_MASTER_SITE_BACKUP}' \
@@ -3094,8 +3035,6 @@
 			dp_NO_CHECKSUM='${NO_CHECKSUM}' \
 			dp_RANDOMIZE_SITES='${_RANDOMIZE_SITES}' \
 			dp_SCRIPTSDIR='${SCRIPTSDIR}' \
-			dp_SORTED_MASTER_SITES_DEFAULT_CMD='${SORTED_MASTER_SITES_DEFAULT_CMD}' \
-			dp_SORTED_PATCH_SITES_DEFAULT_CMD='${SORTED_PATCH_SITES_DEFAULT_CMD}' \
 			dp_TARGET='${.TARGET}'
 .if defined(DEVELOPER)
 _DO_FETCH_ENV+= dp_DEVELOPER=yes
@@ -3850,7 +3789,7 @@
 
 .if !target(distclean)
 distclean: pre-distclean clean
-	@cd ${.CURDIR} && ${MAKE} delete-distfiles RESTRICTED_FILES="${_DISTFILES} ${_PATCHFILES}"
+	@cd ${.CURDIR} && ${MAKE} delete-distfiles RESTRICTED_FILES="${_DISTFILES:Q} ${_PATCHFILES:Q}"
 .endif
 
 .if !target(delete-distfiles)
Index: sysutils/geomWatch/Makefile
===================================================================
--- sysutils/geomWatch/Makefile
+++ sysutils/geomWatch/Makefile
@@ -9,7 +9,7 @@
 		http://bk.macroblock.net/${PORTNAME}/ \
 		http://svnweb.freebsd.org/base/head/sys/cddl/compat/opensolaris/sys/:nvpair
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		nvpair.h\?revision=279437\&view=co:nvpair
+		nvpair.h?revision=279437&view=co:nvpair
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	spawk@acm.poly.edu
Index: www/xpi-splash/Makefile
===================================================================
--- www/xpi-splash/Makefile
+++ www/xpi-splash/Makefile
@@ -9,7 +9,7 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Splash screen for most Mozilla and Mozilla Based products
 
-XPI_DISTNAME=	splash\!
+XPI_DISTNAME=	splash!
 XPI_ID=		splash@aldreneo.com
 XPI_NUM=	2995
 XPI_FILES=	chrome/splash.jar components/.autoreg components/splash.js \