From 9fe6230d558daa8fd4473f51099dfade5ab9769e Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 7 Mar 2018 11:57:28 +0000
Subject: xorgproto: use xorgproto instead of separate *proto packages

Remove now obsolete packages.
---
 x11/liboldXrandr/Makefile      | 8 +++-----
 x11/liboldXrandr/buildlink3.mk | 4 ++--
 x11/liboldXrandr/builtin.mk    | 6 +-----
 3 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'x11/liboldXrandr')

diff --git a/x11/liboldXrandr/Makefile b/x11/liboldXrandr/Makefile
index 2db95d04767..5f42c49f1dc 100644
--- a/x11/liboldXrandr/Makefile
+++ b/x11/liboldXrandr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2017/09/06 09:03:05 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:38 wiz Exp $
 
 DISTNAME=		libXrandr-1.0.2
 PKGNAME=		Xrandr-1.0.2
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11 devel
 MASTER_SITES=		https://xlibs.freedesktop.org/release/
 EXTRACT_SUFX=		.tar.bz2
@@ -24,6 +23,5 @@ BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/liboldXrandr/buildlink3.mk b/x11/liboldXrandr/buildlink3.mk
index b73ea11e6bd..fd5d7d935be 100644
--- a/x11/liboldXrandr/buildlink3.mk
+++ b/x11/liboldXrandr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:38 wiz Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -12,7 +12,7 @@ BUILDLINK_ABI_DEPENDS.Xrandr+=	Xrandr>=1.0.2nb3
 BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/liboldXrandr
 
 .include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .endif # XRANDR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-Xrandr
diff --git a/x11/liboldXrandr/builtin.mk b/x11/liboldXrandr/builtin.mk
index f21a49de725..487f7fef15c 100644
--- a/x11/liboldXrandr/builtin.mk
+++ b/x11/liboldXrandr/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2012/03/19 12:34:21 joerg Exp $
+# $NetBSD: builtin.mk,v 1.4 2018/03/07 11:57:38 wiz Exp $
 
 BUILTIN_PKG:=	Xrandr
 
@@ -64,9 +64,6 @@ MAKEVARS+=	BUILTIN_PKG.Xrandr
 .if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO])
 USE_BUILTIN.Xrender=	no
 .endif
-.if defined(USE_BUILTIN.randrproto) && !empty(USE_BUILTIN.randrproto:M[nN][oO])
-USE_BUILTIN.randrproto=	no
-.endif
 
 .if !defined(USE_BUILTIN.Xrandr)
 .  if ${PREFER.Xrandr} == "pkgsrc"
@@ -109,7 +106,6 @@ BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .  if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS])
 BUILDLINK_PREFIX.Xrandr=	${X11BASE}
 USE_BUILTIN.Xrender=		yes
-USE_BUILTIN.randrproto=		yes
 .  endif
 
 .endif	# CHECK_BUILTIN.Xrandr
-- 
cgit v1.2.3