OSEC

Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email hr@neohapsis.com
Re: NEW/UPDATE: games/ioquake3

From: Jacob Meuser (jakemsrsdf.lonestar.org)
Date: Mon Aug 23 2010 - 18:03:39 CDT


On Fri, Aug 20, 2010 at 01:53:15AM -0700, Ryan Freeman wrote:
> Excerpts from Mattieu Baptiste's message of Fri Aug 20 00:50:01 -0700 2010:
> > On Fri, Aug 20, 2010 at 9:02 AM, Ryan Freeman <ryanslipgate.org> wrote:
> > >
> > > included previous conversation as I did not realise it did not make
> > > it to the list. attached is an updated version of my ioquake3 port,
> > > this as Mr Schlichting pointed out does not use the sdl_snd_c patch
> > > anymore, and I decided to sync all patches with the latest for
> > > openarena, as they do share a very similar codebase. I also opted
> > > to include Jacob Meuser's snd_sndio.c which worked without a hitch,
> > > this is working even smoother now esp in regards to sound. I'll be
> > > testing it more myself, comments?
> > >
> > > -ryan
> > >
> >
> > Hi Ryan,
> >
> > It fails for me on amd64, wheras the previous version works great.
> > Build log attached.
> >
> > Cheers,
> >
>
> hey Mattieu,
>
> See attached update, added arch type for amd64 to makefile changes.
> let me know how it goes, thanks!
>
> -ryan

this works fine on MP amd64 for me too. I suggest the following change
though.

--
jakemsrsdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org

diff -uNr ioquake3/Makefile /usr/ports/games/ioquake3/Makefile
--- ioquake3/Makefile Thu Aug 19 23:37:37 2010
+++ /usr/ports/games/ioquake3/Makefile Mon Aug 23 09:37:04 2010
-24,12 +24,15
 
 MASTER_SITES = http://www.ioquake3.org/files/${V}/
 
+QUAKEDIR = ${PREFIX}/share/games/quake3/
+
 USE_X11 = Yes
 USE_GMAKE = Yes
 ALL_TARGET = release
 MAKE_FLAGS = USE_OPENAL=0 \
                         BINEXT='' \
- DEFAULT_BASEDIR=${LOCALBASE}/share/games/quake3/
+ COPYDIR=${QUAKEDIR} \
+ DEFAULT_BASEDIR=${QUAKEDIR}
 
 post-extract:
         mkdir ${WRKSRC}/code/sndio
diff -uNr ioquake3/patches/patch-Makefile /usr/ports/games/ioquake3/patches/patch-Makefile
--- ioquake3/patches/patch-Makefile Thu Aug 19 22:58:08 2010
+++ /usr/ports/games/ioquake3/patches/patch-Makefile Mon Aug 23 09:37:22 2010
-1,15 +1,6
 $OpenBSD: patch-Makefile,v 1.3 2010/05/27 03:47:28 jakemsr Exp $
 --- Makefile.orig Wed Apr 22 11:54:48 2009
 +++ Makefile Thu Aug 19 22:58:01 2010
- -88,7 +88,7 endif
- export CROSS_COMPILING
-
- ifndef COPYDIR
--COPYDIR="/usr/local/games/quake3"
-+COPYDIR="/usr/local/share/games/quake3"
- endif
-
- ifndef MOUNT_DIR
  -149,13 +149,14 endif
  
  #############################################################################