ports/162301: [maintainer-update] games/ioquake3-devel and slaves
Dominic Fandrey
kamikaze at bsdforen.de
Fri Nov 4 21:40:10 UTC 2011
>Number: 162301
>Category: ports
>Synopsis: [maintainer-update] games/ioquake3-devel and slaves
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 04 21:40:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Dominic Fandrey
>Release: RELENG_8
>Organization:
private
>Environment:
FreeBSD mobileKamikaze.norad 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Aug 29 19:15:43 CEST 2011 root at mobileKamikaze.norad:/usr/obj/HP6510b-8/amd64/usr/src/sys/HP6510b-8 amd64
>Description:
games/ioquake3
- Bump portrevision
- Allow slave ports to turn off some options
- Add modular renderer support for slaves
- Add WITH_DEBUG support
- Always check against non-default options so that they can be overridden (e.g. for BATCH mode)
- Add pkg-config build dependency
games/ioquake3
games/ioquake3-devel
games/iourbanterror
games/openarena
- Fix CURL support
- Link libraries instead of using dlopen
games/ioquake3-devel
games/iourbanterror
- Update SVN snapshot r2064 to r2194
- Improved UDP download speed
- New protocol version 71
- Reduced VOIP latency
- Modular rendering system
- Added r_mode -2 for using display resolution
- Clang support
- ...
games/openarena
- Bump portrevision
- Switch from engine src dist 21 to 22 (both SVN r1910 based)
games/openarena-oax
- Update from B48 to B50
games/iourbanterror
games/openarena
- Clean up plist
- Forbid the GAMELIBS option (doesn't work)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nur ioquake3.orig/Makefile ioquake3/Makefile
--- ioquake3.orig/Makefile 2011-10-26 23:27:28.000000000 +0200
+++ ioquake3/Makefile 2011-11-04 21:30:15.000000000 +0100
@@ -7,13 +7,15 @@
PORTNAME?= ioquake3
DISTVERSION?= 1.36
-PORTREVISION?= 7
+PORTREVISION?= 8
CATEGORIES= games
MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/
MAINTAINER?= kamikaze at bsdforen.de
COMMENT?= Cleaned-up and enhanced version of Quake 3
+BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
+
USE_ZIP?= yes
# Allow slave ports to turn off zip.
.if ${USE_ZIP} == "no"
@@ -22,18 +24,26 @@
USE_GMAKE= yes
OPTIONS+= CLIENT "Build client" on \
- GAMELIBS "Build game libraries" off \
DEDICATED "Build dedicated server" on \
CURL "Enable cURL for http/ftp download" on \
OPENAL "Enable OpenAL audio output" on \
MUMBLE "Enable Mumble support (no dependencies)" on \
VORBIS "Enable Ogg Vorbis support" on
+.if !defined(NO_GAMELIBS)
+OPTIONS+= GAMELIBS "Build game libraries" off
+.endif
+.if defined(HAS_DLRENDERER)
+OPTIONS+= DLRENDERER "Build dynamically loaded renderer" on
+.else
+WITHOUT_DLRENDERER= yes
+.endif
MAKE_ARGS+= DEFAULT_BASEDIR="${Q3DIR}" \
DEFAULT_LIBDIR="${LIBDIR}" \
HOMEPATH="${HOMEPATH}" \
VERSION="${DISTVERSION}" \
- ARCH="${ARCH}"
+ ARCH="${ARCH}" \
+ USE_LOCAL_HEADERS=0
PLIST_SUB+= LIBDIR="${LIBDIR:S/${PREFIX}\///}" \
ARCH="${ARCH}" \
BINSUFFIX="${BINSUFFIX}"
@@ -41,7 +51,7 @@
MAKE_JOBS_SAFE= yes
LIBDIR= ${PREFIX}/lib/${PORTNAME}
-BUILDDIR= ${WRKSRC}/build/release-${OPSYS:L}-${ARCH}
+BUILDDIR= ${WRKSRC}/build/${ALL_TARGET}-${OPSYS:L}-${ARCH}
BINSUFFIX?=
HOMEPATH?= /.${PORTNAME}
Q3CLIENT?= ioquake3
@@ -53,6 +63,7 @@
Q3BASE?= baseq3 \
missionpack
Q3ICON?= ${PREFIX}/share/pixmaps/quake3.xpm
+Q3RENDERER?= renderer_opengl1_${ARCH}
Q3INSTALL?=
ONLY_FOR_ARCHS= amd64 i386
@@ -63,8 +74,19 @@
.include <bsd.port.options.mk>
+.if defined(NO_GAMELIBS) && defined(WITH_GAMELIBS)
+BROKEN= WITH_GAMELIBS is not supported by ${PORTNAME}
+.endif
+.if !defined(HAS_DLRENDERER) && defined(WITH_DLRENDERER)
+BROKEN= WITH_DLRENDERER is not supported by ${PORTNAME}
+.endif
+
+.if defined(WITH_DEBUG)
+ALL_TARGET= debug
+.endif
+
.if !defined(DESKTOP_ENTRIES)
-.if defined(WITH_CLIENT)
+.if !defined(WITHOUT_CLIENT)
DESKTOP_ENTRIES+= "${Q3CLIENT} ${DISTVERSION}" "${COMMENT}" \
"${Q3ICON}" \
"${Q3CLIENT}${BINSUFFIX}" "Application;Game;" false
@@ -81,37 +103,43 @@
IGNORE= needs at least one of CLIENT, DEDICATED and SMP options
.endif
-.if defined(WITH_CLIENT) || defined(WITH_SMP)
+.if !defined(WITHOUT_CLIENT) || defined(WITH_SMP)
# cURL
-.if defined(WITH_CURL)
+.if !defined(WITHOUT_CURL)
LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
-#MAKE_ARGS+= USE_CURL_DLOPEN=0
+MAKE_ARGS+= USE_CURL=1 USE_CURL_DLOPEN=0
.else
MAKE_ARGS+= USE_CURL=0
.endif
# OpenAL
-.if defined(WITH_OPENAL)
+.if !defined(WITHOUT_OPENAL)
USE_OPENAL= al
+MAKE_ARGS+= USE_OPENAL=1 USE_OPENAL_DLOPEN=0
.else
MAKE_ARGS+= USE_OPENAL=0
.endif
# SDL
USE_SDL= sdl
# Vorbis
-.if defined(WITH_VORBIS)
+.if !defined(WITHOUT_VORBIS)
LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
MAKE_ARGS+= USE_CODEC_VORBIS=1
+.else
+MAKE_ARGS+= USE_CODEC_VORBIS=0
.endif
# Mumble
-.if defined(WITH_MUMBLE)
+.if !defined(WITHOUT_MUMBLE)
MAKE_ARGS+= USE_MUMBLE=1
.else
MAKE_ARGS+= USE_MUMBLE=0
.endif
+.else
+# Features that aren't installed without a client
+WITHOUT_DLRENDERER= yes
.endif
# SMP is only built with CLIENT.
-.if defined(WITH_CLIENT) || defined(WITH_SMP)
+.if !defined(WITHOUT_CLIENT) || defined(WITH_SMP)
MAKE_ARGS+= BUILD_CLIENT=1
PLIST_SUB+= CLIENT=""
Q3BIN+= ${Q3CLIENT}
@@ -120,7 +148,7 @@
PLIST_SUB+= CLIENT="@comment "
.endif
-.if defined(WITH_DEDICATED)
+.if !defined(WITHOUT_DEDICATED)
MAKE_ARGS+= BUILD_SERVER=1
PLIST_SUB+= DEDICATED=""
Q3BIN+= ${Q3SERVER}
@@ -146,6 +174,14 @@
PLIST_SUB+= SMP="@comment "
.endif
+.if !defined(WITHOUT_DLRENDERER)
+PLIST_SUB+= DLRENDERER=""
+MAKE_ARGS+= USE_RENDERER_DLOPEN=1
+.else
+MAKE_ARGS+= USE_RENDERER_DLOPEN=0
+PLIST_SUB+= DLRENDERER="@comment "
+.endif
+
do-install: ${Q3INSTALL}
.for bin in ${Q3BIN}
${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${ARCH} \
@@ -155,10 +191,16 @@
${INSTALL_PROGRAM} ${BUILDDIR}/tools/${bin} \
${PREFIX}/bin/${bin}${BINSUFFIX}
.endfor
+.if !defined(WITHOUT_DLRENDERER)
+.for renderer in ${Q3RENDERER}
+ ${MKDIR} ${LIBDIR}
+ ${INSTALL_LIB} ${BUILDDIR}/${renderer}.so ${LIBDIR}
+.endfor
+.endif
.if defined(WITH_GAMELIBS)
.for dir in ${Q3BASE}
${MKDIR} ${LIBDIR}/${dir}
- ${INSTALL_PROGRAM} ${BUILDDIR}/${dir}/*.so ${LIBDIR}/${dir}
+ ${INSTALL_LIB} ${BUILDDIR}/${dir}/*.so ${LIBDIR}/${dir}
.endfor
.endif
.if !defined(NOPORTDOCS)
diff -Nur ioquake3.orig/files/patch-Makefile ioquake3/files/patch-Makefile
--- ioquake3.orig/files/patch-Makefile 2011-10-26 23:27:28.000000000 +0200
+++ ioquake3/files/patch-Makefile 2011-11-04 20:43:02.000000000 +0100
@@ -1,6 +1,15 @@
--- Makefile.orig 2009-04-22 20:54:48.000000000 +0200
-+++ Makefile 2009-12-08 11:38:10.000000000 +0100
-@@ -521,15 +521,22 @@
++++ Makefile 2011-11-04 20:42:56.000000000 +0100
+@@ -187,6 +187,8 @@
+ # FIXME: introduce CLIENT_CFLAGS
+ SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')
+ SDL_LIBS=$(shell pkg-config --libs sdl)
++ VORBIS_CFLAGS=$(shell pkg-config --silence-errors --cflags vorbis vorbisfile)
++ VORBIS_LIBS=$(shell pkg-config --silence-errors --libs vorbis vorbisfile)
+ endif
+
+ # version info
+@@ -521,44 +523,25 @@
ifeq ($(PLATFORM),freebsd)
@@ -13,29 +22,18 @@
-
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
- -DUSE_ICON $(shell sdl-config --cflags)
-+ ifndef HOMEPATH
-+ HOMEPATH = /.ioquake3
-+ endif
-+
-+ ifndef DEFAULT_LIBDIR
-+ DEFAULT_LIBDIR = /usr/local/lib/ioquake3
-+ endif
-+
-+ BASE_CFLAGS = $(shell env MACHINE_ARCH=$(ARCH) make -f /dev/null -VCFLAGS) \
-+ -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-+ -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON \
-+ -DHOMEPATH=\\\"$(HOMEPATH)\\\" \
-+ -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\"
-+ CLIENT_CFLAGS = $(SDL_CFLAGS)
-+ SERVER_CFLAGS =
-+ HAVE_VM_COMPILED = true
-
- ifeq ($(USE_OPENAL),1)
- BASE_CFLAGS += -DUSE_OPENAL
-@@ -542,24 +549,6 @@
- BASE_CFLAGS += -DUSE_CODEC_VORBIS
- endif
-
+-
+- ifeq ($(USE_OPENAL),1)
+- BASE_CFLAGS += -DUSE_OPENAL
+- ifeq ($(USE_OPENAL_DLOPEN),1)
+- BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
+- endif
+- endif
+-
+- ifeq ($(USE_CODEC_VORBIS),1)
+- BASE_CFLAGS += -DUSE_CODEC_VORBIS
+- endif
+-
- ifeq ($(ARCH),axp)
- BASE_CFLAGS += -DNO_VM_COMPILED
- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
@@ -51,16 +49,71 @@
- BASE_CFLAGS += -DNO_VM_COMPILED
- endif
- endif
--
++ ifndef HOMEPATH
++ HOMEPATH = /.ioquake3
++ endif
++
++ ifndef DEFAULT_LIBDIR
++ DEFAULT_LIBDIR = /usr/local/lib/ioquake3
++ 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)
++ HAVE_VM_COMPILED = true
+
- DEBUG_CFLAGS=$(BASE_CFLAGS) -g
--
++ OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
++ OPTIMIZE = $(OPTIMIZEVM) -ffast-math
+
SHLIBEXT=so
SHLIBCFLAGS=-fPIC
- SHLIBLDFLAGS=-shared $(LDFLAGS)
-@@ -582,6 +571,27 @@
- CLIENT_LIBS += -lvorbisfile -lvorbis -logg
+@@ -568,20 +551,52 @@
+ # don't need -ldl (FreeBSD)
+ LIBS=-lm
+
+- CLIENT_LIBS =
+-
+- CLIENT_LIBS += $(shell sdl-config --libs) -lGL
++ CLIENT_LIBS = $(SDL_LIBS) -lGL
+
++ # optional features/libraries
+ ifeq ($(USE_OPENAL),1)
+- ifneq ($(USE_OPENAL_DLOPEN),1)
+- CLIENT_LIBS += $(THREAD_LIBS) -lopenal
++ CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
++ CLIENT_CFLAGS += -DUSE_OPENAL
++ ifneq ($(USE_LOCAL_HEADERS),1)
++ CLIENT_CFLAGS += $(OPENAL_CFLAGS)
++ endif
++ endif
++
++ ifeq ($(USE_CURL),1)
++ CLIENT_LIBS += $(CURL_LIBS)
++ CLIENT_CFLAGS += -DUSE_CURL
++ ifneq ($(USE_LOCAL_HEADERS),1)
++ CLIENT_CFLAGS += $(CURL_CFLAGS)
+ endif
endif
+ ifeq ($(USE_CODEC_VORBIS),1)
+- CLIENT_LIBS += -lvorbisfile -lvorbis -logg
++ CLIENT_LIBS += $(VORBIS_LIBS)
++ CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
++ ifneq ($(USE_LOCAL_HEADERS),1)
++ CLIENT_CFLAGS += $(VORBIS_CFLAGS)
++ endif
+ endif
+
++ ifeq ($(BUILD_CLIENT),1)
++ BASE_CFLAGS += $(CLIENT_CFLAGS)
++ endif
++
++ # cross-compiling tweaks
+ ifeq ($(ARCH),i386)
+ ifeq ($(CROSS_COMPILING),1)
+ BASE_CFLAGS += -m32
@@ -72,20 +125,13 @@
+ endif
+ endif
+
-+ ifeq ($(BUILD_CLIENT),1)
-+ BASE_CFLAGS += $(CLIENT_CFLAGS)
-+ endif
-+
-+ RELEASE_CFLAGS = $(BASE_CFLAGS) -DNDEBUG -O3 -fomit-frame-pointer \
-+ -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-+ -funroll-loops -fstrength-reduce
-+
++ RELEASE_CFLAGS = $(BASE_CFLAGS)
+ DEBUG_CFLAGS = $(BASE_CFLAGS) -g
+
else # ifeq freebsd
#############################################################################
-@@ -1442,6 +1452,9 @@
+@@ -1442,6 +1457,9 @@
ifeq ($(ARCH),x86_64)
Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
endif
@@ -95,7 +141,7 @@
ifeq ($(ARCH),ppc)
Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
endif
-@@ -1591,6 +1604,9 @@
+@@ -1591,6 +1609,9 @@
ifeq ($(ARCH),x86_64)
Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
endif
diff -Nur ioquake3.orig/files/patch-README ioquake3/files/patch-README
--- ioquake3.orig/files/patch-README 2011-10-26 23:27:28.000000000 +0200
+++ ioquake3/files/patch-README 2011-10-27 13:31:15.000000000 +0200
@@ -1,5 +1,5 @@
---- README.orig 2009-08-30 23:34:03.000000000 +0200
-+++ README 2009-08-31 00:05:03.000000000 +0200
+--- README.orig 2009-04-08 05:36:16.000000000 +0200
++++ README 2011-10-27 13:13:59.000000000 +0200
@@ -79,6 +79,8 @@
CFLAGS - use this for custom CFLAGS
V - set to show cc command line when building
diff -Nur ioquake3.orig/files/patch-code-client-cl_curl.h ioquake3/files/patch-code-client-cl_curl.h
--- ioquake3.orig/files/patch-code-client-cl_curl.h 1970-01-01 01:00:00.000000000 +0100
+++ ioquake3/files/patch-code-client-cl_curl.h 2011-11-03 10:17:27.000000000 +0100
@@ -0,0 +1,12 @@
+--- code/client/cl_curl.h.orig 2011-11-03 10:16:32.000000000 +0100
++++ code/client/cl_curl.h 2011-11-03 10:16:56.000000000 +0100
+@@ -34,8 +34,7 @@
+ #elif defined(MACOS_X)
+ #define DEFAULT_CURL_LIB "libcurl.dylib"
+ #else
+-#define DEFAULT_CURL_LIB "libcurl.so.4"
+-#define ALTERNATE_CURL_LIB "libcurl.so.3"
++#define DEFAULT_CURL_LIB "libcurl.so"
+ #endif
+
+ #ifdef USE_LOCAL_HEADERS
diff -Nur ioquake3.orig/files/patch-code-sys-sys_unix.c ioquake3/files/patch-code-sys-sys_unix.c
--- ioquake3.orig/files/patch-code-sys-sys_unix.c 2011-10-26 23:27:28.000000000 +0200
+++ ioquake3/files/patch-code-sys-sys_unix.c 2011-10-27 13:30:19.000000000 +0200
@@ -1,5 +1,5 @@
--- code/sys/sys_unix.c.orig 2008-11-11 00:55:22.000000000 +0100
-+++ code/sys/sys_unix.c 2009-12-08 10:54:22.000000000 +0100
++++ code/sys/sys_unix.c 2011-10-27 13:11:15.000000000 +0200
@@ -53,7 +53,9 @@
if( ( p = getenv( "HOME" ) ) != NULL )
{
diff -Nur ioquake3.orig/pkg-plist ioquake3/pkg-plist
--- ioquake3.orig/pkg-plist 2011-10-26 23:27:28.000000000 +0200
+++ ioquake3/pkg-plist 2011-10-27 12:20:50.000000000 +0200
@@ -5,6 +5,7 @@
bin/q3cpp%%BINSUFFIX%%
bin/q3lcc%%BINSUFFIX%%
bin/q3rcc%%BINSUFFIX%%
+%%DLRENDERER%%%%LIBDIR%%/renderer_opengl1_%%ARCH%%.so
%%GAMELIBS%%%%LIBDIR%%/baseq3/cgame%%ARCH%%.so
%%GAMELIBS%%%%LIBDIR%%/baseq3/qagame%%ARCH%%.so
%%GAMELIBS%%%%LIBDIR%%/baseq3/ui%%ARCH%%.so
@@ -14,5 +15,5 @@
%%PORTDOCS%%%%DOCSDIR%%/README
%%GAMELIBS%%@dirrm %%LIBDIR%%/missionpack
%%GAMELIBS%%@dirrm %%LIBDIR%%/baseq3
-%%GAMELIBS%%@dirrm %%LIBDIR%%
+ at dirrmtry %%LIBDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -Nur ioquake3-devel.orig/Makefile ioquake3-devel/Makefile
--- ioquake3-devel.orig/Makefile 2011-10-26 23:09:31.000000000 +0200
+++ ioquake3-devel/Makefile 2011-11-04 19:15:02.000000000 +0100
@@ -17,7 +17,9 @@
PLIST?= ${.CURDIR}/../ioquake3/pkg-plist
PATCHDIR?= ${WRKDIR}/freebsd-patchset/
-SVNREVISION?= 2064
+SVNREVISION?= 2194
BINSUFFIX?= -devel
+HAS_DLRENDERER?= yes
+
.include "${.CURDIR}/../ioquake3/Makefile"
diff -Nur ioquake3-devel.orig/distinfo ioquake3-devel/distinfo
--- ioquake3-devel.orig/distinfo 2011-10-26 23:09:31.000000000 +0200
+++ ioquake3-devel/distinfo 2011-11-04 20:37:06.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (ioquake3-devel-1.36_SVN2064.zip) = 74385a02206b635fbbad20dd62b13a69ead63b6ca3412f4d20f95ae5c512ddce
-SIZE (ioquake3-devel-1.36_SVN2064.zip) = 6066356
+SHA256 (ioquake3-devel-1.36_SVN2194.zip) = 91ef10e29ebc49c4d1faa4265b573e98c3b804b71004111142ee7b55543a54ff
+SIZE (ioquake3-devel-1.36_SVN2194.zip) = 5660634
diff -Nur iourbanterror.orig/Makefile iourbanterror/Makefile
--- iourbanterror.orig/Makefile 2011-10-27 01:19:33.000000000 +0200
+++ iourbanterror/Makefile 2011-10-28 10:46:26.000000000 +0200
@@ -19,6 +19,7 @@
PLIST= ${.CURDIR}/pkg-plist
+NO_GAMELIBS= yes
# The docs belong to ioquake3
NOPORTDOCS= yes
GAMEVERSION= 4.1.1
diff -Nur iourbanterror.orig/distinfo iourbanterror/distinfo
--- iourbanterror.orig/distinfo 2011-10-27 01:19:33.000000000 +0200
+++ iourbanterror/distinfo 2011-11-04 19:18:42.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (ioquake3-devel-1.36_SVN2064.zip) = 74385a02206b635fbbad20dd62b13a69ead63b6ca3412f4d20f95ae5c512ddce
-SIZE (ioquake3-devel-1.36_SVN2064.zip) = 6066356
+SHA256 (ioquake3-devel-1.36_SVN2194.zip) = 91ef10e29ebc49c4d1faa4265b573e98c3b804b71004111142ee7b55543a54ff
+SIZE (ioquake3-devel-1.36_SVN2194.zip) = 5660634
diff -Nur iourbanterror.orig/files/patch-code-qcommon-q_shared.h iourbanterror/files/patch-code-qcommon-q_shared.h
--- iourbanterror.orig/files/patch-code-qcommon-q_shared.h 2011-10-27 01:19:33.000000000 +0200
+++ iourbanterror/files/patch-code-qcommon-q_shared.h 2011-10-27 13:39:13.000000000 +0200
@@ -1,6 +1,6 @@
---- code/qcommon/q_shared.h.orig 2011-02-09 01:42:54.000000000 +0100
-+++ code/qcommon/q_shared.h 2011-02-19 01:11:38.000000000 +0100
-@@ -27,11 +27,11 @@
+--- code/qcommon/q_shared.h.orig 2011-10-27 02:45:12.000000000 +0200
++++ code/qcommon/q_shared.h 2011-10-27 02:47:17.000000000 +0200
+@@ -27,15 +27,15 @@
// A user mod should never modify this file
#ifdef STANDALONE
@@ -8,12 +8,17 @@
- #define BASEGAME "foobar"
- #define CLIENT_WINDOW_TITLE "changeme"
- #define CLIENT_WINDOW_MIN_TITLE "changeme2"
-- #define GAMENAME_FOR_MASTER "iofoo3" // must NOT contain whitespaces
+ #define PRODUCT_NAME "ioq3+UT"
+ #define BASEGAME "q3ut4"
+ #define CLIENT_WINDOW_TITLE "ioUrbanTerror"
+ #define CLIENT_WINDOW_MIN_TITLE "ioUT"
-+ #define GAMENAME_FOR_MASTER "Quake3Arena" // must NOT contain whitespaces
- #define HEARTBEAT_FOR_MASTER GAMENAME_FOR_MASTER
- #define FLATLINE_FOR_MASTER GAMENAME_FOR_MASTER "dead"
+ #define HOMEPATH_NAME_UNIX HOMEPATH
+ #define HOMEPATH_NAME_WIN "FooBar"
+ #define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
+- #define GAMENAME_FOR_MASTER "foobar" // must NOT contain whitespace
+-// #define LEGACY_PROTOCOL // You probably don't need this for your standalone game
++ #define GAMENAME_FOR_MASTER "Quake3Arena" // must NOT contain whitespace
++ #define LEGACY_PROTOCOL // You probably don't need this for your standalone game
#else
+ #define PRODUCT_NAME "ioq3"
+ #define BASEGAME "baseq3"
diff -Nur iourbanterror.orig/pkg-plist iourbanterror/pkg-plist
--- iourbanterror.orig/pkg-plist 2011-10-27 01:19:33.000000000 +0200
+++ iourbanterror/pkg-plist 2011-10-28 10:50:04.000000000 +0200
@@ -1,8 +1,5 @@
%%DEDICATED%%bin/ioUrTded
%%CLIENT%%bin/ioUrbanTerror
%%SMP%%bin/ioUrbanTerror-smp
-%%GAMELIBS%%%%LIBDIR%%/q3ut4/cgameamd64.so
-%%GAMELIBS%%%%LIBDIR%%/q3ut4/qagameamd64.so
-%%GAMELIBS%%%%LIBDIR%%/q3ut4/uiamd64.so
-%%GAMELIBS%%@dirrm %%LIBDIR%%/q3ut4
-%%GAMELIBS%%@dirrm %%LIBDIR%%
+%%DLRENDERER%%%%LIBDIR%%/renderer_opengl1_%%ARCH%%.so
+%%DLRENDERER%%@dirrm %%LIBDIR%%
diff -Nur openarena.orig/Makefile openarena/Makefile
--- openarena.orig/Makefile 2011-10-27 03:37:46.000000000 +0200
+++ openarena/Makefile 2011-10-28 10:51:31.000000000 +0200
@@ -8,10 +8,10 @@
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
MAINTAINER= kamikaze at bsdforen.de
COMMENT= Quake3 total conversion based on the ioquake3 engine
@@ -20,6 +20,7 @@
USE_BZIP2= yes
USE_ZIP= no
+NO_GAMELIBS= yes
# OpenArena doc is too messy to bother
NOPORTDOCS= yes
@@ -34,4 +35,7 @@
# No icon included with OpenArena
Q3ICON=
+# Dynamically loaded renderer not yet supported
+WITHOUT_DLRENDERER= yes
+
.include "../ioquake3/Makefile"
diff -Nur openarena.orig/distinfo openarena/distinfo
--- openarena.orig/distinfo 2011-10-27 03:37:46.000000000 +0200
+++ openarena/distinfo 2011-10-27 03:38:52.000000000 +0200
@@ -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 -Nur openarena.orig/files/patch-Makefile openarena/files/patch-Makefile
--- openarena.orig/files/patch-Makefile 2011-10-27 03:37:46.000000000 +0200
+++ openarena/files/patch-Makefile 2011-11-04 21:11:34.000000000 +0100
@@ -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 -Nur openarena.orig/pkg-plist openarena/pkg-plist
--- openarena.orig/pkg-plist 2011-10-27 03:37:46.000000000 +0200
+++ openarena/pkg-plist 2011-10-28 10:52:54.000000000 +0200
@@ -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%%
diff -Nur openarena-oax.orig/Makefile openarena-oax/Makefile
--- openarena-oax.orig/Makefile 2011-10-27 03:36:51.000000000 +0200
+++ openarena-oax/Makefile 2011-10-27 03:40:50.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= oax
-PORTVERSION= B48
+PORTVERSION= B50
CATEGORIES= games
MASTER_SITES= http://files.poulsander.com/~poul19/public_files/eliminationSource/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff -Nur openarena-oax.orig/distinfo openarena-oax/distinfo
--- openarena-oax.orig/distinfo 2011-10-27 03:36:51.000000000 +0200
+++ openarena-oax/distinfo 2011-10-27 03:44:34.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (oaxB48.zip) = 26564e53625adad46513b3ddc6f906d3c74fe22b3222516a135351928a57602f
-SIZE (oaxB48.zip) = 469333
+SHA256 (oaxB50.zip) = 8c3a8846544acc4498a0bdc2fdbeb2206f9dd003be06498aab62e4573d7d108f
+SIZE (oaxB50.zip) = 472236
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list