Update to 1.0.2 (20120514) from Tim Larson in PR 47166.

Changes -- 1700 lines of changelog of various improvements to code
and documentation.

6 files changed, 12 insertions, 50 deletions

diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 7a459131b8f..c895e63e04f 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2012/10/06 11:54:30 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/12/12 10:22:37 wiz Exp $
 
-DISTNAME=	AlephOne-20100424
+DISTNAME=	AlephOne-20120514
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	6
 CATEGORIES=	games
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=marathon/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +12,7 @@ COMMENT=	Classic 2.5D FPS game engine, updated to use SDL
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		pkg-config gmake
 GNU_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	share/doc/AlephOne
diff --git a/games/alephone/PLIST b/games/alephone/PLIST
index 84ff1114027..1bab34f4d75 100644
--- a/games/alephone/PLIST
+++ b/games/alephone/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/10 06:10:02 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/12/12 10:22:37 wiz Exp $
 bin/alephone
 man/man6/alephone.6
 share/AlephOne/Fonts
@@ -6,8 +6,11 @@ share/AlephOne/MML/Interface_Rects.mml
 share/AlephOne/MML/Transparent_Liquids.mml
 share/AlephOne/MML/Transparent_Sprites.mml
 share/AlephOne/Themes/Default/DejaVuLGCSansCondensed-Bold.ttf
+share/AlephOne/Themes/Default/DejaVuLGCSansCondensed-BoldBold.ttf
 share/AlephOne/Themes/Default/DejaVuLGCSansCondensed-BoldOblique.ttf
-share/AlephOne/Themes/Default/bankgthd.ttf
+share/AlephOne/Themes/Default/LICENSE-DejaVu
+share/AlephOne/Themes/Default/SquarishSansCT.README
+share/AlephOne/Themes/Default/Squarish_Sans_CT_Medium.ttf
 share/AlephOne/Themes/Default/button_c.bmp
 share/AlephOne/Themes/Default/button_c_p.bmp
 share/AlephOne/Themes/Default/button_l.bmp
diff --git a/games/alephone/distinfo b/games/alephone/distinfo
index b974a626098..33077d5aaab 100644
--- a/games/alephone/distinfo
+++ b/games/alephone/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/07/03 18:45:14 joerg Exp $
+$NetBSD: distinfo,v 1.7 2012/12/12 10:22:37 wiz Exp $
 
-SHA1 (AlephOne-20100424.tar.bz2) = 3d3989703ccb1b5e8a6b6ab0028956f433e4f846
-RMD160 (AlephOne-20100424.tar.bz2) = cc6e0491b0aa7febd854c560c5df56c0a660c757
-Size (AlephOne-20100424.tar.bz2) = 3180896 bytes
-SHA1 (patch-Source_Files-Network-Metaserver-network_metaserver.h) = 8562a2845f7c1cb969f5d8cbd5f4432cd6c852f0
-SHA1 (patch-Source_Files-RenderOther-IMG_savepng.c) = d031268154af7720d036c4ff54766bd755582cfe
-SHA1 (patch-Source__Files_Lua_lua__templates.h) = 2c1963953f4b81c68a2916e3cc7b6c6ea5145490
+SHA1 (AlephOne-20120514.tar.bz2) = 6663237654a6fb9876254ea0f29cf264528b1da6
+RMD160 (AlephOne-20120514.tar.bz2) = eebeb14bbd43574530d67d0a48b0dde7b7db3edc
+Size (AlephOne-20120514.tar.bz2) = 4716348 bytes
diff --git a/games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h b/games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h
deleted file mode 100644
index e583fd5eac3..00000000000
--- a/games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-Source_Files-Network-Metaserver-network_metaserver.h,v 1.1 2011/09/25 20:52:41 joerg Exp $
-
---- Source_Files/Network/Metaserver/network_metaserver.h.orig	2011-09-24 20:39:50.000000000 +0000
-+++ Source_Files/Network/Metaserver/network_metaserver.h
-@@ -32,6 +32,7 @@
- #include <map>
- #include <memory> // auto_ptr
- #include <set>
-+#include <stdexcept>
- 
- #include "Logging.h"
- 
diff --git a/games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c b/games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c
deleted file mode 100644
index da5131679fe..00000000000
--- a/games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-Source_Files-RenderOther-IMG_savepng.c,v 1.1 2011/09/25 20:52:41 joerg Exp $
-
---- Source_Files/RenderOther/IMG_savepng.c.orig	2011-09-24 21:23:44.000000000 +0000
-+++ Source_Files/RenderOther/IMG_savepng.c
-@@ -29,6 +29,7 @@
- #include <SDL/SDL.h>
- #include <SDL/SDL_byteorder.h>
- #include <png.h>
-+#include <zlib.h>
- #include "IMG_savepng.h"
- 
- int IMG_SavePNG(const char *file, SDL_Surface *surf,int compression, struct IMG_PNG_text* text, int num_text){
diff --git a/games/alephone/patches/patch-Source__Files_Lua_lua__templates.h b/games/alephone/patches/patch-Source__Files_Lua_lua__templates.h
deleted file mode 100644
index 7f60e415620..00000000000
--- a/games/alephone/patches/patch-Source__Files_Lua_lua__templates.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source__Files_Lua_lua__templates.h,v 1.1 2012/07/03 18:45:14 joerg Exp $
-
---- Source_Files/Lua/lua_templates.h.orig	2012-07-03 09:27:35.000000000 +0000
-+++ Source_Files/Lua/lua_templates.h
-@@ -496,7 +496,7 @@ public:
- 	static index_t ToIndex(lua_State *L, int index) {
- 		index_t to;
- 		if(lua_isnil(L, index)) return -1;
--		else if(_lookup(L, index, to)) return to;
-+		else if(L_Enum<name, index_t>::_lookup(L, index, to)) return to;
- 		else {
- 			std::string error;
- 			if(lua_isnumber(L, index) || lua_isstring(L, index))