- Update to 20110731 (bugfix release)

- Add build options
- Fix dependencies

PR:		ports/160728
Submitted by:	green dog <fiziologus@gmail.com> (maintainer)
Approved by:	miwi, wen (mentors implicit)

4 files changed, 53 insertions, 23 deletions

diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 4ec0f7a4f93d..aee921882402 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -6,31 +6,71 @@
 #
 
 PORTNAME=	alephone
-PORTVERSION=	20100424
-PORTREVISION=	1
+PORTVERSION=	20110731
 CATEGORIES=	games
-MASTER_SITES=	SF/marathon/Aleph%20One/2010-04-24
+MASTER_SITES=	SF/marathon/Aleph%20One/2011-07-31
 DISTNAME=	AlephOne-${PORTVERSION}
 
 MAINTAINER=	fiziologus@gmail.com
 COMMENT=	The open source version of Bungie's Marathon game
 
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs \
-		${LOCALBASE}/include/zzip/lib.h:${PORTSDIR}/devel/zziplib
-
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
 USE_BZIP2=	yes
+USE_SDL+=	image net sdl sound
 USE_GL=		yes
 USE_LUA=	5.1
-USE_SDL=	image ttf net sdl sound
+PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LUA_INCDIR}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${LUA_LIBDIR}"
+CONFIGURE_ARGS+=--disable-alsa --disable-sndfile
+CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}"
 
 DATADIR=	${PREFIX}/share/AlephOne
 
 MAN6=		alephone.6
 
+OPTIONS=	MAD "use libmad for mp3 playback" on \
+		OGG "enable ogg/vorbis music playback" on \
+		SPEEX "enable speex net mic playback" on \
+		SMPEG "use SMPEG for movie playback" on \
+		TTF "enable SDL_ttf font rendering" on \
+		ZZIP "enable zziplib support" on
+
+.if !defined(WITHOUT_MAD)
+CONFIGURE_ARGS+=--disable-mad
+.else
+LIB_DEPEND+=	mad.2:${PORTSDIR}/audio/libmad
+.endif
+
+.if !defined(WITHOUT_OGG)
+CONFIGURE_ARGS+=--disable-vorbis
+.else
+LIB_DEPEND+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
+.endif
+
+.if !defined(WITHOUT_SPEEX)
+CONFIGURE_ARGS+=--disable-speex
+.else
+LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+.endif
+
+.if !defined(WITHOUT_SMPEG)
+CONFIGURE_ARGS+=--disable-smpeg
+.else
+LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+.endif
+
+.if !defined(WITHOUT_TTF)
+CONFIGURE_ARGS+=--disable-ttf
+.else
+USE_SDL+=	ttf
+.endif
+
+.if !defined(WITHOUT_ZZIP)
+CONFIGURE_ARGS+=--disable-zzip
+.else
+LIB_DEPENDS+=	zzip.13:${PORTSDIR}/devel/zziplib
+.endif
+	
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/games/alephone/distinfo b/games/alephone/distinfo
index f2967f7552ed..fa7ff2347c3c 100644
--- a/games/alephone/distinfo
+++ b/games/alephone/distinfo
@@ -1,2 +1,2 @@
-SHA256 (AlephOne-20100424.tar.bz2) = d97089890ce99952027eaf6185baa6cb01b26c2882dfca9e68816dfe7076a5e6
-SIZE (AlephOne-20100424.tar.bz2) = 3180896
+SHA256 (AlephOne-20110731.tar.bz2) = c18ec39350e22ac58436bdb13db46a9db94e9ea68cfaf845588f3da1b21edf2b
+SIZE (AlephOne-20110731.tar.bz2) = 3046086
diff --git a/games/alephone/files/patch-Source_Files_Network_Metaserver_network_metaserver.h b/games/alephone/files/patch-Source_Files_Network_Metaserver_network_metaserver.h
deleted file mode 100644
index 8d96ea3d3130..000000000000
--- a/games/alephone/files/patch-Source_Files_Network_Metaserver_network_metaserver.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- Source_Files/Network/Metaserver/network_metaserver.h.orig	2010-12-10 15:54:11.000000000 +0300
-+++ Source_Files/Network/Metaserver/network_metaserver.h	2010-12-10 15:54:23.000000000 +0300
-@@ -32,6 +32,7 @@
- #include <map>
- #include <memory> // auto_ptr
- #include <set>
-+#include <stdexcept>
- 
- #include "Logging.h"
- 
diff --git a/games/alephone/pkg-plist b/games/alephone/pkg-plist
index 8486f21e507e..f2a863c6a46d 100644
--- a/games/alephone/pkg-plist
+++ b/games/alephone/pkg-plist
@@ -5,7 +5,7 @@ bin/alephone
 %%DATADIR%%/MML/Transparent_Sprites.mml
 %%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-Bold.ttf
 %%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-BoldOblique.ttf
-%%DATADIR%%/Themes/Default/bankgthd.ttf
+%%DATADIR%%/Themes/Default/Squarish_Sans_CT_Medium.ttf
 %%DATADIR%%/Themes/Default/button_c.bmp
 %%DATADIR%%/Themes/Default/button_c_p.bmp
 %%DATADIR%%/Themes/Default/button_l.bmp