UPDATE: games/openarena

2012-03-11 Thread Antti Harri 
Update to 0.8.8.

I've switched the VM on and tested it succesfully on amd64 and i386. Network
play worked too on amd64. It didn't look like the gethostnameinfo-patch was
needed anymore but I'd appreciate some test reports about networking and if OA
works on macppc.

The two vm patches are from Toni Spets and actually for ioquake3 but they apply
for OA as well, thanks!

The site containing the engine tarball didn't seem too reliable so I decided to 
mirror
it myself too.

-- 
Antti Harri

diff --git games/openarena/Makefile games/openarena/Makefile
index 8e7d2f7..33ccfcb 100644
--- games/openarena/Makefile
+++ games/openarena/Makefile
@@ -10,8 +10,8 @@ MULTI_PACKAGES =  -main -server -data
 
 CATEGORIES =   games x11
 
-V =0.8.5
-E_V =  0.8.1   # engine version
+V =0.8.8
+E_V =  ${V}# engine version
 
 PKGNAME =  openarena-${V}
 PKGNAME-main = openarena-${V}
@@ -21,13 +21,14 @@ PKGNAME-data =  openarena-data-${V}
 PKG_ARCH-data =*
 REVISION-data= 0
 
-DISTNAME = oa${V:S/.//g}
-DISTFILES =${DISTNAME}.zip openarena-engine-${E_V}-1.tar.bz2
+DISTNAME = openarena-${V}
+DISTFILES =${DISTNAME}.zip openarena-engine-source-${E_V}.tar.bz2:0
 
-MS_PREFIX =http://download.tuxfamily.org/openarena/rel/
 HOMEPAGE = http://www.openarena.ws/
-MASTER_SITES = ${MS_PREFIX}/${V:S/.//g}/ \
-   ${MS_PREFIX}/${E_V:S/.//g}/source/ \
+MS_PREFIX =http://download.tuxfamily.org/openarena/rel/
+MASTER_SITES = ${MS_PREFIX}${V:S/.//g}/ \
+   ${MS_PREFIX}${E_V:S/.//g}/source/
+MASTER_SITES0 =
http://files.poulsander.com/~poul19/public_files/oa/dev088/ \
http://openbsd.fi/distfiles/
 
 # GPLv2 but contains software with other (free) licenses as well
@@ -37,22 +38,25 @@ PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
 WANTLIB-main = GL c m pthread sndio ogg>=5 SDL>=7 vorbis>=7 \
-   vorbisfile>=5
+   vorbisfile>=5 curl
 WANTLIB-server =   c m
 
 LIB_DEPENDS-main = audio/libogg \
+   audio/libvorbis \
devel/sdl \
-   audio/libvorbis
+   net/curl
 RUN_DEPENDS-main = ${BASE_PKGPATH},-data
 RUN_DEPENDS-server =   ${BASE_PKGPATH},-data
 
-ALL_TARGET =   release
 USE_GMAKE =Yes
 MAKE_FLAGS =   USE_OPENAL=0 \
-   BINEXT='' \
+   FULLBINEXT='' \
+   V=1 \
DEFAULT_BASEDIR=${LOCALBASE}/share/openarena
 
-WRKDIST =  ${WRKDIR}/openarena-engine-${E_V}
+NO_REGRESS =   Yes
+WRKDIST =  ${WRKDIR}/openarena-engine-source-${E_V}
+ALL_TARGET =   release
 
 post-extract:
find ${WRKDIR} -name '*.orig' -print0 | xargs -0r rm -f
diff --git games/openarena/distinfo games/openarena/distinfo
index fa891e0..dfad2d2 100644
--- games/openarena/distinfo
+++ games/openarena/distinfo
@@ -1,10 +1,10 @@
-MD5 (oa085.zip) = NrxQRfKfzfOBENoPD1kpkw==
-MD5 (openarena-engine-0.8.1-1.tar.bz2) = TuaW6sxLA1D527VYjc10og==
-RMD160 (oa085.zip) = SH1bw959W+u4LB5/rvW4r9F9QfQ=
-RMD160 (openarena-engine-0.8.1-1.tar.bz2) = Ej6fcGIf2FY4XGynrQWAuBRU1oc=
-SHA1 (oa085.zip) = NOn0OMPBjXmMELKwZprU04qKTtY=
-SHA1 (openarena-engine-0.8.1-1.tar.bz2) = beNFwL69h+FAbLBxiVN9uZpCKAg=
-SHA256 (oa085.zip) = +NSSnwa9+LI8k098FFPzsxBuhRaS/eQHlUXmfFiOnEg=
-SHA256 (openarena-engine-0.8.1-1.tar.bz2) = 
QwuptpHICFuUbgBPDMiQmVx/gpVJi9jIznRCk6hydNI=
-SIZE (oa085.zip) = 356536552
-SIZE (openarena-engine-0.8.1-1.tar.bz2) = 2951703
+MD5 (openarena-0.8.8.zip) = nzU9lteInDdzSdaSw5BeWw==
+MD5 (openarena-engine-source-0.8.8.tar.bz2) = ypsjm0d61njr94HhTObteg==
+RMD160 (openarena-0.8.8.zip) = 3sfEPCcnI16Xvhqzlo2IA/3XElE=
+RMD160 (openarena-engine-source-0.8.8.tar.bz2) = 6CPBhO/6y0Lp7NKq94nZVwIh6JY=
+SHA1 (openarena-0.8.8.zip) = N6tBmQs3RZgizowv5ZBgdhbh9tE=
+SHA1 (openarena-engine-source-0.8.8.tar.bz2) = ZPMzwpCxW2sOOBncEgs+yiZTNA4=
+SHA256 (openarena-0.8.8.zip) = Wo+vf1tR81GwoWGMBra5il8aZ1jx05gY3iyH3yoLrEo=
+SHA256 (openarena-engine-source-0.8.8.tar.bz2) = 
lapQDLfkLlf7H223uXolQWj0+i42dtbNwzGAtp/eDnc=
+SIZE (openarena-0.8.8.zip) = 425189255
+SIZE (openarena-engine-source-0.8.8.tar.bz2) = 3777830
diff --git games/openarena/patches/patch-Makefile 
games/openarena/patches/patch-Makefile
index e0fdec2..58b35ab 100644
--- games/openarena/patches/patch-Makefile
+++ games/openarena/patches/patch-Makefile
@@ -1,7 +1,7 @@
 $OpenBSD: ports/games/openarena/patches/patch-Makefile,v 1.3 2010/05/27 
03:47:28 jakemsr Exp $
 Makefile.orig  Sat Aug  9 13:22:37 2008
-+++ Makefile   Mon May  3 04:26:35 2010
-@@ -143,13 +143,14 @@ endif
+--- Makefile.orig  Tue Dec 13 00:48:49 2011
 Makefile   Wed Mar  7 11:21:2

Re: UPDATE: games/openarena

2012-03-11 Thread Stuart Henderson 
On 2012/03/11 15:54, Antti Harri wrote:
> Update to 0.8.8.

REVISION-data should be zapped, rest reads OK but untested

Re: UPDATE: games/openarena

2012-03-11 Thread Kirill Bychkov 
On Sun, March 11, 2012 16:54, Antti Harri wrote:
> Update to 0.8.8.
>
> I've switched the VM on and tested it succesfully on amd64 and i386. Network
> play worked too on amd64. It didn't look like the gethostnameinfo-patch was
> needed anymore but I'd appreciate some test reports about networking and if OA
> works on macppc.
>
> The two vm patches are from Toni Spets and actually for ioquake3 but they
> apply
> for OA as well, thanks!
>
> The site containing the engine tarball didn't seem too reliable so I decided
> to mirror
> it myself too.

Hi. patches/patch-code_sys_sys_unix_c was killed 3 days ago, and you still
have this in your diff.
Anyway playing with bots on localhost is fine on amd64

>
> --
> Antti Harri
>

> diff --git games/openarena/patches/patch-code_sys_sys_unix_c
> games/openarena/patches/patch-code_sys_sys_unix_c
> index aa80fa9..3b59558 100644
> --- games/openarena/patches/patch-code_sys_sys_unix_c
> +++ games/openarena/patches/patch-code_sys_sys_unix_c
> @@ -1,7 +1,7 @@
>  $OpenBSD: ports/games/openarena/patches/patch-code_sys_sys_unix_c,v 1.1
> 2010/05/27 03:47:28 jakemsr Exp $
>  code/sys/sys_unix.c.orig Sat May  2 16:44:02 2009
> -+++ code/sys/sys_unix.c  Sat May  2 16:44:21 2009
> -@@ -139,7 +139,7 @@ qboolean Sys_RandomBytes( byte *string, int len )
> +--- code/sys/sys_unix.c.orig Sat Dec 24 14:29:36 2011
>  code/sys/sys_unix.c  Wed Mar  7 10:11:54 2012
> +@@ -151,7 +151,7 @@ qboolean Sys_RandomBytes( byte *string, int len )
>   {
>   FILE *fp;
>

Re: UPDATE: games/openarena

2012-03-11 Thread Antti Harri 
On Sunday 11 March 2012 17:41:03 Kirill Bychkov wrote:
> Hi. patches/patch-code_sys_sys_unix_c was killed 3 days ago, and you still
> have this in your diff.
> Anyway playing with bots on localhost is fine on amd64

On Sunday 11 March 2012 16:12:47 Stuart Henderson wrote:
> REVISION-data should be zapped, rest reads OK but untested

Fixed diff attached.

PS. It might be enough on macppc to package this and run openarena-server.
Then load any map, for example: "map aggressor". That should show if it's
using the VM or the interpreter just like openarena-client. Please send
me a log of the output to my personal mail if anyone tests this.

-- 
Antti Harri

diff --git games/openarena/Makefile games/openarena/Makefile
index b290974..592ba81 100644
--- games/openarena/Makefile
+++ games/openarena/Makefile
@@ -10,27 +10,24 @@ MULTI_PACKAGES =-main -server -data
 
 CATEGORIES =   games x11
 
-V =0.8.5
-E_V =  0.8.1   # engine version
+V =0.8.8
+E_V =  ${V}# engine version
 
 PKGNAME =  openarena-${V}
 PKGNAME-main = openarena-${V}
 PKGNAME-server =   openarena-server-${V}
 PKGNAME-data = openarena-data-${V}
 
-REVISION-main =0
-REVISION-server =  0
-REVISION-data =0
-
 PKG_ARCH-data =*
 
-DISTNAME = oa${V:S/.//g}
-DISTFILES =${DISTNAME}.zip openarena-engine-${E_V}-1.tar.bz2
+DISTNAME = openarena-${V}
+DISTFILES =${DISTNAME}.zip openarena-engine-source-${E_V}.tar.bz2:0
 
-MS_PREFIX =http://download.tuxfamily.org/openarena/rel/
 HOMEPAGE = http://www.openarena.ws/
-MASTER_SITES = ${MS_PREFIX}/${V:S/.//g}/ \
-   ${MS_PREFIX}/${E_V:S/.//g}/source/ \
+MS_PREFIX =http://download.tuxfamily.org/openarena/rel/
+MASTER_SITES = ${MS_PREFIX}${V:S/.//g}/ \
+   ${MS_PREFIX}${E_V:S/.//g}/source/
+MASTER_SITES0 =
http://files.poulsander.com/~poul19/public_files/oa/dev088/ \
http://openbsd.fi/distfiles/
 
 # GPLv2 but contains software with other (free) licenses as well
@@ -40,22 +37,25 @@ PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
 WANTLIB-main = GL c m pthread sndio ogg>=5 SDL>=7 vorbis>=7 \
-   vorbisfile>=5
+   vorbisfile>=5 curl
 WANTLIB-server =   c m
 
 LIB_DEPENDS-main = audio/libogg \
+   audio/libvorbis \
devel/sdl \
-   audio/libvorbis
+   net/curl
 RUN_DEPENDS-main = ${BASE_PKGPATH},-data
 RUN_DEPENDS-server =   ${BASE_PKGPATH},-data
 
-ALL_TARGET =   release
 USE_GMAKE =Yes
 MAKE_FLAGS =   USE_OPENAL=0 \
-   BINEXT='' \
+   FULLBINEXT='' \
+   V=1 \
DEFAULT_BASEDIR=${LOCALBASE}/share/openarena
 
-WRKDIST =  ${WRKDIR}/openarena-engine-${E_V}
+NO_REGRESS =   Yes
+WRKDIST =  ${WRKDIR}/openarena-engine-source-${E_V}
+ALL_TARGET =   release
 
 post-extract:
find ${WRKDIR} -name '*.orig' -print0 | xargs -0r rm -f
diff --git games/openarena/distinfo games/openarena/distinfo
index fa891e0..dfad2d2 100644
--- games/openarena/distinfo
+++ games/openarena/distinfo
@@ -1,10 +1,10 @@
-MD5 (oa085.zip) = NrxQRfKfzfOBENoPD1kpkw==
-MD5 (openarena-engine-0.8.1-1.tar.bz2) = TuaW6sxLA1D527VYjc10og==
-RMD160 (oa085.zip) = SH1bw959W+u4LB5/rvW4r9F9QfQ=
-RMD160 (openarena-engine-0.8.1-1.tar.bz2) = Ej6fcGIf2FY4XGynrQWAuBRU1oc=
-SHA1 (oa085.zip) = NOn0OMPBjXmMELKwZprU04qKTtY=
-SHA1 (openarena-engine-0.8.1-1.tar.bz2) = beNFwL69h+FAbLBxiVN9uZpCKAg=
-SHA256 (oa085.zip) = +NSSnwa9+LI8k098FFPzsxBuhRaS/eQHlUXmfFiOnEg=
-SHA256 (openarena-engine-0.8.1-1.tar.bz2) = 
QwuptpHICFuUbgBPDMiQmVx/gpVJi9jIznRCk6hydNI=
-SIZE (oa085.zip) = 356536552
-SIZE (openarena-engine-0.8.1-1.tar.bz2) = 2951703
+MD5 (openarena-0.8.8.zip) = nzU9lteInDdzSdaSw5BeWw==
+MD5 (openarena-engine-source-0.8.8.tar.bz2) = ypsjm0d61njr94HhTObteg==
+RMD160 (openarena-0.8.8.zip) = 3sfEPCcnI16Xvhqzlo2IA/3XElE=
+RMD160 (openarena-engine-source-0.8.8.tar.bz2) = 6CPBhO/6y0Lp7NKq94nZVwIh6JY=
+SHA1 (openarena-0.8.8.zip) = N6tBmQs3RZgizowv5ZBgdhbh9tE=
+SHA1 (openarena-engine-source-0.8.8.tar.bz2) = ZPMzwpCxW2sOOBncEgs+yiZTNA4=
+SHA256 (openarena-0.8.8.zip) = Wo+vf1tR81GwoWGMBra5il8aZ1jx05gY3iyH3yoLrEo=
+SHA256 (openarena-engine-source-0.8.8.tar.bz2) = 
lapQDLfkLlf7H223uXolQWj0+i42dtbNwzGAtp/eDnc=
+SIZE (openarena-0.8.8.zip) = 425189255
+SIZE (openarena-engine-source-0.8.8.tar.bz2) = 3777830
diff --git games/openarena/patches/patch-Makefile 
games/openarena/patches/patch-Makefile
index e0fdec2..58b35ab 100644
--- games/openarena/patches/patch-Makefile
+++ games/openarena/patches/patch-Makefile
@@ -1,7 +1,7 @@
 $OpenBSD: ports/games/openarena/patch

Re: UPDATE: games/openarena

2012-03-12 Thread Ryan Freeman 
On Sun, Mar 11, 2012 at 06:16:37PM +0200, Antti Harri wrote:
> On Sunday 11 March 2012 17:41:03 Kirill Bychkov wrote:
> > Hi. patches/patch-code_sys_sys_unix_c was killed 3 days ago, and you still
> > have this in your diff.
> > Anyway playing with bots on localhost is fine on amd64
> 
> On Sunday 11 March 2012 16:12:47 Stuart Henderson wrote:
> > REVISION-data should be zapped, rest reads OK but untested
> 
> Fixed diff attached.
> 
> PS. It might be enough on macppc to package this and run openarena-server.
> Then load any map, for example: "map aggressor". That should show if it's
> using the VM or the interpreter just like openarena-client. Please send
> me a log of the output to my personal mail if anyone tests this.

works good on i386-current built yesterday.  played a few matches
with bots, and played a match online without issue.

-ryan

> 
> -- 
> Antti Harri
> 
> diff --git games/openarena/Makefile games/openarena/Makefile
> index b290974..592ba81 100644
> --- games/openarena/Makefile
> +++ games/openarena/Makefile
> @@ -10,27 +10,24 @@ MULTI_PACKAGES =  -main -server -data
>  
>  CATEGORIES = games x11
>  
> -V =  0.8.5
> -E_V =0.8.1   # engine version
> +V =  0.8.8
> +E_V =${V}# engine version
>  
>  PKGNAME =openarena-${V}
>  PKGNAME-main =   openarena-${V}
>  PKGNAME-server = openarena-server-${V}
>  PKGNAME-data =   openarena-data-${V}
>  
> -REVISION-main =  0
> -REVISION-server =0
> -REVISION-data =  0
> -
>  PKG_ARCH-data =  *
>  
> -DISTNAME =   oa${V:S/.//g}
> -DISTFILES =  ${DISTNAME}.zip openarena-engine-${E_V}-1.tar.bz2
> +DISTNAME =   openarena-${V}
> +DISTFILES =  ${DISTNAME}.zip openarena-engine-source-${E_V}.tar.bz2:0
>  
> -MS_PREFIX =  http://download.tuxfamily.org/openarena/rel/
>  HOMEPAGE =   http://www.openarena.ws/
> -MASTER_SITES =   ${MS_PREFIX}/${V:S/.//g}/ \
> - ${MS_PREFIX}/${E_V:S/.//g}/source/ \
> +MS_PREFIX =  http://download.tuxfamily.org/openarena/rel/
> +MASTER_SITES =   ${MS_PREFIX}${V:S/.//g}/ \
> + ${MS_PREFIX}${E_V:S/.//g}/source/
> +MASTER_SITES0 =  
> http://files.poulsander.com/~poul19/public_files/oa/dev088/ \
>   http://openbsd.fi/distfiles/
>  
>  # GPLv2 but contains software with other (free) licenses as well
> @@ -40,22 +37,25 @@ PERMIT_DISTFILES_CDROM =Yes
>  PERMIT_DISTFILES_FTP =   Yes
>  
>  WANTLIB-main =   GL c m pthread sndio ogg>=5 SDL>=7 vorbis>=7 \
> - vorbisfile>=5
> + vorbisfile>=5 curl
>  WANTLIB-server = c m
>  
>  LIB_DEPENDS-main =   audio/libogg \
> + audio/libvorbis \
>   devel/sdl \
> - audio/libvorbis
> + net/curl
>  RUN_DEPENDS-main =   ${BASE_PKGPATH},-data
>  RUN_DEPENDS-server = ${BASE_PKGPATH},-data
>  
> -ALL_TARGET = release
>  USE_GMAKE =  Yes
>  MAKE_FLAGS = USE_OPENAL=0 \
> - BINEXT='' \
> + FULLBINEXT='' \
> + V=1 \
>   DEFAULT_BASEDIR=${LOCALBASE}/share/openarena
>  
> -WRKDIST =${WRKDIR}/openarena-engine-${E_V}
> +NO_REGRESS = Yes
> +WRKDIST =${WRKDIR}/openarena-engine-source-${E_V}
> +ALL_TARGET = release
>  
>  post-extract:
>   find ${WRKDIR} -name '*.orig' -print0 | xargs -0r rm -f
> diff --git games/openarena/distinfo games/openarena/distinfo
> index fa891e0..dfad2d2 100644
> --- games/openarena/distinfo
> +++ games/openarena/distinfo
> @@ -1,10 +1,10 @@
> -MD5 (oa085.zip) = NrxQRfKfzfOBENoPD1kpkw==
> -MD5 (openarena-engine-0.8.1-1.tar.bz2) = TuaW6sxLA1D527VYjc10og==
> -RMD160 (oa085.zip) = SH1bw959W+u4LB5/rvW4r9F9QfQ=
> -RMD160 (openarena-engine-0.8.1-1.tar.bz2) = Ej6fcGIf2FY4XGynrQWAuBRU1oc=
> -SHA1 (oa085.zip) = NOn0OMPBjXmMELKwZprU04qKTtY=
> -SHA1 (openarena-engine-0.8.1-1.tar.bz2) = beNFwL69h+FAbLBxiVN9uZpCKAg=
> -SHA256 (oa085.zip) = +NSSnwa9+LI8k098FFPzsxBuhRaS/eQHlUXmfFiOnEg=
> -SHA256 (openarena-engine-0.8.1-1.tar.bz2) = 
> QwuptpHICFuUbgBPDMiQmVx/gpVJi9jIznRCk6hydNI=
> -SIZE (oa085.zip) = 356536552
> -SIZE (openarena-engine-0.8.1-1.tar.bz2) = 2951703
> +MD5 (openarena-0.8.8.zip) = nzU9lteInDdzSdaSw5BeWw==
> +MD5 (openarena-engine-source-0.8.8.tar.bz2) = ypsjm0d61njr94HhTObteg==
> +RMD160 (openarena-0.8.8.zip) = 3sfEPCcnI16Xvhqzlo2IA/3XElE=
> +RMD160 (openarena-engine-source-0.8.8.tar.bz2) = 6CPBhO/6y0Lp7NKq94nZVwIh6JY=
> +SHA1 (openarena-0.8.8.zip) = N6tBmQs3RZgizowv5ZBgdhbh9tE=
> +SHA1 (openarena-engine-source-0.8.8.tar.bz2) = ZPMzwpCxW2sOOBncEgs+yiZTNA4=
> +SHA256 (openarena-0.8.8.zip) = Wo+vf1tR81GwoWGMBra5il8aZ1jx05gY3iyH3yoLrEo=
> +SHA256 (openarena-engine-source-0.8.8.tar.bz2) = 
> lapQDLfkLlf7H223uXolQ

Re: UPDATE: games/openarena

2012-03-18 Thread Antti Harri 
On Monday 12 March 2012 21:01:44 Ryan Freeman wrote:
> On Sun, Mar 11, 2012 at 06:16:37PM +0200, Antti Harri wrote:
> > On Sunday 11 March 2012 17:41:03 Kirill Bychkov wrote:
> > > Hi. patches/patch-code_sys_sys_unix_c was killed 3 days ago, and you
> > > still have this in your diff.
> > > Anyway playing with bots on localhost is fine on amd64
> >
> > On Sunday 11 March 2012 16:12:47 Stuart Henderson wrote:
> > > REVISION-data should be zapped, rest reads OK but untested
> >
> > Fixed diff attached.
> >
> > PS. It might be enough on macppc to package this and run
> > openarena-server. Then load any map, for example: "map aggressor". That
> > should show if it's using the VM or the interpreter just like
> > openarena-client. Please send me a log of the output to my personal mail
> > if anyone tests this.
>
> works good on i386-current built yesterday.  played a few matches
> with bots, and played a match online without issue.

Thanks.

Anyone willing to commit this?


-- 
Antti Harri