- Update to 1.5

- Add dependency for textproc/p5-XML-Parser
- Use the new format for LIB_DEPENDS
- USE_GNOME cairo instead of graphics/cairo
- Support STAGEDIR

Approved by:	pawel / wg (mentors, implicit)

3 files changed, 36 insertions, 24 deletions

diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 777acacdc421..7f9c0a6c878c 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -2,32 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	viking
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	astro
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Program to manage GPS data (tracks, waypoints, etc.)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		pcre:${PORTSDIR}/devel/pcre \
-		curl:${PORTSDIR}/ftp/curl \
-		cairo:${PORTSDIR}/graphics/cairo \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2 \
-		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
 
+USE_BZIP2=	yes
 USES=		gmake iconv desktop-file-utils perl5 pkgconfig
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
-USE_GNOME=	gnomedocutils gtk20
+USE_GNOME=	cairo gnomedocutils gtk20
 USE_PERL5=	run
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
@@ -46,23 +45,22 @@ OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
-GEOTAG_LIB_DEPENDS=	exif:${PORTSDIR}/graphics/libexif
+
+GEOTAG_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
 GEOTAG_CONFIGURE_ENABLE=geotag
-GPSD_LIB_DEPENDS=	gps:${PORTSDIR}/astro/gpsd
-GPSD_CONFIGURE_ENABLE=	realtime-gps-tracking
 
-.include <bsd.port.options.mk>
+GPSD_LIB_DEPENDS=	libgpsd.so:${PORTSDIR}/astro/gpsd
+GPSD_CONFIGURE_ENABLE=	realtime-gps-tracking
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|Science;|Education;Science;|' ${WRKSRC}/src/viking.desktop.in
 
 post-install:
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/astro/viking/distinfo b/astro/viking/distinfo
index 4a4fd3f4f7d8..4f5e45463d8e 100644
--- a/astro/viking/distinfo
+++ b/astro/viking/distinfo
@@ -1,2 +1,2 @@
-SHA256 (viking-1.4.2.tar.gz) = 58e85c9792d0df62c3c9b583869bc40d6218ca01c117c05599d45e6d6b254bf1
-SIZE (viking-1.4.2.tar.gz) = 1503822
+SHA256 (viking-1.5.tar.bz2) = 2f00549e236dedec811c6b018f5ae76a1f4a1b68b1e33ef1eb2de14533579dc4
+SIZE (viking-1.5.tar.bz2) = 1609467
diff --git a/astro/viking/pkg-plist b/astro/viking/pkg-plist
index 9d90d3136372..c6af97c09b9b 100644
--- a/astro/viking/pkg-plist
+++ b/astro/viking/pkg-plist
@@ -1,6 +1,15 @@
 bin/viking
 share/applications/viking.desktop
+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
+share/gnome/help/viking/C/figures/Maps_download_region_dialog.png
+share/gnome/help/viking/C/figures/Track_elevation_graph.png
+share/gnome/help/viking/C/figures/Track_properties.png
+share/gnome/help/viking/C/figures/Track_statistics.png
+share/gnome/help/viking/C/figures/Trackpoint_edit_dialog.png
 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/demdl_18.png
@@ -24,12 +33,14 @@ 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
+%%NLS%%share/locale/ast/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/da/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/de/LC_MESSAGES/viking.mo
 %%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/eu/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
@@ -45,6 +56,7 @@ share/icons/hicolor/48x48/apps/viking.png
 %%NLS%%share/locale/pl/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/viking.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/viking.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/viking.mo
@@ -59,6 +71,8 @@ share/pixmaps/viking.png
 @dirrm share/omf/viking
 %%NLS%%@dirrmtry share/locale/jv/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/jv
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
 @dirrm share/gnome/help/viking/C/figures
 @dirrm share/gnome/help/viking/C
 @dirrm share/gnome/help/viking