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/xlockmore | |
| 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/xlockmore')
| -rw-r--r-- | x11/xlockmore/Makefile.common | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index ed42bf18556..852bd07b2df 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.45 2006/11/06 10:04:42 joerg Exp $ +# $NetBSD: Makefile.common,v 1.46 2006/12/27 13:37:46 joerg Exp $ # # This Makefile.common is included by: # @@ -71,7 +71,14 @@ CONFIGURE_ARGS+= --without-dpms CONFIGURE_ARGS+= --disable-allow-root .endif +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libICE/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" # Set the complete paths to the sound files and set the default xlock # mode/screensaver. |