15 files changed, 57 insertions, 66 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index dd045ce63241..3d1f831841c8 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tightvnc
 PORTVERSION=	1.3.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net java
 MASTER_SITES=	SF/vnc-tight/TightVNC-unix/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}_unixsrc
@@ -14,33 +14,26 @@ COMMENT=	Enhanced version of VNC
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENCE.TXT
 
+BROKEN_aarch64=	Fails to build: invokes x86 asm
+USES=		cpe imake jpeg shebangfix perl5 tar:bzip2
+USE_XORG=	ice sm x11 xaw xext xmu xt xpm
+
 RUN_DEPENDS=	showrgb:x11/rgb \
 		xauth:x11/xauth \
 		xorg-fonts>=7.2:x11-fonts/xorg-fonts
 
-BROKEN_aarch64=	Fails to build: invokes x86 asm
-
 MAKE_JOBS_UNSAFE=	yes
-CONFLICTS=	tridiavnc-[0-9]* vnc-[0-9]* tigervnc-*
+CONFLICTS=	tigervnc-*
 WRKSRC=		${WRKDIR}/vnc_unixsrc
-USES=		cpe imake jpeg shebangfix perl5 tar:bzip2
 SHEBANG_FILES=	vncserver
 CFLAGS+=	-Wno-return-type
-USE_XORG=	xaw
 ALL_TARGET=	World
 
 OPTIONS_DEFINE=	JVNC_VIEWER
+OPTIONS_SUB=	yes
 JVNC_VIEWER_DESC=	Install Java-based vnc viewer
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJVNC_VIEWER}
-USE_JAVA=	yes
-JAVA_RUN=	yes
-PLIST_SUB+=	JVNC_VIEWER=""
-.else
-PLIST_SUB+=	JVNC_VIEWER="@comment "
-.endif
+JVNC_VIEWER_USE_JAVA=	yes
+JVNC_VIEWER_JAVA_RUN=	yes
 
 .ifdef(TIGHTVNC_BASE)
 PREFIX=${TIGHTVNC_BASE}
@@ -68,9 +61,9 @@ do-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${FILE}
 .endfor
 .endif
-.if ${PORT_OPTIONS:MJVNC_VIEWER}
+
+do-install-JVNC_VIEWER-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/classes
 	${INSTALL_DATA} ${WRKSRC}/classes/*.* ${STAGEDIR}${DATADIR}/classes
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/tightvnc/files/patch-Imakefile b/net/tightvnc/files/patch-Imakefile
index 29b65c8b2beb..6e9d0c3b8184 100644
--- a/net/tightvnc/files/patch-Imakefile
+++ b/net/tightvnc/files/patch-Imakefile
@@ -1,6 +1,6 @@
---- Imakefile.orig	Wed May 22 23:19:15 2002
-+++ Imakefile	Wed May 22 23:20:03 2002
-@@ -11,6 +11,7 @@
+--- Imakefile.orig	2002-04-30 13:07:31 UTC
++++ Imakefile
+@@ -11,6 +11,7 @@ World:
  	@echo Built $(SUBDIRS).
  	@echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"'
  	@echo ""
diff --git a/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf b/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf
index 99b35a2822f4..286200ca89c1 100644
--- a/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf
+++ b/net/tightvnc/files/patch-Xvnc__config__cf__FreeBSD.cf
@@ -1,6 +1,6 @@
---- Xvnc/config/cf/FreeBSD.cf.orig	2000-06-11 21:00:51.000000000 +0900
-+++ Xvnc/config/cf/FreeBSD.cf	2009-03-09 08:18:00.000000000 +0900
-@@ -223,7 +223,9 @@ XCOMM operating system:  OSName (OSMajor
+--- Xvnc/config/cf/FreeBSD.cf.orig	2000-06-11 12:00:51 UTC
++++ Xvnc/config/cf/FreeBSD.cf
+@@ -223,7 +223,9 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  # define GccGasOption /**/
  #endif
  
@@ -10,7 +10,7 @@
  
  #define StandardDefines	-DCSRG_BASED
  
-@@ -253,11 +253,17 @@
+@@ -253,11 +255,17 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  #endif
  
  #ifdef i386Architecture
@@ -30,7 +30,7 @@
  #ifndef PreIncDir
  # define PreIncDir	/usr/include
  #endif
-@@ -353,12 +359,15 @@
+@@ -353,12 +361,15 @@ install.man::                                         
  #define HasBsdMake	YES
  #endif
  
diff --git a/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf b/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf
index 1aaf39698bcb..0a6f6502e43a 100644
--- a/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf
+++ b/net/tightvnc/files/patch-Xvnc__config__cf__Imake.cf
@@ -1,6 +1,6 @@
---- Xvnc/config/cf/Imake.cf.orig	2006-12-23 21:07:55.000000000 +0900
-+++ Xvnc/config/cf/Imake.cf	2007-09-05 07:45:05.000000000 +0900
-@@ -206,6 +206,12 @@
+--- Xvnc/config/cf/Imake.cf.orig	2006-12-23 12:07:55 UTC
++++ Xvnc/config/cf/Imake.cf
+@@ -206,6 +206,12 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.66 2001/04/1
  #  define i386Architecture
  #  undef i386
  # endif
diff --git a/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def b/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def
index 79c1e70adfbf..56df2fe3629b 100644
--- a/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def
+++ b/net/tightvnc/files/patch-Xvnc__config__cf__vnclibs.def
@@ -1,5 +1,5 @@
---- Xvnc/config/cf/vnclibs.def.orig     Sat May  3 11:31:54 2003
-+++ Xvnc/config/cf/vnclibs.def  Tue Sep 26 21:48:43 2006
+--- Xvnc/config/cf/vnclibs.def.orig	2003-05-03 09:31:55 UTC
++++ Xvnc/config/cf/vnclibs.def
 @@ -5,13 +5,6 @@
   * and programs/Xserver/hw/vnc whenever you change this file.
   */
diff --git a/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h b/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h
index 1aaeade24b1f..7b19d50df4b8 100644
--- a/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h
+++ b/net/tightvnc/files/patch-Xvnc__config__imake__imakemdep.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- Xvnc/config/imake/imakemdep.h.orig	2003-02-19 16:39:54 UTC
++++ Xvnc/config/imake/imakemdep.h
+@@ -225,6 +225,9 @@ in this Software without prior written authorization f
  #ifdef hpux
  #define USE_CC_E
  #endif
@@ -10,7 +10,7 @@
  #ifdef WIN32
  #define USE_CC_E
  #define DEFAULT_CC "cl"
-@@ -253,7 +256,7 @@
+@@ -253,7 +256,7 @@ in this Software without prior written authorization f
  #ifdef _CRAY
  #define DEFAULT_CPP "/lib/pcpp"
  #endif
diff --git a/net/tightvnc/files/patch-Xvnc__include__Xos.h b/net/tightvnc/files/patch-Xvnc__include__Xos.h
index e843b940fc00..f1aa9b3b65a3 100644
--- a/net/tightvnc/files/patch-Xvnc__include__Xos.h
+++ b/net/tightvnc/files/patch-Xvnc__include__Xos.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- Xvnc/include/Xos.h.orig	2000-06-11 12:00:51 UTC
++++ Xvnc/include/Xos.h
+@@ -151,7 +151,6 @@ extern int sys_nerr;
  #endif /* X_NOT_POSIX else */
  
  #ifdef CSRG_BASED
diff --git a/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile b/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
index ce42359c5f83..6999b947181f 100644
--- a/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__dix__Imakefile
@@ -1,6 +1,6 @@
---- 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 @@
+--- Xvnc/programs/Xserver/dix/Imakefile.orig	2009-03-05 06:38:33 UTC
++++ Xvnc/programs/Xserver/dix/Imakefile
+@@ -43,15 +43,11 @@ OBJS = atom.o colormap.o cursor.o devices.o dispatch.o
   * changed.
   */
  
diff --git a/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c b/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c
index 42fc342840c6..9ff1dcdce046 100644
--- a/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__vnc__sockets.c
@@ -1,5 +1,5 @@
---- Xvnc/programs/Xserver/hw/vnc/sockets.c      Tue Mar 19 18:59:22 2002
-+++ Xvnc/programs/Xserver/hw/vnc/sockets.c      Fri Nov  1 18:03:02 2002
+--- Xvnc/programs/Xserver/hw/vnc/sockets.c.orig	2006-12-23 12:07:55 UTC
++++ Xvnc/programs/Xserver/hw/vnc/sockets.c
 @@ -38,6 +38,7 @@
   */
  
diff --git a/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__xfree86__common__compiler.h b/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__xfree86__common__compiler.h
index d4a1a9e3b70b..7c04be736d08 100644
--- a/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__xfree86__common__compiler.h
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__xfree86__common__compiler.h
@@ -1,6 +1,6 @@
---- Xvnc/programs/Xserver/hw/xfree86/common/compiler.h.orig	2015-12-23 13:48:48.097424000 +0800
-+++ Xvnc/programs/Xserver/hw/xfree86/common/compiler.h	2015-12-23 13:49:19.871472000 +0800
-@@ -371,7 +371,7 @@
+--- Xvnc/programs/Xserver/hw/xfree86/common/compiler.h.orig	2000-06-11 12:00:51 UTC
++++ Xvnc/programs/Xserver/hw/xfree86/common/compiler.h
+@@ -371,7 +371,7 @@ static __inline__ unsigned long ldw_u(unsigned short *
  #define mem_barrier()   /* NOP */
  #define write_mem_barrier()   /* NOP */
  
diff --git a/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile b/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile
index e2c803c61be1..daf52ebd5668 100644
--- a/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__Imakefile
@@ -1,6 +1,6 @@
---- Xvnc/programs/Xserver/os/Imakefile.orig	Sun Jun 11 21:00:52 2000
-+++ Xvnc/programs/Xserver/os/Imakefile	Fri Dec  6 02:53:22 2002
-@@ -135,7 +135,7 @@
+--- Xvnc/programs/Xserver/os/Imakefile.orig	2000-06-11 12:00:51 UTC
++++ Xvnc/programs/Xserver/os/Imakefile
+@@ -135,7 +135,7 @@ SpecialCObjectRule(xalloc,$(ICONFIGFILES),NullParamete
  #if defined(SparcArchitecture) && HasGcc && !HasGcc2
  oscolor.o: oscolor.c $(ICONFIGFILES)
  	$(RM) $@
diff --git a/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c b/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c
index 820b5ccac84f..ac2de3ac6a0c 100644
--- a/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c
+++ b/net/tightvnc/files/patch-Xvnc__programs__Xserver__os__access.c
@@ -1,6 +1,6 @@
---- Xvnc/programs/Xserver/os/access.c.orig	2000-06-11 21:00:51.000000000 +0900
-+++ Xvnc/programs/Xserver/os/access.c	2007-09-05 12:07:30.000000000 +0900
-@@ -634,7 +634,7 @@
+--- Xvnc/programs/Xserver/os/access.c.orig	2000-06-11 12:00:51 UTC
++++ Xvnc/programs/Xserver/os/access.c
+@@ -634,7 +634,7 @@ DefineSelf (fd)
  #endif
      ifc.ifc_len = sizeof (buf);
      ifc.ifc_buf = buf;
diff --git a/net/tightvnc/files/patch-vncserver b/net/tightvnc/files/patch-vncserver
index 60e5b581f274..8dbd47bdae27 100644
--- a/net/tightvnc/files/patch-vncserver
+++ b/net/tightvnc/files/patch-vncserver
@@ -1,12 +1,11 @@
---- vncserver.orig      Thu Aug 10 13:01:07 2006
-+++ vncserver   Tue Sep 26 21:08:10 2006
-@@ -38,7 +38,7 @@
+--- vncserver.orig	2019-03-26 05:19:17 UTC
++++ vncserver
+@@ -34,7 +34,7 @@ $depth = 24;
  $desktopName = "X";
  $vncClasses = "/usr/local/vnc/classes";
  $vncUserDir = "$ENV{HOME}/.vnc";
 -$fontPath = "unix/:7100";
 +#$fontPath = "unix/:7100";
  $authType = "-rfbauth $vncUserDir/passwd";
-
- # Here is another example of setting the font path:
-
+ 
+ # Read configuration from the system-wide and user files if present.
diff --git a/net/tightvnc/files/patch-vncviewer__Imakefile b/net/tightvnc/files/patch-vncviewer__Imakefile
index 0cf49c07a7c0..3851b177dd48 100644
--- a/net/tightvnc/files/patch-vncviewer__Imakefile
+++ b/net/tightvnc/files/patch-vncviewer__Imakefile
@@ -1,6 +1,6 @@
---- vncviewer/Imakefile.orig	Thu Sep 26 11:26:17 2002
-+++ vncviewer/Imakefile	Thu Sep 26 11:28:47 2002
-@@ -10,17 +10,12 @@
+--- vncviewer/Imakefile.orig	2003-03-12 16:20:34 UTC
++++ vncviewer/Imakefile
+@@ -10,17 +10,12 @@ XCOMM seems to cause problems on Digital Unix.
  DEFINES = -DMITSHM
  #endif
  
@@ -22,7 +22,7 @@
  
  DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
  LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
-@@ -44,4 +39,4 @@
+@@ -45,4 +40,4 @@ SRCS = \
  
  OBJS = $(SRCS:.c=.o)
  
diff --git a/net/tightvnc/files/patch-vncviewer__rfbproto.c b/net/tightvnc/files/patch-vncviewer__rfbproto.c
index fa93af733cb0..0ebb8037ce64 100644
--- a/net/tightvnc/files/patch-vncviewer__rfbproto.c
+++ b/net/tightvnc/files/patch-vncviewer__rfbproto.c
@@ -1,6 +1,6 @@
---- vncviewer/rfbproto.c~	2006-12-08 18:20:03.000000000 +1100
-+++ vncviewer/rfbproto.c	2013-09-29 09:19:34.782746129 +1000
-@@ -569,7 +569,7 @@
+--- vncviewer/rfbproto.c.orig	2006-12-08 07:20:03 UTC
++++ vncviewer/rfbproto.c
+@@ -569,7 +569,7 @@ AuthenticateVNC(void)
      passwd = getpass("Password: ");
    }
  
@@ -9,4 +9,3 @@
      fprintf(stderr, "Reading password failed\n");
      return False;
    }
-