From owner-cvs-all Thu Apr 18 8:25: 8 2002 Delivered-To: cvs-all@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id B45C137B404; Thu, 18 Apr 2002 08:24:47 -0700 (PDT) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.6/8.11.2) id g3IFOiJ80002; Thu, 18 Apr 2002 18:24:44 +0300 (EEST) (envelope-from ru) Date: Thu, 18 Apr 2002 18:24:43 +0300 From: Ruslan Ermilov To: Maxim Sobolev Cc: Gordon Tetlow , portmgr@FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: [PATCH] bsd.port.mk is broken Message-ID: <20020418152443.GB79334@sunbay.com> References: <200204171349.g3HDnTV73622@freefall.freebsd.org> <20020418080234.GF98788@sunbay.com> <3CBED91C.3ED57B68@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="R3G7APHDIzY6R/pk" Content-Disposition: inline In-Reply-To: <3CBED91C.3ED57B68@FreeBSD.org> User-Agent: Mutt/1.3.27i Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --R3G7APHDIzY6R/pk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 18, 2002 at 05:33:00PM +0300, Maxim Sobolev wrote: > Ruslan Ermilov wrote: > >=20 > > On Wed, Apr 17, 2002 at 04:11:03PM -0700, Gordon Tetlow wrote: > > > On Wed, 17 Apr 2002, Ruslan Ermilov wrote: > > > > > > > ru 2002/04/17 06:49:29 PDT > > > > > > > > Modified files: > > > > share/mk bsd.doc.mk bsd.docb.mk bsd.info.mk > > > > bsd.lib.mk bsd.libnames.mk bsd.man.mk > > > > bsd.nls.mk bsd.obj.mk bsd.own.mk > > > > bsd.prog.mk bsd.sgml.mk bsd.subdir.mk > > > > sys.mk > > > > Added files: > > > > share/mk bsd.init.mk > > > > Log: > > > > Don't include bsd.own.mk from sys.mk, this makes it impossible > > > > to use ``.if defined()'' inside bsd.own.mk to test for defines > > > > in individual makefiles. For example, setting DEBUG_FLAGS in > > > > Makefile didn't take the desired effect on the STRIP assignment. > > > > > > This broke any port that uses HAS_CONFIGURE (or USE_CONFIGURE, or > > > whatever), which adds into the environment INSTALL=3D"/usr/bin/instal= l -c -o > > > ${BINOWN} -g ${BINGRP}" which are now undefined now that sys.mk no lo= nger > > > includes bsd.own.mk > > > > > Yeah, it did. Could someone from portmgr@ please commit this patch? > >=20 > > %%% > > Index: bsd.port.mk > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v > > retrieving revision 1.409 > > diff -u -r1.409 bsd.port.mk > > --- bsd.port.mk 4 Apr 2002 10:06:00 -0000 1.409 > > +++ bsd.port.mk 18 Apr 2002 07:59:17 -0000 > > @@ -628,6 +628,9 @@ > > PORTOBJFORMAT!=3D test -x /usr/bin/objformat && /usr/bin/objfor= mat || echo aout > > .endif > >=20 > > +# Get system defaults. > > +.include > > + > > MASTERDIR?=3D ${.CURDIR} > >=20 > > # If they exist, include Makefile.inc, then architecture/operating > > %%% >=20 > Will it affect 4-STABLE? >=20 Only after I MFC this stuff. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --R3G7APHDIzY6R/pk Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE8vuU7Ukv4P6juNwoRAqcdAJ9hQQtumrs0N9P3v5lvJw50CoWXugCgh02S yrtU0p6ibhZ9fG+/vpWpkTI= =Ilpz -----END PGP SIGNATURE----- --R3G7APHDIzY6R/pk-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message