svn commit: r316910 - head/devel/pear

[Martin Matuska]

Author: mm
Date: Tue Apr 30 10:10:55 2013
New Revision: 316910
URL: http://svnweb.freebsd.org/changeset/ports/316910

Log:
  Do not include pre-existing directories in the dirrmtry list when using
  PEAR_AUTOINSTALL. This fixes possible deletion of directories populated with
  ports mtree or by other ports.
  
  Discussed with:	Martin Wilke <miwi at FreeBSD.org>

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

Modified: head/devel/pear/bsd.pear.mk
==============================================================================
--- head/devel/pear/bsd.pear.mk	Tue Apr 30 10:08:29 2013	(r316909)
+++ head/devel/pear/bsd.pear.mk	Tue Apr 30 10:10:55 2013	(r316910)
@@ -194,7 +194,11 @@ do-autogenerate-plist: patch
 	| ${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 ${ECHO_CMD} "@dirrmtry $${d}" >> ${PLIST}; done
+	for d in $${DIRS}; do \
+		if [ ! -d ${LOCALBASE}/$${d} ]; then \
+			${ECHO_CMD} "@dirrmtry $${d}" >> ${PLIST}; \
+		fi; \
+	done
 	@${ECHO_CMD} "@dirrm ${LPKGREGDIR}" >> ${PLIST}
 	@${ECHO_CMD} "@dirrmtry ${LPKGREGDIR:H}" >> ${PLIST}