[pkgsrc/trunk]: pkgsrc Modular Xorg support.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/66f9274fe885
branches:  trunk
changeset: 525296:66f9274fe885
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 15 14:47:20 2007 +0000

description:
Modular Xorg support.

diffstat:

 multimedia/dvdview/Makefile         |  6 ++++--
 multimedia/flashplayer/Makefile     |  4 +++-
 multimedia/gst-plugins0.8/Makefile  |  6 ++++--
 multimedia/gstreamer0.8/Makefile    |  3 +--
 multimedia/libflash/Makefile.common |  4 +---
 multimedia/ogle/Makefile            |  8 ++++++--
 multimedia/xfmedia/Makefile         |  4 ++--
 sysutils/idesk/Makefile             |  6 ++++--
 sysutils/tkcron/Makefile            |  4 +---
 sysutils/tpb/Makefile               |  7 +++----
 10 files changed, 29 insertions(+), 23 deletions(-)

diffs (186 lines):

diff -r 8c89c0d54675 -r 66f9274fe885 multimedia/dvdview/Makefile
--- a/multimedia/dvdview/Makefile       Thu Feb 15 14:47:09 2007 +0000
+++ b/multimedia/dvdview/Makefile       Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/05/13 13:22:49 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/15 14:50:29 joerg Exp $
 
 DISTNAME=      dvdview-1.2.2
 PKGREVISION=   4
@@ -26,6 +26,8 @@
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdview
 
 .include "../../graphics/libvideogfx/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8c89c0d54675 -r 66f9274fe885 multimedia/flashplayer/Makefile
--- a/multimedia/flashplayer/Makefile   Thu Feb 15 14:47:09 2007 +0000
+++ b/multimedia/flashplayer/Makefile   Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/15 14:50:29 joerg Exp $
 #
 
 .include "../../multimedia/libflash/Makefile.common"
@@ -19,4 +19,6 @@
 .endif
 
 .include "../../multimedia/libflash/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8c89c0d54675 -r 66f9274fe885 multimedia/gst-plugins0.8/Makefile
--- a/multimedia/gst-plugins0.8/Makefile        Thu Feb 15 14:47:09 2007 +0000
+++ b/multimedia/gst-plugins0.8/Makefile        Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/12/15 20:32:59 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/15 14:50:29 joerg Exp $
 #
 
 USE_LANGUAGES=         c c++
@@ -30,6 +30,8 @@
 REPLACE_PERL+=         tools/gst-visualise-m.m
 
 .include "../../devel/GConf2/schemas.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8c89c0d54675 -r 66f9274fe885 multimedia/gstreamer0.8/Makefile
--- a/multimedia/gstreamer0.8/Makefile  Thu Feb 15 14:47:09 2007 +0000
+++ b/multimedia/gstreamer0.8/Makefile  Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/09/16 12:20:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/15 14:50:29 joerg Exp $
 #
 
 DISTNAME=              gstreamer-0.8.11
@@ -51,5 +51,4 @@
 .include "../../multimedia/gstreamer0.8/plugins.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8c89c0d54675 -r 66f9274fe885 multimedia/libflash/Makefile.common
--- a/multimedia/libflash/Makefile.common       Thu Feb 15 14:47:09 2007 +0000
+++ b/multimedia/libflash/Makefile.common       Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2006/03/09 21:04:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2007/02/15 14:50:29 joerg Exp $
 #
 
 DISTNAME=      flash-0.4.10
@@ -14,8 +14,6 @@
 DISTINFO_FILE= ${.CURDIR}/../libflash/distinfo
 PATCHDIR=      ${.CURDIR}/../libflash/patches
 
-.include "../../mk/x11.buildlink3.mk"
-
 post-extract: remove-subpackages
 
 remove-subpackages:
diff -r 8c89c0d54675 -r 66f9274fe885 multimedia/ogle/Makefile
--- a/multimedia/ogle/Makefile  Thu Feb 15 14:47:09 2007 +0000
+++ b/multimedia/ogle/Makefile  Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/07/16 22:20:37 seb Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/15 14:50:29 joerg Exp $
 
 DISTNAME=      ogle-0.9.2
 PKGREVISION=   3
@@ -44,5 +44,9 @@
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8c89c0d54675 -r 66f9274fe885 multimedia/xfmedia/Makefile
--- a/multimedia/xfmedia/Makefile       Thu Feb 15 14:47:09 2007 +0000
+++ b/multimedia/xfmedia/Makefile       Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 12:25:55 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/15 14:50:30 joerg Exp $
 #
 
 DISTNAME=              xfmedia-0.9.1
@@ -28,8 +28,8 @@
 
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/libexo/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8c89c0d54675 -r 66f9274fe885 sysutils/idesk/Makefile
--- a/sysutils/idesk/Makefile   Thu Feb 15 14:47:09 2007 +0000
+++ b/sysutils/idesk/Makefile   Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:00 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/15 14:47:20 joerg Exp $
 #
 
 DISTNAME=      idesk-0.7.5
@@ -26,7 +26,9 @@
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/idesk
 
 .include "../../graphics/imlib2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8c89c0d54675 -r 66f9274fe885 sysutils/tkcron/Makefile
--- a/sysutils/tkcron/Makefile  Thu Feb 15 14:47:09 2007 +0000
+++ b/sysutils/tkcron/Makefile  Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/15 14:47:20 joerg Exp $
 #
 
 DISTNAME=      tkcron-2.12
@@ -17,8 +17,6 @@
 
 INSTALLATION_DIRS=     bin
 
-.include "../../mk/x11.buildlink3.mk"
-
 do-build:
        ${SED} -e "\:/usr/local/bin/wish: s;;${LOCALBASE}/bin/wish;g" ${WRKSRC}/tkcron.tcl > ${WRKSRC}/tkcron
 
diff -r 8c89c0d54675 -r 66f9274fe885 sysutils/tpb/Makefile
--- a/sysutils/tpb/Makefile     Thu Feb 15 14:47:09 2007 +0000
+++ b/sysutils/tpb/Makefile     Thu Feb 15 14:47:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/15 15:18:03 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/15 14:47:21 joerg Exp $
 #
 
 DISTNAME=      tpb-0.6.1
@@ -27,10 +27,9 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/${f}      ${PREFIX}/share/doc/tpb
 .endfor
 
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xosd/buildlink3.mk"
-
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"