diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 3cff5dbd68c..22714140563 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.14 2011/03/26 10:05:24 sthen Exp $ +# $OpenBSD: Makefile,v 1.15 2011/04/28 18:38:04 jasper Exp $ ONLY_FOR_ARCHS= i386 COMMENT= 3D realtime strategy on a future earth DISTNAME= warzone2100-2.3.7 +REVISION= 0 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/} diff --git a/games/warzone2100/patches/patch-configure_ac b/games/warzone2100/patches/patch-configure_ac index 7dee091fae1..fd54c1b0027 100644 --- a/games/warzone2100/patches/patch-configure_ac +++ b/games/warzone2100/patches/patch-configure_ac @@ -1,16 +1,6 @@ -$OpenBSD: patch-configure_ac,v 1.2 2011/03/13 10:26:26 dcoppa Exp $ +$OpenBSD: patch-configure_ac,v 1.3 2011/04/28 18:38:04 jasper Exp $ --- configure.ac.orig Fri Jan 21 15:52:00 2011 +++ configure.ac Sat Jan 29 21:18:41 2011 -@@ -372,9 +372,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 @@ -414,7 +411,7 @@ AC_CHECK_LIB(popt, poptGetContext, AC_SUBST([POPT_LIBS # Look for PhysicsFS diff --git a/games/warzone2100/patches/patch-lib_sequence_sequence_c b/games/warzone2100/patches/patch-lib_sequence_sequence_c deleted file mode 100644 index f5c5e35fe54..00000000000 --- a/games/warzone2100/patches/patch-lib_sequence_sequence_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_sequence_sequence_c,v 1.2 2011/03/13 10:26:26 dcoppa Exp $ ---- lib/sequence/sequence.c.orig Fri Jan 21 15:52:01 2011 -+++ lib/sequence/sequence.c Sat Jan 29 21:18:37 2011 -@@ -756,7 +756,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) - {