diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-04-20 22:36:59 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-04-20 22:36:59 +0000 |
| commit | 151dc2f76896af70370b02154234183f8c3612a1 (patch) | |
| tree | fba6b3e05a9f3a3c6b9e4d60220ba8e52e9d41b8 | |
| parent | STAGE support, replace pkg-install with some plist (diff) | |
Clean up STAGEDIR from orphans re-generated by pkg-install/pear-install
Notes
Notes:
svn path=/head/; revision=351653
| -rw-r--r-- | devel/pear/Makefile | 4 | ||||
| -rw-r--r-- | devel/pear/bsd.pear.mk | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/devel/pear/Makefile b/devel/pear/Makefile index afa3a6e1f231..9a1a9a4c0306 100644 --- a/devel/pear/Makefile +++ b/devel/pear/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://miwibox.org/distfiles/ MAINTAINER= miwi@FreeBSD.org COMMENT= PEAR framework for PHP -USE_BZIP2= yes +USES= tar:bzip2 NO_BUILD= yes WANT_PHP_CLI= yes @@ -40,5 +40,7 @@ do-install: .if defined(PACKAGE_BUILDING) @${RM} -rf ${PEARDIR} .endif +# Clean up orphans re-generated by pkg-install + @${RM} -rf ${STAGEDIR}${PEARDIR}/.depdb ${STAGEDIR}${PEARDIR}/.depdblock ${STAGEDIR}${PEARDIR}/.filemap ${STAGEDIR}${PEARDIR}/.lock .include <bsd.port.mk> diff --git a/devel/pear/bsd.pear.mk b/devel/pear/bsd.pear.mk index db97c76d9297..2ce0d9fbcb74 100644 --- a/devel/pear/bsd.pear.mk +++ b/devel/pear/bsd.pear.mk @@ -232,6 +232,10 @@ do-auto-install: @cd ${WRKSRC} && ${PEAR} install -n -f package.xml .else @cd ${WRKSRC} && ${PEAR} install -n -f -P ${STAGEDIR} package.xml +# Clean up orphans re-generated by pear-install +.for R in .channels .depdb .depdblock .filemap .lock .registry + @${RM} -rf ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R} +.endfor .endif do-install-files: do-install-files-msg |