xorgproto: use xorgproto instead of separate *proto packages

Remove now obsolete packages.

5 files changed, 14 insertions, 14 deletions

diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 00b31934eca..f5fe7505300 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2018/03/06 15:36:11 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2018/03/07 11:57:31 wiz Exp $
 
 DISTNAME=	fxtv-1.03
-PKGREVISION=	22
+PKGREVISION=	23
 CATEGORIES=	multimedia
 MASTER_SITES=	${HOMEPAGE:Q}
 EXTRACT_SUFX=	.tgz
@@ -42,7 +42,7 @@ pre-configure:
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk
index 0192732358e..58f7a2786eb 100644
--- a/multimedia/gnash/options.mk
+++ b/multimedia/gnash/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2017/09/27 13:37:28 wiz Exp $
+# $NetBSD: options.mk,v 1.23 2018/03/07 11:57:31 wiz Exp $
 #
 
 #
@@ -72,7 +72,7 @@ GNASH_RENDER+=		cairo
 
 .if !empty(PKG_OPTIONS:Mopengl)
 GNASH_RENDER+=		ogl
-.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .  if !empty(PKG_OPTIONS:Mgtk)
 .include "../../graphics/gtkglext/buildlink3.mk"
 .  endif
diff --git a/multimedia/libvdpau/Makefile b/multimedia/libvdpau/Makefile
index 43e74e80e68..ee997461ef0 100644
--- a/multimedia/libvdpau/Makefile
+++ b/multimedia/libvdpau/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2017/02/24 00:59:13 maya Exp $
+# $NetBSD: Makefile,v 1.12 2018/03/07 11:57:31 wiz Exp $
 
 DISTNAME=	libvdpau-1.1.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://people.freedesktop.org/~aplattner/vdpau/
 EXTRACT_SUFX=	.tar.bz2
@@ -32,5 +32,5 @@ PKG_SKIP_REASON+=	"VDPAU is not available on this platform"
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index d3928b5226c..7d107b4329a 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2016/07/09 06:38:40 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2018/03/07 11:57:31 wiz Exp $
 
 DISTNAME=	xawtv-3.95
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.bytesex.org/releases/xawtv/
 
@@ -75,7 +75,7 @@ PLIST.bsd=		yes
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index b59495c6e0a..78cd6ba1e20 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2018/02/26 08:19:31 adam Exp $
+# $NetBSD: Makefile,v 1.84 2018/03/07 11:57:31 wiz Exp $
 
 DISTNAME=		xine-ui-0.99.8
-PKGREVISION=		16
+PKGREVISION=		17
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=		.tar.xz
@@ -41,7 +41,7 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"