diff options
author | joerg <joerg> | 2007-02-15 14:47:20 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-02-15 14:47:20 +0000 |
commit | 9e0faed3263d75e1ec81b17c6a897746d8f8b39a (patch) | |
tree | 87a31342f722fd99fc6b64ca164e386391dbff54 | |
parent | 5d329cee5c9fdfc4a5551fd25906659434cb5dd4 (diff) | |
download | pkgsrc-9e0faed3263d75e1ec81b17c6a897746d8f8b39a.tar.gz |
Modular Xorg support.
-rw-r--r-- | multimedia/dvdview/Makefile | 6 | ||||
-rw-r--r-- | multimedia/flashplayer/Makefile | 4 | ||||
-rw-r--r-- | multimedia/gst-plugins0.8/Makefile | 6 | ||||
-rw-r--r-- | multimedia/gstreamer0.8/Makefile | 3 | ||||
-rw-r--r-- | multimedia/libflash/Makefile.common | 4 | ||||
-rw-r--r-- | multimedia/ogle/Makefile | 8 | ||||
-rw-r--r-- | multimedia/xfmedia/Makefile | 4 | ||||
-rw-r--r-- | sysutils/idesk/Makefile | 6 | ||||
-rw-r--r-- | sysutils/tkcron/Makefile | 4 | ||||
-rw-r--r-- | sysutils/tpb/Makefile | 7 |
10 files changed, 29 insertions, 23 deletions
diff --git a/multimedia/dvdview/Makefile b/multimedia/dvdview/Makefile index e7192d911ba..f36d2898529 100644 --- a/multimedia/dvdview/Makefile +++ b/multimedia/dvdview/Makefile @@ -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 @@ post-install: ${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 --git a/multimedia/flashplayer/Makefile b/multimedia/flashplayer/Makefile index 04015800fad..a1d65b0eb59 100644 --- a/multimedia/flashplayer/Makefile +++ b/multimedia/flashplayer/Makefile @@ -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 @@ MAKE_ENV+= LIBSTDCPP= .endif .include "../../multimedia/libflash/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gst-plugins0.8/Makefile b/multimedia/gst-plugins0.8/Makefile index 9437338d6a5..58def5d1932 100644 --- a/multimedia/gst-plugins0.8/Makefile +++ b/multimedia/gst-plugins0.8/Makefile @@ -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-launch-ext-m.m 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 --git a/multimedia/gstreamer0.8/Makefile b/multimedia/gstreamer0.8/Makefile index b665ffd9a22..74d226ac6ca 100644 --- a/multimedia/gstreamer0.8/Makefile +++ b/multimedia/gstreamer0.8/Makefile @@ -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 @@ _GSTREAMER0.8_NO_DEPEND= # defined .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 --git a/multimedia/libflash/Makefile.common b/multimedia/libflash/Makefile.common index 4ddfe444630..78cc2f5c52c 100644 --- a/multimedia/libflash/Makefile.common +++ b/multimedia/libflash/Makefile.common @@ -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 @@ USE_LANGUAGES= c c++ DISTINFO_FILE= ${.CURDIR}/../libflash/distinfo PATCHDIR= ${.CURDIR}/../libflash/patches -.include "../../mk/x11.buildlink3.mk" - post-extract: remove-subpackages remove-subpackages: diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index 5f8fb8fff91..70076c412b7 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -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 @@ MESSAGE_SUBST+= PKGBASE=${PKGBASE} .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 --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile index 09f54d47dd9..687b71ae33d 100644 --- a/multimedia/xfmedia/Makefile +++ b/multimedia/xfmedia/Makefile @@ -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 @@ post-install: .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 --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile index ff55ffd2399..cb85cac917e 100644 --- a/sysutils/idesk/Makefile +++ b/sysutils/idesk/Makefile @@ -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 @@ post-install: ${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 --git a/sysutils/tkcron/Makefile b/sysutils/tkcron/Makefile index 0db34fab0db..cf8956e4ba2 100644 --- a/sysutils/tkcron/Makefile +++ b/sysutils/tkcron/Makefile @@ -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 @@ EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} > tkcron.tcl 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 --git a/sysutils/tpb/Makefile b/sysutils/tpb/Makefile index 086093fa0dd..a640e753d06 100644 --- a/sysutils/tpb/Makefile +++ b/sysutils/tpb/Makefile @@ -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 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/tpb .endfor -.include "../../x11/xosd/buildlink3.mk" - .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xosd/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |