10 files changed, 61 insertions, 92 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index d4170aaf85bf..71ca7d78945f 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -6,52 +6,41 @@
 #
 
 PORTNAME=	vnc
-PORTVERSION=	3.3.3.2
-PORTREVISION=	1
+PORTVERSION=	3.3.5
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.uk.research.att.com/vnc/dist/ \
-		ftp://ftp.uk.research.att.com/pub/vnc/dist/
-DISTFILES=	vnc-3.3.3r2_unixsrc.tgz \
-		vnc-latest_doc.tgz
-EXTRACT_ONLY=	vnc-3.3.3r2_unixsrc.tgz
+MASTER_SITES=	http://www.realvnc.com/dist/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-unixsrc
 
-PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=	vnc-3.3.3r2-v6-20010421.diff.gz
-PATCH_DIST_STRIP=	-p1
+MAINTAINER=	mchopra@engmail.uwaterloo.ca
 
-MAINTAINER=	ports@FreeBSD.org
+GNU_CONFIGURE=	yes
+USE_PERL5_RUN=	yes
+USE_REINPLACE=	yes
 
-USE_PERL5=	yes
-IGNOREFILES=	vnc-latest_doc.tgz
-WRKSRC=		${WRKDIR}/vnc_unixsrc
-USE_IMAKE=	yes
-NO_INSTALL_MANPAGES=	yes
-ALL_TARGET=	World
+MAN1=		Xvnc.1 \
+		vncviewer.1 \
+		vncpasswd.1 \
+		vncconnect.1 \
+		vncserver.1
 
-# We have to frob a few things, and we want our own permissions, so it's easier
-# to do the install ourselves.
-post-install:
+post-build:
+	@cd ${WRKSRC}/Xvnc && make World
+
+do-install:
+	${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
 	${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
+	${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man ${PREFIX}/man/man1/Xvnc.1
+	${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
+	${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
-.if !defined(NOPORTDOCS)
-# The documentation comes with bogus ownerships; this is a little leaky
-# security-wise
-	${TAR} -C ${PREFIX}/share/doc -xzf ${DISTDIR}/vnc-latest_doc.tgz
-	(cd ${PREFIX}/share/doc; ${RM} -rf vnc; ${MV} vnc_docs vnc)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
-# Add to PLIST because VNC developers can't/won't freeze their doc
-# distfile.
-	(cd ${PREFIX}; ls share/doc/vnc/* >> ${TMPPLIST})
-	${ECHO_CMD} '@dirrm share/doc/vnc' >> ${TMPPLIST}
-.endif
+
 .include <bsd.port.mk>
diff --git a/net/vnc/distinfo b/net/vnc/distinfo
index 8fc2bae4d6fc..6f56eb0fce9c 100644
--- a/net/vnc/distinfo
+++ b/net/vnc/distinfo
@@ -1,3 +1 @@
-MD5 (vnc-3.3.3r2_unixsrc.tgz) = 6fc83e1b6153d3252649953267713f17
-MD5 (vnc-3.3.3r2-v6-20010421.diff.gz) = 05b2ccf5179f61ac8a52f02693331ad6
-MD5 (vnc-latest_doc.tgz) = IGNORE
+MD5 (vnc-3.3.5-unixsrc.tar.gz) = cd1d0cfa4ae7d43d3cbf994b40018f3e
diff --git a/net/vnc/files/patch-Xvnc-programs-Xserver-os-osinit.c b/net/vnc/files/patch-Xvnc-programs-Xserver-os-osinit.c
deleted file mode 100644
index affc9dd74697..000000000000
--- a/net/vnc/files/patch-Xvnc-programs-Xserver-os-osinit.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- Xvnc/programs/Xserver/os/osinit.c.orig	Thu Nov  7 22:41:44 2002
-+++ Xvnc/programs/Xserver/os/osinit.c	Thu Nov  7 22:41:59 2002
-@@ -48,6 +48,7 @@
- /* $XConsortium: osinit.c /main/45 1996/12/02 10:23:13 lehors $ */
- /* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.12 1997/01/18 06:58:02 dawes Exp $ */
- 
-+#include <stdlib.h>
- #include <stdio.h>
- #include "X.h"
- #include "os.h"
diff --git a/net/vnc/files/patch-Xvnc-programs-Xserver-os-transport.c b/net/vnc/files/patch-Xvnc-programs-Xserver-os-transport.c
deleted file mode 100644
index 6177bed85f9f..000000000000
--- a/net/vnc/files/patch-Xvnc-programs-Xserver-os-transport.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- Xvnc/lib/xtrans/transport.c	Thu Nov  7 23:01:27 2002
-+++ Xvnc/lib/xtrans/transport.c	Thu Nov  7 23:02:10 2002
-@@ -53,6 +53,7 @@
-  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#include <stdlib.h>
- #ifdef XSERV_t
- #include "os.h"
- #else
diff --git a/net/vnc/files/patch-ad b/net/vnc/files/patch-Xvnc::config::imake::imakemdep.h
index 16728734e6ed..1aaeade24b1f 100644
--- a/net/vnc/files/patch-ad
+++ b/net/vnc/files/patch-Xvnc::config::imake::imakemdep.h
@@ -1,11 +1,11 @@
---- Xvnc/config/imake/imakemdep.h~	Sat Jul 26 19:41:05 1997
-+++ Xvnc/config/imake/imakemdep.h	Fri Nov 26 23:21:33 1999
+--- 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
++#define USE_CC_E
 +#endif
  #ifdef WIN32
  #define USE_CC_E
@@ -15,9 +15,7 @@
  #define DEFAULT_CPP "/lib/pcpp"
  #endif
 -#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) 
++#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
new file mode 100644
index 000000000000..e843b940fc00
--- /dev/null
+++ b/net/vnc/files/patch-Xvnc::include::Xos.h
@@ -0,0 +1,10 @@
+--- 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::dix::Imakefile b/net/vnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile
new file mode 100644
index 000000000000..c1ecf008a8f1
--- /dev/null
+++ b/net/vnc/files/patch-Xvnc::programs::Xserver::dix::Imakefile
@@ -0,0 +1,20 @@
+--- Xvnc/programs/Xserver/dix/Imakefile.orig	Fri Mar 29 05:30:51 2002
++++ Xvnc/programs/Xserver/dix/Imakefile	Fri Mar 29 05:32:27 2002
+@@ -36,15 +36,11 @@
+  * changed.
+  */
+ 
+-#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
+ 
+ #ifdef DefaultDisplayClass
+ DEFAULTDISPLAYCLASS = DefaultDisplayClass
diff --git a/net/vnc/files/patch-aa b/net/vnc/files/patch-aa
deleted file mode 100644
index 57614f540689..000000000000
--- a/net/vnc/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-*** Imakefile.orig	Mon May 18 06:18:46 1998
---- Imakefile	Sat Jun 20 17:24:00 1998
-***************
-*** 11,16 ****
---- 11,18 ----
-  	@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/vnc/files/patch-ae b/net/vnc/files/patch-ae
deleted file mode 100644
index 7414cf7ce773..000000000000
--- a/net/vnc/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-*** vncviewer/Imakefile.orig	Tue Nov  7 14:08:52 2000
---- vncviewer/Imakefile	Tue Nov  7 14:09:11 2000
-***************
-*** 35,38 ****
-  
-  OBJS = $(SRCS:.c=.o)
-  
-! ComplexProgramTarget(vncviewer)
---- 35,38 ----
-  
-  OBJS = $(SRCS:.c=.o)
-  
-! ComplexProgramTargetNoMan(vncviewer)
diff --git a/net/vnc/pkg-descr b/net/vnc/pkg-descr
index 02dd35ca33d6..6e59c67872cd 100644
--- a/net/vnc/pkg-descr
+++ b/net/vnc/pkg-descr
@@ -4,4 +4,4 @@
  anywhere on the Internet and from a wide variety of machine
  architectures."
 
-WWW: http://www.uk.research.att.com/vnc/
+WWW: http://www.realvnc.com/