diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1994-09-13 06:22:11 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1994-09-13 06:22:11 +0000 |
| commit | 491e992bb5eff39fdd22f6374c4d30132d6721ab (patch) | |
| tree | 1dae62ce276b90574b3e181669da7c9e4f3413c5 /Mk/bsd.port.mk | |
| parent | Remove pkg_install from the SUBDIR list. (diff) | |
Ok, I think I have this whole HOME_LOCATION / MASTER_SITE stuff resolved
to a reasonable compromise:
MASTER_SITES now contains a space seperated list of sites for which each
DISTFILE may be retrieved. This should be a directory spec, which will be
concatenated with each file in DISTFILES. HOME_LOCATION is *gone* now
and isn't used for anything, so you can delete it from your Makefiles.
If you want to force a fetch from a given location, simply do something like:
MASTER_SITES= ftp://fnord.foo.bar/pub/dist
DISTFILES= a.tar.gz b.tar.gz
Your entry in MASTER_SITES will be tried first to fetch a.tar.gz and
b.tar.gz, followed by any master sites we have set up (right now, only
freebsd.cdrom.com).
Notes
Notes:
svn path=/head/; revision=83
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 082f73252053..3b4be5be7d4b 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3,7 +3,7 @@ # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id: bsd.port.mk,v 1.32 1994/09/11 12:06:34 jkh Exp $ +# $Id: bsd.port.mk,v 1.33 1994/09/11 12:55:54 jkh Exp $ # # Please view me with 4 column tabs! @@ -126,9 +126,9 @@ PKG_CMD?= pkg_create PKG_ARGS?= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST PKG_SUFX?= .tgz -# I guess we're in the master distribution business! :) -MASTER_SITE?= ftp://freebsd.cdrom.com/pub/FreeBSD/FreeBSD-current/ports/distfiles -HOME_LOCATION?= <original site unknown> +# I guess we're in the master distribution business! :) As we gain mirror +# sites for distfiles, add them to this list. +MASTER_SITES+= ftp://freebsd.cdrom.com/pub/FreeBSD/FreeBSD-current/ports/distfiles # Derived names so that they're easily overridable. DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} @@ -285,12 +285,16 @@ fetch: pre-fetch for file in ${DISTFILES}; do \ if [ ! -f $$file ]; then \ echo ">> $$file doesn't seem to exist on this system."; \ - echo ">> Attempting to fetch it from master site."; \ - if ${NCFTP} ${NCFTPFLAGS} ${MASTER_SITE}/$$file; then \ - echo ">> $$file Fetched!" ; \ - else \ - echo ">> Couldn't fetch it - please try to manually retreive";\ - echo ">> ${HOME_LOCATION}/$$file into ${DISTDIR} and try again."; \ + echo ">> Attempting to fetch it from a master site."; \ + for site in ${MASTER_SITES}; do \ + if ${NCFTP} ${NCFTPFLAGS} $$site/$$file; then \ + echo ">> $$file Fetched!" ; \ + break; \ + fi \ + done \ + if [ ! -f $$file ]; then \ + echo ">> Couldn't fetch it - please try to retreive this";\ + echo ">> port manually into ${DISTDIR} and try again."; \ exit 1; \ fi; \ fi \ |