Date: Fri, 31 Aug 2001 20:25:29 +0200 From: Alexander Langer <alex@big.endian.de> To: "David O'Brien" <obrien@FreeBSD.ORG> Cc: Ruslan Ermilov <ru@FreeBSD.ORG>, arch@FreeBSD.ORG Subject: Re: cvs commit: src/share/mk sys.mk Message-ID: <20010831202529.B17086@fump.kawo2.rwth-aachen.de> In-Reply-To: <20010831110121.B21276@dragon.nuxi.com>; from obrien@FreeBSD.ORG on Fri, Aug 31, 2001 at 11:01:22AM -0700 References: <200108311118.f7VBIO124920@freefall.freebsd.org> <20010831142958.A60910@sunbay.com> <20010831141746.A1809@zerogravity.kawo2.rwth-aachen.d> <20010831084811.B95710@dragon.nuxi.com> <20010831184945.A16872@fump.kawo2.rwth-aachen.de> <20010831100216.A17397@dragon.nuxi.com> <20010831193947.A17086@fump.kawo2.rwth-aachen.de> <20010831110121.B21276@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Thus spake David O'Brien (obrien@FreeBSD.ORG): > > - A patch to bsd.port.mk has already been submitted to portmgr@ and > > is under development. > Can you post the patch? Of course. cvs diff: Diffing . Index: bsd.port.mk =================================================================== RCS file: /storage/FreeBSD/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.377 diff -u -r1.377 bsd.port.mk --- bsd.port.mk 2001/08/27 00:09:05 1.377 +++ bsd.port.mk 2001/08/29 19:48:46 @@ -489,6 +489,10 @@ _PREMKINCLUDED= yes +.if exists(/etc/ports.conf) +.include </etc/ports.conf> +.endif + AWK?= /usr/bin/awk BASENAME?= /usr/bin/basename CAT?= /bin/cat Note that $PORTSDIR/Mk/bsd.port.mk defines reasonable defaults, ports.conf is just for overriding these. ports.conf is supped to be maintained in the ports-tree. I just noticed, that we should probably modify src/share/mk/bsd.port.mk instead: include /etc/ports.conf before it sets PORTSDIR via ?=, for obvious reasons. > /usr/share/mk/sys.mk, /etc/defaults/make.conf, /etc/make.conf, and > /usr/share/examples/etc/make.conf just seem like too many files to chase > around. Maybe totally do away with /etc/defaults/make.conf and put > BDECFLAGS into either your new world.conf or sys.mk or some other > bsd.*.mk in /usr/share/mk. Hmm. This seems to be what is the actual situation :-) - We need to keep /usr/share/mk/sys.mk, no question - /etc/make.conf is for local overrides, so are world.conf, docs.conf, www.conf and ports.conf. Maybe they should be moved to a new /etc/make/ dir, as we do with most programs that need/can have multiple files in /etc, such as mail, ssh or isdn. - /etc/defaults/make.conf is gone - /usr/share/examples/etc/make.conf is for maintaining example entries, e.g. CPUTYPE documentation. The ports cvs tree will have an equivalent in future, for documenting example ports.conf entries such as WITHOUT_X11, PORTSDIR, LOCALBASE, etc. Users probably want to use BDECFLAGS in the non-world context, but I also don't really like it in sys.mk. However, bsd.prog.mk could be a correct place, though I don't like to pollution of this file with a variable like this. Alex To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010831202529.B17086>