1: Build Xvnc now. Sync patches from net/tightvnc.

2: reset MAINTAINER to ports@
3: Bump PORTSREVISION.

Submitted by:	yjchou@ #bsdchat
Approved by:	dwcjr

14 files changed, 161 insertions, 26 deletions

diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index a5a46681b7cc..08ae8d91d12d 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tridiavnc
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.developvnc.org/logged-in/downloadnow/
@@ -14,25 +15,30 @@ MASTER_SITE_SUBDIR=dwcjr
 DISTNAME=	DevVNC_unix
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	dwcjr@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/unix/vnc_unixsrc
 USE_IMAKE=	yes
+ALL_TARGET=	World
 NO_INSTALL_MANPAGES=	yes
+XFREE86_HTML_MAN=	no
+
+post-patch:
+.for file in vncviewer/Imakefile Xvnc/config/cf/vnclibs.def Xvnc/config/cf/Imake.tmpl
+	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/${file}
+.endfor
+	@${PERL} -pi -e "s,/usr/local/vnc/classes,${DATADIR}/classes,g ; \
+		s,^#!/usr/bin/perl,#!${PERL},g" ${WRKSRC}/vncserver
 
 # We have to frob a few things, and we want our own permissions, so it's easier
 # to do the install ourselves.
 post-install:
-#	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
+	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
 	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
 	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
 	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
-	${SED}  -e s%/usr/local/vnc/classes%${PREFIX}/share/vnc/classes% \
-		-e s%^\#!/usr/bin/perl%\#!${PERL}% \
-		< ${WRKSRC}/vncserver \
-		> ${WRKSRC}/vncserver.local
-	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
+	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver
 # Go install Java classes
 	${MKDIR} ${PREFIX}/share/vnc
 	${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc
diff --git a/net/tridiavnc/files/patch-Imakefile b/net/tridiavnc/files/patch-Imakefile
new file mode 100644
index 000000000000..825c39d8a00a
--- /dev/null
+++ b/net/tridiavnc/files/patch-Imakefile
@@ -0,0 +1,14 @@
+--- Imakefile.orig	Thu Nov  9 02:41:59 2000
++++ Imakefile	Wed Nov 20 01:27:33 2002
+@@ -10,10 +10,7 @@
+ 	XCOMM END TridiaVNC_Source_Internal
+ 	make depend
+ 	make all
+-	@echo ""
+-	@echo Built $(SUBDIRS).
+-	@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
+-	@echo ""
++	cd Xvnc; make World
+ 
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.cf b/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.cf
new file mode 100644
index 000000000000..65bdc1a4dd2d
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.cf
@@ -0,0 +1,14 @@
+--- Xvnc/config/cf/Imake.cf.orig	Thu Feb  8 03:49:57 2001
++++ Xvnc/config/cf/Imake.cf	Wed Nov 20 21:32:23 2002
+@@ -154,6 +154,11 @@
+ #  define i386Architecture
+ #  undef i386
+ # endif
++# ifdef __alpha__
++#  define AlphaBsdArchitecture
++#  define AlphaArchitecture
++#  undef __alpha__
++# endif
+ #endif /* __FreeBSD__ */
+ 
+ #ifdef AMOEBA
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.tmpl b/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.tmpl
new file mode 100644
index 000000000000..42784802ff70
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::config::cf::Imake.tmpl
@@ -0,0 +1,11 @@
+--- Xvnc/config/cf/Imake.tmpl.orig	Thu Apr 13 02:18:19 2000
++++ Xvnc/config/cf/Imake.tmpl	Wed Nov 20 21:48:33 2002
+@@ -1254,7 +1254,7 @@
+         LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+      CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+ 
+-           LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
++           LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) -L%%LOCALBASE%%/lib
+ #if HasBrokenCCForLink
+            CCLINK = LdCmd
+ #else
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::vnclibs.def b/net/tridiavnc/files/patch-Xvnc::config::cf::vnclibs.def
new file mode 100644
index 000000000000..88131df15dc4
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::config::cf::vnclibs.def
@@ -0,0 +1,10 @@
+--- Xvnc/config/cf/vnclibs.def.orig	Wed Apr 19 01:18:53 2000
++++ Xvnc/config/cf/vnclibs.def	Wed Nov 20 22:05:54 2002
+@@ -5,5 +5,5 @@
+  * and programs/Xserver/hw/vnc whenever you change this file.
+  */
+ 
+-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a $(TOP)/../zlib/libz.a
+-VNCCPPFLAGS = -I$(TOP)/../include -I$(TOP)/../zlib
++VNCLIBS = $(TOP)/../libvncauth/libvncauth.a -lz 
++VNCCPPFLAGS = -I$(TOP)/../include -I%%LOCALBASE%%/include
diff --git a/net/tridiavnc/files/patch-Xvnc::config::cf::xfree86.cf b/net/tridiavnc/files/patch-Xvnc::config::cf::xfree86.cf
new file mode 100644
index 000000000000..5a19e04ef80d
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::config::cf::xfree86.cf
@@ -0,0 +1,11 @@
+--- Xvnc/config/cf/xfree86.cf.orig	Thu Apr 13 02:18:21 2000
++++ Xvnc/config/cf/xfree86.cf	Wed Nov 20 21:32:23 2002
+@@ -782,7 +782,7 @@
+ #endif
+ 
+ #ifndef XFree86ConsoleDefines
+-#ifdef i386BsdArchitecture
++#if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture)
+ #define XFree86ConsoleDefines	-DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT
+ #else
+ #define XFree86ConsoleDefines	/**/
diff --git a/net/tridiavnc/files/patch-Xvnc::include::Xos.h b/net/tridiavnc/files/patch-Xvnc::include::Xos.h
new file mode 100644
index 000000000000..3ea59e29a87f
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::include::Xos.h
@@ -0,0 +1,10 @@
+--- Xvnc/include/Xos.h.orig	Thu Apr 13 02:18:22 2000
++++ Xvnc/include/Xos.h	Wed Nov 20 20:42:00 2002
+@@ -151,7 +151,6 @@
+ #endif /* X_NOT_POSIX else */
+ 
+ #ifdef CSRG_BASED
+-#include <stdlib.h>
+ #include <unistd.h>
+ #endif /* CSRG_BASED */
+ 
diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile
new file mode 100644
index 000000000000..4a05fb4b3d4f
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile
@@ -0,0 +1,17 @@
+--- Xvnc/programs/Xserver/dix/Imakefile.orig	Thu Apr 13 02:18:32 2000
++++ Xvnc/programs/Xserver/dix/Imakefile	Wed Nov 20 20:44:05 2002
+@@ -37,12 +37,12 @@
+  */
+ 
+ #ifdef DefaultFontPath
+-DEFAULTFONTPATH = DefaultFontPath
++DEFAULTFONTPATH = ${X11BASE}/lib/X11/fonts/misc
+ SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\"
+ #endif
+ 
+ #ifdef DefaultRGBDatabase
+-DEFAULTRGBDATABASE = DefaultRGBDatabase
++DEFAULTRGBDATABASE = ${X11BASE}/lib/X11/rgb
+    SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\"
+ #endif
+ 
diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::rfb.h b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::rfb.h
new file mode 100644
index 000000000000..e09799ea6dcf
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::rfb.h
@@ -0,0 +1,10 @@
+--- Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	Fri Feb  9 05:37:33 2001
++++ Xvnc/programs/Xserver/hw/vnc/rfb.h	Wed Nov 20 21:14:27 2002
+@@ -23,6 +23,7 @@
+  *  USA.
+  */
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include "scrnintstr.h"
+ #include "colormapst.h"
diff --git a/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c
new file mode 100644
index 000000000000..7e555741b9a6
--- /dev/null
+++ b/net/tridiavnc/files/patch-Xvnc::programs::Xserver::hw::vnc::sockets.c
@@ -0,0 +1,18 @@
+--- Xvnc/programs/Xserver/hw/vnc/sockets.c.orig	Fri Nov 10 21:41:53 2000
++++ Xvnc/programs/Xserver/hw/vnc/sockets.c	Wed Nov 20 22:08:01 2002
+@@ -38,6 +38,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/socket.h>
+@@ -541,6 +542,7 @@
+     int sock;
+     int one = 1;
+ 
++    memset(&addr, 0, sizeof(addr));
+     addr.sin_family = AF_INET;
+     addr.sin_port = htons(port);
+     addr.sin_addr.s_addr = interface.s_addr;
diff --git a/net/tridiavnc/files/patch-main-Imakefile b/net/tridiavnc/files/patch-main-Imakefile
deleted file mode 100644
index cf5e0229a6c5..000000000000
--- a/net/tridiavnc/files/patch-main-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- Imakefile.orig	Thu Jun 14 14:42:57 2001
-+++ Imakefile	Thu Jun 14 14:43:05 2001
-@@ -14,6 +14,7 @@
- 	@echo Built $(SUBDIRS).
- 	@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
- 	@echo ""
-+	(cd Xvnc; make World)
- 
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
diff --git a/net/tridiavnc/files/patch-viewer-Imakefile b/net/tridiavnc/files/patch-viewer-Imakefile
deleted file mode 100644
index 802db722c4b6..000000000000
--- a/net/tridiavnc/files/patch-viewer-Imakefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- vncviewer/Imakefile.orig	Thu Jun 14 14:45:01 2001
-+++ vncviewer/Imakefile	Thu Jun 14 14:45:16 2001
-@@ -41,4 +41,4 @@
- 
- OBJS = $(SRCS:.c=.o)
- 
--ComplexProgramTarget(vncviewer)
-+ComplexProgramTargetNoMan(vncviewer)
diff --git a/net/tridiavnc/files/patch-vncviewer::Imakefile b/net/tridiavnc/files/patch-vncviewer::Imakefile
new file mode 100644
index 000000000000..077ad0a1cbe8
--- /dev/null
+++ b/net/tridiavnc/files/patch-vncviewer::Imakefile
@@ -0,0 +1,32 @@
+--- vncviewer/Imakefile.orig	Wed Oct 11 23:53:21 2000
++++ vncviewer/Imakefile	Wed Nov 20 22:16:14 2002
+@@ -8,9 +8,9 @@
+ 
+ #if defined(HPArchitecture)
+ INCLUDES = -I/usr/include/X11R6 -I/usr/contrib/X11R6/include \
+-	-I../include -I. -I../zlib
++	-I../include -I. -I/usr/local/include
+ #else
+-INCLUDES = -I../include -I. -I../zlib
++INCLUDES = -I../include -I. -I/usr/local/include
+ #endif
+ 
+ #if defined(AIXArchitecture)
+@@ -18,9 +18,9 @@
+ #endif
+ 
+ VNCAUTH_LIB = ../libvncauth/libvncauth.a
+-ZLIB_LIB = ../zlib/libz.a
++ZLIB_LIB = -lz
+ 
+-DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) $(ZLIB_LIB)
++DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
+ LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(LOCAL_LIBPATH_OPTION)
+ 
+ SRCS = \
+@@ -41,4 +41,4 @@
+ 
+ OBJS = $(SRCS:.c=.o)
+ 
+-ComplexProgramTarget(vncviewer)
++ComplexProgramTargetNoMan(vncviewer)
diff --git a/net/tridiavnc/pkg-plist b/net/tridiavnc/pkg-plist
index c5516ae2ecfd..5ac68409b13a 100644
--- a/net/tridiavnc/pkg-plist
+++ b/net/tridiavnc/pkg-plist
@@ -1,4 +1,4 @@
-@comment bin/Xvnc
+bin/Xvnc
 bin/vncviewer
 bin/vncpasswd
 bin/vncserver