From owner-cvs-all Mon Mar 15 13:39:18 1999 Delivered-To: cvs-all@freebsd.org Received: from ns.mt.sri.com (sri-gw.MT.net [206.127.105.141]) by hub.freebsd.org (Postfix) with ESMTP id 9771815100; Mon, 15 Mar 1999 13:39:15 -0800 (PST) (envelope-from nate@mt.sri.com) Received: from mt.sri.com (rocky.mt.sri.com [206.127.76.100]) by ns.mt.sri.com (8.8.8/8.8.8) with SMTP id OAA16091; Mon, 15 Mar 1999 14:38:56 -0700 (MST) (envelope-from nate@rocky.mt.sri.com) Received: by mt.sri.com (SMI-8.6/SMI-SVR4) id OAA01707; Mon, 15 Mar 1999 14:38:42 -0700 Date: Mon, 15 Mar 1999 14:38:42 -0700 Message-Id: <199903152138.OAA01707@mt.sri.com> From: Nate Williams MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: Bill Fumerola Cc: Nate Williams , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/etc make.conf In-Reply-To: References: <199903152122.OAA01568@mt.sri.com> X-Mailer: VM 6.34 under 19.16 "Lille" XEmacs Lucid Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk > > > Take that up with Satoshi or -core, I guess. I was merely trying to keep > > > them in sync. > > > > Huh? You committed the change to both branches, so it didn't exist > > until you made the commit. (In other words, there was nothing to > > sync. up). > > Wrong. > > Index: make.conf > =================================================================== > RCS file: /home/ncvs/src/etc/make.conf,v > retrieving revision 1.74 > retrieving revision 1.75 > diff -u -r1.74 -r1.75 > --- make.conf 1999/02/03 22:25:41 1.74 > +++ make.conf 1999/03/14 19:05:16 1.75 > @@ -1,4 +1,4 @@ > -# $Id: make.conf,v 1.74 1999/02/03 22:25:41 asami Exp $ > +# $Id: make.conf,v 1.75 1999/03/14 19:05:16 billf Exp $ > # > # This file, if present, will be read by make (see /usr/share/mk/sys.mk). > # It allows you to override macro definitions to make without changing > @@ -155,6 +155,8 @@ > #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%/ > # > # > # Kerberos IV > > I merely updated the existing definitions. Ahh, sorry. I mis-read the commit message. I think these files should go in /etc/ports.conf instead of make.conf to separate them out from the base system. Even more so now that the ports tree is even more separated from the base system with the removal /usr/share/mk/*ports*mk stuff. Nate To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message