Sun Apr 18 21:48:39 2010 UTC ()
syncing BINPKG_SITES with reality.

Originally suggested by hubertf@


(sbd)
diff -r1.18 -r1.19 pkgsrc/mk/install/bin-install.mk
cvs diff -r1.18 -r1.19 pkgsrc/mk/install/bin-install.mk (expand / switch to unified diff)

--- pkgsrc/mk/install/bin-install.mk 2008/02/20 09:58:04 1.18
+++ pkgsrc/mk/install/bin-install.mk 2010/04/18 21:48:39 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bin-install.mk,v 1.18 2008/02/20 09:58:04 wiz Exp $ 1# $NetBSD: bin-install.mk,v 1.19 2010/04/18 21:48:39 sbd Exp $
2# 2#
3 3
4# This file provides the following targets: 4# This file provides the following targets:
5# 5#
6# bin-install: 6# bin-install:
7# Tries to install a package from a prebuilt binary package, and 7# Tries to install a package from a prebuilt binary package, and
8# if that doesn't work, builds the package from source. 8# if that doesn't work, builds the package from source.
9# 9#
10# === User-settable variables === 10# === User-settable variables ===
11# 11#
12# PACKAGES 12# PACKAGES
13# This directory is searched before BINPKG_SITES when trying to 13# This directory is searched before BINPKG_SITES when trying to
14# install binary packages. 14# install binary packages.
@@ -21,27 +21,27 @@ @@ -21,27 +21,27 @@
21# 21#
22# PKGNAME_REQD 22# PKGNAME_REQD
23# The package pattern that is required to be installed. By default, 23# The package pattern that is required to be installed. By default,
24# any version of this package will do, but when installing 24# any version of this package will do, but when installing
25# dependencies, a special version may be needed. 25# dependencies, a special version may be needed.
26 26
27# XXX: This file contains implementation details from the "pkg" flavor, 27# XXX: This file contains implementation details from the "pkg" flavor,
28# for example the All/ directory and the @cwd. 28# for example the All/ directory and the @cwd.
29 29
30# List of sites carrying binary pkgs. Variables "rel" and "arch" are 30# List of sites carrying binary pkgs. Variables "rel" and "arch" are
31# replaced with OS release ("1.5", ...) and architecture ("mipsel", ...) 31# replaced with OS release ("1.5", ...) and architecture ("mipsel", ...)
32.if ${OPSYS} == "NetBSD" 32.if ${OPSYS} == "NetBSD"
33BINPKG_SITES?= \ 33BINPKG_SITES?= \
34 ftp://ftp.NetBSD.org/pub/NetBSD/packages/$${rel}/$${arch} 34 ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$${arch}/$${rel}
35.else 35.else
36BINPKG_SITES?= 36BINPKG_SITES?=
37.endif 37.endif
38 38
39PKGNAME_REQD?= ${PKGNAME} 39PKGNAME_REQD?= ${PKGNAME}
40 40
41.PHONY: bin-install 41.PHONY: bin-install
42.PHONY: do-bin-install do-bin-install-from-source 42.PHONY: do-bin-install do-bin-install-from-source
43.PHONY: su-do-bin-install 43.PHONY: su-do-bin-install
44.PHONY: acquire-bin-install-lock locked-su-do-bin-install release-bin-install-lock 44.PHONY: acquire-bin-install-lock locked-su-do-bin-install release-bin-install-lock
45 45
46bin-install: \ 46bin-install: \
47 do-bin-install \ 47 do-bin-install \