- Update to 111.0

- Make food add-on optional because servers usually don't support it
- Move LICENSE section up to satisfy portlint

PR:		ports/162296
Submitted by:	Tijl Coosemans <tijl@coosemans.org> (maintainer)

4 files changed, 104 insertions, 59 deletions

diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile
index dc8ee56d3ed6..5ec9020cab40 100644
--- a/games/simutrans/Makefile
+++ b/games/simutrans/Makefile
@@ -6,41 +6,49 @@
 #
 
 PORTNAME=	simutrans
-PORTVERSION=	110.0.1
+PORTVERSION=	111.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${SIMUTRANS_VERSION} \
 		SF/${PORTNAME}/pak64/${SIMUTRANS_VERSION}:pak64
 DISTFILES=	simutrans-src-${SIMUTRANS_VERSION}.zip \
 		simulinux-${SIMUTRANS_VERSION}.zip \
-		simupak64-${SIMUTRANS_VERSION}.zip:pak64 \
-		simupak64-addon-food-${SIMUTRANS_VERSION}.zip:pak64
+		simupak64-${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
+
+SIMUTRANS_VERSION=	${PORTVERSION:S,.,-,g}
+SIMUTRANS_REVISION=	4911
+
+OPTIONS=	FOOD	"Add-on with farms, foods, markets,..." off
+
 MAKE_ARGS=	BACKEND=mixer_sdl \
 		COLOUR_DEPTH=16 \
 		OSTYPE=freebsd \
 		FLAGS="-DUSE_C -DREVISION=${SIMUTRANS_REVISION}" \
 		VERBOSE=1
 NO_WRKSUBDIR=	yes
+USE_DOS2UNIX=	Makefile
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer
 USE_ZIP=	yes
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_FOOD)
+DISTFILES+=	simupak64-addon-food-${SIMUTRANS_VERSION}.zip:pak64
+.endif
+
 .include "${.CURDIR}/Makefile.plist"
 
 PLIST_DIRS=	${SIMUTRANS_DIRS:S,^,%%DATADIR%%/,} %%DATADIR%%
-PLIST_FILES=	${SIMUTRANS_DATA:S,^,%%DATADIR%%/,} \
-		${SIMUTRANS_DOCS:S,^,%%PORTDOCS%%%%DATADIR%%/,}
+PLIST_FILES=	${SIMUTRANS_DATA:S,^,%%DATADIR%%/,}
 
 post-patch:
-	@${REINPLACE_CMD} 's/simutrans/.simutrans/' ${WRKSRC}/simsys_s.cc
+	@${REINPLACE_CMD} 's/simutrans/.simutrans/' ${WRKSRC}/simsys.cc
 
 do-install:
 	${MKDIR} ${DATADIR}
@@ -50,12 +58,8 @@ do-install:
 .for _D in ${SIMUTRANS_DATA}
 	${INSTALL_DATA} ${WRKSRC}/simutrans/${_D} ${DATADIR}/${_D}
 .endfor
-.ifndef NOPORTDOCS
-.for _D in ${SIMUTRANS_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/simutrans/${_D} ${DATADIR}/${_D}
-.endfor
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/sim ${PREFIX}/bin/simutrans-bin
+	${INSTALL_PROGRAM} ${WRKSRC}/build/default/sim \
+		${PREFIX}/bin/simutrans-bin
 	${INSTALL_SCRIPT} ${FILESDIR}/simutrans ${PREFIX}/bin/simutrans
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FILESDIR}/simutrans.desktop \
diff --git a/games/simutrans/Makefile.plist b/games/simutrans/Makefile.plist
index 97a74c081200..72d0aad4537a 100644
--- a/games/simutrans/Makefile.plist
+++ b/games/simutrans/Makefile.plist
@@ -121,6 +121,8 @@ pak/building.1930AirDepot.pak \
 pak/building.1headquarter.pak \
 pak/building.2headquarter.pak \
 pak/building.3headquarter.pak \
+pak/building.4headquarter.pak \
+pak/building.5headquarter.pak \
 pak/building.A1_ALTE_KIRCHE.pak \
 pak/building.A2_SCHLOSS1.pak \
 pak/building.A3_BURG1.pak \
@@ -188,7 +190,6 @@ 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 \
@@ -244,6 +245,7 @@ pak/building.IND_02_02.pak \
 pak/building.IND_02_06.pak \
 pak/building.IND_02_09.pak \
 pak/building.IND_02_10.pak \
+pak/building.KingsbridgeMonastry.pak \
 pak/building.LargeShipStop.pak \
 pak/building.LeuchtturmShipStop.pak \
 pak/building.Lighthouse.pak \
@@ -386,7 +388,6 @@ pak/factory.Erzbergwerk.pak \
 pak/factory.Geokraftwerk.pak \
 pak/factory.Kohlegrube.pak \
 pak/factory.Kohlekraftwerk.pak \
-pak/factory.Marketplace.pak \
 pak/factory.Materialswholesale.pak \
 pak/factory.Moebelfabrik.pak \
 pak/factory.Moebelhaus.pak \
@@ -407,22 +408,7 @@ pak/factory.Stonequarry.pak \
 pak/factory.TANKE.pak \
 pak/factory.Turmkraftwerk.pak \
 pak/factory.Windkraftwerk.pak \
-pak/factory.bakery.pak \
-pak/factory.brewery.pak \
-pak/factory.cannery.pak \
-pak/factory.cow_farm.pak \
-pak/factory.dairy.pak \
-pak/factory.fish_pond.pak \
-pak/factory.fish_swarm.pak \
-pak/factory.food_processing_plant.pak \
-pak/factory.grain_farm.pak \
-pak/factory.grain_mill.pak \
-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 \
 pak/good.Buecher.pak \
@@ -445,14 +431,6 @@ pak/good.PrintersInk.pak \
 pak/good.Sand.pak \
 pak/good.Stahl.pak \
 pak/good.Stone.pak \
-pak/good.beer.pak \
-pak/good.canned_food.pak \
-pak/good.fish.pak \
-pak/good.flour.pak \
-pak/good.food.pak \
-pak/good.grain.pak \
-pak/good.meat.pak \
-pak/good.milk.pak \
 pak/ground.Basement.pak \
 pak/ground.Borders.pak \
 pak/ground.ClimateTexture.pak \
@@ -504,6 +482,8 @@ pak/roadsign.Minimum80.pak \
 pak/roadsign.NoAirEntry.pak \
 pak/roadsign.NoEntry.pak \
 pak/roadsign.RailClose.pak \
+pak/roadsign.Railgate.pak \
+pak/roadsign.Roadgate.pak \
 pak/roadsign.Signals.pak \
 pak/roadsign.SignalsMonorail.pak \
 pak/roadsign.choose_point.pak \
@@ -583,6 +563,7 @@ pak/text/citylist_fr.txt \
 pak/text/citylist_hu.txt \
 pak/text/citylist_it.txt \
 pak/text/citylist_ja.txt \
+pak/text/citylist_lt.txt \
 pak/text/citylist_nl.txt \
 pak/text/citylist_pl.txt \
 pak/text/citylist_pt.txt \
@@ -740,9 +721,6 @@ pak/vehicle.Concept2Mail.pak \
 pak/vehicle.Concept2Pass.pak \
 pak/vehicle.Concept2Rear.pak \
 pak/vehicle.Concorde.pak \
-pak/vehicle.Cooling_Container.pak \
-pak/vehicle.Cooling_Truck.pak \
-pak/vehicle.Cooling_Waggon.pak \
 pak/vehicle.DC-3.pak \
 pak/vehicle.DaimlerStoll.pak \
 pak/vehicle.DoubleDecker.pak \
@@ -765,8 +743,6 @@ pak/vehicle.Erztransporter.pak \
 pak/vehicle.Erzwagen.pak \
 pak/vehicle.F7back.pak \
 pak/vehicle.FastFerry.pak \
-pak/vehicle.Fishing_Boat.pak \
-pak/vehicle.Fishing_Boat_DanMacK.pak \
 pak/vehicle.Flachwagen.pak \
 pak/vehicle.Fokker_F27.pak \
 pak/vehicle.FordZugmaschine.pak \
@@ -805,6 +781,9 @@ pak/vehicle.JNR_C11.pak \
 pak/vehicle.JR_9600.pak \
 pak/vehicle.JR_9600_tender.pak \
 pak/vehicle.Ju52.pak \
+pak/vehicle.JumboCruiser.pak \
+pak/vehicle.JumboCruiserBack1.pak \
+pak/vehicle.JumboCruiserBack2.pak \
 pak/vehicle.JumboJet.pak \
 pak/vehicle.Klappdeckelwagen.pak \
 pak/vehicle.Kohleanhaenger.pak \
@@ -822,8 +801,6 @@ pak/vehicle.Mack_Truck_01.pak \
 pak/vehicle.MailExpress.pak \
 pak/vehicle.Mailcontainerwagon.pak \
 pak/vehicle.Mailwagon.pak \
-pak/vehicle.Milk_Truck.pak \
-pak/vehicle.Milk_Waggon.pak \
 pak/vehicle.Moebelschiff.pak \
 pak/vehicle.Moebelwagen.pak \
 pak/vehicle.NS1000.pak \
@@ -926,6 +903,15 @@ skin/menu.WindowSkin.pak \
 text/be.tab \
 text/ca.tab \
 text/cn.tab \
+text/cn/airtools.txt \
+text/cn/color.txt \
+text/cn/convoi_filter.txt \
+text/cn/enlarge_map.txt \
+text/cn/labellist_filter.txt \
+text/cn/scenario.txt \
+text/cn/settings.txt \
+text/cn/sound.txt \
+text/cn/trafficlight_info.txt \
 text/cz.tab \
 text/cz/about.txt \
 text/cz/bridges.txt \
@@ -993,6 +979,7 @@ text/de/new_world.txt \
 text/de/options.txt \
 text/de/password.txt \
 text/de/players.txt \
+text/de/privatesign_info.txt \
 text/de/railtools.txt \
 text/de/roadtools.txt \
 text/de/save.txt \
@@ -1008,6 +995,7 @@ text/de/sound.txt \
 text/de/special.txt \
 text/de/station.txt \
 text/de/station_details.txt \
+text/de/trafficlight_info.txt \
 text/de/tramtools.txt \
 text/de/underground.txt \
 text/de/use.txt \
@@ -1080,6 +1068,7 @@ text/en/new_world.txt \
 text/en/options.txt \
 text/en/password.txt \
 text/en/players.txt \
+text/en/privatesign_info.txt \
 text/en/railtools.txt \
 text/en/removal_tool.txt \
 text/en/roadtools.txt \
@@ -1150,6 +1139,8 @@ text/et.tab \
 text/fi.tab \
 text/fi/new_world.txt \
 text/fr.tab \
+text/fr/airtools.txt \
+text/fr/baum_build.txt \
 text/fr/climates.txt \
 text/fr/color.txt \
 text/fr/convoi.txt \
@@ -1236,9 +1227,12 @@ text/it/airtools.txt \
 text/it/baum_build.txt \
 text/it/citylist_filter.txt \
 text/it/citywindow.txt \
+text/it/climates.txt \
 text/it/color.txt \
 text/it/convoi.txt \
 text/it/convoi_filter.txt \
+text/it/convoidetail.txt \
+text/it/convoiinfo.txt \
 text/it/depot.txt \
 text/it/display.txt \
 text/it/finances.txt \
@@ -1252,6 +1246,7 @@ text/it/new_world.txt \
 text/it/options.txt \
 text/it/players.txt \
 text/it/railtools.txt \
+text/it/removal_tool.txt \
 text/it/roadtools.txt \
 text/it/save.txt \
 text/it/scenario.txt \
@@ -1259,7 +1254,9 @@ text/it/schedule.txt \
 text/it/shiptools.txt \
 text/it/sound.txt \
 text/it/station.txt \
+text/it/station_details.txt \
 text/it/trafficlight_info.txt \
+text/it/window.txt \
 text/ja.tab \
 text/ja/citylist_filter.txt \
 text/ja/citywindow.txt \
@@ -1465,7 +1462,53 @@ text/sv/simutrans.txt \
 text/sv/underground.txt \
 text/tr.tab \
 text/tr/airtools.txt \
-text/zh.tab
+text/zh.tab \
+text/zh/color.txt \
+text/zh/convoi_filter.txt \
+text/zh/enlarge_map.txt \
+text/zh/labellist_filter.txt \
+text/zh/scenario.txt \
+text/zh/settings.txt \
+text/zh/sound.txt \
+text/zh/trafficlight_info.txt
+
+.ifdef WITH_FOOD
+SIMUTRANS_DATA+= \
+pak/building.CattlePorch.pak \
+pak/factory.Marketplace.pak \
+pak/factory.bakery.pak \
+pak/factory.brewery.pak \
+pak/factory.cannery.pak \
+pak/factory.cow_farm.pak \
+pak/factory.dairy.pak \
+pak/factory.fish_pond.pak \
+pak/factory.fish_swarm.pak \
+pak/factory.food_processing_plant.pak \
+pak/factory.grain_farm.pak \
+pak/factory.grain_mill.pak \
+pak/factory.grain_windmill.pak \
+pak/factory.old_farm.pak \
+pak/factory.supermarket.pak \
+pak/field.cow_fields.pak \
+pak/field.wheat_fields.pak \
+pak/good.beer.pak \
+pak/good.canned_food.pak \
+pak/good.fish.pak \
+pak/good.flour.pak \
+pak/good.food.pak \
+pak/good.grain.pak \
+pak/good.meat.pak \
+pak/good.milk.pak \
+pak/vehicle.Cooling_Container.pak \
+pak/vehicle.Cooling_Truck.pak \
+pak/vehicle.Cooling_Waggon.pak \
+pak/vehicle.Fishing_Boat.pak \
+pak/vehicle.Fishing_Boat_DanMacK.pak \
+pak/vehicle.Milk_Truck.pak \
+pak/vehicle.Milk_Waggon.pak
+.endif
 
-SIMUTRANS_DOCS= \
+.ifndef NOPORTDOCS
+SIMUTRANS_DATA+= \
 readme.txt
+.endif
diff --git a/games/simutrans/distinfo b/games/simutrans/distinfo
index 07a99734b80e..86a0baef12bb 100644
--- a/games/simutrans/distinfo
+++ b/games/simutrans/distinfo
@@ -1,8 +1,8 @@
-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
+SHA256 (simutrans-src-111-0.zip) = 75ff501c9c244d0759cd677efcf75fbd7816c01c6ee7f8b4b127b6b8ec934f9b
+SIZE (simutrans-src-111-0.zip) = 3136834
+SHA256 (simulinux-111-0.zip) = bbc5b26f13bd18e4a57c27e21af5b40b1f3bb35d583e72807ae959fe43e25b65
+SIZE (simulinux-111-0.zip) = 2676779
+SHA256 (simupak64-111-0.zip) = 70e0b64cf3265178bde11a32274ee568816cbd78eccadef0e947d4ddbf1edf67
+SIZE (simupak64-111-0.zip) = 3477795
+SHA256 (simupak64-addon-food-111-0.zip) = 16117b1a813a9547a48ab9b182622479871ed763b4e1209fa9c9915d6e48d537
+SIZE (simupak64-addon-food-111-0.zip) = 113799
diff --git a/games/simutrans/pkg-plist b/games/simutrans/pkg-plist
index 3d13332df27a..46dbdddcf38e 100644
--- a/games/simutrans/pkg-plist
+++ b/games/simutrans/pkg-plist
@@ -3,9 +3,7 @@ bin/simutrans-bin
 share/applications/simutrans.desktop
 @exec mkdir -p %D/%%DATADIR%%/text/be
 @exec mkdir -p %D/%%DATADIR%%/text/ca
-@exec mkdir -p %D/%%DATADIR%%/text/cn
 @exec mkdir -p %D/%%DATADIR%%/text/et
-@exec mkdir -p %D/%%DATADIR%%/text/hr
 @exec mkdir -p %D/%%DATADIR%%/text/id
 @exec mkdir -p %D/%%DATADIR%%/text/lt
 @dirrmtry share/applications