Update astro/viking to v1.6

Also switch to working dependency astro/josm to unbreak the dep-tree

PR:		203025
Submitted by:	uqs

3 files changed, 20 insertions, 13 deletions

diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index dc49321eb1a8..6f3a07793eca 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	viking
-PORTVERSION=	1.5.1
-PORTREVISION=	3
+PORTVERSION=	1.6
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/
 
@@ -12,22 +11,22 @@ COMMENT=	Program to manage GPS data (tracks, waypoints, etc.)
 
 LICENSE=	GPLv2
 
-BROKEN=		Fails to build
-
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \
+		libmapnik.so:${PORTSDIR}/graphics/mapnik \
 		libpcre.so:${PORTSDIR}/devel/pcre \
-		libcurl.so:${PORTSDIR}/ftp/curl \
 		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
 RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
 
 USES=		gmake iconv desktop-file-utils perl5 pkgconfig tar:bzip2
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
-USE_GNOME=	cairo gnomedocutils gtk20
+USE_GNOME=	cairo gnomedocutils gtk20 intlhack
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -39,7 +38,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=		DOCS GEOCACHES NLS GEOTAG GPSD
-OPTIONS_DEFAULT=	GEOTAG GPSD MERKAATOR
+OPTIONS_DEFAULT=	GEOTAG GPSD JOSM
 
 OPTIONS_MULTI=		OpenStreetMap-Editor
 OPTIONS_MULTI_OpenStreetMap-Editor=	JOSM MERKAATOR
diff --git a/astro/viking/distinfo b/astro/viking/distinfo
index f446ce804bc1..71a2aa024910 100644
--- a/astro/viking/distinfo
+++ b/astro/viking/distinfo
@@ -1,2 +1,2 @@
-SHA256 (viking-1.5.1.tar.bz2) = 6c560c8665112732e575110e9a316638cf278f03b5ecd92ff8845419cb3d53ec
-SIZE (viking-1.5.1.tar.bz2) = 1616172
+SHA256 (viking-1.6.tar.bz2) = 21f1bd372c571b8d021e4509a69ec6448efefec623355a9db26cd81898b5920a
+SIZE (viking-1.6.tar.bz2) = 3060389
diff --git a/astro/viking/pkg-plist b/astro/viking/pkg-plist
index addfaa7588fd..0fc0710a1141 100644
--- a/astro/viking/pkg-plist
+++ b/astro/viking/pkg-plist
@@ -1,5 +1,7 @@
 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
@@ -12,6 +14,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
@@ -30,7 +33,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
 %%NLS%%share/locale/ast/LC_MESSAGES/viking.mo
@@ -49,6 +55,7 @@ share/icons/hicolor/48x48/apps/viking.png
 %%NLS%%share/locale/it/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/jv/LC_MESSAGES/viking.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/viking.mo
@@ -67,3 +74,4 @@ share/pixmaps/viking.png
 %%DATADIR%%/external_tools.xml
 %%DATADIR%%/goto_tools.xml
 %%DATADIR%%/maps.xml
+%%DATADIR%%/latlontz.txt