Make index || portsdb -uU fails after cvsup

[Oliver Eikemeier]

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