- Update to 1.5.3

PR:		ports/75042
Submitted by:	Jean-Yves Lefort <jylefort@brutele.be> (maintainer)

6 files changed, 27 insertions, 47 deletions

diff --git a/games/urban/Makefile b/games/urban/Makefile
index d2da9c0a1fcb..a2582a39108a 100644
--- a/games/urban/Makefile
+++ b/games/urban/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=		urban
-PORTVERSION=		1.5.2
+PORTVERSION=		1.5.3
 CATEGORIES=		games
-MASTER_SITES=		http://urban.worldonline.nl/files/linux/
+MASTER_SITES=		http://urban.bengburken.net/files/linux/
 DIST_SUBDIR=		urban
 
 MAINTAINER=		jylefort@brutele.be
diff --git a/games/urban/distinfo b/games/urban/distinfo
index 0a27ae4c862f..1621504220fd 100644
--- a/games/urban/distinfo
+++ b/games/urban/distinfo
@@ -1,2 +1,2 @@
-MD5 (urban/urban-1.5.2.tar.gz) = 4d394e70866db944ffff0901d75535b0
-SIZE (urban/urban-1.5.2.tar.gz) = 809513
+MD5 (urban/urban-1.5.3.tar.gz) = dbbecc021a204e4c41fee5c876d7585d
+SIZE (urban/urban-1.5.3.tar.gz) = 808662
diff --git a/games/urban/files/patch-src::gfx::ggidrv.cc b/games/urban/files/patch-src::gfx::ggidrv.cc
index 99d59f2c005e..6ec412e012c4 100644
--- a/games/urban/files/patch-src::gfx::ggidrv.cc
+++ b/games/urban/files/patch-src::gfx::ggidrv.cc
@@ -1,29 +1,10 @@
---- src/gfx/ggidrv.cc.orig	Sun Jan 25 03:56:28 2004
-+++ src/gfx/ggidrv.cc	Sun Jan 25 03:57:34 2004
-@@ -383,7 +383,7 @@
- }
+--- src/gfx/ggidrv.cc.orig	Tue Dec 14 06:26:36 2004
++++ src/gfx/ggidrv.cc	Tue Dec 14 06:26:45 2004
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <ggi/ggi.h>
+ #include <allegro.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 +398,7 @@
- };
- /**************************************************************************/
- 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 +715,7 @@
- }
- /**************************************************************************/
- 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/files/patch-src::highscor::highscor.cc b/games/urban/files/patch-src::highscor::highscor.cc
index 1c362040ac53..e1e80f6f8d45 100644
--- a/games/urban/files/patch-src::highscor::highscor.cc
+++ b/games/urban/files/patch-src::highscor::highscor.cc
@@ -1,5 +1,5 @@
---- src/highscor/highscor.cc.orig	Sun Jan 25 03:58:07 2004
-+++ src/highscor/highscor.cc	Sun Jan 25 03:58:30 2004
+--- src/highscor/highscor.cc.orig	Tue Dec 14 06:30:56 2004
++++ src/highscor/highscor.cc	Tue Dec 14 06:31:19 2004
 @@ -75,7 +75,7 @@
  
  		if(highscore[i].Level)
@@ -17,7 +17,7 @@
 +        	if(score > highscore[i].Skore) {
  
                  	memmove(&highscore[i + 1], &highscore[i],
-                 		sizeof(Score) * (NUM_HIGHSCORES - i - 1));
+                 		sizeof(Score_t) * (NUM_HIGHSCORES - i - 1));
  
                          strcpy(highscore[i].Name, GetName());
 -                        highscore[i].Score = score;
diff --git a/games/urban/files/patch-src::sound::sound.cc b/games/urban/files/patch-src::sound::sound.cc
index fe9d1e008969..b06287da8604 100644
--- a/games/urban/files/patch-src::sound::sound.cc
+++ b/games/urban/files/patch-src::sound::sound.cc
@@ -1,11 +1,10 @@
---- src/sound/sound.cc.orig	Sun Jan 25 03:58:51 2004
-+++ src/sound/sound.cc	Sun Jan 25 04:00:00 2004
-@@ -90,7 +90,7 @@
- 	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));
- 			
+--- src/sound/sound.cc.orig	Tue Dec 14 06:29:12 2004
++++ src/sound/sound.cc	Tue Dec 14 06:29:21 2004
+@@ -28,6 +28,7 @@
+ 
+     thomas.nyberg@usa.net				jonas_b@bitsmart.com
+ *****************************************************************************/
++#include <unistd.h>
+ #include <allegro.h>
+ #ifdef DJGPP
+   #include <jgmod.h>
diff --git a/games/urban/pkg-descr b/games/urban/pkg-descr
index d2c62f0fed6d..fd527ea9b220 100644
--- a/games/urban/pkg-descr
+++ b/games/urban/pkg-descr
@@ -2,7 +2,7 @@ URBAN is a bloody, violent sidescrolling shoot-em-up in which you're a
 renegade military cyborg fighting your way out of the military base
 where you were created.
 
-WWW: http://urban.worldonline.nl/
+WWW: http://urban.bengburken.net/
 
 - Jean-Yves Lefort
 jylefort@brutele.be