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 /x11/libXpm | |
| 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 'x11/libXpm')
| -rw-r--r-- | x11/libXpm/buildlink3.mk | 4 |
1 files changed, 3 insertions, 1 deletions
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}+ |