From 1cad57103e5f6a8495a9013698c3226d694f4d3e Mon Sep 17 00:00:00 2001 From: bdrewery Date: Fri, 21 Sep 2012 13:30:57 +0000 Subject: - Revert ports/171672 patch to 'do-package' due to reported problems with defining PKG_SUFX, and leaving behind tmp files. PR: ports/171672 Reported by: poyopoyo@puripuri.plala.or.jp Approved by: portmgr (beat, implicit) --- Mk/bsd.pkgng.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Mk/bsd.pkgng.mk') diff --git a/Mk/bsd.pkgng.mk b/Mk/bsd.pkgng.mk index 90d934b4ad2c..df797911ad82 100644 --- a/Mk/bsd.pkgng.mk +++ b/Mk/bsd.pkgng.mk @@ -231,16 +231,11 @@ do-package: ${TMPPLIST} fi; \ fi; \ fi; - @TMPPKGREPOSITORY=$$(mktemp -dt pkg); \ - trap "${RM} -rf $${TMPPKGREPOSITORY}; exit 1" 1 2 3 5 10 13 15; \ - if ${PKG_CREATE} -o $${TMPPKGREPOSITORY} ${PKGNAME}; then \ - ${MV} -f $${TMPPKGREPOSITORY}/${PKGNAME}${PKG_SUFX} ${PKGREPOSITORY}; \ - ${RM} -rf $${TMPPKGREPOSITORY}; \ + @if ${PKG_CREATE} -o ${PKGREPOSITORY} ${PKGNAME}; then \ if [ -d ${PACKAGES} ]; then \ cd ${.CURDIR} && eval ${MAKE} package-links; \ fi; \ else \ - ${RM} -rf $${TMPPKGREPOSITORY}; \ cd ${.CURDIR} && eval ${MAKE} delete-package; \ exit 1; \ fi -- cgit