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 /sysutils | |
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.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/asapm/Makefile | 6 | ||||
-rw-r--r-- | sysutils/xdu/Makefile | 5 | ||||
-rw-r--r-- | sysutils/xmeter/Makefile | 5 |
3 files changed, 11 insertions, 5 deletions
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" |