From 30852e379b6ffc4693ccaba665d3fd892445037a Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Fri, 4 Sep 1998 10:26:59 +0000
Subject: Moved src/etc/mtree/BSD.x11.dist to pkgsrc/mk/NetBSD.x11.dist by
 Repository Copy.  Modified bsd.pkg.mk to use the file from the new location.

---
 mk/bsd.pkg.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 52995828fdf..b38eaaa98d6 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.156 1998/09/04 10:08:27 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.157 1998/09/04 10:26:59 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -251,16 +251,20 @@ EXTRACT_SUFX?=		.tar.gz
 
 # Figure out where the local mtree file is
 .if !defined(MTREE_FILE)
+.if (${OPSYS} == "NetBSD")
 .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11)
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
+MTREE_FILE=	${PKGSRCDIR}/mk/NetBSD.x11.dist
 .else
-.if (${OPSYS} == "NetBSD")
 MTREE_FILE=	${PKGSRCDIR}/mk/NetBSD.pkg.dist
+.endif
+.else # not NetBSD
+.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11)
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .else
 MTREE_FILE=	/etc/mtree/BSD.local.dist
 .endif
-.endif
-.endif
+.endif # not NetBSD
+.endif # not MTREE_FILE
 MTREE_CMD?=	/usr/sbin/mtree
 MTREE_ARGS?=	-U -f ${MTREE_FILE} -d -e -p
 
-- 
cgit v1.2.3