Make it build on DragonFly.

3 files changed, 146 insertions, 12 deletions

diff --git a/games/ioquake3/distinfo b/games/ioquake3/distinfo
index 9db17c748e6..9ea419f021c 100644
--- a/games/ioquake3/distinfo
+++ b/games/ioquake3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/13 00:12:29 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2009/03/23 09:57:36 hasso Exp $
 
 SHA1 (ioquake3-0.0.1490.tar.gz) = 249bf7e55d62adde90caa20aca05e2df10541079
 RMD160 (ioquake3-0.0.1490.tar.gz) = 16bc03444cfa8670b3f37cc713be52109bd528ba
 Size (ioquake3-0.0.1490.tar.gz) = 4054017 bytes
-SHA1 (patch-aa) = 3b23bdcb4b0b43c9a5520a2cce24ac9063aebebb
+SHA1 (patch-aa) = 3f89e248cb2e64657f37ccb4f77b837fc7e7a012
 SHA1 (patch-ab) = 7808f9c26160ae1931c96fe1bc5e898b69afbde2
-SHA1 (patch-ac) = 174319bd674ebf809d371dc4b816eee2d79269ee
+SHA1 (patch-ac) = 38834fd3e1b3b1c9dba648ffbc97814c0aaa581a
 SHA1 (patch-ad) = be5e91745076c23b3984268f428445722223f350
diff --git a/games/ioquake3/patches/patch-aa b/games/ioquake3/patches/patch-aa
index dbcb1cb2f32..54c37c0c0d2 100644
--- a/games/ioquake3/patches/patch-aa
+++ b/games/ioquake3/patches/patch-aa
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/13 00:12:29 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2009/03/23 09:57:37 hasso Exp $
 
---- code/qcommon/q_platform.h.orig	2009-01-12 12:28:35.000000000 -0500
-+++ code/qcommon/q_platform.h
-@@ -194,6 +194,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
+--- code/qcommon/q_platform.h.orig	2009-01-12 19:28:35 +0200
++++ code/qcommon/q_platform.h	2009-03-23 11:14:03 +0200
+@@ -170,7 +170,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
+ 
+ //=================================================================== BSD ===
+ 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 
+ #include <sys/types.h>
+ #include <machine/endian.h>
+@@ -185,6 +185,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
+ #define OS_STRING "openbsd"
+ #elif defined(__NetBSD__)
+ #define OS_STRING "netbsd"
++#elif defined(__DragonFly__)
++#define OS_STRING "dragonfly"
+ #endif
+ 
+ #define ID_INLINE inline
+@@ -194,6 +196,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
  #define ARCH_STRING "i386"
  #elif defined __axp__
  #define ARCH_STRING "alpha"
diff --git a/games/ioquake3/patches/patch-ac b/games/ioquake3/patches/patch-ac
index 000fdfeadbe..3afcab635f0 100644
--- a/games/ioquake3/patches/patch-ac
+++ b/games/ioquake3/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/01/13 00:12:29 jmcneill Exp $
+$NetBSD: patch-ac,v 1.2 2009/03/23 09:57:37 hasso Exp $
 
---- Makefile.orig	2009-01-12 12:28:41.000000000 -0500
-+++ Makefile
-@@ -644,24 +644,109 @@ ifeq ($(PLATFORM),netbsd)
+--- Makefile.orig	2009-01-12 19:28:41 +0200
++++ Makefile	2009-03-23 11:21:16 +0200
+@@ -644,28 +644,217 @@ ifeq ($(PLATFORM),netbsd)
  
    ifeq ($(shell uname -m),i386)
      ARCH=i386
@@ -90,9 +90,113 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/01/13 00:12:29 jmcneill Exp $
 +      CLIENT_LIBS += -lcurl
 +    endif
 +  endif
++
++  ifeq ($(USE_CODEC_VORBIS),1)
++    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
++  endif
  
 -  BUILD_CLIENT = 0
 -  BUILD_GAME_QVM = 0
++  ifeq ($(USE_MUMBLE),1)
++    CLIENT_LIBS += -lrt
++  endif
++
++  ifeq ($(USE_LOCAL_HEADERS),1)
++    BASE_CFLAGS += -I$(SDLHDIR)/include
++  endif
++
++  ifeq ($(ARCH),i386)
++    # linux32 make ...
++    BASE_CFLAGS += -m32
++  else
++  ifeq ($(ARCH),ppc64)
++    BASE_CFLAGS += -m64
++  endif
++  endif
++
++  DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
++  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
+ 
+ else # ifeq netbsd
+ 
+ #############################################################################
++# SETUP AND BUILD -- DRAGONFLY
++#############################################################################
++
++ifeq ($(PLATFORM),dragonfly)
++
++  ifeq ($(shell uname -m),i386)
++    ARCH=i386
++  else
++  ifeq ($(shell uname -m),amd64)
++    ARCH=x86_64
++  endif
++  endif
++
++  USE_MUMBLE=0
++
++  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
++    -pipe -DUSE_ICON $(shell sdl-config --cflags)
++
++  ifeq ($(USE_OPENAL),1)
++    BASE_CFLAGS += -DUSE_OPENAL
++    ifeq ($(USE_OPENAL_DLOPEN),1)
++      BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
++    endif
++  endif
++
++  ifeq ($(USE_CURL),1)
++    BASE_CFLAGS += -DUSE_CURL
++    ifeq ($(USE_CURL_DLOPEN),1)
++      BASE_CFLAGS += -DUSE_CURL_DLOPEN
++    endif
++  endif
++
++  ifeq ($(USE_CODEC_VORBIS),1)
++    BASE_CFLAGS += -DUSE_CODEC_VORBIS
++  endif
++
++  OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
++
++  ifeq ($(ARCH),x86_64)
++    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
++      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
++      -fstrength-reduce
++    # experimental x86_64 jit compiler! you need GNU as
++    HAVE_VM_COMPILED = true
++  else
++  ifeq ($(ARCH),i386)
++    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
++      -funroll-loops -falign-loops=2 -falign-jumps=2 \
++      -falign-functions=2 -fstrength-reduce
++    HAVE_VM_COMPILED=true
++  endif
++  endif
++
++  ifneq ($(HAVE_VM_COMPILED),true)
++    BASE_CFLAGS += -DNO_VM_COMPILED
++  endif
++
++  SHLIBEXT=so
++  SHLIBCFLAGS=-fPIC
++  SHLIBLDFLAGS=-shared $(LDFLAGS)
++
++  THREAD_LIBS=-lpthread
++  LIBS=-lm
++  CLIENT_LIBS = $(shell sdl-config --libs) -lGL
++
++  ifeq ($(USE_OPENAL),1)
++    ifneq ($(USE_OPENAL_DLOPEN),1)
++      CLIENT_LIBS += -lopenal
++    endif
++  endif
++
++  ifeq ($(USE_CURL),1)
++    ifneq ($(USE_CURL_DLOPEN),1)
++      CLIENT_LIBS += -lcurl
++    endif
++  endif
++
 +  ifeq ($(USE_CODEC_VORBIS),1)
 +    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
 +  endif
@@ -116,6 +220,18 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/01/13 00:12:29 jmcneill Exp $
 +
 +  DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
 +  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
++
++else # ifeq dragonfly
++
++#############################################################################
+ # SETUP AND BUILD -- IRIX
+ #############################################################################
  
- else # ifeq netbsd
+@@ -776,6 +965,7 @@ endif #mingw32
+ endif #FreeBSD
+ endif #OpenBSD
+ endif #NetBSD
++endif #DragonFly
+ endif #IRIX
+ endif #SunOS