Date: Mon, 13 Dec 2004 18:56:55 -0500 From: Serge Gagnon <ser_gagnon@sympatico.ca> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jylefort@brutele.be Subject: ports/75037: Patch port: games/urban fix compile Message-ID: <E1Ce03j-00086h-W4@quenix1.dyndns.org> Resent-Message-ID: <200412140000.iBE00ejn070980@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75037
>Category: ports
>Synopsis: Patch port: games/urban fix compile
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 14 00:00:40 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Serge Gagnon
>Release: FreeBSD 4.10-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix1.dyndns.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Thu Dec 2 14:23:49 EST 2004 root@quenix1.dyndns.org:/usr/obj/usr/src/sys/OCEAN i386
>Description:
Fix compile
MAINTAINER is cced
>How-To-Repeat:
>Fix:
--- patch-urban.diff begins here ---
diff -urN /usr/ports/games/urban/files/patch-src::gfx::ggidrv.cc games/urban/files/patch-src::gfx::ggidrv.cc
--- /usr/ports/games/urban/files/patch-src::gfx::ggidrv.cc Sun Jan 25 18:02:00 2004
+++ games/urban/files/patch-src::gfx::ggidrv.cc Mon Dec 13 18:45:42 2004
@@ -1,6 +1,34 @@
---- 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 Fri Jul 2 05:20:29 1999
++++ src/gfx/ggidrv.cc Mon Dec 13 18:44:15 2004
+@@ -1,7 +1,7 @@
+ /******************************************************************************
+
+ Libggi gfx driver.
+- Copyright (C) 1999 Jonas Borgstrm
++ Copyright (C) 1999 Jonas Borgstrm
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -19,8 +19,8 @@
+
+ Contact the author my mail:
+
+- Jonas Borgstrm
+- Bondevgen 6
++ Jonas Borgstrm
++ Bondevgen 6
+ 92332 Storuman
+ Sweden
+
+@@ -34,6 +34,7 @@
+ #include <stdlib.h>
+ #include <ggi/ggi.h>
+ #include <allegro.h>
++#include <unistd.h>
+ /**************************************************************************/
+ /* BITMAP *create_bitmap(int w, int h); */
+ /**************************************************************************/
+@@ -383,7 +384,7 @@
}
/**************************************************************************/
int set_palette(PALETTE p) {
@@ -9,7 +37,7 @@
int i;
for(i=0;i<256;i++) {
-@@ -398,7 +398,7 @@
+@@ -398,7 +399,7 @@
};
/**************************************************************************/
void get_palette(PALETTE p) {
@@ -18,7 +46,7 @@
int i;
ggiGetPalette(screen->vis, 0, 1 << 8, pal);
-@@ -715,7 +715,7 @@
+@@ -715,7 +716,7 @@
}
/**************************************************************************/
int set_color(int i, RGB *rgb) {
diff -urN /usr/ports/games/urban/files/patch-src::sound::sound.cc games/urban/files/patch-src::sound::sound.cc
--- /usr/ports/games/urban/files/patch-src::sound::sound.cc Sun Jan 25 18:02:00 2004
+++ games/urban/files/patch-src::sound::sound.cc Mon Dec 13 18:48:34 2004
@@ -1,6 +1,34 @@
---- 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 @@
+--- src/sound/sound.cc.orig Mon Jun 7 12:27:29 1999
++++ src/sound/sound.cc Mon Dec 13 18:48:12 2004
+@@ -1,7 +1,7 @@
+ /******************************************************************************
+
+ URBAN
+- Copyright (C) 1999 Thomas Nyberg and Jonas Borgstrm
++ Copyright (C) 1999 Thomas Nyberg and Jonas Borgstrm
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -19,8 +19,8 @@
+
+ Contact the authors:
+ Snailmail:
+- Thomas Nyberg Jonas Borgstrm
+- Brnnbergsvgen 21b Bondevgen 6
++ Thomas Nyberg Jonas Borgstrm
++ Brnnbergsvgen 21b Bondevgen 6
+ 92136 Lycksele 92332 Storuman
+ Sweden Sweden
+
+@@ -39,6 +39,7 @@
+ #include "sound.h"
+ #include "config.h"
+ #include "scache.h"
++#include <unistd.h>
+
+ extern Config *config;
+ #ifndef DJGPP
+@@ -90,7 +91,7 @@
md_mode = DMODE_SOFT_SNDFX | DMODE_SOFT_MUSIC | DMODE_16BITS;
md_mixfreq = 22050;
--- patch-urban.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Ce03j-00086h-W4>