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

16 files changed, 51 insertions, 16 deletions

diff --git a/time/asclock-xlib/Makefile b/time/asclock-xlib/Makefile
index 2e7588213fb..458b3c27f87 100644
--- a/time/asclock-xlib/Makefile
+++ b/time/asclock-xlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:01 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=	asclock-xlib-2.0.11
@@ -32,5 +32,7 @@ post-install:
 	${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-xlib
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-xlib
 
+.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 3f32ea99491..6fcbe2b2123 100644
--- a/time/asclock/Makefile
+++ b/time/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/12/15 20:33:01 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/12/27 13:37:40 joerg Exp $
 
 DISTNAME=	asclock-classic-1.0
 PKGNAME=	asclock-1.0
@@ -75,5 +75,7 @@ do-install:
 .endfor
 	@${ECHO} @dirrm share/asclock-classic >> ${PLIST_SRC}
 
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile
index d2921b0717b..bdd32dd739a 100644
--- a/time/emiclock/Makefile
+++ b/time/emiclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/09/02 12:46:31 obache Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=	emiclock-2.0.2
@@ -34,4 +34,5 @@ post-install:
 		${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock
 
 .include "../../mk/xaw.buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnyaclock/Makefile b/time/gnyaclock/Makefile
index ecfbfaf3653..001bc324e32 100644
--- a/time/gnyaclock/Makefile
+++ b/time/gnyaclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:01 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=	gnya
@@ -22,5 +22,8 @@ do-install:
 		${INSTALL_MAN} ${WRKSRC}/gnyaclock.man \
 			${PREFIX}/man/ja_JP.EUC/man1/gnyaclock.1
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/lmclock/Makefile b/time/lmclock/Makefile
index 77c7d120c0c..b819aa97aa3 100644
--- a/time/lmclock/Makefile
+++ b/time/lmclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:10 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=	lmclock-1.2
@@ -15,4 +15,6 @@ 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 9055c850b66..b19324ae78c 100644
--- a/time/pclock/Makefile
+++ b/time/pclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:01 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=	pclock_0.13.1.orig
@@ -21,5 +21,7 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/pclock
 		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pclock
 
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/polclock/Makefile b/time/polclock/Makefile
index 03fac58c981..4e3383eac26 100644
--- a/time/polclock/Makefile
+++ b/time/polclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/04 22:01:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=		polclock-1.11
@@ -12,4 +12,5 @@ COMMENT=		Digital clock with some nice graphics effects
 
 USE_IMAKE=		yes
 
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/sunclock/Makefile b/time/sunclock/Makefile
index 7e7ab5c89f9..9e21d321e55 100644
--- a/time/sunclock/Makefile
+++ b/time/sunclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:11 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=	sunclock-1.5
@@ -13,4 +13,5 @@ USE_IMAKE=	yes
 
 CPPFLAGS.SunOS+=	-DUSE_PUTENV
 
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/swisswatch/Makefile b/time/swisswatch/Makefile
index eda0f894b5d..13e937a4f1a 100644
--- a/time/swisswatch/Makefile
+++ b/time/swisswatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:11:11 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/12/27 13:37:40 joerg Exp $
 
 DISTNAME=	swisswatch-0.06
 PKGREVISION=	2
@@ -11,4 +11,8 @@ COMMENT=	Swiss railway clock emulation, and a fancy default appearance
 
 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/titrax/Makefile b/time/titrax/Makefile
index 4a53a7a2b2c..3faccdb5794 100644
--- a/time/titrax/Makefile
+++ b/time/titrax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/04 22:01:52 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=		titrax-1.98
@@ -24,4 +24,7 @@ post-patch:
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/titrax
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile
index 8629f555d9b..1d2d7637aec 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/12/15 20:33:01 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
@@ -26,5 +26,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/
 
+.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 eca1258a92d..76801747664 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:01 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=	wmMoonClock-1.27
@@ -22,5 +22,7 @@ MAKE_FLAGS+=    EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
 EXTRA_LOCAL_LIBS=       -lsocket
 .endif
 
+.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 c2f510cb2f0..5693e293fc5 100644
--- a/time/xbeats/Makefile
+++ b/time/xbeats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:01 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=	xbeats-0.4
@@ -12,5 +12,7 @@ COMMENT=	Beats clock dockable in both Window Maker and AfterStep
 
 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/xcal/Makefile b/time/xcal/Makefile
index 47dec6f1159..1e544fd5d5c 100644
--- a/time/xcal/Makefile
+++ b/time/xcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:11 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=		xcal41
@@ -20,4 +20,7 @@ post-extract:
 	    ${SED} -e '1,/--shar starts here--/d' $$i | ${SH} >/dev/null 2>&1; \
 	done
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xchrono/Makefile b/time/xchrono/Makefile
index 7aa75c829f6..f6b46c28876 100644
--- a/time/xchrono/Makefile
+++ b/time/xchrono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:40 joerg Exp $
 #
 
 DISTNAME=		xchrono
@@ -18,4 +18,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchrono
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchrono/
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xtimer/Makefile b/time/xtimer/Makefile
index 5db91300b36..d8579c0d418 100644
--- a/time/xtimer/Makefile
+++ b/time/xtimer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:12 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:40 joerg Exp $
 
 DISTNAME=	xtimer-8089
 PKGNAME=	xtimer-0.8089
@@ -12,4 +12,7 @@ COMMENT=	Super simple digital timer for X11
 
 USE_IMAKE=	yes
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"