xorgproto: use xorgproto instead of separate *proto packages

Remove now obsolete packages.

6 files changed, 18 insertions, 33 deletions

diff --git a/graphics/MesaLib/dri.mk b/graphics/MesaLib/dri.mk
index 68eb95d093e..e4362c876ac 100644
--- a/graphics/MesaLib/dri.mk
+++ b/graphics/MesaLib/dri.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.16 2016/03/10 05:29:56 tnn Exp $
+# $NetBSD: dri.mk,v 1.17 2018/03/07 11:57:30 wiz Exp $
 #
 # Currently, this is for convenience only.
 #
@@ -12,8 +12,6 @@ CHECK_BUILTIN.MesaLib:=	no
 .  endif
 
 .  if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
-BUILDLINK_API_DEPENDS.dri2proto+=	dri2proto>=2.1
-BUILDLINK_API_DEPENDS.glproto+=		glproto>=1.4.11
 .    if ${OPSYS} != "Darwin"
 BUILDLINK_API_DEPENDS.libdrm+=		libdrm>=2.4.60
 .    endif
@@ -22,22 +20,17 @@ BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.9.3
 .    endif
 .  endif
 .  include "../../textproc/expat/buildlink3.mk"
-.  include "../../x11/dri2proto/buildlink3.mk"
+.  include "../../x11/xorgproto/buildlink3.mk"
 # XXX these do not have builtin.mk
 .  if ${X11_TYPE} == "modular"
-.    include "../../x11/dri3proto/buildlink3.mk"
 .    include "../../x11/libxshmfence/buildlink3.mk"
-.    include "../../x11/presentproto/buildlink3.mk"
 .  endif
-.  include "../../x11/glproto/buildlink3.mk"
 .  include "../../x11/libXdamage/buildlink3.mk"
 .  include "../../x11/libXfixes/buildlink3.mk"
 .  include "../../x11/libXxf86vm/buildlink3.mk"
 .  if ${OPSYS} != "Darwin"
 .    include "../../x11/libdrm/buildlink3.mk"
 .  endif
-.  include "../../x11/xf86driproto/buildlink3.mk"
-.  include "../../x11/xf86vidmodeproto/buildlink3.mk"
 .  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 .    include "../../devel/libdevq/buildlink3.mk"
 .  endif
diff --git a/graphics/MesaLib7/Makefile b/graphics/MesaLib7/Makefile
index f0e687f9d27..a2ff24b716d 100644
--- a/graphics/MesaLib7/Makefile
+++ b/graphics/MesaLib7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2017/09/03 08:53:09 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:30 wiz Exp $
 
 DISTNAME?=	${MESA_DISTNAME}
 PKGNAME=	MesaLib7-${MESA_PKGVERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MESA_SITES}
 EXTRACT_SUFX=	.tar.bz2
@@ -129,8 +129,7 @@ pre-install:
 .include "../../lang/python/tool.mk"
 BUILDLINK_DEPMETHOD.libxml2?=	build
 .include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glproto+=	glproto>=1.4.11
-.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff --git a/graphics/MesaLib7/glx-config.mk b/graphics/MesaLib7/glx-config.mk
index 58d92501291..9e73f588ac1 100644
--- a/graphics/MesaLib7/glx-config.mk
+++ b/graphics/MesaLib7/glx-config.mk
@@ -1,15 +1,10 @@
-# $NetBSD: glx-config.mk,v 1.1 2015/04/05 17:01:37 tnn Exp $
+# $NetBSD: glx-config.mk,v 1.2 2018/03/07 11:57:30 wiz Exp $
 #
 # used by x11/modular-xorg-server112/options.mk
 
 .if !defined(GLX_CONFIG_MK)
 GLX_CONFIG_MK=	# empty
 
-### XXX Older versions of xf86driproto installed dri_interface.h, which
-###	is now installed by Mesa.
-###
-BUILDLINK_API_DEPENDS.xf86driproto+=	xf86driproto>=2.0.4
-
 .  include "../../mk/bsd.fast.prefs.mk"
 
 CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
diff --git a/graphics/evas-software-x11/Makefile b/graphics/evas-software-x11/Makefile
index cca07793596..a20c2725ff4 100644
--- a/graphics/evas-software-x11/Makefile
+++ b/graphics/evas-software-x11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2016/03/05 11:28:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:30 wiz Exp $
 
 PKGNAME=	evas-software-x11-${EVAS_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Evas software X11 engine
 
 EVAS_ENGINES=	software-xlib
@@ -15,15 +15,14 @@ MAKE_FLAGS+=	module_la_LIBADD="\$${EINA_LIBS} \$${evas_engine_software_x11_libs}
 INSTALLATION_DIRS+=	lib/pkgconfig
 PKGCONFIG_OVERRIDE=	evas-software-x11.pc.in
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/evas-software-x11.pc \
+		${DESTDIR}${PREFIX}/lib/pkgconfig
+
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/evas-software-x11.pc \
-		${DESTDIR}${PREFIX}/lib/pkgconfig
-
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index 466bf96f23c..36f77c5266a 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2014/09/08 20:40:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2018/03/07 11:57:30 wiz Exp $
 
 BUILDLINK_TREE+=	imlib
 
@@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .endif # IMLIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-imlib
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index cf559eb1b75..75ffbeddaf5 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2018/01/14 14:58:39 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.59 2018/03/07 11:57:31 wiz Exp $
 
 DISTNAME=	libggi-2.2.2.src
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=ggi/}
@@ -51,7 +50,7 @@ PLIST.libvgl=		yes
 	exists(${X11BASE}/include/X11/extensions/xf86dga.h)
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 PLIST.xf86dga=		yes
 .endif