4 files changed, 57 insertions, 16 deletions

diff --git a/games/openarena/Makefile b/games/openarena/Makefile
index ff351ba0747d..2ddae0fdf18e 100644
--- a/games/openarena/Makefile
+++ b/games/openarena/Makefile
@@ -8,18 +8,19 @@
 PORTNAME=	openarena
 PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
 DISTVERSION=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 MASTER_SITES=	http://files.poulsander.com/~poul19/public_files/oa/dev081/
-DISTNAME=	${PORTNAME}-engine-source-0.8.x-21
+DISTNAME=	${PORTNAME}-engine-source-0.8.x-22
+# Master port defines EXTRACT_SUFX unless already defined
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Quake3 total conversion based on the ioquake3 engine
 
 RUN_DEPENDS=	${DATADIR}/${Q3BASE}/pak0.pk3:${PORTSDIR}/games/openarena-data
 
-USE_BZIP2=	yes
-USE_ZIP=	no
+NO_GAMELIBS=	yes
 # OpenArena doc is too messy to bother
 NOPORTDOCS=	yes
 
@@ -34,4 +35,7 @@ Q3DIR=		${DATADIR}
 # No icon included with OpenArena
 Q3ICON=
 
+# Dynamically loaded renderer not yet supported
+WITHOUT_DLRENDERER=	yes
+
 .include "../ioquake3/Makefile"
diff --git a/games/openarena/distinfo b/games/openarena/distinfo
index 4dc0673137de..1daf5d406a76 100644
--- a/games/openarena/distinfo
+++ b/games/openarena/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openarena-engine-source-0.8.x-21.tar.bz2) = 5888436571c053f8ccb4e7832b1a2d7a8742c340e3df66242d0016655fa29067
-SIZE (openarena-engine-source-0.8.x-21.tar.bz2) = 7411462
+SHA256 (openarena-engine-source-0.8.x-22.tar.bz2) = d2a9123b3e35f656de795957afcb64917612e91cfc55157410cceaa6a7939a60
+SIZE (openarena-engine-source-0.8.x-22.tar.bz2) = 7422832
diff --git a/games/openarena/files/patch-Makefile b/games/openarena/files/patch-Makefile
index 4767cfb2e5dd..e6844bf57409 100644
--- a/games/openarena/files/patch-Makefile
+++ b/games/openarena/files/patch-Makefile
@@ -1,19 +1,61 @@
---- Makefile.orig	2010-07-02 21:50:49.000000000 +0200
-+++ Makefile	2010-11-27 14:39:09.000000000 +0100
-@@ -561,9 +561,16 @@
+--- Makefile.orig	2011-11-04 21:03:54.000000000 +0100
++++ Makefile	2011-11-04 21:09:54.000000000 +0100
+@@ -205,6 +205,8 @@
+     OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
+     SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
+     SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
++    VORBIS_CFLAGS=$(shell pkg-config --silence-errors --cflags vorbis vorbisfile)
++    VORBIS_LIBS=$(shell pkg-config --silence-errors --libs vorbis vorbisfile)
+   endif
+   # Use sdl-config if all else fails
+   ifeq ($(SDL_CFLAGS),)
+@@ -569,9 +571,15 @@
  
  ifeq ($(PLATFORM),freebsd)
  
 +  # system integration
 +  ifndef DEFAULT_LIBDIR
-+    DEFAULT_LIBDIR = /usr/local/lib/ioquake3
++    DEFAULT_LIBDIR = /usr/local/lib/openarena
 +  endif
 +
    # flags
    BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
      -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-+    -DHOMEPATH=\\\"$(HOMEPATH)\\\" \
 +    -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \
      -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
    CLIENT_CFLAGS = $(SDL_CFLAGS)
    SERVER_CFLAGS = 
+@@ -594,27 +602,24 @@
+ 
+   # optional features/libraries
+   ifeq ($(USE_OPENAL),1)
+-    CLIENT_CFLAGS += -DUSE_OPENAL
++    CLIENT_CFLAGS += -DUSE_OPENAL $(OPENAL_CFLAGS)
++    CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
+     ifeq ($(USE_OPENAL_DLOPEN),1)
+       CLIENT_CFLAGS += -DUSE_OPENAL_DLOPEN
+-      CLIENT_LIBS += $(THREAD_LIBS) -lopenal
+     endif
+   endif
+ 
+   ifeq ($(USE_CURL),1)
+-    CLIENT_CFLAGS += -DUSE_CURL
++    CLIENT_CFLAGS += -DUSE_CURL $(CURL_CFLAGS)
++    CLIENT_LIBS += $(CURL_LIBS)
+     ifeq ($(USE_CURL_DLOPEN),1)
+       CLIENT_CFLAGS += -DUSE_CURL_DLOPEN
+-      CLIENT_LIBS += -lcurl
+     endif
+   endif
+ 
+   ifeq ($(USE_CODEC_VORBIS),1)
+-    CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
+-  endif
+-
+-  ifeq ($(USE_CODEC_VORBIS),1)
+-    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
++    CLIENT_CFLAGS += -DUSE_CODEC_VORBIS $(VORBIS_CFLAGS)
++    CLIENT_LIBS += $(VORBIS_LIBS)
+   endif
+ 
+   # cross-compiling tweaks
diff --git a/games/openarena/pkg-plist b/games/openarena/pkg-plist
index 8a4c880148a9..f5e5c6c635bc 100644
--- a/games/openarena/pkg-plist
+++ b/games/openarena/pkg-plist
@@ -1,8 +1,3 @@
 %%DEDICATED%%bin/oa_ded%%BINSUFFIX%%
 %%CLIENT%%bin/openarena%%BINSUFFIX%%
 %%SMP%%bin/openarena-smp%%BINSUFFIX%%
-%%GAMELIBS%%%%LIBDIR%%/baseoa/cgame%%ARCH%%.so
-%%GAMELIBS%%%%LIBDIR%%/baseoa/qagame%%ARCH%%.so
-%%GAMELIBS%%%%LIBDIR%%/baseoa/ui%%ARCH%%.so
-%%GAMELIBS%%@dirrm %%LIBDIR%%/baseoa
-%%GAMELIBS%%@dirrm %%LIBDIR%%