Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.540
diff -u -r1.540 bsd.port.mk
--- bsd.port.mk	14 Aug 2006 13:24:18 -0000	1.540
+++ bsd.port.mk	25 Aug 2006 19:46:18 -0000
@@ -5551,7 +5551,7 @@
 	@_manpages='${_MANPAGES:S/'/'\''/g}' && [ "$${_manpages}" != "" ] && ( eval ${GZIP_CMD} $${_manpages} ) || ${TRUE}
 .endif
 .if defined(_MLINKS)
-	@set ${_MLINKS}; \
+	@set -- ${_MLINKS}; \
 	while :; do \
 		[ $$# -eq 0 ] && break || ${TRUE}; \
 		${RM} -f $${2%.gz}; ${RM} -f $$2.gz; \
@@ -5681,7 +5681,7 @@
 	-@if [ -e ${_OPTIONSFILE} ]; then \
 		. ${_OPTIONSFILE}; \
 	fi; \
-	set ${OPTIONS} XXX; \
+	set -- ${OPTIONS} XXX; \
 	while [ $$# -gt 3 ]; do \
 		OPTIONSLIST="$${OPTIONSLIST} $$1"; \
 		defaultval=$$3; \
@@ -5761,7 +5761,7 @@
 	-@if [ -e ${_OPTIONSFILE} ]; then \
 		. ${_OPTIONSFILE}; \
 	fi; \
-	set ${OPTIONS} XXX; \
+	set -- ${OPTIONS} XXX; \
 	while [ $$# -gt 3 ]; do \
 		defaultval=$$3; \
 		withvar=WITH_$$1; \
@@ -5894,7 +5894,7 @@
 
 check-desktop-entries:
 .if defined(DESKTOP_ENTRIES)
-	@set ${DESKTOP_ENTRIES} XXX; \
+	@set -- ${DESKTOP_ENTRIES} XXX; \
 	if [ `${EXPR} \( $$# - 1 \) % 6` -ne 0 ]; then \
 		${ECHO_MSG} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \
 		exit 1; \
@@ -5952,7 +5952,7 @@
 .if defined(DESKTOP_ENTRIES)
 	@(${MKDIR} "${DESKTOPDIR}" 2> /dev/null) || \
 		(${ECHO_MSG} "===> Cannot create ${DESKTOPDIR}, check permissions"; exit 1)
-	@set ${DESKTOP_ENTRIES} XXX; \
+	@set -- ${DESKTOP_ENTRIES} XXX; \
 	if [ -z "${_DESKTOPDIR_REL}" ]; then \
 		${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}; \
 	fi; \