diff options
| author | wiz <wiz@pkgsrc.org> | 2006-01-03 17:26:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-01-03 17:26:56 +0000 |
| commit | d5a0e27f9a2e2092069d7b479fa3cbfacc84de64 (patch) | |
| tree | 3e7a5ac15f685b5e14db6f9455123184f69e779e /mk | |
| parent | a077b71996490d5413dfe1e921119c40f63b0438 (diff) | |
| download | pkgsrc-d5a0e27f9a2e2092069d7b479fa3cbfacc84de64.tar.gz | |
In the bin-install target, instead of running pkg_add for every
BINPKG_SITES entry separately, construct an appropriate PKG_PATH
and call pkg_add only once. Patch from Chapman Flack in PR 30929.
Use PKGNAME_REQD when installing package dependencies.
Patch from Chapman Flack in PR 30954.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6940c9bf26d..976316dd232 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1781 2006/01/03 00:41:51 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1782 2006/01/03 17:26:56 wiz Exp $ # # This file is in the public domain. # @@ -3463,6 +3463,8 @@ _BIN_INSTALL_FLAGS+= -A .endif _BIN_INSTALL_FLAGS+= ${PKG_ARGS_ADD} +_SHORT_UNAME_R= ${:!${UNAME} -r!:C@\.([0-9]*)[_.].*@.\1@} # n.n[_.]anything => n.n + # Install binary pkg, without strict uptodate-check first .PHONY: real-su-bin-install real-su-bin-install: @@ -3474,32 +3476,24 @@ real-su-bin-install: ${SHCOMMENT} ${ECHO_MSG} "*** or use \`\`${MAKE} bin-update'' to upgrade it and all of its dependencies."; \ exit 1; \ fi - @if [ -f ${PKGFILE} ] ; then \ - ${ECHO_MSG} "Installing from binary pkg ${PKGFILE}" ; \ - ${PKG_ADD} ${_BIN_INSTALL_FLAGS} ${PKGFILE} ; \ - else \ - rel=`${UNAME} -r | ${SED} 's@\.\([0-9]*\)[\._].*@\.\1@'`; \ - arch=${MACHINE_ARCH}; \ - for site in ${BINPKG_SITES} ; do \ - ${ECHO} Trying `eval ${ECHO} $$site`/All ; \ - ${SHCOMMENT} ${ECHO} ${SETENV} PKG_PATH="`eval ${ECHO} $$site`/All" ${PKG_ADD} ${_BIN_INSTALL_FLAGS} ${PKGNAME}${PKG_SUFX} ; \ - if ${SETENV} PKG_PATH="`eval ${ECHO} $$site`/All" ${PKG_ADD} ${_BIN_INSTALL_FLAGS} ${PKGNAME}${PKG_SUFX} ; then \ - ${ECHO} "${PKGNAME} successfully installed."; \ - break ; \ - fi ; \ - done ; \ - if ! ${PKG_INFO} -qe "${PKGNAME}" ; then \ - ${SHCOMMENT} Cycle through some FTP server here ;\ - ${ECHO_MSG} "Installing from source" ; \ - ${MAKE} ${MAKEFLAGS} package \ - DEPENDS_TARGET=${DEPENDS_TARGET:Q} && \ - ${MAKE} ${MAKEFLAGS} clean ; \ - fi ; \ + @rel=${_SHORT_UNAME_R:Q} ; \ + arch=${MACHINE_ARCH:Q} ; \ + pkgpath=${PKGREPOSITORY:Q} ; \ + for i in ${BINPKG_SITES} ; do pkgpath="$$pkgpath;$$i/All" ; done ; \ + ${ECHO} "Trying $$pkgpath" ; \ + if ${SETENV} PKG_PATH="$$pkgpath" ${PKG_ADD} ${_BIN_INSTALL_FLAGS} ${PKGNAME_REQD:U${PKGNAME}:Q}${PKG_SUFX} ; then \ + ${ECHO} "`${PKG_INFO} -e ${PKGNAME_REQD:U${PKGNAME}:Q}` successfully installed."; \ + else \ + ${SHCOMMENT} Cycle through some FTP server here ;\ + ${ECHO_MSG} "Installing from source" ; \ + ${MAKE} ${MAKEFLAGS} package \ + DEPENDS_TARGET=${DEPENDS_TARGET:Q} && \ + ${MAKE} ${MAKEFLAGS} clean ; \ fi .PHONY: bin-install bin-install: - @${ECHO_MSG} "${_PKGSRC_IN}> Binary install for ${PKGNAME}" + @${ECHO_MSG} "${_PKGSRC_IN}> Binary install for "${PKGNAME_REQD:U${PKGNAME}:Q} ${_PKG_SILENT}${_PKG_DEBUG} \ realtarget="real-su-bin-install"; \ action="binary install"; \ |