Make compile on Solaris (fix typo introduced by IPv6 patch).

Don't override ${CC} when compiling imake
Install Xvnc sgid root, as Xsun creates /tmp/.X11-* 770.

4 files changed, 39 insertions, 2 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index ea62eaabded..ddeac76e50c 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/08/21 02:12:15 grant Exp $
+# $NetBSD: Makefile,v 1.26 2002/10/23 18:16:58 bouyer Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
@@ -30,10 +30,19 @@ WRKSRC=			${WRKDIR}/vnc_unixsrc
 
 ALL_TARGET=		World
 
+MAKE_ENV+= CC=${CC}	#for make imake in Xvnc/config/imake
+
 # We have to frob a few things, and we want our own permissions, so it's easier
 # to do the install ourselves.
+
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
+.if ${OPSYS} == "SunOS"
+	${CHOWN} root:root ${PREFIX}/bin/Xvnc
+	${CHMOD} 2555 ${PREFIX}/bin/Xvnc
+.endif
 	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
 	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
 	${SED} -e 's|/usr/local/vnc/classes|${X11PREFIX}/share/vnc/classes|g' \
diff --git a/net/vnc/distinfo b/net/vnc/distinfo
index bcc68cb461e..d8051d0e074 100644
--- a/net/vnc/distinfo
+++ b/net/vnc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/04/25 04:33:46 itojun Exp $
+$NetBSD: distinfo,v 1.6 2002/10/23 18:16:58 bouyer Exp $
 
 SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
 Size (vnc-3.3.3r2_unixsrc.tgz) = 2072772 bytes
@@ -13,3 +13,5 @@ SHA1 (patch-ad) = a524db9a403428bd750819d25e6157d4c3cb96f7
 SHA1 (patch-ae) = 399ff1527ff75eee7d181dd4f90f95edab028bd7
 SHA1 (patch-af) = 369961aa3e089195653980da91e8fba53807fc53
 SHA1 (patch-ag) = 89ce8a6ac8d51ffd4d4be4588e59b7dd53366716
+SHA1 (patch-ah) = 0f9f3f3c9b167a2743e8dab2df430b0526346867
+SHA1 (patch-ai) = 0e8e49a44fbe2cf8f371a1224e0064b7cb28597c
diff --git a/net/vnc/patches/patch-ah b/net/vnc/patches/patch-ah
new file mode 100644
index 00000000000..3957c025c68
--- /dev/null
+++ b/net/vnc/patches/patch-ah
@@ -0,0 +1,10 @@
+--- Xvnc/config/imake/Makefile.ini.orig	Wed Oct 23 19:00:22 2002
++++ Xvnc/config/imake/Makefile.ini	Wed Oct 23 19:00:32 2002
+@@ -10,7 +10,6 @@
+ # $XFree86: xc/config/imake/Makefile.ini,v 3.4.2.1 1997/06/11 12:08:33 dawes Exp $
+ 
+ BOOTSTRAPCFLAGS = 
+-CC = cc
+ CDEBUGFLAGS = -O
+ INCLUDES = -I../../include -I../../imports/x11/include/X11
+ CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
diff --git a/net/vnc/patches/patch-ai b/net/vnc/patches/patch-ai
new file mode 100644
index 00000000000..db9904f8aaa
--- /dev/null
+++ b/net/vnc/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 2002/10/23 18:16:59 bouyer Exp $
+
+--- Xvnc/programs/Xserver/hw/vnc/sockets.c.orig	Wed Oct 23 19:16:52 2002
++++ Xvnc/programs/Xserver/hw/vnc/sockets.c	Wed Oct 23 19:18:31 2002
+@@ -512,9 +512,9 @@
+ #else
+     addr.su_len = sizeof(struct sockaddr_in);
+     if (rfbLocalhostOnly)
+-        addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
++        addr.su_sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+     else
+-        addr.sin_addr.s_addr = htonl(INADDR_ANY);
++        addr.su_sin.sin_addr.s_addr = htonl(INADDR_ANY);
+ #endif
+ 
+     if ((sock = socket(addr.su_family, SOCK_STREAM, 0)) < 0) {