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

20 files changed, 20 insertions, 40 deletions

diff --git a/graphics/GraphicsMagick/options.mk b/graphics/GraphicsMagick/options.mk
index 1e92d6b2802..41566ea0a12 100755
--- a/graphics/GraphicsMagick/options.mk
+++ b/graphics/GraphicsMagick/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/01/08 05:25:54 obache Exp $
+# $NetBSD: options.mk,v 1.4 2012/10/23 10:24:05 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.GraphicsMagick
 PKG_SUPPORTED_OPTIONS=	bzip2 lzma x11 jasper ghostscript wmf
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=	--without-lzma
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 PLIST.x11=		yes
 .else
 CONFIGURE_ARGS+=	--without-x
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index a1e71649ef9..30bcd873103 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2011/05/13 12:55:39 abs Exp $
+# $NetBSD: options.mk,v 1.12 2012/10/23 10:24:05 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ImageMagick
 PKG_SUPPORTED_OPTIONS=	x11 jasper djvu ghostscript wmf
@@ -10,7 +10,6 @@ PKG_SUGGESTED_OPTIONS=	x11 jasper
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
 .endif
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 6555c74b0dd..2d99694e794 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.72 2012/10/06 14:10:40 asau Exp $
+# $NetBSD: Makefile.common,v 1.73 2012/10/23 10:24:06 wiz Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
@@ -29,4 +29,3 @@ DIST_SUBDIR=		Mesa-${MESA_PKGVERSION}
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index d757f510ad6..7adbd889f58 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/10/06 14:10:45 asau Exp $
+# $NetBSD: Makefile,v 1.38 2012/10/23 10:24:06 wiz Exp $
 #
 
 DISTNAME=		cqcam-0.91
@@ -38,5 +38,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/tk/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/evas-software-x11/Makefile b/graphics/evas-software-x11/Makefile
index 3f149d61912..b5a0a2c4bf8 100644
--- a/graphics/evas-software-x11/Makefile
+++ b/graphics/evas-software-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/12/05 17:33:33 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/23 10:24:06 wiz Exp $
 
 PKGNAME=	evas-software-x11-${EVAS_VERSION}
 
@@ -20,7 +20,6 @@ PKGCONFIG_OVERRIDE=	evas-software-x11.pc.in
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 
 post-install:
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 1316cc1bc19..0585cd160d5 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2012/10/06 14:10:49 asau Exp $
+# $NetBSD: Makefile,v 1.47 2012/10/23 10:24:06 wiz Exp $
 #
 
 DISTNAME=		fnlib-0.5
@@ -29,6 +29,5 @@ post-install:
 .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/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 71613aae92b..215606b2d20 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2012/10/06 14:11:00 asau Exp $
+# $NetBSD: Makefile,v 1.113 2012/10/23 10:24:06 wiz Exp $
 
 DISTNAME=	imlib-1.9.15
 PKGREVISION=	12
@@ -66,6 +66,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../graphics/tiff/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/graphics/imlib2/options.mk b/graphics/imlib2/options.mk
index 506ec7b42cf..09f4235f6d7 100644
--- a/graphics/imlib2/options.mk
+++ b/graphics/imlib2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2011/05/04 02:00:02 obache Exp $
+# $NetBSD: options.mk,v 1.11 2012/10/23 10:24:06 wiz Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+=	--disable-amd64
 PLIST_VARS+=		x11
 
 .if !empty(PKG_OPTIONS:Mx11)
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 PLIST.x11=		yes
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index 4e706afd275..bef027dac6e 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/10/06 14:11:00 asau Exp $
+# $NetBSD: Makefile,v 1.27 2012/10/23 10:24:06 wiz Exp $
 
 DISTNAME=	ivtools-1.2.8
 PKGREVISION=	1
@@ -40,5 +40,4 @@ pre-install:
 .include "../../graphics/tiff/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/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 430859d5432..254c6144972 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2012/10/06 14:11:04 asau Exp $
+# $NetBSD: Makefile,v 1.53 2012/10/23 10:24:06 wiz Exp $
 #
 
 DISTNAME=	libggi-2.2.2.src
@@ -62,5 +62,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/graphics/libggi/buildlink3.mk b/graphics/libggi/buildlink3.mk
index 4d9a0651e35..1cf9babd5cd 100644
--- a/graphics/libggi/buildlink3.mk
+++ b/graphics/libggi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/30 15:29:04 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2012/10/23 10:24:06 wiz Exp $
 
 BUILDLINK_TREE+=	libggi
 
@@ -18,7 +18,6 @@ BUILDLINK_PKGSRCDIR.libggi?=	../../graphics/libggi
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../graphics/libgii/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .endif # LIBGGI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libggi
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 5fb623a1f48..76b91387239 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2012/10/06 14:11:07 asau Exp $
+# $NetBSD: Makefile,v 1.80 2012/10/23 10:24:06 wiz Exp $
 
 DISTNAME=		magicpoint-1.13a
 PKGREVISION=		11
@@ -76,6 +76,5 @@ post-install:
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index 36810355550..cfb1275a226 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2011/09/25 13:52:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2012/10/23 10:24:06 wiz Exp $
 #
 
 DISTNAME=	mgl2-alpha-020
@@ -125,5 +125,4 @@ post-install:
 .include "../../mk/giflib.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/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index 3e2e3d90bd4..345924abce9 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/06 14:11:07 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:07 wiz Exp $
 
 DISTNAME=	mpeg2vidcodec_v12
 PKGNAME=	mpeg2codec-1.2
@@ -19,7 +19,6 @@ INSTALLATION_DIRS=	bin
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} \
diff --git a/graphics/plotutils/options.mk b/graphics/plotutils/options.mk
index 5a5c52012d1..995439c4f6d 100644
--- a/graphics/plotutils/options.mk
+++ b/graphics/plotutils/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2011/11/29 17:55:07 drochner Exp $
+# $NetBSD: options.mk,v 1.3 2012/10/23 10:24:07 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.plotutils
 PKG_SUPPORTED_OPTIONS=	x11
@@ -10,7 +10,6 @@ PKG_SUGGESTED_OPTIONS=	x11
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
 .endif
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 1ab7b37c8cc..7cfdd3d84cc 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/06 14:11:22 asau Exp $
+# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:07 wiz Exp $
 #
 
 DISTNAME=	skencil-0.6.17
@@ -45,5 +45,4 @@ post-install:
 .include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/py-Tk/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 957523a0c7c..7ece181e71f 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2012/10/06 14:11:23 asau Exp $
+# $NetBSD: Makefile,v 1.58 2012/10/23 10:24:07 wiz Exp $
 
 DISTNAME=	urt
 PKGNAME=	urt-3.1b1
@@ -48,5 +48,4 @@ post-install:
 
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index 2ff0d6e53ba..47562335151 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/06 14:11:25 asau Exp $
+# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:07 wiz Exp $
 #
 
 DISTNAME=	wmphoto-0.3a
@@ -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/graphics/xli/Makefile b/graphics/xli/Makefile
index 9450a1c205b..c02f1b45c2d 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2012/10/06 14:11:26 asau Exp $
+# $NetBSD: Makefile,v 1.43 2012/10/23 10:24:07 wiz Exp $
 
 DISTNAME=	xli-2005-02-27
 PKGNAME=	xli-1.17.0
@@ -17,5 +17,4 @@ INSTALLATION_DIRS+=	lib/X11/app-defaults
 .include "../../graphics/png/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/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index c3ecd8e8829..6549337c19f 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2012/10/06 14:11:26 asau Exp $
+# $NetBSD: Makefile,v 1.71 2012/10/23 10:24:07 wiz Exp $
 
 DISTNAME=	xpaint-2.7.8.1
 PKGREVISION=	8
@@ -45,5 +45,4 @@ pre-configure:
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/Xaw3d/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"