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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7c9dbbc4307
branches:  trunk
changeset: 523797:c7c9dbbc4307
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jan 13 18:26:29 2007 +0000

description:
Modular Xorg support.

diffstat:

 x11/gromit/Makefile          |  6 +++---
 x11/qt2-libs/Makefile        |  6 +++++-
 x11/qt2-libs/Makefile.common |  4 ++--
 x11/qt2-libs/buildlink3.mk   |  6 +++++-
 x11/qt2/Makefile.common      |  3 +--
 5 files changed, 16 insertions(+), 9 deletions(-)

diffs (98 lines):

diff -r a32d6098e64e -r c7c9dbbc4307 x11/gromit/Makefile
--- a/x11/gromit/Makefile       Sat Jan 13 18:09:06 2007 +0000
+++ b/x11/gromit/Makefile       Sat Jan 13 18:26:29 2007 +0000
@@ -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 @@
 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 @@
        ${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 -r a32d6098e64e -r c7c9dbbc4307 x11/qt2-libs/Makefile
--- a/x11/qt2-libs/Makefile     Sat Jan 13 18:09:06 2007 +0000
+++ b/x11/qt2-libs/Makefile     Sat Jan 13 18:26:29 2007 +0000
@@ -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 @@
 .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 -r a32d6098e64e -r c7c9dbbc4307 x11/qt2-libs/Makefile.common
--- a/x11/qt2-libs/Makefile.common      Sat Jan 13 18:09:06 2007 +0000
+++ b/x11/qt2-libs/Makefile.common      Sat Jan 13 18:26:29 2007 +0000
@@ -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,@QTDIR@,${QTPREFIX},g'
 SUBST_STAGE.paths=     post-patch
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 
 pre-build:
        @${TOUCH} ${WRKSRC}/.buildopts
diff -r a32d6098e64e -r c7c9dbbc4307 x11/qt2-libs/buildlink3.mk
--- a/x11/qt2-libs/buildlink3.mk        Sat Jan 13 18:09:06 2007 +0000
+++ b/x11/qt2-libs/buildlink3.mk        Sat Jan 13 18:26:29 2007 +0000
@@ -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 @@
 .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 -r a32d6098e64e -r c7c9dbbc4307 x11/qt2/Makefile.common
--- a/x11/qt2/Makefile.common   Sat Jan 13 18:09:06 2007 +0000
+++ b/x11/qt2/Makefile.common   Sat Jan 13 18:26:29 2007 +0000
@@ -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 @@
 HOMEPAGE=      http://www.trolltech.com/products/qt/
 
 USE_X11BASE=   yes
-.include "../../mk/x11.buildlink3.mk"