update of the freeciv packages to the latest version.

Fixes a security vulnerability. (SA40078)

Changelog:
--- 2.1.x - 2.2.0
* Built-in editor
* Expanded ruleset format:
	* Unit classes
	* Movement restrictions
		* Can limit which terrains a unit can enter
		* River-boats
		* Wheeled units
		* Which units another unit can transport

	* Migration
	* Plague
	* Bases
	* Calendar effects

* Changes to gameplay with default ruleset:
	* New terrains:
		o Deep Ocean (as Ocean but no specials and cannot be transformed)
		o Lake (as Ocean but no Whales special; inland water below a certain size is generated as Lake)
	* Triremes are not restricted to tiles next to land, but to (shallow) Ocean tiles; they now cannot even attempt to enter unsafe tiles
	* Triremes no longer get the +1 movement bonus from Nuclear Power that other sea units get
	* Triremes and Carriers can no longer attack land units
	* Submarine attack strength reduced from 15 to 12 (to make it easier to defend against them with escorts)
	* New base type buoy, which can be built by Engineers on water tiles with the Radio advance, and gives vision.
	* Ruins (left behind by destroyed cities, no effect on gameplay currently)
	* New advance Environmentalism and Solar Plant improvement, which can eliminate pollution from production
	* Trade route value now depends on size of cities, not on trade generated in them
	* New national borders system
	* Coastal Defense now available earlier (requires Gunpowder instead of Metallurgy)
	* No restrictions on specialists in small cities
	* Terrain within working range of a city can no longer remain unknown
	* Units in fortresses now regain 25% HP per turn (as in 2.0.x) instead of 100%
	* New nations

* AI difficulty level: Cheating
* New server options:
	* foggedborders: visibility of borders is subject to fog of war
	* borders gains new modes where player can see all tiles inside borders, and borders extend to unknown tiles revealing them
	* endspaceship controls whether spaceship reaching Alpha Cen ends the game
	* trademindist controls the minimum distance for trade routes between your cities
	* Times now specified in turns instead of years (endyear becomes endturn, onsetbarbs expressed in turns)
	* simultaneousphases renamed to phasemode and gains new options

* Client interface changes:
	* Menus and shortcut keys revamped; notable changes include:
		o Connect with Road/Rail/Irrigation changes from Ctrl+Shift+R/L/I to Shift+R/L/I
		o City Report: F1 to F4
		o Go/Airlift to City: Shift+L to T
		o Wake up Others (Shift+W) becomes Unsentry all on tile (Shift+S)
		o Orders menu split into Select, Unit, Work, and Combat; Reports becomes Civilization
	* Scripting improvements
	* Event cache: messages from the last few turns can be replayed to clients on connection and saved in savegames
	* Featured text in Gtk client, including colour coding and clickable links to mentioned cities/units/tiles

--- 2.2.0 - 2.2.1
* Stability fixes and refactoring. GNA#15305 GNA#15356 GNA#15432 GNA#15426 GNA#15332 GNAPATCH#1465 GNA#15348 GNA#15442 GNA#15468 GNA#15469 GNA#15480 GNA#15483 GNA#15456 GNA#15500 GNAPATCH#1490 GNA#15582 GNAPATCH#1513 GNAPATCH#1515 GNA#15661 GNAPATCH#1537 GNA#15450 GNA#15671 GNA#15714 GNA#15643 GNA#15734 GNA#15741 GNA#15730 GNAPATCH#1544 GNA#15377 GNA#15778 GNAPATCH#1598 GNA#15709 GNA#15844 GNA#15857 GNA#15908 GNA#15899 GNA#15983 GNA#16003
* client-sdl: Push the maximal resolution to 3200x2400 in options. GNA#15346
* Make impossible to change the server settings trademindist when the game is running. GNA#15405
* Fixed the display of workable tiles when investigating foreign cities. GNA#15411 GNA#15944
* Improved server logging. GNA#15404 GNA#15336 GNA#15460 GNA#15333 GNA#15523 GNAPATCH#1498 GNA#15923
* client-gtk2: Canceling server logon takes you back to the main menu. GNA#15388
* Fixed a bug where you were unable to initiate diplomatic meetings with other players under certain circumstances. GNA#15439
* Internationalization and string fixes. GNA#15443 GNA#15403 GNA#15427 GNA#15457 GNA#15440 GNA#15455 GNA#15467 GNA#15478 GNA#15477 GNA#15484 GNA#15487 GNA#15585 GNA#15665 GNAPATCH#1569 GNA#15790 GNA#15809 GNA#15808 GNA#15802 GNA#15890
* Fixed bugs with voting. GNA#15451
* client-gtk2 Use city id instead of name in the goto dialog. GNA#15435
* Fixed a bug where air bases wouldn't work on certain tiles. GNA#15446
* Improved city illness. GNA#15373 GNA#15394 GNA#15422 GNA#15499
* Do not show new city dialog if city cannot be built GNA#15328
* client-gtk2: Made the unit info label scrollable to prevent the map view to resize. GNA#15504
* Do not show team name in victory message in the case there's only one team member. GNA#15511
* Improved documentation. GNA#13848 GNA#15667 GNA#15345
* Fixed goto turn time calculations. GNA#15503 GNA#15722
* Fixed a bug where the -M <metaserver> command line parameter was ignored. GNA#15538
* Improvements to Lua scripting. GNAPATCH#1503 GNA#15531 GNA#15586 GNA#15596 GNA#15602 GNA#15606 GNA#15612 GNAPATCH#1526 GNAPATCH#1531 GNAPATCH#1532 GNAPATCH#1533 GNAPATCH#1535 GNA#15675 GNA#15624 GNAPATCH#1553 GNAPATCH#1554 GNAPATCH#1552 GNA#15705 GNA#15706 GNA#15707 GNAPATCH#1599 GNA#13709 GNA#13709 GNAPATCH#1621 GNA#15725 GNA#15860 GNAPATCH#1617 GNA#15586 GNA#15696
* Fixed configuration and compilation warnings. GNA#15549 GNA#15575
* Added a column for plague risk in city report. GNA#15376
* Fixed bugs with loading saved games. GNA#15520 GNA#15581 GNA#15660
* Fixed the display of global warming / nuclear winter in the client. GNA#15563
* Disallowed paradrops inside peaceful foreign borders. GNA#15569
* Give a palace to nations split off by civil war. GNA#15548
* Fixed editor UI bugs. GNA#15578 GNA#15579 GNA#15605
* client-gtk2: Made 'Work' menu adapt to terrain for multiple units on single tile. GNA#15611
* Introduced Lake terrain in more scenario maps. GNA#15610
* Fixed minor issues with isotrident and amplio tilesets. GNA#15621 GNA#15777
* client-gtk2: Made the pregame player context menu stay open with one click. GNA#15593
* Disallowed transporter units to load into themselves. GNA#15616
* Don't close client dialogs when switching tileset. GNA#15620
* client-gtk2: Made client work with GTK versions older than 2.6. GNA#15637
* client-gtk2: Added tooltips for columns in the city report. GNA#15603
* Made improvement upkeep visible in "Info" column of worklist editor. GNAPATCH#1563
* Fixed mangled server "help options" output. GNA#15723
* client-gtk2: Improved the "Start Scenario Game" page. GNA#15663
* client-gtk2: Center map view at start of first game. GNA#15738
* Show pillage activity in middle-click map popup. GNAPATCH#1566
* Create ruins for disbanded cities. GNAPATCH#1570
* Avoid getting migrants that starve to death instantly. GNA#15760 GNAPATCH#1579
* client-gtk2: Improvements diplomacy dialog. GNA#15776
* client-gtk2: Sort the science dialog technologies in alphabetical order. GNA#15779
* Do not require an extra endline at the end of ruleset files. GNA#15816
* client-sdl: Fixed bug where popups were not displayed. GNA#13493
* Fixes to freedesktop.org file. GNA#15878
* Avoid transforming a city tile to a terrain that won't support the city. GNA#15630
* Fixed a bug with the France scenario that caused trouble building improvements the first few turns. GNA#15892
* Fixed bugs with the CMA UI. GNA#15909
* Reworked pillaging. GNA#15744 GNA#15742
* Changed the build system to work better with shared libraries. GNA#15973
* Fixed typos in civil war nations. GNA#15378
* Made linking work with binutils-gold. GNA#15400
* Updated translations: Ukrainian, Korean, Catalan, French, Spanish, Russian, Italian

2 files changed, 10 insertions, 4 deletions

diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 85a1580c6a2..1ada547b623 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2010/02/10 19:17:38 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/21 07:53:14 spz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	Freeciv game server
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
@@ -18,6 +17,12 @@ CONFIGURE_ARGS+=	--with-readline
 # Uses rl_filename_completion_function() which was introduced in readline-4.2
 BUILDLINK_API_DEPENDS.readline+=	readline>=4.2
 
+SUBST_CLASSES+=			installfix
+SUBST_STAGE.installfix=		post-patch
+SUBST_FILES.installfix=		common/Makefile.in
+SUBST_SED.installfix+=		-e 's|^install-exec-am: install-libLTLIBRARIES|install-exec-am: \# install-libLTLIBRARIES|'
+SUBST_MESSAGE.installfix=	Suppressing installation of libs already in freeciv-share.
+
 .include "../../games/freeciv-share/Makefile.common"
 
 .include "../../devel/readline/buildlink3.mk"
diff --git a/games/freeciv-server/PLIST b/games/freeciv-server/PLIST
index 1908a1b7f9d..0a820f5a627 100644
--- a/games/freeciv-server/PLIST
+++ b/games/freeciv-server/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/01/06 16:39:14 adam Exp $
-bin/civserver
+@comment $NetBSD: PLIST,v 1.3 2010/06/21 07:53:14 spz Exp $
+bin/freeciv-server
+lib/libfreeciv-srv.la
 share/applications/freeciv-server.desktop