Date: Fri, 21 Sep 2012 13:29:21 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304633 - head/Mk Message-ID: <201209211329.q8LDTLn3041857@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Sep 21 13:29:20 2012 New Revision: 304633 URL: http://svn.freebsd.org/changeset/ports/304633 Log: - 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) Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Sep 21 13:16:19 2012 (r304632) +++ head/Mk/bsd.port.mk Fri Sep 21 13:29:20 2012 (r304633) @@ -3905,15 +3905,11 @@ do-package: ${TMPPLIST} fi; \ fi; \ fi - @TMPPKGFILE=$$(mktemp -t pkg); \ - trap "${RM} -f $${TMPPKGFILE} $${TMPPKGFILE}${PKG_SUFX}; exit 1" 1 2 3 5 10 13 15; \ - if ${PKG_CMD} -b ${PKGNAME} $${TMPPKGFILE}; then \ - ${MV} -f $${TMPPKGFILE}${PKG_SUFX} ${PKGFILE}; \ + @if ${PKG_CMD} -b ${PKGNAME} ${PKGFILE}; then \ if [ -d ${PACKAGES} ]; then \ cd ${.CURDIR} && eval ${MAKE} package-links; \ fi; \ else \ - ${RM} -f $${TMPPKGFILE}; \ cd ${.CURDIR} && eval ${MAKE} delete-package; \ exit 1; \ fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209211329.q8LDTLn3041857>