Split out vncviwer into its own package. Depend on it

9 files changed, 86 insertions, 115 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 21a7cf3440e..68781356a21 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2000/09/09 19:40:20 fredb Exp $
+# $NetBSD: Makefile,v 1.14 2000/11/10 16:57:24 abs Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
-DISTNAME=       	vnc-3.3.3r1
+DISTNAME=		vnc-3.3.3r1
 PKGNAME=		vnc-3.3.3.1
 CATEGORIES=		net x11
-MASTER_SITES=   	http://www.uk.research.att.com/vnc/dist/
+MASTER_SITES=		http://www.uk.research.att.com/vnc/dist/
 DISTFILES=		vnc-3.3.3r1_unixsrc.tgz \
 			vnc-latest_doc.tgz
 
-MAINTAINER=	 	packages@netbsd.org
+MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.uk.research.att.com/vnc/
 
+DEPENDS+=		vncviewer:../../net/vncviewer
+
 CRYPTO=			yes
 NO_INSTALL_MANPAGES=	yes
 USE_IMAKE=		yes
@@ -19,13 +21,12 @@ USE_PERL5=		yes
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 
-ALL_TARGET=    		World
+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}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
 	${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' \
diff --git a/net/vnc/files/patch-sum b/net/vnc/files/patch-sum
index 5fe9827cbc6..5c05b88aec1 100644
--- a/net/vnc/files/patch-sum
+++ b/net/vnc/files/patch-sum
@@ -1,8 +1,7 @@
-$NetBSD: patch-sum,v 1.4 2000/09/10 01:17:13 hubertf Exp $
+$NetBSD: patch-sum,v 1.5 2000/11/10 16:57:25 abs Exp $
 
-MD5 (patch-aa) = ee6b0756f983ca7f0d5e4401e78f968e
-MD5 (patch-ab) = 523030821006bbef34d255d0a6fb9d86
-MD5 (patch-ac) = 3fa5d05f820dab9b663c2f581054622b
-MD5 (patch-ad) = 8371234642b1b69748fd6efa610235e8
-MD5 (patch-ae) = 7d2dee70b940eed144c19d56602fe1d7
-MD5 (patch-af) = eb61a67dda8bbb546f472fe90678984a
+MD5 (patch-aa) = c84a0ceeb4a46aedcb89de6f3ef51b2a
+MD5 (patch-ab) = e4348bbee16eee12f241a4ca426060f2
+MD5 (patch-ac) = 7706348a76cfed42d088721f4cf9ad60
+MD5 (patch-ad) = 1c60c29502088523561c681b67aed024
+MD5 (patch-ae) = 1e05282906b96d0a76fddf26f066a7b3
diff --git a/net/vnc/patches/patch-aa b/net/vnc/patches/patch-aa
index 1913ae48040..8de0ad796ed 100644
--- a/net/vnc/patches/patch-aa
+++ b/net/vnc/patches/patch-aa
@@ -1,17 +1,23 @@
-$NetBSD: patch-aa,v 1.5 1999/04/20 18:59:48 tron Exp $
+$NetBSD: patch-aa,v 1.6 2000/11/10 16:57:25 abs Exp $
 
-*** Xvnc/config/cf/NetBSD.cf.orig	Tue Jul 28 14:19:10 1998
---- Xvnc/config/cf/NetBSD.cf	Tue Jul 28 12:45:19 1998
-***************
-*** 373,377 ****
-   * Definition for compiling on Alpha machines
-   */
-  #ifdef AlphaArchitecture
-! #define	BuildServer	NO
-  #endif
---- 373,377 ----
-   * Definition for compiling on Alpha machines
-   */
-  #ifdef AlphaArchitecture
-! #define	BuildServer	YES
-  #endif
+--- Imakefile.orig	Mon May 18 14:18:46 1998
++++ Imakefile
+@@ -1,7 +1,7 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags
+ 
+-SUBDIRS = libvncauth vncviewer vncpasswd
++SUBDIRS = libvncauth vncpasswd
+ 
+ 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/vnc/patches/patch-ab b/net/vnc/patches/patch-ab
index dd1fabe02dd..5d2201071cf 100644
--- a/net/vnc/patches/patch-ab
+++ b/net/vnc/patches/patch-ab
@@ -1,22 +1,11 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 11:11:03 agc Exp $
+$NetBSD: patch-ab,v 1.4 2000/11/10 16:57:25 abs Exp $
 
-*** Imakefile.orig	Mon May 18 06:18:46 1998
---- Imakefile	Tue Jul 28 14:57:53 1998
-***************
-*** 9,16 ****
-  	make all
-  	@echo ""
-  	@echo Built $(SUBDIRS).
-! 	@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
-! 	@echo ""
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
---- 9,15 ----
-  	make all
-  	@echo ""
-  	@echo Built $(SUBDIRS).
-! 	(cd Xvnc && make World)
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
+--- Xvnc/config/cf/NetBSD.cf.orig	Sat Jul 26 07:30:39 1997
++++ Xvnc/config/cf/NetBSD.cf
+@@ -373,5 +373,5 @@
+  * Definition for compiling on Alpha machines
+  */
+ #ifdef AlphaArchitecture
+-#define	BuildServer	NO
++#define	BuildServer	YES
+ #endif
diff --git a/net/vnc/patches/patch-ac b/net/vnc/patches/patch-ac
index 0aea2aa46c5..f3914faf799 100644
--- a/net/vnc/patches/patch-ac
+++ b/net/vnc/patches/patch-ac
@@ -1,23 +1,16 @@
-$NetBSD: patch-ac,v 1.4 1999/02/17 19:11:36 tls Exp $
+$NetBSD: patch-ac,v 1.5 2000/11/10 16:57:25 abs Exp $
 
-*** vncserver.orig	Tue Jul 28 16:16:07 1998
---- vncserver	Tue Jul 28 16:17:02 1998
-***************
-*** 144,151 ****
-  
-  # Add font path and color database stuff here, e.g.:
-  #
-! # $cmd .= " -fp /usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
-! # $cmd .= " -co /usr/lib/X11/rgb";
-  #
-  
-  foreach $arg (@ARGV) {
---- 144,151 ----
-  
-  # Add font path and color database stuff here, e.g.:
-  #
-! $cmd .= " -fp /usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/";
-! $cmd .= " -co /usr/X11R6/lib/X11/rgb";
-  #
-  
-  foreach $arg (@ARGV) {
+--- 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/vnc/patches/patch-ad b/net/vnc/patches/patch-ad
index ff07411bc23..2239a448018 100644
--- a/net/vnc/patches/patch-ad
+++ b/net/vnc/patches/patch-ad
@@ -1,16 +1,13 @@
-$NetBSD: patch-ad,v 1.3 1999/04/20 18:39:34 tron Exp $
+$NetBSD: patch-ad,v 1.4 2000/11/10 16:57:25 abs Exp $
 
---- Xvnc/config/imake/imakemdep.h.orig	Sun Jul 27 04:41:05 1997
-+++ Xvnc/config/imake/imakemdep.h	Tue Apr 20 20:26:52 1999
-@@ -287,6 +287,11 @@
-  *     that support multiple operating systems).
-  */
+--- Xvnc/programs/Xserver/include/servermd.h.orig	Mon Jul 28 15:17:34 1997
++++ Xvnc/programs/Xserver/include/servermd.h
+@@ -336,7 +336,7 @@
  
-+#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 */
+ #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(__powerpc__))) || (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/vnc/patches/patch-ae b/net/vnc/patches/patch-ae
index 01468c90e67..ab1f135f29d 100644
--- a/net/vnc/patches/patch-ae
+++ b/net/vnc/patches/patch-ae
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.1 1999/09/02 21:29:31 tron Exp $
+$NetBSD: patch-ae,v 1.2 2000/11/10 16:57:25 abs Exp $
 
-*** vncviewer/Imakefile.orig	Thu Sep  2 11:45:25 1999
---- vncviewer/Imakefile	Thu Sep  2 11:45:44 1999
-***************
-*** 35,38 ****
-  
-  OBJS = $(SRCS:.c=.o)
-  
-! ComplexProgramTarget(vncviewer)
---- 35,38 ----
-  
-  OBJS = $(SRCS:.c=.o)
-  
-! ComplexProgramTargetNoMan(vncviewer)
+--- vncserver.orig	Wed Jan 12 16:57:12 2000
++++ vncserver
+@@ -146,8 +146,8 @@
+ 
+ # Add font path and color database stuff here, e.g.:
+ #
+-# $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/vnc/patches/patch-af b/net/vnc/patches/patch-af
deleted file mode 100644
index 96a8700adc8..00000000000
--- a/net/vnc/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/09/10 01:17:14 hubertf Exp $
-
---- Xvnc/programs/Xserver/include/servermd.h.orig	Mon Jul 28 16:17:34 1997
-+++ Xvnc/programs/Xserver/include/servermd.h
-@@ -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(__powerpc__))) || (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/vnc/pkg/PLIST b/net/vnc/pkg/PLIST
index 81a38a5f195..e1a75e0921b 100644
--- a/net/vnc/pkg/PLIST
+++ b/net/vnc/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.11 2000/02/18 02:35:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2000/11/10 16:57:26 abs Exp $
 bin/Xvnc
-bin/vncviewer
 bin/vncpasswd
 bin/vncserver
 share/doc/vnc/Xvnc.gif