From owner-svn-ports-all@FreeBSD.ORG  Fri Sep 21 13:30:57 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C66A8106564A;
	Fri, 21 Sep 2012 13:30:57 +0000 (UTC)
	(envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B16E58FC17;
	Fri, 21 Sep 2012 13:30:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8LDUvIc042333;
	Fri, 21 Sep 2012 13:30:57 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8LDUvUZ042331;
	Fri, 21 Sep 2012 13:30:57 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201209211330.q8LDUvUZ042331@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 21 Sep 2012 13:30:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304634 - head/Mk
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Sep 2012 13:30:57 -0000

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