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

8 files changed, 8 insertions, 16 deletions

diff --git a/net/synergy/Makefile b/net/synergy/Makefile
index d01a284269e..31c7676e546 100644
--- a/net/synergy/Makefile
+++ b/net/synergy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/06/23 03:16:50 taca Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/23 10:24:09 wiz Exp $
 #
 
 DISTNAME=		synergy-1.3.7-Source
@@ -55,7 +55,6 @@ do-install:
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .endif
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/synergy1.2/Makefile b/net/synergy1.2/Makefile
index e6770a82b29..2eb79d472da 100644
--- a/net/synergy1.2/Makefile
+++ b/net/synergy1.2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/02/09 17:04:49 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:09 wiz Exp $
 #
 
 DISTNAME=		synergy-1.2.7
@@ -22,6 +22,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile
index 95223565e45..c15b8ca2561 100644
--- a/net/vncviewer/Makefile
+++ b/net/vncviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/04/27 18:35:30 tron Exp $
+# $NetBSD: Makefile,v 1.27 2012/10/23 10:24:09 wiz Exp $
 
 DISTNAME=		vnc-4_1_2-unixsrc
 PKGNAME=		vncviewer-4.1.2
@@ -40,5 +40,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wmget/Makefile b/net/wmget/Makefile
index edbf7327d9a..4eca43d9a26 100644
--- a/net/wmget/Makefile
+++ b/net/wmget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/04/22 13:44:29 obache Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/23 10:24:09 wiz Exp $
 
 DISTNAME=	wmget-0.6.0-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -36,5 +36,4 @@ do-install:
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wminet/Makefile b/net/wminet/Makefile
index 21f67168dba..86882214f21 100644
--- a/net/wminet/Makefile
+++ b/net/wminet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/02/14 19:25:24 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/23 10:24:10 wiz Exp $
 
 DISTNAME=	wmnet-1.2
 PKGNAME=	wminet-1.2
@@ -24,5 +24,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/net/wmnd/Makefile b/net/wmnd/Makefile
index a0cf6124085..cc8b3e8bf8c 100644
--- a/net/wmnd/Makefile
+++ b/net/wmnd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/03/17 22:12:09 zafer Exp $
+# $NetBSD: Makefile,v 1.7 2012/10/23 10:24:10 wiz Exp $
 
 DISTNAME=	wmnd-0.4.12
 PKGREVISION=	1
@@ -17,5 +17,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/net/wmnet/Makefile b/net/wmnet/Makefile
index cbbc6707bab..33613182a5d 100644
--- a/net/wmnet/Makefile
+++ b/net/wmnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2011/03/20 06:55:13 obache Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:10 wiz Exp $
 
 DISTNAME=	wmnet-1.06
 PKGREVISION=	5
@@ -26,5 +26,4 @@ SPECIAL_PERMS+=	bin/wmnet ${BINOWN} kmem 2555
 .endif
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wmpload/Makefile b/net/wmpload/Makefile
index f4d7b6fb933..9a75f6e192d 100644
--- a/net/wmpload/Makefile
+++ b/net/wmpload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:32 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:10 wiz Exp $
 #
 
 DISTNAME=	wmpload-0.9.5
@@ -17,5 +17,4 @@ USE_IMAKE=	YES
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"