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

7 files changed, 7 insertions, 14 deletions

diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index 9285f6c0cf6..6cc93274100 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/07/15 08:22:54 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2012/10/23 10:24:10 wiz Exp $
 #
 
 DISTNAME=	idesk-0.7.5
@@ -34,6 +34,5 @@ post-install:
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index c37200abe24..79f9b65ba70 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/10/03 21:57:39 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2012/10/23 10:24:10 wiz Exp $
 #
 
 DISTNAME=	lavaps-2.7
@@ -35,5 +35,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index 37584c709cb..9caf578cd9f 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/10/31 23:38:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:10 wiz Exp $
 
 DISTNAME=		torsmo-0.18
 PKGREVISION=		2
@@ -45,5 +45,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmSMPmon/Makefile b/sysutils/wmSMPmon/Makefile
index 24bb98cffb1..18832996354 100644
--- a/sysutils/wmSMPmon/Makefile
+++ b/sysutils/wmSMPmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/01/27 20:41:16 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2012/10/23 10:24:11 wiz Exp $
 
 DISTNAME=	wmSMPmon-2.3
 PKGREVISION=	1
@@ -21,5 +21,4 @@ do-install:
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index d35319d3306..e6d31918829 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:37 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/23 10:24:11 wiz Exp $
 #
 
 DISTNAME=	wmcpuload-1.0.1
@@ -20,5 +20,4 @@ post-extract:
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile
index 296948f54a2..e84c5de9da5 100644
--- a/sysutils/wmmemmon/Makefile
+++ b/sysutils/wmmemmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:37 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/23 10:24:11 wiz Exp $
 #
 
 DISTNAME=	wmmemmon-1.0.1
@@ -19,5 +19,4 @@ post-extract:
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index ab1f6635146..d3f1819d949 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2012/02/06 12:41:41 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2012/10/23 10:24:11 wiz Exp $
 
 DISTNAME=	xnc-5.0.4.src
 PKGNAME=	xnc-5.0.4
@@ -30,6 +30,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"