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 /wm/wmx | |
| 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 'wm/wmx')
| -rw-r--r-- | wm/wmx/Makefile.common | 7 | ||||
| -rw-r--r-- | wm/wmx/distinfo | 3 | ||||
| -rw-r--r-- | wm/wmx/patches/patch-ag | 16 |
3 files changed, 24 insertions, 2 deletions
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common index e755b98e58a..39e989631a2 100644 --- a/wm/wmx/Makefile.common +++ b/wm/wmx/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile.common,v 1.19 2006/12/27 13:37:42 joerg Exp $ DISTNAME= wmx-6 WMX_VERS= 6.0 @@ -30,4 +30,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx ${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" diff --git a/wm/wmx/distinfo b/wm/wmx/distinfo index 8386c80a6ff..a1bc8ada614 100644 --- a/wm/wmx/distinfo +++ b/wm/wmx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/12/06 16:25:26 joerg Exp $ +$NetBSD: distinfo,v 1.11 2006/12/27 13:37:42 joerg Exp $ SHA1 (wmx-6.tar.gz) = 89563c8c2af1d3ffbee06197928123fd03ae9c54 RMD160 (wmx-6.tar.gz) = 871c0de0ddd30ed90cc8f7eae287fa62177142c4 @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 5921c882abd6769b2adf4fe26bb965982c9a5356 SHA1 (patch-ad) = b4b66989ecfe0dc535abae38ddbbc271200d0c19 SHA1 (patch-ae) = 20f155c556fd06d2cf721ab0620a0c5334b6ace4 SHA1 (patch-af) = 84faece4f23af6d51aa8a87a28da2f5056101113 +SHA1 (patch-ag) = 6b69f800da04ec83fcf40ae6b00ebacdfec193f8 diff --git a/wm/wmx/patches/patch-ag b/wm/wmx/patches/patch-ag new file mode 100644 index 00000000000..b88cfa021a6 --- /dev/null +++ b/wm/wmx/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.1 2006/12/27 13:37:42 joerg Exp $ + +--- configure.orig 2000-05-17 10:53:13.000000000 +0000 ++++ configure +@@ -888,9 +888,10 @@ if test "$ac_x_libraries" = NO; then + cat > conftest.$ac_ext <<EOF + #line 890 "configure" + #include "confdefs.h" ++#include <X11/Intrinsic.h> + + int main() { +-${x_direct_test_function}() ++${x_direct_test_function}(0) + ; return 0; } + EOF + if { (eval echo configure:897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |