summaryrefslogtreecommitdiff
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
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).
-rw-r--r--audio/mixer.app/Makefile3
-rw-r--r--audio/wmmixer/Makefile3
-rw-r--r--audio/wmmp/Makefile3
-rw-r--r--audio/wmmp3/Makefile3
-rw-r--r--audio/wmsmixer/Makefile3
-rw-r--r--audio/wmusic/Makefile3
-rw-r--r--biology/rasmol/Makefile3
-rw-r--r--devel/SDL/Makefile3
-rw-r--r--devel/libdockapp/Makefile3
-rw-r--r--devel/libmatchbox/Makefile3
-rw-r--r--devel/libmatchbox/buildlink3.mk3
-rw-r--r--emulators/BasiliskII/options.mk3
-rw-r--r--emulators/arcem/Makefile3
-rw-r--r--emulators/e-uae/options.mk3
-rw-r--r--emulators/fmsx/Makefile3
-rw-r--r--emulators/gnuboy/Makefile3
-rw-r--r--emulators/kegs/Makefile3
-rw-r--r--emulators/snes9x/Makefile3
-rw-r--r--emulators/x48/Makefile3
-rw-r--r--emulators/xcopilot/Makefile3
-rw-r--r--emulators/xhomer/Makefile3
-rw-r--r--emulators/xm7/Makefile3
-rw-r--r--games/abuse/Makefile3
-rw-r--r--games/maelstrom-x11/Makefile3
-rw-r--r--games/netmaze/Makefile3
-rw-r--r--games/quake/Makefile3
-rw-r--r--games/quake2forge/Makefile3
-rw-r--r--games/quake6/Makefile3
-rw-r--r--games/quakeforge/Makefile3
-rw-r--r--games/tyrquake/Makefile3
-rw-r--r--games/wormz/Makefile3
-rw-r--r--games/xdoom/Makefile3
-rw-r--r--games/xfreecell/Makefile3
-rw-r--r--games/xjig/Makefile3
-rwxr-xr-xgraphics/GraphicsMagick/options.mk3
-rw-r--r--graphics/ImageMagick/options.mk3
-rw-r--r--graphics/Mesa/Makefile.common3
-rw-r--r--graphics/cqcam/Makefile3
-rw-r--r--graphics/evas-software-x11/Makefile3
-rw-r--r--graphics/fnlib/Makefile3
-rw-r--r--graphics/imlib/Makefile3
-rw-r--r--graphics/imlib2/options.mk3
-rw-r--r--graphics/ivtools/Makefile3
-rw-r--r--graphics/libggi/Makefile3
-rw-r--r--graphics/libggi/buildlink3.mk3
-rw-r--r--graphics/magicpoint/Makefile3
-rw-r--r--graphics/mgl/Makefile3
-rw-r--r--graphics/mpeg2codec/Makefile3
-rw-r--r--graphics/plotutils/options.mk3
-rw-r--r--graphics/skencil/Makefile3
-rw-r--r--graphics/urt/Makefile3
-rw-r--r--graphics/wmphoto/Makefile3
-rw-r--r--graphics/xli/Makefile3
-rw-r--r--graphics/xpaint/Makefile3
-rw-r--r--inputmethod/uim/options.mk3
-rw-r--r--lang/openjdk7/Makefile3
-rw-r--r--lang/squeak-vm/Makefile3
-rw-r--r--mail/wmbiff/Makefile3
-rw-r--r--mail/wmmail/Makefile3
-rw-r--r--mail/xmailbox/Makefile3
-rw-r--r--mbone/vic-devel/Makefile3
-rw-r--r--mbone/vic/Makefile3
-rw-r--r--multimedia/flashplayer/Makefile3
-rw-r--r--multimedia/fxtv/Makefile3
-rw-r--r--multimedia/mpeg_play/Makefile3
-rw-r--r--multimedia/ogle/Makefile3
-rw-r--r--multimedia/transcode/Makefile3
-rw-r--r--multimedia/xanim/Makefile3
-rw-r--r--multimedia/xawtv/Makefile3
-rw-r--r--multimedia/xine-lib/Makefile3
-rw-r--r--multimedia/xine-ui/Makefile3
-rw-r--r--net/synergy/Makefile3
-rw-r--r--net/synergy1.2/Makefile3
-rw-r--r--net/vncviewer/Makefile3
-rw-r--r--net/wmget/Makefile3
-rw-r--r--net/wminet/Makefile3
-rw-r--r--net/wmnd/Makefile3
-rw-r--r--net/wmnet/Makefile3
-rw-r--r--net/wmpload/Makefile3
-rw-r--r--pkgtools/x11-links/xorg.mk3
-rw-r--r--print/mupdf/Makefile3
-rw-r--r--sysutils/idesk/Makefile3
-rw-r--r--sysutils/lavaps/Makefile3
-rw-r--r--sysutils/torsmo/Makefile3
-rw-r--r--sysutils/wmSMPmon/Makefile3
-rw-r--r--sysutils/wmcpuload/Makefile3
-rw-r--r--sysutils/wmmemmon/Makefile3
-rw-r--r--sysutils/xnc/Makefile3
-rw-r--r--time/asclock-gtk/Makefile3
-rw-r--r--time/asclock-xlib/Makefile3
-rw-r--r--time/asclock/Makefile3
-rw-r--r--time/lmclock/Makefile3
-rw-r--r--time/pclock/Makefile3
-rw-r--r--time/swisswatch/Makefile3
-rw-r--r--time/wmCalClock/Makefile3
-rw-r--r--time/wmclockmon/Makefile3
-rw-r--r--time/wmmoonclock/Makefile3
-rw-r--r--time/wmtime/Makefile3
-rw-r--r--time/wmzcalock/Makefile3
-rw-r--r--time/xbeats/Makefile3
-rw-r--r--time/xdkcal/Makefile3
-rw-r--r--time/xonclock/Makefile3
-rw-r--r--time/xtu/Makefile3
-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
-rw-r--r--x11/Xaw-Xpm/Makefile3
-rw-r--r--x11/Xaw3d/Makefile3
-rw-r--r--x11/desklaunch/Makefile3
-rw-r--r--x11/ede/Makefile3
-rw-r--r--x11/efltk/Makefile3
-rw-r--r--x11/eterm/Makefile3
-rw-r--r--x11/fbdesk/Makefile3
-rw-r--r--x11/fltk/Makefile3
-rw-r--r--x11/fltk13/Makefile3
-rw-r--r--x11/fltk2/Makefile3
-rw-r--r--x11/fox/Makefile3
-rw-r--r--x11/fox/buildlink3.mk3
-rw-r--r--x11/gnustep-back/Makefile3
-rw-r--r--x11/gtk/Makefile3
-rw-r--r--x11/gtk2/options.mk3
-rw-r--r--x11/gtk3/options.mk3
-rw-r--r--x11/imwheel/Makefile3
-rw-r--r--x11/lbxproxy/Makefile3
-rw-r--r--x11/lesstif/Makefile3
-rw-r--r--x11/libAppleWM/Makefile3
-rw-r--r--x11/libXScrnSaver/Makefile3
-rw-r--r--x11/libXTrap/Makefile3
-rw-r--r--x11/libXaw/Makefile3
-rw-r--r--x11/libXaw/buildlink3.mk3
-rw-r--r--x11/libXevie/Makefile3
-rw-r--r--x11/libXinerama/Makefile3
-rw-r--r--x11/libXinerama/buildlink3.mk3
-rw-r--r--x11/libXmu/Makefile3
-rw-r--r--x11/libXp/Makefile3
-rw-r--r--x11/libXpm/Makefile3
-rw-r--r--x11/libXprintUtil/Makefile3
-rw-r--r--x11/libXrandr/Makefile3
-rw-r--r--x11/libXres/Makefile3
-rw-r--r--x11/libXtst/buildlink3.mk3
-rw-r--r--x11/libXv/Makefile3
-rw-r--r--x11/libXv/buildlink3.mk3
-rw-r--r--x11/libXvMC/Makefile3
-rw-r--r--x11/libXxf86dga/Makefile3
-rw-r--r--x11/libXxf86misc/Makefile3
-rw-r--r--x11/libXxf86vm/Makefile3
-rw-r--r--x11/liboldXrandr/Makefile3
-rw-r--r--x11/modular-xorg-server/Makefile3
-rw-r--r--x11/neXtaw/Makefile3
-rw-r--r--x11/numlockx/Makefile3
-rw-r--r--x11/oneko/Makefile3
-rw-r--r--x11/openmotif/Makefile3
-rw-r--r--x11/openmotif/buildlink3.mk3
-rw-r--r--x11/space_dapp/Makefile3
-rw-r--r--x11/speyes/Makefile3
-rw-r--r--x11/wmavgload/Makefile3
-rw-r--r--x11/wmfire/Makefile3
-rw-r--r--x11/wmfstatus/Makefile3
-rw-r--r--x11/wmweather/Makefile3
-rw-r--r--x11/x11perf/Makefile3
-rw-r--r--x11/x11vnc/options.mk3
-rw-r--r--x11/xauth/Makefile3
-rw-r--r--x11/xdesktopwaves/Makefile3
-rw-r--r--x11/xdpyinfo/Makefile3
-rw-r--r--x11/xeyes/Makefile4
-rw-r--r--x11/xgamma/Makefile3
-rw-r--r--x11/xlupe/Makefile3
-rw-r--r--x11/xmindpath/Makefile3
-rw-r--r--x11/xosd/Makefile.common3
-rw-r--r--x11/xpenguins/Makefile3
-rw-r--r--x11/xplsprinters/Makefile3
-rw-r--r--x11/xpmroot/Makefile3
-rw-r--r--x11/xprehashprinterlist/Makefile3
-rw-r--r--x11/xrestop/Makefile3
-rw-r--r--x11/xscreensaver/Makefile3
-rw-r--r--x11/xset/Makefile3
-rw-r--r--x11/xsetmode/Makefile3
-rw-r--r--x11/xsetpointer/Makefile3
-rw-r--r--x11/xsnow/Makefile3
-rw-r--r--x11/xteddy/Makefile3
-rw-r--r--x11/xteddy2/Makefile3
-rw-r--r--x11/xvidcap/Makefile3
-rw-r--r--x11/xview-clients/Makefile3
-rw-r--r--x11/xwininfo/Makefile3
-rw-r--r--x11/xxkb/Makefile3
215 files changed, 215 insertions, 432 deletions
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 5fa63d11484..c40aa7c45b9 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/02 23:47:57 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:02 wiz Exp $
#
DISTNAME= Mixer.app-1.8.0
@@ -27,6 +27,5 @@ do-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index 733d5498942..afeb3bd52ac 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/02 23:48:12 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:02 wiz Exp $
#
DISTNAME= wmmixer-1.0-beta1
@@ -24,6 +24,5 @@ pre-build:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmmp/Makefile b/audio/wmmp/Makefile
index 7d5b557a8a8..b702d874765 100644
--- a/audio/wmmp/Makefile
+++ b/audio/wmmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/02 23:48:13 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:02 wiz Exp $
DISTNAME= WMmp-0.10.0
CATEGORIES= audio
@@ -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/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index a70b555dbc2..dece242dd14 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/02 23:48:13 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:02 wiz Exp $
DISTNAME= wmmp3-0.12
PKGREVISION= 3
@@ -28,5 +28,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/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile
index fe3fc3ba778..76bffdc534d 100644
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/02 23:48:13 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:02 wiz Exp $
#
DISTNAME= wmsmixer-0.5.1
@@ -29,6 +29,5 @@ post-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index 55a7d1899e1..52c7d613cee 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/02 23:48:13 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:02 wiz Exp $
DISTNAME= wmusic-1.5.0
PKGREVISION= 5
@@ -23,5 +23,4 @@ do-install:
.include "../../audio/xmms/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/biology/rasmol/Makefile b/biology/rasmol/Makefile
index e9e4c7262ce..4962da09527 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2012/09/11 20:32:14 asau Exp $
+# $NetBSD: Makefile,v 1.33 2012/10/23 10:24:02 wiz Exp $
DISTNAME= RasMol_2.7.3
PKGNAME= rasmol-2.7.3
@@ -59,5 +59,4 @@ post-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index f94d867c5a4..a9b2122d967 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2012/09/15 10:04:04 obache Exp $
+# $NetBSD: Makefile,v 1.107 2012/10/23 10:24:02 wiz Exp $
DISTNAME= SDL-1.2.15
PKGREVISION= 4
@@ -57,7 +57,6 @@ CONFIGURE_ARGS+= --disable-x11-shared
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-x
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile
index a2270f8ea70..c3cc65e4f8d 100644
--- a/devel/libdockapp/Makefile
+++ b/devel/libdockapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2011/05/04 19:23:08 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2012/10/23 10:24:03 wiz Exp $
#
DISTNAME= libdockapp-0.6.2
@@ -26,5 +26,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/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile
index 42e01cf7149..150058a5599 100644
--- a/devel/libmatchbox/Makefile
+++ b/devel/libmatchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2011/11/01 06:00:59 sbd Exp $
+# $NetBSD: Makefile,v 1.24 2012/10/23 10:24:03 wiz Exp $
#
DISTNAME= libmatchbox-1.9
@@ -21,6 +21,5 @@ USE_TOOLS+= pkg-config
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk
index 1d4a4ec5fe9..b9546a65bca 100644
--- a/devel/libmatchbox/buildlink3.mk
+++ b/devel/libmatchbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2011/11/01 06:00:59 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2012/10/23 10:24:03 wiz Exp $
BUILDLINK_TREE+= libmatchbox
@@ -13,7 +13,6 @@ BUILDLINK_PKGSRCDIR.libmatchbox?= ../../devel/libmatchbox
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.endif # LIBMATCHBOX_BUILDLINK3_MK
BUILDLINK_TREE+= -libmatchbox
diff --git a/emulators/BasiliskII/options.mk b/emulators/BasiliskII/options.mk
index d5f4e31a1d5..d436263588a 100644
--- a/emulators/BasiliskII/options.mk
+++ b/emulators/BasiliskII/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2007/06/12 12:51:07 joerg Exp $
+# $NetBSD: options.mk,v 1.6 2012/10/23 10:24:03 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.BasiliskII
PKG_SUPPORTED_OPTIONS= esound gtk sdl
@@ -33,5 +33,4 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.endif
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
index 0008e27f6b1..083ca05fb8f 100644
--- a/emulators/arcem/Makefile
+++ b/emulators/arcem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/12 08:00:03 marino Exp $
+# $NetBSD: Makefile,v 1.22 2012/10/23 10:24:03 wiz Exp $
#
DISTNAME= arcem-1.00-src
@@ -46,5 +46,4 @@ post-install:
${DESTDIR}${PREFIX}/share/arcem/hexcmos
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/e-uae/options.mk b/emulators/e-uae/options.mk
index 6a241c76708..93a7090f105 100644
--- a/emulators/e-uae/options.mk
+++ b/emulators/e-uae/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2010/06/14 06:30:24 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2012/10/23 10:24:03 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.e-uae
PKG_SUPPORTED_OPTIONS= gtk sdl x11
@@ -28,5 +28,4 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.endif
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index ffcd2b29464..cb4d729bba8 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/10/03 12:55:12 asau Exp $
+# $NetBSD: Makefile,v 1.29 2012/10/23 10:24:03 wiz Exp $
DISTNAME= fMSX351
PKGNAME= fmsx-3.5.1
@@ -62,6 +62,5 @@ do-install:
.include "../../devel/zlib/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/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index 1570f9be55f..e9e6727e81e 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/03 12:55:13 asau Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:03 wiz Exp $
DISTNAME= gnuboy-1.0.3
PKGREVISION= 2
@@ -28,5 +28,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/emulators/kegs/Makefile b/emulators/kegs/Makefile
index 36fc8d35762..a9ee27dea72 100644
--- a/emulators/kegs/Makefile
+++ b/emulators/kegs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/03 21:56:01 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/23 10:24:03 wiz Exp $
#
DISTNAME= kegs.0.91
@@ -52,5 +52,4 @@ do-install:
.include "../../x11/xproto/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/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index d618133052e..bb76a035115 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/10/03 12:55:18 asau Exp $
+# $NetBSD: Makefile,v 1.50 2012/10/23 10:24:04 wiz Exp $
SNESVER= 1.43
DISTNAME= snes9x-${SNESVER}-src
@@ -92,7 +92,6 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index c5528f2f388..c003b3f8e54 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/03 12:55:21 asau Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/23 10:24:04 wiz Exp $
#
DISTNAME= x48_041
@@ -26,5 +26,4 @@ post-install:
${DESTDIR}${PREFIX}/share/doc/x48/romdump
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile
index e9dba5e0eac..568ca7032db 100644
--- a/emulators/xcopilot/Makefile
+++ b/emulators/xcopilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/03 12:55:21 asau Exp $
+# $NetBSD: Makefile,v 1.19 2012/10/23 10:24:04 wiz Exp $
#
DISTNAME= xcopilot-0.6.6
@@ -22,5 +22,4 @@ post-extract:
.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/emulators/xhomer/Makefile b/emulators/xhomer/Makefile
index c3bf2de3321..dcfbc67537f 100644
--- a/emulators/xhomer/Makefile
+++ b/emulators/xhomer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/03 12:55:22 asau Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/23 10:24:04 wiz Exp $
DISTNAME= xhomer-9-16-06
PKGNAME= xhomer-9.16.06
@@ -30,5 +30,4 @@ do-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index ab57dfcaff5..8bdc1261c7c 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/10/03 12:55:22 asau Exp $
+# $NetBSD: Makefile,v 1.31 2012/10/23 10:24:04 wiz Exp $
#
DISTNAME= xm71020s
@@ -37,6 +37,5 @@ do-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index f9198177ac4..a03fe0c5764 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/10/06 11:54:29 asau Exp $
+# $NetBSD: Makefile,v 1.27 2012/10/23 10:24:04 wiz Exp $
DISTNAME= abuse_pd
PKGNAME= abuse-2.0
@@ -27,5 +27,4 @@ post-extract:
&& ${GTAR} xfz ${DISTDIR}/abuse_data.tar.gz
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index 9b12fabcb61..eeb60aa7bcc 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/10/06 11:54:46 asau Exp $
+# $NetBSD: Makefile,v 1.26 2012/10/23 10:24:04 wiz Exp $
DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz
PKGNAME= maelstrom-x11-2.0.6
@@ -55,6 +55,5 @@ post-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/netmaze/Makefile b/games/netmaze/Makefile
index 531c3ba0ded..6a1cddf9912 100644
--- a/games/netmaze/Makefile
+++ b/games/netmaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/06 11:54:48 asau Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/23 10:24:04 wiz Exp $
DISTNAME= netmaze0.81
PKGNAME= netmaze-0.81
@@ -18,5 +18,4 @@ post-patch:
< ${WRKSRC}/Imakefile.bak > ${WRKSRC}/Imakefile
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 56d2adc0598..764edf5e1f1 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2012/10/06 11:54:51 asau Exp $
+# $NetBSD: Makefile,v 1.48 2012/10/23 10:24:04 wiz Exp $
DISTNAME= q1source
PKGNAME= quake-2.30
@@ -57,6 +57,5 @@ do-install:
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 3384290fbc0..a954228819d 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/06 11:54:51 asau Exp $
+# $NetBSD: Makefile,v 1.28 2012/10/23 10:24:04 wiz Exp $
#
DISTNAME= quake2-0.3
@@ -45,7 +45,6 @@ CONFIGURE_ENV+= ac_cv_header_sys_audioio_h=no
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index 0009d62420c..4908269af07 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2012/10/06 11:54:52 asau Exp $
+# $NetBSD: Makefile,v 1.39 2012/10/23 10:24:05 wiz Exp $
DISTNAME= quake-v6-bsd-kame
PKGNAME= quake6-0.0
@@ -40,6 +40,5 @@ CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index e09529bebf9..5c49fbedef7 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/06 11:54:52 asau Exp $
+# $NetBSD: Makefile,v 1.28 2012/10/23 10:24:05 wiz Exp $
DISTNAME= quakeforge-0.5.5
PKGREVISION= 11
@@ -55,7 +55,6 @@ INSTALLATION_DIRS= include/QF/GL include/QF/plugin include/QF/ruamoko/gui
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xf86vidmodeproto/buildlink3.mk"
.include "../../x11/xf86dgaproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
diff --git a/games/tyrquake/Makefile b/games/tyrquake/Makefile
index 43c3540d4db..a24e4b9d5ac 100644
--- a/games/tyrquake/Makefile
+++ b/games/tyrquake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 11:54:57 asau Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/23 10:24:05 wiz Exp $
DISTNAME= tyrquake-0.61
CATEGORIES= games x11
@@ -30,7 +30,6 @@ do-install:
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/wormz/Makefile b/games/wormz/Makefile
index 152aa5f9cc8..5901c313d8e 100644
--- a/games/wormz/Makefile
+++ b/games/wormz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/06 11:54:58 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:05 wiz Exp $
#
DISTNAME= Wormz-1.0b5
@@ -26,5 +26,4 @@ do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} depend
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 4d0cd33f274..907ff909a9d 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/10/06 11:55:00 asau Exp $
+# $NetBSD: Makefile,v 1.50 2012/10/23 10:24:05 wiz Exp $
DISTNAME= linuxdoom-1.10
PKGNAME= xdoom-1.10
@@ -52,6 +52,5 @@ do-install:
${DESTDIR}${PREFIX}/bin/sndserver
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile
index 9aba91627fb..2d1e837b95e 100644
--- a/games/xfreecell/Makefile
+++ b/games/xfreecell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/06 11:55:00 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:05 wiz Exp $
DISTNAME= xfreecell-1.0.5b
PKGREVISION= 2
@@ -22,5 +22,4 @@ NO_CONFIGURE= YES
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index b45463f5f04..be78993a68f 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/06 11:55:01 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/23 10:24:05 wiz Exp $
#
DISTNAME= xjig-2.4
@@ -21,5 +21,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/tina.gif ${DESTDIR}${PREFIX}/lib/xjig
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
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"
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index c4b8db56a3d..540040df60b 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.26 2012/07/22 06:15:22 obache Exp $
+# $NetBSD: options.mk,v 1.27 2012/10/23 10:24:07 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.uim
PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn4 xim
@@ -27,7 +27,6 @@ PLIST_VARS+= anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde kde3 m17nlib ope
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
CONFIGURE_ARGS+= --with-x
PLIST.xim= yes
.else
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index d76d8cfced4..7135230b214 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/10/02 20:11:47 asau Exp $
+# $NetBSD: Makefile,v 1.38 2012/10/23 10:24:07 wiz Exp $
DISTNAME= openjdk-7-fcs-src-b147-27_jun_2011
PKGNAME= openjdk7-1.7.0.147.20110811
@@ -185,6 +185,5 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXtst/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/java-env.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile
index 5238f90033e..775541b3437 100644
--- a/lang/squeak-vm/Makefile
+++ b/lang/squeak-vm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/02 20:11:54 asau Exp $
+# $NetBSD: Makefile,v 1.19 2012/10/23 10:24:08 wiz Exp $
#
SQUEAK_VERSION= 3.11.3.2135
@@ -58,7 +58,6 @@ pre-configure:
.include "../../graphics/glu/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.if $(OSS_TYPE) != "none"
PLIST.oss= yes
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index f538760d6a4..203c61a9ca2 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2012/10/08 12:19:34 asau Exp $
+# $NetBSD: Makefile,v 1.48 2012/10/23 10:24:08 wiz Exp $
DISTNAME= wmbiff-0.4.26
PKGREVISION= 15
@@ -23,5 +23,4 @@ post-install:
.include "../../wm/windowmaker/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/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 7ee7d1880ba..6438882ceb8 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2012/10/08 12:19:34 asau Exp $
+# $NetBSD: Makefile,v 1.37 2012/10/23 10:24:08 wiz Exp $
DISTNAME= WMMail.app-0.64
PKGNAME= wmmail-0.64
@@ -23,5 +23,4 @@ CONFIGURE_ARGS+= --with-PL-incs="-I${LOCALBASE}/include" \
.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/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index d02997c686a..0d7acf2bbef 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/08 12:19:35 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:08 wiz Exp $
#
DISTNAME= xmailbox-2.5
@@ -25,5 +25,4 @@ post-install:
.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/mbone/vic-devel/Makefile b/mbone/vic-devel/Makefile
index 9a10c00f49f..b9a716f3d8a 100644
--- a/mbone/vic-devel/Makefile
+++ b/mbone/vic-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 09:25:50 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:08 wiz Exp $
DISTNAME= vic-2.8ucl1.4.0beta-4337
PKGNAME= vic-devel-2.8.1.4.0beta.4337
@@ -40,7 +40,6 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mbone/common-mml/buildlink3.mk"
.include "../../x11/tk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 620d809ef84..6b798b83377 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2012/10/08 09:25:50 asau Exp $
+# $NetBSD: Makefile,v 1.43 2012/10/23 10:24:08 wiz Exp $
DISTNAME= vicsrc-2.8
PKGNAME= ${DISTNAME:S/src//}
@@ -32,6 +32,5 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/tk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/flashplayer/Makefile b/multimedia/flashplayer/Makefile
index 4c6d17264b2..6c09d5c339d 100644
--- a/multimedia/flashplayer/Makefile
+++ b/multimedia/flashplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/08 09:21:00 asau Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/23 10:24:08 wiz Exp $
#
.include "../../multimedia/libflash/Makefile.common"
@@ -22,5 +22,4 @@ INSTALLATION_DIRS+= bin
.include "../../multimedia/libflash/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 1010247034f..eb43f341799 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/10/08 09:21:01 asau Exp $
+# $NetBSD: Makefile,v 1.31 2012/10/23 10:24:08 wiz Exp $
DISTNAME= fxtv-1.03
PKGREVISION= 19
@@ -42,7 +42,6 @@ pre-configure:
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xf86dgaproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
index 5f9a852d717..a8c9fb6965e 100644
--- a/multimedia/mpeg_play/Makefile
+++ b/multimedia/mpeg_play/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 09:21:09 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:08 wiz Exp $
DISTNAME= mpeg_play-2.4-patched
PKGNAME= mpeg_play-2.4patched
@@ -19,5 +19,4 @@ pre-configure:
${MV} -f ${WRKSRC}/mpeg_play.1 ${WRKSRC}/mpeg_play.man
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index e6a4204b63e..a0ef2cb1a03 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/10/08 09:21:10 asau Exp $
+# $NetBSD: Makefile,v 1.32 2012/10/23 10:24:09 wiz Exp $
DISTNAME= ogle-0.9.2
PKGREVISION= 8
@@ -51,5 +51,4 @@ BUILDLINK_API_DEPENDS.libdvdread+= libdvdread>=4.1.3
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXv/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 7af2b84e6db..6fc93bb447b 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2012/10/10 13:37:25 drochner Exp $
+# $NetBSD: Makefile,v 1.80 2012/10/23 10:24:09 wiz Exp $
DISTNAME= transcode-1.1.7
CATEGORIES= multimedia
@@ -62,7 +62,6 @@ LIBS+= ${LIBOSSAUDIO}
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.endif
.include "../../mk/jpeg.buildlink3.mk"
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index eb16401fe90..aa502576adf 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/08 09:21:15 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/23 10:24:09 wiz Exp $
DISTNAME= xanim2920
PKGNAME= xanim-2.92.0
@@ -55,6 +55,5 @@ post-extract:
.include "../../devel/zlib/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 04ecdca64fc..72f35b2e4f5 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/10/08 09:21:15 asau Exp $
+# $NetBSD: Makefile,v 1.34 2012/10/23 10:24:09 wiz Exp $
#
DISTNAME= xawtv-3.95
@@ -59,7 +59,6 @@ MAKE_FLAGS+= SUID_ROOT= FS_LIBS=-lFS
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 687959d05c9..0ae0e688dc1 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2012/10/08 09:21:15 asau Exp $
+# $NetBSD: Makefile,v 1.109 2012/10/23 10:24:09 wiz Exp $
PKGREVISION= 4
@@ -65,5 +65,4 @@ CONFIGURE_ARGS+= --disable-opengl
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libxcb/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 2613d3537ae..ab3af1b6409 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2012/10/08 09:21:15 asau Exp $
+# $NetBSD: Makefile,v 1.53 2012/10/23 10:24:09 wiz Exp $
#
DISTNAME= xine-ui-0.99.7
@@ -39,7 +39,6 @@ PTHREAD_AUTO_VARS= yes
.include "../../x11/libXtst/buildlink3.mk"
.include "../../x11/libXv/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xf86vidmodeproto/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/pthread.buildlink3.mk"
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"
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 9dada436e69..bcc227adfaa 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.22 2011/09/21 14:58:37 joerg Exp $
+# $NetBSD: xorg.mk,v 1.23 2012/10/23 10:24:10 wiz Exp $
#
# This is for X.org, but use "xfree" files also.
@@ -64,7 +64,6 @@ FILES_LIST= ${FILESDIR}/xorg
.include "../../x11/xcmiscproto/buildlink3.mk"
.include "../../x11/xcb-proto/buildlink3.mk"
.include "../../x11/xcb-util/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/print/mupdf/Makefile b/print/mupdf/Makefile
index f9517871fba..f2b6abbe161 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/08 13:45:42 asau Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:10 wiz Exp $
#
DISTNAME= mupdf-1.1-source
@@ -34,5 +34,4 @@ post-install:
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/openjpeg/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index 9285f6c0cf6..6cc93274100 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/07/15 08:22:54 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2012/10/23 10:24:10 wiz Exp $
#
DISTNAME= idesk-0.7.5
@@ -34,6 +34,5 @@ post-install:
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index c37200abe24..79f9b65ba70 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/10/03 21:57:39 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2012/10/23 10:24:10 wiz Exp $
#
DISTNAME= lavaps-2.7
@@ -35,5 +35,4 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index 37584c709cb..9caf578cd9f 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/10/31 23:38:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/23 10:24:10 wiz Exp $
DISTNAME= torsmo-0.18
PKGREVISION= 2
@@ -45,5 +45,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/sysutils/wmSMPmon/Makefile b/sysutils/wmSMPmon/Makefile
index 24bb98cffb1..18832996354 100644
--- a/sysutils/wmSMPmon/Makefile
+++ b/sysutils/wmSMPmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/01/27 20:41:16 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2012/10/23 10:24:11 wiz Exp $
DISTNAME= wmSMPmon-2.3
PKGREVISION= 1
@@ -21,5 +21,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/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index d35319d3306..e6d31918829 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:37 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/23 10:24:11 wiz Exp $
#
DISTNAME= wmcpuload-1.0.1
@@ -20,5 +20,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/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile
index 296948f54a2..e84c5de9da5 100644
--- a/sysutils/wmmemmon/Makefile
+++ b/sysutils/wmmemmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:37 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/23 10:24:11 wiz Exp $
#
DISTNAME= wmmemmon-1.0.1
@@ -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/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index ab1f6635146..d3f1819d949 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2012/02/06 12:41:41 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2012/10/23 10:24:11 wiz Exp $
DISTNAME= xnc-5.0.4.src
PKGNAME= xnc-5.0.4
@@ -30,6 +30,5 @@ 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/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"
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"
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"