allow this package to work on sparc / arm (ELF) platforms. now builds,

but crashes on sparc64 still....

3 files changed, 27 insertions, 23 deletions

diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index fab37157db9..58c29983b08 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2003/11/27 17:27:29 abs Exp $
+$NetBSD: distinfo,v 1.9 2004/01/03 14:18:57 mrg Exp $
 
 SHA1 (tightvnc-1.2.9_unixsrc.tar.bz2) = 62b55237676bbdc7f08771e6ff72c0f70264f4ee
 Size (tightvnc-1.2.9_unixsrc.tar.bz2) = 1738256 bytes
 SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4
-SHA1 (patch-ab) = 1ddbc0fef0f5ea4798537365bafcce15b5698b27
+SHA1 (patch-ab) = b610979131497edae24119961bb56122e9d5a5c4
 SHA1 (patch-ac) = 7068947b76270e858c66d1c46a8ebb8675ecdbbd
 SHA1 (patch-ad) = 9606ffc253ea40fa03058cf40c4eab447adafa61
 SHA1 (patch-ae) = f541c3d7f143145798eb2d3eca3d2a1992619a50
@@ -12,5 +12,5 @@ SHA1 (patch-ag) = 675c42780888ff471109521de0a358ba40a6b8f3
 SHA1 (patch-ah) = 013acd16171cdfdc4b97529af60978afb9b4d861
 SHA1 (patch-ai) = c95caf348ad41e2fd0954119d23c17e1c73795af
 SHA1 (patch-aj) = bac4b0703f86f10a8a39a2de255694517330af22
-SHA1 (patch-ak) = ad1b7cec677dec76f2808b4c4ddc550749cf0882
+SHA1 (patch-ak) = 71e36559fe55c80382691b6292fa68084f8e7ca1
 SHA1 (patch-al) = 4a45378b53b0e550c87ddc0b244b7a03f518bfb4
diff --git a/net/tightvnc/patches/patch-ab b/net/tightvnc/patches/patch-ab
index 87c6168ad75..eced01476f6 100644
--- a/net/tightvnc/patches/patch-ab
+++ b/net/tightvnc/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
+$NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $
 
---- Xvnc/config/cf/NetBSD.cf.orig	2000-06-11 13:00:51.000000000 +0100
-+++ Xvnc/config/cf/NetBSD.cf
-@@ -2,9 +2,37 @@ XCOMM platform:  $XConsortium: NetBSD.cf
+--- Xvnc/config/cf/NetBSD.cf.orig	2000-06-11 12:00:51.000000000 +0000
++++ Xvnc/config/cf/NetBSD.cf	2004-01-03 11:41:23.000000000 +0000
+@@ -2,9 +2,37 @@
  
  
  
@@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  #ifndef OSName
  #define OSName			DefaultOSName OSBinaryType
  #endif
-@@ -14,24 +42,34 @@ XCOMM platform:  $XFree86: xc/config/cf/
+@@ -14,24 +42,34 @@
  #ifndef OSMinorVersion
  #define OSMinorVersion		DefaultOSMinorVersion
  #endif
@@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  #define HasNdbm         	YES
  #define HasPutenv       	YES
  #define HasSnprintf		YES
-@@ -61,7 +99,20 @@ XCOMM operating system:  OSName (OSMajor
+@@ -61,7 +99,20 @@
       (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2))
  #  define HasDlsymBug		YES
  #endif
@@ -100,15 +100,19 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  #if (!(OSMajorVersion == 0 || \
         (OSMajorVersion == 1 && OSMinorVersion < 2))) 
  #define HasMkstemp		YES
-@@ -85,6 +136,7 @@ XCOMM operating system:  OSName (OSMajor
+@@ -85,9 +136,10 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
 +#define HasMktemp		NO
  #define MkdirHierCmd		mkdir -p
  
- #define CppCmd          	/usr/libexec/cpp
-@@ -96,13 +148,15 @@ XCOMM operating system:  OSName (OSMajor
+-#define CppCmd          	/usr/libexec/cpp
++#define CppCmd          	/usr/bin/cpp
+ #define StandardCppDefines	-traditional
+ #define PreProcessCmd   	CppCmd
+ #define PreIncDir		/usr/include
+@@ -96,13 +148,15 @@
  #define CcCmd 			gcc
  #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
  #define DefaultCCOptions 	/**/
@@ -125,7 +129,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  /* UseElfFormat defaults to YES if __ELF__ set */
  #ifndef UseElfFormat
  # ifdef __ELF__
-@@ -114,60 +168,234 @@ XCOMM operating system:  OSName (OSMajor
+@@ -114,60 +168,234 @@
  #endif
  
  /*
@@ -382,7 +386,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  #endif
  
  #define StandardDefines	-DCSRG_BASED
-@@ -177,7 +405,18 @@ XCOMM operating system:  OSName (OSMajor
+@@ -177,7 +405,18 @@
  #define ExtraLibraries		/**/
  #endif
  #ifndef UseGnuMalloc
@@ -401,7 +405,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  #endif
  #ifndef GnuMallocLibrary
  #define GnuMallocLibrary	-lgnumalloc
-@@ -191,6 +430,13 @@ XCOMM operating system:  OSName (OSMajor
+@@ -191,6 +430,13 @@
  #endif
  #endif 
  
@@ -415,7 +419,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  #define	AdmDir			/var/log
  
  /*
-@@ -200,8 +446,17 @@ XCOMM operating system:  OSName (OSMajor
+@@ -200,8 +446,17 @@
  #define StripInstalledPrograms	YES
  #define CompressAllFonts	YES
  #define GzipFontCompression	YES
@@ -435,7 +439,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  
  #ifdef  InstallCmd
  # undef  InstallCmd
-@@ -212,11 +467,23 @@ XCOMM operating system:  OSName (OSMajor
+@@ -212,11 +467,23 @@
  # define ExtraFilesToClean 	*.core
  #endif
  
@@ -461,7 +465,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  #define	EqnCmd 			eqn -Tps
  #define TroffCmd        	groff -Tps
  
-@@ -264,7 +531,10 @@ install.man::                           
+@@ -264,7 +531,10 @@
  	-@if [ -f file.0 ]; \						@@\
  	then \								@@\
  	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
@@ -473,7 +477,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  
  #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
  	InstallManPageLong(file,destdir,dest)
-@@ -281,7 +551,16 @@ install.man:: 								@@\
+@@ -281,7 +551,16 @@
  	done
  
  #define InstallMultipleMan(list,dest)                                   @@\
@@ -491,7 +495,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  
  #define InstallManPageAliases(file,destdir,aliases)                     @@\
  install.man:: 								@@\
-@@ -299,13 +578,10 @@ install.man:: 								@@\
+@@ -299,13 +578,10 @@
  /*
   * Shared libraries supported starting in 1.0 on a.out platforms,
   * and on all ELF platforms.
@@ -507,7 +511,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/27 17:27:29 abs Exp $
  # ifndef HasSharedLibraries
  # define HasSharedLibraries	YES
  # endif
-@@ -327,51 +603,179 @@ install.man:: 								@@\
+@@ -327,51 +603,179 @@
  #include <bsdLib.rules>
  #endif /* HasSharedLibraries */
  
diff --git a/net/tightvnc/patches/patch-ak b/net/tightvnc/patches/patch-ak
index e7c5a6fb44c..9620f13b475 100644
--- a/net/tightvnc/patches/patch-ak
+++ b/net/tightvnc/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2003/11/27 17:27:29 abs Exp $
+$NetBSD: patch-ak,v 1.2 2004/01/03 14:18:57 mrg Exp $
 
 --- Xvnc/programs/Xserver/include/servermd.h.orig	2003-02-19 16:39:54.000000000 +0000
 +++ Xvnc/programs/Xserver/include/servermd.h
@@ -16,7 +16,7 @@ $NetBSD: patch-ak,v 1.1 2003/11/27 17:27:29 abs Exp $
  #endif /* (__s390__ || __s390x__) && linux */
      
 -#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__)))
++#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && (defined(__i386__) || defined(__arm32__) || defined(__arm__))) || (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