Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Sep 2012 13:30:57 +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: r304634 - head/Mk
Message-ID:  <201209211330.q8LDUvUZ042331@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Fri Sep 21 13:30:57 2012
New Revision: 304634
URL: http://svn.freebsd.org/changeset/ports/304634

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.pkgng.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Fri Sep 21 13:29:20 2012	(r304633)
+++ head/Mk/bsd.pkgng.mk	Fri Sep 21 13:30:57 2012	(r304634)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209211330.q8LDUvUZ042331>