On Wed, Oct 13, 2010 at 06:38:15PM -0400, Brad wrote:
> Here is an update to Warzone 2100 2.3.5.
>
> I'm looking for someone with an i386 system to test this out.
Updated the diff. I didn't notice there was a conflict locally
with one of the patches from a commit awhile ago to cvs.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 22 Dec 2009 16:28:01 -0000 1.5
+++ Makefile 11 Oct 2010 01:04:25 -0000
@@ -1,48 +1,52 @@
# $OpenBSD: Makefile,v 1.5 2009/12/22 16:28:01 ajacoutot Exp $
-COMMENT= 3d realtime strategy on a future earth
+ONLY_FOR_ARCHS= i386
-DISTNAME= warzone2100-2.0.7
-PKGNAME= ${DISTNAME}p2
+COMMENT= 3D realtime strategy on a future earth
+
+DISTNAME= warzone2100-2.3.5
CATEGORIES= games
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
HOMEPAGE= http://wz2100.net/
MAINTAINER= Simon Bertrang <[email protected]>
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= GL GLU SDL X11 Xext c m ogg pthread pthread-stubs \
- sndio usbhid xcb z
-
-MASTER_SITES= http://download.gna.org/warzone/releases/2.0/
-
-LIB_DEPENDS= SDL_net.>=1::devel/sdl-net \
- physfs.>=1::devel/physfs \
- openal.>=1::audio/openal \
- vorbis.>=5,vorbisfile.>=4::audio/libvorbis \
- mad.>=2::audio/libmad \
- jpeg.>=62::graphics/jpeg \
- png.>=5::graphics/png
-
-BUILD_DEPENDS= ::devel/bison \
- ::archivers/unzip \
- ::archivers/zip
+WANTLIB= GL GLC GLU SDL.>=8 X11 c m physfs.>=1 ogg.>=6 openal.>=1 \
+ png.>=5 popt pthread sndio stdc++ theora vorbis.>=5 \
+ vorbisfile.>=4 z
+
+MODULES= devel/gettext
+LIB_DEPENDS= ::audio/libogg \
+ ::audio/libvorbis \
+ :openal->=0.0.8p7:audio/openal \
+ ::devel/physfs \
+ ::devel/popt \
+ ::devel/sdl \
+ ::graphics/png \
+ ::graphics/quesoglc \
+ ::multimedia/libtheora
+BUILD_DEPENDS= ::archivers/unzip \
+ ::archivers/zip \
+ ::devel/bison \
+ ::devel/flex
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
USE_GMAKE= Yes
USE_X11= Yes
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=${CONFIGURE_SHARED}
-CONFIGURE_ENV+= CPPFLAGS='-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng \
- -I${X11BASE}/include' \
- LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib' \
- LIBS='-pthread' \
- YACC='bison -y'
+CONFIGURE_STYLE= autoconf
+# Should be 2.65
+AUTOCONF_VERSION= 2.64
+CONFIGURE_ARGS+= --with-distributor="OpenBSD"
+CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include
-I${LOCALBASE}/include/libpng \
+ -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+ YACC="bison -y" \
+ LEX="gflex"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 22 Jul 2007 14:57:52 -0000 1.1.1.1
+++ distinfo 11 Oct 2010 01:03:22 -0000
@@ -1,5 +1,5 @@
-MD5 (warzone2100-2.0.7.tar.bz2) = mDzMZ8/V3zGFxoNsYupyLw==
-RMD160 (warzone2100-2.0.7.tar.bz2) = qNSDZmq2YhtLP9jdl/xOlanZxWs=
-SHA1 (warzone2100-2.0.7.tar.bz2) = +4W+ejAWvSwAbKxkVTjaOn1wJdE=
-SHA256 (warzone2100-2.0.7.tar.bz2) =
5q4rNYTG8YlofL/HejQ5foIQy86rg3ERVcNllOmw+so=
-SIZE (warzone2100-2.0.7.tar.bz2) = 19622856
+MD5 (warzone2100-2.3.5.tar.gz) = HZ1yRVW2JXOp67zfVqTRYA==
+RMD160 (warzone2100-2.3.5.tar.gz) = 8nbx5jbTdbKPTp0ecXpWKp9WsPc=
+SHA1 (warzone2100-2.3.5.tar.gz) = Ej2HssxWA8ySZyuuopuwe9rr0u0=
+SHA256 (warzone2100-2.3.5.tar.gz) =
Op5ChR1rJEl/wH2ujXW74v8TWP+96uot6qYj7AFWpGk=
+SIZE (warzone2100-2.3.5.tar.gz) = 59205795
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 22 Jul 2007 14:57:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/22 14:57:52 simon Exp $
---- Makefile.in.orig Sun Jul 22 00:02:49 2007
-+++ Makefile.in Sun Jul 22 00:03:05 2007
-@@ -199,7 +199,7 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = win32 lib src data icons nsis
--dist_doc_DATA = AUTHORS ChangeLog README COPYING COPYING.README
-+dist_doc_DATA = README
- ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = \
- autogen.sh \
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 16 Dec 2009 21:13:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2009/12/16 21:13:24 naddy Exp $
---- configure.orig Sat Jun 23 11:20:09 2007
-+++ configure Sat Jul 21 21:20:43 2007
-@@ -6485,7 +6485,7 @@ if test "${ac_cv_lib_GLU_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lGLU $LIBS"
-+LIBS="-lGLU -lGL $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6964,7 +6964,7 @@ if test "${ac_cv_lib_openal_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lopenal $LIBS"
-+LIBS="-lopenal -lsndio $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -7810,7 +7810,7 @@ fi
- # add some required C flags here
- # -DYY_STATIC is required by flex
- # -m32 forces 32-bit compile, since code is not clean enough for 64-bit yet
--WZ_CFLAGS="${WZ_CFLAGS} -m32 -DYY_STATIC
-DDATADIR=\\\"${datadir}/${PACKAGE}\\\""
-+WZ_CFLAGS="${WZ_CFLAGS} -DYY_STATIC -DDATADIR=\\\"${datadir}/${PACKAGE}\\\""
-
- CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)"
- CFLAGS="${CFLAGS} ${WZ_CFLAGS}"
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 14 Oct 2010 18:22:41 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- configure.ac.orig Sat Sep 25 00:10:05 2010
++++ configure.ac Sun Oct 10 21:03:50 2010
+@@ -346,9 +346,6 @@ fi
+
+ # Checks for libraries:
+
+-# check for nearbyint()
+-AC_CHECK_LIB(m, nearbyint, [MATH_LIB=""], AC_MSG_ERROR([nearbyint not
found.]))
+-
+ # When (cross-)compiling for Windows (MinGW) we need to link in iberty for
Popt
+ # and the Dr. MinGW derived exception handler.
+ if test "x$host_os_mingw32" = "xyes" ; then
+@@ -388,7 +385,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS
+
+ # Look for PhysicsFS
+ AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.]))
+-AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]),
AC_MSG_ERROR([PhysicsFS not found.]), [${WIN32_LIBS}])
++AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]),
AC_MSG_ERROR([PhysicsFS not found.]), [-pthread])
+
+ # Look for OpenGL
+ CPPFLAGS_SAVE="$CPPFLAGS"
Index: patches/patch-lib_sequence_sequence_c
===================================================================
RCS file: patches/patch-lib_sequence_sequence_c
diff -N patches/patch-lib_sequence_sequence_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_sequence_sequence_c 14 Oct 2010 18:22:46 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- lib/sequence/sequence.c.orig Thu Sep 2 21:08:58 2010
++++ lib/sequence/sequence.c Sun Oct 10 21:03:46 2010
+@@ -758,7 +758,7 @@ bool seq_Update()
+ {
+ for (j = 0; j < videodata.vi.channels; j++)
+ {
+- int val = nearbyint(pcm[j][i] *
32767.f);
++ int val = rint(pcm[j][i] * 32767.f);
+
+ if (val > 32767)
+ {
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/games/warzone2100/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 22 Dec 2009 16:28:01 -0000 1.2
+++ pkg/PLIST 27 Aug 2010 20:52:40 -0000
@@ -1,13 +1,75 @@
@comment $OpenBSD: PLIST,v 1.2 2009/12/22 16:28:01 ajacoutot Exp $
-bin/warzone2100
-share/applications/
+...@bin bin/warzone2100
share/applications/warzone2100.desktop
share/doc/warzone2100/
-share/doc/warzone2100/README
+...@comment share/doc/warzone2100/AUTHORS
+...@comment share/doc/warzone2100/COPYING
+...@comment share/doc/warzone2100/COPYING.NONGPL
+...@comment share/doc/warzone2100/COPYING.README
+...@comment share/doc/warzone2100/ChangeLog
+share/doc/warzone2100/Readme.de
+share/doc/warzone2100/Readme.de.xhtml
+share/doc/warzone2100/Readme.en
+share/doc/warzone2100/Readme.en.xhtml
+share/doc/warzone2100/ScriptingManual.htm
+share/doc/warzone2100/styles/
+share/doc/warzone2100/styles/readme.print.css
+share/doc/warzone2100/styles/readme.screen.css
+share/doc/warzone2100/styles/scriptingmanual.css
share/icons/
share/icons/warzone2100.png
+share/locale/cs/LC_MESSAGES/warzone2100.mo
+share/locale/da/LC_MESSAGES/warzone2100.mo
+share/locale/de/LC_MESSAGES/warzone2100.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
+share/locale/en_GB/LC_MESSAGES/warzone2100.mo
+share/locale/es/LC_MESSAGES/warzone2100.mo
+share/locale/et_EE/
+share/locale/et_EE/LC_MESSAGES/
+share/locale/et_EE/LC_MESSAGES/warzone2100.mo
+share/locale/fi/LC_MESSAGES/warzone2100.mo
+share/locale/fr/LC_MESSAGES/warzone2100.mo
+share/locale/fy/
+share/locale/fy/LC_MESSAGES/
+share/locale/fy/LC_MESSAGES/warzone2100.mo
+share/locale/ga/LC_MESSAGES/warzone2100.mo
+share/locale/hr/LC_MESSAGES/warzone2100.mo
+share/locale/it/LC_MESSAGES/warzone2100.mo
+share/locale/ko/LC_MESSAGES/warzone2100.mo
+share/locale/la/
+share/locale/la/LC_MESSAGES/
+share/locale/la/LC_MESSAGES/warzone2100.mo
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
+share/locale/lt/LC_MESSAGES/warzone2100.mo
+share/locale/nb/LC_MESSAGES/warzone2100.mo
+share/locale/nl/LC_MESSAGES/warzone2100.mo
+share/locale/pl/LC_MESSAGES/warzone2100.mo
+share/locale/pt/LC_MESSAGES/warzone2100.mo
+share/locale/pt_BR/LC_MESSAGES/warzone2100.mo
+share/locale/ro/LC_MESSAGES/warzone2100.mo
+share/locale/ru/LC_MESSAGES/warzone2100.mo
+share/locale/sk/LC_MESSAGES/warzone2100.mo
+share/locale/sl/LC_MESSAGES/warzone2100.mo
+share/locale/uk_UA/
+share/locale/uk_UA/LC_MESSAGES/
+share/locale/uk_UA/LC_MESSAGES/warzone2100.mo
+share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
+share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
share/warzone2100/
+share/warzone2100/base.wz
+share/warzone2100/mods/
+share/warzone2100/mods/multiplay/
+share/warzone2100/mods/multiplay/dydo-ai.wz
+share/warzone2100/mods/multiplay/ntw.wz
+share/warzone2100/mods/multiplay/old-1.10-balance.wz
share/warzone2100/mp.wz
-share/warzone2100/warzone.wz
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+share/warzone2100/music/
+share/warzone2100/music/menu.ogg
+share/warzone2100/music/music.wpl
+share/warzone2100/music/track1.ogg
+share/warzone2100/music/track2.ogg
+share/warzone2100/music/track3.ogg
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
