From c7b351215a8a16808ec918b148104ec5da31d15b Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 15 Jan 2007 19:16:36 +0000
Subject: Modular Xorg support.

---
 x11/qt4-libs/Makefile        | 4 +++-
 x11/qt4-libs/Makefile.common | 8 ++++----
 x11/qt4-libs/buildlink3.mk   | 9 ++++++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'x11/qt4-libs')

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index fc1e27eab52..1904cea0c60 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/15 19:16:36 joerg Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
@@ -61,8 +61,10 @@ SUBST_SED.socklen=	-e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 6f948d90ee0..031dc88c535 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/05/31 19:18:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/01/15 19:16:36 joerg Exp $
 
 DISTNAME=	qt-x11-opensource-src-${QTVERSION}
 CATEGORIES=	x11
@@ -69,7 +69,9 @@ LDFLAGS+=		-lresolv
 
 QMAKE_RANLIB?=		${TRUE}
 
-.if !exists(${X11BASE}/lib/libXinerama.so) && \
+.if ${X11_TYPE} != "native"
+.include "../../x11/libXinerama/buildlink3.mk"
+.elif !exists(${X11BASE}/lib/libXinerama.so) && \
 	!exists(${X11BASE}/lib/libXinerama.dylib)
 CONFIGURE_ARGS+=	-no-xinerama
 .endif
@@ -84,8 +86,6 @@ CONFIGURE_ARGS+=	-no-xinerama
 CXXFLAGS+=		-DQ_INLINE_TEMPLATES=inline
 .endif
 
-.include "../../mk/x11.buildlink3.mk"
-
 pre-configure:
 	${SED}	-e 's:@LOCALBASE@:${LOCALBASE}:g' \
 		-e 's:@X11BASE@:${X11BASE}:g' \
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index f5401f1178d..fe181af975e 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2007/01/15 19:16:36 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT4_LIBS_BUILDLINK3_MK:=	${QT4_LIBS_BUILDLINK3_MK}+
@@ -25,14 +25,21 @@ BUILDLINK_PASSTHRU_DIRS+=	${QTDIR}
 
 PTHREAD_OPTS+=	require
 
+.include "../../mk/bsd.fast.prefs.mk"
+
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
+.if ${X11_TYPE} == "modular"
+.include "../../x11/libXinerama/buildlink3.mk"
+.endif
 .include "../../mk/pthread.buildlink3.mk"
 
 .if !defined(BUILD_QT4)
-- 
cgit v1.2.3