svn commit: r333480 - head/devel/pear

[Antoine Brodin]

Author: antoine
Date: Mon Nov 11 09:17:51 2013
New Revision: 333480
URL: http://svnweb.freebsd.org/changeset/ports/333480

Log:
  Correctly handle directory names with space in PEAR_AUTOINSTALL
  This is needed for pear-Symfony_Component_Finder update
  
  PR:		ports/181672
  Reported by:	Gasol Wu

Modified:
  head/devel/pear/bsd.pear.mk

Modified: head/devel/pear/bsd.pear.mk
==============================================================================
--- head/devel/pear/bsd.pear.mk	Mon Nov 11 09:07:15 2013	(r333479)
+++ head/devel/pear/bsd.pear.mk	Mon Nov 11 09:17:51 2013	(r333480)
@@ -190,24 +190,24 @@ do-autogenerate-plist: patch
 	${ECHO_CMD} "Cannot generate packing list: package files outside PREFIX"; \
 	exit 1; fi;
 	@${ECHO_CMD} "${LPKGREGDIR}/package.xml" > ${PLIST}
-	# pkg_install needs to escape $ in directory name while pkg does not
+# pkg_install needs to escape $ in directory name while pkg does not
 .if defined(WITH_PKGNG)
 	@cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type f | ${SORT} \
 	| ${CUT} -c 3- >> ${PLIST}
-	@DIRS=`cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type d | ${SORT} -r | \
-	${CUT} -c 3-`; \
-	for d in $${DIRS}; do \
-		if [ ! -d ${LOCALBASE}/$${d} ]; then \
+	@cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type d | ${SORT} -r | \
+	${CUT} -c 3- | \
+	while read d ; do \
+		if [ ! -d "${LOCALBASE}/$${d}" ]; then \
 			${ECHO_CMD} "@dirrmtry $${d}" >> ${PLIST}; \
 		fi; \
 	done
 .else
 	@cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type f | ${SORT} \
 	| ${CUT} -c 3- >> ${PLIST}
-	@DIRS=`cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type d | ${SORT} -r | \
-	${CUT} -c 3- | ${SED} -e 's,\\$$,\\\\$$,g'`; \
-	for d in $${DIRS}; do \
-		if [ ! -d ${LOCALBASE}/$${d} ]; then \
+	@cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type d | ${SORT} -r | \
+	${CUT} -c 3- | ${SED} -e 's,\$$,\\\\$$,g' | \
+	while read d ; do \
+		if [ ! -d "${LOCALBASE}/$${d}" ]; then \
 			${ECHO_CMD} "@dirrmtry $${d}" >> ${PLIST}; \
 		fi; \
 	done