Date: Sun, 19 Apr 2015 18:33:37 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384312 - head/Mk Message-ID: <201504191833.t3JIXb9W035218@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504191833.t3JIXb9W035218>