Remove xextproto/buildlink3.mk in most cases where it occurs with

libXext/buildlink3.mk, now that it is included there.
Leave the places where its API version is set or variables from it
are used directly (about 3 packages).

9 files changed, 9 insertions, 18 deletions

diff --git a/multimedia/flashplayer/Makefile b/multimedia/flashplayer/Makefile
index 4c6d17264b2..6c09d5c339d 100644
--- a/multimedia/flashplayer/Makefile
+++ b/multimedia/flashplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/08 09:21:00 asau Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/23 10:24:08 wiz Exp $
 #
 
 .include "../../multimedia/libflash/Makefile.common"
@@ -22,5 +22,4 @@ INSTALLATION_DIRS+=	bin
 
 .include "../../multimedia/libflash/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 1010247034f..eb43f341799 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/10/08 09:21:01 asau Exp $
+# $NetBSD: Makefile,v 1.31 2012/10/23 10:24:08 wiz Exp $
 
 DISTNAME=	fxtv-1.03
 PKGREVISION=	19
@@ -42,7 +42,6 @@ pre-configure:
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
index 5f9a852d717..a8c9fb6965e 100644
--- a/multimedia/mpeg_play/Makefile
+++ b/multimedia/mpeg_play/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 09:21:09 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:08 wiz Exp $
 
 DISTNAME=	mpeg_play-2.4-patched
 PKGNAME=	mpeg_play-2.4patched
@@ -19,5 +19,4 @@ pre-configure:
 	${MV} -f ${WRKSRC}/mpeg_play.1 ${WRKSRC}/mpeg_play.man
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index e6a4204b63e..a0ef2cb1a03 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/10/08 09:21:10 asau Exp $
+# $NetBSD: Makefile,v 1.32 2012/10/23 10:24:09 wiz Exp $
 
 DISTNAME=	ogle-0.9.2
 PKGREVISION=	8
@@ -51,5 +51,4 @@ BUILDLINK_API_DEPENDS.libdvdread+=      libdvdread>=4.1.3
 .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/transcode/Makefile b/multimedia/transcode/Makefile
index 7af2b84e6db..6fc93bb447b 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2012/10/10 13:37:25 drochner Exp $
+# $NetBSD: Makefile,v 1.80 2012/10/23 10:24:09 wiz Exp $
 
 DISTNAME=	transcode-1.1.7
 CATEGORIES=	multimedia
@@ -62,7 +62,6 @@ LIBS+=			${LIBOSSAUDIO}
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .endif
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index eb16401fe90..aa502576adf 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/08 09:21:15 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:09 wiz Exp $
 
 DISTNAME=	xanim2920
 PKGNAME=	xanim-2.92.0
@@ -55,6 +55,5 @@ post-extract:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 04ecdca64fc..72f35b2e4f5 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/10/08 09:21:15 asau Exp $
+# $NetBSD: Makefile,v 1.34 2012/10/23 10:24:09 wiz Exp $
 #
 
 DISTNAME=	xawtv-3.95
@@ -59,7 +59,6 @@ MAKE_FLAGS+=		SUID_ROOT= FS_LIBS=-lFS
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 687959d05c9..0ae0e688dc1 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2012/10/08 09:21:15 asau Exp $
+# $NetBSD: Makefile,v 1.109 2012/10/23 10:24:09 wiz Exp $
 
 PKGREVISION=	4
 
@@ -65,5 +65,4 @@ CONFIGURE_ARGS+=	--disable-opengl
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 2613d3537ae..ab3af1b6409 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2012/10/08 09:21:15 asau Exp $
+# $NetBSD: Makefile,v 1.53 2012/10/23 10:24:09 wiz Exp $
 #
 
 DISTNAME=		xine-ui-0.99.7
@@ -39,7 +39,6 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86vidmodeproto/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/pthread.buildlink3.mk"