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 | 90e452c4cd09620859115e0d4e58a25bcc1e282a (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /lang | |
| parent | f0be9a3937d29cae297d06a13ca6a1c5faa979a3 (diff) | |
| download | pkgsrc-90e452c4cd09620859115e0d4e58a25bcc1e282a.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.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/classpath-gui/Makefile | 3 | ||||
| -rw-r--r-- | lang/sablevm-classpath-gui/Makefile | 6 | ||||
| -rw-r--r-- | lang/swi-prolog-packages/Makefile | 4 |
3 files changed, 10 insertions, 3 deletions
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" |