ports/79177: games/alephone update [PATCH]
Evan Dower
evantd at yahoo.com
Wed Mar 23 23:50:04 UTC 2005
>Number: 79177
>Category: ports
>Synopsis: games/alephone update [PATCH]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 23 23:50:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Evan Dower
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD 5.3-STABLE #0: Tue Jan 18 14:47:53 PST 2005
evantd at innosense.washington.edu:/usr/obj/usr/src/sys/CUSTOM
>Description:
The games/alephone port is at version 0.12 which is several years old. There have been a number of updates since then. This patch will bring us up to the latest version 20050118.
>How-To-Repeat:
>Fix:
--- alephone.patch begins here ---
diff -Nurd alephone.orig/Makefile alephone/Makefile
--- alephone.orig/Makefile Mon Sep 20 12:43:12 2004
+++ alephone/Makefile Wed Mar 23 14:30:16 2005
@@ -6,8 +6,7 @@
#
PORTNAME= alephone
-PORTVERSION= 0.12.0
-PORTREVISION= 2
+PORTVERSION= 20050118
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= marathon
@@ -16,16 +15,12 @@
MAINTAINER= malyn at strangeGizmo.com
COMMENT= The open source version of Bungie's Marathon game
-USE_SDL= image net sdl
-USE_PERL5_BUILD=yes
+USE_SDL= image net sdl sound
+USE_GL= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}"
-
-post-patch:
- @${PERL} -pi -e 's,^#include \"network_modem.h\".*,,' \
- ${WRKSRC}/Source_Files/Network/network.cpp \
- ${WRKSRC}/Source_Files/Network/network_stream.cpp \
+CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" CFLAGS="${CFLAGS} -I/usr/X11R6/include" CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include" LDFLAGS="${LDFLAGS} -L/usr/X11R6/lib"
+CONFIGURE_ARGS+= --program-transform-name=""
post-install:
.if !defined(NOPORTDOCS)
diff -Nurd alephone.orig/distinfo alephone/distinfo
--- alephone.orig/distinfo Tue Mar 30 19:07:50 2004
+++ alephone/distinfo Wed Mar 23 10:21:11 2005
@@ -1,2 +1,2 @@
-MD5 (AlephOne-0.12.0.tar.gz) = 7a44d2ed10699012836320584b9920ba
-SIZE (AlephOne-0.12.0.tar.gz) = 938589
+MD5 (AlephOne-20050118.tar.gz) = c30c96b7b24c7b44f39c1a83534e1446
+SIZE (AlephOne-20050118.tar.gz) = 1335814
diff -Nurd alephone.orig/files/patch-Source_Files::Misc::sdl_widgets.h alephone/files/patch-Source_Files::Misc::sdl_widgets.h
--- alephone.orig/files/patch-Source_Files::Misc::sdl_widgets.h Mon Sep 20 12:43:12 2004
+++ alephone/files/patch-Source_Files::Misc::sdl_widgets.h Wed Dec 31 16:00:00 1969
@@ -1,20 +0,0 @@
---- Source_Files/Misc/sdl_widgets.h.orig Mon Jul 16 21:37:51 2001
-+++ Source_Files/Misc/sdl_widgets.h Mon Sep 20 20:46:48 2004
-@@ -402,7 +402,7 @@
- protected:
- void draw_items(SDL_Surface *s) const
- {
-- vector<T>::const_iterator i = items.begin() + top_item;
-+ typename vector<T>::const_iterator i = items.begin() + top_item;
- int x = rect.x + get_dialog_space(LIST_L_SPACE);
- int y = rect.y + get_dialog_space(LIST_T_SPACE);
- int width = rect.w - get_dialog_space(LIST_L_SPACE) - get_dialog_space(LIST_R_SPACE);
-@@ -413,7 +413,7 @@
- const vector<T> &items; // List of items
-
- private:
-- virtual void draw_item(vector<T>::const_iterator i, SDL_Surface *s, int x, int y, int width, bool selected) const = 0;
-+ virtual void draw_item(typename vector<T>::const_iterator i, SDL_Surface *s, int x, int y, int width, bool selected) const = 0;
- };
-
- #endif
diff -Nurd alephone.orig/files/patch-Source_Files::Misc::thread_priority_sdl_posix.cpp alephone/files/patch-Source_Files::Misc::thread_priority_sdl_posix.cpp
--- alephone.orig/files/patch-Source_Files::Misc::thread_priority_sdl_posix.cpp Wed Dec 31 16:00:00 1969
+++ alephone/files/patch-Source_Files::Misc::thread_priority_sdl_posix.cpp Wed Mar 23 10:44:18 2005
@@ -0,0 +1,11 @@
+--- Source_Files/Misc/thread_priority_sdl_posix.cpp.orig Wed Mar 23 10:41:58 2005
++++ Source_Files/Misc/thread_priority_sdl_posix.cpp Wed Mar 23 10:42:10 2005
+@@ -12,7 +12,7 @@
+ #if defined(TARGET_API_MAC_CARBON) && __MACH__
+ #include <SDL/SDL_Thread.h>
+ #else
+-#include <SDL/SDL_thread.h>
++#include <SDL_thread.h>
+ #endif
+
+ #include <pthread.h>
diff -Nurd alephone.orig/files/patch-aa alephone/files/patch-aa
--- alephone.orig/files/patch-aa Thu Feb 7 13:23:02 2002
+++ alephone/files/patch-aa Wed Dec 31 16:00:00 1969
@@ -1,10 +0,0 @@
---- 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 -Nurd alephone.orig/files/patch-ab alephone/files/patch-ab
--- alephone.orig/files/patch-ab Thu Feb 7 13:23:02 2002
+++ alephone/files/patch-ab Wed Dec 31 16:00:00 1969
@@ -1,10 +0,0 @@
---- 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 -Nurd alephone.orig/files/patch-ac alephone/files/patch-ac
--- alephone.orig/files/patch-ac Thu Dec 4 06:41:46 2003
+++ alephone/files/patch-ac Wed Dec 31 16:00:00 1969
@@ -1,32 +0,0 @@
---- Source_Files/Misc/FileHandler.h.orig Fri Aug 8 15:00:21 2003
-+++ Source_Files/Misc/FileHandler.h Fri Aug 8 15:01:07 2003
-@@ -46,6 +46,7 @@
- #endif
- #endif
-
-+using namespace std;
-
- // Symbolic constant for a closed file's reference number (refnum) (MacOS only)
- const short RefNum_Closed = -1;
---- Source_Files/Misc/resource_manager.h.orig Fri Aug 8 15:00:22 2003
-+++ Source_Files/Misc/resource_manager.h Fri Aug 8 15:04:02 2003
-@@ -10,6 +10,8 @@
- #include <stdio.h>
- #include <vector>
-
-+using namespace std;
-+
- class FileSpecifier;
- class LoadedResource;
-
---- Source_Files/Misc/sdl_dialogs.h.orig Fri Aug 8 15:00:22 2003
-+++ Source_Files/Misc/sdl_dialogs.h Fri Aug 8 15:01:43 2003
-@@ -9,6 +9,8 @@
-
- #include <vector>
-
-+using namespace std;
-+
- class widget;
- struct SDL_Surface;
- class sdl_font_info;
diff -Nurd alephone.orig/pkg-descr alephone/pkg-descr
--- alephone.orig/pkg-descr Thu Mar 1 10:01:25 2001
+++ alephone/pkg-descr Wed Mar 23 10:23:34 2005
@@ -16,7 +16,7 @@
do not have a graphics card with the appropriate functionality (you need
to use the -g/--nogl option).
-WWW: http://www.uni-mainz.de/~bauec002/A1Main.html
+WWW: http://source.bungie.org/
Michael Alyn Miller
malyn at strangeGizmo.com
diff -Nurd alephone.orig/pkg-message alephone/pkg-message
--- alephone.orig/pkg-message Thu Feb 7 13:23:00 2002
+++ alephone/pkg-message Wed Mar 23 10:14:03 2005
@@ -3,15 +3,20 @@
This package does not include any Aleph One data files. There are a few
ways of getting a fully-playable version of Aleph One:
- * Install the `alephone-data' port. This port includes the demo files
+ * Install the `alephone-data' port. This port includes the data files
from Marathon Infinity.
- * Buy a copy of Marathon 2 or Marathon Infinity and convert those data
+ * Get a copy of Marathon 2 or Marathon Infinity and convert those data
files into the appropriate AlephOne format (http://source.bungie.org
- has more information).
+ has more information). You can get any of the Marathon series (and
+ AlephOne conversions of Marathon 2 and Marathon Infinity) from
+ http://trilogyrelease.bungie.org/.
* Go to http://archives.bungie.org and download one or more of the SDL
scenarios.
+
+ * The games/marathon2-data port contains the AlephOne versions of the
+ "Marathon 2: Durandal" data files.
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.
--- alephone.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list