pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

simutrans: bump to 120.2.2 and depend cleanup

Module Name:	pkgsrc-wip
Committed By:	i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By:	i3enedek
Date:		Tue May 16 11:50:35 2017 +0100
Changeset:	1922460b605fd61cd80c6a234e262d0d4ff5857d

Modified Files:
	simutrans-data/Makefile
	simutrans-data/PLIST
	simutrans-data/distinfo
	simutrans-data/options.mk
	simutrans/Makefile
	simutrans/PLIST
	simutrans/distinfo
	simutrans/patches/patch-Makefile
	simutrans/patches/patch-boden_wege_weg.cc

Log Message:
simutrans: bump to 120.2.2 and depend cleanup

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1922460b605fd61cd80c6a234e262d0d4ff5857d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 simutrans-data/Makefile                   |  2 +-
 simutrans-data/PLIST                      | 18 ++++++++++++------
 simutrans-data/distinfo                   | 12 ++++--------
 simutrans-data/options.mk                 |  6 +++---
 simutrans/Makefile                        |  8 +++++---
 simutrans/PLIST                           |  8 ++------
 simutrans/distinfo                        | 16 ++++++++++------
 simutrans/patches/patch-Makefile          |  7 ++++---
 simutrans/patches/patch-boden_wege_weg.cc | 12 ++++++------
 9 files changed, 47 insertions(+), 42 deletions(-)

diffs:
diff --git a/simutrans-data/Makefile b/simutrans-data/Makefile
index b1f5d867f2..a078e529c6 100644
--- a/simutrans-data/Makefile
+++ b/simutrans-data/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGNAME=	simutrans-data
+PKGNAME=	simutrans-data-0.1
 CATEGORIES=	games
 DISTNAME=	simutrans-data
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=simutrans/}
diff --git a/simutrans-data/PLIST b/simutrans-data/PLIST
index 2ac045ca50..09cfeaa614 100644
--- a/simutrans-data/PLIST
+++ b/simutrans-data/PLIST
@@ -1,4 +1,16 @@
 @comment $NetBSD$
+${PLIST.pak64}share/simutrans/pak/scenario/millionaire/de.tab
+${PLIST.pak64}share/simutrans/pak/sound/buzzsaw.wav
+${PLIST.pak64}share/simutrans/pak/sound/tree-cutting.wav
+${PLIST.pak64}share/simutrans/pak/symbol.CompassIso.pak
+${PLIST.pak64}share/simutrans/pak/symbol.CompassMap.pak
+${PLIST.pak64}share/simutrans/pak/text/frp.tab
+${PLIST.pak64}share/simutrans/pak/tree.Tree10.pak
+${PLIST.pak64}share/simutrans/pak/tree.Tree11.pak
+${PLIST.pak64}share/simutrans/pak/tree.Tree12.pak
+${PLIST.pak64}share/simutrans/pak/vehicle.Fahrradrikscha.pak
+${PLIST.pak64}share/simutrans/pak/vehicle.Rikscha.pak
+${PLIST.pak64}share/simutrans/pak/vehicle.Saenfte.pak
 ${PLIST.pak64}share/simutrans/pak/bridge.ClassicRail.pak
 ${PLIST.pak64}share/simutrans/pak/bridge.ClassicRoad.pak
 ${PLIST.pak64}share/simutrans/pak/bridge.MaglevBridge.pak
@@ -158,7 +170,6 @@ ${PLIST.pak64}share/simutrans/pak/building.LeuchtturmShipStop.pak
 ${PLIST.pak64}share/simutrans/pak/building.Lighthouse.pak
 ${PLIST.pak64}share/simutrans/pak/building.LongBusStop.pak
 ${PLIST.pak64}share/simutrans/pak/building.MHzSmallStation.pak
-${PLIST.pak64}share/simutrans/pak/building.MaglevUndergroundStation.pak
 ${PLIST.pak64}share/simutrans/pak/building.MainTerminal1930.pak
 ${PLIST.pak64}share/simutrans/pak/building.ModernAirTerminal477.pak
 ${PLIST.pak64}share/simutrans/pak/building.MonorailDepot.pak
@@ -276,7 +287,6 @@ ${PLIST.pak64}share/simutrans/pak/config/cityrules.tab
 ${PLIST.pak64}share/simutrans/pak/config/menuconf.tab
 ${PLIST.pak64}share/simutrans/pak/config/simuconf.tab
 ${PLIST.pak64}share/simutrans/pak/config/speedbonus.tab
-${PLIST.pak64}share/simutrans/pak/config/speedbonus.tab.bak
 ${PLIST.pak64}share/simutrans/pak/crossing.rail-road-crossing.pak
 ${PLIST.pak64}share/simutrans/pak/crossing.rail-road-crossing_new.pak
 ${PLIST.pak64}share/simutrans/pak/cursor.Builder.pak
@@ -470,7 +480,6 @@ ${PLIST.pak64}share/simutrans/pak/symbol.pausesym.pak
 ${PLIST.pak64}share/simutrans/pak/symbol.station_type.pak
 ${PLIST.pak64}share/simutrans/pak/symbol.timelinesym.pak
 ${PLIST.pak64}share/simutrans/pak/text/be.tab
-${PLIST.pak64}share/simutrans/pak/text/bg.tab
 ${PLIST.pak64}share/simutrans/pak/text/ca.tab
 ${PLIST.pak64}share/simutrans/pak/text/ce.tab
 ${PLIST.pak64}share/simutrans/pak/text/citylist_cz.txt
@@ -520,10 +529,7 @@ ${PLIST.pak64}share/simutrans/pak/text/pt.tab
 ${PLIST.pak64}share/simutrans/pak/text/ro.tab
 ${PLIST.pak64}share/simutrans/pak/text/ru.tab
 ${PLIST.pak64}share/simutrans/pak/text/sk.tab
-${PLIST.pak64}share/simutrans/pak/text/sq.tab
 ${PLIST.pak64}share/simutrans/pak/text/sv.tab
-${PLIST.pak64}share/simutrans/pak/text/th.tab
-${PLIST.pak64}share/simutrans/pak/text/tr.tab
 ${PLIST.pak64}share/simutrans/pak/text/uk.tab
 ${PLIST.pak64}share/simutrans/pak/text/zh.tab
 ${PLIST.pak64}share/simutrans/pak/tree.Ahorn-1.pak
diff --git a/simutrans-data/distinfo b/simutrans-data/distinfo
index f4dd679194..ba96ec948d 100644
--- a/simutrans-data/distinfo
+++ b/simutrans-data/distinfo
@@ -1,10 +1,6 @@
 $NetBSD$
 
-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 (pak128-2.6--ST120.zip) = af17a20dd638c137dc84b143abbb3b31459a8473
-RMD160 (pak128-2.6--ST120.zip) = 6c5e41dc3adbc83dae083986215fa30c78452a8b
-SHA512 (pak128-2.6--ST120.zip) = a642217a5213717ae710f8d42331ae704ec45027a71052b9cd09d137a96aaf4bdf40b13e4dc1183a69e782fcc943ca0a8ad43c0f0c04db106949e7d003a503b4
-Size (pak128-2.6--ST120.zip) = 95151992 bytes
+SHA1 (simupak64-120-2.zip) = c71bfeb4e9a77e6bbcd249c4c2342664833cf8f0
+RMD160 (simupak64-120-2.zip) = 8be6e6d265c86858810ec6e5d22c384fde28f2fe
+SHA512 (simupak64-120-2.zip) = c7f819142b66c093c8631fcfe8e70c3be667680d745a66eab65e06979f849592d2c09ed18eb33ca2e359b2830f57874ae23d989ab5aa901eece69de83180f357
+Size (simupak64-120-2.zip) = 4453079 bytes
diff --git a/simutrans-data/options.mk b/simutrans-data/options.mk
index a19e9ca3e6..2aebafc395 100644
--- a/simutrans-data/options.mk
+++ b/simutrans-data/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.simutrans
+PKG_OPTIONS_VAR=		PKG_OPTIONS.simutrans-data
 PKG_SUPPORTED_OPTIONS+=		pak64 pak128 pak128de pak64jp pak96hd
 PKG_SUGGESTED_OPTIONS=		pak64
 PLIST_VARS+=			pak64 pak128
@@ -20,8 +20,8 @@ DISTFILES=PAK128.german_0.9_120.x.zip
 .endif
 
 .if !empty(PKG_OPTIONS:Mpak64)
-DISTFILES+=simupak64-120-0-1.zip
-DISTNAME=simupak64-120-0-1
+DISTFILES+=simupak64-120-2.zip
+DISTNAME=simupak64-120-2
 WRKSRC=		${WRKDIR}/simutrans
 PLIST.pak64=             yes
 .endif
diff --git a/simutrans/Makefile b/simutrans/Makefile
index 98134c6419..edc2a2acc9 100644
--- a/simutrans/Makefile
+++ b/simutrans/Makefile
@@ -1,11 +1,13 @@
 # $NetBSD$
 
-PKGNAME=	simutrans-120.1.3
-DISTNAME=	simutrans-src-120-1-3
+PKGNAME=	simutrans-120.2.2
+DISTNAME=	simutrans-src-120-2-2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=simutrans/}
 DISTFILES+=     language_pack-Base+texts.zip
 SITES.language_pack-Base+texts.zip=http://simutrans-germany.com/translator/data/tab/
+DISTFILES+=     ${DISTNAME}${EXTRACT_SUFX}
+SITES.${DISTNAME}${EXTRACT_SUFX}=${MASTER_SITE_SOURCEFORGE:=simutrans/}120-2-2/${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -16,6 +18,7 @@ LICENSE=	artistic
 USE_TOOLS+=	pkg-config unzip gmake pax grep
 USE_LANGUAGES=	c++ c
 
+DEPENDS+=       simutrans-data-0.1{,nb*}:../../wip/simutrans-data
 
 GNU_CONFIGURE=	yes
 HAS_CONFIGURE=		yes
@@ -54,7 +57,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/script/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"
diff --git a/simutrans/PLIST b/simutrans/PLIST
index 2daae88081..97ffaff25e 100644
--- a/simutrans/PLIST
+++ b/simutrans/PLIST
@@ -14,6 +14,7 @@ share/simutrans/font/ro_font.fnt
 share/simutrans/history.txt
 share/simutrans/license.txt
 share/simutrans/license_squirrel.txt
+share/simutrans/ai/readme.txt
 share/simutrans/music/01-Simutrans-Main-Theme.mid
 share/simutrans/music/02-Gotta-catch-that-train.mid
 share/simutrans/music/03-Sunday-drivers.mid
@@ -60,9 +61,6 @@ share/simutrans/music/music.tab
 share/simutrans/music/readme.txt
 share/simutrans/problem_report.txt
 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
@@ -183,7 +181,6 @@ share/simutrans/text/de/password.txt
 share/simutrans/text/de/players.txt
 share/simutrans/text/de/privatesign_info.txt
 share/simutrans/text/de/railtools.txt
-share/simutrans/text/de/readme.html
 share/simutrans/text/de/roadtools.txt
 share/simutrans/text/de/save.txt
 share/simutrans/text/de/scenario.txt
@@ -219,7 +216,6 @@ share/simutrans/text/dk/new_world.txt
 share/simutrans/text/dk/options.txt
 share/simutrans/text/dk/players.txt
 share/simutrans/text/dk/railtools.txt
-share/simutrans/text/dk/readme
 share/simutrans/text/dk/roadtools.txt
 share/simutrans/text/dk/save.txt
 share/simutrans/text/dk/schedule.txt
@@ -474,8 +470,8 @@ 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
 share/simutrans/text/ja/scenario.txt
+share/simutrans/text/ja/schedule.txt
 share/simutrans/text/ja/settings.txt
 share/simutrans/text/ja/shiptools.txt
 share/simutrans/text/ja/signal_spacing.txt
diff --git a/simutrans/distinfo b/simutrans/distinfo
index 8814281553..c2ebd576a2 100644
--- a/simutrans/distinfo
+++ b/simutrans/distinfo
@@ -1,9 +1,13 @@
 $NetBSD$
 
-SHA1 (language_pack-Base+texts.zip) = 1ccaff0dc55d99f9666bab95e6c775849a1dad44
-RMD160 (language_pack-Base+texts.zip) = 442bc1ba6f077c3612cbb775f86323920b9e4171
-SHA512 (language_pack-Base+texts.zip) = 28d47db0d4c6b7a7df35494ba2fc4711bfaeacc2999f25227224a714254f2c96a03e171b9e99acc042daf32283c0d3285d4e29b8419c539a04db2ef882215aa5
-Size (language_pack-Base+texts.zip) = 1098668 bytes
-SHA1 (patch-Makefile) = 5f6629257a6685002c98cd3279b69afb72669434
-SHA1 (patch-boden_wege_weg.cc) = 6982abea4218fc810d63dd5d77edccb23faa9224
+SHA1 (language_pack-Base+texts.zip) = 13b1fa9f0eb0f38f163ff3336d25dfc5ea300220
+RMD160 (language_pack-Base+texts.zip) = 0cbb02e163f60ccdd11ea4491983ed5a8dd3429c
+SHA512 (language_pack-Base+texts.zip) = 580849d10d2a9561b53e893fc6618e2da0a6a7241e16a846a85ee0570741f12bf0272337f35ad958f2367eb4ae457977cee37c28c236eb12248f47359ecbc51c
+Size (language_pack-Base+texts.zip) = 1098522 bytes
+SHA1 (simutrans-src-120-2-2.zip) = 026d4780f33ae09b0afb22e73dc85f3fb4658c78
+RMD160 (simutrans-src-120-2-2.zip) = b7ebc754c12b6d053ff60399893d7f0619f35b82
+SHA512 (simutrans-src-120-2-2.zip) = db9797be132bb1936d8c3192e536523d1249d20a513f3758037097ef46c2bab40d4be8adb68cb21eda2b4820369e89bd0a6e2abc4fe2bbcefe40bb414a3d1ab2
+Size (simutrans-src-120-2-2.zip) = 3900947 bytes
+SHA1 (patch-Makefile) = 35574cd19658298a224dc40f989c19d064809ccb
+SHA1 (patch-boden_wege_weg.cc) = d29489ad2ca66d32a464a5571d9ca7e13c2e202d
 SHA1 (patch-utils_simthread.h) = 89f88a753f467b2eb9e11ad76c6d2427663f8f2a
diff --git a/simutrans/patches/patch-Makefile b/simutrans/patches/patch-Makefile
index e93a1d30ba..afafae8d45 100644
--- a/simutrans/patches/patch-Makefile
+++ b/simutrans/patches/patch-Makefile
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- Makefile.orig	2016-01-09 22:36:24.000000000 +0000
+--- Makefile.orig	2017-03-29 09:04:15.000000000 +0000
 +++ Makefile
-@@ -1,6 +1,14 @@
+@@ -1,6 +1,15 @@
  CFG ?= default
  -include config.$(CFG)
  
@@ -14,6 +14,7 @@ $NetBSD$
 +OSTYPE=freebsd
 +VERBOSE=1
 +MULTI_THREAD=1
- 
++
  BACKENDS      = allegro gdi opengl sdl sdl2 mixer_sdl posix
  COLOUR_DEPTHS = 0 16
+ OSTYPES       = amiga beos cygwin freebsd haiku linux mingw mac
diff --git a/simutrans/patches/patch-boden_wege_weg.cc b/simutrans/patches/patch-boden_wege_weg.cc
index f27e427979..c5c4fd08ae 100644
--- a/simutrans/patches/patch-boden_wege_weg.cc
+++ b/simutrans/patches/patch-boden_wege_weg.cc
@@ -1,23 +1,23 @@
 $NetBSD$
-Work around threading bug in simutrans
---- boden/wege/weg.cc.orig	2015-11-29 19:41:00.000000000 +0000
+
+--- boden/wege/weg.cc.orig	2017-03-04 01:40:29.000000000 +0000
 +++ boden/wege/weg.cc
 @@ -420,9 +420,6 @@ void weg_t::unlock_mutex()
  
  void weg_t::calc_image()
  {
 -#ifdef MULTI_THREAD
--	pthread_mutex_lock( &weg_calc_bild_mutex );
+-	pthread_mutex_lock( &weg_calc_image_mutex );
 -#endif
  	grund_t *from = welt->lookup(get_pos());
  	grund_t *to;
- 	image_id old_bild = bild;
+ 	image_id old_image = image;
 @@ -434,9 +431,6 @@ void weg_t::calc_image()
  		if(  from==NULL  ) {
- 			dbg->error( "weg_t::calc_bild()", "Own way at %s not found!", get_pos().get_str() );
+ 			dbg->error( "weg_t::calc_image()", "Own way at %s not found!", get_pos().get_str() );
  		}
 -#ifdef MULTI_THREAD
--		pthread_mutex_unlock( &weg_calc_bild_mutex );
+-		pthread_mutex_unlock( &weg_calc_image_mutex );
 -#endif
  		return;	// otherwise crashing during enlargement
  	}
Home | Main Index | Thread Index | Old Index