Hi,
Here is an update to openttd-1.2.3.
Tested on i386 and extensively on amd64.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openttd/Makefile,v
retrieving revision 1.26
diff -N -u -p Makefile
--- Makefile 21 Aug 2012 18:01:42 -0000 1.26
+++ Makefile 21 Dec 2012 03:47:26 -0000
@@ -2,11 +2,10 @@
COMMENT= open source clone of the game Transport Tycoon Deluxe
-V= 1.1.5
-DISTNAME= openttd-${V}
+V = 1.2.3
+DISTNAME = openttd-${V}
EXTRACT_SUFX= -source.tar.gz
-REVISION= 1
-GFX_V= 0.3.5
+GFX_V= 0.4.4
SFX_V= 0.2.3
MSX_V= 0.3.1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -72,6 +71,8 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${EXAMPLESDIR}
${INSTALL_DATA_DIR} ${DOCSDIR}
cd ${WRKSRC}/docs/ && umask 022 && pax -rw . ${DOCSDIR}
+ ${INSTALL_DATA_DIR} ${GAMEDIR}/data
+ ${INSTALL_DATA_DIR} ${GAMEDIR}/gm
${INSTALL_DATA} ${WRKDIR}/opengfx-${GFX_V}/*.{grf,obg} ${GAMEDIR}/data
${INSTALL_DATA} ${WRKDIR}/opensfx-${SFX_V}/*.{cat,obs} ${GAMEDIR}/data
${INSTALL_DATA} ${WRKDIR}/openmsx-${MSX_V}/*.{mid,obm} ${GAMEDIR}/gm
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/openttd/distinfo,v
retrieving revision 1.12
diff -N -u -p distinfo
--- distinfo 22 Jan 2012 21:41:49 -0000 1.12
+++ distinfo 21 Dec 2012 03:47:26 -0000
@@ -1,20 +1,8 @@
-MD5 (opengfx-0.3.5.zip) = CACE83W5Zi5cSpGizsPLcw==
-MD5 (openmsx-0.3.1.zip) = hYt51ErqbeXhXZ0UOehsww==
-MD5 (opensfx-0.2.3.zip) = bjpc+X/mnjo1HD4GFaFLBA==
-MD5 (openttd-1.1.5-source.tar.gz) = a61HUMCXguBKmHoybXmNig==
-RMD160 (opengfx-0.3.5.zip) = dx2C+5I56i0KHo/hYMrTrDwfxkY=
-RMD160 (openmsx-0.3.1.zip) = jv8kbonkT2PKSA6azvlKHaX6gdI=
-RMD160 (opensfx-0.2.3.zip) = f/fMp9oumCkx0pHXJ0OMmYrNN4c=
-RMD160 (openttd-1.1.5-source.tar.gz) = kT6/sENnmAUo9fEVhhv/ZJprDI0=
-SHA1 (opengfx-0.3.5.zip) = g7iJ3UgH95KixGpeUK67OlyWn/0=
-SHA1 (openmsx-0.3.1.zip) = 6cQgOSO7nJdKxniGvQC3CQZYuWE=
-SHA1 (opensfx-0.2.3.zip) = v7/t25H/MqWKaEiDgmNvOBJcSPQ=
-SHA1 (openttd-1.1.5-source.tar.gz) = SXGhfSVUr/jzZM/Pbg/42b8gE18=
-SHA256 (opengfx-0.3.5.zip) = U4KjI9gK0uvNmcMIZMKxrfUQoS1HuqapwIB65lNBWks=
+SHA256 (opengfx-0.4.4.zip) = 5KuUTFsuF3JrKWYHbHeoWbaB1DJa05T1F+eP/xMZ5JQ=
SHA256 (openmsx-0.3.1.zip) = kuKTronxOtZ59DGF6D+4H7jK1H/mP0rz09n5VRMEYPU=
SHA256 (opensfx-0.2.3.zip) = NXR0WsDBOLrlO1aXJZHbjXeK2fr/1R3q43pIpWPnFmI=
-SHA256 (openttd-1.1.5-source.tar.gz) =
sA100S3RI/wnHPhP1aENm6B2tNmon2VOUOULVDUiUVM=
-SIZE (opengfx-0.3.5.zip) = 3402778
+SHA256 (openttd-1.2.3-source.tar.gz) =
6/MGuxkR+WEYJDkhBV/+opbXrVqjn6INO8HyeiLYcvw=
+SIZE (opengfx-0.4.4.zip) = 3470306
SIZE (openmsx-0.3.1.zip) = 136981
SIZE (opensfx-0.2.3.zip) = 11144025
-SIZE (openttd-1.1.5-source.tar.gz) = 7938668
+SIZE (openttd-1.2.3-source.tar.gz) = 8722028
Index: patches/patch-Makefile_bundle_in
===================================================================
RCS file: /cvs/ports/games/openttd/patches/patch-Makefile_bundle_in,v
retrieving revision 1.4
diff -N -u -p patches/patch-Makefile_bundle_in
--- patches/patch-Makefile_bundle_in 13 Jan 2012 07:54:43 -0000 1.4
+++ patches/patch-Makefile_bundle_in 21 Dec 2012 03:47:26 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-Makefile_bundle_in,v 1.4 2012/01/13 07
Don't gzip(1) the manual page.
---- Makefile.bundle.in.orig Sun Dec 4 20:40:50 2011
-+++ Makefile.bundle.in Fri Jan 13 08:36:07 2012
-@@ -81,7 +81,6 @@ endif
+--- Makefile.bundle.in.orig Wed Oct 31 15:39:05 2012
++++ Makefile.bundle.in Sun Nov 18 01:08:13 2012
+@@ -73,7 +73,6 @@ endif
ifdef MAN_DIR
$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
$(Q)cp "$(ROOT_DIR)/docs/openttd.6" "$(BUNDLE_DIR)/man/"
@@ -12,7 +12,7 @@ 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/"
-@@ -224,7 +223,7 @@ endif
+@@ -213,7 +212,7 @@ endif
ifdef MAN_DIR
ifndef DO_NOT_INSTALL_MAN
$(Q)install -d "$(INSTALL_MAN_DIR)"
Index: patches/patch-src_fileio_cpp
===================================================================
RCS file: /cvs/ports/games/openttd/patches/patch-src_fileio_cpp,v
retrieving revision 1.3
diff -N -u -p patches/patch-src_fileio_cpp
--- patches/patch-src_fileio_cpp 26 Sep 2011 10:12:46 -0000 1.3
+++ patches/patch-src_fileio_cpp 21 Dec 2012 03:47:26 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_fileio_cpp,v 1.3 2011/09/26 10:12:46 sthen Exp $
---- src/fileio.cpp.orig Thu Sep 15 16:06:59 2011
-+++ src/fileio.cpp Sat Sep 17 22:50:41 2011
-@@ -26,6 +26,7 @@
+--- src/fileio.cpp.orig Wed Oct 31 15:39:00 2012
++++ src/fileio.cpp Sun Nov 18 01:08:13 2012
+@@ -27,6 +27,7 @@
#endif
#include <sys/stat.h>
#include <algorithm>
+#include <unistd.h>
- /*************************************************/
- /* FILE IO ROUTINES ******************************/
+ /** Size of the #Fio data buffer. */
+ #define FIO_BUFFER_SIZE 512
Index: patches/patch-src_music_extmidi_cpp
===================================================================
RCS file: /cvs/ports/games/openttd/patches/patch-src_music_extmidi_cpp,v
retrieving revision 1.1
diff -N -u -p patches/patch-src_music_extmidi_cpp
--- patches/patch-src_music_extmidi_cpp 19 Sep 2010 18:52:08 -0000 1.1
+++ patches/patch-src_music_extmidi_cpp 21 Dec 2012 03:47:26 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_music_extmidi_cpp,v 1.1 2010/09/19 18:52:08 jasper Exp $
---- src/music/extmidi.cpp.orig Sat Feb 20 16:10:58 2010
-+++ src/music/extmidi.cpp Tue Apr 6 06:00:41 2010
-@@ -26,7 +26,7 @@
- #include <errno.h>
+$OpenBSD$
+--- src/music/extmidi.cpp.orig Sun Nov 18 01:08:34 2012
++++ src/music/extmidi.cpp Sun Nov 18 01:08:38 2012
+@@ -27,7 +27,7 @@
#ifndef EXTERNAL_PLAYER
+ /** The default external midi player. */
-#define EXTERNAL_PLAYER "timidity"
+#define EXTERNAL_PLAYER "midiplay"
#endif
- static FMusicDriver_ExtMidi iFMusicDriver_ExtMidi;
+ /** Factory for the midi player that uses external players. */
Index: patches/patch-src_os_unix_unix_cpp
===================================================================
RCS file: patches/patch-src_os_unix_unix_cpp
diff -N -u -p patches/patch-src_os_unix_unix_cpp
--- /dev/null 20 Dec 2012 20:47:26 -0000
+++ patches/patch-src_os_unix_unix_cpp 21 Dec 2012 03:47:26 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- src/os/unix/unix.cpp.orig Sun Nov 18 01:13:52 2012
++++ src/os/unix/unix.cpp Sun Nov 18 23:04:04 2012
+@@ -38,6 +38,7 @@
+ #endif
+
+ #ifdef HAS_SYSCTL
++#include <sys/param.h>
+ #include <sys/sysctl.h>
+ #endif
+
+@@ -337,9 +338,16 @@ uint GetCPUCoreCount()
+ int ncpu = 0;
+ size_t len = sizeof(ncpu);
+
++#if defined(__OpenBSD__)
++ int mib[2];
++ mib[0] = CTL_HW;
++ mib[1] = HW_NCPU;
++ sysctl(mib, 2, &ncpu, &len, NULL, 0);
++#else
+ if (sysctlbyname("hw.availcpu", &ncpu, &len, NULL, 0) < 0) {
+ sysctlbyname("hw.ncpu", &ncpu, &len, NULL, 0);
+ }
++#endif
+
+ if (ncpu > 0) count = ncpu;
+ #elif defined(_SC_NPROCESSORS_ONLN)
Index: patches/patch-src_rail_cmd_cpp
===================================================================
RCS file: /cvs/ports/games/openttd/patches/patch-src_rail_cmd_cpp,v
retrieving revision 1.1
diff -N -u -p patches/patch-src_rail_cmd_cpp
--- patches/patch-src_rail_cmd_cpp 21 Aug 2012 18:01:42 -0000 1.1
+++ /dev/null 21 Dec 2012 03:31:02 -0000
@@ -1,47 +0,0 @@
-$OpenBSD: patch-src_rail_cmd_cpp,v 1.1 2012/08/21 18:01:42 jasper Exp $
-
-Security fixes for CVE-2012-3436, DoS (server) using ships on half tiles
-and landscaping: http://security.openttd.org/en/CVE-2012-3436:
-
-- Fix [FS#5254]: In some cases ships could be covered with land.
- http://vcs.openttd.org/svn/changeset/24439
-
-- Fix [FS#5254]: Coast and sea are not the same.
- http://vcs.openttd.org/svn/changeset/24449
-
---- src/rail_cmd.cpp.orig Tue Aug 21 19:47:32 2012
-+++ src/rail_cmd.cpp Tue Aug 21 19:58:24 2012
-@@ -2527,7 +2527,7 @@ set_ground:
- static TrackStatus GetTileTrackStatus_Track(TileIndex tile, TransportType
mode, uint sub_mode, DiagDirection side)
- {
- /* Case of half tile slope with water. */
-- if (mode == TRANSPORT_WATER && IsPlainRail(tile) &&
GetRailGroundType(tile) == RAIL_GROUND_WATER) {
-+ if (mode == TRANSPORT_WATER && IsPlainRail(tile) &&
GetRailGroundType(tile) == RAIL_GROUND_WATER &&
IsSlopeWithOneCornerRaised(GetTileSlope(tile, NULL))) {
- TrackBits tb = GetTrackBits(tile);
- switch (tb) {
- default: NOT_REACHED();
-@@ -2831,6 +2831,14 @@ static CommandCost TestAutoslopeOnRailTile(TileIndex t
- return cost;
- }
-
-+/**
-+ * Test-procedure for HasVehicleOnPos to check for a ship.
-+ */
-+static Vehicle *EnsureNoShipProc(Vehicle *v, void *data)
-+{
-+ return v->type == VEH_SHIP ? v : NULL;
-+}
-+
- static CommandCost TerraformTile_Track(TileIndex tile, DoCommandFlag flags,
uint z_new, Slope tileh_new)
- {
- uint z_old;
-@@ -2839,6 +2847,9 @@ static CommandCost TerraformTile_Track(TileIndex tile,
- TrackBits rail_bits = GetTrackBits(tile);
- /* Is there flat water on the lower halftile that must be
cleared expensively? */
- bool was_water = (GetRailGroundType(tile) == RAIL_GROUND_WATER
&& IsSlopeWithOneCornerRaised(tileh_old));
-+
-+ /* Allow clearing the water only if there is no ship */
-+ if (was_water && HasVehicleOnPos(tile, NULL,
&EnsureNoShipProc)) return_cmd_error(STR_ERROR_SHIP_IN_THE_WAY);
-
- /* First test autoslope. However if it succeeds we still have
to test the rest, because non-autoslope terraforming is cheaper. */
- CommandCost autoslope_result = TestAutoslopeOnRailTile(tile,
flags, z_old, tileh_old, z_new, tileh_new, rail_bits);
Index: patches/patch-src_table_settings_h
===================================================================
RCS file: /cvs/ports/games/openttd/patches/patch-src_table_settings_h,v
retrieving revision 1.2
diff -N -u -p patches/patch-src_table_settings_h
--- patches/patch-src_table_settings_h 2 Apr 2011 15:39:36 -0000 1.2
+++ /dev/null 21 Dec 2012 03:31:02 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_table_settings_h,v 1.2 2011/04/02 15:39:36 rpointel Exp $
---- 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),
-- SDT_BOOL(MusicFileSettings, playing, S, 0, true,
STR_NULL, NULL),
-+ SDT_BOOL(MusicFileSettings, playing, S, 0, false,
STR_NULL, NULL),
- SDT_BOOL(MusicFileSettings, shuffle, S, 0, false,
STR_NULL, NULL),
- SDT_END()
- };
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/openttd/pkg/PLIST,v
retrieving revision 1.13
diff -N -u -p pkg/PLIST
--- pkg/PLIST 15 Jun 2012 08:32:15 -0000 1.13
+++ pkg/PLIST 21 Dec 2012 03:47:26 -0000
@@ -3,7 +3,6 @@
@man man/man6/openttd.6
share/applications/openttd.desktop
share/doc/openttd/
-share/doc/openttd/32bpp.txt
share/doc/openttd/COPYING
share/doc/openttd/HOWTO_compile_lang_files.txt
share/doc/openttd/Readme_OS2.txt
@@ -50,8 +49,19 @@ 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/ai/compat_1.2.nut
+share/openttd/baseset/
+share/openttd/baseset/no_music.obm
+share/openttd/baseset/no_sound.obs
+share/openttd/baseset/openttd.grf
+share/openttd/baseset/opntitle.dat
+share/openttd/baseset/orig_dos.obg
+share/openttd/baseset/orig_dos.obs
+share/openttd/baseset/orig_dos_de.obg
+share/openttd/baseset/orig_win.obg
+share/openttd/baseset/orig_win.obm
+share/openttd/baseset/orig_win.obs
share/openttd/data/
-share/openttd/data/no_sound.obs
share/openttd/data/ogfx1_base.grf
share/openttd/data/ogfxc_arctic.grf
share/openttd/data/ogfxe_extra.grf
@@ -61,13 +71,6 @@ share/openttd/data/ogfxt_toyland.grf
share/openttd/data/opengfx.obg
share/openttd/data/opensfx.cat
share/openttd/data/opensfx.obs
-share/openttd/data/openttd.grf
-share/openttd/data/opntitle.dat
-share/openttd/data/orig_dos.obg
-share/openttd/data/orig_dos.obs
-share/openttd/data/orig_dos_de.obg
-share/openttd/data/orig_win.obg
-share/openttd/data/orig_win.obs
share/openttd/gm/
share/openttd/gm/5432gone_redfarn.mid
share/openttd/gm/be_sharp_bw_redfarn.mid
@@ -87,10 +90,8 @@ share/openttd/gm/mighty_giant_run.mid
share/openttd/gm/modern_motion.mid
share/openttd/gm/moo_redfarn.mid
share/openttd/gm/mosey_along_redfarn.mid
-share/openttd/gm/no_music.obm
share/openttd/gm/no_work_song_redfarn.mid
share/openttd/gm/openmsx.obm
-share/openttd/gm/orig_win.obm
share/openttd/gm/relax_song.mid
share/openttd/gm/run_for_your_life.mid
share/openttd/gm/say_what_redfarn.mid
@@ -115,6 +116,7 @@ share/openttd/lang/czech.lng
share/openttd/lang/danish.lng
share/openttd/lang/dutch.lng
share/openttd/lang/english.lng
+share/openttd/lang/english_AU.lng
share/openttd/lang/english_US.lng
share/openttd/lang/esperanto.lng
share/openttd/lang/estonian.lng
@@ -176,12 +178,13 @@ share/openttd/media/extra_grf/flags.nfo
share/openttd/media/extra_grf/flags.png
share/openttd/media/extra_grf/foundations.nfo
share/openttd/media/extra_grf/foundations.png
+share/openttd/media/extra_grf/mono.nfo
+share/openttd/media/extra_grf/mono.png
share/openttd/media/extra_grf/oneway.nfo
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.png
-share/openttd/media/extra_grf/overrides.nfo
share/openttd/media/extra_grf/rivers/
share/openttd/media/extra_grf/rivers/arctic.nfo
share/openttd/media/extra_grf/rivers/arctic_brown.png
@@ -205,6 +208,8 @@ share/openttd/media/extra_grf/sloped_tracks.nfo
share/openttd/media/extra_grf/sloped_tracks.png
share/openttd/media/extra_grf/tramtracks.nfo
share/openttd/media/extra_grf/tramtracks.png
+share/openttd/media/extra_grf/tunnel_portals.nfo
+share/openttd/media/extra_grf/tunnel_portals.png
share/openttd/media/openttd.128.png
share/openttd/media/openttd.16.png
share/openttd/media/openttd.256.png
@@ -215,6 +220,7 @@ share/openttd/media/openttd.48.png
share/openttd/media/openttd.64.png
share/openttd/media/openttd.64.xpm
share/openttd/media/openttd.desktop
+share/openttd/media/openttd.desktop.filter.awk
share/openttd/media/openttd.desktop.in
share/openttd/media/openttd.desktop.install
share/openttd/media/openttd.desktop.translation.awk
