Update to 0.12.0

PR:		34706
Submitted by:	maintainer

6 files changed, 24 insertions, 18 deletions

diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 6b62af53f612..f69eb118e886 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	alephone
-PORTVERSION=	0.11.1
-PORTREVISION=	2
+PORTVERSION=	0.12.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	marathon
diff --git a/games/alephone/distinfo b/games/alephone/distinfo
index 315be6321cf3..d1417c5c00fd 100644
--- a/games/alephone/distinfo
+++ b/games/alephone/distinfo
@@ -1 +1 @@
-MD5 (AlephOne-0.11.1.tar.gz) = 95c2a1edc0948cba088369eaa1c45018
+MD5 (AlephOne-0.12.0.tar.gz) = 7a44d2ed10699012836320584b9920ba
diff --git a/games/alephone/files/patch-Source_Files::Misc::screen_sdl.cpp b/games/alephone/files/patch-Source_Files::Misc::screen_sdl.cpp
deleted file mode 100644
index e9a9e1636ed4..000000000000
--- a/games/alephone/files/patch-Source_Files::Misc::screen_sdl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Source_Files/Misc/screen_sdl.cpp.orig	Sat Apr 28 01:48:07 2001
-+++ Source_Files/Misc/screen_sdl.cpp	Sat Apr 28 01:49:40 2001
-@@ -625,7 +625,7 @@
- 		build_sdl_color_table(color_table, colors);
- 		SDL_SetPalette(main_surface, SDL_PHYSPAL, colors, 0, 256);
- 	} else {
--#if SDL_PATCHLEVEL > 6
-+#if SDL_VERSION_ATLEAST(1,1,7)
- 		// SDL 1.1.7 defines these as 16-bit arrays...
- 		uint16 red[256], green[256], blue[256];
- 		for (int i=0; i<color_table->color_count; i++) {
diff --git a/games/alephone/files/patch-aa b/games/alephone/files/patch-aa
new file mode 100644
index 000000000000..be3cacca3600
--- /dev/null
+++ b/games/alephone/files/patch-aa
@@ -0,0 +1,10 @@
+--- Source_Files/ModelView/ModelRenderer.cpp.orig	Sun Sep  2 07:24:31 2001
++++ Source_Files/ModelView/ModelRenderer.cpp	Thu Feb  7 10:33:05 2002
+@@ -5,7 +5,6 @@
+ */
+ 
+ #include <string.h>
+-#include <alloca.h>
+ #include "cseries.h"
+ #include "ModelRenderer.h"
+ 
diff --git a/games/alephone/files/patch-ab b/games/alephone/files/patch-ab
new file mode 100644
index 000000000000..ed445293c9b1
--- /dev/null
+++ b/games/alephone/files/patch-ab
@@ -0,0 +1,10 @@
+--- tools/dumpwad.cpp.orig	Wed Jun  6 08:31:42 2001
++++ tools/dumpwad.cpp	Thu Feb  7 10:51:25 2002
+@@ -13,6 +13,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdarg.h>
+ 
+ // Dummy declarations to avoid link errors
+ void set_game_error(short a, short b) {}
diff --git a/games/alephone/pkg-message b/games/alephone/pkg-message
index b7bc5153885a..83017adfada6 100644
--- a/games/alephone/pkg-message
+++ b/games/alephone/pkg-message
@@ -10,10 +10,8 @@ ways of getting a fully-playable version of Aleph One:
     files into the appropriate AlephOne format (http://source.bungie.org
     has more information).
 
-  * Go to http://www.pfhor.net/ei and download one of the new scenarios.
-    These scenarios have already been converted to AlephOne.  Demo files
-    for Marathon 2 in the AlephOne format are also available at this web
-    site.
+  * Go to http://archives.bungie.org and download one or more of the SDL
+    scenarios.
 
 AlephOne works best with OpenGL; if you do not have an OpenGL-savvy card
 and the game is sluggish, try using the -g option to disable OpenGL.