diff options
| author | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-12-27 13:37:35 +0000 |
| commit | 9d817a0670ab62446c7e477d722a0da1c8c7e489 (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /math | |
| parent | 173784dbf29b9a9d5e49dcecae83fbc5794121e0 (diff) | |
| download | pkgsrc-9d817a0670ab62446c7e477d722a0da1c8c7e489.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 'math')
| -rw-r--r-- | math/abs/Makefile | 4 | ||||
| -rw-r--r-- | math/snns/Makefile | 4 | ||||
| -rw-r--r-- | math/xlife/Makefile | 4 |
3 files changed, 9 insertions, 3 deletions
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" |