Attachment 114455 Details for Bug 156114 – openttd-1.1.0.diff

[patch] openttd-1.1.0.diff

openttd-1.1.0.diff (text/plain), 4.94 KB, created by Koop Mast on 2011-04-01 16:20:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2011-04-01 16:20:10 UTC

Size: 4.94 KB

patch

obsolete

>Index: games/openttd/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/games/openttd/Makefile,v
>retrieving revision 1.33
>diff -a -u -r1.33 Makefile
>--- games/openttd/Makefile	24 Nov 2010 07:33:28 -0000	1.33
>+++ games/openttd/Makefile	1 Apr 2011 15:08:14 -0000
>@@ -6,11 +6,14 @@
> #
> 
> PORTNAME=	openttd
>-PORTVERSION=	1.0.5
>+PORTVERSION=	1.1.0
>+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
> CATEGORIES=	games
> MASTER_SITES=	http://gb.binaries.openttd.org/binaries/releases/${PORTVERSION}/ \
> 		http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${PORTVERSION}/ \
>-		#SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>+		http://cz.binaries.openttd.org/openttd/binaries/releases/${PORTVERSION}/ \
>+		http://de.binaries.openttd.org/binaries/releases/${PORTVERSION}/ \
>+		http://us.binaries.openttd.org/binaries/releases/${PORTVERSION}/
> 
> MAINTAINER=	danfe@FreeBSD.org
> COMMENT=	An open source clone of Microprose Transport Tycoon Deluxe
>@@ -22,7 +25,7 @@
> 
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}"
>-USE_BZIP2=	yes
>+USE_XZ=		yes
> USE_GMAKE=	yes
> INSTALLS_ICONS=	yes
> MAKE_JOBS_SAFE=	yes
>@@ -53,11 +56,13 @@
> DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \
> 		"Game;Simulation;StrategyGame;" ${FALSE}
> 
>-PORTDOCS=	32bpp.txt HOWTO_compile_lang_files.txt elrail.svg \
>-		elrail_tile.png elrail_track.png landscape.html \
>+PORTDOCS=	32bpp.txt HOWTO_compile_lang_files.txt admin_network.txt \
>+		elrail.svg elrail_tile.png elrail_track.png landscape.html \
> 		landscape_externals.html landscape_grid.html multiplayer.txt \
> 		obg_format.txt obm_format.txt obs_format.txt \
>-		ottd-colour-palette.gif ottd-colourtext-palette.png tileh.png
>+		ottd-colourtext-palette.png tileh.png
>+
>+.include <bsd.port.pre.mk>
> 
> pre-everything::
> .if !defined(WITH_MIDI_PLAYER)
>@@ -73,12 +78,16 @@
> post-patch:
> # Remove extra (vendor-provided) CFLAGS and LDFLAGS and make the port more
> # LOCALBASE safe
>-	@${REINPLACE_CMD} -e '1250,1252d ; s,/usr/local,${LOCALBASE},' \
>+	@${REINPLACE_CMD} -e '1355,1355d ; s,/usr/local,${LOCALBASE},' \
>+		${WRKSRC}/config.lib
>+# Use custom libzma.pc for when we use libzma from base.
>+.if ${OSVERSION} >= 900012 || (${OSVERSION} >= 800505 && ${OSVERSION} < 900000)
>+	@${REINPLACE_CMD} \
>+		-e 's|pkg-config liblzma|pkg-config ${FILESDIR}/liblzma.pc|g' \
> 		${WRKSRC}/config.lib
>-# FreeBSD has strndup(3) since 701101
>-	@${REINPLACE_CMD} -e '/__NetBSD_Version__/s,$$, || (defined(__FreeBSD_version) \&\& __FreeBSD_version > 701100),' \
>-	-e 's,def __NetBSD__, defined(__NetBSD__) || defined(__FreeBSD__),' \
>-		${WRKSRC}/src/string_func.h
>+.else
>+LIB_DEPEND+=	lzma.5:${PORTSDIR}/archivers/xz
>+.endif
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
>@@ -106,4 +115,4 @@
> 	@${CAT} ${PKGMESSAGE}
> 	@${ECHO_MSG}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: games/openttd/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/games/openttd/distinfo,v
>retrieving revision 1.22
>diff -a -u -r1.22 distinfo
>--- games/openttd/distinfo	24 Nov 2010 06:13:07 -0000	1.22
>+++ games/openttd/distinfo	1 Apr 2011 15:08:14 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (openttd-1.0.5-source.tar.bz2) = c353626b16b4b781db3c3c61f0ad651f5701e50f87439c4005b4456b63db09f8
>-SIZE (openttd-1.0.5-source.tar.bz2) = 5684796
>+SHA256 (openttd-1.1.0-source.tar.xz) = 290b482efa4229a0ef35660178787bc458fdf6bd982c95aee252cde77e500447
>+SIZE (openttd-1.1.0-source.tar.xz) = 4901356
>Index: games/openttd/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/games/openttd/pkg-plist,v
>retrieving revision 1.14
>diff -a -u -r1.14 pkg-plist
>--- games/openttd/pkg-plist	24 Nov 2010 06:13:07 -0000	1.14
>+++ games/openttd/pkg-plist	1 Apr 2011 15:08:14 -0000
>@@ -2,12 +2,12 @@
> share/pixmaps/openttd.32.xpm
> %%DATADIR%%/ai/compat_0.7.nut
> %%DATADIR%%/ai/compat_1.0.nut
>+%%DATADIR%%/ai/compat_1.1.nut
> @dirrm %%DATADIR%%/ai
> %%DATADIR%%/gm/no_music.obm
> %%DATADIR%%/gm/orig_win.obm
> @dirrm %%DATADIR%%/gm
>-%%DATADIR%%/data/openttdd.grf
>-%%DATADIR%%/data/openttdw.grf
>+%%DATADIR%%/data/openttd.grf
> %%DATADIR%%/data/opntitle.dat
> %%DATADIR%%/data/orig_dos.obg
> %%DATADIR%%/data/orig_dos.obs
>Index: games/openttd/files/liblzma.pc
>===================================================================
>RCS file: games/openttd/files/liblzma.pc
>diff -N games/openttd/files/liblzma.pc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ games/openttd/files/liblzma.pc	1 Apr 2011 15:08:14 -0000
>@@ -0,0 +1,19 @@
>+#
>+# Author: Lasse Collin
>+#
>+# This file has been put into the public domain.
>+# You can do whatever you want with this file.
>+#
>+
>+prefix=/usr
>+exec_prefix=${prefix}
>+libdir=${exec_prefix}/lib
>+includedir=${prefix}/include
>+
>+Name: liblzma
>+Description: General purpose data compression library
>+URL: http://tukaani.org/xz/
>+Version: 5.0.0
>+Cflags: -I${includedir}
>+Libs: -L${libdir} -llzma
>+Libs.private: -D_THREAD_SAFE -pthread

Actions: View | Diff

Attachments on bug 156114: 114455