- 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.
NetBSD · Dec 27, 2006 · d26cf36 · d26cf36
1 parent 6432f76
commit d26cf36
Show file tree

Hide file tree

Showing 211 changed files with 805 additions and 251 deletions.
diff --git 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,12 +85,15 @@ post-patch:
 .  endif
 .endif
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 

diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/09/03 00:56:28 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:36 joerg Exp $
 
 DISTNAME=	xengine-1.0.1
 PKGREVISION=	3
@@ -31,4 +31,6 @@ post-install:
 	@${ECHO} "   1067 RPMs with P100, Winner 2000PRO/X, resolution: 1152x900"
 	@${ECHO} ""
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/xtel/Makefile b/comms/xtel/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:36 joerg Exp $
 #
 
 DISTNAME=	xtel-3.3.0
@@ -11,12 +11,15 @@ HOMEPAGE=	http://pficheux.free.fr/xtel/
 COMMENT=	Minitel(r) emulator
 
 USE_IMAKE=	YES
-USE_TOOLS+=	mkfontdir
+USE_TOOLS+=	mkfontdir bdftopcf
 
 FONTS_DIRS.x11=	${PREFIX}/lib/X11/fonts/xtel
 REQD_DIRS=	${PREFIX}/lib/X11/fonts/xtel
 
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/10/17 16:55:49 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=		at-spi-1.7.12
@@ -26,4 +26,5 @@ BUILDLINK_API_DEPENDS.atk+=	atk>=1.12.0
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/12/27 13:37:36 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AT_SPI_BUILDLINK3_MK:=	${AT_SPI_BUILDLINK3_MK}+
@@ -22,5 +22,6 @@ BUILDLINK_PKGSRCDIR.at-spi?=	../../devel/at-spi
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=	libdockapp-0.4.0
@@ -18,5 +18,11 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libdockapp
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/libX11/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/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=	libmatchbox-1.9
@@ -14,7 +14,10 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.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
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/12/27 13:37:36 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMATCHBOX_BUILDLINK3_MK:=	${LIBMATCHBOX_BUILDLINK3_MK}+
@@ -18,7 +18,9 @@ BUILDLINK_PKGSRCDIR.libmatchbox?=	../../devel/libmatchbox
 .endif	# LIBMATCHBOX_BUILDLINK3_MK
 
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=	xxgdb-1.12
@@ -25,4 +25,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/XDbx.ad ${PREFIX}/lib/X11/app-defaults/XDbx
 	${INSTALL_DATA} ${WRKSRC}/xxgdb.man ${PREFIX}/man/man1/xxgdb.1
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/12/27 13:37:36 joerg Exp $
 
 DISTNAME=	cooledit-3.17.17
 PKGREVISION=	2
@@ -25,5 +25,6 @@ post-configure:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/12/27 13:37:36 joerg Exp $
 
 DISTNAME=		sam
 PKGNAME=		sam-4.3
@@ -36,4 +36,5 @@ do-build:
 	done
 .endif # SunOS
 
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/12/27 13:37:36 joerg Exp $
 
 DISTNAME=	ted-2.16.src
 PKGNAME=	ted-2.16
@@ -30,8 +30,8 @@ CONFIGURE_ENV+=	ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include"
 CONFIGURE_ENV+=	ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib"
 CONFIGURE_ENV+=	ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include"
 CONFIGURE_ENV+=	ac_xm_libraries="${BUILDLINK_PREFIX.openmotif}/lib"
-CONFIGURE_ENV+=	ac_xpm_includes="${BUILDLINK_PREFIX.xpm}/include"
-CONFIGURE_ENV+=	ac_xpm_libraries="${BUILDLINK_PREFIX.xpm}/lib"
+CONFIGURE_ENV+=	ac_xpm_includes="${BUILDLINK_PREFIX.libXpm}/include"
+CONFIGURE_ENV+=	ac_xpm_libraries="${BUILDLINK_PREFIX.libXpm}/lib"
 CONFIGURE_ENV+=	ac_zlib_includes="${BUILDLINK_PREFIX.zlib}/include"
 CONFIGURE_ENV+=	ac_zlib_libraries="${BUILDLINK_PREFIX.zlib}/lib"
 

diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/04/24 22:22:55 markd Exp $
+# $NetBSD: Makefile,v 1.32 2006/12/27 13:37:36 joerg Exp $
 
 DISTNAME=	spim-7.1
 PKGREVISION=	3
@@ -43,4 +43,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Documentation/cycle.ps \
 		${PREFIX}/share/doc/spim
 
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2006/12/15 20:32:55 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=		vice-1.19
@@ -57,6 +57,8 @@ post-patch:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:37 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=	x48_041
@@ -25,4 +25,6 @@ post-install:
 		${INSTALL_DATA} ROMDump ROMDump.s \
 			${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
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:55 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:36 joerg Exp $
 #
 
 DISTNAME=		xcopilot-0.6.6
@@ -17,5 +17,8 @@ GNU_CONFIGURE=		YES
 post-extract:
 	${RM} -f ${WRKSRC}/mc68k/custom.c
 
+.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/games/cbzone/Makefile b/games/cbzone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:09:13 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/27 13:37:36 joerg Exp $
 
 DISTNAME=		cbzone-sound
 PKGNAME=		cbzone-2.0c
@@ -13,4 +13,6 @@ WRKSRC=			${WRKDIR}/cbzone
 USE_TOOLS+=		gmake
 USE_IMAKE=		yes
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"