diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2012-09-21 21:30:57 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2012-09-21 21:30:57 +0800 |
| commit | 1cad57103e5f6a8495a9013698c3226d694f4d3e (patch) | |
| tree | 2555b1f4a5e8113bdc767728e3192f76338cf703 /Mk | |
| parent | ff05725faca03d35231485fba2679a496b64954b (diff) | |
| download | freebsd-ports-gnome-1cad57103e5f6a8495a9013698c3226d694f4d3e.tar.gz freebsd-ports-gnome-1cad57103e5f6a8495a9013698c3226d694f4d3e.tar.zst freebsd-ports-gnome-1cad57103e5f6a8495a9013698c3226d694f4d3e.zip | |
- 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)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.pkgng.mk | 7 |
1 files changed, 1 insertions, 6 deletions
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 |