summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.use.mk
diff options
context:
space:
mode:
authorjoerg <joerg>2007-07-02 14:54:09 +0000
committerjoerg <joerg>2007-07-02 14:54:09 +0000
commitfbc74096eca322fb828e3ecf56ce2746c4577a99 (patch)
tree15cc825e1aa8d8d452f920e475ee512d1c044118 /mk/bsd.pkg.use.mk
parent351bce1abe39a3bdb34cc71ce655c45bf30b5b97 (diff)
downloadpkgsrc-fbc74096eca322fb828e3ecf56ce2746c4577a99.tar.gz
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@.
Diffstat (limited to 'mk/bsd.pkg.use.mk')
-rw-r--r--mk/bsd.pkg.use.mk9
1 files changed, 3 insertions, 6 deletions
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"