For modular Xorg disable xpkgwedge (will be made a hard error later).

Don't add ${X11BASE}/bin to PATH, don't include mk/x11.buildlink3.mk
when USE_X11BASE is set and don't use BUILDLINK_X11_DIR and related
magic.

OKed by wiz@

4 files changed, 26 insertions, 17 deletions

diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 6644838c1af..9ff4ec92684 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.36 2006/07/07 14:29:41 jlam Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.37 2006/12/20 01:04:46 joerg Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -34,7 +34,9 @@ MAKE_FLAGS+=		CC=${CC:Q} CXX=${CXX:Q}
 
 .if defined(USE_X11BASE)
 MTREE_FILE?=		${PKGSRCDIR}/mk/platform/${OPSYS}.x11.dist
-.  include "../../mk/x11.buildlink3.mk"
+.  if ${X11_TYPE} != "modular"
+.    include "../../mk/x11.buildlink3.mk"
+.  endif
 .endif
 
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index da3654789be..37d0dc63c1d 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.241 2006/10/09 12:25:44 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.242 2006/12/20 01:04:46 joerg Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -560,7 +560,10 @@ PKG_DEFAULT_OPTIONS?=	# empty
 PKG_OPTIONS?=		# empty
 
 # we want this *before* compiler.mk, so that compiler.mk paths override them
-PREPEND_PATH+=		${USE_X11:D${X11BASE}/bin} ${LOCALBASE}/bin
+.if ${X11_TYPE} != "modular" && defined(USE_X11)
+PREPEND_PATH+=		${X11BASE}/bin
+.endif
+PREPEND_PATH+=		${LOCALBASE}/bin
 
 # Wrapper framework definitions
 .include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk"
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 83800371e98..9caa72e2dbf 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.189 2006/11/17 09:19:37 rillig Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.190 2006/12/20 01:04:47 joerg Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -420,9 +420,9 @@ BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
 .endif
 #
 # Add the X11 library directory to the library search paths if the package
-# uses X11.
+# uses X11 and we are not using modular Xorg.
 #
-.if defined(USE_X11)
+.if defined(USE_X11) && ${X11_TYPE} != "modular"
 .  if empty(BUILDLINK_LDFLAGS:M-L${X11BASE}/lib${LIBABISUFFIX})
 BUILDLINK_LDFLAGS+=	-L${X11BASE}/lib${LIBABISUFFIX}
 .  endif
@@ -482,7 +482,7 @@ do-buildlink: buildlink-directories
 buildlink-directories:
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_BINDIR}
-.if defined(USE_X11)
+.if defined(USE_X11) && ${X11_TYPE} != "modular"
 	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${BUILDLINK_X11_DIR}
 	${_PKG_SILENT}${_PKG_DEBUG}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR}
 .endif
@@ -759,7 +759,7 @@ _BLNK_PASSTHRU_RPATHDIRS+=	${LOCALBASE}/lib
 # Allow ${X11BASE}/lib in the runtime library search path for USE_X11
 # packages so that X11 libraries can be found.
 #
-.if defined(USE_X11)
+.if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_PASSTHRU_RPATHDIRS+=	${X11BASE}/lib
 .endif
 #
@@ -784,7 +784,7 @@ _BLNK_MANGLE_DIRS+=	/usr/lib
 _BLNK_MANGLE_DIRS+=	${PREFIX}
 .endif
 _BLNK_MANGLE_DIRS+=	${LOCALBASE}
-.if defined(USE_X11)
+.if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_MANGLE_DIRS+=	${X11BASE}
 .endif
 
@@ -811,7 +811,7 @@ _BLNK_UNPROTECT_DIRS+=	/usr/lib
 _BLNK_UNPROTECT_DIRS+=	${PREFIX}
 .endif
 _BLNK_UNPROTECT_DIRS+=	${LOCALBASE}
-.if defined(USE_X11)
+.if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_UNPROTECT_DIRS+=	${X11BASE}
 .endif
 _BLNK_UNPROTECT_DIRS+=	${_BLNK_PASSTHRU_DIRS}
@@ -866,7 +866,7 @@ _BLNK_TRANSFORM+=	opt-sub:-L/usr/lib:-L${_BLNK_MANGLE_DIR./usr/lib}
 # the canonical actual installed paths.
 #
 _BLNK_TRANSFORM+=	rpath:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}:${LOCALBASE}
-.if defined(USE_X11)
+.if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=	rpath:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}:${X11BASE}
 .endif
 #
@@ -894,7 +894,7 @@ _BLNK_TRANSFORM+=	depot:${DEPOTBASE}:${LOCALBASE}
 # ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}.
 #
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
-.  if defined(USE_X11)
+.  if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=	P:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 .  endif
 _BLNK_TRANSFORM+=	P:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
@@ -904,7 +904,7 @@ _BLNK_TRANSFORM+=	P:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
 # (do so before transforming references to ${LOCALBASE} unless the
 # ${X11BASE} path is contained in ${LOCALBASE}'s path)
 #
-.if defined(USE_X11) && empty(LOCALBASE:M${X11BASE}*)
+.if defined(USE_X11) && empty(LOCALBASE:M${X11BASE}*) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=       I:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _BLNK_TRANSFORM+=       L:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 .endif
@@ -920,7 +920,7 @@ _BLNK_TRANSFORM+=	L:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
 # (do so only after transforming references to ${LOCALBASE} if the
 # ${X11BASE} path is contained in ${LOCALBASE}'s path)
 #
-.if defined(USE_X11) && !empty(LOCALBASE:M${X11BASE}*)
+.if defined(USE_X11) && !empty(LOCALBASE:M${X11BASE}*) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=	I:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _BLNK_TRANSFORM+=	L:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 .endif
@@ -931,7 +931,7 @@ _BLNK_TRANSFORM+=	L:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _BLNK_TRANSFORM+=	untransform:sub-mangle:${PREFIX}:${_BLNK_MANGLE_DIR.${PREFIX}}
 .endif
 _BLNK_TRANSFORM+=	untransform:sub-mangle:${LOCALBASE}:${_BLNK_MANGLE_DIR.${LOCALBASE}}
-.if defined(USE_X11)
+.if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=	untransform:sub-mangle:${X11BASE}:${_BLNK_MANGLE_DIR.${X11BASE}}
 .endif
 #
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 0ac9edec140..f05349c672d 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.139 2006/12/15 13:15:06 martti Exp $
+# $NetBSD: mk.conf,v 1.140 2006/12/20 01:04:46 joerg Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -236,7 +236,11 @@ PKGMANDIR?=	man
 # Default: man (i.e. /usr/pkg/man)
 # NOTE: the support for custom setting (not "man") is not complete.
 
+.if ${X11_TYPE} == "modular"
+USE_XPKGWEDGE?=	no
+.else
 USE_XPKGWEDGE?=	yes
+.endif
 # Whether we should use xpkgwedge or not to install all packages into
 # ${LOCALBASE}.
 # Possible: yes, no