On Fri, 1 Apr 2011 22:16:42 -0400 (EDT)
Daniel Dickman <didick...@gmail.com> wrote:
> Here's an update for openttd. Tests/comments welcome. Full changelog is
> here:
>
> http://us.binaries.openttd.org/binaries/releases/1.1.0/changelog.txt
>
Hello,
make port-lib-depends-check indicates lzma lib is missing.
So I added archivers/xz in LIB_DEPENDS and lzma in WANTLIB.
I attached my diff, if it's ok for you I will commit it.
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/openbsd/ports/games/openttd/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 22 Nov 2010 13:04:22 -0000 1.17
+++ Makefile 2 Apr 2011 10:56:43 -0000
@@ -2,10 +2,10 @@
COMMENT= open source clone of the game Transport Tycoon Deluxe
-V= 1.0.5
+V= 1.1.0
DISTNAME= openttd-${V}
-EXTRACT_SUFX= -source.tar.bz2
-GFX_V= 0.3.1
+EXTRACT_SUFX= -source.tar.gz
+GFX_V= 0.3.2
SFX_V= 0.2.3
MSX_V= 0.3.1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -24,9 +24,9 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += SDL c expat fontconfig freetype icudata icui18n icuuc
-WANTLIB += lzo2 m png pthread stdc++ z
+WANTLIB += lzma lzo2 m png pthread stdc++ z
-MASTER_SITES=
http://cz.binaries.openttd.org/openttd/binaries/releases/${V}/
+MASTER_SITES= http://binaries.openttd.org/releases/${V}/
MASTER_SITES0=
http://bundles.openttdcoop.org/opengfx/releases/${GFX_V}/
MASTER_SITES1=
http://bundles.openttdcoop.org/opensfx/releases/${SFX_V}/
MASTER_SITES2=
http://bundles.openttdcoop.org/openmsx/releases/${MSX_V}/
@@ -34,7 +34,8 @@ MASTER_SITES2= http://bundles.openttdco
LIB_DEPENDS= archivers/lzo2 \
devel/sdl \
graphics/png \
- textproc/icu4c
+ textproc/icu4c \
+ archivers/xz
RUN_DEPENDS= devel/desktop-file-utils
Index: distinfo
===================================================================
RCS file: /cvs/openbsd/ports/games/openttd/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 22 Nov 2010 13:04:22 -0000 1.8
+++ distinfo 2 Apr 2011 10:56:43 -0000
@@ -1,20 +1,20 @@
-MD5 (opengfx-0.3.1.zip) = R+uynPxDrpReqg/hdphVHQ==
+MD5 (opengfx-0.3.2.zip) = cKCc+d95OKPD8YTRj8Tw8Q==
MD5 (openmsx-0.3.1.zip) = hYt51ErqbeXhXZ0UOehsww==
MD5 (opensfx-0.2.3.zip) = bjpc+X/mnjo1HD4GFaFLBA==
-MD5 (openttd-1.0.5-source.tar.bz2) = /Hn3iOK+FAlIuXLDKw8e7A==
-RMD160 (opengfx-0.3.1.zip) = USugw5d1NOSkyje5QCM5Fo7VDko=
+MD5 (openttd-1.1.0-source.tar.gz) = 1cozV+XH+ZWqQ0FP9Nk8+w==
+RMD160 (opengfx-0.3.2.zip) = BK3dkSwiagQNhDz2XL0BH8tn9pI=
RMD160 (openmsx-0.3.1.zip) = jv8kbonkT2PKSA6azvlKHaX6gdI=
RMD160 (opensfx-0.2.3.zip) = f/fMp9oumCkx0pHXJ0OMmYrNN4c=
-RMD160 (openttd-1.0.5-source.tar.bz2) = jXI+jv623phgtiz4Nfo9sJp4SM0=
-SHA1 (opengfx-0.3.1.zip) = U3bom1zNP6imHgoYFIJCArt4n7c=
+RMD160 (openttd-1.1.0-source.tar.gz) = 8Q7Rb7PplBjzM10qvRhx2Hd9mxQ=
+SHA1 (opengfx-0.3.2.zip) = hsMiwyK8oDxtRwMqsMhNtpHmx7o=
SHA1 (openmsx-0.3.1.zip) = 6cQgOSO7nJdKxniGvQC3CQZYuWE=
SHA1 (opensfx-0.2.3.zip) = v7/t25H/MqWKaEiDgmNvOBJcSPQ=
-SHA1 (openttd-1.0.5-source.tar.bz2) = Lgz6LW5MS8EjWmDeOZYXKLtyfrg=
-SHA256 (opengfx-0.3.1.zip) = Fr6DzQ/Fm6jxqLPz6+JubA3zJcp1k5dt504HPF0e45s=
+SHA1 (openttd-1.1.0-source.tar.gz) = LVBM8NGxqFz3dViqEcXUJ0ZFOGU=
+SHA256 (opengfx-0.3.2.zip) = 6flLsHmemo2b9kUdo1NDQIbwJ/4N+3wB0gX3OUZ/r9s=
SHA256 (openmsx-0.3.1.zip) = kuKTronxOtZ59DGF6D+4H7jK1H/mP0rz09n5VRMEYPU=
SHA256 (opensfx-0.2.3.zip) = NXR0WsDBOLrlO1aXJZHbjXeK2fr/1R3q43pIpWPnFmI=
-SHA256 (openttd-1.0.5-source.tar.bz2) =
w1Niaxa0t4HbPDxh8K1lH1cB5Q+HQ5xABbRFa2PbCfg=
-SIZE (opengfx-0.3.1.zip) = 3387182
+SHA256 (openttd-1.1.0-source.tar.gz) =
9VhPtIpk/hc/NR0TmT8tlDmv5c861FdpJgTU+AHYlfg=
+SIZE (opengfx-0.3.2.zip) = 3384254
SIZE (openmsx-0.3.1.zip) = 136981
SIZE (opensfx-0.2.3.zip) = 11144025
-SIZE (openttd-1.0.5-source.tar.bz2) = 5684796
+SIZE (openttd-1.1.0-source.tar.gz) = 7575181
Index: patches/patch-Makefile_bundle_in
===================================================================
RCS file: /cvs/openbsd/ports/games/openttd/patches/patch-Makefile_bundle_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_bundle_in
--- patches/patch-Makefile_bundle_in 22 Nov 2010 13:04:22 -0000 1.2
+++ patches/patch-Makefile_bundle_in 2 Apr 2011 10:56:43 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-Makefile_bundle_in,v 1.2
Don't gzip(1) the manual page.
---- Makefile.bundle.in.orig Wed Oct 27 16:17:45 2010
-+++ Makefile.bundle.in Sun Nov 21 19:14:00 2010
-@@ -81,7 +81,6 @@ endif
+--- Makefile.bundle.in.orig Tue Oct 26 18:03:37 2010
++++ Makefile.bundle.in Mon Feb 28 21:50:53 2011
+@@ -78,7 +78,6 @@ endif
ifdef MAN_DIR
$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
$(Q)cp "$(ROOT_DIR)/docs/openttd.6" "$(BUNDLE_DIR)/man/"
@@ -12,12 +12,12 @@ Don't gzip(1) the manual page.
endif
$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
$(Q)cp "$(ROOT_DIR)/media/openttd."*.png "$(BUNDLE_DIR)/media/"
-@@ -215,7 +214,7 @@ else
- endif
+@@ -221,7 +220,7 @@ endif
ifdef MAN_DIR
+ ifndef DO_NOT_INSTALL_MAN
$(Q)install -d "$(INSTALL_MAN_DIR)"
- $(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz"
"$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
+ $(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6"
"$(INSTALL_MAN_DIR)/${BINARY_NAME}.6"
endif
+ endif
ifdef MENU_DIR
- $(Q)install -d "$(INSTALL_MENU_DIR)"
Index: patches/patch-src_fileio_cpp
===================================================================
RCS file: /cvs/openbsd/ports/games/openttd/patches/patch-src_fileio_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_fileio_cpp
--- patches/patch-src_fileio_cpp 19 Sep 2010 18:52:08 -0000 1.1
+++ patches/patch-src_fileio_cpp 2 Apr 2011 10:56:43 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_fileio_cpp,v 1.1 2010/09/19 18:52:08 jasper Exp $
---- src/fileio.cpp.orig Mon Mar 15 18:52:39 2010
-+++ src/fileio.cpp Tue Apr 6 06:00:41 2010
-@@ -29,6 +29,7 @@
+--- src/fileio.cpp.orig Thu Nov 18 17:26:29 2010
++++ src/fileio.cpp Mon Feb 28 21:50:53 2011
+@@ -28,6 +28,7 @@
#endif
#include <sys/stat.h>
#include <algorithm>
Index: patches/patch-src_table_settings_h
===================================================================
RCS file: /cvs/openbsd/ports/games/openttd/patches/patch-src_table_settings_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_table_settings_h
--- patches/patch-src_table_settings_h 19 Sep 2010 18:52:08 -0000 1.1
+++ patches/patch-src_table_settings_h 2 Apr 2011 10:56:43 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_table_settings_h,v 1.1 2010/09/19 18:52:08 jasper Exp $
---- src/table/settings.h.orig Thu Jan 28 21:47:25 2010
-+++ src/table/settings.h Thu Jan 28 21:48:00 2010
-@@ -224,7 +224,7 @@ static const SettingDesc _music_settings[] = {
+--- src/table/settings.h.orig Sun Feb 13 15:52:33 2011
++++ src/table/settings.h Mon Feb 28 21:50:53 2011
+@@ -232,7 +232,7 @@ static const SettingDesc _music_settings[] = {
SDT_VAR(MusicFileSettings, effect_vol, SLE_UINT8, S, 0, 127, 0, 127,
1, STR_NULL, NULL),
SDT_LIST(MusicFileSettings, custom_1, SLE_UINT8, S, 0, NULL,
STR_NULL, NULL),
SDT_LIST(MusicFileSettings, custom_2, SLE_UINT8, S, 0, NULL,
STR_NULL, NULL),
Index: pkg/PLIST
===================================================================
RCS file: /cvs/openbsd/ports/games/openttd/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 22 Nov 2010 13:04:22 -0000 1.8
+++ pkg/PLIST 2 Apr 2011 10:56:43 -0000
@@ -8,6 +8,7 @@ share/doc/openttd/COPYING
share/doc/openttd/HOWTO_compile_lang_files.txt
share/doc/openttd/Readme_OS2.txt
share/doc/openttd/Readme_Windows_MSVC.txt
+share/doc/openttd/admin_network.txt
share/doc/openttd/changelog.txt
share/doc/openttd/elrail.svg
share/doc/openttd/elrail_tile.png
@@ -21,7 +22,6 @@ share/doc/openttd/obg_format.txt
share/doc/openttd/obm_format.txt
share/doc/openttd/obs_format.txt
share/doc/openttd/openttd.6
-share/doc/openttd/ottd-colour-palette.gif
share/doc/openttd/ottd-colourtext-palette.png
share/doc/openttd/palettes/
share/doc/openttd/palettes/openttd.gpl
@@ -63,6 +63,7 @@ share/openttd/
share/openttd/ai/
share/openttd/ai/compat_0.7.nut
share/openttd/ai/compat_1.0.nut
+share/openttd/ai/compat_1.1.nut
share/openttd/data/
share/openttd/data/no_sound.obs
share/openttd/data/ogfx1_base.grf
@@ -74,8 +75,7 @@ share/openttd/data/ogfxt_toyland.grf
share/openttd/data/opengfx.obg
share/openttd/data/opensfx.cat
share/openttd/data/opensfx.obs
-share/openttd/data/openttdd.grf
-share/openttd/data/openttdw.grf
+share/openttd/data/openttd.grf
share/openttd/data/opntitle.dat
share/openttd/data/orig_dos.obg
share/openttd/data/orig_dos.obs
@@ -168,42 +168,43 @@ share/openttd/lang/vietnamese.lng
share/openttd/lang/welsh.lng
share/openttd/media/
share/openttd/media/extra_grf/
-share/openttd/media/extra_grf/2ccmapd.nfo
-share/openttd/media/extra_grf/2ccmapw.nfo
+share/openttd/media/extra_grf/2ccmap.nfo
+share/openttd/media/extra_grf/airport_preview.nfo
+share/openttd/media/extra_grf/airport_preview.png
share/openttd/media/extra_grf/airports.nfo
-share/openttd/media/extra_grf/airports.pcx
+share/openttd/media/extra_grf/airports.png
share/openttd/media/extra_grf/aqueduct.nfo
-share/openttd/media/extra_grf/aqueduct.pcx
+share/openttd/media/extra_grf/aqueduct.png
share/openttd/media/extra_grf/autorail.nfo
-share/openttd/media/extra_grf/autorail.pcx
+share/openttd/media/extra_grf/autorail.png
share/openttd/media/extra_grf/canals.nfo
-share/openttd/media/extra_grf/canals.pcx
+share/openttd/media/extra_grf/canals.png
share/openttd/media/extra_grf/chars.nfo
-share/openttd/media/extra_grf/chars.pcx
+share/openttd/media/extra_grf/chars.png
share/openttd/media/extra_grf/elrails.nfo
-share/openttd/media/extra_grf/elrails.pcx
+share/openttd/media/extra_grf/elrails.png
share/openttd/media/extra_grf/fix_graphics.nfo
-share/openttd/media/extra_grf/fix_graphics.pcx
+share/openttd/media/extra_grf/fix_graphics.png
share/openttd/media/extra_grf/flags.nfo
-share/openttd/media/extra_grf/flags.pcx
+share/openttd/media/extra_grf/flags.png
share/openttd/media/extra_grf/foundations.nfo
-share/openttd/media/extra_grf/foundations.pcx
+share/openttd/media/extra_grf/foundations.png
share/openttd/media/extra_grf/oneway.nfo
-share/openttd/media/extra_grf/oneway.pcx
+share/openttd/media/extra_grf/oneway.png
share/openttd/media/extra_grf/openttd.nfo
share/openttd/media/extra_grf/openttdgui.nfo
-share/openttd/media/extra_grf/openttdgui.pcx
+share/openttd/media/extra_grf/openttdgui.png
share/openttd/media/extra_grf/overrides.nfo
share/openttd/media/extra_grf/roadstops.nfo
-share/openttd/media/extra_grf/roadstops.pcx
+share/openttd/media/extra_grf/roadstops.png
share/openttd/media/extra_grf/shore.nfo
-share/openttd/media/extra_grf/shore.pcx
+share/openttd/media/extra_grf/shore.png
share/openttd/media/extra_grf/signals.nfo
-share/openttd/media/extra_grf/signals.pcx
+share/openttd/media/extra_grf/signals.png
share/openttd/media/extra_grf/sloped_tracks.nfo
-share/openttd/media/extra_grf/sloped_tracks.pcx
+share/openttd/media/extra_grf/sloped_tracks.png
share/openttd/media/extra_grf/tramtracks.nfo
-share/openttd/media/extra_grf/tramtracks.pcx
+share/openttd/media/extra_grf/tramtracks.png
share/openttd/media/openttd.128.png
share/openttd/media/openttd.16.png
share/openttd/media/openttd.256.png
