svn commit: r351653 - head/devel/pear

[Antoine Brodin]

Author: antoine
Date: Sun Apr 20 22:36:59 2014
New Revision: 351653
URL: http://svnweb.freebsd.org/changeset/ports/351653
QAT: https://qat.redports.org/buildarchive/r351653/

Log:
  Clean up STAGEDIR from orphans re-generated by pkg-install/pear-install

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

Modified: head/devel/pear/Makefile
==============================================================================
--- head/devel/pear/Makefile	Sun Apr 20 22:07:46 2014	(r351652)
+++ head/devel/pear/Makefile	Sun Apr 20 22:36:59 2014	(r351653)
@@ -10,7 +10,7 @@ MASTER_SITES=	http://miwibox.org/distfil
 MAINTAINER=	miwi at 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>

Modified: head/devel/pear/bsd.pear.mk
==============================================================================
--- head/devel/pear/bsd.pear.mk	Sun Apr 20 22:07:46 2014	(r351652)
+++ head/devel/pear/bsd.pear.mk	Sun Apr 20 22:36:59 2014	(r351653)
@@ -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