Fix build on mips (only tested on o32)

Package-Manager: portage-2.1.1-r1

4 files changed, 109 insertions, 11 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index b30e55825439..f8a6638a2150 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.80 2006/11/01 12:38:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.81 2006/11/05 05:44:46 iluxa Exp $
+
+  05 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
+  +files/tightvnc-1.3.8-mips.patch, tightvnc-1.3.8.ebuild:
+  Allow to compile on mips
 
   01 Nov 2006; Jeroen Roovers <jer@gentoo.org> files/x86.patch:
   Fix Xvnc build system for HPPA.
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index 7661383b6149..c82ac97676f8 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -42,6 +42,10 @@ AUX tightvnc-1.3.8-imake-tmpdir.patch 956 RMD160 efa2723e879f96a2176685252854905
 MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3.8-imake-tmpdir.patch 956
 RMD160 efa2723e879f96a2176685252854905207516120 files/tightvnc-1.3.8-imake-tmpdir.patch 956
 SHA256 01c00a5ef8eed18633ed3b800ea23dc08602bdaa2c737e60ea13803243731aef files/tightvnc-1.3.8-imake-tmpdir.patch 956
+AUX tightvnc-1.3.8-mips.patch 3107 RMD160 d1fd85f10376576936f29abd651d582ed68dd644 SHA1 ee9f9c4b8ee72a78cc05bc1adc1d8f038d820798 SHA256 02c281c12f6846c356aca104a757e6fadc73d507fc222908c9d7059ffb071788
+MD5 45762dfd8a965dc0b8ca51c280015848 files/tightvnc-1.3.8-mips.patch 3107
+RMD160 d1fd85f10376576936f29abd651d582ed68dd644 files/tightvnc-1.3.8-mips.patch 3107
+SHA256 02c281c12f6846c356aca104a757e6fadc73d507fc222908c9d7059ffb071788 files/tightvnc-1.3.8-mips.patch 3107
 AUX tightvnc-1.3.8-pathfixes.patch 871 RMD160 aef060a40ba1c79bc8478ddd494283fdb97358ad SHA1 e937e328c4af00206e7d6d723e336e42c9d42512 SHA256 10c2e9d604235443e953a8c13b986d0c212d2cdad6858a54db819a6aa87eabf5
 MD5 248193a5095c87c7b10c1683a7eabb2f files/tightvnc-1.3.8-pathfixes.patch 871
 RMD160 aef060a40ba1c79bc8478ddd494283fdb97358ad files/tightvnc-1.3.8-pathfixes.patch 871
@@ -97,18 +101,18 @@ EBUILD tightvnc-1.2.9-r3.ebuild 2753 RMD160 f7aaef6ff96a4614a2760ffc7e4d2a16b38f
 MD5 2c71f3e51e2c6f324047eaba2d329257 tightvnc-1.2.9-r3.ebuild 2753
 RMD160 f7aaef6ff96a4614a2760ffc7e4d2a16b38f473b tightvnc-1.2.9-r3.ebuild 2753
 SHA256 d583cf52ecdcd79228f71a8f8e8a81a70184fdb691661dc7d81f1e0b70ec55f0 tightvnc-1.2.9-r3.ebuild 2753
-EBUILD tightvnc-1.3.8.ebuild 2638 RMD160 ded8e7f009b667f1edb3df92ad3c67eb25680017 SHA1 766e04ca02fe2160f5133e3d8ebc9c2d28be3d58 SHA256 a822292c7643b5ede0f82027dfa7bde4e107d6092c76ad7e755c9bdb557925be
-MD5 4b3dfcd2fe73c694a62742012be4ae9f tightvnc-1.3.8.ebuild 2638
-RMD160 ded8e7f009b667f1edb3df92ad3c67eb25680017 tightvnc-1.3.8.ebuild 2638
-SHA256 a822292c7643b5ede0f82027dfa7bde4e107d6092c76ad7e755c9bdb557925be tightvnc-1.3.8.ebuild 2638
+EBUILD tightvnc-1.3.8.ebuild 2692 RMD160 37dc9138652bc25086f2b57170096691312cceac SHA1 2c875af493109b0526b82dedf85674cc6a42272e SHA256 3072189311e7515c800ce8a217dbbef247cd5f039a269239ba675f00acbbc62e
+MD5 ed7409501bb2a2382340990de31ba675 tightvnc-1.3.8.ebuild 2692
+RMD160 37dc9138652bc25086f2b57170096691312cceac tightvnc-1.3.8.ebuild 2692
+SHA256 3072189311e7515c800ce8a217dbbef247cd5f039a269239ba675f00acbbc62e tightvnc-1.3.8.ebuild 2692
 EBUILD tightvnc-1.3_alpha7.ebuild 2633 RMD160 68c4415cdbf8f0e21975ec7882b62daab6660bd1 SHA1 06abf1d5c547eaef6e787fd501377c2dd1c50df3 SHA256 11b8ae99e0d080bca1e87e1fe3f0c708dc887d90c86091cfb64d3a724ca94993
 MD5 316d7d331a4aba48e2f3beb0900ca3de tightvnc-1.3_alpha7.ebuild 2633
 RMD160 68c4415cdbf8f0e21975ec7882b62daab6660bd1 tightvnc-1.3_alpha7.ebuild 2633
 SHA256 11b8ae99e0d080bca1e87e1fe3f0c708dc887d90c86091cfb64d3a724ca94993 tightvnc-1.3_alpha7.ebuild 2633
-MISC ChangeLog 11838 RMD160 1d2de3c4ee67b46a32b9d710acc60df358b51e3c SHA1 30873abf14addc410e48ec32d839b7ec068a0961 SHA256 4cbe4643fbb79cf915ae7fff6cde196349ea3bc1428f1b00fab285fdf235087e
-MD5 1f2277f38aabdc8e510a5cae68457681 ChangeLog 11838
-RMD160 1d2de3c4ee67b46a32b9d710acc60df358b51e3c ChangeLog 11838
-SHA256 4cbe4643fbb79cf915ae7fff6cde196349ea3bc1428f1b00fab285fdf235087e ChangeLog 11838
+MISC ChangeLog 11987 RMD160 2aaf45c9f12fa728cbcffd12fe98732638eb39e4 SHA1 0b5030c6e33b57d07726091396aa9a4fcbd959b2 SHA256 eb2df3a8ed7b3611626cf14e7598f99bdf1ea05b4ac43f4bad3ff28493f39012
+MD5 8375437954a50013a923e0c963dd7cdc ChangeLog 11987
+RMD160 2aaf45c9f12fa728cbcffd12fe98732638eb39e4 ChangeLog 11987
+SHA256 eb2df3a8ed7b3611626cf14e7598f99bdf1ea05b4ac43f4bad3ff28493f39012 ChangeLog 11987
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-mips.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-mips.patch
new file mode 100644
index 000000000000..422a998d5aa6
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3.8-mips.patch
@@ -0,0 +1,89 @@
+diff -cr vnc_unixsrc.orig/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
+*** vnc_unixsrc.orig/Xvnc/config/cf/linux.cf	Wed Mar 20 02:49:23 2002
+--- vnc_unixsrc/Xvnc/config/cf/linux.cf	Sat Nov  4 19:01:06 2006
+***************
+*** 43,49 ****
+  #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
+      defined(SparcArchitecture) || defined(ArmArchitecure) || \
+      defined(i386Architecture) || defined(s390Architecture) || \
+!     defined(s390xArchitecture)
+  #define DefaultLinuxCLibMajorVersion	6
+  #else
+  #define DefaultLinuxCLibMajorVersion	5
+--- 43,49 ----
+  #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
+      defined(SparcArchitecture) || defined(ArmArchitecure) || \
+      defined(i386Architecture) || defined(s390Architecture) || \
+!     defined(s390xArchitecture) || defined(MipsArchitecture)
+  #define DefaultLinuxCLibMajorVersion	6
+  #else
+  #define DefaultLinuxCLibMajorVersion	5
+***************
+*** 261,266 ****
+--- 261,273 ----
+  #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+  #endif /* AlphaArchitecture */
+  
++ #ifdef MipsArchitecture
++ #define OptimizedCDebugFlags	-O2
++ #define LinuxMachineDefines	-D__mips__
++ #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
++ #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
++ #endif /* MipsArchitecture */
++ 
+  #ifdef Mc68020Architecture
+  #define OptimizedCDebugFlags	-O2
+  #define LinuxMachineDefines 	-D__mc68000__
+diff -cr vnc_unixsrc.orig/Xvnc/programs/Xserver/cfb/Imakefile vnc_unixsrc/Xvnc/programs/Xserver/cfb/Imakefile
+*** vnc_unixsrc.orig/Xvnc/programs/Xserver/cfb/Imakefile	Tue Mar 19 21:16:03 2002
+--- vnc_unixsrc/Xvnc/programs/Xserver/cfb/Imakefile	Sat Nov  4 19:01:49 2006
+***************
+*** 10,24 ****
+  /* cfb8cppl.c MUST come last to avoid confusing makedepend */
+  PSZSRCS = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c cfb8cppl.c
+  PSZOBJS = cfb8bit.o cfbteblt8.o cfbglrop8.o cfbpush8.o cfbrctstp8.o cfb8cppl.o
+- #ifdef MipsArchitecture
+- #ifndef ArcArchitecture
+- #ifndef Mips64Architecture
+- STIPPLESRC = stipmips.s stipmipste.s
+- STIPPLEOBJ = stipmips.o stipmipste.o
+- STIPPLEDEF = -DHAS_STIPPLE_CODE
+- #endif
+- #endif
+- #endif
+  #ifdef SparcArchitecture
+  STIPPLESRC = stipsparc.s stipsparcte.s
+  STIPPLEOBJ = stipsparc.o stipsparcte.o
+--- 10,15 ----
+***************
+*** 128,136 ****
+  LinkSourceFile(cfbpush8.c,LinkDirectory)
+  LinkSourceFile(cfbrctstp8.c,LinkDirectory)
+  LinkSourceFile(cfbteblt8.c,LinkDirectory)
+- #ifdef MipsArchitecture
+- LinkSourceFile(stipmips.s,LinkDirectory)
+- #endif
+  #ifdef SparcArchitecture
+  LinkSourceFile(stipsparc.s,LinkDirectory)
+  #endif
+--- 119,124 ----
+***************
+*** 186,202 ****
+  #if PixelSize == 8
+  ObjectFromSpecialSource(cfbglrop8,cfbglblt8,-DGLYPHROP)
+  
+- #ifdef MipsArchitecture
+- stipmipste.s: stipmips.s
+- 	$(RM) $@
+- 	$(LN) stipmips.s stipmipste.s
+- clean::
+- 	$(RM) stipmipste.s
+- 
+- stipmipste.o: stipmipste.s
+- 	$(AS) -o $@ -DTETEXT stipmipste.s
+- #endif
+- 
+  #ifdef SparcArchitecture
+  stipsparcte.s: stipsparc.s
+  	$(RM) $@
+--- 174,179 ----
diff --git a/net-misc/tightvnc/tightvnc-1.3.8.ebuild b/net-misc/tightvnc/tightvnc-1.3.8.ebuild
index 5e24610aebec..35a5f797f01c 100644
--- a/net-misc/tightvnc/tightvnc-1.3.8.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.8.ebuild,v 1.1 2006/10/04 18:40:25 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.8.ebuild,v 1.2 2006/11/05 05:44:46 iluxa Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ DESCRIPTION="A great client/server software package allowing remote network acce
 SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc-macos ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -59,6 +59,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-imake-tmpdir.patch" # fixes bug 23483
 	epatch "${FILESDIR}/${P}-darwin.patch" # fixes bug 89908
 	use amd64 && epatch "${FILESDIR}/${P}-amd64.patch" # fixes bug 82583
+	use mips && epatch "${FILESDIR}/${P}-mips.patch"
 }
 
 src_compile() {