Update to 1.6.

Disable the new mapnik option, in order to separate the upgrade work
from the mapnik work, not because it's undesirable.

From NEWS:

Viking 1.6 (2015-03-29)
New features since 1.5.1
* Mapnik Rendering Layer (not available in Windows build ATM) - with
  preprocessor CartoCSS option.
** Build system dependency on C++. Source dependency on libmapnik-dev.
* Export files via GPSBabel
* Extended GPSBabel filtering support - Enables limited/simple OSM Overpass
   API support.
* Support reading of MBTiles files.
* Support reading of OSM Metatiles.
* Configurable Toolbar
* Configurable Menu keys
* Various time related features:
** Edit trackpoint and waypoint times.
** Sort layers by time.
** Preference option 'World' to display time values based on the position
   (i.e. in the local timezone) of the track or waypoint.
** Show time axis values on time graphs
** Quick search of tracks by date
** Open external programs Rednotebook or Stellarium at the specific
   time (and place) of a point.
* Improved route finder UI usage
* GeoJSON support via external programs 'togpx' and 'togeojson'
* New default Map Cache layout to be more compatible with standard
  OSM/TMS structure.
** Also python tool available to migrate cache layouts
* Support GPX Metadata values common to GPX1.0 and GPX1.1
* Extended map type configuration options (zoom levels + area extents limits)
* Build compatibility with GPSD 3.12
* Allow starting Viking with command line parameters to set position, zoom
  and map type.
** --latitude <degrees>
** --longitude <degrees>
** --zoom <ZoomLevelOSM>
** --map <MapID>
** eg: $> viking --latitude 51.4 --longitude -1.3 --zoom 12 --map 13
* Improved Windows install information and options
* Export Track, Route and Waypoint Lists as text.
* Many internal improvements, fixes, more translations and various other small
  improvements.

3 files changed, 19 insertions, 8 deletions

diff --git a/geography/viking/Makefile b/geography/viking/Makefile
index e635d2e04c8..362030e4849 100644
--- a/geography/viking/Makefile
+++ b/geography/viking/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2015/06/12 10:50:08 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2015/08/30 19:04:17 gdt Exp $
 #
 
-VERSION=		1.5.1
+VERSION=		1.6
 DISTNAME=		viking-${VERSION}
-PKGREVISION=		2
 CATEGORIES=		geography
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/
 EXTRACT_SUFX=		.tar.bz2
@@ -23,6 +22,8 @@ CONFIGURE_ARGS+=	--disable-magic
 # Perhaps optionize use of gpsd (remove bl3, add this).
 # CONFIGURE_ARGS+=	--disable-realtime-gps-tracking
 
+CONFIGURE_ARGS+=	--disable-mapnik
+
 DEPENDS+=		gpsbabel-[0-9]*:../../geography/gpsbabel
 DEPENDS+=		p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 REPLACE_PERL=		viking-remote
@@ -33,6 +34,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
+.include "../../graphics/libgexiv2/buildlink3.mk"
 .include "../../geography/gpsd/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
diff --git a/geography/viking/PLIST b/geography/viking/PLIST
index 00e67eba908..b8baa94a864 100644
--- a/geography/viking/PLIST
+++ b/geography/viking/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2014/03/11 23:50:38 gdt Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $
 bin/viking
 share/applications/viking.desktop
+share/gnome/help/viking/C/attribution.xml
+share/gnome/help/viking/C/commandline.xml
 share/gnome/help/viking/C/figures/DEM_file_info_dialog.png
 share/gnome/help/viking/C/figures/LayersTracksList.png
 share/gnome/help/viking/C/figures/LayersTracksStatistics.png
@@ -13,6 +16,7 @@ share/gnome/help/viking/C/figures/Viking-OSM-CycleMap-ManyTracks.jpg
 share/gnome/help/viking/C/figures/WaypointsList.png
 share/gnome/help/viking/C/figures/addtr_18.png
 share/gnome/help/viking/C/figures/addwp_18.png
+share/gnome/help/viking/C/figures/customize_toolbar_dialog.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
@@ -31,7 +35,10 @@ 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/georef_layer.xml
 share/gnome/help/viking/C/legal.xml
+share/gnome/help/viking/C/mapnik_rendering_layer.xml
+share/gnome/help/viking/C/recommends.xml
 share/gnome/help/viking/C/viking.xml
 share/icons/hicolor/48x48/apps/viking.png
 share/locale/ast/LC_MESSAGES/viking.mo
@@ -50,6 +57,7 @@ share/locale/id/LC_MESSAGES/viking.mo
 share/locale/it/LC_MESSAGES/viking.mo
 share/locale/ja/LC_MESSAGES/viking.mo
 share/locale/jv/LC_MESSAGES/viking.mo
+share/locale/ko/LC_MESSAGES/viking.mo
 share/locale/lt/LC_MESSAGES/viking.mo
 share/locale/lv/LC_MESSAGES/viking.mo
 share/locale/nb/LC_MESSAGES/viking.mo
@@ -66,4 +74,5 @@ 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/latlontz.txt
 share/viking/maps.xml
diff --git a/geography/viking/distinfo b/geography/viking/distinfo
index c4e31acf207..dba8c2dac80 100644
--- a/geography/viking/distinfo
+++ b/geography/viking/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.22 2014/11/23 17:17:46 gdt Exp $
+$NetBSD: distinfo,v 1.23 2015/08/30 19:04:17 gdt Exp $
 
-SHA1 (viking-1.5.1.tar.bz2) = b23df806711d121799f3c9ad2d00f9f650415965
-RMD160 (viking-1.5.1.tar.bz2) = 27f3d828fdddeb423386da2eb598e9b39b8e1b35
-Size (viking-1.5.1.tar.bz2) = 1616172 bytes
+SHA1 (viking-1.6.tar.bz2) = 364365dfe23742aef36dfd08fd81560000a18ffe
+RMD160 (viking-1.6.tar.bz2) = b348bf666753adae0344023d7d32e5ae78dc7554
+Size (viking-1.6.tar.bz2) = 3060389 bytes
 SHA1 (patch-aa) = c7db1eb5562132c463b9472fd7a1a7e559af8d9a