diff options
| author | mm <mm@FreeBSD.org> | 2013-04-30 18:10:55 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-04-30 18:10:55 +0800 |
| commit | a8a2bb0ea0bafdcaf70d7c518492ebd3e95aa7d1 (patch) | |
| tree | 5e7b93e71cd61d17598de941727f2d4e5af89c7a /devel | |
| parent | 041d8b68b2d4a887f33d56717e9c435db4ee04c6 (diff) | |
| download | freebsd-ports-gnome-a8a2bb0ea0bafdcaf70d7c518492ebd3e95aa7d1.tar.gz freebsd-ports-gnome-a8a2bb0ea0bafdcaf70d7c518492ebd3e95aa7d1.tar.zst freebsd-ports-gnome-a8a2bb0ea0bafdcaf70d7c518492ebd3e95aa7d1.zip | |
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@FreeBSD.org>
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pear/bsd.pear.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/devel/pear/bsd.pear.mk b/devel/pear/bsd.pear.mk index 1679dc0eadbd..2afd1a151dcf 100644 --- a/devel/pear/bsd.pear.mk +++ b/devel/pear/bsd.pear.mk @@ -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} |