diff options
Diffstat (limited to 'net/tightvnc/patches/patch-ab')
| -rw-r--r-- | net/tightvnc/patches/patch-ab | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/net/tightvnc/patches/patch-ab b/net/tightvnc/patches/patch-ab index eced01476f6..5cb27653550 100644 --- a/net/tightvnc/patches/patch-ab +++ b/net/tightvnc/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ +$NetBSD: patch-ab,v 1.4 2013/07/02 12:15:36 joerg Exp $ --- 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 @@ ++++ Xvnc/config/cf/NetBSD.cf +@@ -2,9 +2,37 @@ XCOMM platform: $XConsortium: NetBSD.cf @@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #ifndef OSName #define OSName DefaultOSName OSBinaryType #endif -@@ -14,24 +42,34 @@ +@@ -14,24 +42,34 @@ XCOMM platform: $XFree86: xc/config/cf/ #ifndef OSMinorVersion #define OSMinorVersion DefaultOSMinorVersion #endif @@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #define HasNdbm YES #define HasPutenv YES #define HasSnprintf YES -@@ -61,7 +99,20 @@ +@@ -61,7 +99,20 @@ XCOMM operating system: OSName (OSMajor (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2)) # define HasDlsymBug YES #endif @@ -100,7 +100,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #if (!(OSMajorVersion == 0 || \ (OSMajorVersion == 1 && OSMinorVersion < 2))) #define HasMkstemp YES -@@ -85,9 +136,10 @@ +@@ -85,9 +136,10 @@ XCOMM operating system: OSName (OSMajor #define NeedVarargsPrototypes YES #define NeedWidePrototypes NO @@ -112,14 +112,15 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #define StandardCppDefines -traditional #define PreProcessCmd CppCmd #define PreIncDir /usr/include -@@ -96,13 +148,15 @@ +@@ -96,13 +148,15 @@ XCOMM operating system: OSName (OSMajor #define CcCmd gcc #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) #define DefaultCCOptions /**/ +#elif defined(arm32Architecture) -+#define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char -fomit-frame-pointer ++#define DefaultCCOptions $(CPPFLAGS) -Dasm=__asm -fsigned-char -fomit-frame-pointer #else - #define DefaultCCOptions -ansi -Dasm=__asm +-#define DefaultCCOptions -ansi -Dasm=__asm ++#define DefaultCCOptions $(CPPFLAGS) -Dasm=__asm #endif #define GccGasOption -DGCCUSESGAS @@ -129,7 +130,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ /* UseElfFormat defaults to YES if __ELF__ set */ #ifndef UseElfFormat # ifdef __ELF__ -@@ -114,60 +168,234 @@ +@@ -114,60 +168,234 @@ XCOMM operating system: OSName (OSMajor #endif /* @@ -386,7 +387,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #endif #define StandardDefines -DCSRG_BASED -@@ -177,7 +405,18 @@ +@@ -177,7 +405,18 @@ XCOMM operating system: OSName (OSMajor #define ExtraLibraries /**/ #endif #ifndef UseGnuMalloc @@ -405,7 +406,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #endif #ifndef GnuMallocLibrary #define GnuMallocLibrary -lgnumalloc -@@ -191,6 +430,13 @@ +@@ -191,6 +430,13 @@ XCOMM operating system: OSName (OSMajor #endif #endif @@ -419,7 +420,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #define AdmDir /var/log /* -@@ -200,8 +446,17 @@ +@@ -200,8 +446,17 @@ XCOMM operating system: OSName (OSMajor #define StripInstalledPrograms YES #define CompressAllFonts YES #define GzipFontCompression YES @@ -439,7 +440,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #ifdef InstallCmd # undef InstallCmd -@@ -212,11 +467,23 @@ +@@ -212,11 +467,23 @@ XCOMM operating system: OSName (OSMajor # define ExtraFilesToClean *.core #endif @@ -465,7 +466,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #define EqnCmd eqn -Tps #define TroffCmd groff -Tps -@@ -264,7 +531,10 @@ +@@ -264,7 +531,10 @@ install.man:: -@if [ -f file.0 ]; \ @@\ then \ @@\ $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\ @@ -477,7 +478,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ InstallManPageLong(file,destdir,dest) -@@ -281,7 +551,16 @@ +@@ -281,7 +551,16 @@ install.man:: @@\ done #define InstallMultipleMan(list,dest) @@\ @@ -495,7 +496,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ #define InstallManPageAliases(file,destdir,aliases) @@\ install.man:: @@\ -@@ -299,13 +578,10 @@ +@@ -299,13 +578,10 @@ install.man:: @@\ /* * Shared libraries supported starting in 1.0 on a.out platforms, * and on all ELF platforms. @@ -511,7 +512,7 @@ $NetBSD: patch-ab,v 1.3 2004/01/03 14:18:57 mrg Exp $ # ifndef HasSharedLibraries # define HasSharedLibraries YES # endif -@@ -327,51 +603,179 @@ +@@ -327,51 +603,179 @@ install.man:: @@\ #include <bsdLib.rules> #endif /* HasSharedLibraries */ |