Switch to xorgproto instead of individual packages

Upstream used to distribute protocol headers as separate packages, but has
decided to merge those to a common package, named xorgproto.  This update
tracks that change.

* Add a new port, x11/xorgproto, with are protocol headers for xorg.
* Hook the new protocol port to the build and to infrastructure in
  bsd.xorg.mk.
* Update all ports with a dependency on any of the old *proto packages to
  instead depend on xorgproto.  Bump portrevision.
* Delete the old *proto packages, update MOVED.

PR:		230023
Submitted by:	zeising
Approved by:	portmgr (antoine)
exp-run by:	antoine

11 files changed, 21 insertions, 19 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 1dc06ee55fef..a7fa33cd1f40 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,7 +6,7 @@ PORTNAME=	gstreamer
 PORTVERSION?=	${BASE_PORTVERSION}
 # When chasing a shared library for a plug-in bump the PORTREVISION in the
 # plug-in port instead, like ${category}/gstreamer-plugin-${PLUGIN}.
-PORTREVISION?=	8
+PORTREVISION?=	9
 PORTEPOCH=	3
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
@@ -72,7 +72,7 @@ PLIST_SUB+=	I386="@comment "
 gst_base_DIST=	base
 NO_GSTREAMER_COMMON=	yes
 USE_LDCONFIG=	yes
-USE_XORG=	x11 xv xext videoproto xextproto
+USE_XORG=	x11 xv xext xorgproto
 PLIST_SUB+=	VERSION="${VERSION}" \
 		SHLIB_VERSION="${SHLIB_VERSION}"
 SHEBANG_FILES=	tools/gst-visualise-m.m
diff --git a/multimedia/gstreamer1-vaapi/Makefile b/multimedia/gstreamer1-vaapi/Makefile
index a4b864e94d71..d1d97bf91996 100644
--- a/multimedia/gstreamer1-vaapi/Makefile
+++ b/multimedia/gstreamer1-vaapi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gstreamer1-vaapi
 PORTVERSION=	1.12.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gstreamer.freedesktop.org/src/gstreamer-vaapi/
 DISTNAME=	gstreamer-vaapi-${PORTVERSION}
@@ -24,7 +24,7 @@ USE_LDCONFIG=	yes
 USE_GNOME=	glib20
 USE_GSTREAMER1=	bad gl
 USE_GL=		gl
-USE_XORG=	x11 xrandr xrender xproto:build
+USE_XORG=	x11 xrandr xrender xorgproto:build
 
 # drm backend needs libudev so disable it for now.
 CONFIGURE_ARGS+=--disable-drm
diff --git a/multimedia/libcec/Makefile b/multimedia/libcec/Makefile
index 4997f8ef3271..ec7707e6b6ca 100644
--- a/multimedia/libcec/Makefile
+++ b/multimedia/libcec/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libcec
 PORTVERSION=	4.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	multimedia
 
@@ -51,7 +51,7 @@ CMAKE_ARGS+=	-DSKIP_PYTHON_WRAPPER:BOOL=true
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-USE_XORG=	x11 xproto xrandr
+USE_XORG=	x11 xorgproto xrandr
 .endif
 
 post-patch:
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index 14dc5da47f1f..4daff2fa2de6 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libva
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
@@ -15,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 USES=		autoreconf gmake libtool localbase pkgconfig tar:bzip2
-USE_XORG=	glproto pciaccess x11 xext xfixes
+USE_XORG=	xorgproto pciaccess x11 xext xfixes
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=va
diff --git a/multimedia/libvdpau/Makefile b/multimedia/libvdpau/Makefile
index aa4149ddf9f4..c7aa0e854d7c 100644
--- a/multimedia/libvdpau/Makefile
+++ b/multimedia/libvdpau/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libvdpau
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cgit.freedesktop.org/~aplattner/libvdpau/snapshot/
 
@@ -14,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		autoreconf libtool pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-documentation
-USE_XORG=	dri2proto xext
+USE_XORG=	xorgproto xext
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 6e34f1d4fff6..62ced8b8ff83 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index 68a69bb82dfb..f0d622b708a8 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -140,7 +140,7 @@ VDPAU_CONFIGURE_OFF=	--disable-vdpau
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_OFF=	--disable-libvpx-lavc
 
-X11_USE=		XORG=x11,xext,xproto,xscrnsaver
+X11_USE=		XORG=x11,xext,xorgproto,xscrnsaver
 X11_CONFIGURE_OFF=	--disable-x11
 
 X11DGA_USE=		XORG=xxf86dga
@@ -154,7 +154,7 @@ X11VM_IMPLIES=		X11
 X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_OFF=	--disable-x264
 
-XINERAMA_USE=		XORG=xinerama,xineramaproto
+XINERAMA_USE=		XORG=xinerama,xorgproto
 XINERAMA_CONFIGURE_OFF=	--disable-xinerama
 XINERAMA_IMPLIES=	X11
 
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index ec7fa30005fa..666c472479cf 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpv
 PORTVERSION=	0.29.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
@@ -141,7 +141,7 @@ WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
 				libxkbcommon.so:x11/libxkbcommon
 WAYLAND_CONFIGURE_OFF=		--disable-wayland
 
-X11_USE=			XORG=x11,xext,xinerama,xineramaproto,xrandr,xscrnsaver,xv,xxf86vm
+X11_USE=			XORG=x11,xext,xinerama,xorgproto,xrandr,xscrnsaver,xv,xxf86vm
 X11_VARS=			INSTALLS_ICONS=yes
 X11_CONFIGURE_OFF=		--disable-x11
 
diff --git a/multimedia/recordmydesktop/Makefile b/multimedia/recordmydesktop/Makefile
index 6681b067b681..3c064fd56ff5 100644
--- a/multimedia/recordmydesktop/Makefile
+++ b/multimedia/recordmydesktop/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	recordmydesktop
 DISTVERSION=	0.3.8.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -16,7 +16,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-oss=yes \
 			--enable-jack=yes
 
-USE_XORG=	ice sm x11 xext xextproto xfixes xdamage
+USE_XORG=	ice sm x11 xext xorgproto xfixes xdamage
 PLIST_FILES=	bin/recordmydesktop man/man1/recordmydesktop.1.gz
 
 .include <bsd.port.mk>
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 4f270f7c8e66..a0883cdc76c0 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	totem
 PORTVERSION=	3.18.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -36,7 +36,7 @@ USES=		desktop-file-utils gettext gmake gnome libtool \
 		pathfix pkgconfig python:2.7 tar:xz
 USE_GNOME=	gtk30 intlhack introspection:build libxml2 nautilus3 \
 		pygobject3
-USE_XORG=	x11 xproto xtst ice sm
+USE_XORG=	x11 xorgproto xtst ice sm
 USE_GSTREAMER1=	core good bad soup ugly
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 72a9c727a59c..e718a4cdfb71 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.2.8
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
@@ -307,7 +307,7 @@ VDPAU_CONFIGURE_ENABLE=	vdpau
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=vorbis
 
-X11_USE=		GL=gl XORG=xcb,xproto
+X11_USE=		GL=gl XORG=xcb,xorgproto
 X11_LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 X11_CONFIGURE_ENABLE=	xcb xvideo
 X11_CONFIGURE_WITH=	x