From e9f4bbbcbcee524031b85968ff1f5a86b391ee32 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 26 Jul 2010 10:01:45 +0000 Subject: Changes 0.9.2.1: * Fix build on 64 bits system Changes 0.9.2: * The rope of grapple no longer gets stuck in ground. * Network games between specific computers which didn't work properly before should work now. * A bug has been fixed which prevented the bugzilla team to have more then three players. * Poisoned characters die now when they have to less health. --- games/wormux/Makefile | 10 +++++----- games/wormux/PLIST | 15 +++------------ games/wormux/distinfo | 9 +++++---- games/wormux/patches/patch-aa | 13 +++++++++++++ 4 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 games/wormux/patches/patch-aa (limited to 'games') diff --git a/games/wormux/Makefile b/games/wormux/Makefile index 526bda7d5f2..ef3c4f96709 100644 --- a/games/wormux/Makefile +++ b/games/wormux/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:24 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2010/07/26 10:01:45 adam Exp $ -DISTNAME= wormux-0.9.1 -PKGREVISION= 1 +DISTNAME= wormux-0.9.2.1 CATEGORIES= games MASTER_SITES= http://download.gna.org/wormux/ EXTRACT_SUFX= .tar.bz2 @@ -16,12 +15,13 @@ USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes USE_TOOLS+= pkg-config msgfmt GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-servers -.include "../../devel/SDL/buildlink3.mk" -.include "../../graphics/SDL_image/buildlink3.mk" .include "../../audio/SDL_mixer/buildlink3.mk" +.include "../../devel/SDL/buildlink3.mk" .include "../../devel/SDL_ttf/buildlink3.mk" .include "../../devel/SDL_gfx/buildlink3.mk" +.include "../../graphics/SDL_image/buildlink3.mk" .include "../../net/SDL_net/buildlink3.mk" .include "../../textproc/libxml++/buildlink3.mk" .include "../../www/curl/buildlink3.mk" diff --git a/games/wormux/PLIST b/games/wormux/PLIST index 83065c73667..72942011a59 100644 --- a/games/wormux/PLIST +++ b/games/wormux/PLIST @@ -1,6 +1,8 @@ -@comment $NetBSD: PLIST,v 1.10 2010/03/14 14:00:35 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2010/07/26 10:01:45 adam Exp $ bin/wormux +bin/wormux-index-server bin/wormux-list-games +bin/wormux-server man/man6/wormux.6 share/applications/wormux.desktop share/locale/bg/LC_MESSAGES/wormux.mo @@ -807,17 +809,12 @@ share/wormux/font/DejaVuSans.ttf share/wormux/font/VL-Gothic-Regular.ttf share/wormux/font/wqy-microhei-lite.ttc share/wormux/game_mode/blitz.xml -share/wormux/game_mode/blitz.xml.~1~ share/wormux/game_mode/classic.xml -share/wormux/game_mode/classic.xml.~1~ -share/wormux/game_mode/classic.xml.~2~ share/wormux/game_mode/default_objects.xml share/wormux/game_mode/game_mode.dtd share/wormux/game_mode/objects.dtd share/wormux/game_mode/skin_viewer.xml -share/wormux/game_mode/skin_viewer.xml.~1~ share/wormux/game_mode/unlimited.xml -share/wormux/game_mode/unlimited.xml.~1~ share/wormux/graphism.dtd share/wormux/graphism.xml share/wormux/interface/not_skin/background_interface.png @@ -970,7 +967,6 @@ share/wormux/map/hell/hellsky.jpg share/wormux/map/hell/preview.jpg share/wormux/map/hive/bg.jpg share/wormux/map/hive/config.xml -share/wormux/map/hive/config.xml.~1~ share/wormux/map/hive/fg.png share/wormux/map/hive/part_effect_strip.png share/wormux/map/hive/preview.jpg @@ -1022,13 +1018,11 @@ share/wormux/map/paint/map.png share/wormux/map/paint/preview.jpg share/wormux/map/paint/sky.png share/wormux/map/paradis/config.xml -share/wormux/map/paradis/config.xml.~1~ share/wormux/map/paradis/decor_paradis.png share/wormux/map/paradis/decor_paradis_bg.jpg share/wormux/map/paradis/paradis_preview.jpg share/wormux/map/pillars/bg.jpg share/wormux/map/pillars/config.xml -share/wormux/map/pillars/config.xml.~1~ share/wormux/map/pillars/fg.png share/wormux/map/pillars/preview.jpg share/wormux/map/pirates/config.xml @@ -1050,12 +1044,10 @@ share/wormux/map/qingqong/qingqong.png share/wormux/map/qingqong/sky.jpg share/wormux/map/random_map.jpg share/wormux/map/randomamoebas/config.xml -share/wormux/map/randomamoebas/config.xml.~1~ share/wormux/map/randomamoebas/preview.jpg share/wormux/map/randomamoebas/sky.jpg share/wormux/map/randomamoebas/texture.png share/wormux/map/randomisland/config.xml -share/wormux/map/randomisland/config.xml.~1~ share/wormux/map/randomisland/palm-tree.png share/wormux/map/randomisland/preview.jpg share/wormux/map/randomisland/sky.jpg @@ -1073,7 +1065,6 @@ share/wormux/map/space2/preview.jpg share/wormux/map/space2/sky.jpg share/wormux/map/tic-tac-toe/bg.jpg share/wormux/map/tic-tac-toe/config.xml -share/wormux/map/tic-tac-toe/config.xml.~1~ share/wormux/map/tic-tac-toe/fg.png share/wormux/map/tic-tac-toe/part_effect_strip.png share/wormux/map/tic-tac-toe/preview.jpg diff --git a/games/wormux/distinfo b/games/wormux/distinfo index 4e2506cb94c..01a52fb316c 100644 --- a/games/wormux/distinfo +++ b/games/wormux/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.9 2010/03/14 14:00:35 adam Exp $ +$NetBSD: distinfo,v 1.10 2010/07/26 10:01:45 adam Exp $ -SHA1 (wormux-0.9.1.tar.bz2) = 75f4327c2752813c47364a87a6e526919103ed7d -RMD160 (wormux-0.9.1.tar.bz2) = ef16e1c7c12ff2085f7d89bda96be9c0817fba7c -Size (wormux-0.9.1.tar.bz2) = 99479410 bytes +SHA1 (wormux-0.9.2.1.tar.bz2) = 9fc39f61f2c1eb4ddd1d7ad5238e3728b9604e45 +RMD160 (wormux-0.9.2.1.tar.bz2) = 23b678092693c471dbc692471f5f7f56970e2175 +Size (wormux-0.9.2.1.tar.bz2) = 99679696 bytes +SHA1 (patch-aa) = fcd6d01a9ff6f1c73e9ab66413fe372d4806b57f diff --git a/games/wormux/patches/patch-aa b/games/wormux/patches/patch-aa new file mode 100644 index 00000000000..6128781e013 --- /dev/null +++ b/games/wormux/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.4 2010/07/26 10:01:45 adam Exp $ + +--- lib/fixedpoint/fixed_class.h.orig 2010-07-25 16:18:30.000000000 +0000 ++++ lib/fixedpoint/fixed_class.h +@@ -64,7 +64,7 @@ struct fixed_point { + /*explicit*/ fixed_point(float f) : intValue(float2fix

(f)) {} + /*explicit*/ fixed_point(double f) : intValue(float2fix

((float)f)) {} + #if __WORDSIZE != 64 +- /*explicit*/ fixed_point(long int l) : intValue(((int64_t)l) << p) {} ++ /*explicit*/ fixed_point(unsigned long l) : intValue(((int64_t)l) << p) {} + #endif + /*explicit*/ fixed_point(unsigned int l) : intValue(((int64_t)l) << p) {} + #ifdef SIZE_T_FIXEDPOINT_METHODS -- cgit v1.2.3