ports/136665: games/d2x-xl version upgrade

[Aragon Gouveia]

>Number:         136665
>Category:       ports
>Synopsis:       games/d2x-xl version upgrade
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 11 17:20:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Aragon Gouveia
>Release:        7.1-STABLE
>Organization:
>Environment:
FreeBSD crusty.geek.sh 7.1-STABLE FreeBSD 7.1-STABLE #1: Tue Jan 27 20:30:03 SAST 2009     root at fuzz.geek.sh:/usr/obj/usr/src/sys/FUZZ  i386
>Description:
I have updated the d2x-xl port that I made a while ago from 1.13.127 to 1.14.55.  Please find attached patch.

Please note the patch deletes 4 patch files. (they're left at zero bytes after patching)

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN d2x-xl.old/Makefile d2x-xl/Makefile
--- d2x-xl.old/Makefile	2009-03-16 12:01:07.000000000 +0200
+++ d2x-xl/Makefile	2009-07-11 16:55:58.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	d2x-xl
-PORTVERSION=	1.13.127
+PORTVERSION=	1.14.55
 CATEGORIES=	games
 MASTER_SITES=	http://www.descent2.de/downloads/
 DISTFILES=	${PORTNAME}-src-${PORTVERSION}.rar
diff -urN d2x-xl.old/distinfo d2x-xl/distinfo
--- d2x-xl.old/distinfo	2009-07-11 17:43:52.000000000 +0200
+++ d2x-xl/distinfo	2009-07-11 16:54:56.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (d2x-xl-src-1.13.127.rar) = 050a60816b90e5f6e1e6b2c729d3ea22
-SHA256 (d2x-xl-src-1.13.127.rar) = a9d856c08b3617412393c80fcdf4a80dd565b2ed8dd375d5f6cedf692288d599
-SIZE (d2x-xl-src-1.13.127.rar) = 1406776
+MD5 (d2x-xl-src-1.14.55.rar) = 04aca514b5c664e21595d7d5fc32b688
+SHA256 (d2x-xl-src-1.14.55.rar) = 2c66715e93d41259648fee483f790d7e50a1a747f93b8d5ee7c36ce2e5acd76d
+SIZE (d2x-xl-src-1.14.55.rar) = 1398677 
diff -urN d2x-xl.old/files/patch-audio-digi.cpp d2x-xl/files/patch-audio-digi.cpp
--- d2x-xl.old/files/patch-audio-digi.cpp	2009-02-25 02:21:57.000000000 +0200
+++ d2x-xl/files/patch-audio-digi.cpp	1970-01-01 02:00:00.000000000 +0200
@@ -1,19 +0,0 @@
---- audio/digi.cpp.orig	2009-01-03 11:57:45.000000000 +0200
-+++ audio/digi.cpp	2009-02-25 02:04:59.000000000 +0200
-@@ -16,13 +16,9 @@
- 
- #include "digi.h"
- 
--#ifdef __macosx__
--# include <SDL/SDL.h>
--#else
--# include <SDL.h>
--# if USE_SDL_MIXER
--#  include <SDL_mixer.h>
--# endif
-+#include <SDL/SDL.h>
-+#if USE_SDL_MIXER
-+# include <SDL/SDL_mixer.h>
- #endif
- 
- #include "inferno.h"
diff -urN d2x-xl.old/files/patch-include-inferno.h d2x-xl/files/patch-include-inferno.h
--- d2x-xl.old/files/patch-include-inferno.h	2009-02-25 02:21:57.000000000 +0200
+++ d2x-xl/files/patch-include-inferno.h	1970-01-01 02:00:00.000000000 +0200
@@ -1,19 +0,0 @@
---- include/inferno.h.orig	2009-01-03 12:21:33.000000000 +0200
-+++ include/inferno.h	2009-02-25 02:06:07.000000000 +0200
-@@ -97,14 +97,8 @@
- #include "segment.h"
- #include "console.h"
- #include "vecmat.h"
--
--#ifdef __macosx__
--# include <SDL/SDL.h>
--# include <SDL/SDL_thread.h>
--#else
--# include <SDL.h>
--# include <SDL_thread.h>
--#endif
-+#include <SDL/SDL.h>
-+#include <SDL/SDL_thread.h>
- 
- /**
-  **	Constants
diff -urN d2x-xl.old/files/patch-include-pstypes.h d2x-xl/files/patch-include-pstypes.h
--- d2x-xl.old/files/patch-include-pstypes.h	1970-01-01 02:00:00.000000000 +0200
+++ d2x-xl/files/patch-include-pstypes.h	2009-07-11 17:45:07.000000000 +0200
@@ -0,0 +1,11 @@
+--- include/pstypes.h.orig	2009-07-11 17:44:34.000000000 +0200
++++ include/pstypes.h	2009-07-11 17:44:40.000000000 +0200
+@@ -28,7 +28,7 @@
+ 
+ //define unsigned types;
+ typedef unsigned char ubyte;
+-#ifndef __unix__
++#ifdef __unix__
+ typedef unsigned short ushort;
+ typedef unsigned int uint;
+ typedef unsigned long ulong;
diff -urN d2x-xl.old/files/patch-main-console.cpp d2x-xl/files/patch-main-console.cpp
--- d2x-xl.old/files/patch-main-console.cpp	2009-02-25 02:21:57.000000000 +0200
+++ d2x-xl/files/patch-main-console.cpp	1970-01-01 02:00:00.000000000 +0200
@@ -1,15 +0,0 @@
---- main/console.cpp.orig	2008-11-29 00:12:18.000000000 +0200
-+++ main/console.cpp	2009-02-25 02:08:12.000000000 +0200
-@@ -16,11 +16,7 @@
- #ifndef _WIN32
- #	include <fcntl.h>
- #endif
--#ifdef __macosx__
--# include <SDL/SDL.h>
--#else
--# include <SDL.h>
--#endif
-+#include <SDL/SDL.h>
- 
- #include "inferno.h"
- #include "u_mem.h"
diff -urN d2x-xl.old/files/patch-main-inferno.cpp d2x-xl/files/patch-main-inferno.cpp
--- d2x-xl.old/files/patch-main-inferno.cpp	2009-02-25 02:21:57.000000000 +0200
+++ d2x-xl/files/patch-main-inferno.cpp	1970-01-01 02:00:00.000000000 +0200
@@ -1,17 +0,0 @@
---- main/inferno.cpp.orig	2009-01-06 20:17:10.000000000 +0200
-+++ main/inferno.cpp	2009-02-25 02:10:33.000000000 +0200
-@@ -29,14 +29,6 @@
- #include <sys/types.h>
- #endif
- 
--#ifdef __macosx__
--#	include "SDL/SDL_main.h"
--#	include "SDL/SDL_keyboard.h"
--#	include "FolderDetector.h"
--#else
--#	include "SDL_main.h"
--#	include "SDL_keyboard.h"
--#endif
- #include "inferno.h"
- #include "u_mem.h"
- #include "strutil.h"
diff -urN d2x-xl.old/files/patch-network-autodl.cpp d2x-xl/files/patch-network-autodl.cpp
--- d2x-xl.old/files/patch-network-autodl.cpp	2009-02-25 02:21:57.000000000 +0200
+++ d2x-xl/files/patch-network-autodl.cpp	2009-07-11 17:02:51.000000000 +0200
@@ -10,6 +10,6 @@
 -# include <SDL.h>
 -#endif
 +#include <SDL/SDL.h>
- #include "inferno.h"
+ #include "descent.h"
+ #include "cfile.h"
  #include "ipx.h"
- #include "key.h"


>Release-Note:
>Audit-Trail:
>Unformatted: