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

6 files changed, 6 insertions, 12 deletions

diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 5fa63d11484..c40aa7c45b9 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/02 23:47:57 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:02 wiz Exp $
 #
 
 DISTNAME=	Mixer.app-1.8.0
@@ -27,6 +27,5 @@ do-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/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index 733d5498942..afeb3bd52ac 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/02 23:48:12 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:02 wiz Exp $
 #
 
 DISTNAME=	wmmixer-1.0-beta1
@@ -24,6 +24,5 @@ pre-build:
 
 .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/audio/wmmp/Makefile b/audio/wmmp/Makefile
index 7d5b557a8a8..b702d874765 100644
--- a/audio/wmmp/Makefile
+++ b/audio/wmmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/02 23:48:13 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:02 wiz Exp $
 
 DISTNAME=	WMmp-0.10.0
 CATEGORIES=	audio
@@ -14,5 +14,4 @@ GNU_CONFIGURE=	yes
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index a70b555dbc2..dece242dd14 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/02 23:48:13 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:02 wiz Exp $
 
 DISTNAME=	wmmp3-0.12
 PKGREVISION=	3
@@ -28,5 +28,4 @@ post-install:
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile
index fe3fc3ba778..76bffdc534d 100644
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/02 23:48:13 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:02 wiz Exp $
 #
 
 DISTNAME=	wmsmixer-0.5.1
@@ -29,6 +29,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/audio/wmusic/Makefile b/audio/wmusic/Makefile
index 55a7d1899e1..52c7d613cee 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/02 23:48:13 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:02 wiz Exp $
 
 DISTNAME=	wmusic-1.5.0
 PKGREVISION=	5
@@ -23,5 +23,4 @@ do-install:
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"