5 files changed, 79 insertions, 94 deletions

diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 6eeef5f590ff..44abb20145aa 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	alephone
-PORTVERSION=	20061202
-PORTREVISION=	1
+PORTVERSION=	20061228
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	marathon
@@ -20,7 +19,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost
 LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnometarget
 USE_LUA=	5.0
@@ -30,28 +28,15 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include -I${LUA_INCDIR}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -L${LUA_LIBDIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-CXXFLAGS+=	-ftemplate-depth-30
-.endif
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|<SDL/SDL|<SDL|g' \
-		${WRKSRC}/Source_Files/Misc/thread_priority_sdl_posix.cpp
-.if ${OSVERSION} < 500035
-	@${REINPLACE_CMD} -e 's|streambuf>|streambuf\.h>|' \
-		${WRKSRC}/Source_Files/CSeries/snprintf.h
-	@${REINPLACE_CMD} -e 's|m_buffer\.clear()|m_buffer.resize(0)|g ; \
-		 s|m_displayBuffer\.clear()|m_displayBuffer.resize(0)|g' \
-		${WRKSRC}/Source_Files/Misc/Console.cpp
-.endif
+DATADIR=	${PREFIX}/share/AlephOne
 
 post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} README docs/* ${DOCSDIR}
+.endif
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/alephone/distinfo b/games/alephone/distinfo
index 701934864353..64e934784015 100644
--- a/games/alephone/distinfo
+++ b/games/alephone/distinfo
@@ -1,3 +1,3 @@
-MD5 (AlephOne-20061202.tar.bz2) = 5b39d7bba271279aecc0805a9fae6962
-SHA256 (AlephOne-20061202.tar.bz2) = cf052e6a2c7ba4fb4aee723c14acd3a89f4071158c4f0112a1cde06bf6ccdcec
-SIZE (AlephOne-20061202.tar.bz2) = 6005324
+MD5 (AlephOne-20061228.tar.bz2) = ee2107386104d151ea03317376ee1b9e
+SHA256 (AlephOne-20061228.tar.bz2) = c36aaa8a7db7b5a271ddf3e8c75103b162fd28c41dbd00a288378a8c1aab89c9
+SIZE (AlephOne-20061228.tar.bz2) = 6003628
diff --git a/games/alephone/pkg-descr b/games/alephone/pkg-descr
index 2551dd7467da..4cf14a50d1bc 100644
--- a/games/alephone/pkg-descr
+++ b/games/alephone/pkg-descr
@@ -1,19 +1,18 @@
 Aleph One is the open source version of Bungie's Marathon game.
 
-Marathon is a three-part, first-person shooter series that was published
-by Bungie Software.  The complete Marathon trilogy consists of Marathon,
-Marathon 2: Durandal, and Marathon Infinity.  The hallmark of the series
+Marathon is a three-part, first-person shooter series that was published by
+Bungie Software. The complete Marathon trilogy consists of "Marathon",
+"Marathon 2: Durandal", and "Marathon Infinity". The hallmark of the series
 is the detailed story-line that unfolds throughout the game.
 
-After Bungie released the source code to the Mac OS version of Marathon,
-the Aleph One project was created to enhance the software and port it to
-other operating systems.  The project's home page and news site is found
-at http://source.bungie.org.  As AlephOne has matured, so have the user-
-contributed scenarios, some which far surpass the original Marathon game
-scenarios themselves.
+After Bungie released the source code to the Mac OS version of Marathon, the
+Aleph One project was created to enhance the software and port it to other
+operating systems. As AlephOne has matured, so have the user-contributed
+scenarios, some which far surpass the original Marathon game scenarios
+themselves.
 
-Aleph One is OpenGL-accelerated, but performs well without OpenGL if you
-do not have a graphics card with the appropriate functionality (you need
-to use the -g/--nogl option).
+Aleph One is OpenGL-accelerated, but performs well without OpenGL if you do
+not have a graphics card with the appropriate functionality (you need to use
+the -g/--nogl option).
 
 WWW: http://source.bungie.org/
diff --git a/games/alephone/pkg-message b/games/alephone/pkg-message
index 40f43ef7a7c9..f37953235579 100644
--- a/games/alephone/pkg-message
+++ b/games/alephone/pkg-message
@@ -1,24 +1,21 @@
-************************************************************************
+==============================================================================
 
-This package does not include any Aleph One data files.  There are a few
-ways of getting a fully-playable version of Aleph One:
+Aleph One has been installed.
 
-  * Install the `alephone-data' port.  This port includes the data files
-    from Marathon Infinity.
+This package does not include any Aleph One data files. To obtain the original
+ones use the "games/alephone-data" port. The "games/alephone-scenarios" port
+contains more (unofficial) scenarios. In addition, you can search for data
+files here:
 
-  * 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). You can get any of the Marathon series (and
-    AlephOne conversions of Marathon 2 and Marathon Infinity) from
-    http://trilogyrelease.bungie.org/.
+* http://archives.bungie.org/
 
-  * Go to http://archives.bungie.org and download one or more of the SDL
-    scenarios.
+* http://fileball.net/marathon/
 
-  * The games/marathon2-data port contains the AlephOne versions of the
-    "Marathon 2: Durandal" data files.
+* http://orbitalarm.bungie.org/downloads/alephone.html
 
-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.
+* http://marathon.bungie.org/scenarionews/
 
-************************************************************************
+Aleph One works best with OpenGL. If you do not have an OpenGL card and the
+game is sluggish, try using the "-g" option to disable OpenGL.
+
+==============================================================================
diff --git a/games/alephone/pkg-plist b/games/alephone/pkg-plist
index 0bf919dbb7c6..4fd54c2ff898 100644
--- a/games/alephone/pkg-plist
+++ b/games/alephone/pkg-plist
@@ -1,39 +1,43 @@
 bin/alephone
-share/AlephOne/Fonts
-share/AlephOne/MML/Interface_Rects.mml
-share/AlephOne/MML/Transparent_Liquids.mml
-share/AlephOne/MML/Transparent_Sprites.mml
-share/AlephOne/Themes/Default/button_c.bmp
-share/AlephOne/Themes/Default/button_l.bmp
-share/AlephOne/Themes/Default/button_r.bmp
-share/AlephOne/Themes/Default/frame_b.bmp
-share/AlephOne/Themes/Default/frame_bl.bmp
-share/AlephOne/Themes/Default/frame_br.bmp
-share/AlephOne/Themes/Default/frame_l.bmp
-share/AlephOne/Themes/Default/frame_r.bmp
-share/AlephOne/Themes/Default/frame_t.bmp
-share/AlephOne/Themes/Default/frame_tl.bmp
-share/AlephOne/Themes/Default/frame_tr.bmp
-share/AlephOne/Themes/Default/list_b.bmp
-share/AlephOne/Themes/Default/list_bl.bmp
-share/AlephOne/Themes/Default/list_br.bmp
-share/AlephOne/Themes/Default/list_l.bmp
-share/AlephOne/Themes/Default/list_r.bmp
-share/AlephOne/Themes/Default/list_t.bmp
-share/AlephOne/Themes/Default/list_tl.bmp
-share/AlephOne/Themes/Default/list_tr.bmp
-share/AlephOne/Themes/Default/resources
-share/AlephOne/Themes/Default/slider.bmp
-share/AlephOne/Themes/Default/slider_c.bmp
-share/AlephOne/Themes/Default/slider_l.bmp
-share/AlephOne/Themes/Default/slider_r.bmp
-share/AlephOne/Themes/Default/theme.mml
-share/AlephOne/Themes/Default/thumb_b.bmp
-share/AlephOne/Themes/Default/thumb_bc.bmp
-share/AlephOne/Themes/Default/thumb_c.bmp
-share/AlephOne/Themes/Default/thumb_t.bmp
-share/AlephOne/Themes/Default/thumb_tc.bmp
-@dirrm share/AlephOne/Themes/Default
-@dirrm share/AlephOne/Themes
-@dirrm share/AlephOne/MML
-@dirrm share/AlephOne
+%%DATADIR%%/Fonts
+%%DATADIR%%/MML/Interface_Rects.mml
+%%DATADIR%%/MML/Transparent_Liquids.mml
+%%DATADIR%%/MML/Transparent_Sprites.mml
+%%DATADIR%%/Themes/Default/button_c.bmp
+%%DATADIR%%/Themes/Default/button_l.bmp
+%%DATADIR%%/Themes/Default/button_r.bmp
+%%DATADIR%%/Themes/Default/frame_b.bmp
+%%DATADIR%%/Themes/Default/frame_bl.bmp
+%%DATADIR%%/Themes/Default/frame_br.bmp
+%%DATADIR%%/Themes/Default/frame_l.bmp
+%%DATADIR%%/Themes/Default/frame_r.bmp
+%%DATADIR%%/Themes/Default/frame_t.bmp
+%%DATADIR%%/Themes/Default/frame_tl.bmp
+%%DATADIR%%/Themes/Default/frame_tr.bmp
+%%DATADIR%%/Themes/Default/list_b.bmp
+%%DATADIR%%/Themes/Default/list_bl.bmp
+%%DATADIR%%/Themes/Default/list_br.bmp
+%%DATADIR%%/Themes/Default/list_l.bmp
+%%DATADIR%%/Themes/Default/list_r.bmp
+%%DATADIR%%/Themes/Default/list_t.bmp
+%%DATADIR%%/Themes/Default/list_tl.bmp
+%%DATADIR%%/Themes/Default/list_tr.bmp
+%%DATADIR%%/Themes/Default/resources
+%%DATADIR%%/Themes/Default/slider.bmp
+%%DATADIR%%/Themes/Default/slider_c.bmp
+%%DATADIR%%/Themes/Default/slider_l.bmp
+%%DATADIR%%/Themes/Default/slider_r.bmp
+%%DATADIR%%/Themes/Default/theme.mml
+%%DATADIR%%/Themes/Default/thumb_b.bmp
+%%DATADIR%%/Themes/Default/thumb_bc.bmp
+%%DATADIR%%/Themes/Default/thumb_c.bmp
+%%DATADIR%%/Themes/Default/thumb_t.bmp
+%%DATADIR%%/Themes/Default/thumb_tc.bmp
+%%PORTDOCS%%%%DOCSDIR%%/Cheat_Codes
+%%PORTDOCS%%%%DOCSDIR%%/MML.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/Themes/Default
+@dirrm %%DATADIR%%/Themes
+@dirrm %%DATADIR%%/MML
+@dirrm %%DATADIR%%