From owner-freebsd-ports@FreeBSD.ORG Sat May 3 00:23:07 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CECAD37B401; Sat, 3 May 2003 00:23:07 -0700 (PDT) Received: from baraca.united.net.ua (vlan1.baraca.united.net.ua [195.234.212.67]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1369C43FB1; Sat, 3 May 2003 00:23:06 -0700 (PDT) (envelope-from max@vega.com) Received: from vega.vega.com (root@xDSL-2-2.united.net.ua [193.111.9.226]) h437N0VG083465; Sat, 3 May 2003 10:23:01 +0300 (EEST) (envelope-from max@vega.com) Received: from vega.vega.com (max@localhost.vega.com [127.0.0.1]) by vega.vega.com (8.12.6/8.12.5) with ESMTP id h437OIQ8096910; Sat, 3 May 2003 10:24:18 +0300 (EEST) (envelope-from sobomax@FreeBSD.org) Received: (from max@localhost) by vega.vega.com (8.12.6/8.12.5/Submit) id h437ODho096909; Sat, 3 May 2003 10:24:13 +0300 (EEST) Date: Sat, 3 May 2003 10:24:13 +0300 From: Maxim Sobolev To: Ruslan Ermilov Message-ID: <20030503072413.GF93541@vega.vega.com> References: <20030501102544.GG85687@vega.vega.com> <20030501111011.GA99875@sunbay.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="LZvS9be/3tNcYl/X" Content-Disposition: inline In-Reply-To: <20030501111011.GA99875@sunbay.com> User-Agent: Mutt/1.4i X-Operating-System: FreeBSD 4.7-STABLE i386 cc: ports@FreeBSD.ORG cc: portmgr@FreeBSD.ORG Subject: Re: Fix for Makefile.{local,inc,${ARCH},${OPSYS},${ARCH}-${OPSYS}} [patch] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 May 2003 07:23:08 -0000 --LZvS9be/3tNcYl/X Content-Type: text/plain; charset=koi8-r Content-Disposition: inline OOPS, attaching it now. -Maxim On Thu, May 01, 2003 at 02:10:11PM +0300, Ruslan Ermilov wrote: > On Thu, May 01, 2003 at 01:25:44PM +0300, Maxim Sobolev wrote: > > Folks, > > > > Attched please find a patch, which fixes auto-inclusion of various > > Makefile.*, broken since my bsd.port.mk speed-up changes. > > > > Please review/approve or put on test on bento if you think that it > > is necessary. > > > I looked to no avail, but couldn't find the attachment. ;) > > > Cheers, > -- > 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 --LZvS9be/3tNcYl/X Content-Type: text/plain; charset=koi8-r Content-Disposition: attachment; filename=d Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.447 diff -d -u -r1.447 bsd.port.mk --- bsd.port.mk 19 Apr 2003 22:35:28 -0000 1.447 +++ bsd.port.mk 1 May 2003 10:20:55 -0000 @@ -813,22 +813,28 @@ .if ${MASTERDIR} != ${.CURDIR} && exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" +USE_SUBMAKE= yes .endif .if exists(${MASTERDIR}/../Makefile.inc) .include "${MASTERDIR}/../Makefile.inc" +USE_SUBMAKE= yes .endif .if exists(${MASTERDIR}/Makefile.${ARCH}-${OPSYS}) .include "${MASTERDIR}/Makefile.${ARCH}-${OPSYS}" +USE_SUBMAKE= yes .elif exists(${MASTERDIR}/Makefile.${OPSYS}) .include "${MASTERDIR}/Makefile.${OPSYS}" +USE_SUBMAKE= yes .elif exists(${MASTERDIR}/Makefile.${ARCH}) .include "${MASTERDIR}/Makefile.${ARCH}" +USE_SUBMAKE= yes .endif .if exists(${MASTERDIR}/Makefile.local) .include "${MASTERDIR}/Makefile.local" +USE_SUBMAKE= yes .endif .if !defined(PORTNAME) || !defined(PORTVERSION) || defined(PKGNAME) @@ -1394,6 +1400,7 @@ .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" +USE_SUBMAKE= yes .endif # Special macro for doing in-place file editing using regexps --LZvS9be/3tNcYl/X--