summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorwiz <wiz>2012-10-23 10:24:02 +0000
committerwiz <wiz>2012-10-23 10:24:02 +0000
commitf58a58fbe2edf90905490a6b3a7223e6294532a6 (patch)
tree892072fafe7eefd7f4adc55fc610517564655d57 /wm
parent8ed522076bba77f74a562b0e15964978ce1375cd (diff)
downloadpkgsrc-f58a58fbe2edf90905490a6b3a7223e6294532a6.tar.gz
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).
Diffstat (limited to 'wm')
-rw-r--r--wm/9wm/Makefile4
-rw-r--r--wm/aewm++/Makefile3
-rw-r--r--wm/amaterus/Makefile3
-rw-r--r--wm/amiwm/Makefile3
-rw-r--r--wm/ctwm/Makefile3
-rw-r--r--wm/cwm/Makefile3
-rw-r--r--wm/enlightenment/Makefile3
-rw-r--r--wm/evilwm/Makefile3
-rw-r--r--wm/fluxbox/Makefile3
-rw-r--r--wm/fvwm-devel/Makefile3
-rw-r--r--wm/fvwm/Makefile3
-rw-r--r--wm/fvwm1/Makefile3
-rw-r--r--wm/golem/Makefile3
-rw-r--r--wm/icewm/Makefile3
-rw-r--r--wm/larswm/Makefile3
-rw-r--r--wm/lwm/Makefile3
-rw-r--r--wm/mlvwm/Makefile3
-rw-r--r--wm/notion/Makefile3
-rw-r--r--wm/obpager/Makefile3
-rw-r--r--wm/olvwm/Makefile3
-rw-r--r--wm/oroborus/Makefile3
-rw-r--r--wm/piewm/Makefile3
-rw-r--r--wm/tvtwm/Makefile3
-rw-r--r--wm/twm/Makefile3
-rw-r--r--wm/vtwm/Makefile3
-rw-r--r--wm/w9wm/Makefile3
-rw-r--r--wm/waimea/Makefile3
-rw-r--r--wm/wampager/Makefile3
-rw-r--r--wm/windowlab/Makefile3
-rw-r--r--wm/windowmaker/Makefile3
-rw-r--r--wm/wm2/Makefile3
-rw-r--r--wm/wmii/Makefile3
-rw-r--r--wm/wmx/Makefile.common3
33 files changed, 33 insertions, 67 deletions
diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile
index c3ac1b8e979..3cf3cd15004 100644
--- a/wm/9wm/Makefile
+++ b/wm/9wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/08 12:42:17 asau Exp $
+# $NetBSD: Makefile,v 1.17 2012/10/23 10:24:13 wiz Exp $
DISTNAME= 9wm-1.1
PKGREVISION= 2
@@ -14,6 +14,4 @@ WRKSRC= ${WRKDIR}
USE_IMAKE= yes
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/aewm++/Makefile b/wm/aewm++/Makefile
index 04d4120719e..0a281eb0a99 100644
--- a/wm/aewm++/Makefile
+++ b/wm/aewm++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/08 12:42:17 asau Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/23 10:24:13 wiz Exp $
#
DISTNAME= aewm++-1.0.24
@@ -16,5 +16,4 @@ USE_LANGUAGES= c c++
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile
index a6c21354faf..578ad6a8c1d 100644
--- a/wm/amaterus/Makefile
+++ b/wm/amaterus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/08 12:42:17 asau Exp $
+# $NetBSD: Makefile,v 1.22 2012/10/23 10:24:13 wiz Exp $
DISTNAME= amaterus-0.34.1
PKGREVISION= 6
@@ -19,6 +19,5 @@ post-install:
.include "../../textproc/libxml/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index 9c86ae530ad..f31bb2a38c3 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/10/08 12:42:17 asau Exp $
+# $NetBSD: Makefile,v 1.27 2012/10/23 10:24:13 wiz Exp $
#
DISTNAME= amiwm0.20pl48
@@ -39,5 +39,4 @@ INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index acec515bb25..d9d90a4495b 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/10/08 12:42:19 asau Exp $
+# $NetBSD: Makefile,v 1.30 2012/10/23 10:24:13 wiz Exp $
#
DISTNAME= ctwm-3.8a
@@ -45,5 +45,4 @@ pre-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/wm/cwm/Makefile b/wm/cwm/Makefile
index 6871ed7f0b6..d950c40436c 100644
--- a/wm/cwm/Makefile
+++ b/wm/cwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/08 12:42:19 asau Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/23 10:24:13 wiz Exp $
#
DISTNAME= cwm-3
@@ -18,5 +18,4 @@ LDFLAGS.DragonFly+= -lfontconfig
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index e6567bcbf58..8ebe2c1c1f9 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2012/10/08 12:42:19 asau Exp $
+# $NetBSD: Makefile,v 1.54 2012/10/23 10:24:13 wiz Exp $
DISTNAME= e16-0.16.8.8
PKGNAME= ${DISTNAME:S/e16/enlightenment/}
@@ -55,6 +55,5 @@ post-install:
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile
index 5033e075073..46f61fec51b 100644
--- a/wm/evilwm/Makefile
+++ b/wm/evilwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2012/10/08 12:42:19 asau Exp $
+# $NetBSD: Makefile,v 1.33 2012/10/23 10:24:13 wiz Exp $
#
DISTNAME= evilwm-1.1.0
@@ -23,5 +23,4 @@ do-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index f1a47e98d4a..896b221f7b5 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2012/10/08 12:42:19 asau Exp $
+# $NetBSD: Makefile,v 1.58 2012/10/23 10:24:13 wiz Exp $
#
DISTNAME= fluxbox-1.3.2
@@ -36,5 +36,4 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXpm/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/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 37a3a6f0ed7..029b1ad462d 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2012/10/08 12:42:20 asau Exp $
+# $NetBSD: Makefile,v 1.41 2012/10/23 10:24:14 wiz Exp $
DISTNAME= fvwm-${FVWM_VER}
PKGREVISION= 3
@@ -71,5 +71,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/wm/fvwm/Makefile b/wm/fvwm/Makefile
index 592b40334ee..97a6de06f5b 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/08 12:42:20 asau Exp $
+# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:14 wiz Exp $
DISTNAME= fvwm-${FVWM_VER}
PKGREVISION= 5
@@ -73,5 +73,4 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXinerama/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/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index 53f2cad8e5f..0524c1202e4 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/08 12:42:20 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:14 wiz Exp $
DISTNAME= fvwm-1.24r
PKGNAME= ${DISTNAME:S/fvwm/fvwm1/}
@@ -51,5 +51,4 @@ post-install:
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xbitmaps/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/golem/Makefile b/wm/golem/Makefile
index 0d9b5993479..a0c760aff89 100644
--- a/wm/golem/Makefile
+++ b/wm/golem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/10/08 12:42:20 asau Exp $
+# $NetBSD: Makefile,v 1.31 2012/10/23 10:24:14 wiz Exp $
#
DISTNAME= golem-0.0.5
@@ -58,5 +58,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/wm/icewm/Makefile b/wm/icewm/Makefile
index b140f08146d..e46a2ce08d8 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2011/11/01 06:02:42 sbd Exp $
+# $NetBSD: Makefile,v 1.42 2012/10/23 10:24:14 wiz Exp $
PKGREVISION= 2
COMMENT= Small, fast and light-weight window manager
@@ -13,7 +13,6 @@ CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm}
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXt/buildlink3.mk"
diff --git a/wm/larswm/Makefile b/wm/larswm/Makefile
index bad383d6ace..a4a81809a4c 100644
--- a/wm/larswm/Makefile
+++ b/wm/larswm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 12:42:21 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:14 wiz Exp $
#
DISTNAME= larswm-7.5.3
@@ -39,5 +39,4 @@ post-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/lwm/Makefile b/wm/lwm/Makefile
index 95ba7562cbb..e6c3a898e6a 100644
--- a/wm/lwm/Makefile
+++ b/wm/lwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/08 12:42:21 asau Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:14 wiz Exp $
DISTNAME= lwm-1.2.1
PKGREVISION= 1
@@ -13,5 +13,4 @@ USE_IMAKE= YES
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/mlvwm/Makefile b/wm/mlvwm/Makefile
index 3599344433a..19123041e86 100644
--- a/wm/mlvwm/Makefile
+++ b/wm/mlvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/08 12:42:21 asau Exp $
+# $NetBSD: Makefile,v 1.11 2012/10/23 10:24:14 wiz Exp $
#
DISTNAME= mlvwm091
@@ -33,5 +33,4 @@ SUBST_MESSAGE.xpm= Fixing configuration file.
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/notion/Makefile b/wm/notion/Makefile
index c179208e78e..e7b2b441a39 100644
--- a/wm/notion/Makefile
+++ b/wm/notion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 12:42:22 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:14 wiz Exp $
#
DISTNAME= notion-3-2012042300-src
@@ -57,7 +57,6 @@ post-install:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../lang/lua/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
diff --git a/wm/obpager/Makefile b/wm/obpager/Makefile
index f3598685775..be918ea1138 100644
--- a/wm/obpager/Makefile
+++ b/wm/obpager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/08 12:42:22 asau Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/23 10:24:14 wiz Exp $
#
DISTNAME= obpager-1.8
@@ -24,5 +24,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/wm/olvwm/Makefile b/wm/olvwm/Makefile
index 76303a95c69..f29b6b315db 100644
--- a/wm/olvwm/Makefile
+++ b/wm/olvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/08 12:42:22 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:15 wiz Exp $
#
DISTNAME= olvwm4.src4
@@ -21,6 +21,5 @@ USE_IMAKE= yes
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xview-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile
index 8e123cf090e..23a96c90c51 100644
--- a/wm/oroborus/Makefile
+++ b/wm/oroborus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/08 12:42:22 asau Exp $
+# $NetBSD: Makefile,v 1.19 2012/10/23 10:24:15 wiz Exp $
#
DISTNAME= oroborus_2.0.12-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/wm/piewm/Makefile b/wm/piewm/Makefile
index 2148fc74534..f7b8b2fdcc6 100644
--- a/wm/piewm/Makefile
+++ b/wm/piewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/08 12:42:22 asau Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:15 wiz Exp $
DISTNAME= piewm-1.04
CATEGORIES= wm
@@ -16,6 +16,5 @@ USE_TOOLS+= lex yacc
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xbitmaps/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile
index 10b0b4a146e..8e08fe0e7e3 100644
--- a/wm/tvtwm/Makefile
+++ b/wm/tvtwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/08 12:42:23 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:15 wiz Exp $
DISTNAME= tvtwm.pl11
PKGNAME= tvtwm-11
@@ -18,5 +18,4 @@ USE_TOOLS+= lex yacc
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xbitmaps/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/twm/Makefile b/wm/twm/Makefile
index 03db549aed4..5c7325c4455 100644
--- a/wm/twm/Makefile
+++ b/wm/twm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/08 12:42:23 asau Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/23 10:24:15 wiz Exp $
DISTNAME= twm-1.0.7
CATEGORIES= x11 wm
@@ -19,5 +19,4 @@ CONFIGURE_ENV+= ac_cv_prog_YACC=yacc
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xbitmaps/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/vtwm/Makefile b/wm/vtwm/Makefile
index c8a01d4f9d7..b21fda9e898 100644
--- a/wm/vtwm/Makefile
+++ b/wm/vtwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/08 12:42:24 asau Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/23 10:24:15 wiz Exp $
#
DISTNAME= vtwm-5.4.7
@@ -20,5 +20,4 @@ USE_TOOLS+= flex yacc
.include "../../x11/libXmu/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/wm/w9wm/Makefile b/wm/w9wm/Makefile
index a6fcba65171..5fb40fbd744 100644
--- a/wm/w9wm/Makefile
+++ b/wm/w9wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/08 12:42:24 asau Exp $
+# $NetBSD: Makefile,v 1.7 2012/10/23 10:24:15 wiz Exp $
DISTNAME= w9wm-0.4.2
PKGREVISION= 1
@@ -12,5 +12,4 @@ WRKSRC= ${WRKDIR}/${DISTNAME}.orig
USE_IMAKE= yes
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 81a4ed560c4..c95d3ab62f1 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2012/10/08 12:42:24 asau Exp $
+# $NetBSD: Makefile,v 1.42 2012/10/23 10:24:15 wiz Exp $
#
DISTNAME= waimea-0.4.0
@@ -27,7 +27,6 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.else
. if !exists(${X11BASE}/include/X11/extensions/Xinerama.h)
CONFIGURE_ARGS+= --disable-xinerama
diff --git a/wm/wampager/Makefile b/wm/wampager/Makefile
index 51175b11741..5b611d12f11 100644
--- a/wm/wampager/Makefile
+++ b/wm/wampager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 12:42:24 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:15 wiz Exp $
#
DISTNAME= wampager-0.9.1
@@ -25,5 +25,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/wm/windowlab/Makefile b/wm/windowlab/Makefile
index b5038f0ae85..2a6e60ce5af 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/08 12:42:24 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:15 wiz Exp $
#
DISTNAME= windowlab-1.33
@@ -25,5 +25,4 @@ post-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index ad03717ee01..c97069afe4f 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2012/10/08 12:42:24 asau Exp $
+# $NetBSD: Makefile,v 1.95 2012/10/23 10:24:16 wiz Exp $
DISTNAME= WindowMaker-0.92.0
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
@@ -110,5 +110,4 @@ post-install:
.include "../../x11/libXpm/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index 42e361d1686..e0769b291d1 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/08 12:42:24 asau Exp $
+# $NetBSD: Makefile,v 1.22 2012/10/23 10:24:16 wiz Exp $
DISTNAME= wm2-4
PKGNAME= wm2-4.0
@@ -25,5 +25,4 @@ do-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index 49fe78a82b4..289c57a3c8e 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/10/08 12:42:25 asau Exp $
+# $NetBSD: Makefile,v 1.25 2012/10/23 10:24:16 wiz Exp $
DISTNAME= wmii-3.6
PKGREVISION= 4
@@ -38,7 +38,6 @@ post-build:
${TBL} ${WRKSRC}/man/wmii.tbl > ${WRKSRC}/man/wmii.1
.include "../../devel/libixp/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
index 4052e5dc75b..5a0b97852b6 100644
--- a/wm/wmx/Makefile.common
+++ b/wm/wmx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2010/02/12 19:59:29 joerg Exp $
+# $NetBSD: Makefile.common,v 1.22 2012/10/23 10:24:16 wiz Exp $
DISTNAME= wmx-6
WMX_VERS= 6.0
@@ -36,4 +36,3 @@ BUILDLINK_DEPMETHOD.libXt+= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"