diff options
| author | wiz <wiz> | 2011-03-19 09:45:24 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-03-19 09:45:24 +0000 |
| commit | 8118fc4de0022453e5bb1b01d8c21fad74360872 (patch) | |
| tree | a706c78edc42cafed20ce79da9aa83f3637168a7 /mk | |
| parent | b067a0192da6fbe8338e783897f0beb317593585 (diff) | |
| download | pkgsrc-8118fc4de0022453e5bb1b01d8c21fad74360872.tar.gz | |
Add FILEBASE support for choosing the file name for a binary package.
From Aleksey Cheusov in relation to PR 44698.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/package.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/flavor/pkg/package.mk b/mk/flavor/pkg/package.mk index 80e6e748d3b..e911dfdc7bf 100644 --- a/mk/flavor/pkg/package.mk +++ b/mk/flavor/pkg/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.20 2010/02/09 23:02:13 joerg Exp $ +# $NetBSD: package.mk,v 1.21 2011/03/19 09:45:24 wiz Exp $ .if defined(PKG_SUFX) WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION" @@ -11,7 +11,8 @@ WARNINGS+= "Unsupported value for PKG_SUFX" . endif .endif PKG_SUFX?= .tgz -PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} +FILEBASE?= ${PKGBASE} +PKGFILE?= ${PKGREPOSITORY}/${FILEBASE}-${PKGVERSION}${PKG_SUFX} PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR} PKGREPOSITORYSUBDIR?= All @@ -114,7 +115,7 @@ tarup-pkg: ${RUN} [ -x ${_PKG_TARUP_CMD} ] || exit 1; \ ${SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX} \ PKGREPOSITORY=${PKGREPOSITORY} \ - ${_PKG_TARUP_CMD} ${PKGNAME} + ${_PKG_TARUP_CMD} -f ${FILEBASE} ${PKGNAME} ###################################################################### ### package-install (PUBLIC) |