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/aterm | |
| 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/aterm')
| -rw-r--r-- | x11/aterm/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 7471cc741f8..f25f239841b 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile,v 1.33 2006/12/27 13:37:42 joerg Exp $ # DISTNAME= aterm-1.0.0 @@ -20,8 +20,8 @@ CONFIGURE_ARGS+=--enable-background-image \ --enable-fading \ --enable-graphics \ --with-xpm \ - --with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include \ - --with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib \ + --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include \ + --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib \ --with-jpeg \ --with-jpeg-includes=${BUILDLINK_PREFIX.jpeg}/include \ --with-jpeg-library=${BUILDLINK_PREFIX.jpeg}/lib \ @@ -43,8 +43,13 @@ CONFIGURE_ARGS+= --enable-ttygid SPECIAL_PERMS= ${PREFIX}/bin/aterm ${SETUID_ROOT_PERMS} .endif +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |