Date: Thu, 18 Apr 2002 11:02:34 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Gordon Tetlow <gordont@gnf.org> Cc: portmgr@FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: [PATCH] bsd.port.mk is broken Message-ID: <20020418080234.GF98788@sunbay.com> In-Reply-To: <Pine.LNX.4.44.0204171603420.26554-100000@smtp.gnf.org> References: <200204171349.g3HDnTV73622@freefall.freebsd.org> <Pine.LNX.4.44.0204171603420.26554-100000@smtp.gnf.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--z9ECzHErBrwFF8sy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Wed, Apr 17, 2002 at 04:11:03PM -0700, Gordon Tetlow wrote:
> On Wed, 17 Apr 2002, Ruslan Ermilov wrote:
>=20
> > ru 2002/04/17 06:49:29 PDT
> >=20
> > Modified files:
> > share/mk bsd.doc.mk bsd.docb.mk bsd.info.mk=20
> > bsd.lib.mk bsd.libnames.mk bsd.man.mk=20
> > bsd.nls.mk bsd.obj.mk bsd.own.mk=20
> > bsd.prog.mk bsd.sgml.mk bsd.subdir.mk=20
> > sys.mk=20
> > Added files:
> > share/mk bsd.init.mk=20
> > 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.
>=20
> This broke any port that uses HAS_CONFIGURE (or USE_CONFIGURE, or
> whatever), which adds into the environment INSTALL=3D"/usr/bin/install -c=
-o
> ${BINOWN} -g ${BINGRP}" which are now undefined now that sys.mk no longer
> includes bsd.own.mk
>=20
Yeah, it did. Could someone from portmgr@ please commit this patch?
%%%
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/objformat || echo=
aout
.endif
=20
+# Get system defaults.
+.include <bsd.own.mk>
+
MASTERDIR?=3D ${.CURDIR}
=20
# If they exist, include Makefile.inc, then architecture/operating
%%%
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
--z9ECzHErBrwFF8sy
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
iD8DBQE8vn2aUkv4P6juNwoRAvGzAKCAtj58vT2ZI897GFbFO8EJamrRJwCfdlKP
6Rxgv+L2Kzbg/kDzLeYo6ic=
=F1np
-----END PGP SIGNATURE-----
--z9ECzHErBrwFF8sy--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020418080234.GF98788>