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

79 files changed, 79 insertions, 159 deletions

diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 49bbff700cc..f0ce33bdf6e 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/05/03 09:55:32 obache Exp $
+# $NetBSD: Makefile,v 1.30 2012/10/23 10:24:16 wiz Exp $
 #
 
 DISTNAME=		Xaw-XPM-1.1
@@ -31,5 +31,4 @@ post-install:
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index a8312c3a0f4..6481d0a720d 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2011/11/29 17:49:01 drochner Exp $
+# $NetBSD: Makefile,v 1.58 2012/10/23 10:24:16 wiz Exp $
 
 DISTNAME=	Xaw3d-1.5E
 PKGREVISION=	4
@@ -46,5 +46,4 @@ post-install:
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/desklaunch/Makefile b/x11/desklaunch/Makefile
index 154dd527a85..f5292e826b3 100644
--- a/x11/desklaunch/Makefile
+++ b/x11/desklaunch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/07/07 18:34:06 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:16 wiz Exp $
 #
 
 VERSION=	1.1.5
@@ -26,5 +26,4 @@ do-install:
 .include "../../x11/libX11/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/x11/ede/Makefile b/x11/ede/Makefile
index f08013ee72a..0a715d36989 100644
--- a/x11/ede/Makefile
+++ b/x11/ede/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/11/01 06:02:48 sbd Exp $
+# $NetBSD: Makefile,v 1.16 2012/10/23 10:24:16 wiz Exp $
 #
 
 DISTNAME=	ede-1.0.4
@@ -24,6 +24,5 @@ INSTALLATION_DIRS+=	bin
 
 .include "../../x11/efltk/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/efltk/Makefile b/x11/efltk/Makefile
index 219e8af49af..514ed594f96 100644
--- a/x11/efltk/Makefile
+++ b/x11/efltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2011/11/01 06:02:48 sbd Exp $
+# $NetBSD: Makefile,v 1.24 2012/10/23 10:24:16 wiz Exp $
 #
 
 DISTNAME=	efltk-2.0.5
@@ -37,6 +37,5 @@ INSTALL_MAKE_FLAGS+=	INSTALL_PREFIX=${DESTDIR:Q}
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 68a17579570..27c9f7b3360 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2012/10/03 21:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2012/10/23 10:24:16 wiz Exp $
 
 DISTNAME=	Eterm-0.9.5
 PKGNAME=	${DISTNAME:S/^E/e/}
@@ -47,6 +47,5 @@ SPECIAL_PERMS=		${PREFIX}/bin/Eterm ${SETUID_ROOT_PERMS}
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXres/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 9590e70520c..fb4aa548da5 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/02/06 12:41:56 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2012/10/23 10:24:17 wiz Exp $
 #
 
 DISTNAME=	fbdesk-1.4.1
@@ -32,5 +32,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index b67975ddbcf..0e25b936e26 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2011/03/01 09:53:16 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2012/10/23 10:24:17 wiz Exp $
 
 DISTNAME=	fltk-1.1.10-source
 PKGNAME=	${DISTNAME:S/-source//}
@@ -42,6 +42,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fltk13/Makefile b/x11/fltk13/Makefile
index e4e654e1e33..32089d037b5 100644
--- a/x11/fltk13/Makefile
+++ b/x11/fltk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/02 17:12:11 tron Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:17 wiz Exp $
 
 DISTNAME=	fltk-1.3.0-source
 PKGNAME=	${DISTNAME:S/-source//}
@@ -73,6 +73,5 @@ CONFIGURE_ARGS+=	--disable-localjpeg --disable-localzlib --disable-localpng
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fltk2/Makefile b/x11/fltk2/Makefile
index ca5f6658dfd..69f7189073f 100644
--- a/x11/fltk2/Makefile
+++ b/x11/fltk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/12/17 00:56:06 marino Exp $
+# $NetBSD: Makefile,v 1.11 2012/10/23 10:24:17 wiz Exp $
 
 VERS=		6129
 PKGREVISION=	6
@@ -34,6 +34,5 @@ LDFLAGS+=		-lfontconfig -lXrender -lfreetype
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index 9b0b1b34329..5841f934aa6 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2012/02/06 12:41:56 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2012/10/23 10:24:17 wiz Exp $
 
 DISTNAME=	fox-1.6.33
 PKGREVISION=	6
@@ -45,5 +45,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index 1ed4fe20f07..7bb19eb3176 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2012/05/07 01:54:07 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2012/10/23 10:24:17 wiz Exp $
 
 BUILDLINK_TREE+=	fox
 
@@ -20,7 +20,6 @@ BUILDLINK_INCDIRS.fox?=		include/fox-1.6
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .endif # FOX_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-fox
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index 8eb1278a538..9c121b6d4b9 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2012/10/22 02:25:15 rh Exp $
+# $NetBSD: Makefile,v 1.51 2012/10/23 10:24:17 wiz Exp $
 
 DISTNAME=	gnustep-back-0.22.0
 CATEGORIES=	x11 gnustep
@@ -33,6 +33,5 @@ PREFER_PKGSRC+=	freetype2
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 5f5864e529b..315eb31c7ad 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2012/10/03 21:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.128 2012/10/23 10:24:17 wiz Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		11
@@ -68,5 +68,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/options.mk b/x11/gtk2/options.mk
index c6fdfcedf3d..9e5d0b85fca 100644
--- a/x11/gtk2/options.mk
+++ b/x11/gtk2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2012/01/19 15:17:42 reed Exp $
+# $NetBSD: options.mk,v 1.13 2012/10/23 10:24:17 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtk2
 PKG_SUPPORTED_OPTIONS=	cups debug
@@ -49,7 +49,6 @@ BUILDLINK_API_DEPENDS.libXi+=	libXi>=1.3.0
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 
diff --git a/x11/gtk3/options.mk b/x11/gtk3/options.mk
index 27ddb1db177..c9d34df657b 100644
--- a/x11/gtk3/options.mk
+++ b/x11/gtk3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2011/09/09 10:02:03 adam Exp $
+# $NetBSD: options.mk,v 1.3 2012/10/23 10:24:17 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS=	cups debug
@@ -48,7 +48,6 @@ BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2nb2
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index e8a3f4d0a40..f6f44cd804d 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/02/26 10:28:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:18 wiz Exp $
 #
 
 DISTNAME=	imwheel-0.9.9
@@ -20,5 +20,4 @@ CONFIGURE_ARGS+=	--disable-gpm
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lbxproxy/Makefile b/x11/lbxproxy/Makefile
index a14ba52d4a8..248db2366bd 100644
--- a/x11/lbxproxy/Makefile
+++ b/x11/lbxproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/06/26 00:39:59 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:18 wiz Exp $
 #
 
 DISTNAME=		lbxproxy-1.0.2
@@ -22,6 +22,5 @@ BROKEN=			Unsupported by modern X.org
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/liblbxutil/buildlink3.mk"
 .include "../../x11/xproxymanagementprotocol/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 13c6f26f5e8..f7174774bf5 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2011/11/01 06:03:02 sbd Exp $
+# $NetBSD: Makefile,v 1.99 2012/10/23 10:24:18 wiz Exp $
 
 DISTNAME=	lesstif-0.95.2
 PKGREVISION=	2
@@ -70,5 +70,4 @@ post-patch:
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libAppleWM/Makefile b/x11/libAppleWM/Makefile
index 02ff13e81d0..bb45b241668 100644
--- a/x11/libAppleWM/Makefile
+++ b/x11/libAppleWM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/10/16 13:10:05 obache Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/23 10:24:18 wiz Exp $
 #
 
 DISTNAME=		libAppleWM-1.4.0
@@ -24,5 +24,4 @@ PKGCONFIG_OVERRIDE+=	applewm.pc.in
 .include "../../x11/applewmproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index d1b35e54810..bc690c7fafe 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:47 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/23 10:24:18 wiz Exp $
 #
 
 DISTNAME=		libXScrnSaver-1.2.2
@@ -33,6 +33,5 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .include "../../x11/libXext/buildlink3.mk"
 BUILDLINK_API_DEPENDS.scrnsaverproto+=	scrnsaverproto>=1.2.0
 .include "../../x11/scrnsaverproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index a35a4c6fdbf..ef1dbceff31 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:15 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:18 wiz Exp $
 #
 
 DISTNAME=		libXTrap-1.0.0
@@ -23,6 +23,5 @@ PKGCONFIG_OVERRIDE+=	xtrap.pc.in
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/trapproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXaw/Makefile b/x11/libXaw/Makefile
index 1a02c8aa809..61b18fbc2bc 100644
--- a/x11/libXaw/Makefile
+++ b/x11/libXaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/06/09 05:44:21 obache Exp $
+# $NetBSD: Makefile,v 1.11 2012/10/23 10:24:18 wiz Exp $
 #
 
 DISTNAME=		libXaw-1.0.11
@@ -26,7 +26,6 @@ CONFIGURE_ENV+=		LIB_MAN_SUFFIX=3
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXaw/buildlink3.mk b/x11/libXaw/buildlink3.mk
index d543bd002a5..b741e8aa3f2 100644
--- a/x11/libXaw/buildlink3.mk
+++ b/x11/libXaw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2012/10/23 10:24:18 wiz Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -22,7 +22,6 @@ BUILDLINK_TRANSFORM+=		l:Xaw:Xaw7
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 .endif # LIBXAW_BUILDLINK3_MK
 
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index 151a38a67ce..fe525ad17bf 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/06/03 17:41:04 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/23 10:24:18 wiz Exp $
 #
 
 DISTNAME=		libXevie-1.0.3
@@ -31,7 +31,6 @@ pre-configure:
 .include "../../x11/evieext/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 3ab00e56355..cd1c4b7ce58 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/06/09 07:00:48 obache Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:18 wiz Exp $
 
 DISTNAME=	libXinerama-1.1.2
 CATEGORIES=	x11
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xineramaproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXinerama/buildlink3.mk b/x11/libXinerama/buildlink3.mk
index 805f07b198b..c52bc15ca83 100644
--- a/x11/libXinerama/buildlink3.mk
+++ b/x11/libXinerama/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/04/10 21:09:21 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2012/10/23 10:24:18 wiz Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -16,7 +16,6 @@ BUILDLINK_PKGSRCDIR.libXinerama?=	../../x11/libXinerama
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xineramaproto/buildlink3.mk"
 .endif # LIBXINERAMA_BUILDLINK3_MK
 
diff --git a/x11/libXmu/Makefile b/x11/libXmu/Makefile
index adc05d14a19..6981bd04657 100644
--- a/x11/libXmu/Makefile
+++ b/x11/libXmu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:47 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/23 10:24:19 wiz Exp $
 #
 
 DISTNAME=		libXmu-1.1.1
@@ -24,6 +24,5 @@ USE_TOOLS+=		pkg-config
 .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/x11/libXp/Makefile b/x11/libXp/Makefile
index baea32f19d3..8e3869aa3e0 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/01/21 23:17:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/23 10:24:19 wiz Exp $
 #
 
 DISTNAME=		libXp-1.0.1
@@ -36,6 +36,5 @@ CONFIGURE_ARGS+=	XPRINT_CFLAGS=${XPRINT_CFLAGS:Q} \
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/printproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index e54128b6cd0..6b4a241fc96 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/06/09 07:00:48 obache Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/23 10:24:19 wiz Exp $
 #
 
 DISTNAME=		libXpm-3.5.10
@@ -49,7 +49,6 @@ CONFIGURE_ARGS+=	XPM_CFLAGS=${XPM_CFLAGS:Q} \
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
index f548770ea3b..1f65ac81f6a 100644
--- a/x11/libXprintUtil/Makefile
+++ b/x11/libXprintUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/05/24 21:45:19 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2012/10/23 10:24:19 wiz Exp $
 #
 
 DISTNAME=		libXprintUtil-1.0.1
@@ -21,6 +21,5 @@ PKGCONFIG_OVERRIDE+=	xprintutil.pc.in
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 9e89e235ad6..1d02fb6f854 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/07/29 20:37:06 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/23 10:24:19 wiz Exp $
 #
 
 DISTNAME=		libXrandr-1.4.0
@@ -32,6 +32,5 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 46e83d87fdb..05fa1444d7c 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:48 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/23 10:24:19 wiz Exp $
 #
 
 DISTNAME=		libXres-1.0.6
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/resourceproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXtst/buildlink3.mk b/x11/libXtst/buildlink3.mk
index 639803c1aeb..33e11b267f4 100644
--- a/x11/libXtst/buildlink3.mk
+++ b/x11/libXtst/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2012/02/10 17:19:02 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2012/10/23 10:24:19 wiz Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -11,7 +11,6 @@ BUILDLINK_API_DEPENDS.libXtst+=	libXtst>=1.0.1
 BUILDLINK_PKGSRCDIR.libXtst?=	../../x11/libXtst
 
 .include "../../x11/recordproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 5c214c1a824..b02cd2d47fc 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/06/09 07:00:48 obache Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:19 wiz Exp $
 #
 
 DISTNAME=		libXv-1.0.7
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXv/buildlink3.mk b/x11/libXv/buildlink3.mk
index e351679cf29..19dcccad9d3 100644
--- a/x11/libXv/buildlink3.mk
+++ b/x11/libXv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/09/05 14:41:22 jakllsch Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2012/10/23 10:24:19 wiz Exp $
 
 BUILDLINK_TREE+=	libXv
 
@@ -11,7 +11,6 @@ BUILDLINK_PKGSRCDIR.libXv?=	../../x11/libXv
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 .endif # LIBXV_BUILDLINK3_MK
 
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index 5020f0b6a8c..17ce6226cc1 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/09 07:00:49 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/23 10:24:19 wiz Exp $
 #
 
 DISTNAME=		libXvMC-1.0.7
@@ -31,6 +31,5 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index 27a458ddf2b..08bcdc6c082 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/06/09 07:00:49 obache Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/23 10:24:19 wiz Exp $
 #
 
 DISTNAME=		libXxf86dga-1.1.3
@@ -30,7 +30,6 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index cd299310243..ad8a8ae6e2d 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/06/03 17:48:28 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/23 10:24:20 wiz Exp $
 #
 
 DISTNAME=		libXxf86misc-1.0.3
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86miscproto/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index f4a4d4d5522..5225dafc3fd 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/06/09 07:00:49 obache Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:20 wiz Exp $
 #
 
 DISTNAME=		libXxf86vm-1.1.2
@@ -30,7 +30,6 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86vidmodeproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 
diff --git a/x11/liboldXrandr/Makefile b/x11/liboldXrandr/Makefile
index 140310d2557..37400d91865 100644
--- a/x11/liboldXrandr/Makefile
+++ b/x11/liboldXrandr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/05/30 01:22:12 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/23 10:24:20 wiz Exp $
 #
 
 DISTNAME=		libXrandr-1.0.2
@@ -28,6 +28,5 @@ BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index f0398d41713..3d99f40a174 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2012/09/27 06:12:09 asau Exp $
+# $NetBSD: Makefile,v 1.70 2012/10/23 10:24:20 wiz Exp $
 #
 
 DISTNAME=	xorg-server-1.6.5
@@ -172,7 +172,6 @@ BUILDLINK_API_DEPENDS.libXext+=	libXext>=1.1.1
 .include "../../x11/trapproto/buildlink3.mk"
 .include "../../x11/videoproto/buildlink3.mk"
 .include "../../x11/xcmiscproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86bigfontproto/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"
 .include "../../x11/xf86driproto/buildlink3.mk"
diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile
index bf24747abfa..902c041dfac 100644
--- a/x11/neXtaw/Makefile
+++ b/x11/neXtaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/07/07 18:22:37 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2012/10/23 10:24:20 wiz Exp $
 
 DISTNAME=	neXtaw-0.15.1
 PKGREVISION=	3
@@ -40,5 +40,4 @@ post-install:
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index 572f0f6223d..850a832035c 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/07/07 18:10:38 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/23 10:24:20 wiz Exp $
 #
 
 DISTNAME=		numlockx-1.1
@@ -29,5 +29,4 @@ CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11:Q}/lib${LIBABISUFFIX:Q}
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/oneko/Makefile b/x11/oneko/Makefile
index be86681ef79..66530bce0cf 100644
--- a/x11/oneko/Makefile
+++ b/x11/oneko/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/12/01 13:58:33 itohy Exp $
+# $NetBSD: Makefile,v 1.11 2012/10/23 10:24:20 wiz Exp $
 
 DISTNAME=		oneko-1.1b
 PKGNAME=		oneko-1.2
@@ -20,5 +20,4 @@ WRKSRC=			${WRKDIR}/oneko
 USE_IMAKE=		yes
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index e9fdb4fb9e0..0c231aac67c 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2012/01/12 16:01:46 hans Exp $
+# $NetBSD: Makefile,v 1.72 2012/10/23 10:24:20 wiz Exp $
 
 PKGVER=		2.3.3
 DISTNAME=	openmotif-${PKGVER}
@@ -121,5 +121,4 @@ post-build:
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk
index 8b12c260c11..a2a1473436d 100644
--- a/x11/openmotif/buildlink3.mk
+++ b/x11/openmotif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2012/05/07 01:54:12 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2012/10/23 10:24:20 wiz Exp $
 
 BUILDLINK_TREE+=	openmotif
 
@@ -23,7 +23,6 @@ BUILDLINK_TRANSFORM+=	rm:-lXp
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/xbitmaps/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .endif # OPENMOTIF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-openmotif
diff --git a/x11/space_dapp/Makefile b/x11/space_dapp/Makefile
index 338cb9cc621..1942116ba9a 100644
--- a/x11/space_dapp/Makefile
+++ b/x11/space_dapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/03 15:26:25 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/23 10:24:20 wiz Exp $
 
 PKGNAME=		space_dapp-20060717
 CATEGORIES=		x11
@@ -28,5 +28,4 @@ do-install:
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/speyes/Makefile b/x11/speyes/Makefile
index 8659478d9d7..a0e30150067 100644
--- a/x11/speyes/Makefile
+++ b/x11/speyes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:45 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:21 wiz Exp $
 
 DISTNAME=	speyes-1.2.0
 PKGREVISION=	1
@@ -16,5 +16,4 @@ USE_IMAKE=	YES
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmavgload/Makefile b/x11/wmavgload/Makefile
index f902f0f199c..b7a6c1460cf 100644
--- a/x11/wmavgload/Makefile
+++ b/x11/wmavgload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/12/23 19:22:28 abs Exp $
+# $NetBSD: Makefile,v 1.17 2012/10/23 10:24:21 wiz Exp $
 
 DISTNAME=	wmavgload-0.7.0
 PKGREVISION=	1
@@ -15,5 +15,4 @@ NO_INSTALL_MANPAGES=	YES
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile
index 946fb3494be..0c1a20d33a4 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/12/17 17:48:42 abs Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:21 wiz Exp $
 #
 
 DISTNAME=	wmfire-0.0.3.9pre4
@@ -23,5 +23,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/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index 6285777d322..f252f5aa776 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/12/17 17:55:22 abs Exp $
+# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:21 wiz Exp $
 
 DISTNAME=	wmfstatus-0.4
 PKGREVISION=	1
@@ -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/x11/wmweather/Makefile b/x11/wmweather/Makefile
index 330ffcd0271..84b70e362d4 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2012/06/15 23:06:04 dholland Exp $
+# $NetBSD: Makefile,v 1.37 2012/10/23 10:24:21 wiz Exp $
 #
 
 DISTNAME=	wmweather-2.4.2
@@ -30,6 +30,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index 836d752ff9f..6791136e87b 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/03 18:02:24 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/10/23 10:24:21 wiz Exp $
 #
 
 DISTNAME=		x11perf-1.5.4
@@ -21,5 +21,4 @@ CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/x11vnc/options.mk b/x11/x11vnc/options.mk
index 98b040c91df..5294ae24c51 100644
--- a/x11/x11vnc/options.mk
+++ b/x11/x11vnc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2009/05/07 14:03:26 obache Exp $
+# $NetBSD: options.mk,v 1.3 2012/10/23 10:24:21 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.x11vnc
@@ -25,7 +25,6 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
 .endif
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 015f49561fa..f14185109ce 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/06/03 18:07:30 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/23 10:24:21 wiz Exp $
 #
 
 DISTNAME=		xauth-1.0.7
@@ -17,5 +17,4 @@ USE_TOOLS+=		pkg-config
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xdesktopwaves/Makefile b/x11/xdesktopwaves/Makefile
index c2cdd70506d..7e9754db9b8 100644
--- a/x11/xdesktopwaves/Makefile
+++ b/x11/xdesktopwaves/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/07/22 09:01:55 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/23 10:24:21 wiz Exp $
 #
 
 DISTNAME=	xdesktopwaves-1.1
@@ -26,5 +26,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/xdesktopwaves.xpm ${DESTDIR}${PREFIX}/share/pixmaps/
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index e9dbfc5166b..11f6907bdde 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/07/29 19:48:35 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/23 10:24:21 wiz Exp $
 #
 
 DISTNAME=	xdpyinfo-1.3.0
@@ -26,5 +26,4 @@ USE_TOOLS+=	pkg-config
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86misc/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
index 6c2e5a7e461..79bf39d6540 100644
--- a/x11/xeyes/Makefile
+++ b/x11/xeyes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/06/03 18:13:21 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/23 10:24:22 wiz Exp $
 #
 
 DISTNAME=	xeyes-1.1.1
@@ -22,6 +22,4 @@ CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
index fcb81910766..141f7edff07 100644
--- a/x11/xgamma/Makefile
+++ b/x11/xgamma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/03 18:15:21 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/23 10:24:22 wiz Exp $
 #
 
 DISTNAME=		xgamma-1.0.5
@@ -20,6 +20,5 @@ CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86vidmodeproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index fb89716685e..f6103c1dbd7 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/05/03 09:55:32 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/23 10:24:22 wiz Exp $
 #
 
 DISTNAME=	xlupe-1.1
@@ -17,5 +17,4 @@ USE_IMAKE=	yes
 .include "../../x11/libXaw/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/x11/xmindpath/Makefile b/x11/xmindpath/Makefile
index 301d7ff586b..816c11bce77 100644
--- a/x11/xmindpath/Makefile
+++ b/x11/xmindpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/06/16 03:21:22 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:22 wiz Exp $
 
 DISTNAME=	magicpoint-1.09a
 PKGNAME=	xmindpath-1.09a
@@ -38,5 +38,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common
index 47ac2e20ebc..02fc7d439b5 100644
--- a/x11/xosd/Makefile.common
+++ b/x11/xosd/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2012/01/09 17:57:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.27 2012/10/23 10:24:22 wiz Exp $
 #
 # used by x11/xmms-osd/Makefile
 
@@ -29,4 +29,3 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile
index feb1c61857f..dd7800e25b0 100644
--- a/x11/xpenguins/Makefile
+++ b/x11/xpenguins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/14 12:56:20 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:22 wiz Exp $
 #
 
 DISTNAME=	xpenguins-2.2
@@ -19,5 +19,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xplsprinters/Makefile b/x11/xplsprinters/Makefile
index 953a2330a07..71b37a676a8 100644
--- a/x11/xplsprinters/Makefile
+++ b/x11/xplsprinters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/23 10:24:22 wiz Exp $
 #
 
 DISTNAME=		xplsprinters-1.0.1
@@ -21,6 +21,5 @@ CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXprintUtil/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index f8b15285673..92c9532f8af 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2012/07/30 03:59:06 dholland Exp $
+# $NetBSD: Makefile,v 1.62 2012/10/23 10:24:22 wiz Exp $
 #
 
 DISTNAME=	fvwm-${PKG_VERSION}
@@ -32,5 +32,4 @@ do-install:
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xprehashprinterlist/Makefile b/x11/xprehashprinterlist/Makefile
index 7f106da7a0c..a84614430e8 100644
--- a/x11/xprehashprinterlist/Makefile
+++ b/x11/xprehashprinterlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/23 10:24:22 wiz Exp $
 #
 
 DISTNAME=		xprehashprinterlist-1.0.1
@@ -20,6 +20,5 @@ CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index 28bb27bc85f..353d07f821c 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/05/12 21:25:25 zafer Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/23 10:24:22 wiz Exp $
 #
 
 DISTNAME=		xrestop-0.4
@@ -17,5 +17,4 @@ USE_TOOLS+=		pkg-config
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXres/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index a535619eb1b..4ea6eccdd6a 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2012/10/03 21:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2012/10/23 10:24:23 wiz Exp $
 
 COMMENT=	Screen saver and locker for the X window system
 PKGREVISION=	1
@@ -36,5 +36,4 @@ post-install:
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXxf86misc/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index 1e3b82f1287..90c77587eb3 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/06/03 18:25:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/23 10:24:23 wiz Exp $
 #
 
 DISTNAME=		xset-1.2.2
@@ -22,6 +22,5 @@ CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXxf86misc/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile
index cf903e1326f..3faacb3c344 100644
--- a/x11/xsetmode/Makefile
+++ b/x11/xsetmode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/23 10:24:23 wiz Exp $
 #
 
 DISTNAME=		xsetmode-1.0.0
@@ -19,6 +19,5 @@ CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile
index 549e46e2149..d777bd1f51c 100644
--- a/x11/xsetpointer/Makefile
+++ b/x11/xsetpointer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:19 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/23 10:24:23 wiz Exp $
 #
 
 DISTNAME=		xsetpointer-1.0.1
@@ -19,6 +19,5 @@ CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 37121d504eb..73a5693bee4 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 15:18:53 is Exp $
+# $NetBSD: Makefile,v 1.31 2012/10/23 10:24:23 wiz Exp $
 
 DISTNAME=	xsnow-1.42
 PKGREVISION=	5
@@ -23,5 +23,4 @@ IMAKEOPTS+=	-DExtraLibraries=${LIBS:Q}
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile
index c801afe5fd8..c23010df3c8 100644
--- a/x11/xteddy/Makefile
+++ b/x11/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/09/16 12:42:03 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2012/10/23 10:24:23 wiz Exp $
 
 DISTNAME=	xteddy-1.1
 PKGREVISION=	1
@@ -21,5 +21,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 857ca498aaa..75cbf331dc8 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2012/02/06 12:42:32 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2012/10/23 10:24:23 wiz Exp $
 
 DISTNAME=	xteddy-2.0.1
 PKGREVISION=	17
@@ -27,5 +27,4 @@ SUBST_SED.prefix=	-e 's|@PREFIX@|${PREFIX}|g'
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xvidcap/Makefile b/x11/xvidcap/Makefile
index 713425e6a70..0b108a9a335 100644
--- a/x11/xvidcap/Makefile
+++ b/x11/xvidcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/09/22 13:48:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2012/10/23 10:24:23 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -12,6 +12,5 @@ CONFIGURE_ARGS+=	--without-gtk2
 LDFLAGS.DragonFly=	-lXt -lX11
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index 22fa3a623e6..e192adac14a 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2012/06/15 23:06:09 dholland Exp $
+# $NetBSD: Makefile,v 1.36 2012/10/23 10:24:23 wiz Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-clients-3.2.1
@@ -31,6 +31,5 @@ SUBST_SED.xvc=		-e "s,@PREFIX@,${PREFIX},g"
 SUBST_SED.xvc+=		-e "s,@X11BASE@,${X11BASE},g"
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xview-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index f9d8639b0a5..b1013f83519 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/02 12:09:42 tron Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:24 wiz Exp $
 #
 
 DISTNAME=		xwininfo-1.1.2
@@ -21,5 +21,4 @@ CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile
index 2c19f4f8eda..8a897667559 100644
--- a/x11/xxkb/Makefile
+++ b/x11/xxkb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/10/09 10:02:44 cheusov Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/23 10:24:24 wiz Exp $
 
 DISTNAME=	xxkb-1.11-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -32,5 +32,4 @@ post-install:
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"