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 /mail | |
| 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 'mail')
| -rw-r--r-- | mail/xmailbox/Makefile | 5 | ||||
| -rw-r--r-- | mail/xmailwatcher/Makefile | 5 |
2 files changed, 8 insertions, 2 deletions
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" |