From owner-freebsd-ports@FreeBSD.ORG  Sun May  9 17:40:32 2004
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
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 6083316A4CE
	for <ports@freebsd.org>; Sun,  9 May 2004 17:40:32 -0700 (PDT)
Received: from fillmore.dyndns.org (port-212-202-49-130.reverse.qsc.de
	[212.202.49.130])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CA7B943D1D
	for <ports@freebsd.org>; Sun,  9 May 2004 17:40:31 -0700 (PDT)
	(envelope-from eikemeier@fillmore-labs.com)
Received: from [172.16.0.2] (helo=fillmore-labs.com)
	by fillmore.dyndns.org with esmtp (Exim 4.33; FreeBSD)
	id 1BMyqJ-000J6p-Qf; Mon, 10 May 2004 02:40:31 +0200
Message-ID: <409ECF7B.5090606@fillmore-labs.com>
Date: Mon, 10 May 2004 02:40:27 +0200
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Organization: Fillmore Labs GmbH - http://www.fillmore-labs.com/
MIME-Version: 1.0
To: Kris Kennaway <kris@obsecurity.org>
References: <BCC2AE80.128AC%tomonage2@gmx.de>
	<20040508134709.GA35555@xor.obsecurity.org>
	<p0602040fbcc33d188518@[128.113.24.47]>
	<20040509024226.GA79746@xor.obsecurity.org>
	<p06020411bcc4683ea298@[128.113.24.47]>
	<20040509231911.GA54086@xor.obsecurity.org>
In-Reply-To: <20040509231911.GA54086@xor.obsecurity.org>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
User-Agent: KMail/1.5.9
cc: ports@freebsd.org
cc: Garance A Drosihn <drosih@rpi.edu>
Subject: Re: Make index || portsdb -uU fails after cvsup
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2004 00:40:32 -0000

Kris Kennaway wrote:

> The existence of /usr/obj/usr/ports seems to confuse ports.

This stems from the fact that make has `pwd` != ${.CURDIR} when
/usr/obj/`pwd` exists, see make(1).

This patch fixes the problems for `make index':

diff -u -r1.53 bsd.port.subdir.mk
--- bsd.port.subdir.mk	2 Apr 2004 07:25:23 -0000	1.53
+++ bsd.port.subdir.mk	10 May 2004 00:27:11 -0000
@@ -209,7 +213,7 @@
 
 .for i in ${SUBDIR}
 describe.$i:
-	@${MAKE} -B ${i:S/^/_/:S/$/.describe/} > ${INDEX_TMPDIR}/${INDEXFILE}.desc.${i}
+	@cd ${.CURDIR}; ${MAKE} -B ${i:S/^/_/:S/$/.describe/} > ${INDEX_TMPDIR}/${INDEXFILE}.desc.${i}
 .endfor
 .else
 describe: ${SUBDIR:S/^/_/:S/$/.describe/}

while I'm here, may I humbly as for:

diff -u -r1.53 bsd.port.subdir.mk
--- bsd.port.subdir.mk	2 Apr 2004 07:25:23 -0000	1.53
+++ bsd.port.subdir.mk	10 May 2004 00:27:11 -0000
@@ -82,6 +81,11 @@
 
 ECHO_MSG?=	echo
 
+# local customization of the ports tree
+.if exists(${.CURDIR}/Makefile.local)
+.include "${.CURDIR}/Makefile.local"
+.endif
+
 TARGETS+=	all
 TARGETS+=	build
 TARGETS+=	checksum