4 files changed, 78 insertions, 46 deletions

diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile
index b6b7854069d6..dc8ee56d3ed6 100644
--- a/games/simutrans/Makefile
+++ b/games/simutrans/Makefile
@@ -6,25 +6,27 @@
 #
 
 PORTNAME=	simutrans
-PORTVERSION=	102.2.2
+PORTVERSION=	110.0.1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${SIMUTRANS_VERSION} \
-		SF/${PORTNAME}/pak64/102-2-1:food \
 		SF/${PORTNAME}/pak64/${SIMUTRANS_VERSION}:pak64
 DISTFILES=	simutrans-src-${SIMUTRANS_VERSION}.zip \
 		simulinux-${SIMUTRANS_VERSION}.zip \
 		simupak64-${SIMUTRANS_VERSION}.zip:pak64 \
-		simupak64-addon-food-102-2-1.zip:food
+		simupak64-addon-food-${SIMUTRANS_VERSION}.zip:pak64
 
 MAINTAINER=	tijl@coosemans.org
 COMMENT=	Transportation simulation game
 
 SIMUTRANS_VERSION=	${PORTVERSION:S,.,-,g}
+SIMUTRANS_REVISION=	4359
 
+LICENSE=	ART10
+LICENSE_FILE=	${WRKSRC}/simutrans/licence.txt
 MAKE_ARGS=	BACKEND=mixer_sdl \
 		COLOUR_DEPTH=16 \
 		OSTYPE=freebsd \
-		FLAGS=-DUSE_C \
+		FLAGS="-DUSE_C -DREVISION=${SIMUTRANS_REVISION}" \
 		VERBOSE=1
 NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
diff --git a/games/simutrans/Makefile.plist b/games/simutrans/Makefile.plist
index c60f639e35a4..97a74c081200 100644
--- a/games/simutrans/Makefile.plist
+++ b/games/simutrans/Makefile.plist
@@ -170,6 +170,8 @@ pak/building.COM_03_15.pak \
 pak/building.COM_03_17.pak \
 pak/building.COM_03_19.pak \
 pak/building.COM_03_20.pak \
+pak/building.COM_04_13.pak \
+pak/building.COM_04_14.pak \
 pak/building.COM_04_15.pak \
 pak/building.COM_10_01.pak \
 pak/building.COM_10_02.pak \
@@ -182,11 +184,14 @@ pak/building.COM_10_12.pak \
 pak/building.COM_11_10.pak \
 pak/building.COM_11_11.pak \
 pak/building.COM_11_12.pak \
+pak/building.COM_12_04.pak \
 pak/building.CarDepot.pak \
 pak/building.CarStop.pak \
 pak/building.Car_StationBlg.pak \
+pak/building.CattlePorch.pak \
 pak/building.ChannelStop.pak \
 pak/building.Control_StationBlg.pak \
+pak/building.DenkDirk.pak \
 pak/building.DenkFlor.pak \
 pak/building.DenkHajo.pak \
 pak/building.DenkMHz.pak \
@@ -207,6 +212,7 @@ pak/building.GCGTrainStop.pak \
 pak/building.Gas_StationBlg.pak \
 pak/building.Goods_StationBlg.pak \
 pak/building.Gymnasium.pak \
+pak/building.HallBusStop.pak \
 pak/building.IND_00_01.pak \
 pak/building.IND_00_02.pak \
 pak/building.IND_00_03.pak \
@@ -241,6 +247,7 @@ pak/building.IND_02_10.pak \
 pak/building.LargeShipStop.pak \
 pak/building.LeuchtturmShipStop.pak \
 pak/building.Lighthouse.pak \
+pak/building.LongBusStop.pak \
 pak/building.MHzSmallStation.pak \
 pak/building.MainTerminal1930.pak \
 pak/building.ModernAirTerminal477.pak \
@@ -355,11 +362,11 @@ pak/citycar.yellow_car.pak \
 pak/compat.tab \
 pak/config/alternative_cityrules.tab \
 pak/config/cityrules.tab \
-pak/config/forestrules.tab \
 pak/config/menuconf.tab \
 pak/config/simuconf.tab \
 pak/config/speedbonus.tab \
 pak/crossing.rail-road-crossing.pak \
+pak/crossing.rail-road-crossing_new.pak \
 pak/cursor.Builder.pak \
 pak/cursor.GeneralTools.pak \
 pak/cursor.Marked.pak \
@@ -414,6 +421,7 @@ pak/factory.grain_windmill.pak \
 pak/factory.old_farm.pak \
 pak/factory.supermarket.pak \
 pak/factory.thermisches_Solarkraftwerk.pak \
+pak/field.cow_fields.pak \
 pak/field.wheat_fields.pak \
 pak/good.Autos.pak \
 pak/good.Bretter.pak \
@@ -554,6 +562,10 @@ pak/symbol.ShipStop.pak \
 pak/symbol.TrainStop.pak \
 pak/symbol.TramStop.pak \
 pak/symbol.Waren.pak \
+pak/symbol.fastforwardsym.pak \
+pak/symbol.networksym.pak \
+pak/symbol.pausesym.pak \
+pak/symbol.timelinesym.pak \
 pak/text/be.tab \
 pak/text/ca.tab \
 pak/text/citylist_cz.txt \
@@ -683,7 +695,6 @@ pak/vehicle.BR01.pak \
 pak/vehicle.BR38-Tender.pak \
 pak/vehicle.BR38.pak \
 pak/vehicle.BR39.pak \
-pak/vehicle.BR45-Tender.pak \
 pak/vehicle.BR45.pak \
 pak/vehicle.BR85.pak \
 pak/vehicle.BRV36.pak \
@@ -831,6 +842,7 @@ pak/vehicle.Papierwagen.pak \
 pak/vehicle.Passagierwagen.pak \
 pak/vehicle.Pferdebahn.pak \
 pak/vehicle.Pferdebahnwagen.pak \
+pak/vehicle.PonyExpress.pak \
 pak/vehicle.Postschiff.pak \
 pak/vehicle.Posttransporter.pak \
 pak/vehicle.Postwagen.pak \
@@ -927,7 +939,6 @@ text/cz/general.txt \
 text/cz/goods_filter.txt \
 text/cz/haltlist.txt \
 text/cz/haltlist_filter.txt \
-text/cz/keys.txt \
 text/cz/language.txt \
 text/cz/load.txt \
 text/cz/map.txt \
@@ -968,7 +979,6 @@ text/de/goods_filter.txt \
 text/de/haltlist.txt \
 text/de/haltlist_filter.txt \
 text/de/industry_info.txt \
-text/de/keys.txt \
 text/de/labellist_filter.txt \
 text/de/language.txt \
 text/de/linemanagement.txt \
@@ -981,14 +991,17 @@ text/de/map.txt \
 text/de/monorailtools.txt \
 text/de/new_world.txt \
 text/de/options.txt \
+text/de/password.txt \
 text/de/players.txt \
 text/de/railtools.txt \
 text/de/roadtools.txt \
 text/de/save.txt \
 text/de/scenario.txt \
 text/de/schedule.txt \
+text/de/server.txt \
 text/de/settings.txt \
 text/de/shiptools.txt \
+text/de/signal_spacing.txt \
 text/de/simutrans.txt \
 text/de/slopetools.txt \
 text/de/sound.txt \
@@ -1011,7 +1024,6 @@ text/dk/finances2.txt \
 text/dk/general.txt \
 text/dk/haltlist.txt \
 text/dk/haltlist_filter.txt \
-text/dk/keys.txt \
 text/dk/language.txt \
 text/dk/load.txt \
 text/dk/map.txt \
@@ -1042,9 +1054,11 @@ text/en/convoi_filter.txt \
 text/en/convoidetail.txt \
 text/en/convoiinfo.txt \
 text/en/curiositylist_filter.txt \
+text/en/curiosity_build.txt \
 text/en/depot.txt \
 text/en/display.txt \
 text/en/edittools.txt \
+text/en/enlarge_map.txt \
 text/en/factorylist_filter.txt \
 text/en/finances.txt \
 text/en/general.txt \
@@ -1053,7 +1067,7 @@ text/en/haltlist.txt \
 text/en/haltlist_filter.txt \
 text/en/industry_info.txt \
 text/en/inspection_tool.txt \
-text/en/keys.txt \
+text/en/labellist_filter.txt \
 text/en/language.txt \
 text/en/linemanagement.txt \
 text/en/list.txt \
@@ -1064,19 +1078,25 @@ text/en/map.txt \
 text/en/monorailtools.txt \
 text/en/new_world.txt \
 text/en/options.txt \
+text/en/password.txt \
 text/en/players.txt \
 text/en/railtools.txt \
 text/en/removal_tool.txt \
 text/en/roadtools.txt \
 text/en/save.txt \
+text/en/scenario.txt \
 text/en/schedule.txt \
+text/en/server.txt \
+text/en/settings.txt \
 text/en/shiptools.txt \
+text/en/signal_spacing.txt \
 text/en/simutrans.txt \
 text/en/slopetools.txt \
 text/en/sound.txt \
 text/en/special.txt \
 text/en/station.txt \
 text/en/station_details.txt \
+text/en/trafficlight_info.txt \
 text/en/tramtools.txt \
 text/en/window.txt \
 text/es.tab \
@@ -1101,7 +1121,6 @@ text/es/haltlist.txt \
 text/es/haltlist_filter.txt \
 text/es/industry_info.txt \
 text/es/inspection_tool.txt \
-text/es/keys.txt \
 text/es/language.txt \
 text/es/linemanagement.txt \
 text/es/list.txt \
@@ -1141,7 +1160,6 @@ text/fr/finances.txt \
 text/fr/general.txt \
 text/fr/haltlist.txt \
 text/fr/haltlist_filter.txt \
-text/fr/keys.txt \
 text/fr/language.txt \
 text/fr/load.txt \
 text/fr/mailbox.txt \
@@ -1159,8 +1177,27 @@ text/fr/shiptools.txt \
 text/fr/sound.txt \
 text/fr/station.txt \
 text/gr.tab \
-text/gr/airtools.txt \
 text/hr.tab \
+text/hr/baum_build.txt \
+text/hr/citybuilding_build.txt \
+text/hr/citylist_filter.txt \
+text/hr/citywindow.txt \
+text/hr/climates.txt \
+text/hr/color.txt \
+text/hr/display.txt \
+text/hr/finances.txt \
+text/hr/general.txt \
+text/hr/language.txt \
+text/hr/linemanagement.txt \
+text/hr/list.txt \
+text/hr/load.txt \
+text/hr/options.txt \
+text/hr/players.txt \
+text/hr/simutrans.txt \
+text/hr/sound.txt \
+text/hr/station_details.txt \
+text/hr/underground.txt \
+text/hr/window.txt \
 text/hu.tab \
 text/hu/citylist_filter.txt \
 text/hu/citywindow.txt \
@@ -1175,7 +1212,6 @@ text/hu/general.txt \
 text/hu/goods_filter.txt \
 text/hu/haltlist.txt \
 text/hu/haltlist_filter.txt \
-text/hu/keys.txt \
 text/hu/language.txt \
 text/hu/list.txt \
 text/hu/load.txt \
@@ -1197,6 +1233,9 @@ text/hu/tramtools.txt \
 text/id.tab \
 text/it.tab \
 text/it/airtools.txt \
+text/it/baum_build.txt \
+text/it/citylist_filter.txt \
+text/it/citywindow.txt \
 text/it/color.txt \
 text/it/convoi.txt \
 text/it/convoi_filter.txt \
@@ -1206,7 +1245,6 @@ text/it/finances.txt \
 text/it/general.txt \
 text/it/haltlist.txt \
 text/it/haltlist_filter.txt \
-text/it/keys.txt \
 text/it/language.txt \
 text/it/load.txt \
 text/it/map.txt \
@@ -1216,10 +1254,12 @@ text/it/players.txt \
 text/it/railtools.txt \
 text/it/roadtools.txt \
 text/it/save.txt \
+text/it/scenario.txt \
 text/it/schedule.txt \
 text/it/shiptools.txt \
 text/it/sound.txt \
 text/it/station.txt \
+text/it/trafficlight_info.txt \
 text/ja.tab \
 text/ja/citylist_filter.txt \
 text/ja/citywindow.txt \
@@ -1228,7 +1268,6 @@ text/ja/depot.txt \
 text/ja/display.txt \
 text/ja/finances.txt \
 text/ja/general.txt \
-text/ja/keys.txt \
 text/ja/language.txt \
 text/ja/load.txt \
 text/ja/mailbox.txt \
@@ -1286,21 +1325,18 @@ text/nl/curiositylist_filter.txt \
 text/nl/depot.txt \
 text/nl/display.txt \
 text/nl/general.txt \
-text/nl/keys.txt \
 text/nl/mailbox.txt \
 text/nl/map.txt \
 text/nl/monorailtools.txt \
 text/nl/mouse.txt \
 text/nl/signals.txt \
 text/no.tab \
-text/no/about.txt \
 text/pl.tab \
 text/pl/color.txt \
 text/pl/depot.txt \
 text/pl/display.txt \
 text/pl/finances.txt \
 text/pl/general.txt \
-text/pl/keys.txt \
 text/pl/language.txt \
 text/pl/load.txt \
 text/pl/map.txt \
@@ -1327,9 +1363,11 @@ text/pt/convoi_filter.txt \
 text/pt/convoidetail.txt \
 text/pt/convoiinfo.txt \
 text/pt/curiositylist_filter.txt \
+text/pt/curiosity_build.txt \
 text/pt/depot.txt \
 text/pt/display.txt \
 text/pt/edittools.txt \
+text/pt/enlarge_map.txt \
 text/pt/factorylist_filter.txt \
 text/pt/finances.txt \
 text/pt/general.txt \
@@ -1338,7 +1376,6 @@ text/pt/haltlist.txt \
 text/pt/haltlist_filter.txt \
 text/pt/industry_info.txt \
 text/pt/inspection_tool.txt \
-text/pt/keys.txt \
 text/pt/language.txt \
 text/pt/linemanagement.txt \
 text/pt/list.txt \
@@ -1355,6 +1392,7 @@ text/pt/railtools.txt \
 text/pt/removal_tool.txt \
 text/pt/roadtools.txt \
 text/pt/save.txt \
+text/pt/scenario.txt \
 text/pt/schedule.txt \
 text/pt/shiptools.txt \
 text/pt/simutrans.txt \
@@ -1363,17 +1401,17 @@ text/pt/sound.txt \
 text/pt/special.txt \
 text/pt/station.txt \
 text/pt/station_details.txt \
+text/pt/trafficlight_info.txt \
 text/pt/tramtools.txt \
 text/pt/window.txt \
 text/readme_citylist.txt \
 text/ro.tab \
-text/ro/about.txt \
+text/ro/airtools.txt \
 text/ro/color.txt \
 text/ro/depot.txt \
 text/ro/display.txt \
 text/ro/finances.txt \
 text/ro/general.txt \
-text/ro/keys.txt \
 text/ro/language.txt \
 text/ro/load.txt \
 text/ro/map.txt \
@@ -1391,7 +1429,6 @@ text/ro/station_details.txt \
 text/ru.tab \
 text/ru/color.txt \
 text/ru/general.txt \
-text/ru/keys.txt \
 text/sk.tab \
 text/sk/bridges.txt \
 text/sk/color.txt \
@@ -1402,7 +1439,6 @@ text/sk/finances.txt \
 text/sk/general.txt \
 text/sk/haltlist.txt \
 text/sk/i-net.txt \
-text/sk/keys.txt \
 text/sk/language.txt \
 text/sk/load.txt \
 text/sk/map.txt \
@@ -1424,13 +1460,12 @@ text/sv/citybuilding_build.txt \
 text/sv/citywindow.txt \
 text/sv/depot.txt \
 text/sv/players.txt \
+text/sv/signal_spacing.txt \
 text/sv/simutrans.txt \
 text/sv/underground.txt \
 text/tr.tab \
 text/tr/airtools.txt \
-text/zh.tab \
-text/zh/keys.txt
+text/zh.tab
 
 SIMUTRANS_DOCS= \
-licence.txt \
 readme.txt
diff --git a/games/simutrans/distinfo b/games/simutrans/distinfo
index 952ca2c51601..07a99734b80e 100644
--- a/games/simutrans/distinfo
+++ b/games/simutrans/distinfo
@@ -1,12 +1,8 @@
-MD5 (simutrans-src-102-2-2.zip) = f9a01921ee4dda78bd4db0bf146d90a8
-SHA256 (simutrans-src-102-2-2.zip) = b105013ba180706a4790eddf19e007e1955c4ef7daa1c90fb6aaa48c28134351
-SIZE (simutrans-src-102-2-2.zip) = 2498680
-MD5 (simulinux-102-2-2.zip) = 2f36e7f16bbd957e9dd3eea01f025eea
-SHA256 (simulinux-102-2-2.zip) = 2d624624e8b5518f62979d19b1392f1917ef9791355301a2b2f2f7fe5dabb071
-SIZE (simulinux-102-2-2.zip) = 2437790
-MD5 (simupak64-102-2-2.zip) = e432a224499b41c294897501de33446e
-SHA256 (simupak64-102-2-2.zip) = 23ac416914ae86b0155eb43fdf69f09eff219d0c51c7f8474c04fad982315218
-SIZE (simupak64-102-2-2.zip) = 3486591
-MD5 (simupak64-addon-food-102-2-1.zip) = 2d75cb31e2012154ef60f9e4633ddb8a
-SHA256 (simupak64-addon-food-102-2-1.zip) = 7add9c3e3dc3959c6a39776043a16beb92f6f59190fcae25b29e367c17e24607
-SIZE (simupak64-addon-food-102-2-1.zip) = 113454
+SHA256 (simutrans-src-110-0-1.zip) = 091239054717ad36f8729fdc5233e61d1afbb581c074ce8b5688b1c351279ab7
+SIZE (simutrans-src-110-0-1.zip) = 1342914
+SHA256 (simulinux-110-0-1.zip) = 4407430c66cbdad1a7cc9f7aa6778beab739bb31471d9f3bff0efef6d51ce197
+SIZE (simulinux-110-0-1.zip) = 2584621
+SHA256 (simupak64-110-0-1.zip) = 98f5fc7f2e6b671af7e5cfde6582d1daef62d497a2ebaac50306c2b55a9a463f
+SIZE (simupak64-110-0-1.zip) = 3405709
+SHA256 (simupak64-addon-food-110-0-1.zip) = f8836ec94227c4f3a852c1dd4bd5a99019fd72e090f18034b849e21bac513702
+SIZE (simupak64-addon-food-110-0-1.zip) = 112502
diff --git a/games/simutrans/files/patch-Makefile b/games/simutrans/files/patch-Makefile
index 9a5610331127..9afda375f580 100644
--- a/games/simutrans/files/patch-Makefile
+++ b/games/simutrans/files/patch-Makefile
@@ -1,12 +1,11 @@
---- Makefile.orig	2008-12-21 15:40:36.000000000 +0100
-+++ Makefile	2008-12-21 15:41:10.000000000 +0100
-@@ -69,9 +69,6 @@
-     CFLAGS   += -minline-all-stringops
-     LDFLAGS += -ffunctions-sections
+--- Makefile.orig
++++ Makefile
+@@ -85,8 +85,6 @@
+       CFLAGS += -minline-all-stringops
+     endif
    endif
 -else
--  CFLAGS   += -O
--  CXXFLAGS += -O
+-  CFLAGS += -O
  endif
  
  ifdef DEBUG