From owner-svn-ports-all@FreeBSD.ORG Mon Nov 11 09:17:52 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0ECD234A; Mon, 11 Nov 2013 09:17:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F0225260B; Mon, 11 Nov 2013 09:17:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAB9HpPo072850; Mon, 11 Nov 2013 09:17:51 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAB9HpLG072849; Mon, 11 Nov 2013 09:17:51 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201311110917.rAB9HpLG072849@svn.freebsd.org> From: Antoine Brodin Date: Mon, 11 Nov 2013 09:17:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333480 - head/devel/pear X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 09:17:52 -0000 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