From 9d817a0670ab62446c7e477d722a0da1c8c7e489 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 27 Dec 2006 13:37:35 +0000
Subject: - 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.
---
 wm/wmx/Makefile.common  |  7 ++++++-
 wm/wmx/distinfo         |  3 ++-
 wm/wmx/patches/patch-ag | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 wm/wmx/patches/patch-ag

(limited to 'wm/wmx')

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
-- 
cgit v1.2.3