- 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.

4 files changed, 43 insertions, 2 deletions

diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile
index f01bd764962..afe722c6e79 100644
--- a/net/vncviewer/Makefile
+++ b/net/vncviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/07/22 19:21:11 abs Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:39 joerg Exp $
 
 DISTNAME=       	vnc-4_1_2-unixsrc
 PKGNAME=		vncviewer-4.1.2
@@ -32,5 +32,12 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
 		${PREFIX}/man/man1/vncpasswd.1
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vncviewer/distinfo b/net/vncviewer/distinfo
index 77ae0a3eb43..98653131e2d 100644
--- a/net/vncviewer/distinfo
+++ b/net/vncviewer/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/07/22 19:21:11 abs Exp $
+$NetBSD: distinfo,v 1.10 2006/12/27 13:37:39 joerg Exp $
 
 SHA1 (vnc-4_1_2-unixsrc.tar.gz) = 9d8d8d93f4120b2e60c0ec0fce7e81ea302614e7
 RMD160 (vnc-4_1_2-unixsrc.tar.gz) = 2a2d615825e6ac74aca5f0c29d025e576b725dc3
 Size (vnc-4_1_2-unixsrc.tar.gz) = 537713 bytes
 SHA1 (patch-aa) = 2b598d63502b8abc6aaa4cb1bde736e15b455f1a
+SHA1 (patch-ab) = dc0c2db92e8d9c09b45bc82b2a61c316ba69cda5
+SHA1 (patch-ac) = 2e59341580ab98c1b245201c5a2b26df1cfa4c0b
diff --git a/net/vncviewer/patches/patch-ab b/net/vncviewer/patches/patch-ab
new file mode 100644
index 00000000000..535263dcc70
--- /dev/null
+++ b/net/vncviewer/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.4 2006/12/27 13:37:39 joerg Exp $
+
+--- ../common/configure.orig	2006-12-17 20:32:26.000000000 +0000
++++ ../common/configure
+@@ -1226,9 +1226,10 @@ if test "$ac_x_libraries" = NO; then
+ cat > conftest.$ac_ext <<EOF
+ #line 1228 "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:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/net/vncviewer/patches/patch-ac b/net/vncviewer/patches/patch-ac
new file mode 100644
index 00000000000..5df0fff2573
--- /dev/null
+++ b/net/vncviewer/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2006/12/27 13:37:39 joerg Exp $
+
+--- configure.orig	2006-12-17 20:33:25.000000000 +0000
++++ configure
+@@ -1230,9 +1230,10 @@ if test "$ac_x_libraries" = NO; then
+ cat > conftest.$ac_ext <<EOF
+ #line 1232 "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:1239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then