pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
simutrans: fix pthreads and fetch localized strings.
Module Name: pkgsrc-wip
Committed By: i3enedek <git%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By: i3enedek
Date: Sat Nov 5 00:40:12 2016 +0000
Changeset: c70039a411dbd0a678697a9669c15b127242d644
Modified Files:
simutrans-data/Makefile
simutrans-data/PLIST
simutrans-data/distinfo
simutrans/Makefile
simutrans/PLIST
simutrans/distinfo
simutrans/files/simutrans
simutrans/patches/patch-Makefile
simutrans/patches/patch-utils_simthread.h
Removed Files:
simutrans/patches/patch-boden_wege_weg.cc
simutrans/patches/patch-obj_crossing.cc
simutrans/patches/patch-obj_tunnel.cc
simutrans/patches/patch-obj_wayobj.cc
simutrans/patches/patch-simworld.cc
Log Message:
simutrans: fix pthreads and fetch localized strings.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c70039a411dbd0a678697a9669c15b127242d644
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
simutrans-data/Makefile | 23 +++---
simutrans-data/PLIST | 114 +++++++++++++++---------------
simutrans-data/distinfo | 16 +++--
simutrans/Makefile | 39 ++++++++--
simutrans/PLIST | 49 +++++++++++++
simutrans/distinfo | 9 +--
simutrans/files/simutrans | 3 +-
simutrans/patches/patch-Makefile | 27 +++----
simutrans/patches/patch-boden_wege_weg.cc | 13 ----
simutrans/patches/patch-obj_crossing.cc | 13 ----
simutrans/patches/patch-obj_tunnel.cc | 13 ----
simutrans/patches/patch-obj_wayobj.cc | 13 ----
simutrans/patches/patch-simworld.cc | 13 ----
simutrans/patches/patch-utils_simthread.h | 16 +++--
14 files changed, 189 insertions(+), 172 deletions(-)
diffs:
diff --git a/simutrans-data/Makefile b/simutrans-data/Makefile
index 4c4dc13..3d0ea45 100644
--- a/simutrans-data/Makefile
+++ b/simutrans-data/Makefile
@@ -1,28 +1,27 @@
# $NetBSD$
PKGNAME= simutrans-data
-DISTNAME= simupak64-120-0-1
-CATEGORIES= wip
+CATEGORIES= games
+DISTNAME= simutrans-data
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=simutrans/}
-MASTER_SITES+= -http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
-DISTFILES+= language_pack-Base+texts.zip
-EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://downloads.sourceforge.net/project/simutrans/pak64/120-0/
-COMMENT= TODO: Short description of the package
+HOMEPAGE= http://www.simutrans.com/en/paksets/
+COMMENT= Game data for Simutrans
#LICENSE= # TODO: (see mk/license.mk)
-WRKSRC= ${WRKDIR}/simutrans
NO_BUILD= yes
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+
+WRKSRC= ${WRKDIR}/simutrans
+
+#DEPENDS+= unzip-[0-9]*:../../archivers/unzip
post-extract:
- ${MV} ${WRKSRC}/pak/text ${WRKSRC}
${FIND} ${WRKDIR} -type f -exec ${CHMOD} 0644 {} \;
-do-install:
+
+do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/simtrans
${CP} -r ${WRKSRC} ${DESTDIR}${PREFIX}/share/
-
+.include "options.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/simutrans-data/PLIST b/simutrans-data/PLIST
index 2173f52..c8d85f5 100644
--- a/simutrans-data/PLIST
+++ b/simutrans-data/PLIST
@@ -469,6 +469,63 @@ share/simutrans/pak/symbol.networksym.pak
share/simutrans/pak/symbol.pausesym.pak
share/simutrans/pak/symbol.station_type.pak
share/simutrans/pak/symbol.timelinesym.pak
+share/simutrans/pak/text/be.tab
+share/simutrans/pak/text/bg.tab
+share/simutrans/pak/text/ca.tab
+share/simutrans/pak/text/ce.tab
+share/simutrans/pak/text/citylist_cz.txt
+share/simutrans/pak/text/citylist_de.txt
+share/simutrans/pak/text/citylist_de_at.txt
+share/simutrans/pak/text/citylist_de_ch.txt
+share/simutrans/pak/text/citylist_dk.txt
+share/simutrans/pak/text/citylist_en_au.txt
+share/simutrans/pak/text/citylist_en_gb.txt
+share/simutrans/pak/text/citylist_en_nz.txt
+share/simutrans/pak/text/citylist_en_us.txt
+share/simutrans/pak/text/citylist_es.txt
+share/simutrans/pak/text/citylist_fi.txt
+share/simutrans/pak/text/citylist_fr.txt
+share/simutrans/pak/text/citylist_hu.txt
+share/simutrans/pak/text/citylist_it.txt
+share/simutrans/pak/text/citylist_ja.txt
+share/simutrans/pak/text/citylist_lt.txt
+share/simutrans/pak/text/citylist_nl.txt
+share/simutrans/pak/text/citylist_pl.txt
+share/simutrans/pak/text/citylist_pt.txt
+share/simutrans/pak/text/citylist_ro.txt
+share/simutrans/pak/text/citylist_ru.txt
+share/simutrans/pak/text/citylist_sk.txt
+share/simutrans/pak/text/citylist_zh.txt
+share/simutrans/pak/text/cn.tab
+share/simutrans/pak/text/cz.tab
+share/simutrans/pak/text/de.tab
+share/simutrans/pak/text/dk.tab
+share/simutrans/pak/text/en.tab
+share/simutrans/pak/text/es.tab
+share/simutrans/pak/text/et.tab
+share/simutrans/pak/text/fi.tab
+share/simutrans/pak/text/fr.tab
+share/simutrans/pak/text/gr.tab
+share/simutrans/pak/text/hr.tab
+share/simutrans/pak/text/hu.tab
+share/simutrans/pak/text/id.tab
+share/simutrans/pak/text/it.tab
+share/simutrans/pak/text/ja.tab
+share/simutrans/pak/text/ko.tab
+share/simutrans/pak/text/lt.tab
+share/simutrans/pak/text/nl.tab
+share/simutrans/pak/text/no.tab
+share/simutrans/pak/text/pl.tab
+share/simutrans/pak/text/pt.tab
+share/simutrans/pak/text/ro.tab
+share/simutrans/pak/text/ru.tab
+share/simutrans/pak/text/sk.tab
+share/simutrans/pak/text/sq.tab
+share/simutrans/pak/text/sv.tab
+share/simutrans/pak/text/th.tab
+share/simutrans/pak/text/tr.tab
+share/simutrans/pak/text/uk.tab
+share/simutrans/pak/text/zh.tab
share/simutrans/pak/tree.Ahorn-1.pak
share/simutrans/pak/tree.Ahorn-2.pak
share/simutrans/pak/tree.Ahorn-Gruppe.pak
@@ -798,61 +855,4 @@ share/simutrans/pak/way.sand_track.pak
share/simutrans/pak/way.steel_sleeper_track.pak
share/simutrans/pak/way.taxiway.pak
share/simutrans/pak/way.wooden_sleeper_track.pak
-share/simutrans/text/be.tab
-share/simutrans/text/bg.tab
-share/simutrans/text/ca.tab
-share/simutrans/text/ce.tab
-share/simutrans/text/citylist_cz.txt
-share/simutrans/text/citylist_de.txt
-share/simutrans/text/citylist_de_at.txt
-share/simutrans/text/citylist_de_ch.txt
-share/simutrans/text/citylist_dk.txt
-share/simutrans/text/citylist_en_au.txt
-share/simutrans/text/citylist_en_gb.txt
-share/simutrans/text/citylist_en_nz.txt
-share/simutrans/text/citylist_en_us.txt
-share/simutrans/text/citylist_es.txt
-share/simutrans/text/citylist_fi.txt
-share/simutrans/text/citylist_fr.txt
-share/simutrans/text/citylist_hu.txt
-share/simutrans/text/citylist_it.txt
-share/simutrans/text/citylist_ja.txt
-share/simutrans/text/citylist_lt.txt
-share/simutrans/text/citylist_nl.txt
-share/simutrans/text/citylist_pl.txt
-share/simutrans/text/citylist_pt.txt
-share/simutrans/text/citylist_ro.txt
-share/simutrans/text/citylist_ru.txt
-share/simutrans/text/citylist_sk.txt
-share/simutrans/text/citylist_zh.txt
-share/simutrans/text/cn.tab
-share/simutrans/text/cz.tab
-share/simutrans/text/de.tab
-share/simutrans/text/dk.tab
-share/simutrans/text/en.tab
-share/simutrans/text/es.tab
-share/simutrans/text/et.tab
-share/simutrans/text/fi.tab
-share/simutrans/text/fr.tab
-share/simutrans/text/gr.tab
-share/simutrans/text/hr.tab
-share/simutrans/text/hu.tab
-share/simutrans/text/id.tab
-share/simutrans/text/it.tab
-share/simutrans/text/ja.tab
-share/simutrans/text/ko.tab
-share/simutrans/text/lt.tab
-share/simutrans/text/nl.tab
-share/simutrans/text/no.tab
-share/simutrans/text/pl.tab
-share/simutrans/text/pt.tab
-share/simutrans/text/ro.tab
-share/simutrans/text/ru.tab
-share/simutrans/text/sk.tab
-share/simutrans/text/sq.tab
-share/simutrans/text/sv.tab
-share/simutrans/text/th.tab
-share/simutrans/text/tr.tab
-share/simutrans/text/uk.tab
-share/simutrans/text/zh.tab
@pkgdir share/simtrans
diff --git a/simutrans-data/distinfo b/simutrans-data/distinfo
index 098e271..2b27648 100644
--- a/simutrans-data/distinfo
+++ b/simutrans-data/distinfo
@@ -1,6 +1,14 @@
$NetBSD$
-SHA1 (language_pack-Base+texts.zip) = 6df0294bfd0c65ba05d2f032c60b6e8daf781d4a
-RMD160 (language_pack-Base+texts.zip) = dbefa9b4b41b05477efe26b4e4bf9399032e11a4
-SHA512 (language_pack-Base+texts.zip) = 4af20eb2f73d4406d58c65c3f76e72d7a8960b8c45063d4ee64624db56f9b67507aad2be88bd840fc530c1aa4fcf5ed6a0617bd2f59b8d6f91bc785b88c20458
-Size (language_pack-Base+texts.zip) = 1098037 bytes
+SHA1 (language_pack-Base+texts.zip) = 33c9c7b80bf8215da0a513dbf6eeba4c44e2e77c
+RMD160 (language_pack-Base+texts.zip) = b38fd83258b137a909378c4d962073a6236b5e45
+SHA512 (language_pack-Base+texts.zip) = 6beddca57ee331b00a8fe0f20aa74041d12aa45f8e1aa4400ef3bec228c4ccf0a1d7bf1837618778ad458b4e9a082416932a7aff88ac259405288db2b3c724f0
+Size (language_pack-Base+texts.zip) = 1098245 bytes
+SHA1 (simupak64-120-0-1.zip) = ceb70ef7b61867f8af129b8af30935c7fef61c11
+RMD160 (simupak64-120-0-1.zip) = 813d097c1701cf4839363e98ef6c7fb589ca8da5
+SHA512 (simupak64-120-0-1.zip) = 21badd251b9018bef55531923e23cb1935c3831784fab028febd3879384330e843329499ab08a08e71238fb92bf7db36e18ecbbc4e719a942e427f58fc634afc
+Size (simupak64-120-0-1.zip) = 4051769 bytes
+SHA1 (simutrans-data.zip) = 33c9c7b80bf8215da0a513dbf6eeba4c44e2e77c
+RMD160 (simutrans-data.zip) = b38fd83258b137a909378c4d962073a6236b5e45
+SHA512 (simutrans-data.zip) = 6beddca57ee331b00a8fe0f20aa74041d12aa45f8e1aa4400ef3bec228c4ccf0a1d7bf1837618778ad458b4e9a082416932a7aff88ac259405288db2b3c724f0
+Size (simutrans-data.zip) = 1098245 bytes
diff --git a/simutrans/Makefile b/simutrans/Makefile
index 6680cdb..7c9d7a7 100644
--- a/simutrans/Makefile
+++ b/simutrans/Makefile
@@ -4,6 +4,7 @@ PKGNAME= simutrans-120.1.3
DISTNAME= simutrans-src-120-1-3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=simutrans/}
+#DISTFILES+= language_pack-Base+texts.zip
EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -11,15 +12,22 @@ HOMEPAGE= http://www.simutrans.com/
COMMENT= Simutrans is a freeware and open-source transportation simulator
LICENSE= artistic
-USE_TOOLS+= pkg-config unzip gmake pax
+USE_TOOLS+= pkg-config unzip gmake pax grep
USE_LANGUAGES= c++ c
+
GNU_CONFIGURE= yes
-CONFIGURE_SCRIPT= ${WRKDIR}/configure.sh
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --with-pthread
+HAS_CONFIGURE= yes
+CONFIGURE_SCRIPT= ${WRKSRC}/configure.sh
+
+CONFIGURE_ENV+=
+CONFIGURE_ARGS+= --prefix=${PREFIX}/share/simutrans
+CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/bin
+PTHREAD_OPTS+= require
+#CONFIGURE_ARGS+= --with-pthread
-WRKSRC= ${WRKDIR}
+#AUTO_MKDIRS= yes
+WRKSRC= ${WRKDIR}/simutrans
SUBST_CLASSES+= testeq
SUBST_STAGE.testeq= post-extract
@@ -30,16 +38,33 @@ SUBST_FILES.testeq+= script/*.sh
SUBST_FILES.testeq+= Makefile
SUBST_SED.testeq= -e 's/==/=/g'
+
+do-extract:
+ unzip ${DISTDIR}/${DISTNAME}.zip -d ${WRKSRC} -o
+ unzip ${DISTDIR}/language_pack-Base+texts.zip -d ${WRKSRC}/simutrans/text -o
+
+
+
do-install:
+ cd ${WRKSRC} && ${PAX} -rw -pp simutrans ${DESTDIR}${PREFIX}/share/
${MKDIR} ${DESTDIR}${PREFIX}/bin/
- cd ${WRKDIR} && ${PAX} -rw -pp simutrans ${DESTDIR}${PREFIX}/share/
- ${INSTALL_PROGRAM} ${WRKDIR}/sim ${DESTDIR}${PREFIX}/bin/
+ ${INSTALL_PROGRAM} ${WRKSRC}/sim ${DESTDIR}${PREFIX}/bin/
+ ${INSTALL_SCRIPT} ${FILESDIR}/simutrans ${DESTDIR}${PREFIX}/bin/
${FIND} ${DESTDIR}${PREFIX}/share -type f -exec ${CHMOD} 0644 {} \;
# url2pkg-marker (please do not remove this line.)
#.include "options.mk"
.include "../../mk/pthread.buildlink3.mk"
+.include "../../archivers/lzo/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL_ttf/buildlink3.mk"
+.include "../../devel/SDL_gfx/buildlink3.mk"
.include "../../graphics/SDL_image/buildlink3.mk"
.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../audio/SDL_sound/buildlink3.mk"
+#.include "../../audio/timidity/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/simutrans/PLIST b/simutrans/PLIST
index 2d7bede..9270137 100644
--- a/simutrans/PLIST
+++ b/simutrans/PLIST
@@ -1,5 +1,6 @@
@comment $NetBSD$
bin/sim
+bin/simutrans
share/simutrans/change_request.txt
share/simutrans/config/simuconf.tab
share/simutrans/copyright.txt
@@ -62,6 +63,11 @@ share/simutrans/readme.txt
share/simutrans/script/new_scenario_template.nut
share/simutrans/script/scenario_base.nut
share/simutrans/script/scenario_compat.nut
+share/simutrans/text/be.tab
+share/simutrans/text/bg.tab
+share/simutrans/text/ca.tab
+share/simutrans/text/ce.tab
+share/simutrans/text/cn.tab
share/simutrans/text/cn/baum_build.txt
share/simutrans/text/cn/color.txt
share/simutrans/text/cn/enlarge_map.txt
@@ -71,6 +77,7 @@ share/simutrans/text/cn/scenario.txt
share/simutrans/text/cn/settings.txt
share/simutrans/text/cn/simutrans.txt
share/simutrans/text/cn/trafficlight_info.txt
+share/simutrans/text/cz.tab
share/simutrans/text/cz/airtools.txt
share/simutrans/text/cz/baum_build.txt
share/simutrans/text/cz/bridges.txt
@@ -134,6 +141,7 @@ share/simutrans/text/cz/trafficlight_info.txt
share/simutrans/text/cz/tramtools.txt
share/simutrans/text/cz/underground.txt
share/simutrans/text/cz/window.txt
+share/simutrans/text/de.tab
share/simutrans/text/de/airtools.txt
share/simutrans/text/de/baum_build.txt
share/simutrans/text/de/citybuilding_build.txt
@@ -194,6 +202,7 @@ share/simutrans/text/de/trafficlight_info.txt
share/simutrans/text/de/tramtools.txt
share/simutrans/text/de/underground.txt
share/simutrans/text/de/window.txt
+share/simutrans/text/dk.tab
share/simutrans/text/dk/color.txt
share/simutrans/text/dk/convoi.txt
share/simutrans/text/dk/convoi_filter.txt
@@ -217,6 +226,7 @@ share/simutrans/text/dk/schedule.txt
share/simutrans/text/dk/shiptools.txt
share/simutrans/text/dk/sound.txt
share/simutrans/text/dk/station.txt
+share/simutrans/text/en.tab
share/simutrans/text/en/airtools.txt
share/simutrans/text/en/baum_build.txt
share/simutrans/text/en/citybuilding_build.txt
@@ -275,6 +285,7 @@ share/simutrans/text/en/station_details.txt
share/simutrans/text/en/trafficlight_info.txt
share/simutrans/text/en/tramtools.txt
share/simutrans/text/en/window.txt
+share/simutrans/text/es.tab
share/simutrans/text/es/airtools.txt
share/simutrans/text/es/citylist_filter.txt
share/simutrans/text/es/citywindow.txt
@@ -321,7 +332,10 @@ share/simutrans/text/es/station.txt
share/simutrans/text/es/station_details.txt
share/simutrans/text/es/tramtools.txt
share/simutrans/text/es/window.txt
+share/simutrans/text/et.tab
+share/simutrans/text/fi.tab
share/simutrans/text/fi/new_world.txt
+share/simutrans/text/fr.tab
share/simutrans/text/fr/airtools.txt
share/simutrans/text/fr/baum_build.txt
share/simutrans/text/fr/climates.txt
@@ -347,6 +361,9 @@ share/simutrans/text/fr/schedule.txt
share/simutrans/text/fr/shiptools.txt
share/simutrans/text/fr/sound.txt
share/simutrans/text/fr/station.txt
+share/simutrans/text/frp.tab
+share/simutrans/text/gr.tab
+share/simutrans/text/hr.tab
share/simutrans/text/hr/baum_build.txt
share/simutrans/text/hr/citybuilding_build.txt
share/simutrans/text/hr/citylist_filter.txt
@@ -367,6 +384,7 @@ share/simutrans/text/hr/sound.txt
share/simutrans/text/hr/station_details.txt
share/simutrans/text/hr/underground.txt
share/simutrans/text/hr/window.txt
+share/simutrans/text/hu.tab
share/simutrans/text/hu/citylist_filter.txt
share/simutrans/text/hu/citywindow.txt
share/simutrans/text/hu/color.txt
@@ -397,6 +415,10 @@ share/simutrans/text/hu/special.txt
share/simutrans/text/hu/station.txt
share/simutrans/text/hu/station_details.txt
share/simutrans/text/hu/tramtools.txt
+share/simutrans/text/id.tab
+share/simutrans/text/id/general.txt
+share/simutrans/text/id/simutrans.txt
+share/simutrans/text/it.tab
share/simutrans/text/it/airtools.txt
share/simutrans/text/it/baum_build.txt
share/simutrans/text/it/citylist_filter.txt
@@ -428,22 +450,27 @@ share/simutrans/text/it/station.txt
share/simutrans/text/it/station_details.txt
share/simutrans/text/it/trafficlight_info.txt
share/simutrans/text/it/window.txt
+share/simutrans/text/ja.tab
share/simutrans/text/ja/citylist_filter.txt
share/simutrans/text/ja/citywindow.txt
share/simutrans/text/ja/color.txt
share/simutrans/text/ja/depot.txt
share/simutrans/text/ja/display.txt
+share/simutrans/text/ja/enlarge_map.txt
share/simutrans/text/ja/finances.txt
share/simutrans/text/ja/general.txt
share/simutrans/text/ja/language.txt
share/simutrans/text/ja/load.txt
+share/simutrans/text/ja/load_relief.txt
share/simutrans/text/ja/mailbox.txt
share/simutrans/text/ja/map.txt
+share/simutrans/text/ja/monorailtools.txt
share/simutrans/text/ja/new_world.txt
share/simutrans/text/ja/options.txt
share/simutrans/text/ja/password.txt
share/simutrans/text/ja/players.txt
share/simutrans/text/ja/railtools.txt
+share/simutrans/text/ja/removal_tool.txt
share/simutrans/text/ja/roadtools.txt
share/simutrans/text/ja/save.txt
share/simutrans/text/ja/schedule.txt
@@ -456,6 +483,7 @@ share/simutrans/text/ja/sound.txt
share/simutrans/text/ja/station.txt
share/simutrans/text/ja/station_details.txt
share/simutrans/text/ja/trafficlight_info.txt
+share/simutrans/text/ko.tab
share/simutrans/text/ko/citylist_filter.txt
share/simutrans/text/ko/citywindow.txt
share/simutrans/text/ko/color.txt
@@ -480,6 +508,8 @@ share/simutrans/text/ko/slopetools.txt
share/simutrans/text/ko/sound.txt
share/simutrans/text/ko/station.txt
share/simutrans/text/ko/station_details.txt
+share/simutrans/text/lt.tab
+share/simutrans/text/nl.tab
share/simutrans/text/nl/airtools.txt
share/simutrans/text/nl/citylist_filter.txt
share/simutrans/text/nl/citywindow.txt
@@ -498,6 +528,8 @@ share/simutrans/text/nl/map.txt
share/simutrans/text/nl/monorailtools.txt
share/simutrans/text/nl/mouse.txt
share/simutrans/text/nl/signals.txt
+share/simutrans/text/no.tab
+share/simutrans/text/pl.tab
share/simutrans/text/pl/color.txt
share/simutrans/text/pl/depot.txt
share/simutrans/text/pl/display.txt
@@ -515,6 +547,7 @@ share/simutrans/text/pl/schedule.txt
share/simutrans/text/pl/shiptools.txt
share/simutrans/text/pl/sound.txt
share/simutrans/text/pl/station.txt
+share/simutrans/text/pt.tab
share/simutrans/text/pt/airtools.txt
share/simutrans/text/pt/baum_build.txt
share/simutrans/text/pt/citybuilding_build.txt
@@ -569,6 +602,7 @@ share/simutrans/text/pt/trafficlight_info.txt
share/simutrans/text/pt/tramtools.txt
share/simutrans/text/pt/window.txt
share/simutrans/text/readme_citylist.txt
+share/simutrans/text/ro.tab
share/simutrans/text/ro/airtools.txt
share/simutrans/text/ro/color.txt
share/simutrans/text/ro/depot.txt
@@ -588,7 +622,12 @@ share/simutrans/text/ro/shiptools.txt
share/simutrans/text/ro/sound.txt
share/simutrans/text/ro/station.txt
share/simutrans/text/ro/station_details.txt
+share/simutrans/text/ru.tab
+share/simutrans/text/ru/airtools.txt
+share/simutrans/text/ru/baum_build.txt
+share/simutrans/text/ru/citybuilding_build.txt
share/simutrans/text/ru/color.txt
+share/simutrans/text/sk.tab
share/simutrans/text/sk/bridges.txt
share/simutrans/text/sk/color.txt
share/simutrans/text/sk/convoi.txt
@@ -610,6 +649,8 @@ share/simutrans/text/sk/schedule.txt
share/simutrans/text/sk/shiptools.txt
share/simutrans/text/sk/sound.txt
share/simutrans/text/sk/station.txt
+share/simutrans/text/sq.tab
+share/simutrans/text/sv.tab
share/simutrans/text/sv/airtools.txt
share/simutrans/text/sv/baum_build.txt
share/simutrans/text/sv/citybuilding_build.txt
@@ -619,7 +660,15 @@ share/simutrans/text/sv/players.txt
share/simutrans/text/sv/signal_spacing.txt
share/simutrans/text/sv/simutrans.txt
share/simutrans/text/sv/underground.txt
+share/simutrans/text/th.tab
+share/simutrans/text/tr.tab
share/simutrans/text/tr/airtools.txt
+share/simutrans/text/uk.tab
+share/simutrans/text/uk/airtools.txt
+share/simutrans/text/uk/baum_build.txt
+share/simutrans/text/uk/bridges.txt
+share/simutrans/text/uk/citybuilding_build.txt
+share/simutrans/text/zh.tab
share/simutrans/text/zh/baum_build.txt
share/simutrans/text/zh/color.txt
share/simutrans/text/zh/enlarge_map.txt
diff --git a/simutrans/distinfo b/simutrans/distinfo
index ac4307e..8e44a4e 100644
--- a/simutrans/distinfo
+++ b/simutrans/distinfo
@@ -4,10 +4,5 @@ SHA1 (simutrans-src-120-1-3.zip) = a8ec53a5de48c834abdb1cc86866954e97f645df
RMD160 (simutrans-src-120-1-3.zip) = 43a4e0589d0168cc35b1a528ba3690b3a84aa87a
SHA512 (simutrans-src-120-1-3.zip) = ae31dda7bdbd057aaf9c40914eb7ec0c60b21d2790d1ca12aa8db698cd112043a291934f6f460b1d5a8a1984b7defb4a0c4bc9839c81c674834062cc1e49c8bd
Size (simutrans-src-120-1-3.zip) = 3447115 bytes
-SHA1 (patch-Makefile) = a567c94861eb28736f7b367f3dcaab312162dbdf
-SHA1 (patch-boden_wege_weg.cc) = 02c674692c85401cb6484090195fe60ba923d429
-SHA1 (patch-obj_crossing.cc) = 283d895dfce853e5c71176674379e25bbb5a888a
-SHA1 (patch-obj_tunnel.cc) = 5fcc032c12115e11068a9c3ea7a42cf277716eba
-SHA1 (patch-obj_wayobj.cc) = 267a67e79160009226af3eb27762ebf1833fb190
-SHA1 (patch-simworld.cc) = d95eccc13864d2293c0dab9ba8c2178ad05a7d2c
-SHA1 (patch-utils_simthread.h) = 8b04ec231a5c861637ac3e41db3d7141308bcc93
+SHA1 (patch-Makefile) = 5f6629257a6685002c98cd3279b69afb72669434
+SHA1 (patch-utils_simthread.h) = 89f88a753f467b2eb9e11ad76c6d2427663f8f2a
diff --git a/simutrans/files/simutrans b/simutrans/files/simutrans
index a53ac75..844f425 100644
--- a/simutrans/files/simutrans
+++ b/simutrans/files/simutrans
@@ -1,2 +1,3 @@
#!/bin/sh
-sim -use_workdir ${PREFIX}/share/simutrans/
+cd ${PREFIX}/share/simutrans/
+sim -use_workdir -use_hw $@
diff --git a/simutrans/patches/patch-Makefile b/simutrans/patches/patch-Makefile
index a89dad1..e93a1d3 100644
--- a/simutrans/patches/patch-Makefile
+++ b/simutrans/patches/patch-Makefile
@@ -2,15 +2,18 @@ $NetBSD$
--- Makefile.orig 2016-01-09 22:36:24.000000000 +0000
+++ Makefile
-@@ -1,6 +1,11 @@
- CFG ?= default
- -include config.$(CFG)
-
-+BACKEND=mixer_sdl
-+COLOUR_DEPTH=16
-+OSTYPE=freebsd
-+VERBOSE=1
-+
-
- BACKENDS = allegro gdi opengl sdl sdl2 mixer_sdl posix
- COLOUR_DEPTHS = 0 16
+@@ -1,6 +1,14 @@
+ CFG ?= default
+ -include config.$(CFG)
+
++DEBUG = 0
++OPTIMISE = 1
++FLAGS = -DUSE_C -DNDEBUG
++BACKEND=mixer_sdl
++COLOUR_DEPTH=16
++OSTYPE=freebsd
++VERBOSE=1
++MULTI_THREAD=1
+
+ BACKENDS = allegro gdi opengl sdl sdl2 mixer_sdl posix
+ COLOUR_DEPTHS = 0 16
diff --git a/simutrans/patches/patch-boden_wege_weg.cc b/simutrans/patches/patch-boden_wege_weg.cc
deleted file mode 100644
index 662acff..0000000
--- a/simutrans/patches/patch-boden_wege_weg.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- boden/wege/weg.cc.orig 2015-11-29 19:41:00.000000000 +0000
-+++ boden/wege/weg.cc
-@@ -46,7 +46,7 @@
-
- #ifdef MULTI_THREAD
- #include "../../utils/simthread.h"
--static pthread_mutex_t weg_calc_bild_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+static pthread_mutex_t weg_calc_bild_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
-
- /**
diff --git a/simutrans/patches/patch-obj_crossing.cc b/simutrans/patches/patch-obj_crossing.cc
deleted file mode 100644
index 70898c9..0000000
--- a/simutrans/patches/patch-obj_crossing.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- obj/crossing.cc.orig 2015-08-30 18:18:58.000000000 +0000
-+++ obj/crossing.cc
-@@ -26,7 +26,7 @@
-
- #ifdef MULTI_THREAD
- #include "../utils/simthread.h"
--static pthread_mutex_t crossing_logic_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+static pthread_mutex_t crossing_logic_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
-
-
diff --git a/simutrans/patches/patch-obj_tunnel.cc b/simutrans/patches/patch-obj_tunnel.cc
deleted file mode 100644
index 59ab598..0000000
--- a/simutrans/patches/patch-obj_tunnel.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- obj/tunnel.cc.orig 2015-01-24 20:36:34.000000000 +0000
-+++ obj/tunnel.cc
-@@ -26,7 +26,7 @@
-
- #ifdef MULTI_THREAD
- #include "../utils/simthread.h"
--static pthread_mutex_t tunnel_calc_bild_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+static pthread_mutex_t tunnel_calc_bild_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
-
-
diff --git a/simutrans/patches/patch-obj_wayobj.cc b/simutrans/patches/patch-obj_wayobj.cc
deleted file mode 100644
index c248bb1..0000000
--- a/simutrans/patches/patch-obj_wayobj.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- obj/wayobj.cc.orig 2015-01-24 20:36:34.000000000 +0000
-+++ obj/wayobj.cc
-@@ -43,7 +43,7 @@
-
- #ifdef MULTI_THREAD
- #include "../utils/simthread.h"
--static pthread_mutex_t wayobj_calc_bild_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+static pthread_mutex_t wayobj_calc_bild_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
-
- // the descriptions ...
diff --git a/simutrans/patches/patch-simworld.cc b/simutrans/patches/patch-simworld.cc
deleted file mode 100644
index 9e41ffc..0000000
--- a/simutrans/patches/patch-simworld.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- simworld.cc.orig 2016-01-25 20:42:10.000000000 +0000
-+++ simworld.cc
-@@ -5483,7 +5483,7 @@ DBG_MESSAGE("karte_t::laden()","Savegame
-
-
- #ifdef MULTI_THREAD
--static pthread_mutex_t height_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+static pthread_mutex_t height_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
-
-
diff --git a/simutrans/patches/patch-utils_simthread.h b/simutrans/patches/patch-utils_simthread.h
index 39faa24..26ca7a1 100644
--- a/simutrans/patches/patch-utils_simthread.h
+++ b/simutrans/patches/patch-utils_simthread.h
@@ -2,10 +2,12 @@ $NetBSD$
--- utils/simthread.h.orig 2015-11-29 19:41:00.000000000 +0000
+++ utils/simthread.h
-@@ -1,5 +1,6 @@
- #ifndef simthread_h
- #define simthread_h
-+#define _USE_POSIX_BARRIERS
-
- #ifdef MULTI_THREAD
-
+@@ -24,7 +24,7 @@
+
+ // Mac OS X defines this initializers without _NP.
+ #ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+-#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER
++#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_MUTEX_INITIALIZER
+ #endif
+
+ // use our implementation if no posix barriers are available
Home |
Main Index |
Thread Index |
Old Index