diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-05 18:18:21 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-05 18:18:21 +0000 |
commit | 295893efd1b516c942c54e368209b3b558ece1ec (patch) | |
tree | 01404f5e84ec7e5e6a520af60a4c5af136fb0225 /games-strategy | |
parent | Fix gettext dependency (diff) | |
download | gentoo-2-295893efd1b516c942c54e368209b3b558ece1ec.tar.gz gentoo-2-295893efd1b516c942c54e368209b3b558ece1ec.tar.bz2 gentoo-2-295893efd1b516c942c54e368209b3b558ece1ec.zip |
Stable on x86 wrt bug #147783 and removing 0.2.0 ebuilds/patches.
(Portage version: 2.1.2_pre1-r4)
(Signed Manifest commit)
Diffstat (limited to 'games-strategy')
-rw-r--r-- | games-strategy/freecnc/Manifest | 44 | ||||
-rw-r--r-- | games-strategy/freecnc/files/0.2.0-gentoo-paths.patch | 29 | ||||
-rw-r--r-- | games-strategy/freecnc/files/0.2.0-makefile-cflags.patch | 94 | ||||
-rw-r--r-- | games-strategy/freecnc/files/digest-freecnc-0.2.0 | 9 | ||||
-rw-r--r-- | games-strategy/freecnc/files/freecnc-0.2.0-endian.patch | 124 | ||||
-rw-r--r-- | games-strategy/freecnc/freecnc-0.2.0.ebuild | 77 |
6 files changed, 12 insertions, 365 deletions
diff --git a/games-strategy/freecnc/Manifest b/games-strategy/freecnc/Manifest index 2321b5510500..e40ce285200e 100644 --- a/games-strategy/freecnc/Manifest +++ b/games-strategy/freecnc/Manifest @@ -1,14 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 0.2.0-gentoo-paths.patch 980 RMD160 ae4e9d0e8e44f757137a257ca538d1b46269a3f5 SHA1 a3db2f7eb90b596a4af6028e1f39b77686d27c5c SHA256 8dec1678067f808fdc3ac8ab1a0c1df5f8e148240f1253a512197801bc241ee2 -MD5 deb5d60f8269a27307f92372b65f2600 files/0.2.0-gentoo-paths.patch 980 -RMD160 ae4e9d0e8e44f757137a257ca538d1b46269a3f5 files/0.2.0-gentoo-paths.patch 980 -SHA256 8dec1678067f808fdc3ac8ab1a0c1df5f8e148240f1253a512197801bc241ee2 files/0.2.0-gentoo-paths.patch 980 -AUX 0.2.0-makefile-cflags.patch 4220 RMD160 e63665273dbea8d96b2692a1043135748f1afc1b SHA1 ebd9713435c99f656b8cedcd3adfbbe4facc1b91 SHA256 258a05074f2fce00aa5fe62a68b6c59e5da7aacfe8d6bb6ba3122ea15666a7c1 -MD5 97801c0bb7df9499db0b530110aaa510 files/0.2.0-makefile-cflags.patch 4220 -RMD160 e63665273dbea8d96b2692a1043135748f1afc1b files/0.2.0-makefile-cflags.patch 4220 -SHA256 258a05074f2fce00aa5fe62a68b6c59e5da7aacfe8d6bb6ba3122ea15666a7c1 files/0.2.0-makefile-cflags.patch 4220 AUX 0.2.0-remove-root.patch 636 RMD160 4c2cc7caf3ec2ed077d06c38bfe0d5725a98561d SHA1 b2981e9b4b16864eb9861355ecca9b6dcf194b62 SHA256 5bf71e0e607cfb2191cdd55c45e9856cfbc1146980929419679ac5f7f72735fb MD5 929803ba179a8f6e0996f29dfc33dcdc files/0.2.0-remove-root.patch 636 RMD160 4c2cc7caf3ec2ed077d06c38bfe0d5725a98561d files/0.2.0-remove-root.patch 636 @@ -29,44 +21,32 @@ AUX freecnc 44 RMD160 449158ab5e3bf2d4025cc6a7d7e108115776a709 SHA1 2a86ec97c739 MD5 190952f0b1cd7f8ebd7385c01e0b70db files/freecnc 44 RMD160 449158ab5e3bf2d4025cc6a7d7e108115776a709 files/freecnc 44 SHA256 94b017b779b59a349a752d3663864058c4036ffbfa453216f3212fe5eda9aeae files/freecnc 44 -AUX freecnc-0.2.0-endian.patch 3042 RMD160 3aebfdd38cd7f1e447b9cdc07e3456fec072fda6 SHA1 cbc061b52573c52955be92646b9f06383628d913 SHA256 4565fd4ed3f3dec9f9b686839bbaba32adafda4a7003a6a298c0b36431939996 -MD5 da57fef460c5cba4a6aaf3490242a0e4 files/freecnc-0.2.0-endian.patch 3042 -RMD160 3aebfdd38cd7f1e447b9cdc07e3456fec072fda6 files/freecnc-0.2.0-endian.patch 3042 -SHA256 4565fd4ed3f3dec9f9b686839bbaba32adafda4a7003a6a298c0b36431939996 files/freecnc-0.2.0-endian.patch 3042 AUX freecnc-0.2.1.31072003-gcc4.patch 403 RMD160 2aa4b9ecfe762cbb6599ad8a502d384bb75c8816 SHA1 3f884ae37f843ea8320f0e5e1f12695db661731c SHA256 bfe4b998ae938a1b3f87d394ddc13e745ec85736b4594dd7ab66ee48e5b34ae1 MD5 b7a2487d3f2a0c36ab831cc34f300c15 files/freecnc-0.2.1.31072003-gcc4.patch 403 RMD160 2aa4b9ecfe762cbb6599ad8a502d384bb75c8816 files/freecnc-0.2.1.31072003-gcc4.patch 403 SHA256 bfe4b998ae938a1b3f87d394ddc13e745ec85736b4594dd7ab66ee48e5b34ae1 files/freecnc-0.2.1.31072003-gcc4.patch 403 DIST cc1demo1.zip 9367945 RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 SHA1 fce488d0f9090cd96e6b064f0821ecf299b71962 SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87 DIST cc1demo2.zip 17797920 RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 SHA1 a154a12f2479b76601081f2bdb49286b5bb040dc SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48 -DIST freecnc++-0.2.0-src.tar.bz2 264419 RMD160 8fa51bd98dce7a57b388ea668528295e2b421bc2 SHA1 9a1fc62af96c24359e82a4fdf4da3de5c4590207 SHA256 19b2aa3ef040a631a4cc0c8e773252380437c2f961d9a8bf8a6722fdfc08dc49 DIST freecnc++-0.2.1.31072003-src.tar.bz2 271980 RMD160 e249a600a54a5a0aa791219360011724b8e273f2 SHA1 40d742f4acc9d175bb3b7ef1deddd1cdb18ba285 SHA256 512f55708791742093703b5ebe7ebe7b3e0c3ca46562aa9fb8f526bafc514cc5 -EBUILD freecnc-0.2.0.ebuild 2220 RMD160 c3a33caddece3c4fb0c0c1a88a07ad35b7d0e4e1 SHA1 c8663862b63b27591dbed715f184a30afd3ce71e SHA256 52d73e35b621050db326cfc5c5573e936cb73d25067dac32952854dac9442f21 -MD5 24ef15f2031361b1492ee0e60bb1edb4 freecnc-0.2.0.ebuild 2220 -RMD160 c3a33caddece3c4fb0c0c1a88a07ad35b7d0e4e1 freecnc-0.2.0.ebuild 2220 -SHA256 52d73e35b621050db326cfc5c5573e936cb73d25067dac32952854dac9442f21 freecnc-0.2.0.ebuild 2220 -EBUILD freecnc-0.2.1.31072003.ebuild 2290 RMD160 87b9b1593b3cbb07abdeecd9d474a40bcc7fb653 SHA1 d4bc7478629b104a5835d033fbc69d8435e65e5c SHA256 c9fb673a8faf6f3ca5b403a5dc8b88ef0612b0c29f6a2f96676a7c4b7ab017f3 -MD5 e4174320527e56dca8beba4631bc9b90 freecnc-0.2.1.31072003.ebuild 2290 -RMD160 87b9b1593b3cbb07abdeecd9d474a40bcc7fb653 freecnc-0.2.1.31072003.ebuild 2290 -SHA256 c9fb673a8faf6f3ca5b403a5dc8b88ef0612b0c29f6a2f96676a7c4b7ab017f3 freecnc-0.2.1.31072003.ebuild 2290 -MISC ChangeLog 1017 RMD160 80ee94329c748b039ee875fb7f3578f2951cc75b SHA1 4d710f70758ccdf6eb3ce8079eb26034a0d0b9ab SHA256 6f4a764cd7a318b73750f6d40cb1a0a4536fdf4734c3e4569b0028edecb75c75 -MD5 b331004a1a6e8f30c54cc82993f6f380 ChangeLog 1017 -RMD160 80ee94329c748b039ee875fb7f3578f2951cc75b ChangeLog 1017 -SHA256 6f4a764cd7a318b73750f6d40cb1a0a4536fdf4734c3e4569b0028edecb75c75 ChangeLog 1017 +EBUILD freecnc-0.2.1.31072003.ebuild 2291 RMD160 8fa83b8a3b4c7e9958f936156f561931a93e1358 SHA1 b223f935aa6ad219102232a5a188abbaee76f9c8 SHA256 3105c84655b3ae063b1b373be18ab9bca7c8056edfaaacb2cee20c0770041694 +MD5 2ff57a88fcc1cebd3350fcf9a1ac6c50 freecnc-0.2.1.31072003.ebuild 2291 +RMD160 8fa83b8a3b4c7e9958f936156f561931a93e1358 freecnc-0.2.1.31072003.ebuild 2291 +SHA256 3105c84655b3ae063b1b373be18ab9bca7c8056edfaaacb2cee20c0770041694 freecnc-0.2.1.31072003.ebuild 2291 +MISC ChangeLog 1306 RMD160 822c732341a7dd301b097cda458583aa42487fb7 SHA1 ad3aeef1520610fbf40c79ab37357126d4a85e81 SHA256 019931ef905a58455f7a385a001eddd3eee7c2843a965939fef0a4585e06c0ed +MD5 4f35ab250e6fe3055e4e75b7f64bf5cd ChangeLog 1306 +RMD160 822c732341a7dd301b097cda458583aa42487fb7 ChangeLog 1306 +SHA256 019931ef905a58455f7a385a001eddd3eee7c2843a965939fef0a4585e06c0ed ChangeLog 1306 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 7e8e77b1c53ca06cfeeaaf2faefe190d files/digest-freecnc-0.2.0 705 -RMD160 aa9cc33d6babd489de738a9982e3ee92d4373e5c files/digest-freecnc-0.2.0 705 -SHA256 6b984aa823e042fe05effcf449ef71be564fbd28f59885d2400a6766eeb71d31 files/digest-freecnc-0.2.0 705 MD5 0c0285caf26128f1b2fb8d3adf5812a7 files/digest-freecnc-0.2.1.31072003 732 RMD160 d52931537e7d6a1eedbb1021a60993c3b415b2ad files/digest-freecnc-0.2.1.31072003 732 SHA256 4b3c8208e11a10196c1a16c81f493db49aa8739cb9cc10b83227c28b234bf342 files/digest-freecnc-0.2.1.31072003 732 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFEd5re2CTtIKiFlQIRAj4LAKCkCiH56NreeuoV/QgWNQeakz/NTwCfbRBI -7UGagJIq7ZjvGWrMJohcG9k= -=JQVV +iD8DBQFFJUxpkT4lNIS36YERAl4ZAJ48Oe6eXJwJCJkCccm6QLRW9sgATgCeKMRJ +Tu5M08ZJ7stQpgOIYomdzDc= +=iQo+ -----END PGP SIGNATURE----- diff --git a/games-strategy/freecnc/files/0.2.0-gentoo-paths.patch b/games-strategy/freecnc/files/0.2.0-gentoo-paths.patch deleted file mode 100644 index bfaa03d0cd14..000000000000 --- a/games-strategy/freecnc/files/0.2.0-gentoo-paths.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/freecnc.cpp.orig 2003-07-31 21:17:53.000000000 -0400 -+++ src/freecnc.cpp 2003-07-31 21:18:07.000000000 -0400 -@@ -42,7 +42,7 @@ - exit(1); - } - // default to only showing errors on stdout -- logger = new Logger("freecnc.log",0); -+ logger = new Logger("GENTOO_LOGDIR/freecnc.log",0); - #if !defined _WIN32 - // maybe some win32 specific checks for running as the Administrator - // account or something ---- src/vfs/vfs.cpp.orig 2003-07-31 21:50:05.000000000 -0400 -+++ src/vfs/vfs.cpp 2002-07-29 08:59:44.000000000 -0400 -@@ -32,10 +32,13 @@ - - externals = new ExternalFiles(); - -- externals->loadArchive("conf/"); -+ sprintf(tempstr, "%s/.freecnc/", getenv("HOME")); -+ externals->loadArchive(tempstr); -+ externals->loadArchive("GENTOO_CONFDIR"); - #if !defined WIN32 - -- externals->loadArchive("/etc/freecnc/"); -+ externals->loadArchive("GENTOO_DATADIR/conf/"); -+ externals->loadArchive("GENTOO_DATADIR/"); - #endif - - try { diff --git a/games-strategy/freecnc/files/0.2.0-makefile-cflags.patch b/games-strategy/freecnc/files/0.2.0-makefile-cflags.patch deleted file mode 100644 index fd80e34c64f6..000000000000 --- a/games-strategy/freecnc/files/0.2.0-makefile-cflags.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -ur freecnc++.orig/src/Makefile freecnc++/src/Makefile ---- freecnc++.orig/src/Makefile 2002-07-29 08:59:44.000000000 -0400 -+++ freecnc++/src/Makefile 2003-07-31 20:43:21.000000000 -0400 -@@ -26,12 +26,11 @@ - - #EFENCE = -lefence - --CFLAGS = $(DEBUG_FLAGS) -Werror -Wall -I./include `sdl-config --cflags` -+CFLAGS = -Wall -I./include `sdl-config --cflags` $(EXTRACFLAGS) - LIBS = -lSDL_net - - # comment this out if your compiler isn't ANSI - # needed on OSX and some gcc systems. --CFLAGS += -ansi -pedantic - - # uncomment these lines if compiling on OSX - #CFLAGS += -DDARWIN -D_WITHOUT_STRCASECMP -diff -ur freecnc++.orig/src/vfs/vfs_mix/Makefile freecnc++/src/vfs/vfs_mix/Makefile ---- freecnc++.orig/src/vfs/vfs_mix/Makefile 2002-07-29 08:59:44.000000000 -0400 -+++ freecnc++/src/vfs/vfs_mix/Makefile 2003-07-31 20:42:58.000000000 -0400 -@@ -8,8 +8,7 @@ - #DEBUG_FLAGS += -D_DEBUG -DSTRICT_DEBUG - #LDFLAGS += ../../misc/memtrack.o - --CFLAGS = $(DEBUG_FLAGS) -Werror -Wall -I.. -I../../include `sdl-config --cflags` --CFLAGS += -ansi -pedantic -+CFLAGS = -Wall -I.. -I../../include `sdl-config --cflags` $(EXTRACFLAGS) - # uncomment these lines if compiling on OSX - #CFLAGS += -D_WITHOUT_STRCASECMP - #LDFLAGS += -bundle -flat_namespace -undefined suppress -diff -ur freecnc++.orig/src/vfs/vfs_tgz/Makefile freecnc++/src/vfs/vfs_tgz/Makefile ---- freecnc++.orig/src/vfs/vfs_tgz/Makefile 2002-07-29 08:59:45.000000000 -0400 -+++ freecnc++/src/vfs/vfs_tgz/Makefile 2003-07-31 20:43:08.000000000 -0400 -@@ -8,8 +8,7 @@ - #DEBUG_FLAGS += -D_DEBUG -DSTRICT_DEBUG - #LDFLAGS += ../../misc/memtrack.o - --CFLAGS = $(DEBUG_FLAGS) -Werror -Wall -I.. -I../../include `sdl-config --cflags` --CFLAGS += -ansi -pedantic -+CFLAGS = -Wall -I.. -I../../include `sdl-config --cflags` $(EXTRACFLAGS) - # uncomment these lines if compiling on OSX - #CFLAGS += -D_WITHOUT_STRCASECMP - #LDFLAGS += -bundle -flat_namespace -undefined suppress -diff -ur freecnc++.orig/tools/audplay/Makefile freecnc++/tools/audplay/Makefile ---- freecnc++.orig/tools/audplay/Makefile 2002-07-20 09:20:15.000000000 -0400 -+++ freecnc++/tools/audplay/Makefile 2003-07-31 20:42:05.000000000 -0400 -@@ -9,10 +9,9 @@ - LOCALOBJS = $(LOCALSRC:.cpp=.o) - OBJECTS = $(SRC:.cpp=.o) - --CFLAGS = -g -Werror -Wall -I. -I../../src/include `sdl-config --cflags` -+CFLAGS = -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS) - - #if your compiler is really broken and doesn't understand ANSI, comment this out --CFLAGS += -ansi -pedantic - - #if your compiler is partially broken and allows the use of str(n)casecmp - #even when compiling with -ansi -pedantic (it shouldn't), uncomment this: -diff -ur freecnc++.orig/tools/mixshell/Makefile freecnc++/tools/mixshell/Makefile ---- freecnc++.orig/tools/mixshell/Makefile 2002-07-20 09:20:15.000000000 -0400 -+++ freecnc++/tools/mixshell/Makefile 2003-07-31 20:42:18.000000000 -0400 -@@ -10,4 +10,4 @@ - - .SUFFIXES: .cpp .o - .cpp.o: -- g++ -Wall -c $< `sdl-config --cflags` -+ g++ -Wall -c $< `sdl-config --cflags` $(EXTRACFLAGS) -diff -ur freecnc++.orig/tools/shpview/Makefile freecnc++/tools/shpview/Makefile ---- freecnc++.orig/tools/shpview/Makefile 2002-07-20 09:20:15.000000000 -0400 -+++ freecnc++/tools/shpview/Makefile 2003-07-31 20:42:30.000000000 -0400 -@@ -9,10 +9,9 @@ - LOCALOBJS = $(LOCALSRC:.cpp=.o) - OBJECTS = $(SRC:.cpp=.o) - --CFLAGS = -g -Werror -Wall -I. -I../../src/include `sdl-config --cflags` -+CFLAGS = -Wall -I. -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS) - - #if your compiler is really broken and doesn't understand ANSI, comment this out --CFLAGS += -ansi -pedantic - - #if your compiler is partially broken and allows the use of str(n)casecmp - #even when compiling with -ansi -pedantic (it shouldn't), uncomment this: -diff -ur freecnc++.orig/tools/tmpinied/Makefile freecnc++/tools/tmpinied/Makefile ---- freecnc++.orig/tools/tmpinied/Makefile 2002-07-20 09:20:15.000000000 -0400 -+++ freecnc++/tools/tmpinied/Makefile 2003-07-31 20:42:41.000000000 -0400 -@@ -7,7 +7,7 @@ - - OBJECTS = $(SRC:.cpp=.o) - --CFLAGS = -g -Wall -I../../src/include `sdl-config --cflags` -+CFLAGS = -Wall -I../../src/include `sdl-config --cflags` $(EXTRACFLAGS) - - all: $(OBJECTS) - g++ -o tmpinied -g `sdl-config --libs` $(OBJECTS) diff --git a/games-strategy/freecnc/files/digest-freecnc-0.2.0 b/games-strategy/freecnc/files/digest-freecnc-0.2.0 deleted file mode 100644 index 536986d688c0..000000000000 --- a/games-strategy/freecnc/files/digest-freecnc-0.2.0 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 7d770d38618e20796fbe642037f08de5 cc1demo1.zip 9367945 -RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 cc1demo1.zip 9367945 -SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87 cc1demo1.zip 9367945 -MD5 bbe489d259c4e6d6cadb4a2544b764aa cc1demo2.zip 17797920 -RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 cc1demo2.zip 17797920 -SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48 cc1demo2.zip 17797920 -MD5 9d43ea387f370b8108e7a870a82017d5 freecnc++-0.2.0-src.tar.bz2 264419 -RMD160 8fa51bd98dce7a57b388ea668528295e2b421bc2 freecnc++-0.2.0-src.tar.bz2 264419 -SHA256 19b2aa3ef040a631a4cc0c8e773252380437c2f961d9a8bf8a6722fdfc08dc49 freecnc++-0.2.0-src.tar.bz2 264419 diff --git a/games-strategy/freecnc/files/freecnc-0.2.0-endian.patch b/games-strategy/freecnc/files/freecnc-0.2.0-endian.patch deleted file mode 100644 index ad8779ace61a..000000000000 --- a/games-strategy/freecnc/files/freecnc-0.2.0-endian.patch +++ /dev/null @@ -1,124 +0,0 @@ -freecnc normally bundles a file called 'endian.h' ... this causes problems -with the real system endian.h. grab upstream cvs fix for this (rename -endian.h to fcnc_endian.h). - ---- src/game/loadmap.cpp -+++ src/game/loadmap.cpp -@@ -8,3 +8,3 @@ - #include "shpimage.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "config.h" ---- src/include/fcnc_endian.h -+++ src/include/fcnc_endian.h -@@ -0,0 +1,68 @@ -+// mode: -*- C++ -*- -+/***************************************************************************** -+ * endian.h - Includes macro definitions to convert bytes to correct endianess -+ * This code has yet to be tested on Big Endian Machines. -+ * -+ * Author: Kareem Dana -+ ****************************************************************************/ -+ -+#ifndef __FCNC_ENDIAN_H -+#define __FCNC_ENDIAN_H -+ -+#include <stdio.h> -+#include "SDL_endian.h" -+ -+#if SDL_BYTEORDER == SDL_LIL_ENDIAN -+ #define readbyte(x,y) x[y] -+ #define readword(x,y) x[y] + (x[y+1] << 8) -+ #define readthree(x,y) x[y] + (x[y+1] << 8) + (x[y+2] << 16) + (0 << 24) -+ #define readlong(x,y) x[y] + (x[y+1] << 8) + (x[y+2] << 16) + (x[y+3] << 24) -+#else -+ #define readbyte(x,y) x[y] -+ #define readword(x,y) SDL_Swap16((x[y] << 8) ^ x[y+1]) -+ #define readthree(x,y) SDL_Swap32((x[y] << 24) ^ (x[y+1] << 16) ^ (x[y+2] << 8)) -+ #define readlong(x,y) SDL_Swap32((x[y] << 24) ^ (x[y+1] << 16) ^ (x[y+2] << 8) ^ (x[y+3])) -+#endif -+ -+static __inline__ Uint8 freadbyte(FILE *fptr) -+{ -+ Uint8 x; -+ fread(&x,1,1,fptr); -+ return x; -+} -+ -+static __inline__ Uint16 freadword(FILE *fptr) -+{ -+ Uint16 x; -+ fread(&x,2,1,fptr); -+#if SDL_BYTEORDER == SDL_BIG_ENDIAN -+ -+ return SDL_Swap16(x); -+#else -+ -+ return x; -+#endif -+} -+ -+static __inline__ Uint32 freadthree(FILE *fptr) -+{ -+ /* Can this be made betteR?? */ -+ Uint8 x[3]; -+ fread(x,3,1,fptr); -+ return readthree(x,0); -+} -+ -+static __inline__ Uint32 freadlong(FILE *fptr) -+{ -+ Uint32 x; -+ fread(&x, 4, 1, fptr); -+#if SDL_BYTEORDER == SDL_BIG_ENDIAN -+ -+ return SDL_Swap32(x); -+#else -+ -+ return x; -+#endif -+} -+ -+#endif ---- src/ui/font.cpp -+++ src/ui/font.cpp -@@ -1,3 +1,3 @@ - #include "font.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "vfs.h" ---- src/vfs/vfs_mix/mixvfs.cpp -+++ src/vfs/vfs_mix/mixvfs.cpp -@@ -2,3 +2,3 @@ - #include "ws-key.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "SDL_endian.h" ---- src/video/cpsimage.cpp -+++ src/video/cpsimage.cpp -@@ -4,3 +4,3 @@ - #include "inifile.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "compression.h" ---- src/video/shpimage.cpp -+++ src/video/shpimage.cpp -@@ -7,3 +7,3 @@ - #include "inifile.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "compression.h" ---- src/video/vqa.cpp -+++ src/video/vqa.cpp -@@ -1,3 +1,3 @@ - #include "compression.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "vfs.h" ---- src/video/wsaimage.cpp -+++ src/video/wsaimage.cpp -@@ -1,3 +1,3 @@ - #include "wsa.h" --#include "endian.h" -+#include "fcnc_endian.h" - #include "compression.h" diff --git a/games-strategy/freecnc/freecnc-0.2.0.ebuild b/games-strategy/freecnc/freecnc-0.2.0.ebuild deleted file mode 100644 index 4332818a22ee..000000000000 --- a/games-strategy/freecnc/freecnc-0.2.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.0.ebuild,v 1.8 2006/05/27 00:18:10 tupone Exp $ - -inherit games flag-o-matic eutils - -DESCRIPTION="SDL-rewrite of the classical real time strategy hit Command & Conquer" -HOMEPAGE="http://freecnc-sf.holarse.net/" -SRC_URI="mirror://sourceforge/freecnc/freecnc++-${PV}-src.tar.bz2 - nocd? ( ftp://ftp.westwood.com/pub/cc1/previews/demo/cc1demo1.zip ) - nocd? ( ftp://ftp.westwood.com/pub/cc1/previews/demo/cc1demo2.zip )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="zlib nocd" - -RDEPEND="media-libs/libsdl - media-libs/sdl-net - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - app-arch/unzip" - -S=${WORKDIR}/freecnc++ - -src_unpack() { - unpack freecnc++-${PV}-src.tar.bz2 - if use nocd ; then - mkdir data ; cd data - unpack cc1demo1.zip cc1demo2.zip - for f in * ; do - mv ${f} $(echo ${f} | awk '{print tolower($1)}') || die "moving $f" - done - fi - cd "${S}" - epatch "${FILESDIR}"/${PV}-makefile-cflags.patch \ - "${FILESDIR}"/${PV}-remove-root.patch \ - "${FILESDIR}"/${PV}-gentoo-paths.patch \ - "${FILESDIR}"/${P}-endian.patch - rm -f src/include/endian.h - sed -i \ - -e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \ - -e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \ - -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}/:" \ - src/freecnc.cpp src/vfs/vfs.cpp \ - || die "sed failed" -} - -src_compile() { - emake EXTRACFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - exeinto "${GAMES_LIBDIR}"/${PN} - doexe freecnc *.vfs - dogamesbin "${FILESDIR}"/freecnc || die "dogamesbin failed" - dosed "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/freecnc - insinto "${GAMES_DATADIR}"/${PN}/conf - doins conf/* - insinto "${GAMES_SYSCONFDIR}"/${PN} - doins conf/* - dodoc AUTHORS ChangeLog NEWS README THANKS TODO - if use nocd ; then - cd "${WORKDIR}"/data - insinto "${GAMES_DATADIR}"/${PN} - doins *.mix *.aud || die "doins failed" - dodoc *.txt - fi - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - einfo "If you have the C&C games, then just copy the .mix" - einfo "to ${GAMES_DATADIR}/${PN}" - einfo "Otherwise, re-emerge freecnc with 'nocd' in your USE." -} |