Fixes for bugs 445658, 423327 - unbundle minizip and fix build issue.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x08C170DE55EC123A

5 files changed, 150 insertions, 40 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 3b284496d14e..bb93e415a171 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/eternal-lands
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.65 2012/06/24 16:17:30 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.66 2012/12/02 23:23:43 rich0 Exp $
+
+  02 Dec 2012; Richard Freeman <rich0@gentoo.org>
+  eternal-lands-1.9.3-r2.ebuild, +files/eternal-lands-1.9.3-glbuild.patch,
+  +files/eternal-lands-1.9.3-minizip.patch:
+  Fixes for bugs 445658, 423327 - unbundle minizip and fix build issue.
 
   24 Jun 2012; Richard Freeman <rich0@gentoo.org>
   eternal-lands-1.9.3-r2.ebuild:
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 912bbc3c7235..734c9f3eaf54 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX eternal-lands-1.9.0-glext.patch 302 RMD160 81702799ee5b06ed43e6a858c48fd36ab8450a8f SHA1 4281701bf4b1c87ca54f0f0476e524335c461b9b SHA256 696da44a3c5064881f738cc08af05a9e0aa9ae80c342b1d04170459f3834f016
-AUX eternal-lands-1.9.1-libpng.patch 604 RMD160 65e1c768de9f4633726c2bdce7dba5de7c2d29cb SHA1 3040914f67e91b9f85afdf382f19b039e1163c07 SHA256 a60bd9a16aa965e451a747bd43a5650af9d62b53a2e6fae93a6b3d94b2357e60
-AUX eternal-lands-1.9.2-glext.patch 296 RMD160 dfa430c6f9c474d413e2d2f4ab31876204c0d47b SHA1 c7ec3a0cab68b4b424a8a6e4bcae6cb72237591d SHA256 fa66cc5793df66c804c02395587b1866b9ce843a2eea2a6161003ff9dad37bbc
-AUX eternal-lands-1.9.3-build.patch 16222 RMD160 b19585e67af7af4c53654559ada4259317ca4c86 SHA1 18321b852929980898b670c5bf817e899e6c9ca6 SHA256 cc4dea9ea06fb62cd662cf07cd478f6e3d0f5afa2c7730c63943909cf2676ef8
-DIST elc_1.9.2-20110618.tar.bz2 2164208 RMD160 2dfda23784b607515b5bc7f34c5568b43a12e3c6 SHA1 9efc02ed3e957c204b6c0cbde4a6ea2578f8d75c SHA256 0226c95dc9e0a93713d2d8efcba7f75fbb97efe9b2b4f3b527e2851db69a0fad
-DIST elc_1.9.3-20120213.tar.bz2 2401172 RMD160 c3088a744e1a3950086742206151ba07c720fdb9 SHA1 1ccdcc52c3036f489b142260ddbe08f7a548e559 SHA256 b5ca11a2fc8db72003c6719ed031f9a7536865647a0278fa45ad8426ce88599e
-DIST eternal-lands.png 9955 RMD160 2f9c8acd96214577cf8b8027f0d20fb1fe7574ff SHA1 34ee1c154178090f45ca171509f8ba00d26d6a21 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb
-EBUILD eternal-lands-1.9.2-r1.ebuild 4178 RMD160 3eb4421d112c613b9e2ba9d28a528294142f7774 SHA1 1202be6237babb04d16cdb758eab5c2e7173b0cc SHA256 8a4f33082bcb523a5a90dc5ef450b9520d864c495550ed7152ad8b27ed60d3fb
-EBUILD eternal-lands-1.9.2.ebuild 4072 RMD160 01c9e3a645d3c0ab195370fd3739d24b7a84033a SHA1 168d3192cef862bc6663748a51319a2d670b4224 SHA256 3d61f6f8051121cbd648bcec2e2dce8a87992117346d5ff66e6e1e59bd3db045
-EBUILD eternal-lands-1.9.3-r1.ebuild 4304 RMD160 8fff139f3364cc34de1d501389d3649eb9b09d84 SHA1 bd87016aa48043e1d17b464d5a82e4086f4ba77d SHA256 aabb2af1045328eccfa1db644f997882b008b1df20743401701af71eb4030f41
-EBUILD eternal-lands-1.9.3-r2.ebuild 2828 RMD160 52d7e86a1b8929103fb491ee6f9b36b3a9fa8dfb SHA1 19ca8925e46e854fef178899444d114c9f4e3f55 SHA256 4dd02396736b63c686540a4411933d5ac3b46b3fc7d6aaf2b001d701afc516e1
-EBUILD eternal-lands-1.9.3.ebuild 4155 RMD160 51b6098ecf6dcddddd16ba16babd3292ef95b3d8 SHA1 4eed729c7144f66a3cc797fba1b4650c3e2ccb7d SHA256 2ca5492f0c691e6a8352867f0b6a0c2f110d424ba17947238ff657cd0d2ef9d8
-MISC ChangeLog 11957 RMD160 dddb81bf100e3b9061fd5711593cd20a9172fa58 SHA1 6e7157cf5945e367c38d2a0ea612184b2deb7c7e SHA256 11ef68128c07bb143d0a14812adb598498d10100ad638a39d6e0956a145d75a8
-MISC metadata.xml 366 RMD160 ccbe7a2729da6681a8dbcd3d7ea23add0ff18c65 SHA1 667cc0ff9d3cc004febdc7e34903e6d81ad2c68d SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732
+AUX eternal-lands-1.9.0-glext.patch 302 SHA256 696da44a3c5064881f738cc08af05a9e0aa9ae80c342b1d04170459f3834f016 SHA512 5924828b43be439ada37aa7ec5e6f78de826770ae5cc40938c8490fd1da2559da4d7bceaf91753e085a3222589470ff25ecd8da1c1d12427f45ee81ff25239dd WHIRLPOOL 8fcef89b6090813f29fa62af5653564badc40e1c7511b76cf4610d4f0c963c6fffaddc47f6f4ae32b027e7f052d07038847d8a820fd954874a5a43c2cd596bb4
+AUX eternal-lands-1.9.1-libpng.patch 604 SHA256 a60bd9a16aa965e451a747bd43a5650af9d62b53a2e6fae93a6b3d94b2357e60 SHA512 41700e5ffaf749a691b7588006ca28142477690d4d4f1d0b1517e5d5188c2932fa8a08c1538cc36198fc19a7f8fa58646a2e51fd7500e3f175b0e55e0903e0df WHIRLPOOL cc62a5b008b8fe9c6fb51ba139e70f154ca1a1f5f11146accba4ae62a532b009d5c9f9c92b80e6716b833db108b90111317a0bdea97a968df43607a133a9a8aa
+AUX eternal-lands-1.9.2-glext.patch 296 SHA256 fa66cc5793df66c804c02395587b1866b9ce843a2eea2a6161003ff9dad37bbc SHA512 523fff594a86e770a573731092e7cc9d02121f183ac1d9d123acff2b082c00f0a9111e2262313f2f208b1b00a6a6a61d19eace36e8da0baa40ca5e3aecc7fdaf WHIRLPOOL 909cf73906dde12b7e17af02ff4ab1722d6325c6f0122db964a72863553ceb388eca35e8ea94b0d982da039ab19e0a4171765799264499aa3585afa9ff4f72ed
+AUX eternal-lands-1.9.3-build.patch 16222 SHA256 cc4dea9ea06fb62cd662cf07cd478f6e3d0f5afa2c7730c63943909cf2676ef8 SHA512 b268c0f1dab0f86bfcea3d13122983c4efdbf9941d1851618a01986b2fc36139350e830c6838c229f7ffbb69fd51a46d06277eb43167a47e192b86db710dcfc7 WHIRLPOOL 4672c9bf0ca77703d18e676f072e7bca2354f4a9fa1d048bba2319b63ceabfcc5b2cc653235490fef33f677b59938d37ee0a501122942a21a30932041175e817
+AUX eternal-lands-1.9.3-glbuild.patch 581 SHA256 333e0e0bcc96b6ec3776415ad8a6793e271628b41c3733d9f1aeeb9092142673 SHA512 583b306f98975e8d86314519cfd0034870d07a2d908de9ac2fae9eba50ce90acc7f8949fbe40379a13308ebfdf33379f5801ccfe83d67c318b8edc3ddc0a9ed5 WHIRLPOOL d695d1f9fa668f1246f934fe0ee845b43e56533800ce97513b1d72341e8f88aebc5b8600f005a539253bc21e18426a5ee909f9311bc73797f4189fdda584a638
+AUX eternal-lands-1.9.3-minizip.patch 2142 SHA256 17101affdb96dff6de028dc1729d6d62237d8ff685d986c77806ed8721afcb5d SHA512 2a560c99504a649de7d01d08bb4d92cdd803e6c91b2ef2d1e82449268e8248b468fb8bb855e8e73396e8d4e5e2def44bda9df07f654b730bb25b509550d0f826 WHIRLPOOL 3cbb12da0a6f0a8f25046490a0692a84ed2f91fc1d87f2548f79321478607275c471ed5549df2254f2599713560956607df2f3d4cb781ca9419cdbdf78897577
+DIST elc_1.9.2-20110618.tar.bz2 2164208 SHA256 0226c95dc9e0a93713d2d8efcba7f75fbb97efe9b2b4f3b527e2851db69a0fad
+DIST elc_1.9.3-20120213.tar.bz2 2401172 SHA256 b5ca11a2fc8db72003c6719ed031f9a7536865647a0278fa45ad8426ce88599e SHA512 3580d3ceb94094443ef25f6e4880c9ffe3fff256c8d8e6657b4e0683a05184da9e6a76264557d2065a8187e3d36febd9d30ff5adff83a17607b1e478be90fabc WHIRLPOOL 12461eb7c4e453c7f9e3b607ce6f0c935e78c37e04a5736dcbf59775324e9280fc7f6302792d35984a7ae21ad4e48e35854568400df279714131de4a39b0a075
+DIST eternal-lands.png 9955 SHA256 dd7d45cd9948fe7875ebd0bfcd1925d9b34e7606a223faf61d37a6dd2cd433fb SHA512 c77571c949bb43fa7f95ae58f863ed972cfc76e184de5d0fa0a3599e4f7539f6334b843233b61fc807c90ef270d87cd57494510ce559427b592d255c198729bf WHIRLPOOL 760a339efeda97dd517ebc6dc4e222a77d35fb936002ff4f3ec571b9845ba53ce677dc3ce1a2206bb49a0b33efda231f5677fff25aadb700c191d9f7e17a778f
+EBUILD eternal-lands-1.9.2-r1.ebuild 4178 SHA256 8a4f33082bcb523a5a90dc5ef450b9520d864c495550ed7152ad8b27ed60d3fb SHA512 d259458b06432b1b6578b6f0ac71b69ec6687ae4c26506192342b28a2468561f15890cfea13a8a5c23d861dda90e5b62119fca46f34882d38e5f0b18f3af569a WHIRLPOOL 9206c6867bb2693b2b99e1b2effe1c5e1d362e8cc782e7babd4a5f9ef0917efbcbd73f76a57efef3d23d05147c8cd571955943386df6d4bde91529880decd5a5
+EBUILD eternal-lands-1.9.2.ebuild 4072 SHA256 3d61f6f8051121cbd648bcec2e2dce8a87992117346d5ff66e6e1e59bd3db045 SHA512 bb5f4ef026c7299b58dd106f43c659572ad2485f0e6a66e5fa0aeadc2d5e1ef9f5a624f63df27781e8be564739789d51b82773c25452c0a1af7c4959a626c963 WHIRLPOOL ed331d40146584a55ce2c06a59a7d7098383a9da4b96df09f49d1224f27bb05b034aa01ff341fe2d7c5fb17286121eedf019c5066a34a50b62c3d41274514de7
+EBUILD eternal-lands-1.9.3-r1.ebuild 4304 SHA256 aabb2af1045328eccfa1db644f997882b008b1df20743401701af71eb4030f41 SHA512 0977da13ab693114acf893e6a76e1351e300c40557c20e29253b1dc79f8519d94c9643c67385af3b804ffcfdd8e4c93535237223c16d60d636294ef21429dd8c WHIRLPOOL b393afdfc9fdbf8d9c1a8bff7d35fc5cb53cfadd344d26b9a4b9f41ff25d0d4eac28606dbf0b7e4057ae54351c76701121268653aeab9f4ee5440d04e26dba4e
+EBUILD eternal-lands-1.9.3-r2.ebuild 2909 SHA256 21bfe023aebfcf836ab156485e07c0cfe02c95405b6d445fb320a588b95eec7d SHA512 019b54c1862ad0b02d34038695755f0f2263ae664bac95646e02a4d8f9d5a1ac4a9674c70786875f51d6dd05e01b8e1a464ff19e6c4fe32b9e9f5db33636a12d WHIRLPOOL 74e16965fd15e6861cff984d98379ad188a0e0da88d1fd28e083a8c4a8e1d659e88a20c8a7a7015aa62e265e515f449ec971e8be46b7528aa0c10aa8eff5ba0f
+EBUILD eternal-lands-1.9.3.ebuild 4155 SHA256 2ca5492f0c691e6a8352867f0b6a0c2f110d424ba17947238ff657cd0d2ef9d8 SHA512 48988d425076c9a9182d9786b5362c18168641f7b6310e5325ffe7b984bdee3503bbb9edd8f8303df71b84319a5f1413a5f0cf33d9cc2a4a2be53e78fd9b9ad8 WHIRLPOOL 6d5441ef14c31d018a05c97f3d405cd92134e7af4a0aea3b55ae550149a98b0f53f42bd85739e3a83e51fb1bdd5098ef19781f705b95aa14106f15288a78aaec
+MISC ChangeLog 12199 SHA256 e4b019c4ef0fd723e9bcefcf80f65952939a632c80647b4b60c300838edb0408 SHA512 9c9f5df47cdadebb4cf87ed83b1231a526f5a7ba93120d34b3b2bc8a89aa7d6e203038c5db33d5798858fbbdc1c3951d0b5a23b7165f2ea1887300925ff93417 WHIRLPOOL dc542dc82b8920fc4560842b015b3508dd9fefd65b6837987af6219807e84d853ef02615766ec874f274426fb286df80d8cd19c3c4865312c7404077149502d3
+MISC metadata.xml 366 SHA256 3d87566ab1a097e5e331a2238ddb230fe2e5eb2b7097744a2aa609abf0d90732 SHA512 1f5df2a9439996e6698a6d786da9f66776a8e5d170da5c814522f24ad29c4ab889af59342816c3edb4c7889da3d1b23d1ccd8b8001be576e102ffebe38caa02b WHIRLPOOL 4e64747c3ac17bc5b4b6be4dc7606a74d7c69c642bc07ba34d6febdb396a542be2de04ef7eae83ee12bfd05e885a53fbbcc626406ed010ef7166ff751b78bb2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/nPaEACgkQCMFw3lXsEjpFfAD/VixfTGx9X7rHMEagRmKErU0n
-diFq2gthIMIBCr5o22YBALqbUw1PM7dNHU+zQ+apeY6UG6ITrU34P6EYO+Fpy216
-=7Jou
+iF4EAREIAAYFAlC74wYACgkQCMFw3lXsEjqtDgD+K+nBcq7c9jmb+yUEftdPvyqQ
+pJMiB4hHoyOrDBv1t7gA/RgDIPOTxJEsysfvQOafqVCx9vX+vxcmSVd1hSiFunMc
+=131U
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
index bf01d588d83c..fc8ee94e4301 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild,v 1.2 2012/06/24 16:17:30 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild,v 1.3 2012/12/02 23:23:44 rich0 Exp $
 
 EAPI=4
 inherit eutils flag-o-matic gnome2-utils games
@@ -15,26 +15,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="debug doc kernel_linux"
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	virtual/opengl
-	virtual/glu
-	media-libs/libsdl[X]
-	media-libs/sdl-net
-	media-libs/sdl-image
-	media-libs/openal
+RDEPEND="dev-libs/libxml2
+	media-libs/cal3d[-16bit-indices]
 	media-libs/freealut
+	media-libs/libpng:0
+	media-libs/libsdl[X]
 	media-libs/libvorbis
-	dev-libs/libxml2
-	media-libs/cal3d[-16bit-indices]
-	media-libs/libpng
-	>=games-rpg/eternal-lands-data-1.9.3"
-
+	media-libs/openal
+	media-libs/sdl-image
+	media-libs/sdl-net
+	>=games-rpg/eternal-lands-data-1.9.3
+	sys-libs/zlib[minizip]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext"
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-opengl-1.0.6-r1
 	app-arch/unzip
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen
 		media-gfx/graphviz )"
 
@@ -53,18 +54,20 @@ src_prepare() {
 	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
 		el.ini || die "sed failed"
 
-	epatch "${FILESDIR}/${PN}-1.9.2-glext.patch"
+	epatch "${FILESDIR}/${PN}-1.9.3-glbuild.patch"
 	epatch "${FILESDIR}/${PN}-1.9.3-build.patch"
+	epatch "${FILESDIR}/${PN}-1.9.3-minizip.patch"
 
-	cp Makefile.linux Makefile
+	# remove bundled minizip
+	rm io/{crypt,ioapi,unzip,zip}.h || die
+	rm io/{ioapi,unzip,zip}.c || die
 
-	# Fix for Gentoo zlib OF redefine
-	sed -i '1i#define OF(x) x' `find -name "*.c"` || die "sed failed"
+	cp Makefile.linux Makefile
 }
 
 src_compile() {
 	emake \
-		DEBUG="$(usex debug "yes" "no")" \
+		DEBUG="$(usex debug)" \
 		BSD_KERNEL="$(usex !kernel_linux)" \
 		DATADIR="${GAMES_DATADIR}/${PN}/"
 
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
new file mode 100644
index 000000000000..972abd9b0d2b
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
@@ -0,0 +1,25 @@
+--- gl_init.c	2012-02-13 22:01:54.000000000 -0500
++++ gl_init.c	2012-12-02 18:09:41.274014922 -0500
+@@ -27,6 +27,8 @@
+ #include "fsaa/fsaa.h"
+ #endif	/* FSAA */
+ 
++#define APIENTRY
++
+ Uint32 flags;
+ 
+ int window_width=640;
+--- platform.h	2012-02-13 22:01:54.000000000 -0500
++++ platform.h	2012-12-02 17:32:46.017627957 -0500
+@@ -87,9 +87,10 @@
+  #define APIENTRYP *
+ #elif !defined(BSD)
+  #define GL_GLEXT_LEGACY
++ #include <GL/glew.h>
+  #include <GL/gl.h>
+  #include <GL/glu.h>
+- #include "glext.h"
++ #include <GL/glext.h>
+ #else // BSD
+  #include <GL/gl.h>
+  #include <GL/glu.h>
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
new file mode 100644
index 000000000000..9edb22254502
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
@@ -0,0 +1,75 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Jun 24 16:33:08 UTC 2012
+Subject: unbundle minizip
+
+https://bugs.gentoo.org/show_bug.cgi?id=423327
+applied on top of eternal-lands-1.9.3-build.patch
+
+--- elc/new_update.c
++++ elc/new_update.c
+@@ -5,8 +5,8 @@
+ #include <string.h>
+ #include "md5.h"
+ #include "elc_private.h"
+-#include "io/zip.h"
+-#include "io/unzip.h"
++#include <zip.h>
++#include <unzip.h>
+ #include "io/ziputil.h"
+ #include "io/fileutil.h"
+ #include "io/elfilewrapper.h"
+--- elc/io/ziputil.h
++++ elc/io/ziputil.h
+@@ -8,8 +8,8 @@
+ 
+ #include <SDL.h>
+ #include "../md5.h"
+-#include "zip.h"
+-#include "unzip.h"
++#include <zip.h>
++#include <unzip.h>
+ 
+ #ifdef __cplusplus
+ extern "C"
+--- elc/io/elfilewrapper.c
++++ elc/io/elfilewrapper.c
+@@ -1,5 +1,5 @@
+ #include "elfilewrapper.h"
+-#include "unzip.h"
++#include <unzip.h>
+ #include "elpathwrapper.h"
+ #include "fileutil.h"
+ #include <sys/stat.h>
+--- elc/Makefile.linux
++++ elc/Makefile.linux
+@@ -25,11 +25,13 @@
+ 
+ CFLAGS += $(shell sdl-config --cflags) \
+ 	  $(shell xml2-config --cflags) \
++	  $(shell pkg-config --cflags minizip) \
+ 	  -fno-strict-aliasing \
+ 	  $(EXTRA_INCLUDES)
+ 
+ CXXFLAGS += $(shell sdl-config --cflags) \
+ 	    $(shell xml2-config --cflags) \
++	    $(shell pkg-config --cflags minizip) \
+ 	    -fno-strict-aliasing \
+ 	    $(EXTRA_INCLUDES)
+ 
+@@ -47,6 +49,7 @@
+ 	$(shell pkg-config --libs vorbis) \
+ 	$(shell pkg-config --libs vorbisfile) \
+ 	$(shell pkg-config --libs zlib) \
++	$(shell pkg-config --libs minizip) \
+ 	-lm \
+ 	$(EXTRA_LIBS) \
+ 	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
+@@ -80,7 +83,7 @@
+ 	gamewin.o gl_init.o hud.o help.o highlight.o	\
+ 	ignore.o init.o interface.o items.o io/fileutil.o	\
+ 	io/e3d_io.o io/elc_io.o	io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \
+-	io/half.o io/normal.o io/elfilewrapper.o io/unzip.o io/ioapi.o io/zip.o io/ziputil.o	\
++	io/half.o io/normal.o io/elfilewrapper.o io/ziputil.o	\
+ 	keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o	\
+ 	main.o manufacture.o map.o mapwin.o memory.o	\
+ 	md5.o mines.o minimap.o misc.o missiles.o multiplayer.o	\