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

15 files changed, 15 insertions, 30 deletions

diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile
index e95e31e0a2b..a62d8efb605 100644
--- a/time/asclock-gtk/Makefile
+++ b/time/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/10/08 13:04:16 asau Exp $
+# $NetBSD: Makefile,v 1.30 2012/10/23 10:24:11 wiz Exp $
 #
 
 DISTNAME=	asclock-gtk-2.1.10beta
@@ -38,5 +38,4 @@ do-install:
 .include "../../x11/gtk/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/time/asclock-xlib/Makefile b/time/asclock-xlib/Makefile
index f69b5553c7e..3c1d6a57e01 100644
--- a/time/asclock-xlib/Makefile
+++ b/time/asclock-xlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/08 13:04:16 asau Exp $
+# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:11 wiz Exp $
 #
 
 DISTNAME=	asclock-xlib-2.0.11
@@ -34,5 +34,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/time/asclock/Makefile b/time/asclock/Makefile
index 85f8bc32850..5cf54206135 100644
--- a/time/asclock/Makefile
+++ b/time/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/10/08 13:04:16 asau Exp $
+# $NetBSD: Makefile,v 1.32 2012/10/23 10:24:11 wiz Exp $
 
 DISTNAME=	asclock-classic-1.0
 PKGNAME=	asclock-1.0
@@ -67,5 +67,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/time/lmclock/Makefile b/time/lmclock/Makefile
index 8b9a7e14fba..d60a95868ad 100644
--- a/time/lmclock/Makefile
+++ b/time/lmclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/08 13:04:20 asau Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/23 10:24:11 wiz Exp $
 #
 
 DISTNAME=	lmclock-1.2
@@ -16,5 +16,4 @@ post-extract:
 USE_IMAKE=		YES
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/pclock/Makefile b/time/pclock/Makefile
index 07edf255875..f97028f36c7 100644
--- a/time/pclock/Makefile
+++ b/time/pclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 13:04:27 asau Exp $
+# $NetBSD: Makefile,v 1.16 2012/10/23 10:24:11 wiz Exp $
 #
 
 DISTNAME=	pclock_0.13.1.orig
@@ -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/time/swisswatch/Makefile b/time/swisswatch/Makefile
index c2679b37bff..9f871a6203f 100644
--- a/time/swisswatch/Makefile
+++ b/time/swisswatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/08 13:04:29 asau Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/23 10:24:11 wiz Exp $
 
 DISTNAME=	swisswatch-0.06
 PKGREVISION=	2
@@ -14,5 +14,4 @@ USE_IMAKE=	yes
 .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/time/wmCalClock/Makefile b/time/wmCalClock/Makefile
index 8f7b417590a..787fa0b119e 100644
--- a/time/wmCalClock/Makefile
+++ b/time/wmCalClock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/08 13:04:30 asau Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:12 wiz Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
@@ -30,5 +30,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/time/wmclockmon/Makefile b/time/wmclockmon/Makefile
index 4359938a079..0093d3cb167 100644
--- a/time/wmclockmon/Makefile
+++ b/time/wmclockmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/08 13:04:30 asau Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/23 10:24:12 wiz Exp $
 #
 
 DISTNAME=	wmclockmon-0.8.1
@@ -15,5 +15,4 @@ GNU_CONFIGURE=	yes
 .include "../../x11/gtk/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/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index daf486fa623..6c0165c5d49 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/08 13:04:30 asau Exp $
+# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:12 wiz Exp $
 
 DISTNAME=	wmMoonClock-1.27
 PKGREVISION=	1
@@ -25,5 +25,4 @@ INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmtime/Makefile b/time/wmtime/Makefile
index fc28f4ad6bb..a4c1cfea56a 100644
--- a/time/wmtime/Makefile
+++ b/time/wmtime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/08 13:04:30 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:12 wiz Exp $
 #
 
 DISTNAME=	wmtime-1.0b2
@@ -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/time/wmzcalock/Makefile b/time/wmzcalock/Makefile
index a40cd5702b5..92d9710406e 100644
--- a/time/wmzcalock/Makefile
+++ b/time/wmzcalock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/08 13:04:30 asau Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:12 wiz Exp $
 #
 
 DISTNAME=		wmzcalock-0.1
@@ -29,5 +29,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/time/xbeats/Makefile b/time/xbeats/Makefile
index cdb30fe3546..2ab5eaf2a1b 100644
--- a/time/xbeats/Makefile
+++ b/time/xbeats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 13:04:31 asau Exp $
+# $NetBSD: Makefile,v 1.16 2012/10/23 10:24:12 wiz Exp $
 #
 
 DISTNAME=	xbeats-0.4
@@ -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/time/xdkcal/Makefile b/time/xdkcal/Makefile
index c51d0c6dc09..45576a5c0db 100644
--- a/time/xdkcal/Makefile
+++ b/time/xdkcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/08 13:04:31 asau Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/23 10:24:12 wiz Exp $
 #
 
 DISTNAME=	xdkcal-0.9d
@@ -21,5 +21,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/xdkcal.1x ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xdkcal.1
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xonclock/Makefile b/time/xonclock/Makefile
index 5ba456440c1..c6bfc44d283 100644
--- a/time/xonclock/Makefile
+++ b/time/xonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 13:04:31 asau Exp $
+# $NetBSD: Makefile,v 1.16 2012/10/23 10:24:12 wiz Exp $
 #
 
 DISTNAME=	xonclock-0.0.9.4
@@ -25,5 +25,4 @@ LDFLAGS.SunOS+=		-lm -lrt
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xtu/Makefile b/time/xtu/Makefile
index 18b9146e812..093f218a65c 100644
--- a/time/xtu/Makefile
+++ b/time/xtu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/08 13:04:32 asau Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/23 10:24:12 wiz Exp $
 #
 
 DISTNAME=	xtu-1.3
@@ -21,5 +21,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"