[pkgsrc/trunk]: pkgsrc/x11 Modular Xorg support.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c93d01c51767
branches:  trunk
changeset: 523699:c93d01c51767
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 11 14:55:15 2007 +0000

description:
Modular Xorg support.

diffstat:

 x11/9term/Makefile                |  4 ++--
 x11/XaoS/Makefile                 |  7 +++++--
 x11/startup-notification/Makefile |  8 ++++++--
 x11/xvidcap/Makefile              |  5 ++++-
 x11/xvidcap/Makefile.common       |  5 +++--
 x11/xworld/Makefile               |  4 ++--
 x11/xwrits/Makefile               |  4 ++--
 7 files changed, 24 insertions(+), 13 deletions(-)

diffs (123 lines):

diff -r d5705133f40b -r c93d01c51767 x11/9term/Makefile
--- a/x11/9term/Makefile        Thu Jan 11 13:02:48 2007 +0000
+++ b/x11/9term/Makefile        Thu Jan 11 14:55:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/11 15:01:14 joerg Exp $
 
 DISTNAME=              9term.1.6.3
 PKGNAME=               9term-1.6.3
@@ -20,5 +20,5 @@
 MAKE_ENV+=             SAM_DIR=${BUILDLINK_PREFIX.sam}
 
 .include "../../editors/sam/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d5705133f40b -r c93d01c51767 x11/XaoS/Makefile
--- a/x11/XaoS/Makefile Thu Jan 11 13:02:48 2007 +0000
+++ b/x11/XaoS/Makefile Thu Jan 11 14:55:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/04 22:06:56 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/01/11 15:08:24 joerg Exp $
 #
 
 DISTNAME=              XaoS-3.2.2
@@ -27,7 +27,10 @@
 
 INSTALLATION_DIRS=     ${PKGINFODIR}
 
+BUILDLINK_DEPMETHOD.libXt?=    build
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d5705133f40b -r c93d01c51767 x11/startup-notification/Makefile
--- a/x11/startup-notification/Makefile Thu Jan 11 13:02:48 2007 +0000
+++ b/x11/startup-notification/Makefile Thu Jan 11 14:55:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:31:11 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/11 15:22:26 joerg Exp $
 
 DISTNAME=              startup-notification-0.8
 PKGREVISION=           1
@@ -24,5 +24,9 @@
                doc/startup-notification.txt \
                ${PREFIX}/share/doc/startup-notification/
 
-.include "../../mk/x11.buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=    build
+
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d5705133f40b -r c93d01c51767 x11/xvidcap/Makefile
--- a/x11/xvidcap/Makefile      Thu Jan 11 13:02:48 2007 +0000
+++ b/x11/xvidcap/Makefile      Thu Jan 11 14:55:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/05/17 01:53:18 reed Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/11 15:12:53 joerg Exp $
 #
 
 .include "Makefile.common"
@@ -8,4 +8,7 @@
 
 CONFIGURE_ARGS+=       --without-gtk2
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff -r d5705133f40b -r c93d01c51767 x11/xvidcap/Makefile.common
--- a/x11/xvidcap/Makefile.common       Thu Jan 11 13:02:48 2007 +0000
+++ b/x11/xvidcap/Makefile.common       Thu Jan 11 14:55:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2006/05/17 05:06:28 reed Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/01/11 15:12:53 joerg Exp $
 #
 
 DISTNAME=              xvidcap-1.1.3
@@ -18,5 +18,6 @@
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
diff -r d5705133f40b -r c93d01c51767 x11/xworld/Makefile
--- a/x11/xworld/Makefile       Thu Jan 11 13:02:48 2007 +0000
+++ b/x11/xworld/Makefile       Thu Jan 11 14:55:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/07/21 17:31:44 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/11 14:55:15 joerg Exp $
 #
 
 DISTNAME=              xworld-2.0
@@ -30,5 +30,5 @@
 SUBST_FILES.install=   Makefile.in
 SUBST_SED.install=     -e 's,-g bin -o bin,-g ${BINGRP} -o ${BINOWN},g'
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d5705133f40b -r c93d01c51767 x11/xwrits/Makefile
--- a/x11/xwrits/Makefile       Thu Jan 11 13:02:48 2007 +0000
+++ b/x11/xwrits/Makefile       Thu Jan 11 14:55:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/08/07 23:48:15 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/11 14:56:36 joerg Exp $
 
 DISTNAME=      xwrits-2.24
 CATEGORIES=    x11
@@ -10,5 +10,5 @@
 
 GNU_CONFIGURE= YES
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"