From fbc74096eca322fb828e3ecf56ce2746c4577a99 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 2 Jul 2007 14:54:09 +0000
Subject: Remove USE_MTREE support. Keep one copy (the NetBSD version) for the
 purpose of print-PLIST in plist/common-dirs.mtree.

Discussed with wiz@, no objections on tech-pkg@.
---
 mk/bsd.pkg.use.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'mk/bsd.pkg.use.mk')

diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 3f59e8df24e..17b18cbdc8e 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.42 2007/03/02 09:08:34 wiz Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.43 2007/07/02 14:54:09 joerg Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -41,11 +41,8 @@ USE_X11BASE?=		implied
 MAKE_FLAGS+=		CC=${CC:Q} CXX=${CXX:Q}
 .endif
 
-.if defined(USE_X11BASE)
-_MTREE_FILE?=		${PKGSRCDIR}/mk/platform/${OPSYS}.x11.dist
-.  if ${X11_TYPE} != "modular"
-.    include "../../mk/x11.buildlink3.mk"
-.  endif
+.if defined(USE_X11BASE) && ${X11_TYPE} != "modular"
+.  include "../../mk/x11.buildlink3.mk"
 .endif
 
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
-- 
cgit v1.2.3