Update games/openttd from 0.4.0.1 to 0.4.8rc2

All pkgsrc patches appear to have been committed
Resolves security issue:
	http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1999

0.4.8-RC2 (2006-07-31)
------------------------------------------------------------------------
- Feature: Add Italian town names as we have an official Italian translation
- Codechange: Verify the presence of music files in the gm/ folder. This should also solve some 100% CPU buildup for some users.
- Fix: Certain combinations of trains crash when moved around inside the depot.
- Fix: Reversed arrow-sign in the multiplayer list column headers on sort by name
- Fix: Industry production change button doesn't work for oilrig passangers.
- Fix: Helicopters stopping in depot after autorenew/autoreplace
- Fix: MorphOS crashes when you go a level up in the root level
- Fix: UDP sockets were used even if network-availability was set to false
- Fix: Crash when trying to build a vehicle type that is set to a max of zero

0.4.8-RC1 (2006-06-28)
------------------------------------------------------------------------
- Feature: Add Turkish town names as we have an official Turkish translation
- Feature: Add a fully optional configure script that is a wrapper around the cumbersome makefile.config
- Codechange: [NPF] Disable NPF totally for ships as it wholly kills performance (blathijs). Only for 0.4/ branch and 0.4.8.
- Fix: Redraw the screen when switching the signal side in the patches window
- Fix: It was possible to dig into a tunnel if certain rail combinations were ontop of it
- Fix: A HQ could only be flooded at its northern tile, the other 3 were immune to water
- Fix: Fix several glitches concerning foundations. Houses, property (rail/road/bridge/etc.) and cursor are now aligned properly
- Fix: Prohibit altering a road tile while road works are in progress. This fixes some glitches like "turning" the excavation by adding/removing road bits or removing the road piece
- Fix: Only advertise the server to your external IP/network (eg not to 127.0.0.1) and use proper broadcast addresses
- Fix: '-f' switch is not valid on windows, so don't show it in help
- Fix: [autoreplace] Autoreplaced trains can leave all wagons in depot under certain circumstances
- Fix: The wrong IP could get unbanned, e.g. 'unban 1.2.3.42' could result in unbanning 1.2.3.4
- Fix: It was possible to convert the railtype of a bridge while a train was on it
- Fix: It was possible to rename signs or waypoints with the chat box
- Fix: Be more strict what it means for an aircraft to be in a hangar: It's not just being stopped on a hangar tile
- Fix: If a road vehicle is on a road depot tile and stopped doesn't mean it's in the depot. Use the proper test for this
- Fix: [AI] The AI should send a plane into a hangar if it's not in a hangar _or_ not stopped, not when it's not in a hangar _and_ not stopped
- Fix: [AI] The trolly AI used information from the wrong industry when calculating the amount of to be transported goods
- Fix: [NTP] Fix NTP over bridges: don't check the rail type when on a bridge
- Fix: Truncate text in dropdown lists to stop text overflowing.
- Fix: "Erroneous train reversal on waypoints". When processing the next train order, do not even consider reversing the train if the last order was to a waypoint.
- Fix: Starting a new scenario did not adhere to local difficulty settings but took it from the scenario itself. That mode is for 'play scenario'
- Fix: Vehicles on a sloped tile under a bridge were affected by the bridge speed limit
- Fix: Issue with train pathfinding over level crossings.
- Fix: [AI] The AI no longer attempts to build signals under bridges.
- Fix: Refresh build vehicle window (if opened) when converting rail depot
- Fix: Crash when sorting an empty server list.
- Fix: The build-tree window button defaulted to a place-push-button on opening where no treetype is selected.
- Fix: Game crashes when cloning/autoreplace reaches train-limit
- Fix: [NTP] properly check for railtypes on non-plain-rail-tiles
- Fix: Trains could enter certain sloped rail tiles under bridges with incompatible rail type
- Fix: Ensure the map memory is cleared after it is allocated. This fixes random deserts that sometimes occurred.
- Fix: Some weird behaviour with tile selection near bridges
- Fix: Don't allow PF to enter train depot from the back (signal updates)
- Fix: Game no longer crashes when the last vehicle servicing a station has been deleted
- Fix: Reset the last built railtype when starting a new game
- Fix: Cloned vehicles get the same service interval as the original vehicle
- Fix: Game no longer errors out when "Many random towns" is selected in the scenario editor.
- Fix: Obscure road dragging bug. The road build command did not return the appropiate error message of invalid-slope when building road.
- Fix: Temperate bank will no longer appear (during game) in tropic landscape. This bug is from the original game.
- Fix: Specify the 'stopall' console command as a debug command.
- Fix: Fixed a problem that caused DeliverGoodsToIndustry to not work as intended
- Fix: Ships and aircraft can now be used as feeders as well
- Fix: When a multiheaded train is sold the pointers were not updated correctly causing sporadious crashes/disconnects.
- Fix: New plantations now cause the correct ".. being planted .." news item
- Fix: Danish town names were saved/loaded as Swiss
- Fix: Removing roads on crossings was done without a check for ownership
- Fix: [autoreplace] Fix drawing of train list for outdated engines
- Fix: Malicious clients/servers could crash the game
- Fix: [autoreplace] allow replacement of wagons even when the engine fails to be replaced
- Fix: Certain operations involving trains inside a depot could cause a crash
- Fix: [autoreplace] cost for refitting a new vehicle is added to the cost animation (player always paid for it, it just wasn't shown)
- Fix: [OSX] Save/Load issues solved for OSX 10.3.9 universal binaries
- Fix: Illegal servers in the master-server list could kick the client back to the main menu, effectively making Multiplayer impossible
- Fix: [NPF] Don't mark tiles when debugging in multiplayer, this will cause desyncs
- Fix: Several fixes to chatbox code, mainly plug a buffer overflow

0.4.7 (2006-03-26)
------------------------------------------------------------------------

- Feature: [OSX] Add support for triple-binaries (PPC, PPC970, i386) (r4102)
- Fix: [OSX] crash when going to fullscreen (r4100)
- Fix: Allow unused wagons to have their first cache set. Fixes faulty cache-warning message and noticably speeds up depot operations (r4094)
- Fix: [NPF] Trains & busses were unable to find a route when leaving a depot or bus stop. (r4072)

0.4.6 (2006-03-22)
------------------------------------------------------------------------

- Codechange: [win32] Show the revision in crash.txt and enable the button to show the crash text in the crash-window (r3965)
- Codechange: Add additional linker information to release builds to help figure out crashes more easily (r3526)
- Fix: [OSX 10.3 and newer] [ 1157244 ] Can't save game if name contains german umlauts (loading savegames with certain chars still look odd) (r4038)
- Fix: [OSX] major speedup for PPC fullscreen (r4034)
- Fix: [Makefile] Make sure the ICON_DIR gets created before copying files there. (r4032)
- Fix: [win32] Change compiler settings to use the multithreaded CRT. This prevents certain crashes on multi-threaded machines. (r4031)
- Fix: [ 1453646 NPF ] Road vehicles planning through the back of depots and stations. (r4029)
- Fix: Use the title of a savegame in the saveload dialog-editbox. (r4018)
- Fix: Improper resolution written to the configuration file when exiting from fullscreen. (r4017)
- Fix: When removing rail track from a tile where only X and Y pieces exist, explicitly update signals in both directions. (r4016)
- Fix: Default the patch-setting 'pause_on_join' to true. (r4015)
- Fix: Slope and height information returned for some tile types is wrong (r4014)
- Fix: Fixes a bug introduced by r3228 which allowed steep rail tiles resulting in ... unwanted effects such as display artifacts. (r4012)
- Fix: Update french translation (r3978)
- Fix: FS#56 - [Crash] Missing glyph(s) in big-font. Added several missing glyphs for the big font. (r3970)
- Fix: [ 1439907 ] Increase client list window width so at least most languages fit. (r3969)
- Fix: Update german and finnish languages. (r3968)
- Fix: Properly set back the owner of a crossing/road-under bridge after removing it. (r3967)
- Fix: [autoreplace]: (FS#67) autoreplacing trains now keep their tile length instead of their pixel length. (r3964)
- Fix: Mark the right tile as dirty. It's just a graphical glitch which happend in r1592. (r3962)
- Fix: Fix crash when resizing news history window. (r3961)
- Fix: Correctly implement minimum search, so road vehicles head twoards the closest station, not the last one in the list. (r3960)
- Fix: [FS#61] The tooltips for raising and lowering land buttons in the scenario editor are interchanged (r3959)
- Fix: Correctly restore the roadside after roadworks are finished. (r3957)
- Fix: [Multistop] Check the status of the destination road stop instead of a station's first road stop. This only has effect with road vehicle queuing disabled. (r3956)
- Fix: validate the setting of max_companies/spectators through the console. (r3955)
- Fix: Improve game-load times. (r3954)
- Fix: On loading a game, GetPlayerRailtypes() didn't account for the fact that vehicles are introduced a year after their introduction date. This will also relieve possible (rare) network desyncs. (r3952)
- Fix: Restore plural forms of cargo types for several languages. (r3951)
- Fix: [win32] Add directives to allow Visual Studio 2005 compilation. (r3950)
- Fix: [ 1415782 ] crash in string code with openbsd/zaurus; alignment issues (r3948)

0.4.5 (2006-01-31)
------------------------------------------------------------------------

- Feature: [newgrf] Implement varaction2 property 0x41 and 0xDA. (2361)
- Feature: giving server_ip a value of 'all' will make the server listen on any interface (2374)
- Feature: shortcut CTRL + U that clears the current input-box (2385)
- Feature: [newgrf] Implement the mechanism for handling newgrf callbacks (2389)
- Feature: [newgrf] Implement the 'refit capacity' callback (2389)
- Feature: saving games happen in a seperate thread (2391)
- Feature: [newgrf] Implement powered wagons, and the callback that goes with it (2414)
- Feature: [newgrf] Implement shorter train vehicles (2428)
- Feature: New display option: 'transparent station signs' (2438)
- Feature: You can now give transfer order to set up feeder systems (2441)
- Feature: Removing tracks with the 'remove' tool, automatically removes signals on the tracks (2469)
- Feature: [localisation] Allow changing the order of parameters in translated strings (2573)
- Feature: [localisation] New way to specify plural forms (2592)
- Feature: [localisation] Support genders (2594)
- Feature: [localisation] Support cases (2597)
- Feature: add support for truncating strings to a given (pixel) length (2607)
- Feature: Overhaul DirectMusic MIDI backend, remove "experimental" status (2712)
- Feature: Change the driver probing algorithm: Use the first music/sound/video which succeeds initialising instead of bailing out after the first. No need to specify -snull if no soundcard is present anymore (2728)
- Feature: The Main Toolbar Dropdown Menu can now display disabled items (2734)
- Feature: Clone vehicles (2764)
- Feature: When starting without a config file determine the language on basis of the current locale (2777)
- Feature: [NewGRF] Add support for "extended bytes" (2872)
- Feature: [localisation] Major step twoards ISO-8859-15: Implement missing characters (2879)
- Feature: Implement the console command rm to remove savegames (2941)
- Feature: Danish town names (2957)
- Feature: Menu option to toggle console (2958)
- Feature: Calculate proportions of non-square giant screenshot correctly (2963)
- Feature: [newgrf] Implement current set of action D (ParamSet) operations (2968)
- Feature: [newgrf] Show a wagon's speed limit in purchase list (2969)
- Feature: [newgrf] Support loading VarAction2 parameter for variables 0x60-0x7F (2971)
- Feature: [newgrf] Add patch option for wagon speed limits (2982)
- Feature: [newgrf] Support loading of bridge attributes and tables from GRF (3004)
- Feature: Native Support for Win64 (3008)
- Feature: OSX now uses quicktime to play midi files (3022)
- Feature: [OSX] Command+Q now works in main menu (3027)
- Feature: Allow unbanning players based on banlist-id (as well as IP) (3067)
- Feature: 'status' and 'clients' now show the IP of the players (3067)
- Feature: Make it possible to create a screenshot from the console that is both big and has no console, or any combination of (3068)
- Feature: [newgrf] Add support for rail vehicle weight greater than 255 tons (3071)
- Feature: 'HOME' icon to saveload dialogs that jumps to the default save/load directory based on the dialog (3096)
- Feature: Turkish translation (3120)
- Feature: [newgrf] Support positioning of rail vehicle visual effects (3132)
- Feature: [newgrf] Support for articulated rail vehicles (3139)
- Feature: [newgrf] Add support for cargo refitting specification by cargo classes (3148)
- Feature: [newgrf] Action 7/9 new value : is it TTDPatch or OpenTTD? (3152)
- Feature: Drag and drop rocky areas in scenario editor (3153)
- Feature: Added patch option to link the terraform toolbar to the rail, road, water and airport toolbars (3157)
- Feature: Right-Click-Scrolling optionally moves in the opposite direction (3222)
- Feature: Native cocoa sound and video drivers for OSX (3281)
- Feature: [newgrf] Allow train running cost class to differ from engine class (3388)
- Feature: Kick and ban now with IP numbers (3407)
- Feature: Allow seeing and setting the maximum amount of companies and spectators for a server. This can be changed/viewed during runtime as well in the console (3427)
- Feature: Allow the network game list to be sorted (by name/clients/compatibility ascending/descending) (3441)
- Feature: Make it possible to ban offline clients (3469)
- Fix: The refit window now shows the correct refit options (2365)
- Fix: Refitting to a cargo which is already carried by some vehicles takes their capacities into account for display (2365)
- Fix: Add 'multihead' TTDPatch option to OpenTTD newgrf flags-emulation (2368)
- Fix: make install tried to install scenarios in the (non-existing) personal dir when USE_HOMEDIR is specified (2371)
- Fix: [console] update the example scripts in the scripts/ directory to reflect the new console functionality (2372)
- Fix: [console] any line starting with a '#' is a comment so ignore it (2372)
- Fix: [console] The special variables whose value can only be set by a custom process should, also print out their newly set value there (2372)
- Fix: [newgrf] Ignore action 0 prop 0x20 (air drag) (2377)
- Fix: [newgrf] Further property stubs, help prevents subsequent incorrect reading of newgrf data (2378)
- Fix: Build year for mail compartment of planes was not set correctly, affected station ratings (2380)
- Fix: Endgame window on easy difficulty resulted in infinite loop (2381)
- Fix: Check the airport type when building an airport (2382)
- Fix: Monkey-testing turned up some command crashes (2383)
- Fix: Check selling land and setting player colour. Also an extra map-bounds check for terraforming (2384)
- Fix: [realistic accel] Very slow trains no longer get an increase in maximum speed when part of them is in a depot (2388)
- Fix: [newgrf] Load power for dual-headed engines correctly (2400)
- Fix: [newgrf] When resolving callbacks, dont ignore wagon overrides (2410)
- Fix: Station ratings aren't affected by speed limits from realistic acceleration anymore (2411)
- Fix: building vehicles without depot crashed the game (2412)
- Fix: certain resolutions caused a crash when minimap was partly dragged outside the game window (2424)
- Fix: Deleting canals under bridges removed bridges first in certain configurations (2436)
- Fix: [NPF] Vehicles try to drive into a tunnel entrance from above (2471)
- Fix: [newgrf] Some road vehicle action 0 properties were loaded as the wrong type (int8,int16,int32) causing undefined results. (like cargo types being wrong) (2474)
- Fix: The console variable autoclean_unprotected was linked to the variable _network_autoclean_protected (2498)
- Fix: Old bug in the PCX writer: The first pixel column contained garbage, the picture was shifted one to the right, and the last column was dropped (2512)
- Fix: Using the mouse wheel could lead to a crash if mouse was not over a widget (2530)
- Fix: blinking 'lock' gfx in multiplayer games (2548)
- Fix: Remove original train pathfinder. Enhanced old pathfinder. (2553)
- Fix: Spaces in the path to the MIDI files caused the win32 MIDI player to fail (2563)
- Fix: set server map name to the loaded name of the game/scenario (2610)
- Fix: Improve the old pathfinder. Changed it to A* instead of Dijkstra. Benchmark shows that NTP is now around 10x faster than NPF (2635)
- Fix: Correctly save and load company_value, it's 64 bits wide, not 32 bits (2684)
- Fix: Volume control works now for the DirectMusic MIDI backend (2712)
- Fix: Change the fence algorithm so it removes fences when no farm tile is adjacent (2739)
- Fix: Tree tiles above the snow line got redrawn disproportionately often (2750)
- Fix: Depots could build trains of the wrong track type (2764)
- Fix: Sort the directories in the scenarion/savegame list (2860)
- Fix: On OS/2 show the trailing \ if the current directory is a root directory (2860)
- Fix: Return a proper version number, when testing the TTDPatch version in the SkipIf action (2862)
- Fix: Change the way NewGRFs are loaded, this saves quite some sprite slots - about 2000 for DBSetXL for example (2868)
- Fix: Several format string vulnerabilities and buffer overflows in the network code (2899)
- Fix: fixed issue where autorenewed vehicles didn't get all stats updated (2912)
- Fix: Exit the child of the extmidi backend with _exit() instead of exit(), because we don't want any atexit handlers - especially flushing output streams - to run, if exec() fails (2938)
- Fix: Server crash with "say"-command (2950)
- Fix: Fix win32 midi volume level control which didn't work (2960)
- Fix: [OSX] quitting the game no longer leaves a process behind that eats all the CPU power (3281)
- Fix: Fix for [ 1216203 ] UFO-broken waypoint (2961)
- Fix: [newgrf] Include missing grf feature canal
- Fix: [newgrf] Add bounds checking to VehicleChangeInfo for vehicles
- Fix: [newgrf] Wagon speed limits don't apply for wagons with livery overrides
- Fix: Align settings pool items to the size of void* to fix bus errors on 64bit architectures which require aligned variables (2976)
- Fix: restart_game_date is an UINT16, not a BYTE. Now setting the game restart year via the console should work (2987)
- Fix: [newgrf] Some GRF files don't specify a name or description, in which case the Action 8 is 8 bytes, not 9 (3005)
- Fix: The finnish markka was never abbreviated with capital letters (3021)
- Fix: Improve handling of non-existent sprite sets (3044)
- Fix: Don't attempt to map and empty sprite group to a vehicle (3045)
- Fix: Fixed typo and hang for BeOS Networking (3053)
- Fix: On Win98 and lower when you go to the root directory of a drive (eg. C:\) you were stuck there indefinitely and couldn't change any directories or see any files (3056)
- Fix: Complete rewrite of autoreplace; multiheaded train engines are replaced correctly (3081)
- Fix: A new train is now made if the front unit is an engine and the former front engine is moved away (3144)
- Fix: There are only 2 possible directions for ship depots, not 4 (3199)
- Fix: Allow bribing up to the maximum rating for bribing, don't disable this option at some arbitrary value early (3201)
- Fix: Don't lower land on tunnel, even with diag tracks on it (3228)
- Fix: Crash when making a screenshotin the main menu (3235)
- Fix: Crash when starting a scenarion via 'New Game' fails (3235)
- Fix: Determine clicked status of sticky icon from window flags rather than the widget click state (3247)
- Fix: Graphical glitch with autorail tool on a certain tile-types (3254)
- Fix: Center the X of the window close button (3302)
- Fix: [newgrf] Unload engine names before loading grf files (3316)
- Fix: Network window crash when it receives invalid information for example from the integrated nightly, so validate the network-input when it is received (3322)
- Fix: Build failed if SDL is built without pthread support (3326)
- Fix: Move initialization of vehicle random_bits to DC_EXEC blocks to allow use of Random() instead of InteractiveRandom(), which will alleviate some possib le network desyncs (3352)
- Fix: The default AI tried to change the service intervals of vehicles via the CMD_CHANGE_TRAIN_SERVICE_INT command - regardless of the type of the vehicle (3367)
- Fix: Out-of-bounds array access when road vehicles overtook in a curve caused desyncs (3371)
- Fix: Update signal states when building or removing rail station blocks (3372)
- Fix: Don't allow trains to get bigger than 100 via drag and drop (3374)
- Fix: Don't reset date in the scenario editor when pressing RandomLand (3376)
- Fix: [newgrf] Running cost should be halved for dual head vehicles (3384)
- Fix: No fence was placed when placing fences and the neighbouring tile is a rail configuration which permits a fence but has a signal (3389)
- Fix: [newgrf] Ignore non-climate dependent cargo types (3394)
- Fix: [newgrf] Only add a random number of days to an engine's base introduction date if that date is not 0 (3410)
- Fix: When changing the server password via the console, actually set the password as well as flag whether it is required (3411)
- Fix: Under certain conditions placing a road tile parallel under a bridge would, instead of failing, succeed and place a perpendicular piece (3413)
- Fix: Disable the Fund New Industry menu item and window when connected to a server as a spectator (3414)
- Fix: Disable the clone and refit buttons in the train view when viewing another player's vehicles, or as a spectator (3415)
- Fix: Disallow building an oil rig above sea level (3416)
- Fix: When removing a town-owned tunnel the player's rating was not reduced (3418)
- Fix: (Possible) game crash on removing track/road under bridge if a vehicle was on the track/road under the bridge and the track/road sloped (3419)
- Fix: [newgrf] Only power should decide whether a rail vehicle is an engine or a wagon. (fixes SHIKI 810 in jpsetw.grf) (3424)
- Fix: Incorrect validating of tree-planting command which can allow a buffer-overflow (3446)
- Fix: [newgrf] When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf) (3449)
- Fix: You couldn't remove an item from a list-type of config ingame from the configuration file (3475)
- Fix: [newgrf] Always reinitialize the ttdpatch flags as patch settings may have changed (3486)
- Fix: Price for demolishing a bridge was dependent on orientation and map size (3487)

13 files changed, 18 insertions, 254 deletions

diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 47095f12f3f..e107284d328 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2006/06/12 16:28:10 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/08/10 13:28:37 abs Exp $
 
-DISTNAME=	openttd-0.4.0.1-source
-PKGNAME=	openttd-0.4.0.1
-PKGREVISION=	6
+DISTNAME=	openttd-0.4.8-RC2-source
+PKGNAME=	openttd-0.4.8rc2
 CATEGORIES=	games x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=openttd/}
 
 MAINTAINER=	froz@icix.org
 HOMEPAGE=	http://www.openttd.com/
 COMMENT=	Open source clone of Transport Tycoon Deluxe
+EXTRACT_SUFX=	.tar.bz2
 
 USE_TOOLS+=	gmake pkg-config
 
@@ -23,17 +23,17 @@ MAKE_ENV+=	PERSONAL_DIR=.openttd
 MAKE_ENV+=	WITH_NETWORK=1
 MAKE_ENV+=	X11BASE=${X11BASE:Q}
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/${DISTNAME:S:-source::}
 
 INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/openttd ${PREFIX}/bin
-	@${INSTALL_DATA_DIR} ${DATA_DIR}
-	@${INSTALL_DATA_DIR} ${DATA_DIR}/lang
-	@${INSTALL_DATA_DIR} ${DATA_DIR}/data
-	@${INSTALL_DATA_DIR} ${DATA_DIR}/docs
-	@${INSTALL_DATA_DIR} ${DATA_DIR}/gm
+	${INSTALL_DATA_DIR} ${DATA_DIR}
+	${INSTALL_DATA_DIR} ${DATA_DIR}/lang
+	${INSTALL_DATA_DIR} ${DATA_DIR}/data
+	${INSTALL_DATA_DIR} ${DATA_DIR}/docs
+	${INSTALL_DATA_DIR} ${DATA_DIR}/gm
 	${INSTALL_DATA} -m 644 ${WRKSRC}/lang/*.lng ${DATA_DIR}/lang
 	${INSTALL_DATA} -m 644 ${WRKSRC}/data/* ${DATA_DIR}/data
 	${INSTALL_DATA} -m 644 ${WRKSRC}/readme.txt ${DATA_DIR}/docs
diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index e28e2ba73ea..e5a2b446d68 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2005/09/26 16:28:31 rpaulo Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/08/10 13:28:37 abs Exp $
 bin/openttd
 share/games/openttd/data/autorail.grf
 share/games/openttd/data/canalsw.grf
 share/games/openttd/data/dosdummy.grf
+share/games/openttd/data/nsignalsw.grf
 share/games/openttd/data/openttd.grf
 share/games/openttd/data/opntitle.dat
-share/games/openttd/data/signalsw.grf
 share/games/openttd/data/trkfoundw.grf
 share/games/openttd/docs/Manual.txt
 share/games/openttd/docs/changelog.txt
@@ -18,6 +18,7 @@ share/games/openttd/lang/czech.lng
 share/games/openttd/lang/danish.lng
 share/games/openttd/lang/dutch.lng
 share/games/openttd/lang/english.lng
+share/games/openttd/lang/estonian.lng
 share/games/openttd/lang/finnish.lng
 share/games/openttd/lang/french.lng
 share/games/openttd/lang/galician.lng
@@ -25,8 +26,6 @@ share/games/openttd/lang/german.lng
 share/games/openttd/lang/hungarian.lng
 share/games/openttd/lang/icelandic.lng
 share/games/openttd/lang/italian.lng
-share/games/openttd/lang/latvian.lng
-share/games/openttd/lang/lithuanian.lng
 share/games/openttd/lang/norwegian.lng
 share/games/openttd/lang/origveh.lng
 share/games/openttd/lang/polish.lng
@@ -35,6 +34,7 @@ share/games/openttd/lang/romanian.lng
 share/games/openttd/lang/slovak.lng
 share/games/openttd/lang/spanish.lng
 share/games/openttd/lang/swedish.lng
+share/games/openttd/lang/turkish.lng
 @dirrm share/games/openttd/lang
 @dirrm share/games/openttd/docs
 @unexec ${RMDIR} %D/share/games/openttd/data 2>/dev/null || ${TRUE}
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index 8a422293636..d80ab9db90a 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,15 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/09/11 11:44:29 adrianp Exp $
+$NetBSD: distinfo,v 1.4 2006/08/10 13:28:37 abs Exp $
 
-SHA1 (openttd-0.4.0.1-source.tar.gz) = 992d3d497161b63cb8de94f34ed63611e23ae08e
-RMD160 (openttd-0.4.0.1-source.tar.gz) = 4bd07812c27cf7a637feaf92ee66ccdff56c6b65
-Size (openttd-0.4.0.1-source.tar.gz) = 2950778 bytes
-SHA1 (patch-aa) = aebea9710752bd4b8a7f5562f0ee49ac8b071d68
-SHA1 (patch-ab) = 1353468886982f88180279319e704a70ace8301f
-SHA1 (patch-ac) = ed02aac0e304c8b32783d0d9e8c5c6c0a0922743
-SHA1 (patch-ad) = edcab881f70c59bf02b6ef434255d8ba0a1852a6
-SHA1 (patch-ae) = fe505481f222ec850cf62dcd7780b47ae655ebb8
-SHA1 (patch-af) = 5eac3df49f155e6640870de59730946c8571ee64
-SHA1 (patch-ag) = 08fffdde2f6fb5bda88f044365f9bc87082e0247
-SHA1 (patch-ah) = 9de971efd8647673a32185dbfc5a5ec2bc294c72
-SHA1 (patch-ai) = 5d7fee67d031eac8b9796d58a8783412df3ac639
-SHA1 (patch-aj) = a6949e266c9b65289d84b7e973481350f4b786aa
+SHA1 (openttd-0.4.8-RC2-source.tar.bz2) = 26351512d98e81fb06d5964683aea8c24c9606f8
+RMD160 (openttd-0.4.8-RC2-source.tar.bz2) = 59a66b05ce563a1c5d12b0f5ebe4bee818c8fe94
+Size (openttd-0.4.8-RC2-source.tar.bz2) = 2211442 bytes
diff --git a/games/openttd/patches/patch-aa b/games/openttd/patches/patch-aa
deleted file mode 100644
index 694b2c81911..00000000000
--- a/games/openttd/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/09/08 19:06:03 rpaulo Exp $
-
---- makefiledir/Makefile.libdetection.orig	2005-05-16 09:30:32.000000000 +0100
-+++ makefiledir/Makefile.libdetection	2005-09-07 22:45:41.000000000 +0100
-@@ -66,7 +66,7 @@
- WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
- 
- # libpng detection
--WITH_PNG:=$(shell libpng-config --version 2>/dev/null)
-+WITH_PNG:=$(shell pkg-config --version libpng12 2>/dev/null)
- 
- ifdef WITH_PNG
- # LibPNG depends on Zlib
diff --git a/games/openttd/patches/patch-ab b/games/openttd/patches/patch-ab
deleted file mode 100644
index fe84877584f..00000000000
--- a/games/openttd/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/09/08 19:06:03 rpaulo Exp $
-
---- Makefile.orig	2005-05-21 23:39:44.000000000 +0100
-+++ Makefile	2005-09-07 23:27:16.000000000 +0100
-@@ -458,19 +458,12 @@
- # libpng config
- ifdef WITH_PNG
- CDEFS += -DWITH_PNG
--CFLAGS += $(shell libpng-config --cflags)
-+CFLAGS += $(shell pkg-config --cflags libpng12)
- 
--# seems like older libpng versions are broken and need this
--PNGCONFIG_FLAGS = --ldflags --libs
- ifdef STATIC
--ifdef OSX
--# Seems like we need a tiny hack for OSX static to work
--LIBS += $(shell libpng-config --prefix)/lib/libpng.a
--else
--LIBS += $(shell libpng-config --static $(PNGCONFIG_FLAGS))
--endif
-+LIBS += $(shell pkg-config --static libpng12)
- else
--LIBS += $(shell libpng-config  --L_opts $(PNGCONFIG_FLAGS))
-+LIBS += $(shell pkg-config --libs libpng12)
- endif
- endif
- 
diff --git a/games/openttd/patches/patch-ac b/games/openttd/patches/patch-ac
deleted file mode 100644
index ea6fb1ae6d6..00000000000
--- a/games/openttd/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/09/11 11:44:29 adrianp Exp $
-
---- console_cmds.c.orig	2005-05-20 18:59:24.000000000 +0100
-+++ console_cmds.c
-@@ -1101,7 +1101,7 @@ DEF_CONSOLE_HOOK(ConProcPlayerName)
- 			SEND_COMMAND(PACKET_CLIENT_SET_NAME)(_network_player_name);
- 		} else {
- 			if (NetworkFindName(_network_player_name)) {
--				NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, _network_player_name);
-+				NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", _network_player_name);
- 				ttd_strlcpy(ci->client_name, _network_player_name, sizeof(ci->client_name));
- 				NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
- 			}
diff --git a/games/openttd/patches/patch-ad b/games/openttd/patches/patch-ad
deleted file mode 100644
index 90076115f5a..00000000000
--- a/games/openttd/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- network.c.orig	2005-05-17 17:01:19.000000000 +0100
-+++ network.c
-@@ -96,7 +96,7 @@ void CDECL NetworkTextMessage(NetworkAct
- 	StringID TempStr = STR_NULL;
- 
- 	va_start(va, str);
--	vsprintf(buf, str, va);
-+	vsnprintf(buf, lengthof(buf), str, va);
- 	va_end(va);
- 
- 	switch (action) {
-@@ -507,7 +507,7 @@ void NetworkCloseClient(NetworkClientSta
- 
- 		GetString(str, STR_NETWORK_ERR_CLIENT_GENERAL + errorno);
- 
--		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
- 
- 		// Inform other clients of this... strange leaving ;)
- 		FOR_ALL_CLIENTS(new_cs) {
diff --git a/games/openttd/patches/patch-ae b/games/openttd/patches/patch-ae
deleted file mode 100644
index 413b35f541e..00000000000
--- a/games/openttd/patches/patch-ae
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- network_client.c.orig	2005-05-15 19:50:55.000000000 +0100
-+++ network_client.c
-@@ -344,7 +344,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER
- 	if (ci != NULL) {
- 		if (playas == ci->client_playas && strcmp(name, ci->client_name) != 0) {
- 			// Client name changed, display the change
--			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, name);
-+			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", name);
- 		} else if (playas != ci->client_playas) {
- 			// The player changed from client-player..
- 			// Do not display that for now
-@@ -665,7 +665,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER
- 
- 	ci = NetworkFindClientInfoFromIndex(index);
- 	if (ci != NULL) {
--		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, str);
-+		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str);
- 
- 		// The client is gone, give the NetworkClientInfo free
- 		ci->client_index = NETWORK_EMPTY_INDEX;
-@@ -683,11 +683,11 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER
- 	NetworkClientInfo *ci;
- 
- 	index = NetworkRecv_uint16(MY_CLIENT, p);
--	NetworkRecv_string(MY_CLIENT, p, str, 100);
-+	NetworkRecv_string(MY_CLIENT, p, str, lengthof(str));
- 
- 	ci = NetworkFindClientInfoFromIndex(index);
- 	if (ci != NULL) {
--		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, str);
-+		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, ci->client_name, "%s", str);
- 
- 		// The client is gone, give the NetworkClientInfo free
- 		ci->client_index = NETWORK_EMPTY_INDEX;
diff --git a/games/openttd/patches/patch-af b/games/openttd/patches/patch-af
deleted file mode 100644
index 5722ca98192..00000000000
--- a/games/openttd/patches/patch-af
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- network_server.c.orig	2005-05-17 19:22:59.000000000 +0100
-+++ network_server.c
-@@ -159,7 +159,7 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SER
- 
- 		DEBUG(net, 2)("[NET] %s made an error (%s) and his connection is closed", client_name, str);
- 
--		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
- 
- 		FOR_ALL_CLIENTS(new_cs) {
- 			if (new_cs->status > STATUS_AUTH && new_cs != cs) {
-@@ -907,7 +907,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT
- 
- 	DEBUG(net, 2)("[NET] %s reported an error and is closing his connection (%s)", client_name, str);
- 
--	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
- 
- 	FOR_ALL_CLIENTS(new_cs) {
- 		if (new_cs->status > STATUS_AUTH) {
-@@ -932,11 +932,11 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT
- 		return;
- 	}
- 
--	NetworkRecv_string(cs, p, str, 100);
-+	NetworkRecv_string(cs, p, str, lengthof(str));
- 
- 	NetworkGetClientName(client_name, sizeof(client_name), cs);
- 
--	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, str);
-+	NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
- 
- 	FOR_ALL_CLIENTS(new_cs) {
- 		if (new_cs->status > STATUS_AUTH) {
-@@ -1111,7 +1111,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT
- 	if (ci != NULL) {
- 		// Display change
- 		if (NetworkFindName(client_name)) {
--			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, client_name);
-+			NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", client_name);
- 			ttd_strlcpy(ci->client_name, client_name, sizeof(ci->client_name));
- 			NetworkUpdateClientInfo(ci->client_index);
- 		}
diff --git a/games/openttd/patches/patch-ag b/games/openttd/patches/patch-ag
deleted file mode 100644
index 4e5eb2be992..00000000000
--- a/games/openttd/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- os2.c.orig	2005-05-15 15:01:35.000000000 +0100
-+++ os2.c
-@@ -642,7 +642,7 @@ static long CDECL MidiSendCommand(const 
- 	va_list va;
- 	char buf[512];
- 	va_start(va, cmd);
--	vsprintf(buf, cmd, va);
-+	vsnprintf(buf, sizeof(buf), cmd, va);
- 	va_end(va);
- 	return mciSendString(buf, NULL, 0, NULL, 0);
- }
diff --git a/games/openttd/patches/patch-ah b/games/openttd/patches/patch-ah
deleted file mode 100644
index 8fe8451fa6f..00000000000
--- a/games/openttd/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- texteff.c.orig	2005-03-28 13:38:02.000000000 +0100
-+++ texteff.c
-@@ -57,7 +57,7 @@ void CDECL AddTextMessage(uint16 color, 
- 	int length;
- 
- 	va_start(va, message);
--	vsprintf(buf, message, va);
-+	vsnprintf(buf, lengthof(buf), message, va);
- 	va_end(va);
- 
- 	/* Special color magic */
diff --git a/games/openttd/patches/patch-ai b/games/openttd/patches/patch-ai
deleted file mode 100644
index 35e64a32ca9..00000000000
--- a/games/openttd/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- ttd.c.orig	2005-05-16 17:19:32.000000000 +0100
-+++ ttd.c
-@@ -70,7 +70,7 @@ void CDECL error(const char *s, ...) {
- 	va_list va;
- 	char buf[512];
- 	va_start(va, s);
--	vsprintf(buf, s, va);
-+	vsnprintf(buf, sizeof(buf), s, va);
- 	va_end(va);
- 
- 	ShowOSErrorBox(buf);
-@@ -86,7 +86,7 @@ void CDECL ShowInfoF(const char *str, ..
- 	va_list va;
- 	char buf[1024];
- 	va_start(va, str);
--	vsprintf(buf, str, va);
-+	vsnprintf(buf, sizeof(buf), str, va);
- 	va_end(va);
- 	ShowInfo(buf);
- }
-@@ -99,7 +99,7 @@ char * CDECL str_fmt(const char *str, ..
- 	char *p;
- 
- 	va_start(va, str);
--	len = vsprintf(buf, str, va);
-+	len = vsnprintf(buf, sizeof(buf), str, va);
- 	va_end(va);
- 	p = malloc(len + 1);
- 	if (p)
diff --git a/games/openttd/patches/patch-aj b/games/openttd/patches/patch-aj
deleted file mode 100644
index 50ee4aaa05e..00000000000
--- a/games/openttd/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/09/11 11:44:29 adrianp Exp $
-
---- win32.c.orig	2005-05-16 17:19:32.000000000 +0100
-+++ win32.c
-@@ -841,7 +841,7 @@ static long CDECL MidiSendCommand(const 
- 	char buf[512];
- 
- 	va_start(va, cmd);
--	vsprintf(buf, cmd, va);
-+	vsnprintf(buf, sizeof(buf), cmd, va);
- 	va_end(va);
- 	return mciSendStringA(buf, NULL, 0, 0);
- }