--- bsd.port.mk	(Revision 324676)
+++ bsd.port.mk	(Arbeitskopie)
@@ -1134,15 +1134,16 @@ 
 .if !target(makepatch)
 makepatch:
 	@${MKDIR} ${FILESDIR}
-	@(cd ${PATCH_WRKSRC}; \
+	@(cd ${PATCH_WRKSRC} && \
+		IFS="`printf '\n\t'`" && \
 		for i in `find . -type f -name '*.orig'`; do \
-			ORG=$$i; \
-			NEW=$${i%.orig}; \
-			OUT=${FILESDIR}`${ECHO} $${NEW} | \
-				${SED} -e 's|/|__|g' \
-					-e 's|^\.__|/patch-|'`; \
-			${ECHO} ${DIFF} -ud $${ORG} $${NEW} '>' $${OUT}; \
-			${DIFF} -ud $${ORG} $${NEW} > $${OUT} || ${TRUE}; \
+			ORG="$$i"; \
+			NEW="$${i%.orig}"; \
+			OUT="${FILESDIR}`${ECHO} $${NEW} | \
+				${SED} -e 's|[/ ]|__|g' \
+					-e 's|^\.__|/patch-|'`"; \
+			${ECHO} ${DIFF} -ud "$${ORG}" "$${NEW}" '>' "$${OUT}"; \
+			${DIFF} -ud "$${ORG}" "$${NEW}" > "$${OUT}" || ${TRUE}; \
 		done \
 	)
 .endif