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

10 files changed, 33 insertions, 10 deletions

diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index c3eeede2290..29dfd96ca4d 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2006/07/31 21:43:55 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.22 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=	bmp-0.9.7.1
@@ -85,6 +85,8 @@ post-patch:
 .  endif
 .endif
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -92,5 +94,6 @@ post-patch:
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 20b00b0e665..eef573de614 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=	Mixer.app-1.8.0
@@ -25,6 +25,8 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Mixer.app
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Mixer.app
 
+.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/nas/Makefile b/audio/nas/Makefile
index 1ab4d122c64..339795185ff 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/10/22 16:03:18 rillig Exp $
+# $NetBSD: Makefile,v 1.69 2006/12/27 13:37:35 joerg Exp $
 
 DISTNAME=	nas-1.8.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -95,4 +95,8 @@ PLIST_SRC+=	${PKGDIR}/PLIST.server
 pre-configure:
 	cd ${WRKSRC}/config && ${SETENV} ${CONFIGURE_ENV} ./configure
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 2ee08cda2f2..3824d45170b 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/11 14:34:17 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=	terminatorX-3.82
@@ -37,6 +37,7 @@ SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXxf86dga/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index e031cf21080..a18ef8fed2f 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=	wmmixer-1.0-beta1
@@ -22,6 +22,8 @@ NO_INSTALL_MANPAGES=	YES
 pre-build:
 	${TOUCH} ${WRKSRC}/wmmixer.man
 
+.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/wmmp3/Makefile b/audio/wmmp3/Makefile
index d27c82d927e..5758eece92b 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:35 joerg Exp $
 
 DISTNAME=	wmmp3-0.12
 PKGREVISION=	2
@@ -22,5 +22,7 @@ post-install:
 	@${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples"
 	${INSTALL_DATA} ${WRKSRC}/sample.wmmp3 ${PREFIX}/share/examples
 
+.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 b47157ef058..54b6831b72b 100644
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:35 joerg Exp $
 #
 
 DISTNAME=	wmsmixer-0.5.1
@@ -27,6 +27,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.wmmixer \
 		${PREFIX}/share/doc/wmsmixer/README.wmsmixer
 
+.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/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 8a7e41d3cf7..b6d6700146d 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/08/12 14:51:39 darcy Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:35 joerg Exp $
 
 DISTNAME=       xcdplayer-2.2
 PKGREVISION=	3
@@ -19,4 +19,8 @@ pre-configure:
 	${CP} ${FILESDIR}/cdrom_freebsd.h ${WRKSRC}
 	${CP} ${WRKSRC}/xcdplayer.1 ${WRKSRC}/xcdplayer.man
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index d6bb0db50db..7c884d24f3d 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/27 13:37:35 joerg Exp $
 
 DISTNAME=		xmix-2.1
 PKGREVISION=		2
@@ -22,5 +22,7 @@ pre-configure:
 pre-install:
 	${INSTALL_DATA} ${WRKSRC}/XMix ${PREFIX}/lib/X11/app-defaults
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index 6239bced70e..b92faf2d485 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:53 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=		xwave2
@@ -24,6 +24,7 @@ do-install:
 			${WRKSRC}/INSTALL \
 			${PREFIX}/share/doc/xwave2
 
+.include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"