- fine grained X11 dependencies for packages which have either USE_IMAKE

  or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
  via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
  in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
  C++ for compilation without including the proper headers

Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.

69 files changed, 247 insertions, 81 deletions

diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk
index ba3fdfdcbda..d0e0977fc3b 100644
--- a/x11/Xaw-Xpm/buildlink3.mk
+++ b/x11/Xaw-Xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/12/27 13:37:42 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XAW_XPM_BUILDLINK3_MK:=	${XAW_XPM_BUILDLINK3_MK}+
@@ -22,8 +22,8 @@ BUILDLINK_PKGSRCDIR.Xaw-Xpm?=	../../x11/Xaw-Xpm
 
 LIBXAW?=	-L${BUILDLINK_PREFIX.Xaw-Xpm}/lib			\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib	\
-		-L${BUILDLINK_PREFIX.xpm}/lib				\
-		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.xpm}/lib	\
+		-L${BUILDLINK_PREFIX.libXpm}/lib			\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXpm}/lib	\
 		-lXaw3d -lXpm
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 246dc8621fc..d8ee96dfed1 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2006/12/27 13:37:42 joerg Exp $
 #
 
 DISTNAME=	Xaw3d-1.5E
@@ -42,5 +42,9 @@ post-install:
 .endif
 	cd ${DESTDIR}${PREFIX} && ${LS} lib/libXaw3d* >>${PLIST_SRC}
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index 18db550744b..135db3e0fee 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/12/27 13:37:42 joerg Exp $
 #
 
 DISTNAME=		libXrandr-1.0.2
@@ -25,6 +25,7 @@ PKGCONFIG_OVERRIDE+=    xrandr.pc.in
 
 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"
diff --git a/x11/asnap/Makefile b/x11/asnap/Makefile
index 35bbe02b6e4..24c8e98373a 100644
--- a/x11/asnap/Makefile
+++ b/x11/asnap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:42 joerg Exp $
 
 DISTNAME=		asnap
 PKGNAME=		${DISTNAME}-1.0
@@ -12,4 +12,6 @@ COMMENT=		Takes a snapshot of a region of the screen
 WRKSRC=			${WRKDIR}
 USE_IMAKE=		yes
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 7471cc741f8..f25f239841b 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/12/27 13:37:42 joerg Exp $
 #
 
 DISTNAME=	aterm-1.0.0
@@ -20,8 +20,8 @@ CONFIGURE_ARGS+=--enable-background-image \
 		--enable-fading \
 		--enable-graphics \
 		--with-xpm \
-		--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include \
-		--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib \
+		--with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include \
+		--with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib \
 		--with-jpeg \
 		--with-jpeg-includes=${BUILDLINK_PREFIX.jpeg}/include \
 		--with-jpeg-library=${BUILDLINK_PREFIX.jpeg}/lib \
@@ -43,8 +43,13 @@ CONFIGURE_ARGS+=	--enable-ttygid
 SPECIAL_PERMS=		${PREFIX}/bin/aterm ${SETUID_ROOT_PERMS}
 .endif
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 6f52fc6affa..06cbb195b9e 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:42 joerg Exp $
 #
 
 DISTNAME=	fbdesk-1.2.1
@@ -19,7 +19,14 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fbdesk
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/fbdesk/
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .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/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile
index ab31ce87396..12c0142867d 100644
--- a/x11/fvwm-wharf/Makefile
+++ b/x11/fvwm-wharf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:42 joerg Exp $
 
 DISTNAME=		AfterStep-1.0
 PKGNAME=		fvwm-wharf-1.0
@@ -21,5 +21,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${PREFIX}/bin/Fvwm-Wharf
 	${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${PREFIX}/man/man1/Fvwm-Wharf.1
 
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index e6cb7ad71f5..02f5e25bfa8 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/09/15 15:22:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2006/12/27 13:37:42 joerg Exp $
 #
 
 DISTNAME=		gnome-mag-0.13.1
@@ -18,6 +18,8 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=    gnome-mag-1.0.pc.in
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../devel/at-spi/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -25,4 +27,7 @@ PKGCONFIG_OVERRIDE+=    gnome-mag-1.0.pc.in
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index c741df9d502..c041877e138 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/17 13:46:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:42 joerg Exp $
 
 DISTNAME=	gtkterm2-0.2.3
 PKGREVISION=	3
@@ -15,5 +15,6 @@ GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/vte/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/hanterm/Makefile b/x11/hanterm/Makefile
index f6beaa7e9f0..9c33b4292db 100644
--- a/x11/hanterm/Makefile
+++ b/x11/hanterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/20 22:05:22 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:42 joerg Exp $
 
 DISTNAME=	hanterm-3.1.6
 PKGREVISION=	3
@@ -11,4 +11,7 @@ COMMENT=	X11R6-based xterm hacked for managing Korean languages
 
 USE_IMAKE=	YES
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 762d9450196..067ae478234 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2006/12/27 13:37:42 joerg Exp $
 
 DISTNAME=	kterm-6.2.0
 PKGREVISION=	10
@@ -40,5 +40,6 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR:Q}/patch-xaw3d
 .endif
 
+.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 857636242b5..9a437322ba3 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: Makefile,v 1.92 2006/12/27 13:37:42 joerg Exp $
 
 DISTNAME=	lesstif-0.95.0
 CATEGORIES=	x11
@@ -64,5 +64,9 @@ post-patch:
 	done
 
 .include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.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/libXpm/buildlink3.mk b/x11/libXpm/buildlink3.mk
index 38bc576273c..7bbae188573 100644
--- a/x11/libXpm/buildlink3.mk
+++ b/x11/libXpm/buildlink3.mk
@@ -1,9 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/06 09:54:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/12/27 13:37:42 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${X11_TYPE} != "modular"
 .include "../../graphics/xpm/buildlink3.mk"
+
+BUILDLINK_PREFIX.libXpm=	${BUILDLINK_PREFIX.xpm}
 .else
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
diff --git a/x11/mowitz/Makefile b/x11/mowitz/Makefile
index 60c81f33a13..1fa2db05de4 100644
--- a/x11/mowitz/Makefile
+++ b/x11/mowitz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:42 joerg Exp $
 
 DISTNAME=	Mowitz-0.2.2
 PKGREVISION=	2
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=--with-xawm=neXtaw
 CONFIGURE_ARGS+=--with-xawm=Xaw
 .endif
 
+.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 9d411909d05..7d595102702 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:43 joerg Exp $
 #
 
 DISTNAME=	multi-aterm-0.0.4
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--enable-half-shadow
 CONFIGURE_ARGS+=	--enable-shading
 CONFIGURE_ARGS+=	--enable-fading
 CONFIGURE_ARGS+=	--enable-transparency
-CONFIGURE_ARGS+=	--with-xpm=${BUILDLINK_PREFIX.xpm}
+CONFIGURE_ARGS+=	--with-xpm=${BUILDLINK_PREFIX.libXpm}
 
 .include "options.mk"
 
diff --git a/x11/oneko/Makefile b/x11/oneko/Makefile
index 801d8775204..d13e47c1bb0 100644
--- a/x11/oneko/Makefile
+++ b/x11/oneko/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=		oneko-1.1b
 PKGNAME=		oneko-1.2
@@ -16,4 +16,6 @@ COMMENT=		Like xneko except on the desktop and with other animals
 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/rxvt/Makefile b/x11/rxvt/Makefile
index d3da340d5e1..30d3f8f3952 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=		rxvt-2.7.10
 PKGREVISION=		5
@@ -38,8 +38,8 @@ CONFIGURE_ARGS+=	--enable-utmp \
 			--enable-languages \
 			--with-encoding=noenc
 
-CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include/X11
-CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib
+CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include/X11
+CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -66,4 +66,5 @@ pre-install:
 	fi
 
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/speyes/Makefile b/x11/speyes/Makefile
index 4ff866e9820..d0368cc0e91 100644
--- a/x11/speyes/Makefile
+++ b/x11/speyes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	speyes-1.2.0
 PKGREVISION=	1
@@ -11,5 +11,8 @@ COMMENT=	South Park XEyes clone
 
 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/unclutter/Makefile b/x11/unclutter/Makefile
index 1f2bbfbf7a3..516c2e99767 100644
--- a/x11/unclutter/Makefile
+++ b/x11/unclutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/09/03 00:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:43 joerg Exp $
 #
 
 DISTNAME=	unclutter-8
@@ -13,4 +13,6 @@ COMMENT=	Remove idle cursor image from screen
 WRKSRC=		${WRKDIR}/unclutter
 USE_IMAKE=	yes
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 09f0906abc2..923fa952072 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2006/12/27 13:37:43 joerg Exp $
 #
 
 DISTNAME=	vte-0.14.1
@@ -34,4 +34,5 @@ BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.1.93
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libzvt/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmavgload/Makefile b/x11/wmavgload/Makefile
index 1868be2e2a2..7e6cb4acf98 100644
--- a/x11/wmavgload/Makefile
+++ b/x11/wmavgload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	wmavgload-0.7.0
 PKGREVISION=	1
@@ -12,5 +12,7 @@ USE_IMAKE=      	YES
 
 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 bb30d247a94..6232f58c35e 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/27 13:37:43 joerg Exp $
 #
 
 DISTNAME=	wmfire-0.0.3.9pre4
@@ -20,5 +20,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/wmfire
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire
 
+.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 53b03a272a9..f60480abf53 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	wmfstatus-0.4
 PKGREVISION=	1
@@ -19,5 +19,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README \
 		${WRKDIR}/${DISTNAME}/HINTS ${PREFIX}/share/doc/wmfstatus
 
+.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 98c27cbc185..97e7a5dc619 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/12/27 13:37:43 joerg Exp $
 #
 
 DISTNAME=	wmweather-2.4.2
@@ -23,7 +23,12 @@ CONF_FILES+=	${EGDIR}/wmweather.conf ${PKG_SYSCONFDIR}/wmweather.conf
 
 LDFLAGS.SunOS+=	-lsocket
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../www/curl/buildlink3.mk"
+.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/wterm/Makefile b/x11/wterm/Makefile
index d89d89f6dcd..1fc6797b0ba 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/04/17 13:47:01 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	wterm-6.2.9
 PKGREVISION=	7
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --enable-utmp --enable-wtmp
 CONFIGURE_ARGS+= --enable-xpm-background --enable-transparency
 CONFIGURE_ARGS+= --enable-menubar --enable-graphics --enable-next-scroll
 CONFIGURE_ARGS+= --enable-half-shadow
-CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.xpm}
+CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm}
 
 post-install:
 	${CHMOD} 4755 ${PREFIX}/bin/wterm
diff --git a/x11/x2x/Makefile b/x11/x2x/Makefile
index 9fe31ee1e68..36039d79519 100644
--- a/x11/x2x/Makefile
+++ b/x11/x2x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	x2x-1.27
 PKGREVISION=	2
@@ -14,4 +14,6 @@ USE_IMAKE=	yes
 post-configure:
 	(cd ${WRKSRC}; ${LN} -s x2x.1 x2x.man)
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 070a2183e07..1a57675c415 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/05/15 22:03:59 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	x3270-3213
 PKGNAME=	x3270-3.2.13
@@ -16,4 +16,7 @@ USE_IMAKE=	yes
 
 FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/misc
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index d1d18035c85..eebf275efe1 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	xaniroc
 PKGNAME=	xaniroc-1.02
@@ -16,4 +16,7 @@ USE_IMAKE=	yes
 post-extract:
 	${MV} ${WRKSRC}/manpage.1 ${WRKSRC}/xaniroc.man
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 8c23855c74a..597f1f186b7 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:11:45 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	xautolock-pl15
 PKGNAME=	xautolock-1.15
@@ -14,4 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_IMAKE=	YES
 
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index 4ff6e9a1ba0..351c66281d0 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/06 12:13:09 rpaulo Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	xcb-2.4
 CATEGORIES=	x11
@@ -11,4 +11,6 @@ COMMENT=	Extensible, multiple cut buffers for X
 USE_IMAKE=	YES
 BUILD_TARGET=	all Xcb.ad
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 020738adf24..4993c65f825 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/05/08 06:31:40 snj Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:43 joerg Exp $
 #
 
 DISTNAME=	xclip-0.08
@@ -13,4 +13,5 @@ COMMENT=	Command line interface to the X windows clipboard
 WRKSRC=		${WRKDIR}/xclip
 USE_IMAKE=	YES
 
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 90c0cea80e3..61d9daff31a 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:43 joerg Exp $
 
 DISTNAME=	xcolors
 PKGNAME=	xcolors-1.3
@@ -12,4 +12,7 @@ COMMENT=	Display all (ok, most of) the colors in the universe
 WRKSRC=		${WRKDIR}/xcolors
 USE_IMAKE=	yes
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile
index 98881f2c1f3..5d7b684c5d1 100644
--- a/x11/xcompmgr/Makefile
+++ b/x11/xcompmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:44 joerg Exp $
 #
 
 DISTNAME=	xcompmgr-1.1.1
@@ -21,6 +21,7 @@ PKG_SKIP_REASON+=	"This package is exclusively for X.org."
 .endif
 
 .include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcruise/Makefile b/x11/xcruise/Makefile
index 3e7b589b130..ec6ada99f58 100644
--- a/x11/xcruise/Makefile
+++ b/x11/xcruise/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 22:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:44 joerg Exp $
 #
 
 DISTNAME=	xcruise-0.24
@@ -21,4 +21,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.jp ${PREFIX}/share/doc/xcruise
 	${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/xcruise
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index 14bfd4a400c..6c656afef6d 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:44 joerg Exp $
 
 DISTNAME=	xcursorgen-4.3.0
 PKGREVISION=	4
@@ -21,5 +21,6 @@ MAKE_FLAGS+=	LIBPNGLIB=${LIBPNG:Q}
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xearth/Makefile b/x11/xearth/Makefile
index 5a06192d83e..554e42a3199 100644
--- a/x11/xearth/Makefile
+++ b/x11/xearth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/11/04 09:23:01 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:44 joerg Exp $
 #
 
 DISTNAME=	xearth-1.1
@@ -14,4 +14,6 @@ COMMENT=	Rotating map of the Earth in X11 root window
 USE_IMAKE=	yes
 INSTALL_MAKE_FLAGS=	MANPATH=${PREFIX}/${PKGMANDIR}
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index 3af6e6a2d21..96d9f624b47 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/07/25 15:58:28 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:45 joerg Exp $
 
 DISTNAME=		xfishtank-2.2
 PKGREVISION=		1
@@ -15,4 +15,6 @@ NO_INSTALL_MANPAGES=	yes
 post-patch:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKEFLAGS} clean
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xflame/Makefile b/x11/xflame/Makefile
index 1ff4a28216c..8b1fc18b6e9 100644
--- a/x11/xflame/Makefile
+++ b/x11/xflame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/27 13:37:45 joerg Exp $
 #
 
 DISTNAME=	xflame-1.1.1
@@ -11,4 +11,6 @@ COMMENT=	Draws a flame on the screen
 
 USE_IMAKE=	yes
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 96e43abb1f1..d5d7a00557f 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2006/12/27 13:37:45 joerg Exp $
 #
 
 DISTNAME=	xforms-1.0-release
@@ -21,6 +21,7 @@ SCRIPTS_ENV=	DEPEND_DEFINES="${CPPFLAGS}"
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xgas/Makefile b/x11/xgas/Makefile
index 03a6182d7a0..7162ef0d48d 100644
--- a/x11/xgas/Makefile
+++ b/x11/xgas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:47 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:45 joerg Exp $
 
 DISTNAME=	xgas
 PKGNAME=        xgas-1.0
@@ -15,4 +15,6 @@ post-install:
 	@${CHMOD} 755 ${PREFIX}/bin/xgas
 	@${CHOWN} bin:bin ${PREFIX}/bin/xgas
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xhangglider/Makefile b/x11/xhangglider/Makefile
index d6cba51fcee..e72ccadf981 100644
--- a/x11/xhangglider/Makefile
+++ b/x11/xhangglider/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/07/21 14:27:56 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:45 joerg Exp $
 #
 
 DISTNAME=	xhangglider-0.94.0
@@ -21,4 +21,6 @@ do-install:
 	cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} make install
 	cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} make install.dat
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xkbd/Makefile b/x11/xkbd/Makefile
index 59b1667a35d..9f5f29c5c47 100644
--- a/x11/xkbd/Makefile
+++ b/x11/xkbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/12/15 20:33:06 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:45 joerg Exp $
 #
 
 DISTNAME=	xkbd-0.8.5
@@ -14,5 +14,10 @@ CONFIGURE_ARGS+=--enable-xpm
 
 GNU_CONFIGURE=	YES
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../x11/libXpm/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/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index 09c82cdf957..aea9a64c828 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:45 joerg Exp $
 #
 
 DISTNAME=	xkeycaps-2.46
@@ -21,4 +21,7 @@ pre-configure:
 	${CAT} Imakefile.old >>Imakefile
 .endif
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xless/Makefile b/x11/xless/Makefile
index 1f8803c3ded..fe79379ebea 100644
--- a/x11/xless/Makefile
+++ b/x11/xless/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:45 joerg Exp $
 
 DISTNAME=	xless-1.7
 PKGREVISION=	2
@@ -11,4 +11,7 @@ COMMENT=	X11 text viewer; useful as an add-on tool for other apps
 
 USE_IMAKE=	yes
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index ed42bf18556..852bd07b2df 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2006/11/06 10:04:42 joerg Exp $
+# $NetBSD: Makefile.common,v 1.46 2006/12/27 13:37:46 joerg Exp $
 #
 # This Makefile.common is included by:
 #
@@ -71,7 +71,14 @@ CONFIGURE_ARGS+=	--without-dpms
 CONFIGURE_ARGS+=	--disable-allow-root
 .endif
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 
 # Set the complete paths to the sound files and set the default xlock
 # mode/screensaver.
diff --git a/x11/xlogout/Makefile b/x11/xlogout/Makefile
index c012784d40a..5bae7de1769 100644
--- a/x11/xlogout/Makefile
+++ b/x11/xlogout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xlogout
@@ -12,4 +12,7 @@ COMMENT=	Quick logout button
 
 USE_IMAKE=	yes
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 5f324ece9e7..4bbc5808f87 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/12/15 20:33:06 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xlupe-1.1
@@ -12,5 +12,9 @@ COMMENT=	Magnifier for X
 
 USE_IMAKE=	yes
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 513067f952d..b7b961592d1 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/11 14:35:15 hira Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:46 joerg Exp $
 
 DISTNAME=	xmascot2.5p2
 PKGNAME=        xmascot-2.5p2
@@ -14,8 +14,7 @@ USE_IMAKE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} != "NetBSD"
-MANCOMPRESSED=	yes
-.endif
-
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index 2e16c9dfcf9..bd9022e5943 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xmon.1.5.4
@@ -13,4 +13,6 @@ COMMENT=	Interactive X protocol monitor
 
 USE_IMAKE=	YES
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index 3b71ac30d74..3081289cdd9 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:48 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xmountains_2.7
@@ -14,4 +14,6 @@ COMMENT=	Fractal terrain generator for X11
 WRKSRC=		${WRKDIR}
 USE_IMAKE=	YES
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 8eb2acdc9af..3533d281026 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xmove.2.0beta2
@@ -26,4 +26,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/limitations.txt ${XMOVEDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/using_xmove.txt ${XMOVEDOCDIR}
 
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xp/Makefile b/x11/xp/Makefile
index fa25935289f..a8c201c95e1 100644
--- a/x11/xp/Makefile
+++ b/x11/xp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/11/12 02:26:33 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:46 joerg Exp $
 
 DISTNAME=	xp-1.2b10
 PKGREVISION=	2
@@ -11,4 +11,7 @@ COMMENT=	Fast X11 text file viewer using Athena widgets
 USE_IMAKE=	yes
 MAKE_FLAGS+=	MANPATH=${PREFIX}/${PKGMANDIR}
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index b1399bed917..3a237d3fb3e 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/07/05 05:37:47 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xpad-1.12
@@ -20,7 +20,11 @@ LIBS.SunOS+=		-lX11
 
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpaste/Makefile b/x11/xpaste/Makefile
index a18a8c561b4..74bbbc7e9de 100644
--- a/x11/xpaste/Makefile
+++ b/x11/xpaste/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xpaste-1.1
@@ -15,4 +15,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}
 USE_IMAKE=	yes
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile
index 1c85547c3db..d8e4705a6ce 100644
--- a/x11/xpenguins/Makefile
+++ b/x11/xpenguins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/12/15 20:33:06 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xpenguins-2.2
@@ -12,5 +12,10 @@ COMMENT=	Little penguins walking along the tops of your windows
 
 GNU_CONFIGURE=	YES
 
+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/xphoon/Makefile b/x11/xphoon/Makefile
index 8fe36ccce73..ff5261c72f8 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xphoon.tar
@@ -28,4 +28,6 @@ GCC_REQD+=	2.95.3
 EXTRA_LOCAL_LIBS=	-lcompat
 .endif
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index e23a6986663..39f85b67173 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/10/28 14:20:20 seb Exp $
+# $NetBSD: Makefile,v 1.35 2006/12/27 13:37:46 joerg Exp $
 
 DISTNAME=	xplanet-1.2.0
 PKGREVISION=	3
@@ -37,11 +37,15 @@ CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-xscreensaver
 .endif
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index 37920b73787..7fbc04700f7 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/12/15 20:33:06 joerg Exp $
+# $NetBSD: Makefile,v 1.53 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	fvwm-${PKG_VERSION}
@@ -32,5 +32,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC:Q}/utils/xpmroot.1 \
 		${PREFIX:Q}/${PKGMANDIR:Q}/man1
 
+.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/xpostit/Makefile b/x11/xpostit/Makefile
index 2eba259a762..4c45d7675a9 100644
--- a/x11/xpostit/Makefile
+++ b/x11/xpostit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xpostit3.3.1
@@ -16,4 +16,7 @@ COMMENT=	Post notes to yourself on the screen
 WRKSRC=		${WRKDIR}/xpostit
 USE_IMAKE=	yes
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile
index f2a0b11cfe6..d5492e80912 100644
--- a/x11/xscribble/Makefile
+++ b/x11/xscribble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:46 joerg Exp $
 
 DISTNAME=	xscribble
 PKGNAME=	xscribble-20000616
@@ -25,4 +25,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xscribble
 	${INSTALL_DATA} ${WRKSRC}/classifiers/*.cl ${PREFIX}/share/examples/xscribble
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscript/Makefile b/x11/xscript/Makefile
index ad5e23f8bd0..57b42bcc617 100644
--- a/x11/xscript/Makefile
+++ b/x11/xscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:46 joerg Exp $
 #
 
 DISTNAME=	xscript.tar
@@ -19,4 +19,6 @@ COMMENT=	X Window system script recording and playback
 WRKSRC=		${WRKDIR}/test-distrib/src
 USE_IMAKE=	YES
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index d5584143fcc..d647361accf 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/12/15 20:33:06 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:46 joerg Exp $
 
 DISTNAME=	xsnow-1.42
 PKGREVISION=	2
@@ -19,5 +19,8 @@ USE_IMAKE=	yes
 IMAKEOPTS+=     -DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q}
 .endif
 
+.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 b6bbbd80ee5..ff511474cf8 100644
--- a/x11/xteddy/Makefile
+++ b/x11/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:06 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:46 joerg Exp $
 
 DISTNAME=	xteddy-1.1
 PKGREVISION=	1
@@ -15,5 +15,8 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps
 
+.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/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index b9187eeb050..eab7705398c 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:49 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:47 joerg Exp $
 #
 
 DISTNAME=	xtoolwait-1.3
@@ -12,4 +12,5 @@ COMMENT=	Free implementation of SunOS toolwait(1)
 
 USE_IMAKE=	yes
 
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index 001310bebb8..2b172387068 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/12/27 13:37:47 joerg Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-clients-3.2.1
@@ -28,5 +28,7 @@ post-patch:
 		${RM} -f $${file}.tmp;			\
 	done
 
+.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/xview-lib/Makefile b/x11/xview-lib/Makefile
index a2224e04ebd..c182965f502 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/04 21:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/12/27 13:37:47 joerg Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-lib-3.2.1
@@ -21,4 +21,5 @@ post-install:
 	cd ${PREFIX}/lib && ${LN} -fs libolgx.so.3.2 libolgx.so.3 && \
 		${LN} -fs libxview.so.3.2 libxview.so.3
 
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk
index 75d73622b5f..e1c6ebf2f7e 100644
--- a/x11/xview-lib/buildlink3.mk
+++ b/x11/xview-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/12/27 13:37:47 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XVIEW_LIB_BUILDLINK3_MK:=	${XVIEW_LIB_BUILDLINK3_MK}+
@@ -17,4 +17,6 @@ BUILDLINK_ABI_DEPENDS.xview-lib?=	xview-lib>=3.2.1nb6
 BUILDLINK_PKGSRCDIR.xview-lib?=	../../x11/xview-lib
 .endif	# XVIEW_LIB_BUILDLINK3_MK
 
+.include "../../x11/libX11/buildlink3.mk"
+
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index d7aadc6b94d..bd3d8c4b763 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:47 joerg Exp $
 
 DISTNAME=	xwatchwin
 PKGNAME=	xwatchwin-1.1.1
@@ -11,4 +11,6 @@ COMMENT=	Watch a window on another X server
 
 USE_IMAKE=	yes
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index fea8a6fce01..9956a3cfb09 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:31:14 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:47 joerg Exp $
 #
 
 DISTNAME=	xwit-3.4
@@ -11,4 +11,6 @@ COMMENT=	Utility for calling X11 functions from the shell
 
 USE_IMAKE=	yes
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"