From owner-freebsd-current Tue Jun 20 14:26:48 2000 Delivered-To: freebsd-current@freebsd.org Received: from server1.mich.com (server1.mich.com [198.108.16.2]) by hub.freebsd.org (Postfix) with ESMTP id 3C28D37BFDC; Tue, 20 Jun 2000 14:26:40 -0700 (PDT) (envelope-from will@almanac.yi.org) Received: from argon.gryphonsoft.com (pm016-021.dialup.bignet.net [64.79.82.229]) by server1.mich.com (8.9.3/8.9.3) with ESMTP id RAA09278; Tue, 20 Jun 2000 17:26:37 -0400 Received: by argon.gryphonsoft.com (Postfix, from userid 1000) id BE573188D; Tue, 20 Jun 2000 17:25:02 -0400 (EDT) Date: Tue, 20 Jun 2000 17:25:02 -0400 From: Will Andrews To: FreeBSD Current , FreeBSD Ports Subject: make.conf fix Message-ID: <20000620172502.C34982@argon.gryphonsoft.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0OAP2g/MAC+5xKAE" X-Mailer: Mutt 1.0.1i X-Operating-System: FreeBSD 5.0-CURRENT i386 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG --0OAP2g/MAC+5xKAE Content-Type: text/plain; charset=us-ascii Hi -current and -ports, I've noticed something that seems to have been broken for a long time. In etc/defaults/make.conf we have several MASTER_SITE_* variables which reference "%SUBDIR%". However, these variables do not work as expected. So we must fix this discrepancy with the following patch. Comments? -- Will Andrews GCS/E/S @d- s+:+>+:- a--->+++ C++ UB++++ P+ L- E--- W+++ !N !o ?K w--- ?O M+ V-- PS+ PE++ Y+ PGP+>+++ t++ 5 X++ R+ tv+ b++>++++ DI+++ D+ G++>+++ e->++++ h! r-->+++ y? --0OAP2g/MAC+5xKAE Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="make.conf.diff" Index: make.conf =================================================================== RCS file: /extra/cvsroot/src/etc/defaults/make.conf,v retrieving revision 1.110 diff -u -r1.110 make.conf --- make.conf 2000/06/17 10:51:47 1.110 +++ make.conf 2000/06/20 21:20:45 @@ -184,22 +184,22 @@ # Some ports use a special variable to point to a collection of # mirrors of well-known software archives. If you have a mirror close # to you, uncomment any of the following lines and change it to that -# address. (Don't remove the "/%SUBDIR%/" part.) +# address. (Don't remove the "/${MASTER_SITE_SUBDIR}/" part.) # # Note: the right hand sides of the following lines are only for your # information. For a full list of default sites, take a look at # bsd.port.mk. # -#MASTER_SITE_XCONTRIB= ftp://ftp.x.org/contrib/%SUBDIR%/ -#MASTER_SITE_GNU= ftp://prep.ai.mit.edu/pub/gnu/%SUBDIR%/ -#MASTER_SITE_PERL_CPAN= ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/%SUBDIR%/ -#MASTER_SITE_TEX_CTAN= ftp://ftp.tex.ac.uk/tex-archive/%SUBDIR%/ -#MASTER_SITE_SUNSITE= ftp://metalab.unc.edu/pub/Linux/%SUBDIR%/ -#MASTER_SITE_KDE= ftp://ftp.kde.org/pub/kde/%SUBDIR%/ -#MASTER_SITE_COMP_SOURCES= ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/ -#MASTER_SITE_GNOME= ftp://ftp.gnome.org/pub/GNOME/sources/%SUBDIR%/ -#MASTER_SITE_AFTERSTEP= ftp://ftp.afterstep.org/%SUBDIR%/ -#MASTER_SITE_WINDOWMAKER= ftp://ftp.windowmaker.org/pub/%SUBDIR%/ +#MASTER_SITE_XCONTRIB= ftp://ftp.x.org/contrib/${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_GNU= ftp://prep.ai.mit.edu/pub/gnu/${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_PERL_CPAN= ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_TEX_CTAN= ftp://ftp.tex.ac.uk/tex-archive/${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_SUNSITE= ftp://metalab.unc.edu/pub/Linux/${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_KDE= ftp://ftp.kde.org/pub/kde/${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_COMP_SOURCES= ftp://gatekeeper.dec.com/pub/usenet/comp.sources.${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_GNOME= ftp://ftp.gnome.org/pub/GNOME/sources/${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_AFTERSTEP= ftp://ftp.afterstep.org/${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_WINDOWMAKER= ftp://ftp.windowmaker.org/pub/${MASTER_SITE_SUBDIR}/ # # # Kerberos IV --0OAP2g/MAC+5xKAE-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message