diff options
author | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
commit | d26cf36e5784f5b648404b8d68c21adb4398f33f (patch) | |
tree | cbd8d2123ffe05331db8b76b38b2de8182524736 | |
parent | 6432f76116c5a27e6f554145314e47d93eeec7a9 (diff) | |
download | pkgsrc-d26cf36e5784f5b648404b8d68c21adb4398f33f.tar.gz |
- 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.
211 files changed, 805 insertions, 251 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" diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile index 4fcc9462f19..c83629f127c 100644 --- 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 index 18667fdfa3c..d4883ac6543 100644 --- 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 index 9f4501e0751..adaf47274a5 100644 --- 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 index 50f86fb0c29..3af23d706aa 100644 --- 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 index d7fa3008181..7792597d4d1 100644 --- 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 index 39e26c6c133..c9e6442bbea 100644 --- 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 index 0827a3b8548..9760d433243 100644 --- 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 index 2528517c4f5..06d3ca66aeb 100644 --- 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 index 9ad243b9a2f..b8adc475c53 100644 --- 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 index 7182aa7745a..346b3b61a86 100644 --- 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 index 0fbcbfc0f3d..a8e54cf234b 100644 --- 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 index f75a62e6f5e..93c2b1da48c 100644 --- 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 index 9993cf6b52b..69c3e055d94 100644 --- 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 index 6a2f31a99a0..b885ab9d177 100644 --- 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 index 0072454bb15..99a1c404b80 100644 --- 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 index 26e6c160748..f8339aebf0c 100644 --- 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" diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile index 106cee12469..d83232cd4a2 100644 --- a/games/crack-attack/Makefile +++ b/games/crack-attack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:24 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:36 joerg Exp $ DISTNAME= crack-attack-1.1.14 PKGREVISION= 3 @@ -20,5 +20,6 @@ post-install: .include "../../graphics/Mesa/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile index 3ddb3c4e867..43209ea64c5 100644 --- a/games/jetpack/Makefile +++ b/games/jetpack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:09:16 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:36 joerg Exp $ DISTNAME= jetpack PKGNAME= jetpack-1.0 @@ -21,4 +21,6 @@ post-install: @${CHMOD} 0775 ${PREFIX}/share/jetpack ${INSTALL_MAN} ${WRKSRC}/jetpack.man ${PREFIX}/man/man6/jetpack.6 +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile index 2fee0fda299..c0d5dc33203 100644 --- a/games/maelstrom-x11/Makefile +++ b/games/maelstrom-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:55 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:36 joerg Exp $ DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz PKGNAME= maelstrom-x11-2.0.6 @@ -24,7 +24,7 @@ EXTRACT_ONLY= ${DISTNAME} WRKSRC= ${WRKDIR}/Maelstrom USE_LANGUAGES= c c++ USE_X11BASE= YES -MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.xpm} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.libXpm} MAKE_ENV+= GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP} MAKE_ENV+= GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE} MAKE_ENV+= VARBASE=${VARBASE} @@ -43,6 +43,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.* ${PREFIX}/share/maelstrom ${INSTALL_PROGRAM} ${WRKSRC}/netplayd/netplayd ${PREFIX}/bin/Maelstrom_netplayd +.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/nethack-x11/Makefile b/games/nethack-x11/Makefile index 68b834ef512..8788f5ba912 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/12/15 20:32:55 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2006/12/27 13:37:36 joerg Exp $ # .include "../../games/nethack-lib/Makefile.common" @@ -28,5 +28,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc \ ${PREFIX}/share/${NETHACK_DIR}/nethack.x11.rc +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/spider/Makefile b/games/spider/Makefile index 9e9a9ecac53..96ef112365e 100644 --- a/games/spider/Makefile +++ b/games/spider/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/06/20 20:48:35 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/12/27 13:37:36 joerg Exp $ DISTNAME= spider PKGNAME= spider-1.1 @@ -12,4 +12,7 @@ COMMENT= Solitaire card game from xcontrib USE_IMAKE= yes INSTALL_TARGET= install install.doc install.man +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/svb/Makefile b/games/svb/Makefile index 7ba9df42700..37a2a348f43 100644 --- a/games/svb/Makefile +++ b/games/svb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:23 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:36 joerg Exp $ DISTNAME= svb PKGNAME= svb-1.0 @@ -20,4 +20,5 @@ post-install: ${CHMOD} ${GAMEMODE} ${PREFIX}/bin/svb ${INSTALL_MAN} ${WRKSRC}/svb.man ${PREFIX}/man/man6/svb.6 +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/tanked/Makefile b/games/tanked/Makefile index 9ff28694bf4..1dec8248bb3 100644 --- a/games/tanked/Makefile +++ b/games/tanked/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:56 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= tanked-0.90 @@ -19,5 +19,6 @@ post-patch: @${SED} -e 's@XXX@${PREFIX}/share/tanked/@' \ < ${WRKSRC}/server/maps.list.bak > ${WRKSRC}/server/maps.list +.include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xbat/Makefile b/games/xbat/Makefile index dd7eea95b75..c6e1f66223f 100644 --- a/games/xbat/Makefile +++ b/games/xbat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/09/03 00:56:29 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xev111 PKGNAME= xbat-1.11 @@ -20,4 +20,6 @@ WRKSRC= ${WRKDIR}/Xev111 USE_IMAKE= yes BUILD_TARGET= xbat +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xbill/Makefile b/games/xbill/Makefile index 8f9e05551b9..ed65aaab1ed 100644 --- a/games/xbill/Makefile +++ b/games/xbill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/12/15 20:32:56 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= xbill-2.0 @@ -27,11 +27,13 @@ MAKE_ENV+= GAMEGRP=${GAMEGRP:Q} MAKE_ENV+= GAMEMODE=${GAMEMODE:Q} CONF_FILES_PERMS+= ${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.scores ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE} -INSTALLATION_DIRS+= ${PKGMANDIR}/man6 +INSTALLATION_DIRS+= ${PKGMANDIR}/man6 share/examples post-install: ${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/${PKGMANDIR}/man6/xbill.6 ${INSTALL_DATA} ${WRKSRC}/scores ${PREFIX}/share/examples/xbill.scores +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xboing/Makefile b/games/xboing/Makefile index db3f8b8090f..da7e241ad3d 100644 --- a/games/xboing/Makefile +++ b/games/xboing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:56 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= xboing2.4 @@ -23,6 +23,7 @@ post-install: ${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xboing ${INSTALL_MAN} ${WRKSRC}/xboing.man ${PREFIX}/man/man6/xboing.6 +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile index 30ebdb2c7b8..70a22ee455e 100644 --- a/games/xdemineur/Makefile +++ b/games/xdemineur/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/12/15 20:32:56 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= xdemineur-2.1.1 @@ -13,5 +13,6 @@ COMMENT= Minesweeper game for the X Window System USE_IMAKE= YES .include "../../devel/sysexits/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile index f49f5cefa79..7d93a6d7d20 100644 --- a/games/xemeraldia/Makefile +++ b/games/xemeraldia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/09/03 00:56:29 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xemeraldia-0.3 PKGNAME= xemeraldia-0.31 @@ -23,4 +23,7 @@ PLIST_SUBST= GAMES_DIR=${GAMES_DIR:Q} CONF_FILES_PERMS+= /dev/null ${PREFIX}/${GAMES_DIR}/xemeraldia/xemeraldia.scores \ ${ROOT_USER} games 664 +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile index 886247b1406..ca9fb2e837b 100644 --- a/games/xgalaga/Makefile +++ b/games/xgalaga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/12/15 20:32:56 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xgalaga-2.0.34 PKGREVISION= 4 @@ -20,6 +20,8 @@ MAKE_ENV+= GAMEOWN=${GAMEOWN:Q} GAMEGRP=${GAMEGRP:Q} \ post-install: ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/xgalaga/README +.include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile index 26e98b29e41..6b78c22b3f3 100644 --- a/games/xjewel/Makefile +++ b/games/xjewel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:24 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xjewel-1.6 PKGREVISION= 2 @@ -10,6 +10,8 @@ MAINTAINER= jdc@NetBSD.org COMMENT= X windows-based dropping jewels game USE_IMAKE= yes -USE_TOOLS+= gzcat bdftopcf +USE_TOOLS+= gzcat bdftopcf mkfontdir +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xjig/Makefile b/games/xjig/Makefile index caf7dc2a745..7d729e5d3bc 100644 --- a/games/xjig/Makefile +++ b/games/xjig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:44 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= xjig-2.4 @@ -19,4 +19,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/xjig ${INSTALL_DATA} ${WRKSRC}/tina.gif ${PREFIX}/lib/xjig +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xjump/Makefile b/games/xjump/Makefile index b4680a74e69..b97cd61633d 100644 --- a/games/xjump/Makefile +++ b/games/xjump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/12/15 20:32:56 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xjump_2.7.5.orig PKGNAME= xjump-2.7.5 @@ -19,5 +19,7 @@ MAKE_ENV+= VARBASE=${VARBASE:Q} do-install: ${INSTALL_GAME} ${WRKSRC}/xjump ${PREFIX}/bin/xjump +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile index caca7a23d76..da9ae6668af 100644 --- a/games/xkobo/Makefile +++ b/games/xkobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/05/11 14:07:56 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xkobo-1.11 PKGREVISION= 3 @@ -14,4 +14,6 @@ USE_IMAKE= yes USE_LANGUAGES= c c++ BUILD_TARGET+= xkobo all +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xmris/Makefile b/games/xmris/Makefile index 5191a85e0a5..055a5b5ae3c 100644 --- a/games/xmris/Makefile +++ b/games/xmris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/14 01:14:29 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xmris.4.0.5 PKGNAME= xmris-4.05 @@ -24,4 +24,6 @@ post-install: ${LN} -fs xmris.6 ${PREFIX}/man/man6/xmsit.6 ${INSTALL_MAN} ${WRKSRC}/xmred.man ${PREFIX}/man/man6/xmred.6 +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile index babd4829746..bfdd73f4cd5 100644 --- a/games/xpat2/Makefile +++ b/games/xpat2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/12/15 20:32:56 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xpat2-1.07 PKGREVISION= 1 @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_X11BASE= YES USE_TOOLS+= imake -MAKE_ENV+= XPMDIR=${BUILDLINK_PREFIX.xpm:Q} XMKMF=${XMKMF_CMD:Q} +MAKE_ENV+= XPMDIR=${BUILDLINK_PREFIX.libXpm:Q} XMKMF=${XMKMF_CMD:Q} CONF_FILES_PERMS= /dev/null /var/games/xpat.log ${GAMEOWN} ${GAMEGRP} ${GAMEMODE} MAKE_DIRS= /var/games @@ -23,5 +23,8 @@ post-install: ${CHOWN} ${GAMEOWN}.${GAMEGRP} ${PREFIX}/bin/xpat2 ${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xpat2 +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile index acac70acf32..402f70fe3b1 100644 --- a/games/xpilot/Makefile +++ b/games/xpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:25 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= xpilot-4.5.4 @@ -12,4 +12,6 @@ COMMENT= Networked space battles for X11 USE_IMAKE= yes +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile index 0272a6ddfc4..ee9fbcebcde 100644 --- a/games/xpipeman/Makefile +++ b/games/xpipeman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/10/04 21:43:01 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= xpipeman-1.5 @@ -25,4 +25,6 @@ do-install: ${INSTALL} -o bin -g games -m 0664 ${WRKSRC}/xpipescores /var/games ; \ fi +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile index aa19cdfffea..6c81b92a613 100644 --- a/games/xscavenger/Makefile +++ b/games/xscavenger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/07/05 06:53:13 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= xscavenger-1.4.4 @@ -29,4 +29,6 @@ post-install: @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scavenger @${INSTALL_MAN} ${WRKSRC}/DOC ${PREFIX}/share/doc/scavenger +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile index 56af237253d..41c4fbf101b 100644 --- a/games/xscrabble/Makefile +++ b/games/xscrabble/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/12/15 20:32:56 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= xscrabble-1.0 @@ -35,5 +35,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/xscrabble.scores ${EGDIR}/xscrabble.scores.dist ${INSTALL_DATA} ${WRKSRC}/XScrabble.ad ${PREFIX}/lib/X11/app-defaults/XScrabble +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xskat/Makefile b/games/xskat/Makefile index a98c9432fe7..6e49cb034e6 100644 --- a/games/xskat/Makefile +++ b/games/xskat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:45 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xskat-3.4 PKGREVISION= 2 @@ -11,10 +11,13 @@ COMMENT= Play the card game Skat USE_IMAKE= yes -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.prefs.mk" .if defined(DEFAULT_IRC_SERVER) MAKE_ENV+= IRC_SERVER=${DEFAULT_IRC_SERVER:Q} .else MAKE_ENV+= IRC_SERVER=irc.fu-berlin.de .endif + +.include "../../x11/libX11/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/games/xvier/Makefile b/games/xvier/Makefile index 5dfa3c7bf55..4b6b44d40cf 100644 --- a/games/xvier/Makefile +++ b/games/xvier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/11/21 13:40:40 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:37 joerg Exp $ DISTNAME= xvier PKGNAME= xvier-1.0 @@ -22,4 +22,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xvier_prog ${PREFIX}/libexec/xvier_prog ${INSTALL_MAN} ${WRKSRC}/xvier.man ${PREFIX}/${PKGMANDIR}/man6/xvier.6 +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/zoom/Makefile b/games/zoom/Makefile index 6df2277661e..2e0af853090 100644 --- a/games/zoom/Makefile +++ b/games/zoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:37 joerg Exp $ DISTNAME= zoom-1.0.3 PKGREVISION= 3 @@ -30,8 +30,13 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/manual/$$f ${DOCDIR}; \ done +BUILDLINK_DEPMETHOD.libXt= build + .include "../../fonts/fontconfig/buildlink3.mk" .include "../../fonts/t1lib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXft/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/geography/xrmap-base/Makefile b/geography/xrmap-base/Makefile index e04960030bf..52b4f153fe8 100644 --- a/geography/xrmap-base/Makefile +++ b/geography/xrmap-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/09/06 09:59:24 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:37 joerg Exp $ # DISTNAME= xrmap-2.29 @@ -19,4 +19,8 @@ MAKE_FLAGS+= MANPATH=${PREFIX}/${PKGMANDIR} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/rmap/factbook +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/geography/xrmap-base/distinfo b/geography/xrmap-base/distinfo index 0b5e395399a..5aa72f2e7f9 100644 --- a/geography/xrmap-base/distinfo +++ b/geography/xrmap-base/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/22 21:08:32 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/12/27 13:37:37 joerg Exp $ SHA1 (xrmap-2.29.tar.bz2) = af2efc47b7ef76840a72a96e67174b0fd5dd8973 RMD160 (xrmap-2.29.tar.bz2) = f8cacc343643a66c8236743c76c80d3c33c44c5c Size (xrmap-2.29.tar.bz2) = 1072241 bytes -SHA1 (patch-aa) = 8ffc67bb8b73819b143e65a29eea4e8e2674b1a1 +SHA1 (patch-aa) = 31ae754c428cd96e5c4313b53c26cadefff3e47f SHA1 (patch-ab) = fa0619337c40cef0d3bd63fcadc9f7bcefb473a6 diff --git a/geography/xrmap-base/patches/patch-aa b/geography/xrmap-base/patches/patch-aa index 3ef7f4ab28c..956b6153f76 100644 --- a/geography/xrmap-base/patches/patch-aa +++ b/geography/xrmap-base/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2004/09/09 10:26:27 drochner Exp $ +$NetBSD: patch-aa,v 1.3 2006/12/27 13:37:37 joerg Exp $ --- Imakefile.orig 2003-05-18 20:53:02.000000000 +0200 +++ Imakefile @@ -18,21 +18,3 @@ $NetBSD: patch-aa,v 1.2 2004/09/09 10:26:27 drochner Exp $ XCOMM Default external utilities : XCOMM PostScript viewer, image viewer, HTML viewer, Print command -@@ -68,7 +60,7 @@ install.man:: - - all:: - strip xrmap ; ls -al xrmap -- cd editkit ; xmkmf ; make -+ cd editkit ; pkgxmkmf ; make - - install:: install.man - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR) -@@ -88,7 +80,7 @@ install:: install.man - EXAMPLE.rc midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc - cd rc ; rm -f *~ - cp -fR rc $(DESTDIR)$(SHAREDIR) -- cd editkit ; xmkmf ; make install -+ cd editkit ; pkgxmkmf ; make install - cat WARNING - - clean:: diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index c94f6475f81..1337e7ea21b 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/10/09 12:52:35 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2006/12/27 13:37:38 joerg Exp $ PKGNAME= MesaDemos-${MESA_VERSION} COMMENT= OpenGL examples and Demos @@ -32,4 +32,7 @@ do-install: -rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV} +.include "../../x11/libXi/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk index d449e2e72bb..1c9218b1ee5 100644 --- a/graphics/glut/buildlink3.mk +++ b/graphics/glut/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:51 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2006/12/27 13:37:38 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+ @@ -18,5 +18,6 @@ BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut .endif # GLUT_BUILDLINK3_MK .include "../../graphics/MesaLib/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index faba310cbe9..7f947c3ec00 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/08/10 17:44:11 drochner Exp $ +# $NetBSD: Makefile,v 1.35 2006/12/27 13:37:38 joerg Exp $ DISTNAME= gtkglext-1.2.0 PKGREVISION= 2 @@ -19,8 +19,11 @@ PKGCONFIG_OVERRIDE= gdkglext.pc.in PKGCONFIG_OVERRIDE+= gtkglext.pc.in LIBS+= -lm +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/pango/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile index cb9daf75560..f8b00fd25cc 100644 --- a/graphics/plotmtv/Makefile +++ b/graphics/plotmtv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:51 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:38 joerg Exp $ DISTNAME= Plotmtv1.4.1 PKGNAME= plotmtv-1.4.1 @@ -22,4 +22,6 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/Tests/run.sh ${WRKSRC}/Tests/run.csh \ ${PREFIX}/share/examples/plotmtv +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile index efb0a37ef0a..3b688dd7e63 100644 --- a/graphics/tgif/Makefile +++ b/graphics/tgif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2006/10/04 21:44:47 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= tgif-4.1.45 @@ -26,6 +26,8 @@ post-patch:: @${CP} ${OS_TEMPLATE} ${WRKSRC}/Tgif.tmpl .include "../../graphics/jpeg/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/viewfax/Makefile b/graphics/viewfax/Makefile index f523956eaa9..5d0daf88554 100644 --- a/graphics/viewfax/Makefile +++ b/graphics/viewfax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:40 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= viewfax-2.4 @@ -20,4 +20,6 @@ USE_IMAKE= yes pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/libdata/viewfax +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile index 365cce5068d..040da49f401 100644 --- a/graphics/wmphoto/Makefile +++ b/graphics/wmphoto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= wmphoto-0.3a @@ -20,5 +20,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmphoto ${INSTALL_DATA} ${WRKSRC}/HINTS ${PREFIX}/share/doc/wmphoto +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile index 6698e2636ba..3c9de007ead 100644 --- a/graphics/xart/Makefile +++ b/graphics/xart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= xart19980415 @@ -22,5 +22,8 @@ post-extract: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile index f68cf5d423a..2896a275725 100644 --- a/graphics/xbmbrowser/Makefile +++ b/graphics/xbmbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xbmbrowser5.1 PKGNAME= xbmbrowser-5.1 @@ -12,5 +12,8 @@ COMMENT= View complete directories of X bitmaps and X pixmaps USE_TOOLS+= gmake USE_IMAKE= YES +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xgraph/Makefile b/graphics/xgraph/Makefile index 6674ebe46d1..42429134e65 100644 --- a/graphics/xgraph/Makefile +++ b/graphics/xgraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/09/03 00:56:29 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= xgraph-11.3.2-hack.9 @@ -12,4 +12,6 @@ COMMENT= Tool to draw a graph on an X11 display USE_IMAKE= yes +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 7dc152ec450..bccfc80e908 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/04/17 13:46:36 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xli-2005-02-27 PKGNAME= xli-1.17.0 @@ -15,4 +15,7 @@ INSTALLATION_DIRS+= lib/X11/app-defaults .include "../../graphics/jpeg/buildlink3.mk" .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 a6926649723..9d0f963c9bd 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2006/12/15 20:32:57 joerg Exp $ +# $NetBSD: Makefile,v 1.57 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xpaint-2.7.8.1 PKGREVISION= 2 @@ -20,7 +20,7 @@ SUBST_FILES.foo= Local.config configure SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" \ -e "s|@PREFIX@|${PREFIX}|g" \ -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" \ - -e "s|@XPMDIR@|${BUILDLINK_PREFIX.xpm}|g" + -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g" pre-configure: cd ${WRKSRC} && ./configure xaw3dg diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index ce6d49bc7df..88fe7131620 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2006/12/18 10:13:38 joerg Exp $ +# $NetBSD: Makefile,v 1.53 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xpm-3.4k PKGREVISION= 7 @@ -45,4 +45,7 @@ post-install: .endif +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index be33a992b63..bdd9cd1cfc2 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2006/09/09 02:42:02 obache Exp $ +# $NetBSD: Makefile,v 1.67 2006/12/27 13:37:38 joerg Exp $ DISTNAME= xv-3.10a PKGREVISION= 12 @@ -51,6 +51,10 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv ${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/gcin/Makefile b/inputmethod/gcin/Makefile index 59ab00b503e..c88e75eebfb 100644 --- a/inputmethod/gcin/Makefile +++ b/inputmethod/gcin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/21 06:00:46 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= gcin-1.1.7 @@ -29,4 +29,5 @@ REPLACE_FILES.sh+= scripts/modify-XIM REPLACE_FILES.sh+= scripts/utf8-edit .include "../../x11/gtk2/modules.mk" +.include "../../x11/libXtst/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/kinput2/Makefile b/inputmethod/kinput2/Makefile index feb38a748db..20c3f8d5b41 100644 --- a/inputmethod/kinput2/Makefile +++ b/inputmethod/kinput2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:43 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:38 joerg Exp $ DISTNAME= kinput2-v3 PKGNAME= kinput2-3.0 @@ -24,4 +24,7 @@ pre-configure: do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile index 398c7b2853e..fc48d93210d 100644 --- a/inputmethod/skkinput/Makefile +++ b/inputmethod/skkinput/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/07/05 06:53:13 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:38 joerg Exp $ DISTNAME= skkinput-2.06.3 PKGREVISION= 2 @@ -19,4 +19,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/FAQ.jis ${PREFIX}/share/doc/skkinput ${INSTALL_DATA} ${WRKSRC}/BUGS.jis ${PREFIX}/share/doc/skkinput +.include "../../x11/libXmu/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile index 3ab32b79cbd..e0bf7009cfa 100644 --- a/lang/classpath-gui/Makefile +++ b/lang/classpath-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/05/16 13:27:33 tonio Exp $ +# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:38 joerg Exp $ .include "../../lang/classpath/Makefile.common" @@ -19,4 +19,5 @@ BUILDLINK_TRANSFORM.libart2+= -e 's|/libart2-config|/libart-config|g' .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXtst/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile index a49e8e1a2cc..38ca07f1b8e 100644 --- a/lang/sablevm-classpath-gui/Makefile +++ b/lang/sablevm-classpath-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:38 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:38 joerg Exp $ # .include "../../lang/sablevm-classpath/Makefile.common" @@ -19,8 +19,12 @@ PRINT_PLIST_AWK+= \ /^@dirrm java\/sablevm\/lib\/sablevm-classpath$$/ \ { print "@comment in sablevm-classpath: "$$0; next; } +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXtst/buildlink3.mk" .include "../../mk/java-env.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile index 896421df027..ebc9c57ff32 100644 --- a/lang/swi-prolog-packages/Makefile +++ b/lang/swi-prolog-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/12/15 20:32:58 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:38 joerg Exp $ .include "../../lang/swi-prolog-lite/Makefile.common" @@ -68,6 +68,8 @@ teardownx: .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" #.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile index 67c19c3f8fd..4f4a7bbe7dc 100644 --- a/mail/xmailbox/Makefile +++ b/mail/xmailbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:58 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:38 joerg Exp $ # DISTNAME= xmailbox-2.5 @@ -21,5 +21,8 @@ post-install: 5xmail1.xpm xmail1.xpm xnomail1.xpm \ ${PREFIX}/share/xmailbox +.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/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile index eade9730473..9218a09f6ca 100644 --- a/mail/xmailwatcher/Makefile +++ b/mail/xmailwatcher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:02 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:39 joerg Exp $ DISTNAME= xmailwatcher PKGNAME= ${DISTNAME}-1.6 @@ -11,4 +11,7 @@ COMMENT= Mailbox checker which displays sender and subject lines of mails 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/math/abs/Makefile b/math/abs/Makefile index dae13f37793..349cdeacdc8 100644 --- a/math/abs/Makefile +++ b/math/abs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:58 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:39 joerg Exp $ # DISTNAME= abs-src-0.8 @@ -20,5 +20,7 @@ INSTALLATION_DIRS= bin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/abs ${PREFIX}/bin +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/snns/Makefile b/math/snns/Makefile index 09e682eed8f..59031cf067e 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:58 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:39 joerg Exp $ DISTNAME= SNNSv4.2 PKGNAME= snns-4.2 @@ -32,5 +32,7 @@ post-install: ${PREFIX}/share/examples/snns; \ done +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/xlife/Makefile b/math/xlife/Makefile index 819070d1217..3a23f6c456e 100644 --- a/math/xlife/Makefile +++ b/math/xlife/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/06/21 18:18:05 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:39 joerg Exp $ # DISTNAME= xlife-5.0 @@ -24,4 +24,6 @@ post-install: done .endfor +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/kdrill/Makefile b/misc/kdrill/Makefile index 14966e6b9c0..3dfe75e3d09 100644 --- a/misc/kdrill/Makefile +++ b/misc/kdrill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:11 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:39 joerg Exp $ # DISTNAME= kdrill5.11.6 @@ -31,4 +31,6 @@ post-install: ${GZIP_CMD} -c ${PREFIX}/share/kanjidic/kanjidic > \ ${PREFIX}/share/kdrill/kanjidic.gz +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/root-tail/Makefile b/misc/root-tail/Makefile index e0ba555f230..cae75adce9d 100644 --- a/misc/root-tail/Makefile +++ b/misc/root-tail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/10/04 21:49:19 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:39 joerg Exp $ # DISTNAME= root-tail-0.0.10 @@ -12,4 +12,6 @@ COMMENT= Allows printing of text directly to the X11 root window USE_IMAKE= YES +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile index e9316cdda16..b666d53b830 100644 --- a/misc/xtide/Makefile +++ b/misc/xtide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/12/15 20:32:59 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2006/12/27 13:37:39 joerg Exp $ DISTNAME= xtide-2.8.3 CATEGORIES= misc x11 @@ -35,5 +35,7 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/${HARMONICS_FILE} ${PREFIX}/share/xtide .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile index 1f22217c06c..dfa1e26ce97 100644 --- a/multimedia/mpeg_play/Makefile +++ b/multimedia/mpeg_play/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/10/04 21:50:09 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2006/12/27 13:37:39 joerg Exp $ DISTNAME= mpeg_play-2.4-patched PKGNAME= mpeg_play-2.4patched @@ -18,4 +18,6 @@ pre-configure: ${MV} -f ${WRKSRC}/Imakefile.proto ${WRKSRC}/Imakefile ${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/xanim/Makefile b/multimedia/xanim/Makefile index 02ac8fd0203..79ffa1d249d 100644 --- a/multimedia/xanim/Makefile +++ b/multimedia/xanim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/12/23 10:35:56 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:39 joerg Exp $ DISTNAME= xanim2920 PKGNAME= xanim-2.92.0 @@ -52,5 +52,8 @@ post-extract: .endif .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/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile index 4a8ad402673..4d31e157dad 100644 --- a/net/tightvncviewer/Makefile +++ b/net/tightvncviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/09/03 00:56:29 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:39 joerg Exp $ DISTNAME= tightvnc-1.2.9 PKGNAME= ${DISTNAME:S/tightvnc/tightvncviewer/} @@ -31,5 +31,8 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile index f01bd764962..afe722c6e79 100644 --- a/net/vncviewer/Makefile +++ b/net/vncviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/07/22 19:21:11 abs Exp $ +# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:39 joerg Exp $ DISTNAME= vnc-4_1_2-unixsrc PKGNAME= vncviewer-4.1.2 @@ -32,5 +32,12 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \ ${PREFIX}/man/man1/vncpasswd.1 +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/zlib/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.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/vncviewer/distinfo b/net/vncviewer/distinfo index 77ae0a3eb43..98653131e2d 100644 --- a/net/vncviewer/distinfo +++ b/net/vncviewer/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.9 2006/07/22 19:21:11 abs Exp $ +$NetBSD: distinfo,v 1.10 2006/12/27 13:37:39 joerg Exp $ SHA1 (vnc-4_1_2-unixsrc.tar.gz) = 9d8d8d93f4120b2e60c0ec0fce7e81ea302614e7 RMD160 (vnc-4_1_2-unixsrc.tar.gz) = 2a2d615825e6ac74aca5f0c29d025e576b725dc3 Size (vnc-4_1_2-unixsrc.tar.gz) = 537713 bytes SHA1 (patch-aa) = 2b598d63502b8abc6aaa4cb1bde736e15b455f1a +SHA1 (patch-ab) = dc0c2db92e8d9c09b45bc82b2a61c316ba69cda5 +SHA1 (patch-ac) = 2e59341580ab98c1b245201c5a2b26df1cfa4c0b diff --git a/net/vncviewer/patches/patch-ab b/net/vncviewer/patches/patch-ab new file mode 100644 index 00000000000..535263dcc70 --- /dev/null +++ b/net/vncviewer/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.4 2006/12/27 13:37:39 joerg Exp $ + +--- ../common/configure.orig 2006-12-17 20:32:26.000000000 +0000 ++++ ../common/configure +@@ -1226,9 +1226,10 @@ if test "$ac_x_libraries" = NO; then + cat > conftest.$ac_ext <<EOF + #line 1228 "configure" + #include "confdefs.h" ++#include <X11/Intrinsic.h> + + int main() { +-${x_direct_test_function}() ++${x_direct_test_function}(0) + ; return 0; } + EOF + if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then diff --git a/net/vncviewer/patches/patch-ac b/net/vncviewer/patches/patch-ac new file mode 100644 index 00000000000..5df0fff2573 --- /dev/null +++ b/net/vncviewer/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.1 2006/12/27 13:37:39 joerg Exp $ + +--- configure.orig 2006-12-17 20:33:25.000000000 +0000 ++++ configure +@@ -1230,9 +1230,10 @@ if test "$ac_x_libraries" = NO; then + cat > conftest.$ac_ext <<EOF + #line 1232 "configure" + #include "confdefs.h" ++#include <X11/Intrinsic.h> + + int main() { +-${x_direct_test_function}() ++${x_direct_test_function}(0) + ; return 0; } + EOF + if { (eval echo configure:1239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then diff --git a/net/wmget/Makefile b/net/wmget/Makefile index af9be8992fb..4d12415959c 100644 --- a/net/wmget/Makefile +++ b/net/wmget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/12/15 20:32:59 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/12/27 13:37:39 joerg Exp $ DISTNAME= wmget-0.6.0-src PKGNAME= ${DISTNAME:S/-src//} @@ -26,5 +26,7 @@ SUBST_SED.paths= -e 's|^PREFIX=.*|PREFIX=${LOCALBASE}|' USE_TOOLS+= gmake .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 5b10701a58f..a663de4f476 100644 --- a/net/wminet/Makefile +++ b/net/wminet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/12/15 20:33:00 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:39 joerg Exp $ DISTNAME= wmnet-1.2 PKGNAME= wminet-1.2 @@ -14,5 +14,7 @@ NOT_FOR_PLATFORM= Interix-*-* # no userland protocol stack support USE_X11BASE= 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 684362e5881..f71f137fa52 100644 --- a/net/wmnet/Makefile +++ b/net/wmnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/10/04 21:53:18 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:39 joerg Exp $ DISTNAME= wmnet-1.06 PKGREVISION= 5 @@ -16,4 +16,6 @@ COMMENT= Dockable network monitor USE_IMAKE= YES +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/xrn/Makefile b/news/xrn/Makefile index 4fcaa45b620..519e8b417a1 100644 --- a/news/xrn/Makefile +++ b/news/xrn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:26 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:39 joerg Exp $ # DISTNAME= 9.01 @@ -23,4 +23,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/xrn; \ done +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile index 93880228a4c..23f3693b725 100644 --- a/print/ja-ptex-bin/Makefile +++ b/print/ja-ptex-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/07/27 18:48:03 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2006/12/27 13:37:39 joerg Exp $ DISTNAME= ptex-src-${PTEX_VERS} PKGNAME= ja-ptex-bin-${PTEX_VERS} @@ -111,4 +111,6 @@ do-install: pre-clean: cd ../../print/teTeX3-bin && ${MAKE} clean +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/ssh-askpass/Makefile b/security/ssh-askpass/Makefile index 5d686d743fc..76245faaf42 100644 --- a/security/ssh-askpass/Makefile +++ b/security/ssh-askpass/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/11/14 13:22:06 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:39 joerg Exp $ DISTNAME= x11-ssh-askpass-1.0 PKGNAME= ${DISTNAME:S/^x11-//} @@ -17,4 +17,5 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ssh-askpass ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ssh-askpass +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 3ca3afc846e..babd2d8f982 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2006/12/15 20:33:00 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2006/12/27 13:37:39 joerg Exp $ # DISTNAME= asapm-2.11 @@ -19,8 +19,8 @@ PKG_FAIL_REASON+= "APM needs /usr/include/machine/apmvar.h to build." GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support CONFIGURE_ARGS+= --with-xpm -CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include -CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib +CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include +CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile index 4b91008f5df..a693839882b 100644 --- a/sysutils/xdu/Makefile +++ b/sysutils/xdu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:10:57 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:39 joerg Exp $ # DISTNAME= xdu-3.0 @@ -21,4 +21,7 @@ USE_IMAKE= yes PATCH_DIST_STRIP.xdu-3.0.dirname.patch = -p1 PATCH_DIST_STRIP.xdu-3.0.i18n.patch = -p1 +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xmeter/Makefile b/sysutils/xmeter/Makefile index 03846efa505..ff73c974d75 100644 --- a/sysutils/xmeter/Makefile +++ b/sysutils/xmeter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:44 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:40 joerg Exp $ # DISTNAME= xmeter-1.15 @@ -13,4 +13,7 @@ COMMENT= Distributed system load meter for X11 WRKSRC= ${WRKDIR} 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/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" diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile index a4e2e0cc1d6..2eaa56336ad 100644 --- a/wm/9wm/Makefile +++ b/wm/9wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:53 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:40 joerg Exp $ DISTNAME= 9wm-1.1 PKGREVISION= 2 @@ -13,4 +13,7 @@ COMMENT= 8 1/2-like Window Manager for X WRKSRC= ${WRKDIR} USE_IMAKE= yes +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile index 1e3eaebea68..acf510a1790 100644 --- a/wm/afterstep1/Makefile +++ b/wm/afterstep1/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= AfterStep-1.8.11 PKGNAME= ${DISTNAME:S/AfterStep/afterstep/} @@ -41,5 +41,9 @@ pre-configure: .include "../../audio/rplay/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.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/ctwm/Makefile b/wm/ctwm/Makefile index b731f2c02cd..583699c930f 100644 --- a/wm/ctwm/Makefile +++ b/wm/ctwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:40 joerg Exp $ # DISTNAME= ctwm-3.7 @@ -38,5 +38,8 @@ pre-install: .endfor .include "../../graphics/jpeg/buildlink3.mk" +.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 c0acf0841d6..ea26dd6ac29 100644 --- a/wm/cwm/Makefile +++ b/wm/cwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= cwm-3 @@ -13,5 +13,8 @@ COMMENT= Window manager for X11 initially inspired by evilwm GNU_CONFIGURE= yes USE_TOOLS+= pkg-config +.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 7dfd59a36f8..608bc24ba6f 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.38 2006/12/27 13:37:41 joerg Exp $ DISTNAME= e16-0.16.8.4 PKGNAME= ${DISTNAME:S/e16/enlightenment/} @@ -48,6 +48,13 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" +.include "../../x11/xbitmaps/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" .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/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile index 83202e590ad..4bd90b55bad 100644 --- a/wm/fvwm-devel/Makefile +++ b/wm/fvwm-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:41 joerg Exp $ DISTNAME= fvwm-${FVWM_VER} #PKGREVISION= 1 @@ -34,9 +34,16 @@ post-install: `${LS} | ${GREP} -v Makefile` \ ${PREFIX}/share/examples/fvwm +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/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/wm/fvwm/Makefile b/wm/fvwm/Makefile index 9113e84c110..5714edac8f6 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:01 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:41 joerg Exp $ DISTNAME= fvwm-${FVWM_VER} #PKGREVISION= 1 @@ -76,6 +76,12 @@ CONFIGURE_ARGS+= --without-gtk-prefix .include "../../audio/rplay/buildlink3.mk" .endif +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/readline/buildlink3.mk" +.include "../../x11/libSM/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/wm/fvwm1/Makefile b/wm/fvwm1/Makefile index 254d30d62dc..70816a246b9 100644 --- a/wm/fvwm1/Makefile +++ b/wm/fvwm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:13 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:41 joerg Exp $ DISTNAME= fvwm-1.24r PKGNAME= ${DISTNAME:S/fvwm/fvwm1/} @@ -45,4 +45,10 @@ post-install: ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \ ${PREFIX}/lib/X11/fvwm/bitmaps +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" +.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 4577c0c3c5e..fe96ba1350c 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= golem-0.0.5 @@ -47,5 +47,11 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/sample.golem/golemrc ${EGDIR}/golemrc.default +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/wm/icewm/Makefile b/wm/icewm/Makefile index 59da5ffe828..9b1eefb43d9 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2006/12/27 13:37:41 joerg Exp $ COMMENT= Small, fast and light-weight window manager @@ -6,9 +6,15 @@ CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]* CONFIGURE_ARGS+= --with-gnome-menus=no CONFIGURE_ARGS+= --with-imlib=no -CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.xpm} +CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm} .include "Makefile.common" +.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" .include "../../mk/bsd.pkg.mk" diff --git a/wm/larswm/Makefile b/wm/larswm/Makefile index 8fdb4da10ab..fcc94e89bfa 100644 --- a/wm/larswm/Makefile +++ b/wm/larswm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:13 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= larswm-7.5.3 @@ -37,4 +37,7 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/sample.* ${EGDIR} +.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 c8f46f2e5b7..6095dd6dcfc 100644 --- a/wm/lwm/Makefile +++ b/wm/lwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:14 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:41 joerg Exp $ DISTNAME= lwm-1.2.1 PKGREVISION= 1 @@ -11,4 +11,7 @@ COMMENT= Lightweight Window Manager 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 5863d2a4be5..e906bde1920 100644 --- a/wm/mlvwm/Makefile +++ b/wm/mlvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= mlvwm091 @@ -31,5 +31,7 @@ SUBST_FILES.xpm= sample_rc/Mlvwmrc SUBST_SED.xpm= -e "s,@PREFIX@,${PREFIX}," 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/openbox/Makefile b/wm/openbox/Makefile index 01667b96cc9..6ce59c9a553 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.34 2006/12/27 13:37:41 joerg Exp $ DISTNAME= openbox-3.3.1 CATEGORIES= wm x11 @@ -27,11 +27,16 @@ EGDIR= ${PREFIX}/share/examples/openbox CONF_FILES= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" # disabled by default in 3.3 because "it doesn't seem to work well" #.include "../../x11/startup-notification/buildlink3.mk" diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile index d6b8fa21eec..ee73d84c989 100644 --- a/wm/oroborus/Makefile +++ b/wm/oroborus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= oroborus_2.0.12-1 @@ -14,5 +14,12 @@ COMMENT= Small and simple window manager for X WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= YES +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libSM/buildlink3.mk" +.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/wm/piewm/Makefile b/wm/piewm/Makefile index f3c932af369..6dcbeb9cc13 100644 --- a/wm/piewm/Makefile +++ b/wm/piewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:41 joerg Exp $ DISTNAME= piewm-1.02 PKGREVISION= 2 @@ -11,6 +11,11 @@ COMMENT= Minimalist window manager based on tvtwm with pie menus USE_IMAKE= yes +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .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/skippy/Makefile b/wm/skippy/Makefile index 0297460911e..9cdbc490222 100644 --- a/wm/skippy/Makefile +++ b/wm/skippy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= skippy-0.5.0 @@ -21,4 +21,6 @@ post-install: .include "../../graphics/imlib2/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile index 197cb256b30..c1c98549e88 100644 --- a/wm/tvtwm/Makefile +++ b/wm/tvtwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:41 joerg Exp $ DISTNAME= tvtwm.pl11 PKGNAME= tvtwm-11 @@ -12,5 +12,10 @@ COMMENT= Classic twm with virtual desktop support WRKSRC= ${WRKDIR}/tvtwm USE_IMAKE= YES +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" .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/uwm/Makefile b/wm/uwm/Makefile index 623d93396e1..b3ba812be60 100644 --- a/wm/uwm/Makefile +++ b/wm/uwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:55 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:41 joerg Exp $ DISTNAME= X.V11R3uwm PKGNAME= uwm-19881027 @@ -24,4 +24,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/uwm ${INSTALL_DATA} ${WRKSRC}/default.uwmrc ${PREFIX}/lib/X11/uwm/system.uwmrc +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/w9wm/Makefile b/wm/w9wm/Makefile index 812d42c1c98..2992534c516 100644 --- a/wm/w9wm/Makefile +++ b/wm/w9wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:11:15 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/12/27 13:37:41 joerg Exp $ DISTNAME= w9wm-0.4.2 PKGREVISION= 1 @@ -12,4 +12,6 @@ COMMENT= 8 1/2-like Window Manager for X with virtual desktops 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/windowlab/Makefile b/wm/windowlab/Makefile index 49647524596..dd46d4db88e 100644 --- a/wm/windowlab/Makefile +++ b/wm/windowlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= windowlab-1.33 @@ -24,5 +24,7 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${EGDIR} +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmi/Makefile b/wm/wmi/Makefile index 56dd39f08c1..3cb3856401f 100644 --- a/wm/wmi/Makefile +++ b/wm/wmi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:41 joerg Exp $ # DISTNAME= wmi-10 @@ -13,5 +13,10 @@ COMMENT= Minimalist, flexible and highly customizable window manager USE_LANGUAGES= c c++ GNU_CONFIGURE= yes +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common index e755b98e58a..39e989631a2 100644 --- a/wm/wmx/Makefile.common +++ b/wm/wmx/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile.common,v 1.19 2006/12/27 13:37:42 joerg Exp $ DISTNAME= wmx-6 WMX_VERS= 6.0 @@ -30,4 +30,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx ${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx +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/wm/wmx/distinfo b/wm/wmx/distinfo index 8386c80a6ff..a1bc8ada614 100644 --- a/wm/wmx/distinfo +++ b/wm/wmx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/12/06 16:25:26 joerg Exp $ +$NetBSD: distinfo,v 1.11 2006/12/27 13:37:42 joerg Exp $ SHA1 (wmx-6.tar.gz) = 89563c8c2af1d3ffbee06197928123fd03ae9c54 RMD160 (wmx-6.tar.gz) = 871c0de0ddd30ed90cc8f7eae287fa62177142c4 @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 5921c882abd6769b2adf4fe26bb965982c9a5356 SHA1 (patch-ad) = b4b66989ecfe0dc535abae38ddbbc271200d0c19 SHA1 (patch-ae) = 20f155c556fd06d2cf721ab0620a0c5334b6ace4 SHA1 (patch-af) = 84faece4f23af6d51aa8a87a28da2f5056101113 +SHA1 (patch-ag) = 6b69f800da04ec83fcf40ae6b00ebacdfec193f8 diff --git a/wm/wmx/patches/patch-ag b/wm/wmx/patches/patch-ag new file mode 100644 index 00000000000..b88cfa021a6 --- /dev/null +++ b/wm/wmx/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.1 2006/12/27 13:37:42 joerg Exp $ + +--- configure.orig 2000-05-17 10:53:13.000000000 +0000 ++++ configure +@@ -888,9 +888,10 @@ if test "$ac_x_libraries" = NO; then + cat > conftest.$ac_ext <<EOF + #line 890 "configure" + #include "confdefs.h" ++#include <X11/Intrinsic.h> + + int main() { +-${x_direct_test_function}() ++${x_direct_test_function}(0) + ; return 0; } + EOF + if { (eval echo configure:897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then diff --git a/www/chimera/Makefile b/www/chimera/Makefile index 6e975e99542..4c9511b9748 100644 --- a/www/chimera/Makefile +++ b/www/chimera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:51 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:42 joerg Exp $ # DISTNAME= chimera-2.0a19 @@ -26,4 +26,7 @@ post-install: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index e649b2318ba..38d93a143f9 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile.common,v 1.13 2006/12/27 13:37:42 joerg Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -46,11 +46,17 @@ BUILD_TARGET= # empty UNLIMIT_RESOURCES= datasize memorysize stacksize +.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXi/buildlink3.mk" + .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .if defined(MOZILLA_USE_GTK2) .include "../../net/libIDL/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs .else .include "../../graphics/freetype2/buildlink3.mk" 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" |