4 files changed, 42 insertions, 11 deletions

diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index f2d232d6ca9e..37db350e6b88 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	viking
-PORTVERSION=	1.3.2.1
-PORTREVISION=	1
+PORTVERSION=	1.4
 CATEGORIES=	astro
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Program to manage GPS data (tracks, waypoints, etc.)
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2
 
 LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		pcre:${PORTSDIR}/devel/pcre \
@@ -28,7 +27,8 @@ GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
-USE_GNOME=	gnomedocutils gtk20
+USE_GNOME=	desktopfileutils gnomedocutils gtk20
+USE_PKGCONFIG=	build
 USE_PERL5_RUN=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
@@ -70,11 +70,15 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
 
 post-install:
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
+# Port not install in figures jpg and png, this is cleaner as patch
+	@${RM} -f ${PREFIX}/share/gnome/help/viking/C/figures/*
+	@(cd ${WRKSRC}/help/C/figures && ${COPYTREE_SHARE} "*.jpg *.png" ${PREFIX}/share/gnome/help/viking/C/figures/)
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
+	@-update-desktop-database -q
 
 .include <bsd.port.mk>
diff --git a/astro/viking/distinfo b/astro/viking/distinfo
index 992a5d571c89..c3ba0f491e20 100644
--- a/astro/viking/distinfo
+++ b/astro/viking/distinfo
@@ -1,2 +1,2 @@
-SHA256 (viking-1.3.2.1.tar.gz) = ebd6f134a340a1b2ba582ea77bd97ddd9db16b476be7090a12649f6069fa1565
-SIZE (viking-1.3.2.1.tar.gz) = 1097274
+SHA256 (viking-1.4.tar.gz) = 80aa4c7bf3be75441a435f6681831b8aeb08f7eb6f7a5a86872eec16cda67799
+SIZE (viking-1.4.tar.gz) = 1487470
diff --git a/astro/viking/pkg-descr b/astro/viking/pkg-descr
index 439e7c45f8cb..cb7fb8b77e6f 100644
--- a/astro/viking/pkg-descr
+++ b/astro/viking/pkg-descr
@@ -1,7 +1,8 @@
 Viking is a free/open source program to manage GPS data.
 
-You can import, plot and create tracks and waypoints, show OSM, Terraserver
-and other maps, see real-time GPS position, get geocaches, control items, etc.
-It is written in C & the GTK+2 toolkit.
+You can import and plot tracks, routes and waypoints, show OpenStreetMap,
+Terraserver, Bing Aerial and other maps in it, download geocaches for
+an area on the map, make new tracks and waypoints, geotag images,
+see real-time GPS position, etc.
 
 WWW: http://sourceforge.net/apps/mediawiki/viking/index.php
diff --git a/astro/viking/pkg-plist b/astro/viking/pkg-plist
index 43227ca62c72..33ab78c4a078 100644
--- a/astro/viking/pkg-plist
+++ b/astro/viking/pkg-plist
@@ -1,7 +1,26 @@
 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
@@ -11,6 +30,7 @@ share/icons/hicolor/48x48/apps/viking.png
 %%NLS%%share/locale/el/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/es/LC_MESSAGES/viking.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/he/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/viking.mo
@@ -32,6 +52,10 @@ share/icons/hicolor/48x48/apps/viking.png
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/viking.mo
 share/omf/viking/viking-C.omf
 share/pixmaps/viking.png
+%%DATADIR%%/external_tools.xml
+%%DATADIR%%/goto_tools.xml
+%%DATADIR%%/maps.xml
+@dirrm %%DATADIR%%
 @dirrmtry share/omf/viking
 @dirrmtry share/omf
 %%NLS%%@dirrmtry share/locale/jv/LC_MESSAGES
@@ -46,3 +70,5 @@ share/pixmaps/viking.png
 @dirrmtry share/gnome/help
 @dirrmtry share/gnome
 @dirrmtry share/applications
+@exec %%LOCALBASE%%/bin/update-desktop-database  -q || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database  -q || /usr/bin/true