Fix build on ELF sparc systems but testing on __ELF__ or SVR4, not just SVR4

8 files changed, 60 insertions, 32 deletions

diff --git a/net/vnc/files/patch-sum b/net/vnc/files/patch-sum
index 89248a8cf2b..00033c2a78e 100644
--- a/net/vnc/files/patch-sum
+++ b/net/vnc/files/patch-sum
@@ -1,7 +1,9 @@
-$NetBSD: patch-sum,v 1.6 2000/11/13 10:26:16 abs Exp $
+$NetBSD: patch-sum,v 1.7 2000/11/13 14:34:40 abs Exp $
 
-MD5 (patch-aa) = 13de940cbf9290f99cb10cbb5d9893ba
+MD5 (patch-aa) = 2b644299e7c1ebfbbadbb9a9f88ca9e1
 MD5 (patch-ab) = e4348bbee16eee12f241a4ca426060f2
 MD5 (patch-ac) = 7706348a76cfed42d088721f4cf9ad60
-MD5 (patch-ad) = 1c60c29502088523561c681b67aed024
-MD5 (patch-ae) = 1e05282906b96d0a76fddf26f066a7b3
+MD5 (patch-ad) = bb5b0e304749313ad7d1c75a58cfa286
+MD5 (patch-ae) = 9e4e7c8da40677d5a83d46aabd019d9a
+MD5 (patch-af) = 1c60c29502088523561c681b67aed024
+MD5 (patch-ag) = 8deb105fc2aae7a4b0346cffc9eb19d4
diff --git a/net/vnc/patches/patch-aa b/net/vnc/patches/patch-aa
index 194fb89990f..ca1d778db01 100644
--- a/net/vnc/patches/patch-aa
+++ b/net/vnc/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2000/11/13 10:26:16 abs Exp $
+$NetBSD: patch-aa,v 1.8 2000/11/13 14:34:40 abs Exp $
 
---- Imakefile.orig	Mon May 18 14:18:46 1998
+--- Imakefile.orig	Thu Oct 26 14:28:32 2000
 +++ Imakefile
 @@ -1,7 +1,7 @@
  #define IHaveSubdirs
diff --git a/net/vnc/patches/patch-ab b/net/vnc/patches/patch-ab
index 5d2201071cf..75eb59d14f5 100644
--- a/net/vnc/patches/patch-ab
+++ b/net/vnc/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2000/11/10 16:57:25 abs Exp $
+$NetBSD: patch-ab,v 1.5 2000/11/13 14:34:41 abs Exp $
 
 --- Xvnc/config/cf/NetBSD.cf.orig	Sat Jul 26 07:30:39 1997
 +++ Xvnc/config/cf/NetBSD.cf
diff --git a/net/vnc/patches/patch-ac b/net/vnc/patches/patch-ac
index f3914faf799..9364e27eefe 100644
--- a/net/vnc/patches/patch-ac
+++ b/net/vnc/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2000/11/10 16:57:25 abs Exp $
+$NetBSD: patch-ac,v 1.6 2000/11/13 14:34:41 abs Exp $
 
 --- Xvnc/config/imake/imakemdep.h.orig	Sun Jul 27 03:41:05 1997
 +++ Xvnc/config/imake/imakemdep.h
diff --git a/net/vnc/patches/patch-ad b/net/vnc/patches/patch-ad
index 2239a448018..25f5967879b 100644
--- a/net/vnc/patches/patch-ad
+++ b/net/vnc/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2000/11/10 16:57:25 abs Exp $
+$NetBSD: patch-ad,v 1.5 2000/11/13 14:34:41 abs Exp $
 
---- Xvnc/programs/Xserver/include/servermd.h.orig	Mon Jul 28 15:17:34 1997
-+++ Xvnc/programs/Xserver/include/servermd.h
-@@ -336,7 +336,7 @@
+--- 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
  
- #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
+-#ifdef SVR4
++#if defined(SVR4) || defined(__ELF__)
+ #ifdef TETEXT
+ #define	_cfbStippleStack	cfbStippleStackTE
+ #else
diff --git a/net/vnc/patches/patch-ae b/net/vnc/patches/patch-ae
index ab1f135f29d..8bd3efc9402 100644
--- a/net/vnc/patches/patch-ae
+++ b/net/vnc/patches/patch-ae
@@ -1,15 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2000/11/10 16:57:25 abs Exp $
+$NetBSD: patch-ae,v 1.3 2000/11/13 14:34:41 abs Exp $
 
---- vncserver.orig	Wed Jan 12 16:57:12 2000
-+++ vncserver
-@@ -146,8 +146,8 @@
+--- 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
  
- # 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) {
+-#ifdef SVR4
++#if defined(SVR4) || defined(__ELF__)
+ #ifdef TETEXT
+ #define	_cfb32StippleStack	cfb32StippleStackTE
+ #else
diff --git a/net/vnc/patches/patch-af b/net/vnc/patches/patch-af
new file mode 100644
index 00000000000..2c6d1ba9521
--- /dev/null
+++ b/net/vnc/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.4 2000/11/13 14:34:41 abs Exp $
+
+--- Xvnc/programs/Xserver/include/servermd.h.orig	Mon Jul 28 15: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/patches/patch-ag b/net/vnc/patches/patch-ag
new file mode 100644
index 00000000000..e8ed4dcf96b
--- /dev/null
+++ b/net/vnc/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2000/11/13 14:34:41 abs Exp $
+
+--- vncserver.orig	Thu Oct 26 16:16:37 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) {