Update to 1.4.1.

pkgsrc changes: improve patch comment and explain why it is not
filed/applied upstream.

Viking 1.4.1.0 (2013-04-08)
Bug Fix Release + updated translations
* Import Launchpad translation updates [Mainly for large Czech update]
* Fix using .vik files with 'unusual' track or waypoint names
* Fix waypoint selection when the waypoint has an image but the images are not being displayed.
* Fix showing map timestamps on Windows on the map tile info dialog.
* SF#3608411: Part 2 - Avoid creating command window on Viking start-up.
* SF#3608411: Part 1 - Avoid warning about unbuffer on Windows Systems.
* SF#3608264: Improve Statusbar Location Info Maybe Truncated
* Prevent inputting empty names for layers and sublayers via the layers panel.
* SF#3608311: Fix crash caused by renaming blank sublayer names
* Be less strigent in loading Geotagged images without optional GPS tags
* Fix use of scaled tile image when tile image not present.
* Enable updating the treeview to allow setting a blank waypoint symbol.
* Improve the Waypoint tooltip to display the description if there is no comment.
* Fix datasource acquiring waypoints from geotag images.
* Updated geo-* scripts to version released on 2013/02/18
* Fix compilation with --enable-geocaches option.
* help/Makefile.am: explicitly list figures.

Viking 1.4 (2013-02-11)
New features since 1.3.2
* Support for GPX Route type including transfer to/from GPS Devices.
** Replaced 'Add Track' tool with 'Create Route' tool. (NB There still is the Create Track tool)
* Support for GPX 'Description' for tracks, waypoints and routes.
* Add ability to Acquire My OSM Traces and ability to choose any subset of the available traces.
* GPS Upload from a track.
* Enable giving a track a specific colour (drawn in default draw by track mode).
* Enable drawing all tracks in a specific colour (no longer is Black the only option).
* Allow option of drawing a direction arrow when drawing a track.
* Allow configuration of trackpoint size and direction arrow size.
* Display Waypoint Icons in the layers panel treeview.
* Restored Route Finding via Google Services. [Was disabled in 1.3.2 due to change in formats supported]
* Only display sublayer container when there are sublayers.
* Display map tile source and cached file information in a dialog for a position.
* Quick zoom level change from the statusbar by clicking on the zoom level to select another level.
* In the Zoom Tool mode: can select an area to zoom in on (via holding shift key + drag mouse).
* Mouse Zooming in/out maintains the position focus on the mouse pointer location.
** (Use the keys Ctrl+Shift and mouse zoom to maintain the centered map location).
* Improvements in Acquiring Wikipedia Points (allow more points, sortable columns, URL and feature type).
* Allow opening a URL on a waypoint which has a URL for a comment or description.
* Re-organized TrackWaypoint Layer menus to group functionality together better with New, View, Combine, Split, Delete, Acquire and Upload submenus.
* Gradient Graph view on the Track Properties.
* Allow same named TrackWaypoint sublayer items. i.e. can now have 2 (or more) waypoints with the same name.
* Add support of a Map type for a local On Disk OSM Tile Format.
* Revised Draw Track by Speed mode with a simple traffic light colouring scheme to represent slow/average/fast speeds.
* Enable deletion of track points with the same timestamp.
* Ability to merge segments of a track.
* Allow generation of large pixel sized images.
* Rework image generation to ask for file name first and then only allow supported map zoom levels.
* Allow control of waypoint text size on the viewport display.
* Allow control of GPX file saving track order (either Alphabetical or By Time via global preference).
* Keyboard shortcuts to create layers and enable some tools.
* Show the bearing and the step distance of the next point when creating a track or route.
* Improved feedback in reading erroneous files.
* Improved Help Manual.
* More translation texts including a Finnish version.
* Scripts to support the creation of the Windows Executable Installer.
* Add a python tool to convert the Viking tile cache into a MapBox MBTiles format file.
* Many internal improvements.

Fixes since 1.3.2
* Don't accidently overwrite GPX and KML files in the Viking file type.
* Use the default desktop font for waypoint viewport display text.
* Ensure when opening multiple .vik files they are each loaded into a new window.
* Show UTM location in statusbar when in UTM mode.
* Fix: crash when dealing with non-compressed DEM files

4 files changed, 36 insertions, 10 deletions

diff --git a/geography/viking/Makefile b/geography/viking/Makefile
index 3d003589da6..0cd921af37b 100644
--- a/geography/viking/Makefile
+++ b/geography/viking/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2013/02/16 11:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2013/04/16 01:08:46 gdt Exp $
 #
 
-DISTNAME=		viking-1.3.2.1
-PKGREVISION=		8
+DISTNAME=		viking-1.4.1
 CATEGORIES=		geography
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=viking/}
 
diff --git a/geography/viking/PLIST b/geography/viking/PLIST
index b6ece37b8ef..5df0d06d035 100644
--- a/geography/viking/PLIST
+++ b/geography/viking/PLIST
@@ -1,8 +1,27 @@
-@comment $NetBSD: PLIST,v 1.7 2012/04/24 01:19:58 gdt Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/04/16 01:08:46 gdt Exp $
 bin/viking
 share/applications/viking.desktop
+share/gnome/help/viking/C/figures/Viking-OSM-CycleMap-ManyTracks.jpg
+share/gnome/help/viking/C/figures/addtr_18.png
+share/gnome/help/viking/C/figures/addwp_18.png
+share/gnome/help/viking/C/figures/demdl_18.png
+share/gnome/help/viking/C/figures/edtr_18.png
+share/gnome/help/viking/C/figures/edwp_18.png
+share/gnome/help/viking/C/figures/geomove_18.png
+share/gnome/help/viking/C/figures/geozoom_18.png
+share/gnome/help/viking/C/figures/map_tile_info_dialog.png
+share/gnome/help/viking/C/figures/mapdl_18.png
+share/gnome/help/viking/C/figures/mover_22.png
 share/gnome/help/viking/C/figures/properties_degree.png
 share/gnome/help/viking/C/figures/properties_units.png
+share/gnome/help/viking/C/figures/route_finder_18.png
+share/gnome/help/viking/C/figures/ruler_18.png
+share/gnome/help/viking/C/figures/select_18.png
+share/gnome/help/viking/C/figures/showpic_18.png
+share/gnome/help/viking/C/figures/trw_statusbar.png
+share/gnome/help/viking/C/figures/vik_new_route_18.png
+share/gnome/help/viking/C/figures/zoom_18.png
+share/gnome/help/viking/C/figures/zoom_status_popup.png
 share/gnome/help/viking/C/legal.xml
 share/gnome/help/viking/C/viking.xml
 share/icons/hicolor/48x48/apps/viking.png
@@ -12,6 +31,7 @@ share/locale/de/LC_MESSAGES/viking.mo
 share/locale/el/LC_MESSAGES/viking.mo
 share/locale/en_GB/LC_MESSAGES/viking.mo
 share/locale/es/LC_MESSAGES/viking.mo
+share/locale/fi/LC_MESSAGES/viking.mo
 share/locale/fr/LC_MESSAGES/viking.mo
 share/locale/he/LC_MESSAGES/viking.mo
 share/locale/hu/LC_MESSAGES/viking.mo
@@ -32,3 +52,6 @@ share/locale/uk/LC_MESSAGES/viking.mo
 share/locale/zh_CN/LC_MESSAGES/viking.mo
 share/locale/zh_TW/LC_MESSAGES/viking.mo
 share/omf/viking/viking-C.omf
+share/viking/external_tools.xml
+share/viking/goto_tools.xml
+share/viking/maps.xml
diff --git a/geography/viking/distinfo b/geography/viking/distinfo
index 39dcbf446e5..6a91b0c6b9b 100644
--- a/geography/viking/distinfo
+++ b/geography/viking/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2012/10/29 01:24:04 gdt Exp $
+$NetBSD: distinfo,v 1.19 2013/04/16 01:08:46 gdt Exp $
 
-SHA1 (viking-1.3.2.1.tar.gz) = 8783b844ec941315a633307e9065643c248e4836
-RMD160 (viking-1.3.2.1.tar.gz) = 3b4cb93ed27092c6ad423eef388e572ef9b0eef0
-Size (viking-1.3.2.1.tar.gz) = 1097274 bytes
-SHA1 (patch-aa) = 106567e97011292250e211a7389572ee5a828627
+SHA1 (viking-1.4.1.tar.gz) = f34f3b7b2252b8fb290a28b174d87032b4bb2861
+RMD160 (viking-1.4.1.tar.gz) = 81aa61d4cc2411b90eaaf25bde7d964fd760622a
+Size (viking-1.4.1.tar.gz) = 1490617 bytes
+SHA1 (patch-aa) = c7db1eb5562132c463b9472fd7a1a7e559af8d9a
diff --git a/geography/viking/patches/patch-aa b/geography/viking/patches/patch-aa
index a1da0f4786a..9eb218c83fa 100644
--- a/geography/viking/patches/patch-aa
+++ b/geography/viking/patches/patch-aa
@@ -1,4 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2012/01/26 01:00:14 gdt Exp $
+$NetBSD: patch-aa,v 1.3 2013/04/16 01:08:47 gdt Exp $
+
+Work around a bug in NetBSD.  See PR standards/40695.  Bug is fixed in
+-current but not -5; revisit if the workaround causes problems.
+(Not filed upstream because this is a NetBSD bug.)
 
 --- src/gpspoint.c.orig	2010-12-13 01:55:55.000000000 +0000
 +++ src/gpspoint.c