Modular Xorg support.

5 files changed, 16 insertions, 9 deletions

diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 25126cf311a..f7a076f106d 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/17 13:46:53 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/13 18:26:29 joerg Exp $
 #
 
 DISTNAME=		gromit-20041213
@@ -13,7 +13,7 @@ COMMENT=		Text marker tool for the X11 screen
 USE_TOOLS+=		pkg-config
 INSTALLATION_DIRS=	bin
 
-LDFLAGS+=		-lX11
+LDFLAGS+=	${X11_LDFLAGS} -lX11
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gromit ${PREFIX}/bin
@@ -21,5 +21,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gromit
 
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index a4c9b2fcb12..09400dba19d 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2007/01/13 18:26:54 joerg Exp $
 
 PKGNAME=	qt2-libs-${QTVERSION}
 PKGREVISION=	9
@@ -28,6 +28,10 @@ do-install:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index d11a1bc5a24..17e8741060a 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2006/05/15 21:58:22 joerg Exp $
+# $NetBSD: Makefile.common,v 1.28 2007/01/13 18:26:54 joerg Exp $
 #
 
 DISTNAME=	qt-x11-${QTVERSION}
@@ -50,7 +50,7 @@ SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
 SUBST_SED.paths+=	-e 's,@QTDIR@,${QTPREFIX},g'
 SUBST_STAGE.paths=	post-patch
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 
 pre-build:
 	@${TOUCH} ${WRKSRC}/.buildopts
diff --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk
index 9a12a079f39..ac47ed4e4bf 100644
--- a/x11/qt2-libs/buildlink3.mk
+++ b/x11/qt2-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/01/13 18:26:54 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT2_LIBS_BUILDLINK3_MK:=	${QT2_LIBS_BUILDLINK3_MK}+
@@ -25,7 +25,11 @@ BUILDLINK_LIBDIRS.qt2-libs=	qt2/lib
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 
 QTDIR=		${BUILDLINK_PREFIX.qt2-libs}/qt2
 CONFIGURE_ENV+=	QTDIR=${QTDIR:Q}
diff --git a/x11/qt2/Makefile.common b/x11/qt2/Makefile.common
index 422a18ab8a1..7af41db6e94 100644
--- a/x11/qt2/Makefile.common
+++ b/x11/qt2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2006/10/04 22:06:57 wiz Exp $
+# $NetBSD: Makefile.common,v 1.11 2007/01/13 18:26:54 joerg Exp $
 #
 
 QTVERSION=	2.3.1
@@ -7,4 +7,3 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt/
 
 USE_X11BASE=	yes
-.include "../../mk/x11.buildlink3.mk"