ports/146818: [update] games/openarena latest release
David Naylor
naylor.b.david at gmail.com
Wed Jun 16 16:40:03 UTC 2010
The following reply was made to PR ports/146818; it has been noted by GNATS.
From: David Naylor <naylor.b.david at gmail.com>
To: bug-followup at freebsd.org,
kamikaze at bsdforen.de
Cc:
Subject: Re: ports/146818: [update] games/openarena latest release
Date: Wed, 16 Jun 2010 18:25:47 +0200
--Boundary-00=_OsPGMHIOtZAb0Yy
Content-Type: Text/Plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Hi,
A while ago I worked a bit on openarena. The diff may be of use to you.
Regards,
David
--Boundary-00=_OsPGMHIOtZAb0Yy
Content-Type: text/x-patch;
charset="ISO-8859-1";
name="openarena.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="openarena.diff"
diff -uNr /usr/ports/games/openarena/Makefile openarena/Makefile
=2D-- /usr/ports/games/openarena/Makefile 2010-06-07 03:17:16.000000000 +02=
00
+++ openarena/Makefile 2010-06-16 18:13:39.000000000 +0200
@@ -2,21 +2,19 @@
# Date created: 2007-08-01
# Whom: Josh Tolbert <hemi at puresimplicity.net>
#
=2D# $FreeBSD: ports/games/openarena/Makefile,v 1.9 2010/06/06 20:43:48 nad=
dy Exp $
+# $FreeBSD: ports/games/openarena/Makefile,v 1.8 2010/01/25 19:15:12 pav E=
xp $
#
=20
PORTNAME=3D openarena
=2DPORTVERSION=3D 0.7.1
=2DPORTREVISION=3D 6
+PORTVERSION=3D 0.8.5
CATEGORIES=3D games
=2DMASTER_SITES=3D http://openarena.ws/rel/070/:src \
=2D http://download.tuxfamily.net/cooker/openarena/rel070/:data \
=2D ftp://ftp.alepulver.com.ar/distfiles/:patch
=2DDISTNAME=3D ioq3-src-oa
=2DDISTFILES=3D ${DISTNAME}${EXTRACT_SUFX}:src \
+MASTER_SITES=3D http://download.tuxfamily.org/openarena/rel/081/source/:oa=
_src \
+ http://download.tuxfamily.org/openarena/rel/081/:data \
+ http://download.tuxfamily.org/openarena/rel/085/:patch
+DISTFILES=3D ${OA_ENGINE}:oa_src \
${OA_DATA}:data \
${OA_PATCH}:patch
=2DEXTRACT_ONLY=3D ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=3D ${OA_ENGINE}
=20
MAINTAINER=3D hemi at puresimplicity.net
COMMENT=3D GPL-licensed total conversion of Quake 3
@@ -26,25 +24,26 @@
=20
USE_BZIP2=3D yes
USE_GMAKE=3D yes
=2DNO_WRKSUBDIR=3D yes
+MAKE_JOBS_SAFE=3D yes
+ONLY_FOR_ARCHS=3D i386 amd64 powerpc
=20
OPTIONS=3D CLIENT "Build client" on \
DEDICATED "Build dedicated server" on \
OPENAL "Enable OpenAL (3D sound) support" off \
OPENAL_DLOPEN "Enable dynamic loading of OpenAL" off \
OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
=2D SDL_AUDIO "Use SDL for audio" off \
=2D SDL_VIDEO "Use SDL for video" off \
SMP "Build SMP (threaded) client" on \
=20
MAKE_ENV=3D DEFAULT_BASEDIR=3D"${DATADIR}" LIBDIR=3D"${LIBDIR}" \
=2D PTHREAD_LIBS=3D"${PTHREAD_LIBS}" USE_CODEC_VORBIS=3D1
+ PTHREAD_LIBS=3D"${PTHREAD_LIBS}" USE_CODEC_VORBIS=3D1 \
+ BUILD_GAME_QVM=3D0 BUILD_STANDALONE=3D1 BUILD_GAME_SO=3D0 \
+ HAVE_VM_COMPILED=3Dtrue
PLIST_SUB=3D LIBDIR=3D"${LIBDIR:S/${PREFIX}\///}"
=20
LIBDIR=3D ${PREFIX}/lib/${PORTNAME}
=2DVM_ARCHS=3D amd64 i386 powerpc
=2DOA_DATA=3D oa070.zip
=2DOA_PATCH=3D oa071-patch.zip
+OA_ENGINE=3D openarena-engine-0.8.1-1.tar.bz2
+OA_DATA=3D oa081.zip
+OA_PATCH=3D oa085p.zip
=20
.include <bsd.port.pre.mk>
=20
@@ -53,16 +52,6 @@
IGNORE=3D needs at least one of CLIENT, DEDICATED and SMP options
.endif
=20
=2D.for i in ${ARCH}
=2D. if ${VM_ARCHS:M${i}} !=3D ""
=2DHAVE_VM_COMPILED=3D yes
=2D. endif
=2D.endfor
=2D
=2D.if defined(HAVE_VM_COMPILED)
=2DMAKE_ENV+=3D HAVE_VM_COMPILED=3Dtrue
=2D.endif
=2D
.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP)
# OpenAL
. if defined(WITH_OPENAL)
@@ -72,24 +61,13 @@
MAKE_ENV+=3D USE_OPENAL_DLOPEN=3D1
. endif
. endif
=2D# SDL
=2D. if defined(WITH_SDL_AUDIO)
=2DUSE_SDL=3D sdl
=2DMAKE_ENV+=3D USE_SDL_AUDIO=3D1
=2D. endif
=2D. if defined(WITH_SDL_VIDEO)
USE_SDL=3D sdl
=2DMAKE_ENV+=3D USE_SDL_VIDEO=3D1
=2D. else
=2DUSE_GL=3D yes
=2DUSE_XORG=3D x11 xxf86dga
=2D. endif
.endif
=20
.if !defined(WITHOUT_CLIENT)
MAKE_ENV+=3D BUILD_CLIENT=3D1
PLIST_SUB+=3D CLIENT=3D""
=2DOABIN+=3D ioquake3
+OABIN+=3D openarena
.else
PLIST_SUB+=3D CLIENT=3D"@comment "
.endif
@@ -97,18 +75,11 @@
.if !defined(WITHOUT_DEDICATED)
MAKE_ENV+=3D BUILD_SERVER=3D1
PLIST_SUB+=3D DEDICATED=3D""
=2DOABIN+=3D ioq3ded
+OABIN+=3D oa_ded
.else
PLIST_SUB+=3D DEDICATED=3D"@comment "
.endif
=20
=2D.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
=2DMAKE_ENV+=3D BUILD_GAME_SO=3D1
=2DPLIST_SUB+=3D GAMELIBS=3D""
=2D.else
=2DPLIST_SUB+=3D GAMELIBS=3D"@comment "
=2D.endif
=2D
.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
MAKE_ENV+=3D USE_OPTIMIZED_CFLAGS=3D1
.endif
@@ -116,7 +87,7 @@
.if !defined(WITHOUT_SMP)
MAKE_ENV+=3D BUILD_CLIENT_SMP=3D1
PLIST_SUB+=3D SMP=3D""
=2DOABIN+=3D ioquake3-smp
+OABIN+=3D openarena-smp
.else
PLIST_SUB+=3D SMP=3D"@comment "
.endif
@@ -126,23 +97,20 @@
.endif
=20
post-extract:
+ ${MV} ${WRKDIR}/openarena-engine-0.8.1/ ${WRKDIR}/openarena-0.8.1/
.for f in ${OA_DATA} ${OA_PATCH}
@${UNZIP_CMD} -qo ${DISTDIR}/${f} -d ${WRKDIR}
.endfor
+ ${MV} ${WRKDIR}/openarena-0.8.1 ${WRKDIR}/openarena-${PORTVERSION}
+ ${RM} ${WRKSRC}/Makefile.local
=20
do-install:
.for bin in ${OABIN}
${INSTALL_PROGRAM} ${WRKSRC}/build/release/${bin} \
=2D ${PREFIX}/bin/${bin:C/(ioquake3|ioq3)/${PORTNAME}/}
=2D.endfor
=2D.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
=2D.for dir in baseq3 missionpack
=2D ${MKDIR} ${LIBDIR}/${dir}
=2D ${INSTALL_PROGRAM} ${WRKSRC}/build/release/${dir}/*.so ${LIBDIR}/${dir}
+ ${PREFIX}/bin/${bin}
.endfor
=2D.endif
${MKDIR} ${DATADIR}
=2D ${CP} -R ${WRKDIR}/${PORTNAME}-0.7.0/baseoa ${DATADIR}
+ ${CP} -R ${WRKSRC}/baseoa ${DATADIR}
=20
post-install:
@${ECHO_CMD}
diff -uNr /usr/ports/games/openarena/distinfo openarena/distinfo
=2D-- /usr/ports/games/openarena/distinfo 2007-09-06 05:50:23.000000000 +02=
00
+++ openarena/distinfo 2010-06-16 18:08:59.000000000 +0200
@@ -1,9 +1,12 @@
=2DMD5 (ioq3-src-oa.tar.bz2) =3D a43cd6044de919dd2af94fb4159ddb47
=2DSHA256 (ioq3-src-oa.tar.bz2) =3D b51a890a525e9a7c49fe9fe3808ec6bba073801=
4d008078bbd28244934d145b9
=2DSIZE (ioq3-src-oa.tar.bz2) =3D 3539582
=2DMD5 (oa070.zip) =3D 739548bfc5dc1d129d20c0f67d54df48
=2DSHA256 (oa070.zip) =3D f420978abedd701744de06bdba3a7c3624175aafb891101f7=
7887581ce8576a1
=2DSIZE (oa070.zip) =3D 263123081
=2DMD5 (oa071-patch.zip) =3D 5fa31998009f8241ad3ded93eb81e701
=2DSHA256 (oa071-patch.zip) =3D 7f6162b04cf624fea73083430b7a5c7a15826fe3ce5=
36c2280448f403fd3561a
=2DSIZE (oa071-patch.zip) =3D 12287230
+MD5 (openarena-modSDK-0.8.1.tar.bz2) =3D d6ade0364db438a7601419b5d2d62f75
+SHA256 (openarena-modSDK-0.8.1.tar.bz2) =3D ca2556f0714d142d90a9acdffe1489=
187479ab1cc5fcb866c3fe6cae9634e904
+SIZE (openarena-modSDK-0.8.1.tar.bz2) =3D 2249024
+MD5 (openarena-engine-0.8.1-1.tar.bz2) =3D 4ee696eacc4b0350f9dbb5588dcd74a2
+SHA256 (openarena-engine-0.8.1-1.tar.bz2) =3D 430ba9b691c8085b946e004f0cc8=
90995c7f8295498bd8c8ce744293a87274d2
+SIZE (openarena-engine-0.8.1-1.tar.bz2) =3D 2951703
+MD5 (oa081.zip) =3D 49006bcb02b4e8ea3d06749e8f4e4887
+SHA256 (oa081.zip) =3D c96282de8bc2ac5781df58c6adbce4265376e36190af50d7528=
f51dc739b6d7d
+SIZE (oa081.zip) =3D 318927645
+MD5 (oa085p.zip) =3D b2a0437da751cd50dd2351ed9e0c4e9d
+SHA256 (oa085p.zip) =3D d360c4b095bc3b34d03d9a366b21c12052c3f9e9c57e86b17c=
8b2c038baa4719
+SIZE (oa085p.zip) =3D 42528474
diff -uNr /usr/ports/games/openarena/files/patch-Makefile openarena/files/p=
atch-Makefile
=2D-- /usr/ports/games/openarena/files/patch-Makefile 2008-05-18 11:40:26.0=
00000000 +0200
+++ openarena/files/patch-Makefile 2010-06-16 16:42:43.000000000 +0200
@@ -1,62 +1,18 @@
=2D--- Makefile.orig Sat Jul 7 02:50:34 2007
=2D+++ Makefile Sun Jul 29 04:30:00 2007
=2D@@ -26,11 +26,19 @@
=2D endif
=2D endif
=2D=20
=2D-BUILD_CLIENT =3D
=2D-BUILD_CLIENT_SMP =3D
=2D-BUILD_SERVER =3D
=2D-BUILD_GAME_SO =3D
=2D-BUILD_GAME_QVM =3D
=2D+BUILD_CLIENT?=3D0
=2D+BUILD_CLIENT_SMP?=3D0
=2D+BUILD_GAME_QVM?=3D0
=2D+BUILD_GAME_SO?=3D0
=2D+BUILD_SERVER?=3D0
=2D+HAVE_VM_COMPILED?=3Dfalse
=2D+USE_CODEC_VORBIS?=3D0
=2D+USE_LOCAL_HEADERS?=3D0
=2D+USE_OPENAL?=3D0
=2D+USE_OPENAL_DLOPEN?=3D0
=2D+USE_OPTIMIZED_CFLAGS?=3D0
=2D+USE_SDL_AUDIO?=3D0
=2D+USE_SDL_VIDEO?=3D0
=2D=20
=2D #######################################################################=
######
=2D #
=2D@@ -88,18 +96,6 @@
=2D endif
=2D export USE_CCACHE
=2D=20
=2D-ifndef USE_SDL
=2D-USE_SDL=3D1
=2D-endif
=2D-
=2D-ifndef USE_OPENAL
=2D-USE_OPENAL=3D1
=2D-endif
=2D-
=2D-ifndef USE_OPENAL_DLOPEN
=2D-USE_OPENAL_DLOPEN=3D0
=2D-endif
=2D-
=2D ifndef USE_CURL
=2D USE_CURL=3D1
=2D endif
=2D@@ -112,18 +108,10 @@
=2D endif
+--- Makefile.orig 2008-08-09 22:22:37.000000000 +0200
++++ Makefile 2010-06-16 16:35:30.000000000 +0200
+@@ -42,10 +42,6 @@
+ BUILD_GAME_QVM =3D
endif
=20
=2D-ifndef USE_CODEC_VORBIS
=2D-USE_CODEC_VORBIS=3D1
=2D-endif
=2D-
=2D-ifndef USE_LOCAL_HEADERS
=2D-USE_LOCAL_HEADERS=3D1
+-ifneq ($(PLATFORM),darwin)
+- BUILD_CLIENT_SMP =3D 0
-endif
-
#########################################################################=
####
+ #
+ # If you require a different configuration from the defaults below, creat=
e a
+@@ -144,7 +140,7 @@
+ #########################################################################=
####
=20
BD=3D$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
-BR=3D$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH)
@@ -64,79 +20,54 @@
CDIR=3D$(MOUNT_DIR)/client
SDIR=3D$(MOUNT_DIR)/server
RDIR=3D$(MOUNT_DIR)/renderer
=2D@@ -498,18 +486,12 @@
=2D=20
=2D ifeq ($(PLATFORM),freebsd)
+@@ -517,12 +513,10 @@
=20
=2D- ifneq (,$(findstring alpha,$(shell uname -m)))
=2D- ARCH=3Daxp
+ ifneq (,$(findstring alpha,$(shell uname -m)))
+ ARCH=3Daxp
- else #default to i386
- ARCH=3Di386
=2D- endif #alpha test
=2D-
=2D+ BASE_CFLAGS =3D -DARCH=3D'\"$(ARCH)\"' -DLIBDIR=3D'\"$(LIBDIR)\"' -I$=
(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototyp=
es
+ endif #alpha test
=20
=2D- BASE_CFLAGS =3D -Wall -fno-strict-aliasing -Wimplicit -Wstrict-protot=
ypes
=2D-
=2D- GL_CFLAGS =3D -I/usr/X11R6/include
=2D+ GL_CFLAGS =3D -I$(LOCALBASE)/include
=20
=2D DEBUG_CFLAGS=3D$(BASE_CFLAGS) -g
=2D+ RELEASE_CFLAGS=3D$(BASE_CFLAGS) -DNDEBUG -pipe
+- BASE_CFLAGS =3D -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototyp=
es \
++ BASE_CFLAGS =3D -DLIBDIR=3D'\"$(LIBDIR)\"' -I$(LOCALBASE)/include -Wall=
-fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+ -DUSE_ICON $(shell sdl-config --cflags)
=20
ifeq ($(USE_OPENAL),1)
=2D BASE_CFLAGS +=3D -DUSE_OPENAL=3D1
=2D@@ -522,47 +504,61 @@
=2D BASE_CFLAGS +=3D -DUSE_CODEC_VORBIS=3D1
=2D endif
=2D=20
=2D- ifeq ($(USE_SDL),1)
=2D- BASE_CFLAGS +=3D $(shell sdl-config --cflags) -DUSE_SDL_VIDEO=3D1 -=
DUSE_SDL_SOUND=3D1
=2D+ ifeq ($(USE_SDL_AUDIO),1)
=2D+ BASE_CFLAGS +=3D $(shell $(SDL_CONFIG) --cflags)
=2D+ else
=2D+ ifeq ($(USE_SDL_VIDEO),1)
=2D+ BASE_CFLAGS +=3D $(shell $(SDL_CONFIG) --cflags)
=2D+ endif
+@@ -536,20 +530,20 @@
+ BASE_CFLAGS +=3D -DUSE_CODEC_VORBIS
endif
=20
- ifeq ($(ARCH),axp)
=2D- CC=3Dgcc
- BASE_CFLAGS +=3D -DNO_VM_COMPILED
- RELEASE_CFLAGS=3D$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loo=
ps \
- -fomit-frame-pointer -fexpensive-optimizations
- else
- ifeq ($(ARCH),i386)
=2D- CC=3Dgcc
- RELEASE_CFLAGS=3D$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=3Dpentiumpro \
- -march=3Dpentium -fomit-frame-pointer -pipe -ffast-math \
- -falign-loops=3D2 -falign-jumps=3D2 -falign-functions=3D2 \
- -funroll-loops -fstrength-reduce
- HAVE_VM_COMPILED=3Dtrue
- else
=2D- BASE_CFLAGS +=3D -DNO_VM_COMPILED
=2D+ ifeq ($(USE_SDL_AUDIO),1)
=2D+ BASE_CFLAGS +=3D -DUSE_SDL_SOUND=3D1
=2D endif
++ BASE_CFLAGS +=3D $(shell $(SDL_CONFIG) --cflags)
+
=2D+ ifeq ($(USE_SDL_VIDEO),1)
=2D+ BASE_CFLAGS +=3D -DUSE_SDL_VIDEO=3D1
=2D+ endif
++ ifneq ($(HAVE_VM_COMPILED),true)
+ BASE_CFLAGS +=3D -DNO_VM_COMPILED
+ endif
+
++ RELEASE_CFLAGS=3D$(BASE_CFLAGS) -DNDEBUG -pipe
+ ifeq ($(USE_OPTIMIZED_CFLAGS),1)
=2D+ RELEASE_CFLAGS+=3D-O3 -ffast-math -funroll-loops -fomit-frame-point=
er \
++ RELEASE_CFLAGS +=3D -O3 -ffast-math -funroll-loops -fomit-frame-point=
er \
+ -fexpensive-optimizations
+ ifeq ($(ARCH),i386)
=2D+ RELEASE_CFLAGS+=3D-falign-loops=3D2 -falign-jumps=3D2 -falign-fun=
ctions=3D2 \
++ RELEASE_CFLAGS +=3D -falign-loops=3D2 -falign-jumps=3D2 -falign-fun=
ctions=3D2 \
+ -fstrength-reduce
+ endif
=2D+ endif
=2D+
=2D+ ifneq ($(HAVE_VM_COMPILED),true)
=2D+ BASE_CFLAGS +=3D -DNO_VM_COMPILED
endif
=20
=2D SHLIBEXT=3Dso
+ DEBUG_CFLAGS=3D$(BASE_CFLAGS) -g
+@@ -558,13 +552,11 @@
SHLIBCFLAGS=3D-fPIC
SHLIBLDFLAGS=3D-shared $(LDFLAGS)
=20
@@ -146,192 +77,192 @@
LDFLAGS=3D-lm
=20
- CLIENT_LDFLAGS =3D
=2D+ CLIENT_LDFLAGS =3D -L$(LOCALBASE)/lib
=2D=20
=2D- ifeq ($(USE_SDL),1)
=2D- CLIENT_LDFLAGS +=3D $(shell sdl-config --libs)
=2D+ ifeq ($(USE_SDL_AUDIO),1)
=2D+ CLIENT_LDFLAGS +=3D $(shell $(SDL_CONFIG) --libs)
=2D else
=2D- CLIENT_LDFLAGS +=3D -L/usr/X11R6/$(LIB) -lGL -lX11 -lXext -lXxf86dg=
a -lXxf86vm
=2D+ ifeq ($(USE_SDL_VIDEO),1)
=2D+ CLIENT_LDFLAGS +=3D $(shell $(SDL_CONFIG) --libs)
=2D+ endif
=2D+ endif
=2D+
=2D+ ifneq ($(USE_SDL_VIDEO),1)
=2D+ CLIENT_LDFLAGS +=3D -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga=
-lXxf86vm
=2D endif
+-
+- CLIENT_LDFLAGS +=3D $(shell sdl-config --libs) -lGL
++ CLIENT_LDFLAGS =3D -L$(LOCALBASE)/lib $(shell $(SDL_CONFIG) --libs) -lGL
=20
ifeq ($(USE_OPENAL),1)
=2D+ CLIENT_LDFLAGS +=3D $(THREAD_LDFLAGS)
ifneq ($(USE_OPENAL_DLOPEN),1)
=2D- CLIENT_LDFLAGS +=3D $(THREAD_LDFLAGS) -lopenal
=2D+ CLIENT_LDFLAGS +=3D -lopenal
=2D endif
=2D endif
=2D=20
=2D@@ -570,7 +566,6 @@
=2D CLIENT_LDFLAGS +=3D -lvorbisfile -lvorbis -logg
=2D endif
=2D=20
=2D-
=2D else # ifeq freebsd
=2D=20
=2D #######################################################################=
######
=2D@@ -725,24 +720,25 @@
+@@ -781,24 +773,24 @@
TARGETS =3D
=20
ifneq ($(BUILD_SERVER),0)
=2D- TARGETS +=3D $(B)/ioq3ded.$(ARCH)$(BINEXT)
=2D+ TARGETS +=3D $(B)/ioq3ded$(BINEXT)
+- TARGETS +=3D $(B)/oa_ded.$(ARCH)$(BINEXT)
++ TARGETS +=3D $(B)/oa_ded$(BINEXT)
endif
=20
ifneq ($(BUILD_CLIENT),0)
=2D- TARGETS +=3D $(B)/ioquake3.$(ARCH)$(BINEXT)
=2D- ifneq ($(BUILD_CLIENT_SMP),0)
=2D- TARGETS +=3D $(B)/ioquake3-smp.$(ARCH)$(BINEXT)
=2D- endif
=2D+ TARGETS +=3D $(B)/ioquake3$(BINEXT)
=2D+endif
=2D+
=2D+ifneq ($(BUILD_CLIENT_SMP),0)
=2D+ TARGETS +=3D $(B)/ioquake3-smp$(BINEXT)
+- TARGETS +=3D $(B)/openarena.$(ARCH)$(BINEXT)
++ TARGETS +=3D $(B)/openarena$(BINEXT)
+ ifneq ($(BUILD_CLIENT_SMP),0)
+- TARGETS +=3D $(B)/openarena-smp.$(ARCH)$(BINEXT)
++ TARGETS +=3D $(B)/openarena-smp$(BINEXT)
+ endif
endif
=20
ifneq ($(BUILD_GAME_SO),0)
TARGETS +=3D \
=2D- $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
=2D- $(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \
=2D- $(B)/baseq3/ui$(ARCH).$(SHLIBEXT) \
+- $(B)/baseoa/cgame$(ARCH).$(SHLIBEXT) \
+- $(B)/baseoa/qagame$(ARCH).$(SHLIBEXT) \
+- $(B)/baseoa/ui$(ARCH).$(SHLIBEXT) \
- $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
- $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
- $(B)/missionpack/ui$(ARCH).$(SHLIBEXT)
=2D+ $(B)/baseq3/cgame.$(SHLIBEXT) \
=2D+ $(B)/baseq3/qagame.$(SHLIBEXT) \
=2D+ $(B)/baseq3/ui.$(SHLIBEXT) \
++ $(B)/baseoa/cgame.$(SHLIBEXT) \
++ $(B)/baseoa/qagame.$(SHLIBEXT) \
++ $(B)/baseoa/ui.$(SHLIBEXT) \
+ $(B)/missionpack/cgame.$(SHLIBEXT) \
+ $(B)/missionpack/qagame.$(SHLIBEXT) \
+ $(B)/missionpack/ui.$(SHLIBEXT)
endif
=20
ifneq ($(BUILD_GAME_QVM),0)
=2D@@ -804,11 +800,11 @@
=2D $(MAKE) targets B=3D$(BD) CFLAGS=3D"$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEN=
D_CFLAGS)"
=2D=20
=2D build_release: B=3D$(BR)
=2D-build_release: makedirs tools
=2D+build_release: makedirs
=2D $(MAKE) targets B=3D$(BR) CFLAGS=3D"$(CFLAGS) $(RELEASE_CFLAGS) $(DEP=
END_CFLAGS)"
=2D=20
=2D #Build both debug and release builds
=2D-all:build_debug build_release
=2D+all:build_release
=2D=20
=2D targets: $(TARGETS)
+@@ -942,7 +934,7 @@
+ #########################################################################=
####
=20
=2D@@ -1022,13 +1018,10 @@
=2D ifeq ($(ARCH),i386)
+ default: release
+-all: debug release
++all: release
+=20
+ debug:
+ @$(MAKE) targets B=3D$(BD) CFLAGS=3D"$(CFLAGS) $(DEPEND_CFLAGS) \
+@@ -1422,7 +1414,7 @@
+ ifeq ($(ARCH),x86)
Q3OBJ +=3D $(B)/client/vm_x86.o
endif
=2D- ifeq ($(ARCH),x86)
=2D- Q3OBJ +=3D $(B)/client/vm_x86.o
=2D- endif
- ifeq ($(ARCH),x86_64)
+ ifeq ($(ARCH),amd64)
=2D Q3OBJ +=3D $(B)/client/vm_x86_64.o
+ Q3OBJ +=3D $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
endif
=2D- ifeq ($(ARCH),ppc)
=2D+ ifeq ($(ARCH),powerpc)
=2D Q3OBJ +=3D $(B)/client/$(VM_PPC).o
=2D endif
=2D endif
=2D@@ -1075,10 +1068,10 @@
=2D $(B)/client/sdl_glimp_smp.o
=2D endif
=2D=20
=2D-$(B)/ioquake3.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
=2D+$(B)/ioquake3$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
=2D $(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) $(LDFLAGS) $(LIBSDLM=
AIN)
=2D=20
=2D-$(B)/ioquake3-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
=2D+$(B)/ioquake3-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
=2D $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
+ ifeq ($(ARCH),ppc)
+@@ -1450,12 +1442,12 @@
+ Q3POBJ_SMP +=3D \
+ $(B)/clientsmp/sdl_glimp.o
+=20
+-$(B)/openarena.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
++$(B)/openarena$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
+ $(echo_cmd) "LD $@"
+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
+ $(LDFLAGS) $(LIBSDLMAIN)
+=20
+-$(B)/openarena-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
++$(B)/openarena-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
+ $(echo_cmd) "LD $@"
+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
=2D=20
=2D@@ -1378,18 +1371,15 @@
=2D ifeq ($(ARCH),i386)
+@@ -1563,7 +1555,7 @@
+ ifeq ($(ARCH),x86)
Q3DOBJ +=3D $(B)/ded/vm_x86.o
endif
=2D- ifeq ($(ARCH),x86)
=2D- Q3DOBJ +=3D $(B)/ded/vm_x86.o
=2D- endif
- ifeq ($(ARCH),x86_64)
+ ifeq ($(ARCH),amd64)
=2D Q3DOBJ +=3D $(B)/ded/vm_x86_64.o
=2D endif
=2D- ifeq ($(ARCH),ppc)
=2D+ ifeq ($(ARCH),powerpc)
=2D Q3DOBJ +=3D $(B)/ded/$(VM_PPC).o
+ Q3DOBJ +=3D $(B)/ded/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
endif
+ ifeq ($(ARCH),ppc)
+@@ -1582,7 +1574,7 @@
+ $(B)/ded/con_tty.o
endif
=20
=2D-$(B)/ioq3ded.$(ARCH)$(BINEXT): $(Q3DOBJ)
=2D+$(B)/ioq3ded$(BINEXT): $(Q3DOBJ)
=2D $(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
=2D=20
=2D $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC)
=2D@@ -1506,7 +1496,7 @@
=2D Q3CGOBJ =3D $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o
=2D Q3CGVMOBJ =3D $(Q3CGOBJ_:%.o=3D%.asm) $(B)/baseq3/game/bg_lib.asm
=2D=20
=2D-$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) : $(Q3CGOBJ)
=2D+$(B)/baseq3/cgame.$(SHLIBEXT) : $(Q3CGOBJ)
=2D $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
+-$(B)/oa_ded.$(ARCH)$(BINEXT): $(Q3DOBJ)
++$(B)/oa_ded$(BINEXT): $(Q3DOBJ)
+ $(echo_cmd) "LD $@"
+ $(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
+=20
+@@ -1622,7 +1614,7 @@
+ Q3CGOBJ =3D $(Q3CGOBJ_) $(B)/baseoa/cgame/cg_syscalls.o
+ Q3CGVMOBJ =3D $(Q3CGOBJ_:%.o=3D%.asm)
+=20
+-$(B)/baseoa/cgame$(ARCH).$(SHLIBEXT): $(Q3CGOBJ)
++$(B)/baseoa/cgame.$(SHLIBEXT): $(Q3CGOBJ)
+ $(echo_cmd) "LD $@"
+ $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
=20
=2D $(B)/baseq3/vm/cgame.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm
=2D@@ -1547,7 +1537,7 @@
+@@ -1666,7 +1658,7 @@
MPCGOBJ =3D $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o
=2D MPCGVMOBJ =3D $(MPCGOBJ_:%.o=3D%.asm) $(B)/missionpack/game/bg_lib.asm
+ MPCGVMOBJ =3D $(MPCGOBJ_:%.o=3D%.asm)
=20
=2D-$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) : $(MPCGOBJ)
=2D+$(B)/missionpack/cgame$(SHLIBEXT) : $(MPCGOBJ)
=2D $(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
=2D=20
=2D $(B)/missionpack/vm/cgame.qvm: $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm
=2D@@ -1597,7 +1587,7 @@
=2D Q3GOBJ =3D $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o
=2D Q3GVMOBJ =3D $(Q3GOBJ_:%.o=3D%.asm) $(B)/baseq3/game/bg_lib.asm
=2D=20
=2D-$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) : $(Q3GOBJ)
=2D+$(B)/baseq3/qagame.$(SHLIBEXT) : $(Q3GOBJ)
=2D $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
+-$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT): $(MPCGOBJ)
++$(B)/missionpack/cgame.$(SHLIBEXT): $(MPCGOBJ)
+ $(echo_cmd) "LD $@"
+ $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
+=20
+@@ -1719,7 +1711,7 @@
+ Q3GOBJ =3D $(Q3GOBJ_) $(B)/baseoa/game/g_syscalls.o
+ Q3GVMOBJ =3D $(Q3GOBJ_:%.o=3D%.asm)
+=20
+-$(B)/baseoa/qagame$(ARCH).$(SHLIBEXT): $(Q3GOBJ)
++$(B)/baseoa/qagame.$(SHLIBEXT): $(Q3GOBJ)
+ $(echo_cmd) "LD $@"
+ $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
=20
=2D $(B)/baseq3/vm/qagame.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm
=2D@@ -1645,7 +1635,7 @@
+@@ -1770,7 +1762,7 @@
MPGOBJ =3D $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o
=2D MPGVMOBJ =3D $(MPGOBJ_:%.o=3D%.asm) $(B)/missionpack/game/bg_lib.asm
+ MPGVMOBJ =3D $(MPGOBJ_:%.o=3D%.asm)
=20
=2D-$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) : $(MPGOBJ)
=2D+$(B)/missionpack/qagame.$(SHLIBEXT) : $(MPGOBJ)
=2D $(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
+-$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT): $(MPGOBJ)
++$(B)/missionpack/qagame.$(SHLIBEXT): $(MPGOBJ)
+ $(echo_cmd) "LD $@"
+ $(Q)$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
=20
=2D $(B)/missionpack/vm/qagame.qvm: $(MPGVMOBJ) $(GDIR)/g_syscalls.asm
=2D@@ -1705,7 +1695,7 @@
+@@ -1833,7 +1825,7 @@
Q3UIOBJ =3D $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
=2D Q3UIVMOBJ =3D $(Q3UIOBJ_:%.o=3D%.asm) $(B)/baseq3/game/bg_lib.asm
+ Q3UIVMOBJ =3D $(Q3UIOBJ_:%.o=3D%.asm)
=20
=2D-$(B)/baseq3/ui$(ARCH).$(SHLIBEXT) : $(Q3UIOBJ)
=2D+$(B)/baseq3/ui.$(SHLIBEXT) : $(Q3UIOBJ)
=2D $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
+-$(B)/baseoa/ui$(ARCH).$(SHLIBEXT): $(Q3UIOBJ)
++$(B)/baseoa/ui.$(SHLIBEXT): $(Q3UIOBJ)
+ $(echo_cmd) "LD $@"
+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
=20
=2D $(B)/baseq3/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm
=2D@@ -1730,7 +1720,7 @@
+@@ -1861,7 +1853,7 @@
MPUIOBJ =3D $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o
=2D MPUIVMOBJ =3D $(MPUIOBJ_:%.o=3D%.asm) $(B)/baseq3/game/bg_lib.asm
+ MPUIVMOBJ =3D $(MPUIOBJ_:%.o=3D%.asm)
+=20
+-$(B)/missionpack/ui$(ARCH).$(SHLIBEXT): $(MPUIOBJ)
++$(B)/missionpack/ui.$(SHLIBEXT): $(MPUIOBJ)
+ $(echo_cmd) "LD $@"
+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)
=20
=2D-$(B)/missionpack/ui$(ARCH).$(SHLIBEXT) : $(MPUIOBJ)
=2D+$(B)/missionpack/ui.$(SHLIBEXT) : $(MPUIOBJ)
=2D $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)
+@@ -2037,33 +2029,33 @@
+ -$(MKDIR) -p -m 0755 $(COPYDIR)/missionpack
+=20
+ ifneq ($(BUILD_CLIENT),0)
+- $(INSTALL) -s -m 0755 $(BR)/openarena.$(ARCH)$(BINEXT) $(COPYDIR)/openar=
ena.$(ARCH)$(BINEXT)
++ $(INSTALL) -s -m 0755 $(BR)/openarena$(BINEXT) $(COPYDIR)/openarena$(BIN=
EXT)
+ endif
+=20
+ # Don't copy the SMP until it's working together with SDL.
+ #ifneq ($(BUILD_CLIENT_SMP),0)
+-# $(INSTALL) -s -m 0755 $(BR)/openarena-smp.$(ARCH)$(BINEXT) $(COPYDIR)/o=
penarena-smp.$(ARCH)$(BINEXT)
++# $(INSTALL) -s -m 0755 $(BR)/openarena-smp$(BINEXT) $(COPYDIR)/openarena=
=2Dsmp$(BINEXT)
+ #endif
+=20
+ ifneq ($(BUILD_SERVER),0)
+- @if [ -f $(BR)/oa_ded.$(ARCH)$(BINEXT) ]; then \
+- $(INSTALL) -s -m 0755 $(BR)/oa_ded.$(ARCH)$(BINEXT) $(COPYDIR)/oa_ded.$=
(ARCH)$(BINEXT); \
++ @if [ -f $(BR)/oa_ded$(BINEXT) ]; then \
++ $(INSTALL) -s -m 0755 $(BR)/oa_ded$(BINEXT) $(COPYDIR)/oa_ded$(BINEXT);=
\
+ fi
+ endif
+=20
+ ifneq ($(BUILD_GAME_SO),0)
+- $(INSTALL) -s -m 0755 $(BR)/baseoa/cgame$(ARCH).$(SHLIBEXT) \
++ $(INSTALL) -s -m 0755 $(BR)/baseoa/cgame.$(SHLIBEXT) \
+ $(COPYDIR)/baseoa/.
+- $(INSTALL) -s -m 0755 $(BR)/baseoa/qagame$(ARCH).$(SHLIBEXT) \
++ $(INSTALL) -s -m 0755 $(BR)/baseoa/qagame.$(SHLIBEXT) \
+ $(COPYDIR)/baseoa/.
+- $(INSTALL) -s -m 0755 $(BR)/baseoa/ui$(ARCH).$(SHLIBEXT) \
++ $(INSTALL) -s -m 0755 $(BR)/baseoa/ui.$(SHLIBEXT) \
+ $(COPYDIR)/baseoa/.
+ -$(MKDIR) -p -m 0755 $(COPYDIR)/missionpack
+- $(INSTALL) -s -m 0755 $(BR)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
++ $(INSTALL) -s -m 0755 $(BR)/missionpack/cgame.$(SHLIBEXT) \
+ $(COPYDIR)/missionpack/.
+- $(INSTALL) -s -m 0755 $(BR)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
++ $(INSTALL) -s -m 0755 $(BR)/missionpack/qagame.$(SHLIBEXT) \
+ $(COPYDIR)/missionpack/.
+- $(INSTALL) -s -m 0755 $(BR)/missionpack/ui$(ARCH).$(SHLIBEXT) \
++ $(INSTALL) -s -m 0755 $(BR)/missionpack/ui.$(SHLIBEXT) \
+ $(COPYDIR)/missionpack/.
+ endif
=20
=2D $(B)/missionpack/vm/ui.qvm: $(MPUIVMOBJ) $(UIDIR)/ui_syscalls.asm
diff -uNr /usr/ports/games/openarena/files/patch-code-qcommon-files.c opena=
rena/files/patch-code-qcommon-files.c
=2D-- /usr/ports/games/openarena/files/patch-code-qcommon-files.c 1970-01-0=
1 02:00:00.000000000 +0200
+++ openarena/files/patch-code-qcommon-files.c 2010-04-01 07:29:15.00000000=
0 +0200
@@ -0,0 +1,11 @@
+--- code/qcommon/files.c~ 2010-04-01 07:26:33.000000000 +0200
++++ code/qcommon/files.c 2010-04-01 07:28:13.000000000 +0200
+@@ -2939,7 +2939,7 @@
+ =09
+ if(foundPak & 1)
+ Cvar_Set("com_standalone", "0");
+-}*/
++*/}
+ #endif
+=20
+ /*
diff -uNr /usr/ports/games/openarena/files/patch-code-qcommon-q_platform.h =
openarena/files/patch-code-qcommon-q_platform.h
=2D-- /usr/ports/games/openarena/files/patch-code-qcommon-q_platform.h 1970=
=2D01-01 02:00:00.000000000 +0200
+++ openarena/files/patch-code-qcommon-q_platform.h 2010-03-31 11:03:46.000=
000000 +0200
@@ -0,0 +1,11 @@
+--- code/qcommon/q_platform.h~ 2010-03-31 10:58:27.000000000 +0200
++++ code/qcommon/q_platform.h 2010-03-31 10:59:12.000000000 +0200
+@@ -192,6 +192,8 @@
+=20
+ #ifdef __i386__
+ #define ARCH_STRING "i386"
++#elif defined __amd64__
++#define ARCH_STRING "amd64"
+ #elif defined __axp__
+ #define ARCH_STRING "alpha"
+ #endif
diff -uNr /usr/ports/games/openarena/files/patch-code-qcommon-vm_x86.c open=
arena/files/patch-code-qcommon-vm_x86.c
=2D-- /usr/ports/games/openarena/files/patch-code-qcommon-vm_x86.c 1970-01-=
01 02:00:00.000000000 +0200
+++ openarena/files/patch-code-qcommon-vm_x86.c 2010-04-01 10:09:18.0000000=
00 +0200
@@ -0,0 +1,11 @@
+--- code/qcommon/vm_x86.c~ 2008-08-09 18:28:20.000000000 +0200
++++ code/qcommon/vm_x86.c 2010-04-01 10:07:44.000000000 +0200
+@@ -1079,7 +1079,7 @@
+ // copy to an exact size buffer on the hunk
+ vm->codeLength =3D compiledOfs;
+ #ifdef VM_X86_MMAP
+- vm->codeBase =3D mmap(NULL, compiledOfs, PROT_WRITE, MAP_SHARED|MAP_ANON=
YMOUS, -1, 0);
++ vm->codeBase =3D mmap(NULL, compiledOfs, PROT_WRITE, MAP_SHARED|MAP_ANON=
, -1, 0);
+ if(vm->codeBase =3D=3D (void*)-1)
+ Com_Error(ERR_DROP, "VM_CompileX86: can't mmap memory");
+ #elif _WIN32
diff -uNr /usr/ports/games/openarena/files/patch-code-qcommon-vm_x86_64.c o=
penarena/files/patch-code-qcommon-vm_x86_64.c
=2D-- /usr/ports/games/openarena/files/patch-code-qcommon-vm_x86_64.c 1970-=
01-01 02:00:00.000000000 +0200
+++ openarena/files/patch-code-qcommon-vm_x86_64.c 2010-04-01 21:36:27.0000=
00000 +0200
@@ -0,0 +1,20 @@
+--- code/qcommon/vm_x86_64.c~ 2010-04-01 19:06:00.000000000 +0200
++++ code/qcommon/vm_x86_64.c 2010-04-01 18:59:56.000000000 +0200
+@@ -246,7 +246,7 @@
+ #else
+ #define JMPIARG \
+ emit("movq $%lu, %%rax", vm->codeBase+vm->instructionPointers[iarg]); \
+- emit("jmpq *%rax");
++ emit("jmpq *%%rax");
+ #endif
+ =20
+ // integer compare and jump
+@@ -534,7 +534,7 @@
+ {
+ compiledOfs =3D assembler_get_code_size();
+ vm->codeLength =3D compiledOfs;
+- vm->codeBase =3D mmap(NULL, compiledOfs, PROT_WRITE, MAP_SHARED|MAP_ANO=
NYMOUS, -1, 0);
++ vm->codeBase =3D mmap(NULL, compiledOfs, PROT_WRITE, MAP_SHARED|MAP_ANO=
N, -1, 0);
+ if(vm->codeBase =3D=3D (void*)-1)
+ Com_Error(ERR_DROP, "VM_CompileX86: can't mmap memory");
+=20
diff -uNr /usr/ports/games/openarena/files/patch-code__qcommon__common.c op=
enarena/files/patch-code__qcommon__common.c
=2D-- /usr/ports/games/openarena/files/patch-code__qcommon__common.c 2007-0=
9-06 05:50:23.000000000 +0200
+++ openarena/files/patch-code__qcommon__common.c 1970-01-01 02:00:00.00000=
0000 +0200
@@ -1,10 +0,0 @@
=2D--- ./code/qcommon/common.c.orig Wed Apr 26 08:27:12 2006
=2D+++ ./code/qcommon/common.c Sun Jun 11 17:26:26 2006
=2D@@ -25,6 +25,7 @@
=2D #include "qcommon.h"
=2D #include <setjmp.h>
=2D #ifndef _WIN32
=2D+#include <sys/types.h>
=2D #include <netinet/in.h>
=2D #include <sys/stat.h> // umask
=2D #else
diff -uNr /usr/ports/games/openarena/files/patch-code__qcommon__q_platform.=
h openarena/files/patch-code__qcommon__q_platform.h
=2D-- /usr/ports/games/openarena/files/patch-code__qcommon__q_platform.h 20=
07-09-06 05:50:23.000000000 +0200
+++ openarena/files/patch-code__qcommon__q_platform.h 1970-01-01 02:00:00.0=
00000000 +0200
@@ -1,15 +0,0 @@
=2D--- ./code/qcommon/q_platform.h.orig Tue Dec 27 16:46:01 2005
=2D+++ ./code/qcommon/q_platform.h Sun Jun 11 17:26:26 2006
=2D@@ -176,11 +176,7 @@
=2D #define ID_INLINE inline
=2D #define PATH_SEP '/'
=2D=20
=2D-#ifdef __i386__
=2D-#define ARCH_STRING "i386"
=2D-#elif defined __axp__
=2D-#define ARCH_STRING "alpha"
=2D-#endif
=2D+#define ARCH_STRING ARCH
=2D=20
=2D #if BYTE_ORDER =3D=3D BIG_ENDIAN
=2D #define Q3_BIG_ENDIAN
diff -uNr /usr/ports/games/openarena/files/patch-code__unix__linux_glimp.c =
openarena/files/patch-code__unix__linux_glimp.c
=2D-- /usr/ports/games/openarena/files/patch-code__unix__linux_glimp.c 2007=
=2D09-06 05:50:23.000000000 +0200
+++ openarena/files/patch-code__unix__linux_glimp.c 1970-01-01 02:00:00.000=
000000 +0200
@@ -1,19 +0,0 @@
=2D--- ./code/unix/linux_glimp.c.orig Sun Apr 30 11:32:56 2006
=2D+++ ./code/unix/linux_glimp.c Sun Jun 11 17:26:26 2006
=2D@@ -631,8 +631,14 @@
=2D=20
=2D dx =3D ((int)event.xmotion.x - mwx);
=2D dy =3D ((int)event.xmotion.y - mwy);
=2D- mx +=3D dx;
=2D- my +=3D dy;
=2D+ if (abs(dx) > 1)
=2D+ mx +=3D dx * 2;
=2D+ else
=2D+ mx +=3D dx;
=2D+ if (abs(dy) > 1)
=2D+ my +=3D dy * 2;
=2D+ else
=2D+ my +=3D dy;
=2D=20
=2D mwx =3D event.xmotion.x;
=2D mwy =3D event.xmotion.y;
diff -uNr /usr/ports/games/openarena/files/patch-code__unix__unix_main.c op=
enarena/files/patch-code__unix__unix_main.c
=2D-- /usr/ports/games/openarena/files/patch-code__unix__unix_main.c 2007-0=
9-06 05:50:23.000000000 +0200
+++ openarena/files/patch-code__unix__unix_main.c 1970-01-01 02:00:00.00000=
0000 +0200
@@ -1,31 +0,0 @@
=2D--- ./code/unix/unix_main.c.orig Sun Feb 26 18:22:12 2006
=2D+++ ./code/unix/unix_main.c Sun Jun 11 17:26:26 2006
=2D@@ -774,6 +774,7 @@
=2D char curpath[MAX_OSPATH];
=2D char fname[MAX_OSPATH];
=2D char *basepath;
=2D+ char *libpath;
=2D char *homepath;
=2D char *pwdpath;
=2D char *cdpath;
=2D@@ -789,14 +790,19 @@
=2D // TODO: use fs_searchpaths from files.c
=2D pwdpath =3D Sys_Cwd();
=2D basepath =3D Cvar_VariableString( "fs_basepath" );
=2D+ libpath =3D LIBDIR;
=2D homepath =3D Cvar_VariableString( "fs_homepath" );
=2D cdpath =3D Cvar_VariableString( "fs_cdpath" );
=2D gamedir =3D Cvar_VariableString( "fs_game" );
=2D=20
=2D- libHandle =3D try_dlopen(pwdpath, gamedir, fname, fqpath);
=2D+ if(!libHandle && homepath)
=2D+ libHandle =3D try_dlopen(pwdpath, gamedir, fname, fqpath);
=2D=20
=2D if(!libHandle && homepath)
=2D libHandle =3D try_dlopen(homepath, gamedir, fname, fqpath);
=2D+
=2D+ if(!libHandle && basepath)
=2D+ libHandle =3D try_dlopen(libpath, gamedir, fname, fqpath);
=2D=20
=2D if(!libHandle && basepath)
=2D libHandle =3D try_dlopen(basepath, gamedir, fname, fqpath);
diff -uNr /usr/ports/games/openarena/files/patch-code_client_snd_openal.c o=
penarena/files/patch-code_client_snd_openal.c
=2D-- /usr/ports/games/openarena/files/patch-code_client_snd_openal.c 2010-=
01-25 21:15:12.000000000 +0200
+++ openarena/files/patch-code_client_snd_openal.c 1970-01-01 02:00:00.0000=
00000 +0200
@@ -1,11 +0,0 @@
=2D--- code/client/snd_openal.c.orig 2009-12-26 18:20:08.000000000 +0100
=2D+++ code/client/snd_openal.c 2009-12-26 18:20:27.000000000 +0100
=2D@@ -1676,7 +1676,7 @@
=2D #elif defined(MACOS_X)
=2D #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/O=
penAL"
=2D #else
=2D-#define ALDRIVER_DEFAULT "libopenal.so.0"
=2D+#define ALDRIVER_DEFAULT "libopenal.so"
=2D #endif
=2D=20
=2D /*
diff -uNr /usr/ports/games/openarena/pkg-plist openarena/pkg-plist
=2D-- /usr/ports/games/openarena/pkg-plist 2007-09-06 05:50:23.000000000 +0=
200
+++ openarena/pkg-plist 2010-06-16 18:14:09.000000000 +0200
@@ -1,23 +1,13 @@
=2D%%DEDICATED%%bin/openarenaded
+%%DEDICATED%%bin/oa_ded
%%CLIENT%%bin/openarena
%%SMP%%bin/openarena-smp
%%DATADIR%%/baseoa/pak0.pk3
%%DATADIR%%/baseoa/pak1-maps.pk3
%%DATADIR%%/baseoa/pak2-players-mature.pk3
%%DATADIR%%/baseoa/pak2-players.pk3
=2D%%DATADIR%%/baseoa/pak3-music.pk3
%%DATADIR%%/baseoa/pak4-textures.pk3
%%DATADIR%%/baseoa/pak5-TA.pk3
%%DATADIR%%/baseoa/pak6-misc.pk3
=2D%%DATADIR%%/baseoa/pak7-patch.pk3
=2D%%GAMELIBS%%%%LIBDIR%%/baseoa/cgame.so
=2D%%GAMELIBS%%%%LIBDIR%%/baseoa/qagame.so
=2D%%GAMELIBS%%%%LIBDIR%%/baseoa/ui.so
=2D%%GAMELIBS%%%%LIBDIR%%/missionpack/cgame.so
=2D%%GAMELIBS%%%%LIBDIR%%/missionpack/qagame.so
=2D%%GAMELIBS%%%%LIBDIR%%/missionpack/ui.so
+%%DATADIR%%/baseoa/pak6-patch085.pk3
@dirrm %%DATADIR%%/baseoa
@dirrm %%DATADIR%%
=2D%%GAMELIBS%%@dirrm %%LIBDIR%%/missionpack
=2D%%GAMELIBS%%@dirrm %%LIBDIR%%/baseoa
=2D%%GAMELIBS%%@dirrm %%LIBDIR%%
--Boundary-00=_OsPGMHIOtZAb0Yy--
More information about the freebsd-ports-bugs
mailing list