summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2002-11-10 18:20:44 +0000
committerhubertf <hubertf@pkgsrc.org>2002-11-10 18:20:44 +0000
commitd019306132f086324661f756ff63058be159edbd (patch)
tree05d65c369d443d86aacbb8ebaf321f72a481313b /mk
parent82503e70ce70cce26522a71440143254e5459ece (diff)
downloadpkgsrc-d019306132f086324661f756ff63058be159edbd.tar.gz
rename BINPKG_SITE to BINPKG_SITES
Adresses PR pkg/19004 by tv@pobox.com
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.defaults.mk4
-rw-r--r--mk/bsd.pkg.mk6
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 2e31f256046..0001e2d1a48 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.103 2002/11/10 12:17:31 grant Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.104 2002/11/10 18:20:44 hubertf Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -376,7 +376,7 @@ WARN_NO_OBJECT_FMT?=yes
# Possible: defined, not defined
# Default: not defined
-#BINPKG_SITE=...
+#BINPKG_SITES=...
# Whitespace seperated list of URLs for binary packages. Directories
# "All" etc. are expected in the named place, variables "rel" and
# "arch" are replaced with OS release ("1.5", ...) and architecture
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 701688e5b90..bc56a65d763 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1081 2002/11/07 04:22:29 dillo Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1082 2002/11/10 18:20:44 hubertf Exp $
#
# This file is in the public domain.
#
@@ -3322,7 +3322,7 @@ checksum: fetch uptodate-digest
# List of sites carrying binary pkgs. Variables "rel" and "arch" are
# replaced with OS release ("1.5", ...) and architecture ("mipsel", ...)
-BINPKG_SITE?= \
+BINPKG_SITES?= \
ftp://ftp.netbsd.org/pub/NetBSD/packages/$${rel}/$${arch}
# List of flags to pass to pkg_add(8) for bin-install:
@@ -3344,7 +3344,7 @@ bin-install:
else \
rel=`${UNAME} -r | ${SED} 's@\.\([0-9]*\)[\._].*@\.\1@'`; \
arch=${MACHINE_ARCH}; \
- for site in ${BINPKG_SITE} ; do \
+ 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 \