Tight VNC, from www.tightvnc.com.

14 files changed, 1028 insertions, 0 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
new file mode 100644
index 00000000000..fad2c5bad3c
--- /dev/null
+++ b/net/tightvnc/Makefile
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.1 2001/09/23 01:34:29 mycroft Exp $
+#
+
+DISTNAME=		tightvnc-1.2.0
+PKGNAME=		tightvnc-1.2.0
+CATEGORIES=		net x11
+MASTER_SITES=		http://prdownloads.sourceforge.net/vnc-tight/ \
+			ftp://ftp.uk.research.att.com/pub/vnc/dist/
+DISTFILES=		tightvnc-1.2.0_unixsrc.tar.bz2 \
+			vnc-3.3.2r2_doc.tgz
+
+MAINTAINER=		mycroft@netbsd.org
+HOMEPAGE=		http://www.tightvnc.com/
+COMMENT=		Display X and Win32 desktops on remote X/Win32/Java displays
+
+CONFLICTS=		vnc-*
+
+CRYPTO=			yes
+NO_INSTALL_MANPAGES=	yes
+USE_IMAKE=		yes
+USE_PERL5=		yes
+
+WRKSRC=			${WRKDIR}/vnc_unixsrc
+
+ALL_TARGET=		World
+
+# 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}/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' \
+		-e 's|/usr/bin/perl|${PERL5}|g' \
+		< ${WRKSRC}/vncserver \
+		> ${WRKSRC}/vncserver.local
+	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vnc
+	cd ${WRKDIR}; \
+	${INSTALL_DATA} *.GIF *.css *.gif *.jpg *.htm *.html *.pdf \
+	  ${PREFIX}/share/doc/vnc
+
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
new file mode 100644
index 00000000000..603efbaba80
--- /dev/null
+++ b/net/tightvnc/distinfo
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1 2001/09/23 01:34:29 mycroft Exp $
+
+SHA1 (tightvnc-1.2.0_unixsrc.tar.bz2) = 377386d48f0431b6df3be2bb2ce597a30f0361fc
+Size (tightvnc-1.2.0_unixsrc.tar.bz2) = 1717392 bytes
+SHA1 (patch-aa) = c642605b62bccc7fca23eda3d00654015bf3b8ab
+SHA1 (patch-ab) = f31282e99502dc50b53c660472aa297ef25e0772
+SHA1 (patch-ac) = 3b551e6c749ca793a165f49a21d10bb4437d00f7
+SHA1 (patch-ad) = a524db9a403428bd750819d25e6157d4c3cb96f7
+SHA1 (patch-ae) = 399ff1527ff75eee7d181dd4f90f95edab028bd7
+SHA1 (patch-af) = 369961aa3e089195653980da91e8fba53807fc53
+SHA1 (patch-ag) = 0cb088fd8c5b2bad1e990a3e81e7b3a26c46f000
+SHA1 (patch-ba) = 15b5fd12abd04ef8caa43e9ce2d540f3df81db60
+SHA1 (patch-bb) = 5c16b81e57acfcc0dabce4ee3f429dd9be322d89
+SHA1 (patch-bc) = a7f399320d3c06fa5c6ee940a8ede4c6422c7937
diff --git a/net/tightvnc/patches/patch-aa b/net/tightvnc/patches/patch-aa
new file mode 100644
index 00000000000..46795362ff8
--- /dev/null
+++ b/net/tightvnc/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1 2001/09/23 01:34:30 mycroft Exp $
+
+--- Imakefile.orig	Thu Oct 26 14:28:32 2000
++++ Imakefile
+@@ -1,7 +1,7 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags
+ 
+-SUBDIRS = libvncauth vncviewer vncpasswd vncconnect
++SUBDIRS = libvncauth vncpasswd vncconnect
+ 
+ World:
+ 	make Makefiles
+@@ -9,8 +9,7 @@
+ 	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/tightvnc/patches/patch-ab b/net/tightvnc/patches/patch-ab
new file mode 100644
index 00000000000..9ff2935b483
--- /dev/null
+++ b/net/tightvnc/patches/patch-ab
@@ -0,0 +1,715 @@
+$NetBSD: patch-ab,v 1.1 2001/09/23 01:34:30 mycroft Exp $
+
+Sync this with what we shipped with NetBSD-1.5 with the exception that 
+HasXdmAuth is set to NO (since vnc doesn't have the Wraphelp.c file).
+This fixes problems on pmax, alpha, and maybe others.
+
+--- Xvnc/config/cf/NetBSD.cf.orig	Sat Jul 26 06:30:39 1997
++++ Xvnc/config/cf/NetBSD.cf	Sat Sep 22 17:59:51 2001
+@@ -2,9 +2,37 @@
+ 
+ 
+ 
+-XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.9 1997/07/26 06:30:39 dawes Exp $
++XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.13 1999/10/12 17:18:20 hohndel Exp $
+ 
+ 
++  
++XCOMM
++XCOMM This file currently contains support for:
++XCOMM
++XCOMM 		NetBSD/i386	client/server
++XCOMM 		NetBSD/sparc	client/server
++XCOMM 		NetBSD/sparc64	client/server
++XCOMM 		NetBSD/sun3	client/server
++XCOMM 		NetBSD/hp300	client
++XCOMM 		NetBSD/mac68k	client/server
++XCOMM 		NetBSD/pmax	client/server
++XCOMM		NetBSD/amiga	client/server
++XCOMM		NetBSD/alpha	client/server
++XCOMM		NetBSD/arm32	client/server
++XCOMM		NetBSD/atari	client/server
++XCOMM		NetBSD/vax	client/server
++XCOMM		NetBSD/pc532	client
++XCOMM		NetBSD/x68k	client/server
++XCOMM		NetBSD/macppc	client/server
++XCOMM		NetBSD/hpcmips	client/server
++XCOMM		NetBSD/next68k	client
++XCOMM		NetBSD/prep	client
++XCOMM		NetBSD/news68k	client
++XCOMM		NetBSD/cobalt	client
++XCOMM		NetBSD/sgimips	client
++XCOMM		NetBSD/luna68k	client
++XCOMM
++
+ #ifndef OSName
+ #define OSName			DefaultOSName OSBinaryType
+ #endif
+@@ -14,24 +42,34 @@
+ #ifndef OSMinorVersion
+ #define OSMinorVersion		DefaultOSMinorVersion
+ #endif
++/* XXX this does not deal with patches, but, patches should not affect it */
++/* 1 = A, 2 = B, 3 = C, 4 = D, 5 = E, ... */
+ #ifndef OSTeenyVersion
+ #define OSTeenyVersion		DefaultOSTeenyVersion
+ #endif
+ 
+ 
+ #ifndef OSVendor
+-#define	OSVendor	/**/
++#define	OSVendor		The NetBSD Foundation, Inc.
+ #endif
+ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+ 
+ /*
++ * Enable support for "xdmauth" authentification.
++ */
++#ifndef HasXdmAuth
++#define HasXdmAuth NO
++#endif
++
++/*
+  * C library features
+  */
+ #if ((OSMajorVersion > 1) || \
+      (OSMajorVersion == 1 && OSMinorVersion > 2) || \
+      (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1))
+-#  define HasPoll			YES
++# define HasPoll		YES
+ #endif
++
+ #define HasNdbm         	YES
+ #define HasPutenv       	YES
+ #define HasSnprintf		YES
+@@ -61,7 +99,20 @@
+      (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2))
+ #  define HasDlsymBug		YES
+ #endif
+-/* Mkstemp is there since 1.2 (at least) */
++
++/*
++ * The USB HID library came after 1.4
++ */
++#if ((OSMajorVersion == 1 && OSMinorVersion > 4) || \
++     (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion > 8))
++#  define HasUsbLib		YES
++#endif
++
++  
++#if OSMajorVersion >= 1
++# define LexCmd			lex -l
++#endif
++
+ #if (!(OSMajorVersion == 0 || \
+        (OSMajorVersion == 1 && OSMinorVersion < 2))) 
+ #define HasMkstemp		YES
+@@ -85,6 +136,7 @@
+ #define NeedVarargsPrototypes	YES
+ #define NeedWidePrototypes	NO
+ 
++#define HasMktemp		NO
+ #define MkdirHierCmd		mkdir -p
+ 
+ #define CppCmd          	/usr/libexec/cpp
+@@ -96,13 +148,15 @@
+ #define CcCmd 			gcc
+ #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
+ #define DefaultCCOptions 	/**/
++#elif defined(arm32Architecture)
++#define DefaultCCOptions 	-ansi -Dasm=__asm -fsigned-char -fomit-frame-pointer
+ #else
+ #define DefaultCCOptions 	-ansi -Dasm=__asm
+ #endif
+ 
+ #define GccGasOption 		-DGCCUSESGAS
+ #define AsmDefines 		-DUSE_GAS
+-
++  
+ /* UseElfFormat defaults to YES if __ELF__ set */
+ #ifndef UseElfFormat
+ # ifdef __ELF__
+@@ -114,60 +168,234 @@
+ #endif
+ 
+ /*
++ * Make sure the binaries know where to look for the shared libaries.
++ * NOTE: This is done in bsdLib.rules for ELF libraries!
++ */
++#if (OSMajorVersion == 1 && OSMinorVersion >= 2) || OSMajorVersion > 1
++# if !defined(UseElfFormat) || UseElfFormat == NO
++#  define ExtraLoadFlags	-R$(USRLIBDIR)
++# endif
++#endif
++
++/*
+  * Dynamic loading supported starting in 1.0 on a.out platforms,
+  * and on all ELF platforms.
+- *
+- * XXX May not be correct on NetBSD/pmax (ELF, but might not have
+- * working shared libs).
+  */
+ #if ((OSMajorVersion > 0) && \
+      !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \
+     UseElfFormat
+ # ifndef BuildDynamicLoading
+-# define BuildDynamicLoading	YES
++#  define BuildDynamicLoading	YES
++# endif
++# ifndef ForceNormalLib
++#  define ForceNormalLib	YES
+ # endif
+ #endif
+ 
+ #if UseElfFormat
+-#define DlLibrary		-rdynamic /* no -ldl yet */
++# define DlLibrary		-rdynamic /* no -ldl yet */
+ #else
+-#define DlLibrary		/**/
++# define DlLibrary		/**/
+ #endif
+ 
++/* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */
+ #ifdef i386Architecture
++# ifndef DefaultGcc2i386Opt
++#  if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2)
++    /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */
++#   define DefaultGcc2i386Opt -O2
++#  endif
++# endif
+ # define OptimizedCDebugFlags 	DefaultGcc2i386Opt
+ # if OSMajorVersion < 1
+ #  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
+ # else
+ #  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+ # endif
+-# if OSMajorVersion == 1 && OSMinorVersion >= 1 || OSMajorVersion >= 2
+-#  define ServerExtraSysLibs	-li386 DlLibrary
+-# endif
+-#else
+-# define OptimizedCDebugFlags 	-O2
+-# if defined(SparcArchitecture) || defined(AlphaArchitecture)
+-#  define ServerOSDefines 	-DDDXOSINIT
+-# else
+-#  define ServerOSDefines 	/**/
+-# endif
+ # if BuildDynamicLoading
+-#  define ServerExtraSysLibs	DlLibrary
++#  define ServerExtraSysLibs	-li386 DlLibrary
+ # else
+ #  define ServerExtraSysLibs	/**/
+ # endif
+-#endif
+-#ifdef i386Architecture
+ # define ServerExtraDefines GccGasOption XFree86ServerDefines
+ # ifndef XFree86ConsoleDefines
+ #  define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
+ # endif
+ #else
+-# if defined(AlphaArchitecture)
+-#  define ServerExtraDefines GccGasOption -D_XSERVER64
++# if defined(m68kArchitecture) && OSMajorVersion == 1 && OSMinorVersion <= 3
++#  define OptimizedCDebugFlags 	-O
+ # else
+-#  define ServerExtraDefines GccGasOption
++#  define OptimizedCDebugFlags 	-O2
++# endif
++#endif
++
++/*
++ * On mips, all libs are compiled with ABIcalls, not just sharedlibs.
++ * Disable MIPS specific code which was not used and tested.
++ */
++#if defined(MipsArchitecture)
++# define SeparateSharedCompile NO
++# undef MipsArchitecture
++#endif
++
++#if defined(SparcArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# if defined(Sparc64Architecture)
++#  define ServerExtraDefines	GccGasOption -D_XSERVER64
++# else
++#  define ServerExtraDefines	GccGasOption
++# endif
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(Sun3Architecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__sun3__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(hp300Architecture)
++# define BuildServer		NO		/* XXX */
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(mac68kArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__mac68k__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(AlphaArchitecture)
++# define BuildServer		YES
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D_XSERVER64
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# undef OptimizedCDebugFlags			/* XXX ??? */
++# define OptimizedCDebugFlags			/* XXX ??? */
++#endif
++
++#if defined(amigaArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__amiga__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# define XserverNeedsSetUID	YES
++#endif
++
++#if defined(arm32Architecture)
++# define BuildServer		YES
++# define ServerOSDefines	-DDDXOSINIT -DDDXTIME
++# define ServerExtraDefines	GccGasOption XFree86ServerDefines
++# ifndef XFree86ConsoleDefines
++#  define XFree86ConsoleDefines -DPCCONS_SUPPORT
+ # endif
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(atariArchitecture)
++# define BuildServer		YES
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption XFree86ServerDefines -D__atari__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(VaxArchitecture)
++# define BuildServer		NO
++# define ServerExtraDefines	GccGasOption
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(pc532Architecture)
++# define BuildServer		NO
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(x68kArchitecture)
++# define BuildServer		YES
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__x68k__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# define XserverNeedsSetUID	YES
++#endif
++
++#if defined(macppcArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__macppc__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
++#endif
++
++#if defined(pmaxArchitecture)
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(hpcmipsArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define BuildServer		YES
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# define ServerExtraDefines	-DSTATIC_COLOR
++# define XserverNeedsSetUID	YES
++#endif
++
++#if defined(next68kArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(prepArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(news68kArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(cobaltArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(sgimipsArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(luna68kArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#ifndef OptimizedCDebugFlags
++# define OptimizedCDebugFlags 	-O2
++#endif
++
++#ifndef PositionIndependentCFlags
++# define PositionIndependentCFlags	-fPIC
+ #endif
+ 
+ #define StandardDefines	-DCSRG_BASED
+@@ -177,7 +405,18 @@
+ #define ExtraLibraries		/**/
+ #endif
+ #ifndef UseGnuMalloc
++/*
++ * There is no way to map 1.4J correctly to OS*Version, so 'J' is mapped
++ * to OSTeenyVersion == 10. This should be save since there will never a
++ * release for 1.4.10.
++ */
++# if ((OSMajorVersion > 1) || \
++     (OSMajorVersion == 1 && OSMinorVersion > 4) || \
++     (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 10))
++#  define UseGnuMalloc		NO
++# else
+ #  define UseGnuMalloc		YES
++# endif
+ #endif
+ #ifndef GnuMallocLibrary
+ #define GnuMallocLibrary	-lgnumalloc
+@@ -191,6 +430,13 @@
+ #endif
+ #endif 
+ 
++/* 1.4R and later has setusercontext() */
++# if ((OSMajorVersion > 1) || \
++     (OSMajorVersion == 1 && OSMinorVersion > 4) || \
++     (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 18))
++#define HasSetUserContext  YES
++#endif
++
+ #define	AdmDir			/var/log
+ 
+ /*
+@@ -200,8 +446,17 @@
+ #define StripInstalledPrograms	YES
+ #define CompressAllFonts	YES
+ #define GzipFontCompression	YES
+-#define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
+-#define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
++#define DefaultUserPath		/usr/bin:/bin:/usr/pkg/bin:$(BINDIR):/usr/local/bin
++#define DefaultSystemPath	/usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin:/usr/pkg/sbin:$(BINDIR):/usr/local/bin:/usr/local/sbin
++
++#define InstPgmFlags		-s -m 0555 -o root -g wheel
++#define InstBinFlags		-m 0555 -o root -g wheel
++#define InstUidFlags		-m 4511 -o root -g wheel
++#define InstLibFlags		-m 0444 -o root -g wheel
++#define InstIncFlags		-m 0444 -o root -g wheel
++#define InstManFlags		-m 0444 -o root -g wheel
++#define InstDatFlags		-m 0444 -o root -g wheel
++#define InstKmemFlags		-m 2555 -o root -g kmem
+ 
+ #ifdef  InstallCmd
+ # undef  InstallCmd
+@@ -212,11 +467,23 @@
+ # define ExtraFilesToClean 	*.core
+ #endif
+ 
++#ifdef arm32Architecture
++/*
++ * NetBSD's default .SUFFIXES target places .s at a higher priority
++ * than .c.  This breaks architectures which use the .c versions of
++ * various files in the XFree86 server tree for which there are also
++ * .s versions.  Default to the basic .SUFFIXES list specified in
++ * SUSv2 (without the SCCS-related suffixes) plus .cxx for Motif.rules.
++ */
++.SUFFIXES:
++.SUFFIXES: .o .c .y .l .a .sh .f .cxx
++#endif
++
+ /*
+  * Documentation formatting
+  */
+-#define NeqnCmd			neqn -Tlatin1
+-#define NroffCmd		nroff -Tlatin1
++#define NeqnCmd			neqn -Tascii
++#define NroffCmd		nroff -Tascii
+ #define	EqnCmd 			eqn -Tps
+ #define TroffCmd        	groff -Tps
+ 
+@@ -264,7 +531,10 @@
+ 	-@if [ -f file.0 ]; \						@@\
+ 	then \								@@\
+ 	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
+-	fi
++	fi								@@\
++									@@\
++clean::									@@\
++	$(RM) file.0
+ 
+ #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
+ 	InstallManPageLong(file,destdir,dest)
+@@ -281,7 +551,16 @@
+ 	done
+ 
+ #define InstallMultipleMan(list,dest)                                   @@\
+-	InstallMultipleManSuffix(list,dest,man)
++	MakeDir($(DESTDIR)dest)						@@\
++	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
++	for i in list; do \                                             @@\
++	  (set -x; \							@@\
++	  MNAME=`echo $$i | cut -f1 -d.`; \				@@\
++	  cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
++	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.man $(DESTDIR)dest/$${MNAME}.0; \	@@\
++	  $(RM) /tmp/$$$$.man); \						@@\
++	done
++
+ 
+ #define InstallManPageAliases(file,destdir,aliases)                     @@\
+ install.man:: 								@@\
+@@ -299,13 +578,10 @@
+ /*
+  * Shared libraries supported starting in 1.0 on a.out platforms,
+  * and on all ELF platforms.
+- *
+- * XXX May not be correct on NetBSD/pmax (ELF, but might not have
+- * working shared libs).
+  */
+ #if ((OSMajorVersion > 0) && \
+-     !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \
+-    UseElfFormat
++     !defined(AlphaArchitecture) && !defined(MipsArchitecture)) \
++     || UseElfFormat
+ # ifndef HasSharedLibraries
+ # define HasSharedLibraries	YES
+ # endif
+@@ -327,51 +603,179 @@
+ #include <bsdLib.rules>
+ #endif /* HasSharedLibraries */
+ 
+-#ifdef i386Architecture
++#if defined(i386Architecture) || defined(arm32Architecture) || \
++    defined(atariArchitecture)
+ # include <xfree86.cf>
+-#endif
+ 
+ /*
+- * Definitions for the SUN server on NetBSD/sparc
++ * XXX The DynamicModuleTarget macro in xf86.rules does NOT work properly
++ * XXX on ELF systems.  This macro should be moved into bsdLib.rules, since
++ * XXX it depends on how shlibs are built on that platform.
++ * XXX
++ * XXX The following overrides DynamicModuleTarget so it should work on
++ * XXX ELF and a.out.
++ */
++/*
++ * DynamicModuleTarget - build a module to be dynamically loaded
++ */
++# undef DynamicModuleTarget
++# define DynamicModuleTarget(module,modlist)				@@\
++AllTarget(module)							@@\
++									@@\
++module: modlist								@@\
++	RemoveFile($@)							@@\
++	$(CC) -nostdlib -o $@ -Wl,-Bshareable -R$(USRLIBDIR) modlist	@@\
++									@@\
++clean::									@@\
++	RemoveFile(module)
++
++#endif /* i386Architecture || arm32Architecture || atariArchitecture */
++
++/*
++ * NetBSD always uses the XFree86 contrib distribution.
+  */
+-#ifdef SparcArchitecture
++#undef	XF86Contrib
++#define	XF86Contrib	YES
++
++/*
++ * Definitions for the SUN server on NetBSD/sparc or NetBSD/sun3
++ */
++#if defined(SparcArchitecture) || defined(Sun3Architecture)
+ #ifndef Xsun24Server
++#if defined(SparcArchitecture)
++#define Xsun24Server	YES
++#else
+ #define Xsun24Server	NO
+ #endif
++#endif
+ #ifndef XsunServer
+ #define XsunServer	YES
+ #endif
+ #ifndef XsunMonoServer
+ #define XsunMonoServer	YES
+ #endif
+-#ifndef BuildScreenSaverLibrary
+-#define BuildScreenSaverLibrary	YES
+ #endif
++  
+ /*
+- * XFree86 uses its own (more portable) database routines to speed up 
+- * the RGB database lookups
+- * However, if you want to use ndbm anyway, you can set that to NO in 
+- * site.def
++ * Definitions for the NetBSD/mac68k server.
+  */
+-#ifndef UseRgbTxt
+-#define UseRgbTxt	YES
++#ifdef mac68kArchitecture
++# ifndef Xmac68kServer
++#  define Xmac68kServer		YES
++# endif
+ #endif
++
++/*
++ * Definitions for the NetBSD/vax server.
++ */
++#ifdef VaxArchitecture
++# define XvaxMonoServer YES
++# if HasGcc
++#  define BuildPexExt XvaxMonoServer
++# else
++#  define BuildPex        NO      /* compiler runs out of table space */
++#  define BuildXInputLib  NO      /* compiler runs out of table space */
++# endif
++# define HasSaberC NO
++# define UnalignedReferencesAllowed YES         /* if arbitrary deref is okay */
+ #endif
+ 
+ /*
+- * Definition for compiling on MIPS machines
++ * Definitions for the NetBSD/amiga server.
+  */
+-#ifdef MipsArchitecture
+-#define PositionIndependentCFlags
+-#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ |
+-sed 's/\.[0-9]*$$//'`
+-#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB)
+-#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB)
++#ifdef amigaArchitecture
++# ifndef XamigaCCmono
++#  define XamigaCCmono		NO
++# endif
++# ifndef XamigaCCcolor
++#  define XamigaCCcolor		YES
++# endif
++# ifndef XamigaGfxCardSupport
++#  define XamigaGfxCardSupport	YES
++# endif
++# ifndef XamigaRetinaZ3Support
++#  define XamigaRetinaZ3Support	YES
++# endif
++# ifndef XamigaCl5426Server
++#  define XamigaCl5426Server	YES
++# endif
++# ifndef XamigaCV64Support
++#  define XamigaCV64Support	YES
++# endif
++/*
++ * You need XamigaGfxCardSupport if you enable XamigaCl5426Server,
++ * XamigaRetinaZ3Support or XamigaCV64Support and you can't use XamigaCCmono
++ * if you enable XamigaCCcolor.
++ * Don't change the next 10 lines !!!!!!!!!
++ */
++# if (XamigaCl5426Server || XamigaCV64Support || XamigaRetinaZ3Support) \
++	&& !XamigaGfxCardSupport
++#  undef XamigaGfxCardSupport
++#  define XamigaGfxCardSupport	YES
++# endif
++# if XamigaCCcolor
++#  undef XamigaCCmono
++#  define XamigaCCmono		NO
++# endif
++#endif
++
++/*
++ * Definitions for the NetBSD/alpha X server.
++ */
++#if defined(AlphaArchitecture)
++# define XalphaNetBSDServer	YES
++#ifndef XkbServerDefines
++#define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
++#endif
+ #endif
+ 
+ /*
+- * Definition for compiling on Alpha machines
++ * Definitions for the NetBSD/arm32 VIDC20 X server.
+  */
+-#ifdef AlphaArchitecture
+-#define	BuildServer	NO
++#if defined(arm32Architecture)
++# define Xarm32VIDCServer	YES
++#endif
++
++/*
++ * Definitions for the NetBSD/x68k X server.
++ */
++#if defined(x68kArchitecture)
++# define X68kServer		YES
++#endif
++
++/*
++ * Definitions for the NetBSD/macppc X server.
++ */
++#if defined(macppcArchitecture)
++# define XmacppcServer		YES
++#endif
++
++/*
++ * Definitions for the NetBSD/pmax X server.
++ */
++#if defined(pmaxArchitecture)
++# define XpmaxServer YES
++#endif
++
++/*
++ * Definitions for the NetBSD/hpcmips X server.
++ */
++#if defined(hpcmipsArchitecture)
++# define XhpcServer		YES
++#endif
++
++
++#ifndef BuildScreenSaverLibrary
++#define BuildScreenSaverLibrary	YES
++#endif
++
++#ifndef XkbServerDefines
++#define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
++#endif
++
++/*
++ * We use rgb.txt with XFree86, so we must use it here to be compatible.
++ */
++#ifndef UseRgbTxt
++#define UseRgbTxt	YES
+ #endif
diff --git a/net/tightvnc/patches/patch-ac b/net/tightvnc/patches/patch-ac
new file mode 100644
index 00000000000..cbeaf131c24
--- /dev/null
+++ b/net/tightvnc/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2001/09/23 01:34:30 mycroft Exp $
+
+--- Xvnc/config/imake/imakemdep.h.orig	Sun Jul 27 03:41:05 1997
++++ Xvnc/config/imake/imakemdep.h
+@@ -287,6 +287,11 @@
+  *     that support multiple operating systems).
+  */
+ 
++#ifdef __NetBSD__
++#undef unix
++#define unix 42
++#endif
++
+ #define	ARGUMENTS 50	/* number of arguments in various arrays */
+ char *cpp_argv[ARGUMENTS] = {
+ 	"cc",		/* replaced by the actual program to exec */
diff --git a/net/tightvnc/patches/patch-ad b/net/tightvnc/patches/patch-ad
new file mode 100644
index 00000000000..a59322850e5
--- /dev/null
+++ b/net/tightvnc/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2001/09/23 01:34:30 mycroft Exp $
+
+--- Xvnc/programs/Xserver/cfb/stipsparc.s.orig	Wed Apr 27 08:14:23 1994
++++ Xvnc/programs/Xserver/cfb/stipsparc.s
+@@ -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/tightvnc/patches/patch-ae b/net/tightvnc/patches/patch-ae
new file mode 100644
index 00000000000..9365a93709c
--- /dev/null
+++ b/net/tightvnc/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+
+--- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig	Wed Apr 27 08:14:23 1994
++++ Xvnc/programs/Xserver/cfb/stipsprc32.s
+@@ -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/tightvnc/patches/patch-af b/net/tightvnc/patches/patch-af
new file mode 100644
index 00000000000..146965e92ac
--- /dev/null
+++ b/net/tightvnc/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+
+--- Xvnc/programs/Xserver/include/servermd.h.orig	Mon Jul 28 16:17:34 1997
++++ Xvnc/programs/Xserver/include/servermd.h
+@@ -132,7 +132,7 @@
+ 
+ #endif /* vax */
+ 
+-#if (defined(Lynx) && defined(__powerpc__))
++#if ((defined(__NetBSD__) || defined(Lynx)) && defined(__powerpc__))
+ 
+ /* For now this is for Xvfb only */
+ #define IMAGE_BYTE_ORDER        MSBFirst
+@@ -336,7 +336,7 @@
+ 
+ #endif /* luna */
+ 
+-#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__)))
++#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && (defined(__i386__) || defined(__arm32__))) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__)))
+ 
+ #ifndef IMAGE_BYTE_ORDER
+ #define IMAGE_BYTE_ORDER	LSBFirst
diff --git a/net/tightvnc/patches/patch-ag b/net/tightvnc/patches/patch-ag
new file mode 100644
index 00000000000..0d89123b612
--- /dev/null
+++ b/net/tightvnc/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+
+--- vncserver.orig	Thu Oct 26 16:16:37 2000
++++ vncserver
+@@ -149,8 +149,8 @@
+ # Add font path and color database stuff here, e.g.:
+ #
+ # $cmd .= " -fp unix/:7100";
+-# $cmd .= " -fp /usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
+-# $cmd .= " -co /usr/lib/X11/rgb";
++$cmd .= " -fp /usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/";
++$cmd .= " -co /usr/X11R6/lib/X11/rgb";
+ #
+ 
+ foreach $arg (@ARGV) {
diff --git a/net/tightvnc/patches/patch-ba b/net/tightvnc/patches/patch-ba
new file mode 100644
index 00000000000..0d042c33d02
--- /dev/null
+++ b/net/tightvnc/patches/patch-ba
@@ -0,0 +1,12 @@
+$NetBSD: patch-ba,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+
+--- Xvnc/config/cf/vnclibs.def.orig	Mon Jan 29 21:24:14 2001
++++ Xvnc/config/cf/vnclibs.def	Sun Sep 23 01:08:42 2001
+@@ -5,5 +5,6 @@
+  * and programs/Xserver/hw/vnc whenever you change this file.
+  */
+ 
+-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a /usr/lib/libjpeg.a
++VNCLIBS = $(TOP)/../libvncauth/libvncauth.a \
++	  ${BUILDLINK_LDFLAGS} -Wl,-rpath ${LOCALBASE}/lib -ljpeg
+ VNCCPPFLAGS = -I$(TOP)/../include
diff --git a/net/tightvnc/patches/patch-bb b/net/tightvnc/patches/patch-bb
new file mode 100644
index 00000000000..62c4c49994f
--- /dev/null
+++ b/net/tightvnc/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+
+--- Xvnc/programs/Xserver/Imakefile.orig	Sun Sep 23 01:20:33 2001
++++ Xvnc/programs/Xserver/Imakefile	Sun Sep 23 01:22:28 2001
+@@ -1712,7 +1712,7 @@
+ XVNC = hw/vnc/libvnc.a $(VNCLIBS)
+ XVNCLIBS = PreFbLibs $(XVNC) $(CFB) PostFbLibs
+ XVNCSYSLIBS = $(SYSLIBS) $(VNCSYSLIBS)
+-ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),$(XVNCLIBS),$(XVNCSYSLIBS))
++ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),,$(XVNCLIBS) $(XVNCSYSLIBS))
+ #endif /* XvncServer */
+ 
+ 
diff --git a/net/tightvnc/patches/patch-bc b/net/tightvnc/patches/patch-bc
new file mode 100644
index 00000000000..730e4003536
--- /dev/null
+++ b/net/tightvnc/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+
+--- Xvnc/programs/Xserver/hw/vnc/Imakefile.orig	Tue Jan 16 08:16:38 2001
++++ Xvnc/programs/Xserver/hw/vnc/Imakefile	Sun Sep 23 01:23:34 2001
+@@ -12,7 +12,7 @@
+ #include <vnclibs.def>
+ INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) -I$(XINCLUDESRC) \
+ 	   -I../../cfb -I../../mfb -I../../mi -I../../include -I../../os \
+-	   $(VNCCPPFLAGS)
++	   ${BUILDLINK_CPPFLAGS} $(VNCCPPFLAGS)
+ 
+ DEFINES = ServerOSDefines
+ 
diff --git a/net/tightvnc/pkg/DESCR b/net/tightvnc/pkg/DESCR
new file mode 100644
index 00000000000..c29a2a0a7db
--- /dev/null
+++ b/net/tightvnc/pkg/DESCR
@@ -0,0 +1,9 @@
+"VNC stands for Virtual Network Computing. It is, in essence, a remote
+ display system which allows you to view a computing 'desktop'
+ environment not only on the machine where it is running, but from
+ anywhere on the Internet and from a wide variety of machine
+ architectures."
+
+Tight VNC is a modified version of VNC that offers some performance
+improvements -- local cursor handling, better compression algorithms,
+etc.
diff --git a/net/tightvnc/pkg/PLIST b/net/tightvnc/pkg/PLIST
new file mode 100644
index 00000000000..d891daf7ba9
--- /dev/null
+++ b/net/tightvnc/pkg/PLIST
@@ -0,0 +1,106 @@
+@comment $NetBSD: PLIST,v 1.1 2001/09/23 01:34:32 mycroft Exp $
+bin/Xvnc
+bin/vncconnect
+bin/vncpasswd
+bin/vncserver
+share/doc/vnc/Xvnc.gif
+share/doc/vnc/ach.jpg
+share/doc/vnc/backbutton.gif
+share/doc/vnc/badgeshad.gif
+share/doc/vnc/bluepix.gif
+share/doc/vnc/cdplay.gif
+share/doc/vnc/cevncviewer.html
+share/doc/vnc/cim.jpg
+share/doc/vnc/clientserver.gif
+share/doc/vnc/collage.gif
+share/doc/vnc/collagesmaller.gif
+share/doc/vnc/conndlg.gif
+share/doc/vnc/contribbutton.gif
+share/doc/vnc/contribs.html
+share/doc/vnc/docbutton.gif
+share/doc/vnc/docs.html
+share/doc/vnc/download.htm
+share/doc/vnc/downloadbutton.gif
+share/doc/vnc/extras.html
+share/doc/vnc/faq.html
+share/doc/vnc/faqbutton.gif
+share/doc/vnc/free.html
+share/doc/vnc/freebutton.gif
+share/doc/vnc/gpl.html
+share/doc/vnc/help.html
+share/doc/vnc/helpbutton.gif
+share/doc/vnc/homebutton.gif
+share/doc/vnc/howitworks.html
+share/doc/vnc/ie1.gif
+share/doc/vnc/ie1_small.gif
+share/doc/vnc/iemacwin.gif
+share/doc/vnc/iemacwin_small.gif
+share/doc/vnc/iemacx.gif
+share/doc/vnc/iemacx_small.gif
+share/doc/vnc/index.html
+share/doc/vnc/internalversion.html
+share/doc/vnc/intouch.html
+share/doc/vnc/intouchbutton.gif
+share/doc/vnc/invalid-download.html
+share/doc/vnc/javavncviewer.html
+share/doc/vnc/jnw.jpg
+share/doc/vnc/krw.jpg
+share/doc/vnc/macshot.gif
+share/doc/vnc/macshot_small.gif
+share/doc/vnc/macvnc.html
+share/doc/vnc/macvncviewer.html
+share/doc/vnc/mailinglist.html
+share/doc/vnc/newlogosmall2.gif
+share/doc/vnc/ns1.gif
+share/doc/vnc/ns1_small.gif
+share/doc/vnc/oldcontribs.html
+share/doc/vnc/oldfaq.html
+share/doc/vnc/orlbutton.gif
+share/doc/vnc/platforms.html
+share/doc/vnc/pmw.jpg
+share/doc/vnc/protocol.html
+share/doc/vnc/qsf.jpg
+share/doc/vnc/rfbcounter.gif
+share/doc/vnc/rfbcounter.html
+share/doc/vnc/rfbproto.pdf
+share/doc/vnc/rfbprotoheader.pdf
+share/doc/vnc/screenbutton.gif
+share/doc/vnc/screenshots.html
+share/doc/vnc/searchbutton.gif
+share/doc/vnc/sidebarbg.gif
+share/doc/vnc/sideblank.gif
+share/doc/vnc/sidelogo.gif
+share/doc/vnc/spacer.gif
+share/doc/vnc/start.html
+share/doc/vnc/startbutton.gif
+share/doc/vnc/styles.css
+share/doc/vnc/template.html
+share/doc/vnc/tjr.jpg
+share/doc/vnc/twmideas.html
+share/doc/vnc/videos.html
+share/doc/vnc/videos1.jpg
+share/doc/vnc/videos2.jpg
+share/doc/vnc/videos3.jpg
+share/doc/vnc/viewertray.gif
+share/doc/vnc/vinci1.gif
+share/doc/vnc/vinci1_small.gif
+share/doc/vnc/vnc.gif
+share/doc/vnc/vncce1.jpg
+share/doc/vnc/vncce1_medium.jpg
+share/doc/vnc/vncce1_small.jpg
+share/doc/vnc/vncce2.jpg
+share/doc/vnc/vncce2_small.jpg
+share/doc/vnc/vncce3.jpg
+share/doc/vnc/vncce3_small.jpg
+share/doc/vnc/vnchistory.html
+share/doc/vnc/vncpeople.html
+share/doc/vnc/vncpeoplebutton.gif
+share/doc/vnc/winhistory.html
+share/doc/vnc/winviewer1.gif
+share/doc/vnc/winviewer1_small.gif
+share/doc/vnc/winvnc.html
+share/doc/vnc/winvnctray.GIF
+share/doc/vnc/winvncviewer.html
+share/doc/vnc/xvnc.html
+share/doc/vnc/xvncviewer.html
+@dirrm share/doc/vnc