11 files changed, 129 insertions, 203 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index f5845ed1f25e..3d24d094dffb 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -6,100 +6,145 @@
 #
 
 PORTNAME=	vnc
-PORTVERSION=	3.3.7
-PORTREVISION=	1
+PORTVERSION=	4.1.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.realvnc.com/dist/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-unixsrc
+# This is a placeholder MASTER_SITES entry -- see the pre-fetch target.
+MASTER_SITES=	http://www.realvnc.com/:vnc
+.if !defined(WITHOUT_SERVER)
+MASTER_SITES+=	${MASTER_SITE_XFREE:S/$/:x/}
+MASTER_SITE_SUBDIR+=	4.3.0/:x
+.endif
+DISTNAME=	vnc-4_1_1-unixsrc
+DISTFILES=	vnc-4_1_1-unixsrc.tar.gz:vnc
+.if !defined(WITHOUT_SERVER)
+DISTFILES+=	X430src-1.tgz:x \
+		X430src-2.tgz:x \
+		X430src-3.tgz:x
+DIST_SUBDIR=	xc
+.endif
 
 MAINTAINER=	james@now.ie
 COMMENT=	Display X and Win32 desktops on remote X/Win32/Java displays
 
+.if !defined(WITHOUT_SERVER)
+RUN_DEPENDS=	xauth:${X_CLIENTS_PORT} \
+		${X11BASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT}
+
+USE_PERL5_RUN=	yes
+
+EXTRA_PATCHES=	${WRKSRC}/xc.patch \
+		${PATCHDIR}/vnc.def-patch \
+		${PATCHDIR}/FreeBSD.cf-patch
+.endif
+
 GNU_CONFIGURE=	yes
-# vnc supplied zlib seg. faults if compiled with -O
+# The vnc supplied zlib seg. faults if compiled with -O
 CONFIGURE_ARGS=	--with-installed-zlib
+USE_GCC=	3.4
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 USE_XPM=	yes
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 PLIST=		${WRKDIR}/pkg-plist
+CONFLICTS=	vnc-[0-9]* tightvnc-[0-9]*
 
 MAN1=		vncviewer.1 \
 		vncpasswd.1 \
-		vncconnect.1
+		vncconfig.1 \
+		x0vncserver.1
 
 .if !defined(WITHOUT_SERVER)
 MAN1+=		Xvnc.1 \
 		vncserver.1
-
-RUN_DEPENDS=	xauth:${X_CLIENTS_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT}
-
-USE_PERL5_RUN=	yes
 .endif
 
 .include <bsd.port.pre.mk>
 
-pre-build:
+# No direct URL for VNC -- have to pseudo-submit their webform.
+pre-fetch:
+	@${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && cd ${DISTDIR}/${DIST_SUBDIR} && \
+	${FETCH_CMD} -o ${DISTNAME}.tar.gz 'http://www.realvnc.com/cgi-bin/download.cgi?product=free4/src/unix&acceptLicense=1&filever=4.1.1&filetype=tar_gz&haveDetails=1'
 .if !defined(WITHOUT_SERVER)
-	@${ECHO_MSG} "NOTE:"
-	@${ECHO_MSG} "   Use 'make -DWITHOUT_SERVER ...' if you do not wish to"
-	@${ECHO_MSG} "   compile/install the VNC server components."
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " ######################################################"
+	@${ECHO_MSG} " # Use 'make -DWITHOUT_SERVER ...' if you do not wish #"
+	@${ECHO_MSG} " # to compile/install the VNC server components.      #"
+	@${ECHO_MSG} " ######################################################"
 	@${ECHO_MSG} ""
 .endif
 
+post-extract:
+.if !defined(WITHOUT_SERVER)
+	@cd ${WRKSRC} && ${TAR} -cf - -C ${WRKDIR} xc | ${TAR} -xf - && \
+	${RM} -rf ${WRKDIR}/xc
+.endif
+
+post-patch:
+.if !defined(WITHOUT_SERVER)
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
+		${WRKSRC}/xc/config/cf/vnc.def
+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' -e 's|%%CXX%%|${CXX}|g' \
+		${WRKSRC}/xc/config/cf/FreeBSD.cf
+.endif
+
 post-build:
 .if defined(WITHOUT_SERVER)
 	@${ECHO_MSG} "Skipping build of VNC server."
 .else
-	@cd ${WRKSRC}/Xvnc && make World
+	cd ${WRKSRC}/xc && make CC=${CC} CXX=${CXX} World
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/Xvnc/config/cf/vnc.def
-
 pre-install:
 	@${RM} -f ${PLIST}
 	@${TOUCH} -f ${PLIST}
+	@${ECHO_CMD} bin/vncviewer >> ${PLIST}
+	@${ECHO_CMD} bin/vncpasswd >> ${PLIST}
+	@${ECHO_CMD} bin/vncconfig >> ${PLIST}
+	@${ECHO_CMD} bin/x0vncserver >> ${PLIST}
 .if !defined(WITHOUT_SERVER)
 	@${ECHO_CMD} bin/Xvnc >> ${PLIST}
 	@${ECHO_CMD} bin/vncserver >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/DesCipher.class >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/animatedMemoryImageSource.class >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/authenticationPanel.class >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/clipboardFrame.class >> ${PLIST}
 	@${ECHO_CMD} share/vnc/classes/index.vnc >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/optionsFrame.class >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/rfbProto.class >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/shared.vnc >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/vncCanvas.class >> ${PLIST}
-	@${ECHO_CMD} share/vnc/classes/vncviewer.class >> ${PLIST}
+	@${ECHO_CMD} share/vnc/classes/logo150x150.gif >> ${PLIST}
 	@${ECHO_CMD} share/vnc/classes/vncviewer.jar >> ${PLIST}
 	@${ECHO_CMD} @dirrm share/vnc/classes >> ${PLIST}
 	@${ECHO_CMD} @dirrm share/vnc >> ${PLIST}
+	@if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \
+		${ECHO_CMD} @cwd ${X11BASE} >> ${PLIST} ; \
+		${ECHO_CMD} lib/modules/extensions/vnc.so >> ${PLIST} ; \
+	fi
 .endif
-	@${ECHO_CMD} bin/vncviewer >> ${PLIST}
-	@${ECHO_CMD} bin/vncpasswd >> ${PLIST}
-	@${ECHO_CMD} bin/vncconnect >> ${PLIST}
 
 do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
+	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
+	${INSTALL_PROGRAM} ${WRKSRC}/vncconfig/vncconfig ${PREFIX}/bin/vncconfig
+	${INSTALL_PROGRAM} ${WRKSRC}/x0vncserver/x0vncserver \
+		${PREFIX}/bin/x0vncserver
+	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man \
+		${PREFIX}/man/man1/vncviewer.1
+	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
+		${PREFIX}/man/man1/vncpasswd.1
+	${INSTALL_MAN} ${WRKSRC}/vncconfig/vncconfig.man \
+		${PREFIX}/man/man1/vncconfig.1
+	${INSTALL_MAN} ${WRKSRC}/x0vncserver/x0vncserver.man \
+		${PREFIX}/man/man1/x0vncserver.1
 .if !defined(WITHOUT_SERVER)
-	${REINPLACE_CMD} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
-		-e 's|^\#!/usr/bin/perl|\#!${PERL}|g' ${WRKSRC}/vncserver
-	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
+	@${REINPLACE_CMD} -e \
+		's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
+		${WRKSRC}/vncserver
+	${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
 	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver
-	${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man ${PREFIX}/man/man1/Xvnc.1
+	@if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \
+		${MKDIR} ${X11BASE}/lib/modules/extensions; \
+		${INSTALL_DATA} ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ${X11BASE}/lib/modules/extensions; \
+	fi
+	${INSTALL_MAN} ${WRKSRC}/xc/programs/Xserver/Xvnc.man \
+		${PREFIX}/man/man1/Xvnc.1
 	${INSTALL_MAN} ${WRKSRC}/vncserver.man ${PREFIX}/man/man1/vncserver.1
-# Go install Java classes
-	${MKDIR} ${PREFIX}/share/vnc
-	${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc
+	${MKDIR} ${PREFIX}/share/vnc/classes
+	${CP} ${WRKDIR}/${DISTNAME}/common/javabin/* ${PREFIX}/share/vnc/classes
 .endif
-	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
-	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
-	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
-	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${PREFIX}/man/man1/vncviewer.1
-	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man ${PREFIX}/man/man1/vncpasswd.1
-	${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man ${PREFIX}/man/man1/vncconnect.1
 
 .include <bsd.port.post.mk>
diff --git a/net/vnc/distinfo b/net/vnc/distinfo
index 6f529aa6aefc..d0ea38839444 100644
--- a/net/vnc/distinfo
+++ b/net/vnc/distinfo
@@ -1,2 +1,8 @@
-MD5 (vnc-3.3.7-unixsrc.tar.gz) = 511ffbc8ed8d9df82e7c67852164728c
-SIZE (vnc-3.3.7-unixsrc.tar.gz) = 2160226
+MD5 (xc/vnc-4_1_1-unixsrc.tar.gz) = 2ddf091a8be9f03bb991a553427d7b89
+SIZE (xc/vnc-4_1_1-unixsrc.tar.gz) = 529894
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+SIZE (xc/X430src-1.tgz) = 10993622
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+SIZE (xc/X430src-2.tgz) = 7962239
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
+SIZE (xc/X430src-3.tgz) = 12366363
diff --git a/net/vnc/files/FreeBSD.cf-patch b/net/vnc/files/FreeBSD.cf-patch
new file mode 100644
index 000000000000..869af7c727e7
--- /dev/null
+++ b/net/vnc/files/FreeBSD.cf-patch
@@ -0,0 +1,18 @@
+--- xc/config/cf/FreeBSD.cf.orig	Mon May 16 17:11:31 2005
++++ xc/config/cf/FreeBSD.cf	Mon May 16 17:11:58 2005
+@@ -162,11 +162,11 @@
+  *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
+  */
+ #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
+-# define CcCmd			$(CLIENTENVSETUP) cc
+-# define CplusplusCmd		$(CLIENTENVSETUP) c++
++# define CcCmd			$(CLIENTENVSETUP) %%CC%%
++# define CplusplusCmd		$(CLIENTENVSETUP) %%CXX%%
+ #else
+-# define CcCmd			cc
+-# define CplusplusCmd		c++
++# define CcCmd			%%CC%%
++# define CplusplusCmd		%%CXX%%
+ #endif
+ 
+ #define CppCmd			/usr/bin/cpp
diff --git a/net/vnc/files/patch-Xvnc::config::cf::FreeBSD.cf b/net/vnc/files/patch-Xvnc::config::cf::FreeBSD.cf
deleted file mode 100644
index 032f430c839e..000000000000
--- a/net/vnc/files/patch-Xvnc::config::cf::FreeBSD.cf
+++ /dev/null
@@ -1,76 +0,0 @@
---- Xvnc/config/cf/FreeBSD.cf.orig	Mon Mar 22 16:41:12 2004
-+++ Xvnc/config/cf/FreeBSD.cf	Wed Mar 24 15:50:22 2004
-@@ -26,6 +26,7 @@
- #define UseGas			YES
- #define GnuCpp			YES
- #define HasNdbm         	YES
-+#define DBMLibrary		/* ndbm is in libc */
- #define HasPutenv       	YES
- #define HasSnprintf		YES
- #define HasBSD44Sockets 	YES
-@@ -50,7 +51,7 @@
- #define MkdirHierCmd		mkdir -p
- 
- #define CcCmd			cc
--#define CppCmd			/usr/libexec/cpp
-+#define CppCmd			/usr/bin/cpp
- #define PreProcessCmd		CppCmd
- #define StandardCppDefines	-traditional
- #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
-@@ -223,12 +224,29 @@
- # define GccGasOption /**/
- #endif
- 
--#define ServerExtraDefines GccGasOption XFree86ServerDefines
-+#ifdef i386Architecture
-+# define ServerExtraDefines GccGasOption XFree86ServerDefines
-+#else
-+# define ServerExtraDefines GccGasOption -D_XSERVER64
-+#endif
- 
- #define StandardDefines	-DCSRG_BASED
- 
-+#ifdef i386Architecture
-+# if OSMajorVersion > 1
-+#  define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
-+# else
-+#  define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
-+# endif
-+#else
-+# if defined(SparcArchitecture) || defined(AlphaArchitecture)
-+#  define ServerOSDefines 	-DDDXOSINIT
-+# else
-+#  define ServerOSDefines 	/**/
-+# endif
-+#endif
-+
- #if OSMajorVersion > 1
--#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
- #define XawI18nDefines		-DUSE_XWCHAR_STRING
- #define HasMakefileSafeInclude	YES
- #define IncludeMakefile(file) @@# dependencies are in .depend
-@@ -241,7 +259,6 @@
- #endif
- #define HasMkstemp		YES
- #else
--#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
- #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
- #endif
- 
-@@ -252,10 +269,15 @@
- #endif
- #endif
- 
-+/* Suppress "The -O2 flag TRIGGERS KNOWN OPTIMIZER BUGS ON THIS PLATFORM" on Alpha 4.x */
- #ifdef i386Architecture
- # define OptimizedCDebugFlags DefaultGcc2i386Opt
- #else
--# define OptimizedCDebugFlags -O2
-+# if defined(AlphaArchitecture) && OSMajorVersion < 5
-+#  define OptimizedCDebugFlags -O
-+# else
-+#  define OptimizedCDebugFlags -O2
-+# endif
- #endif
- 
- #ifndef PreIncDir
diff --git a/net/vnc/files/patch-Xvnc::config::cf::Imake.cf b/net/vnc/files/patch-Xvnc::config::cf::Imake.cf
deleted file mode 100644
index feb47a79a485..000000000000
--- a/net/vnc/files/patch-Xvnc::config::cf::Imake.cf
+++ /dev/null
@@ -1,17 +0,0 @@
---- Xvnc/config/cf/Imake.cf.orig	Mon Mar 22 16:41:05 2004
-+++ Xvnc/config/cf/Imake.cf	Mon Mar 22 16:27:03 2004
-@@ -154,6 +154,14 @@
- #  define i386Architecture
- #  undef i386
- # endif
-+# if defined(__sparc64__) || defined(sparc)
-+#  define SparcArchitecture
-+#  undef sparc
-+# endif
-+# ifdef __alpha__
-+#   define AlphaArchitecture
-+#   undef __alpha__
-+# endif
- #endif /* __FreeBSD__ */
- 
- #ifdef AMOEBA
diff --git a/net/vnc/files/patch-Xvnc::config::cf::vnc.def b/net/vnc/files/patch-Xvnc::config::cf::vnc.def
deleted file mode 100644
index e9f159e1f1f4..000000000000
--- a/net/vnc/files/patch-Xvnc::config::cf::vnc.def
+++ /dev/null
@@ -1,10 +0,0 @@
---- Xvnc/config/cf/vnc.def.orig	Wed Mar 24 11:45:48 2004
-+++ Xvnc/config/cf/vnc.def	Wed Mar 24 11:53:03 2004
-@@ -122,6 +122,9 @@
- #endif
- #endif
- 
-+#ifdef FreeBSDArchitecture
-+#define ProjectRoot %%X11BASE%%
-+#endif
- 
diff --git a/net/vnc/files/patch-Xvnc::config::imake::imakemdep.h b/net/vnc/files/patch-Xvnc::config::imake::imakemdep.h
deleted file mode 100644
index 1aaeade24b1f..000000000000
--- a/net/vnc/files/patch-Xvnc::config::imake::imakemdep.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- Xvnc/config/imake/imakemdep.h.orig	Sat Nov 24 16:43:07 2001
-+++ Xvnc/config/imake/imakemdep.h	Sat Nov 24 16:44:48 2001
-@@ -225,6 +225,9 @@
- #ifdef hpux
- #define USE_CC_E
- #endif
-+#if defined(__FreeBSD__)
-+#define USE_CC_E
-+#endif
- #ifdef WIN32
- #define USE_CC_E
- #define DEFAULT_CC "cl"
-@@ -253,7 +256,7 @@
- #ifdef _CRAY
- #define DEFAULT_CPP "/lib/pcpp"
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #define DEFAULT_CPP "/usr/libexec/cpp"
- #endif
- #if defined(__sgi) && defined(__ANSI_CPP__)
diff --git a/net/vnc/files/patch-Xvnc::include::Xos.h b/net/vnc/files/patch-Xvnc::include::Xos.h
deleted file mode 100644
index e843b940fc00..000000000000
--- a/net/vnc/files/patch-Xvnc::include::Xos.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- Xvnc/include/Xos.h.orig	Sat Jul 13 02:14:08 2002
-+++ Xvnc/include/Xos.h	Sat Jul 13 02:14:15 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/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsparc.s b/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsparc.s
deleted file mode 100644
index b2ef87117d12..000000000000
--- a/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsparc.s
+++ /dev/null
@@ -1,11 +0,0 @@
---- Xvnc/programs/Xserver/cfb/stipsparc.s.orig	Wed Mar 24 16:34:12 2004
-+++ Xvnc/programs/Xserver/cfb/stipsparc.s	Wed Mar 24 16:34:49 2004
-@@ -85,7 +85,7 @@
- #define ForEachBits	LY4
- #define NextBits	LY5
- 
--#ifdef SVR4
-+#if defined(SVR4) || defined(__ELF__)
- #ifdef TETEXT
- #define	_cfbStippleStack	cfbStippleStackTE
- #else
diff --git a/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsprc32.s b/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsprc32.s
deleted file mode 100644
index 9559eb81015b..000000000000
--- a/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsprc32.s
+++ /dev/null
@@ -1,11 +0,0 @@
---- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig	Thu Mar 25 10:28:07 2004
-+++ Xvnc/programs/Xserver/cfb/stipsprc32.s	Thu Mar 25 10:29:02 2004
-@@ -81,7 +81,7 @@
- #define ForEachBits	LY4
- #define NextBits	LY5
- 
--#ifdef SVR4
-+#if defined(SVR4) || defined(__ELF__)
- #ifdef TETEXT
- #define	_cfb32StippleStack	cfb32StippleStackTE
- #else
diff --git a/net/vnc/files/vnc.def-patch b/net/vnc/files/vnc.def-patch
new file mode 100644
index 000000000000..7916363a71fd
--- /dev/null
+++ b/net/vnc/files/vnc.def-patch
@@ -0,0 +1,13 @@
+--- xc/config/cf/vnc.def.orig	Mon Feb 28 12:59:09 2005
++++ xc/config/cf/vnc.def	Mon May 16 16:24:57 2005
+@@ -15,6 +15,10 @@
+ #define BuildXKB NO
+ #endif
+ 
++#ifdef FreeBSDArchitecture
++#define ProjectRoot %%X11BASE%%
++#endif
++
+ #define HasFreetype2 NO
+ #define BuildVNCExt YES
+ #define VNCExtDefines -DVNCEXT