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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f733efdbea4
branches:  trunk
changeset: 523943:0f733efdbea4
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jan 15 17:57:21 2007 +0000

description:
Modular Xorg support.

diffstat:

 x11/imwheel/Makefile  |  7 +++++--
 x11/xnodecor/Makefile |  5 ++---
 x11/xpns/Makefile     |  5 ++---
 x11/xrestop/Makefile  |  6 ++++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diffs (83 lines):

diff -r 5f353edb3b97 -r 0f733efdbea4 x11/imwheel/Makefile
--- a/x11/imwheel/Makefile      Mon Jan 15 17:49:45 2007 +0000
+++ b/x11/imwheel/Makefile      Mon Jan 15 17:57:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:35 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/15 18:05:47 joerg Exp $
 #
 
 DISTNAME=      imwheel-0.9.9
@@ -15,5 +15,8 @@
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --disable-gpm
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5f353edb3b97 -r 0f733efdbea4 x11/xnodecor/Makefile
--- a/x11/xnodecor/Makefile     Mon Jan 15 17:49:45 2007 +0000
+++ b/x11/xnodecor/Makefile     Mon Jan 15 17:57:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/15 18:13:31 joerg Exp $
 
 DISTNAME=      xnodecor-0.1
 PKGREVISION=   1
@@ -13,11 +13,10 @@
 USE_X11BASE=   yes
 NO_CONFIGURE=  yes
 
-.include "../../mk/x11.buildlink3.mk"
-
 do-extract:
        @${MKDIR} ${WRKSRC}
        ${CP} ${FILESDIR}/Makefile ${WRKSRC}
        ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
 
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5f353edb3b97 -r 0f733efdbea4 x11/xpns/Makefile
--- a/x11/xpns/Makefile Mon Jan 15 17:49:45 2007 +0000
+++ b/x11/xpns/Makefile Mon Jan 15 17:57:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/04 22:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/01/15 18:08:58 joerg Exp $
 
 DISTNAME=      pns_source
 PKGNAME=       xpns-1.0
@@ -18,8 +18,6 @@
 
 INSTALLATION_DIRS=     bin
 
-.include "../../mk/x11.buildlink3.mk"
-
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/xpns
        ${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/lib/xpns/
@@ -31,4 +29,5 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xpns
        ${CP} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns/
 
+.include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5f353edb3b97 -r 0f733efdbea4 x11/xrestop/Makefile
--- a/x11/xrestop/Makefile      Mon Jan 15 17:49:45 2007 +0000
+++ b/x11/xrestop/Makefile      Mon Jan 15 17:57:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:11:49 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/15 17:57:21 joerg Exp $
 #
 
 DISTNAME=              xrestop-0.3
@@ -13,5 +13,7 @@
 GNU_CONFIGURE=         yes
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXres/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"