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).

12 files changed, 12 insertions, 24 deletions

diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index f9198177ac4..a03fe0c5764 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/10/06 11:54:29 asau Exp $
+# $NetBSD: Makefile,v 1.27 2012/10/23 10:24:04 wiz Exp $
 
 DISTNAME=		abuse_pd
 PKGNAME=		abuse-2.0
@@ -27,5 +27,4 @@ post-extract:
 	&& ${GTAR} xfz ${DISTDIR}/abuse_data.tar.gz
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index 9b12fabcb61..eeb60aa7bcc 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/10/06 11:54:46 asau Exp $
+# $NetBSD: Makefile,v 1.26 2012/10/23 10:24:04 wiz Exp $
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=		maelstrom-x11-2.0.6
@@ -55,6 +55,5 @@ post-install:
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/netmaze/Makefile b/games/netmaze/Makefile
index 531c3ba0ded..6a1cddf9912 100644
--- a/games/netmaze/Makefile
+++ b/games/netmaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/06 11:54:48 asau Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/23 10:24:04 wiz Exp $
 
 DISTNAME=		netmaze0.81
 PKGNAME=		netmaze-0.81
@@ -18,5 +18,4 @@ post-patch:
 		< ${WRKSRC}/Imakefile.bak > ${WRKSRC}/Imakefile
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 56d2adc0598..764edf5e1f1 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2012/10/06 11:54:51 asau Exp $
+# $NetBSD: Makefile,v 1.48 2012/10/23 10:24:04 wiz Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
@@ -57,6 +57,5 @@ do-install:
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 3384290fbc0..a954228819d 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/06 11:54:51 asau Exp $
+# $NetBSD: Makefile,v 1.28 2012/10/23 10:24:04 wiz Exp $
 #
 
 DISTNAME=	quake2-0.3
@@ -45,7 +45,6 @@ CONFIGURE_ENV+=		ac_cv_header_sys_audioio_h=no
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/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/games/quake6/Makefile b/games/quake6/Makefile
index 0009d62420c..4908269af07 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2012/10/06 11:54:52 asau Exp $
+# $NetBSD: Makefile,v 1.39 2012/10/23 10:24:05 wiz Exp $
 
 DISTNAME=	quake-v6-bsd-kame
 PKGNAME=	quake6-0.0
@@ -40,6 +40,5 @@ CONFIGURE_ARGS+=	--x-includes=${X11BASE:Q}/include
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index e09529bebf9..5c49fbedef7 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/06 11:54:52 asau Exp $
+# $NetBSD: Makefile,v 1.28 2012/10/23 10:24:05 wiz Exp $
 
 DISTNAME=		quakeforge-0.5.5
 PKGREVISION=		11
@@ -55,7 +55,6 @@ INSTALLATION_DIRS=	include/QF/GL include/QF/plugin include/QF/ruamoko/gui
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86vidmodeproto/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/games/tyrquake/Makefile b/games/tyrquake/Makefile
index 43c3540d4db..a24e4b9d5ac 100644
--- a/games/tyrquake/Makefile
+++ b/games/tyrquake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 11:54:57 asau Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/23 10:24:05 wiz Exp $
 
 DISTNAME=	tyrquake-0.61
 CATEGORIES=	games x11
@@ -30,7 +30,6 @@ do-install:
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/wormz/Makefile b/games/wormz/Makefile
index 152aa5f9cc8..5901c313d8e 100644
--- a/games/wormz/Makefile
+++ b/games/wormz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/06 11:54:58 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:05 wiz Exp $
 #
 
 DISTNAME=		Wormz-1.0b5
@@ -26,5 +26,4 @@ do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 4d0cd33f274..907ff909a9d 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/10/06 11:55:00 asau Exp $
+# $NetBSD: Makefile,v 1.50 2012/10/23 10:24:05 wiz Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -52,6 +52,5 @@ do-install:
 		${DESTDIR}${PREFIX}/bin/sndserver
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile
index 9aba91627fb..2d1e837b95e 100644
--- a/games/xfreecell/Makefile
+++ b/games/xfreecell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/06 11:55:00 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:05 wiz Exp $
 
 DISTNAME=	xfreecell-1.0.5b
 PKGREVISION=	2
@@ -22,5 +22,4 @@ NO_CONFIGURE=	YES
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index b45463f5f04..be78993a68f 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/06 11:55:01 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:05 wiz Exp $
 #
 
 DISTNAME=		xjig-2.4
@@ -21,5 +21,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tina.gif ${DESTDIR}${PREFIX}/lib/xjig
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"