From owner-svn-ports-head@FreeBSD.ORG Sun Apr 19 18:33:38 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 016D14BB;
Sun, 19 Apr 2015 18:33:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id CA767D0F;
Sun, 19 Apr 2015 18:33:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3JIXbDF035220;
Sun, 19 Apr 2015 18:33:37 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3JIXb9W035218;
Sun, 19 Apr 2015 18:33:37 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <201504191833.t3JIXb9W035218@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gerald set sender to
gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sun, 19 Apr 2015 18:33:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r384312 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Apr 2015 18:33:38 -0000
Author: gerald
Date: Sun Apr 19 18:33:37 2015
New Revision: 384312
URL: https://svnweb.freebsd.org/changeset/ports/384312
Log:
Abstract ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} which appears five times
and introduce and use WRKDIR_PKGFILE instead.
PR: 199526
Approved by: portmgr (bdrewery)
Modified:
head/Mk/bsd.port.mk
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Sun Apr 19 18:21:19 2015 (r384311)
+++ head/Mk/bsd.port.mk Sun Apr 19 18:33:37 2015 (r384312)
@@ -2645,6 +2645,7 @@ PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${
.else
PKGFILE?= ${.CURDIR}/${PKGNAME}${PKG_SUFX}
.endif
+WRKDIR_PKGFILE= ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}
# The "latest version" link -- ${PKGNAME} minus everthing after the last '-'
PKGLATESTREPOSITORY?= ${PACKAGES}/Latest
@@ -3538,8 +3539,8 @@ do-package: ${TMPPLIST}
@${MKDIR} ${WRKDIR}/pkg
@if ${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -f ${PKG_SUFX:S/.//} -o ${WRKDIR}/pkg ${PKGNAME}; then \
if [ -d ${PKGREPOSITORY} -a -w ${PKGREPOSITORY} ]; then \
- ${LN} -f ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} ${PKGFILE} 2>/dev/null \
- || ${CP} -f ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} ${PKGFILE}; \
+ ${LN} -f ${WRKDIR_PKGFILE} ${PKGFILE} 2>/dev/null \
+ || ${CP} -f ${WRKDIR_PKGFILE} ${PKGFILE}; \
if [ "${PKGORIGIN}" = "ports-mgmt/pkg" -o "${PKGORIGIN}" = "ports-mgmt/pkg-devel" ]; then \
if [ ! -d ${PKGLATESTREPOSITORY} ]; then \
if ! ${MKDIR} ${PKGLATESTREPOSITORY}; then \
@@ -3561,7 +3562,7 @@ do-package: ${TMPPLIST}
delete-package:
@${ECHO_MSG} "===> Deleting package for ${PKGNAME}"
# When staging, the package may only be in the workdir if not root
- @${RM} -f ${PKGFILE} ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} 2>/dev/null || :
+ @${RM} -f ${PKGFILE} ${WRKDIR_PKGFILE} 2>/dev/null || :
.endif
.if !target(delete-package-list)
@@ -3580,7 +3581,7 @@ _INSTALL_PKG_ARGS+= -A
.endif
install-package:
@if [ -f "${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}" ]; then \
- _pkgfile="${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}"; \
+ _pkgfile="${WRKDIR_PKGFILE}"; \
else \
_pkgfile="${PKGFILE}"; \
fi; \