Attachment 164740 Details for Bug 190106 – 20150620 patch

[patch] 20150620 patch

alephone.patch (text/plain), 9.13 KB, created by Dmitry Marakasov on 2015-12-27 23:43:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-12-27 23:43:29 UTC

Size: 9.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 404529)
>+++ Makefile	(working copy)
>@@ -2,49 +2,51 @@
> # $FreeBSD$
> 
> PORTNAME=	alephone
>-PORTVERSION=	20120514
>-PORTREVISION=	7
>+PORTVERSION=	20150620
> CATEGORIES=	games
>-MASTER_SITES=	SF/marathon/Aleph%20One/2012-05-14
>+MASTER_SITES=	SF/marathon/Aleph%20One/2015-06-20
> DISTNAME=	AlephOne-${PORTVERSION}
> 
> MAINTAINER=	fiziologus@gmail.com
> COMMENT=	The open source version of Bungie's Marathon game
> 
>-BUILD_DEPENDS+=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
>+BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
> 
>-USES=		gmake pkgconfig tar:bzip2
>-USE_SDL=	image net sdl sound
>+USES=		gmake localbase pkgconfig tar:bzip2
>+USE_SDL=	image net sdl ttf
> USE_GL=		yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=--disable-alsa --disable-sndfile
>+CONFIGURE_ARGS=	--disable-alsa
> 
>+PORTDOCS=	*
>+
> DATADIR=	${PREFIX}/share/AlephOne
> 
>-OPTIONS_DEFINE=	MAD OGG SPEEX SMPEG TTF ZZIP DOCS
>+OPTIONS_DEFINE=	MAD FFMPEG OGG SPEEX SMPEG ZZIP PNG CURL SNDFILE DOCS
>+OPTIONS_DEFAULT=MAD FFMPEG OGG SPEEX SMPEG ZZIP PNG CURL SNDFILE
>+
>+FFMPEG_DESC=	Use ffmpeg for film export and playback
> SMPEG_DESC=	Use SMPEG for movie playback
>-TTF_DESC=	Enable SDL_ttf font rendering
> ZZIP_DESC=	Enable zziplib support
> 
>-OPTIONS_DEFAULT=	MAD OGG SPEEX SMPEG TTF ZZIP
>-
> MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
>-MAD_CONFIGURE_ENABLE=	mad
>-
>+MAD_CONFIGURE_WITH=	mad
>+FMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
>+FMPEG_CONFIGURE_WITH=	ffmpeg
> OGG_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
>-OGG_CONFIGURE_ENABLE=	vorbis
>-
>+OGG_CONFIGURE_WITH=	vorbis
> SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
>-SPEEX_CONFIGURE_ENABLE=	speex
>-
>+SPEEX_CONFIGURE_WITH=	speex
> SMPEG_LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
>-SMPEG_CONFIGURE_ENABLE=	smpeg
>-
>-TTF_USE=	SDL=ttf
>-TTF_CONFIGURE_ENABLE=	ttf
>-
>+SMPEG_CONFIGURE_WITH=	smpeg
> ZZIP_LIB_DEPENDS=	libzzip.so:${PORTSDIR}/devel/zziplib
>-ZZIP_CONFIGURE_ENABLE=	zzip
>+ZZIP_CONFIGURE_WITH=	zzip
>+PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
>+PNG_CONFIGURE_WITH=	png
>+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
>+CURL_CONFIGURE_WITH=	curl
>+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
>+SNDFILE_CONFIGURE_WITH=	sndfile
> 
> post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 404529)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (AlephOne-20120514.tar.bz2) = 6a7797af74cf3fae7f5505e64ffe57c56f7331521cb569bcc8b7d7041cb3718b
>-SIZE (AlephOne-20120514.tar.bz2) = 4716348
>+SHA256 (AlephOne-20150620.tar.bz2) = c0f360dfb74a6264f95d375103a74000930cf0439ffb0464f915f5379443e133
>+SIZE (AlephOne-20150620.tar.bz2) = 5031898
>Index: files/patch-Source_Files-Lua-lua_templates.h
>===================================================================
>--- files/patch-Source_Files-Lua-lua_templates.h	(revision 404529)
>+++ files/patch-Source_Files-Lua-lua_templates.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- Source_Files/Lua/lua_templates.h.orig	2012-04-21 17:57:45.000000000 +0400
>-+++ Source_Files/Lua/lua_templates.h	2012-04-21 17:58:22.000000000 +0400
>-@@ -496,7 +496,7 @@
>- 	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))
>
>Property changes on: files/patch-Source_Files-Lua-lua_templates.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 404529)
>+++ pkg-message	(working copy)
>@@ -4,18 +4,9 @@
> 
> 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:
>+contains more (unofficial) scenarios. In addition, you can search for game
>+stuff here:
> 
>-* http://archives.bungie.org/
>+* http://www.simplici7y.com/
> 
>-* http://fileball.net/marathon/
>-
>-* http://orbitalarm.bungie.org/downloads/alephone.html
>-
>-* 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.
>-
> ==============================================================================
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 404529)
>+++ pkg-plist	(working copy)
>@@ -1,52 +1,47 @@
> bin/alephone
> man/man6/alephone.6.gz
>-%%DATADIR%%/Fonts
> %%DATADIR%%/MML/Interface_Rects.mml
> %%DATADIR%%/MML/Transparent_Liquids.mml
> %%DATADIR%%/MML/Transparent_Sprites.mml
>-%%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-Bold.ttf
>-%%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-BoldBold.ttf
>-%%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-BoldOblique.ttf
>-%%DATADIR%%/Themes/Default/LICENSE-DejaVu
>-%%DATADIR%%/Themes/Default/SquarishSansCT.README
>-%%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
>-%%DATADIR%%/Themes/Default/button_l_p.bmp
>-%%DATADIR%%/Themes/Default/button_r.bmp
>-%%DATADIR%%/Themes/Default/button_r_p.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/theme2.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
>-%%DATADIR%%/Themes/Default/tiny_button_c.bmp
>-%%DATADIR%%/Themes/Default/tiny_button_l.bmp
>-%%DATADIR%%/Themes/Default/tiny_button_r.bmp
>-%%PORTDOCS%%%%DOCSDIR%%/Lua.html
>-%%PORTDOCS%%%%DOCSDIR%%/Lua_HUD.html
>-%%PORTDOCS%%%%DOCSDIR%%/MML.html
>-%%PORTDOCS%%%%DOCSDIR%%/README
>+%%DATADIR%%/Plugins/Default_Theme/DejaVuLGCSansCondensed-Bold.ttf
>+%%DATADIR%%/Plugins/Default_Theme/DejaVuLGCSansCondensed-BoldBold.ttf
>+%%DATADIR%%/Plugins/Default_Theme/DejaVuLGCSansCondensed-BoldOblique.ttf
>+%%DATADIR%%/Plugins/Default_Theme/LICENSE-DejaVu
>+%%DATADIR%%/Plugins/Default_Theme/Plugin.xml
>+%%DATADIR%%/Plugins/Default_Theme/SquarishSansCT.README
>+%%DATADIR%%/Plugins/Default_Theme/Squarish_Sans_CT_Medium.ttf
>+%%DATADIR%%/Plugins/Default_Theme/button_c.bmp
>+%%DATADIR%%/Plugins/Default_Theme/button_c_p.bmp
>+%%DATADIR%%/Plugins/Default_Theme/button_l.bmp
>+%%DATADIR%%/Plugins/Default_Theme/button_l_p.bmp
>+%%DATADIR%%/Plugins/Default_Theme/button_r.bmp
>+%%DATADIR%%/Plugins/Default_Theme/button_r_p.bmp
>+%%DATADIR%%/Plugins/Default_Theme/frame_b.bmp
>+%%DATADIR%%/Plugins/Default_Theme/frame_bl.bmp
>+%%DATADIR%%/Plugins/Default_Theme/frame_br.bmp
>+%%DATADIR%%/Plugins/Default_Theme/frame_l.bmp
>+%%DATADIR%%/Plugins/Default_Theme/frame_r.bmp
>+%%DATADIR%%/Plugins/Default_Theme/frame_t.bmp
>+%%DATADIR%%/Plugins/Default_Theme/frame_tl.bmp
>+%%DATADIR%%/Plugins/Default_Theme/frame_tr.bmp
>+%%DATADIR%%/Plugins/Default_Theme/list_b.bmp
>+%%DATADIR%%/Plugins/Default_Theme/list_bl.bmp
>+%%DATADIR%%/Plugins/Default_Theme/list_br.bmp
>+%%DATADIR%%/Plugins/Default_Theme/list_l.bmp
>+%%DATADIR%%/Plugins/Default_Theme/list_r.bmp
>+%%DATADIR%%/Plugins/Default_Theme/list_t.bmp
>+%%DATADIR%%/Plugins/Default_Theme/list_tl.bmp
>+%%DATADIR%%/Plugins/Default_Theme/list_tr.bmp
>+%%DATADIR%%/Plugins/Default_Theme/slider.bmp
>+%%DATADIR%%/Plugins/Default_Theme/slider_c.bmp
>+%%DATADIR%%/Plugins/Default_Theme/slider_l.bmp
>+%%DATADIR%%/Plugins/Default_Theme/slider_r.bmp
>+%%DATADIR%%/Plugins/Default_Theme/theme2.mml
>+%%DATADIR%%/Plugins/Default_Theme/thumb_b.bmp
>+%%DATADIR%%/Plugins/Default_Theme/thumb_bc.bmp
>+%%DATADIR%%/Plugins/Default_Theme/thumb_c.bmp
>+%%DATADIR%%/Plugins/Default_Theme/thumb_t.bmp
>+%%DATADIR%%/Plugins/Default_Theme/thumb_tc.bmp
>+%%DATADIR%%/Plugins/Default_Theme/tiny_button_c.bmp
>+%%DATADIR%%/Plugins/Default_Theme/tiny_button_l.bmp
>+%%DATADIR%%/Plugins/Default_Theme/tiny_button_r.bmp

Actions: View | Diff

Attachments on bug 190106: 142989 | 145408 | 147314 | 164740