[pkgsrc/trunk]: pkgsrc Modular Xorg support.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c0863d6eccf0
branches:  trunk
changeset: 523701:c0863d6eccf0
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 11 15:53:59 2007 +0000

description:
Modular Xorg support.

diffstat:

 devel/libwnck/Makefile      |   7 ++++++-
 devel/libwnck/buildlink3.mk |   4 +++-
 x11/fox/Makefile            |  14 ++++++++++++--
 x11/fox/buildlink3.mk       |   8 +++++++-
 x11/tk83/Makefile           |   4 ++--
 x11/tk83/buildlink3.mk      |   4 ++--
 6 files changed, 32 insertions(+), 9 deletions(-)

diffs (135 lines):

diff -r 075ab2ff1b43 -r c0863d6eccf0 devel/libwnck/Makefile
--- a/devel/libwnck/Makefile    Thu Jan 11 15:31:19 2007 +0000
+++ b/devel/libwnck/Makefile    Thu Jan 11 15:53:59 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/11/27 21:07:23 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2007/01/11 15:53:59 joerg Exp $
 #
 
 DISTNAME=      libwnck-2.16.2
@@ -19,9 +19,14 @@
 
 BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.6.0
 
+BUILDLINK_DEPMETHOD.libXt?=    build
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 075ab2ff1b43 -r c0863d6eccf0 devel/libwnck/buildlink3.mk
--- a/devel/libwnck/buildlink3.mk       Thu Jan 11 15:31:19 2007 +0000
+++ b/devel/libwnck/buildlink3.mk       Thu Jan 11 15:53:59 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/01/11 15:53:59 joerg Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 LIBWNCK_BUILDLINK3_MK:=        ${LIBWNCK_BUILDLINK3_MK}+
@@ -19,6 +19,8 @@
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 075ab2ff1b43 -r c0863d6eccf0 x11/fox/Makefile
--- a/x11/fox/Makefile  Thu Jan 11 15:31:19 2007 +0000
+++ b/x11/fox/Makefile  Thu Jan 11 15:53:59 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/09/03 00:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2007/01/11 16:53:18 joerg Exp $
 
 DISTNAME=      fox-1.4.34
 CATEGORIES=    x11
@@ -14,6 +14,7 @@
 CONFIGURE_ARGS+=       --enable-release
 CONFIGURE_ARGS+=       --with-opengl
 CONFIGURE_ARGS+=       --with-shm
+CONFIGURE_ARGS+=       --with-xft
 CONFIGURE_ARGS+=       --with-x
 
 CONFIGURE_ENV+=                REAL_PTHREAD_LIBS=${PTHREAD_LIBS:Q}
@@ -25,11 +26,20 @@
 CONFIGURE_ARGS+=       --disable-threadsafe
 .endif
 
+BUILDLINK_DEPMETHOD.libXt?=    build
+
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 075ab2ff1b43 -r c0863d6eccf0 x11/fox/buildlink3.mk
--- a/x11/fox/buildlink3.mk     Thu Jan 11 15:31:19 2007 +0000
+++ b/x11/fox/buildlink3.mk     Thu Jan 11 15:53:59 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/01/11 16:53:18 joerg Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 FOX_BUILDLINK3_MK:=    ${FOX_BUILDLINK3_MK}+
@@ -23,5 +23,11 @@
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 075ab2ff1b43 -r c0863d6eccf0 x11/tk83/Makefile
--- a/x11/tk83/Makefile Thu Jan 11 15:31:19 2007 +0000
+++ b/x11/tk83/Makefile Thu Jan 11 15:53:59 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/11 16:18:37 joerg Exp $
 
 DISTNAME=      tk8.3.4
 PKGNAME=       tk-8.3.4
@@ -91,5 +91,5 @@
        ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${PREFIX}/include/tk/unix
 
 .include "../../lang/tcl83/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 075ab2ff1b43 -r c0863d6eccf0 x11/tk83/buildlink3.mk
--- a/x11/tk83/buildlink3.mk    Thu Jan 11 15:31:19 2007 +0000
+++ b/x11/tk83/buildlink3.mk    Thu Jan 11 15:53:59 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2007/01/11 16:18:37 joerg Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=     ${TK_BUILDLINK3_MK}+
@@ -27,6 +27,6 @@
 TKCONFIG_SH?=  ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
 .include "../../lang/tcl83/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}