diff options
| author | hubertf <hubertf> | 1999-11-20 21:15:49 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1999-11-20 21:15:49 +0000 |
| commit | 8ce2429f22a96ad8408eeb04f56a06bd5a13dbc6 (patch) | |
| tree | ceef963a1beab5f7280418084e310bb28a4c57a6 /mk | |
| parent | bd40aa4a39fff3f56d96f5ad1d4185e86a0abf6e (diff) | |
| download | pkgsrc-8ce2429f22a96ad8408eeb04f56a06bd5a13dbc6.tar.gz | |
Automatically set MASTER_SITE_LOCAL from MASTER_SITE_BACKUP, and make sure
MASTER_SITE_BACKUP doesn't end in //.
For this, any setting of MASTER_SITE_LOCAL in /etc/mk.conf must no longer
include ${DIST_SUBDIR} - this will be added automatically, if needed.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 17 | ||||
| -rw-r--r-- | mk/mk.conf.example | 23 |
2 files changed, 16 insertions, 24 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 183a3d97d52..48c905a1fa7 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.367 1999/11/12 11:58:45 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.368 1999/11/20 21:15:49 hubertf Exp $ # # This file is in the public domain. # @@ -613,20 +613,21 @@ MASTER_SITES?= PATCH_SITES?= # The primary backup site. -.if defined(DIST_SUBDIR) -MASTER_SITE_BACKUP?= \ - ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/ \ - ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${DIST_SUBDIR}/ -.else MASTER_SITE_BACKUP?= \ ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/ \ ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ +.if defined(DIST_SUBDIR) +MASTER_SITE_BACKUP:= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}/} .endif # Where to put distfiles that don't have any other master site +.if defined(DIST_SUBDIR) +MASTER_SITE_LOCAL?= \ + ${MASTER_SITE_BACKUP:S,${DIST_SUBDIR},LOCAL_PORTS,} +.else # DIST_SUBDIR MASTER_SITE_LOCAL?= \ - ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ \ - ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/LOCAL_PORTS/ + ${MASTER_SITE_BACKUP:=LOCAL_PORTS/} +.endif # DIST_SUBDIR # I guess we're in the master distribution business! :) As we gain mirror # sites for distfiles, add them to this list. diff --git a/mk/mk.conf.example b/mk/mk.conf.example index 52dc9ef016d..d73a51febd9 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.103 1999/11/17 09:13:43 agc Exp $ +# $NetBSD: mk.conf.example,v 1.104 1999/11/20 21:15:50 hubertf Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values @@ -561,11 +561,8 @@ PAPERSIZE= A4 #MASTER_SITE_TEX_CTAN= ftp://mirror.aarnet.edu.au/tex-archive/ #MASTER_SITE_SUNSITE= ftp://mirror.aarnet.edu.au/sunsite.unc.edu/ #MASTER_SITE_BACKUP= \ -# ftp://ftp.au.netbsd.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/ \ -# ftp://ftp2.au.netbsd.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/ -#MASTER_SITE_LOCAL= \ -# ftp://ftp.au.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ \ -# ftp://ftp2.au.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ +# ftp://ftp.au.netbsd.org/pub/NetBSD/packages/distfiles/ \ +# ftp://ftp2.au.netbsd.org/pub/NetBSD/packages/distfiles/ # Finland # @@ -577,9 +574,7 @@ PAPERSIZE= A4 #MASTER_SITE_SUNSITE= \ # ftp://ftp.funet.fi/pub/mirrors/sunsite.unc.edu/pub/Linux/ #MASTER_SITE_BACKUP= \ -# ftp://ftp.fi.netbsd.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/ -#MASTER_SITE_LOCAL= \ -# ftp://ftp.fi.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ +# ftp://ftp.fi.netbsd.org/pub/NetBSD/packages/distfiles/ # Austria # @@ -588,8 +583,7 @@ PAPERSIZE= A4 #MASTER_SITE_PERL_CPAN= ftp://ftp.at.netbsd.org/languages/perl/CPAN/modules/by-module/ #MASTER_SITE_TEX_CTAN= ftp://ftp.at.netbsd.org/publishing/tex/CTAN/ #MASTER_SITE_SUNSITE= ftp://ftp.univie.ac.at/systems/linux/sunsite/ -#MASTER_SITE_BACKUP= ftp://ftp.at.netbsd.org/opsys/NetBSD/packages/distfiles/${DIST_SUBDIR}/ -#MASTER_SITE_LOCAL= ftp://ftp.at.netbsd.org/opsys/NetBSD/packages/distfiles/LOCAL_PORTS/ +#MASTER_SITE_BACKUP= ftp://ftp.at.netbsd.org/opsys/NetBSD/packages/distfiles/ # Denmark # @@ -607,8 +601,5 @@ PAPERSIZE= A4 #MASTER_SITE_TEX_CTAN= ftp://ftp.ring.gr.jp/pub/text/CTAN/ #MASTER_SITE_SUNSITE= ftp://sunsite.sut.ac.jp/pub/archives/linux/sunsite-unc/ #MASTER_SITE_BACKUP= \ -# ftp://ftp.ring.gr.jp/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/ \ -# ftp://ftp.jp.netbsd.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/ -#MASTER_SITE_LOCAL= \ -# ftp://ftp.ring.gr.jp/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ \ -# ftp://ftp.jp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ +# ftp://ftp.ring.gr.jp/pub/NetBSD/packages/distfiles/ \ +# ftp://ftp.jp.netbsd.org/pub/NetBSD/packages/distfiles/ |