diff options
Diffstat (limited to 'games/urban')
-rw-r--r-- | games/urban/Makefile | 8 | ||||
-rw-r--r-- | games/urban/distinfo | 14 | ||||
-rw-r--r-- | games/urban/patches/patch-ad | 31 | ||||
-rw-r--r-- | games/urban/patches/patch-af | 13 | ||||
-rw-r--r-- | games/urban/patches/patch-ah | 32 | ||||
-rw-r--r-- | games/urban/patches/patch-ai | 16 |
6 files changed, 13 insertions, 101 deletions
diff --git a/games/urban/Makefile b/games/urban/Makefile index 76a6f992721..ca23e45e7ac 100644 --- a/games/urban/Makefile +++ b/games/urban/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2005/03/25 02:56:42 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/03/25 03:10:23 wiz Exp $ # -DISTNAME= ${DISTFILES} -PKGNAME= urban-1.5.2 -PKGREVISION= 2 +DISTNAME= urban-1.5.3 CATEGORIES= games MASTER_SITES= http://urban.bengburken.net/files/linux/ -DISTFILES= urban-1.5.2${EXTRACT_SUFX} sound${EXTRACT_SUFX} +DISTFILES= urban-1.5.3${EXTRACT_SUFX} sound${EXTRACT_SUFX} MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://urban.bengburken.net/eng/ diff --git a/games/urban/distinfo b/games/urban/distinfo index 3d1af040a24..f9f179aaabf 100644 --- a/games/urban/distinfo +++ b/games/urban/distinfo @@ -1,17 +1,15 @@ -$NetBSD: distinfo,v 1.5 2005/03/25 02:56:42 wiz Exp $ +$NetBSD: distinfo,v 1.6 2005/03/25 03:10:23 wiz Exp $ -SHA1 (urban-1.5.2.tar.gz) = 3f388da8053a26cd34749aa6989cebd528925c2c -RMD160 (urban-1.5.2.tar.gz) = f63be0cb0f09e84b31587d1d5cdc9a603521941f -Size (urban-1.5.2.tar.gz) = 809513 bytes +SHA1 (urban-1.5.3.tar.gz) = 3450988a83fa969df0148e4cdce179c033fa0868 +RMD160 (urban-1.5.3.tar.gz) = 55c3aab336f16936139601f50dda4854470f38fb +Size (urban-1.5.3.tar.gz) = 808662 bytes SHA1 (sound.tar.gz) = 828f93e1ac6ee43cb82fcd6290a62ba94d7ba18b RMD160 (sound.tar.gz) = 250815b664b9e3f8415c9850eeb00dce09e3006f Size (sound.tar.gz) = 8116030 bytes SHA1 (patch-aa) = eed2cef240eaf0bee47208918e27b65b6cd897f4 SHA1 (patch-ab) = 52f943c7740e05de2f57a6e874d30cf11d5ac5f5 SHA1 (patch-ac) = 6c6d978ef899fbed49d598c4fde8e65d9ec4d8d9 -SHA1 (patch-ad) = 89ee84c98e7ee7569d8f44a2add8910fd1959576 +SHA1 (patch-ad) = 6b877d79f6f5d2c26f8072979a5d0285f1448ff5 SHA1 (patch-ae) = 637883461b08a002fc75bb49ae18298f1d35bd79 -SHA1 (patch-af) = ab8750fc07a10b330ca2d84fadf26052fef97d3b +SHA1 (patch-af) = c1aad1d42792113e56e60a6a2a572d33aad1000b SHA1 (patch-ag) = 181df221bf1f8ba7ee649315257d47e832b19b1a -SHA1 (patch-ah) = ec3485072f40825331785b9317237d1e132ec4f0 -SHA1 (patch-ai) = 2fc9b706d11d854ee1415460778e1d32b625d727 diff --git a/games/urban/patches/patch-ad b/games/urban/patches/patch-ad index 790e27619d1..21cda11e382 100644 --- a/games/urban/patches/patch-ad +++ b/games/urban/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.2 2005/03/25 02:56:42 wiz Exp $ +$NetBSD: patch-ad,v 1.3 2005/03/25 03:10:23 wiz Exp $ ---- src/gfx/ggidrv.cc.orig 1999-07-02 11:20:29.000000000 +0200 +--- src/gfx/ggidrv.cc.orig 2000-01-22 22:39:14.000000000 +0100 +++ src/gfx/ggidrv.cc @@ -32,6 +32,7 @@ #include <string.h> @@ -10,30 +10,3 @@ $NetBSD: patch-ad,v 1.2 2005/03/25 02:56:42 wiz Exp $ #include <ggi/ggi.h> #include <allegro.h> /**************************************************************************/ -@@ -383,7 +384,7 @@ int set_gfx_mode(int mode, int w, int h, - } - /**************************************************************************/ - int set_palette(PALETTE p) { -- struct ggi_color pal[256]; -+ ggi_color pal[256]; - int i; - - for(i=0;i<256;i++) { -@@ -398,7 +399,7 @@ int set_palette(PALETTE p) { - }; - /**************************************************************************/ - void get_palette(PALETTE p) { -- struct ggi_color pal[256]; -+ ggi_color pal[256]; - int i; - - ggiGetPalette(screen->vis, 0, 1 << 8, pal); -@@ -715,7 +716,7 @@ void remove_int(void (*proc)()) { - } - /**************************************************************************/ - int set_color(int i, RGB *rgb) { -- struct ggi_color Color; -+ ggi_color Color; - - Color.r = rgb->r << 10; - Color.g = rgb->g << 10; diff --git a/games/urban/patches/patch-af b/games/urban/patches/patch-af index 0781e81ec96..bc0824b907e 100644 --- a/games/urban/patches/patch-af +++ b/games/urban/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.2 2005/03/25 02:56:42 wiz Exp $ +$NetBSD: patch-af,v 1.3 2005/03/25 03:10:23 wiz Exp $ ---- src/sound/sound.cc.orig 1999-06-07 18:27:29.000000000 +0200 +--- src/sound/sound.cc.orig 2000-01-22 22:46:37.000000000 +0100 +++ src/sound/sound.cc @@ -36,6 +36,7 @@ #include <pthread.h> @@ -10,12 +10,3 @@ $NetBSD: patch-af,v 1.2 2005/03/25 02:56:42 wiz Exp $ #include "sound.h" #include "config.h" #include "scache.h" -@@ -90,7 +91,7 @@ Sound::Sound() { - md_mode = DMODE_SOFT_SNDFX | DMODE_SOFT_MUSIC | DMODE_16BITS; - md_mixfreq = 22050; - -- if(MikMod_Init()) { -+ if(MikMod_Init(NULL)) { - fprintf(stderr,"Could not initialize sound, reason: %s\n", - MikMod_strerror(MikMod_errno)); - diff --git a/games/urban/patches/patch-ah b/games/urban/patches/patch-ah deleted file mode 100644 index 36ab66e8ae2..00000000000 --- a/games/urban/patches/patch-ah +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2005/03/14 14:48:20 rillig Exp $ - -g++-2.95.3 does not allow class members that have the same name as the -class. - ---- src/highscor/highscor.cc.orig Sun Jun 6 21:58:28 1999 -+++ src/highscor/highscor.cc Sat Mar 12 11:20:50 2005 -@@ -75,7 +75,7 @@ HighScore::HighScore() { - - if(highscore[i].Level) - sprintf(buffer, " %-10s%6d %1d:%1d", highscore[i].Name, -- highscore[i].Score, ((highscore[i].Level-1) / 3) + 1, ((highscore[i].Level-1) % 3) + 1); -+ highscore[i].S_Score, ((highscore[i].Level-1) / 3) + 1, ((highscore[i].Level-1) % 3) + 1); - else - sprintf(buffer, " %-10s%6d 0:0", "Empty", 0); - -@@ -166,13 +166,13 @@ HighScore::HighScore(int score, int leve - - for(int i = 0; i < NUM_HIGHSCORES; i++) { - -- if(score > highscore[i].Score) { -+ if(score > highscore[i].S_Score) { - - memmove(&highscore[i + 1], &highscore[i], - sizeof(Score) * (NUM_HIGHSCORES - i - 1)); - - strcpy(highscore[i].Name, GetName()); -- highscore[i].Score = score; -+ highscore[i].S_Score = score; - highscore[i].Level = level; - break; - } diff --git a/games/urban/patches/patch-ai b/games/urban/patches/patch-ai deleted file mode 100644 index 0bd5d099c50..00000000000 --- a/games/urban/patches/patch-ai +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2005/03/14 14:48:20 rillig Exp $ - -g++-2.95.3 does not allow class members that have the same name as the -class. - ---- src/include/highscor.h.orig Sun Jun 6 15:38:15 1999 -+++ src/include/highscor.h Sat Mar 12 11:14:51 2005 -@@ -6,7 +6,7 @@ - /***************************************************************************/ - struct Score { - char Name[64]; -- int Score; -+ int S_Score; - int Level; - }; - /***************************************************************************/ |