- Fix build on non-i386 systems.

PR:		ports/65354
Submitted by:	maintainer

6 files changed, 125 insertions, 4 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 93898bff8cf4..08ade87ba017 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -40,10 +40,6 @@ USE_PERL5_RUN=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
-.endif
-
 pre-build:
 .if !defined(WITHOUT_SERVER)
 	@${ECHO_MSG} "NOTE:"
diff --git a/net/vnc/files/patch-Xvnc::config::cf::FreeBSD.cf b/net/vnc/files/patch-Xvnc::config::cf::FreeBSD.cf
new file mode 100644
index 000000000000..032f430c839e
--- /dev/null
+++ b/net/vnc/files/patch-Xvnc::config::cf::FreeBSD.cf
@@ -0,0 +1,76 @@
+--- Xvnc/config/cf/FreeBSD.cf.orig	Mon Mar 22 16:41:12 2004
++++ Xvnc/config/cf/FreeBSD.cf	Wed Mar 24 15:50:22 2004
+@@ -26,6 +26,7 @@
+ #define UseGas			YES
+ #define GnuCpp			YES
+ #define HasNdbm         	YES
++#define DBMLibrary		/* ndbm is in libc */
+ #define HasPutenv       	YES
+ #define HasSnprintf		YES
+ #define HasBSD44Sockets 	YES
+@@ -50,7 +51,7 @@
+ #define MkdirHierCmd		mkdir -p
+ 
+ #define CcCmd			cc
+-#define CppCmd			/usr/libexec/cpp
++#define CppCmd			/usr/bin/cpp
+ #define PreProcessCmd		CppCmd
+ #define StandardCppDefines	-traditional
+ #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
+@@ -223,12 +224,29 @@
+ # define GccGasOption /**/
+ #endif
+ 
+-#define ServerExtraDefines GccGasOption XFree86ServerDefines
++#ifdef i386Architecture
++# define ServerExtraDefines GccGasOption XFree86ServerDefines
++#else
++# define ServerExtraDefines GccGasOption -D_XSERVER64
++#endif
+ 
+ #define StandardDefines	-DCSRG_BASED
+ 
++#ifdef i386Architecture
++# if OSMajorVersion > 1
++#  define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
++# else
++#  define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
++# endif
++#else
++# if defined(SparcArchitecture) || defined(AlphaArchitecture)
++#  define ServerOSDefines 	-DDDXOSINIT
++# else
++#  define ServerOSDefines 	/**/
++# endif
++#endif
++
+ #if OSMajorVersion > 1
+-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING
+ #define HasMakefileSafeInclude	YES
+ #define IncludeMakefile(file) @@# dependencies are in .depend
+@@ -241,7 +259,6 @@
+ #endif
+ #define HasMkstemp		YES
+ #else
+-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ #endif
+ 
+@@ -252,10 +269,15 @@
+ #endif
+ #endif
+ 
++/* Suppress "The -O2 flag TRIGGERS KNOWN OPTIMIZER BUGS ON THIS PLATFORM" on Alpha 4.x */
+ #ifdef i386Architecture
+ # define OptimizedCDebugFlags DefaultGcc2i386Opt
+ #else
+-# define OptimizedCDebugFlags -O2
++# if defined(AlphaArchitecture) && OSMajorVersion < 5
++#  define OptimizedCDebugFlags -O
++# else
++#  define OptimizedCDebugFlags -O2
++# endif
+ #endif
+ 
+ #ifndef PreIncDir
diff --git a/net/vnc/files/patch-Xvnc::config::cf::Imake.cf b/net/vnc/files/patch-Xvnc::config::cf::Imake.cf
new file mode 100644
index 000000000000..feb47a79a485
--- /dev/null
+++ b/net/vnc/files/patch-Xvnc::config::cf::Imake.cf
@@ -0,0 +1,17 @@
+--- Xvnc/config/cf/Imake.cf.orig	Mon Mar 22 16:41:05 2004
++++ Xvnc/config/cf/Imake.cf	Mon Mar 22 16:27:03 2004
+@@ -154,6 +154,14 @@
+ #  define i386Architecture
+ #  undef i386
+ # endif
++# if defined(__sparc64__) || defined(sparc)
++#  define SparcArchitecture
++#  undef sparc
++# endif
++# ifdef __alpha__
++#   define AlphaArchitecture
++#   undef __alpha__
++# endif
+ #endif /* __FreeBSD__ */
+ 
+ #ifdef AMOEBA
diff --git a/net/vnc/files/patch-Xvnc::config::cf::vnc.def b/net/vnc/files/patch-Xvnc::config::cf::vnc.def
new file mode 100644
index 000000000000..2dfa8b551926
--- /dev/null
+++ b/net/vnc/files/patch-Xvnc::config::cf::vnc.def
@@ -0,0 +1,10 @@
+--- Xvnc/config/cf/vnc.def.orig	Wed Mar 24 11:45:48 2004
++++ Xvnc/config/cf/vnc.def	Wed Mar 24 11:53:03 2004
+@@ -122,6 +122,9 @@
+ #endif
+ #endif
+ 
++#ifdef FreeBSDArchitecture
++#define ProjectRoot /usr/X11R6
++#endif
+ 
diff --git a/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsparc.s b/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsparc.s
new file mode 100644
index 000000000000..b2ef87117d12
--- /dev/null
+++ b/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsparc.s
@@ -0,0 +1,11 @@
+--- Xvnc/programs/Xserver/cfb/stipsparc.s.orig	Wed Mar 24 16:34:12 2004
++++ Xvnc/programs/Xserver/cfb/stipsparc.s	Wed Mar 24 16:34:49 2004
+@@ -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/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsprc32.s b/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsprc32.s
new file mode 100644
index 000000000000..9559eb81015b
--- /dev/null
+++ b/net/vnc/files/patch-Xvnc::programs::Xserver::cfb::stipsprc32.s
@@ -0,0 +1,11 @@
+--- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig	Thu Mar 25 10:28:07 2004
++++ Xvnc/programs/Xserver/cfb/stipsprc32.s	Thu Mar 25 10:29:02 2004
+@@ -81,7 +81,7 @@
+ #define ForEachBits	LY4
+ #define NextBits	LY5
+ 
+-#ifdef SVR4
++#if defined(SVR4) || defined(__ELF__)
+ #ifdef TETEXT
+ #define	_cfb32StippleStack	cfb32StippleStackTE
+ #else