Move the definition of BUILD_ROOT into bsd.pkg.mk, from the individual

package Makefiles which need it.

7 files changed, 9 insertions, 52 deletions

diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 5cf42636687..380a48461e4 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/11/13 01:05:08 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1999/03/22 09:38:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/05/26 04:04:11 mph Exp
 #
 
@@ -11,14 +11,6 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=     packages@netbsd.org
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef WRKOBJDIR
-BUILD_ROOT=	${WRKOBJDIR}
-.else
-BUILD_ROOT=	${PKGSRCDIR}
-.endif
-
 BUILD_DEPENDS=	${BUILD_ROOT}/graphics/urt/${WRKDIR:T}/include/rle.h:../../graphics/urt:configure
 DEPENDS+=	urt-3.1b1:../../graphics/urt
 
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 8c861ca27cf..538b4e2fb5f 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/11/13 01:12:57 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1999/03/22 09:38:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/02/11 08:48:26 tg Exp
 #
 
@@ -14,14 +14,6 @@ PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	packages@netbsd.org
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef WRKOBJDIR
-BUILD_ROOT=	${WRKOBJDIR}
-.else
-BUILD_ROOT=	${PKGSRCDIR}
-.endif
-
 DEPENDS+=	tiff-3.4:../../graphics/tiff
 BUILD_DEPENDS+=	${BUILD_ROOT}/graphics/netpbm/${WRKDIR:T}/netpbm:../../graphics/netpbm:build
 
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 15edccb375b..26b0c952020 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/11/13 01:26:58 frueauf Exp $
+# $NetBSD: Makefile,v 1.13 1999/03/22 09:38:23 agc Exp $
 #
 
 DISTNAME=	nt.1.5a23
@@ -8,14 +8,6 @@ MASTER_SITES=	ftp://cs.ucl.ac.uk/mice/nte/
 
 MAINTAINER=	mycroft@netbsd.org
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef WRKOBJDIR
-BUILD_ROOT=	${WRKOBJDIR}
-.else
-BUILD_ROOT=	${PKGSRCDIR}
-.endif
-
 BUILD_DEPENDS=	${BUILD_ROOT}/x11/tk80/${WRKDIR:T}/tk8.0/generic/default.h:${TK_DIR}:configure
 DEPENDS+=	tk-8.0p2:../../x11/tk80
 
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 6a097caa910..2c27e62414c 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 1998/12/30 01:07:07 tron Exp $
+# $NetBSD: Makefile,v 1.20 1999/03/22 09:38:24 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp 
 #
 
@@ -19,14 +19,6 @@ DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 NOT_FOR_ARCHS=	alpha	#filter.cc compiler error
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef WRKOBJDIR
-BUILD_ROOT=	${WRKOBJDIR}
-.else
-BUILD_ROOT=	${PKGSRCDIR}
-.endif
-
 GSM_DIR=	${BUILD_ROOT}/audio/gsm
 GSM_WORK=	${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10
 
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 0eef63b9748..acba1e16bcb 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.230 1999/03/17 12:05:40 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.231 1999/03/22 09:38:22 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -341,8 +341,10 @@ _PKG_DEBUG=		set -x;
 __canonical_PKGSRCDIR!=	cd ${PKGSRCDIR} && pwd -P
 __canonical_CURDIR!=	cd ${.CURDIR} && pwd -P
 PKGSRC_SUBDIR=		${__canonical_CURDIR:S,${__canonical_PKGSRCDIR}/,,}
+BUILD_ROOT=     	${WRKOBJDIR}
 BUILD_DIR?=		${WRKOBJDIR}/${PKGSRC_SUBDIR}
 .else
+BUILD_ROOT=     	${PKGSRCDIR}
 BUILD_DIR?=		${.CURDIR}
 .endif # WRKOBJDIR
 
diff --git a/plan9/9term/Makefile b/plan9/9term/Makefile
index de8a4326820..06a58208c74 100644
--- a/plan9/9term/Makefile
+++ b/plan9/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1998/11/13 01:41:16 frueauf Exp $
+# $NetBSD: Makefile,v 1.17 1999/03/22 09:38:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
 #
 
@@ -10,14 +10,7 @@ MASTER_SITES=   ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.psrg.cs.usyd.edu.au/~matty/9term/index.html
 
-.include "../../mk/bsd.prefs.mk"
-
 # needs library and private header, but not during runtime
-.ifdef WRKOBJDIR
-BUILD_ROOT=	${WRKOBJDIR}
-.else
-BUILD_ROOT=	${PKGSRCDIR}
-.endif
 BUILD_DEPENDS=	${BUILD_ROOT}/plan9/sam/${WRKDIR:T}/libframe/libframe.a:../../plan9/sam
 
 NOT_FOR_ARCHS=	alpha	#LP64 Problems
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index a60f83c00eb..18f5342d2c8 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 1999/03/16 15:30:58 agc Exp $
+# $NetBSD: Makefile,v 1.35 1999/03/22 09:38:27 agc Exp $
 #
 
 DISTNAME=	ghostscript-5.50
@@ -47,12 +47,6 @@ HP850_DRV=	hp8xxs13.zip
 # PostScript source to decode encrypted PDF files
 PDF_SEC=	pdf_sec.ps
 
-.ifdef WRKOBJDIR
-BUILD_ROOT=	${WRKOBJDIR}
-.else
-BUILD_ROOT=	${PKGSRCDIR}
-.endif
-
 .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
 PAPERSIZE_DEF=	-DA4
 .endif