Deanna Phillips writes:

> The OpenBSD port has been marked broken for over 2 years.  I
> found the source of the problem to be their code not working
> with the OpenBSD zlib, so the diff disables using it and builds
> an internal zlib instead.  A handful of other problems are
> patched away as well, and it builds and runs for me on i386.

More specifically, this was a Z_VERSION_ERROR caused by the
inclusion of their bundled zlib headers even when building with
an external libz.

Here's a better fix that uses OpenBSD's libz.


Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/games/bzflag/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_ac
--- patches/patch-configure_ac  2006/09/22 03:42:57     1.1
+++ patches/patch-configure_ac  2006/09/22 17:45:49
@@ -1,15 +1,6 @@
 $OpenBSD: patch-configure_ac,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
 --- configure.ac.orig  Mon Apr 17 16:11:11 2006
 +++ configure.ac       Sun Aug  6 00:55:20 2006
-@@ -125,7 +125,7 @@ AC_SUBST(AR)
- AC_CHECK_PROG(AR, ar, ar)
- AC_SUBST(AR_FLAGS)
- 
--AC_CHECK_LIB(z, compress, BUILDZLIB=no, BUILDZLIB=yes)
-+AC_CHECK_LIB(z, compress, BUILDZLIB=yes, BUILDZLIB=yes)
- AM_CONDITIONAL(BUILDZLIB, test $BUILDZLIB = yes)
- 
-   #checking for libcurl library
 @@ -187,6 +187,7 @@ AC_CHECK_HEADERS( \
        SDL/SDL.h \
        X11/Xlib.h \
Index: patches/patch-src_bzflag_WorldBuilder_cxx
===================================================================
RCS file: patch-src_bzflag_WorldBuilder_cxx
diff -N patch-src_bzflag_WorldBuilder_cxx
--- /dev/null   Sat Aug 30 18:16:59 1997
+++ patches/patch-src_bzflag_WorldBuilder_cxx   Fri Sep 22 17:45:49 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/bzflag/WorldBuilder.cxx.orig   Fri Sep 22 13:11:38 2006
++++ src/bzflag/WorldBuilder.cxx        Fri Sep 22 13:11:49 2006
+@@ -24,7 +24,7 @@
+ #include "BaseBuilding.h"
+ 
+ /* compression library header */
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ 
+ 
+ WorldBuilder::WorldBuilder()
Index: patches/patch-src_bzflag_clientCommands_cxx
===================================================================
RCS file: patch-src_bzflag_clientCommands_cxx
diff -N patch-src_bzflag_clientCommands_cxx
--- /dev/null   Sat Aug 30 18:16:59 1997
+++ patches/patch-src_bzflag_clientCommands_cxx Fri Sep 22 17:45:49 2006
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/bzflag/clientCommands.cxx.orig Fri Sep 22 13:12:01 2006
++++ src/bzflag/clientCommands.cxx      Fri Sep 22 13:12:19 2006
+@@ -14,8 +14,7 @@
+ #include "commands.h"
+ 
+ /* system implementation headers */
+-#include "../zlib/zconf.h"
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ 
+ /* common implementation headers */
+ #include "BZDBCache.h"
Index: patches/patch-src_bzfs_WorldInfo_cxx
===================================================================
RCS file: patch-src_bzfs_WorldInfo_cxx
diff -N patch-src_bzfs_WorldInfo_cxx
--- /dev/null   Sat Aug 30 18:16:59 1997
+++ patches/patch-src_bzfs_WorldInfo_cxx        Fri Sep 22 17:45:49 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/bzfs/WorldInfo.cxx.orig        Fri Sep 22 13:10:43 2006
++++ src/bzfs/WorldInfo.cxx     Fri Sep 22 13:11:01 2006
+@@ -51,7 +51,7 @@
+ #include "CustomZone.h"
+ 
+ /* compression library header */
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ 
+ 
+ WorldInfo::WorldInfo() :
Index: patches/patch-src_mediafile_PNGImageFile_cxx
===================================================================
RCS file: patch-src_mediafile_PNGImageFile_cxx
diff -N patch-src_mediafile_PNGImageFile_cxx
--- /dev/null   Sat Aug 30 18:16:59 1997
+++ patches/patch-src_mediafile_PNGImageFile_cxx        Fri Sep 22 17:45:49 2006
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/mediafile/PNGImageFile.cxx.orig        Fri Sep 22 13:10:00 2006
++++ src/mediafile/PNGImageFile.cxx     Fri Sep 22 13:10:11 2006
+@@ -15,8 +15,7 @@
+ #include <iostream>
+ #include "Pack.h"
+ #include "bzfio.h"
+-#include "../zlib/zconf.h"
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ 
+ #ifndef _WIN32
+ #include <netinet/in.h>

Reply via email to