Fri Dec 30 00:10:03 2016 UTC ()
Update to 1.6.2

Upstream no longer builds documentation by default.  Don't enable it,
because then the build fails because it assumes mapnik is present.

Note that C++11 is now required by upstream, at least if mapnik is
included.  For now, just add C++ to languages.

Add patch to remediate new bashisms.

Viking 1.6.2 (2015-12-21)
Bug Fix Release
* Don't remove project name if one decides not to delete all layers.
* Fix routes not saved in GPX when tracks are made invisible.
* SF Bugs#103: Fix TrackWaypoint layer items may not be displayed when pasted
* Enable Catalan and Turkish translations.
* Restore opening of JPG files.
* SF Bugs#127: Fix initial display of Waypoint sort order.
* Fix map layer widget sensitivity dependent on map type.

Viking 1.6.1 (2015-11-24)
Bug Fix Release + updated translations
* Several fixes and many code improvements from Coverity scans
* Fix heap-buffer-overflows
* Mapnik3 support.
** C++ standard required is now C++11
* Reactivate building of the reference documentation
* SF Bugs#126: Fix crash in gdk_rgb_convert_0888 due to using deallocated memory.
* SF Bugs#121: Fix crash when invalidating previously acquired tiles.
* SF Bugs#123: Fix bzip2 decompression on Windows.
* SF Bugs#122: Fix memory cache confusion with multiple "On Disk OSM Tile Format" maps
* SF Bugs#120: Fix Track drawing bug across the 180th Meridian.
* Red Hat Bugzilla – Bug 1210403: Only download and process one Bing attribution list.
* Fix Geocaches acquiring with latest geo-* software
* Import latest Launchpad translation updates
* Many other small fixes - see the ChangeLog for the full details.


(gdt)
diff -r1.70 -r1.71 pkgsrc/geography/viking/Makefile
diff -r1.10 -r1.11 pkgsrc/geography/viking/PLIST
diff -r1.25 -r1.26 pkgsrc/geography/viking/distinfo
diff -r0 -r1.1 pkgsrc/geography/viking/patches/patch-configure

cvs diff -r1.70 -r1.71 pkgsrc/geography/viking/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/viking/Makefile 2016/12/04 05:17:28 1.70
+++ pkgsrc/geography/viking/Makefile 2016/12/30 00:10:02 1.71
@@ -1,47 +1,54 @@ @@ -1,47 +1,54 @@
1# $NetBSD: Makefile,v 1.70 2016/12/04 05:17:28 ryoon Exp $ 1# $NetBSD: Makefile,v 1.71 2016/12/30 00:10:02 gdt Exp $
2# 2#
3 3
4VERSION= 1.6 4VERSION= 1.6.2
5DISTNAME= viking-${VERSION} 5DISTNAME= viking-${VERSION}
6PKGREVISION= 6 
7CATEGORIES= geography 6CATEGORIES= geography
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/ 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/
9EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
10 9
11MAINTAINER= gdt@NetBSD.org 10MAINTAINER= gdt@NetBSD.org
12HOMEPAGE= http://viking.sourceforge.net/ 11HOMEPAGE= http://viking.sourceforge.net/
13COMMENT= Viking manages GPS data, supports OpenStreetMap and geocaching 12COMMENT= Viking manages GPS data, supports OpenStreetMap and geocaching
14 13
15LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
16 15
 16# C++11 is now required.
 17USE_LANGUAGES= c c++
 18
17GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
18 20
19TEST_TARGET= check 21TEST_TARGET= check
20 22
21CONFIGURE_ARGS+= --disable-magic 23CONFIGURE_ARGS+= --disable-magic
22 24
23# Perhaps optionize use of gpsd (remove bl3, add this). 25# Perhaps optionize use of gpsd (remove bl3, add this).
24# CONFIGURE_ARGS+= --disable-realtime-gps-tracking 26# CONFIGURE_ARGS+= --disable-realtime-gps-tracking
25 27
26CONFIGURE_ARGS+= --disable-mapnik 28CONFIGURE_ARGS+= --disable-mapnik
27 29
 30# Building docs fails because mapnik being optional is not respected.
 31# For now, just omit docs until we have mapnik.
 32#CONFIGURE_ARGS+= --enable-gtk-doc
 33#.include "../../textproc/gtk-doc/buildlink3.mk"
 34
28DEPENDS+= gpsbabel-[0-9]*:../../geography/gpsbabel 35DEPENDS+= gpsbabel-[0-9]*:../../geography/gpsbabel
29DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser 36DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
30REPLACE_PERL= viking-remote 37REPLACE_PERL= viking-remote
31 38
32USE_TOOLS+= gmake intltool msgfmt pkg-config 39USE_TOOLS+= gmake intltool msgfmt pkg-config
33 40
34.include "../../sysutils/desktop-file-utils/desktopdb.mk" 41.include "../../sysutils/desktop-file-utils/desktopdb.mk"
35 42
36.include "../../databases/sqlite3/buildlink3.mk" 43.include "../../databases/sqlite3/buildlink3.mk"
37.include "../../devel/gettext-lib/buildlink3.mk" 44.include "../../devel/gettext-lib/buildlink3.mk"
38.include "../../graphics/libexif/buildlink3.mk" 45.include "../../graphics/libexif/buildlink3.mk"
39.include "../../graphics/gexiv2/buildlink3.mk" 46.include "../../graphics/gexiv2/buildlink3.mk"
40.include "../../geography/gpsd/buildlink3.mk" 47.include "../../geography/gpsd/buildlink3.mk"
41.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 48.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
42.include "../../lang/perl5/buildlink3.mk" 49.include "../../lang/perl5/buildlink3.mk"
43.include "../../textproc/gnome-doc-utils/buildlink3.mk" 
44.include "../../mk/omf-scrollkeeper.mk" 50.include "../../mk/omf-scrollkeeper.mk"
 51.include "../../textproc/gnome-doc-utils/buildlink3.mk"
45.include "../../www/curl/buildlink3.mk" 52.include "../../www/curl/buildlink3.mk"
46.include "../../x11/gtk2/buildlink3.mk" 53.include "../../x11/gtk2/buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"

cvs diff -r1.10 -r1.11 pkgsrc/geography/viking/PLIST (expand / switch to unified diff)

--- pkgsrc/geography/viking/PLIST 2015/08/30 19:04:17 1.10
+++ pkgsrc/geography/viking/PLIST 2016/12/30 00:10:02 1.11
@@ -1,78 +1,41 @@ @@ -1,78 +1,41 @@
1@comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $ 1@comment $NetBSD: PLIST,v 1.11 2016/12/30 00:10:02 gdt Exp $
2@comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $ 
3bin/viking 2bin/viking
4share/applications/viking.desktop 3share/applications/viking.desktop
5share/gnome/help/viking/C/attribution.xml 
6share/gnome/help/viking/C/commandline.xml 
7share/gnome/help/viking/C/figures/DEM_file_info_dialog.png 
8share/gnome/help/viking/C/figures/LayersTracksList.png 
9share/gnome/help/viking/C/figures/LayersTracksStatistics.png 
10share/gnome/help/viking/C/figures/Maps_download_region_dialog.png 
11share/gnome/help/viking/C/figures/Track_elevation_graph.png 
12share/gnome/help/viking/C/figures/Track_properties.png 
13share/gnome/help/viking/C/figures/Track_statistics.png 
14share/gnome/help/viking/C/figures/Trackpoint_edit_dialog.png 
15share/gnome/help/viking/C/figures/Viking-OSM-CycleMap-ManyTracks.jpg 
16share/gnome/help/viking/C/figures/WaypointsList.png 
17share/gnome/help/viking/C/figures/addtr_18.png 
18share/gnome/help/viking/C/figures/addwp_18.png 
19share/gnome/help/viking/C/figures/customize_toolbar_dialog.png 
20share/gnome/help/viking/C/figures/demdl_18.png 
21share/gnome/help/viking/C/figures/edtr_18.png 
22share/gnome/help/viking/C/figures/edwp_18.png 
23share/gnome/help/viking/C/figures/geomove_18.png 
24share/gnome/help/viking/C/figures/geozoom_18.png 
25share/gnome/help/viking/C/figures/map_tile_info_dialog.png 
26share/gnome/help/viking/C/figures/mapdl_18.png 
27share/gnome/help/viking/C/figures/mover_22.png 
28share/gnome/help/viking/C/figures/properties_degree.png 
29share/gnome/help/viking/C/figures/properties_units.png 
30share/gnome/help/viking/C/figures/route_finder_18.png 
31share/gnome/help/viking/C/figures/ruler_18.png 
32share/gnome/help/viking/C/figures/select_18.png 
33share/gnome/help/viking/C/figures/showpic_18.png 
34share/gnome/help/viking/C/figures/trw_statusbar.png 
35share/gnome/help/viking/C/figures/vik_new_route_18.png 
36share/gnome/help/viking/C/figures/zoom_18.png 
37share/gnome/help/viking/C/figures/zoom_status_popup.png 
38share/gnome/help/viking/C/georef_layer.xml 
39share/gnome/help/viking/C/legal.xml 
40share/gnome/help/viking/C/mapnik_rendering_layer.xml 
41share/gnome/help/viking/C/recommends.xml 
42share/gnome/help/viking/C/viking.xml 
43share/icons/hicolor/48x48/apps/viking.png 4share/icons/hicolor/48x48/apps/viking.png
44share/locale/ast/LC_MESSAGES/viking.mo 5share/locale/ast/LC_MESSAGES/viking.mo
 6share/locale/ca/LC_MESSAGES/viking.mo
45share/locale/cs/LC_MESSAGES/viking.mo 7share/locale/cs/LC_MESSAGES/viking.mo
46share/locale/da/LC_MESSAGES/viking.mo 8share/locale/da/LC_MESSAGES/viking.mo
47share/locale/de/LC_MESSAGES/viking.mo 9share/locale/de/LC_MESSAGES/viking.mo
48share/locale/el/LC_MESSAGES/viking.mo 10share/locale/el/LC_MESSAGES/viking.mo
49share/locale/en_GB/LC_MESSAGES/viking.mo 11share/locale/en_GB/LC_MESSAGES/viking.mo
50share/locale/es/LC_MESSAGES/viking.mo 12share/locale/es/LC_MESSAGES/viking.mo
51share/locale/eu/LC_MESSAGES/viking.mo 13share/locale/eu/LC_MESSAGES/viking.mo
52share/locale/fi/LC_MESSAGES/viking.mo 14share/locale/fi/LC_MESSAGES/viking.mo
53share/locale/fr/LC_MESSAGES/viking.mo 15share/locale/fr/LC_MESSAGES/viking.mo
54share/locale/he/LC_MESSAGES/viking.mo 16share/locale/he/LC_MESSAGES/viking.mo
55share/locale/hu/LC_MESSAGES/viking.mo 17share/locale/hu/LC_MESSAGES/viking.mo
56share/locale/id/LC_MESSAGES/viking.mo 18share/locale/id/LC_MESSAGES/viking.mo
57share/locale/it/LC_MESSAGES/viking.mo 19share/locale/it/LC_MESSAGES/viking.mo
58share/locale/ja/LC_MESSAGES/viking.mo 20share/locale/ja/LC_MESSAGES/viking.mo
59share/locale/jv/LC_MESSAGES/viking.mo 21share/locale/jv/LC_MESSAGES/viking.mo
60share/locale/ko/LC_MESSAGES/viking.mo 22share/locale/ko/LC_MESSAGES/viking.mo
61share/locale/lt/LC_MESSAGES/viking.mo 23share/locale/lt/LC_MESSAGES/viking.mo
62share/locale/lv/LC_MESSAGES/viking.mo 24share/locale/lv/LC_MESSAGES/viking.mo
63share/locale/nb/LC_MESSAGES/viking.mo 25share/locale/nb/LC_MESSAGES/viking.mo
64share/locale/nl/LC_MESSAGES/viking.mo 26share/locale/nl/LC_MESSAGES/viking.mo
65share/locale/pl/LC_MESSAGES/viking.mo 27share/locale/pl/LC_MESSAGES/viking.mo
66share/locale/pt_BR/LC_MESSAGES/viking.mo 28share/locale/pt_BR/LC_MESSAGES/viking.mo
67share/locale/ru/LC_MESSAGES/viking.mo 29share/locale/ru/LC_MESSAGES/viking.mo
68share/locale/sk/LC_MESSAGES/viking.mo 30share/locale/sk/LC_MESSAGES/viking.mo
69share/locale/sl/LC_MESSAGES/viking.mo 31share/locale/sl/LC_MESSAGES/viking.mo
70share/locale/sv/LC_MESSAGES/viking.mo 32share/locale/sv/LC_MESSAGES/viking.mo
 33share/locale/tr/LC_MESSAGES/viking.mo
71share/locale/uk/LC_MESSAGES/viking.mo 34share/locale/uk/LC_MESSAGES/viking.mo
72share/locale/zh_CN/LC_MESSAGES/viking.mo 35share/locale/zh_CN/LC_MESSAGES/viking.mo
73share/locale/zh_TW/LC_MESSAGES/viking.mo 36share/locale/zh_TW/LC_MESSAGES/viking.mo
74share/omf/viking/viking-C.omf 37share/viking/datasources.xml
75share/viking/external_tools.xml 38share/viking/external_tools.xml
76share/viking/goto_tools.xml 39share/viking/goto_tools.xml
77share/viking/latlontz.txt 40share/viking/latlontz.txt
78share/viking/maps.xml 41share/viking/maps.xml

cvs diff -r1.25 -r1.26 pkgsrc/geography/viking/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/viking/distinfo 2015/12/13 20:37:31 1.25
+++ pkgsrc/geography/viking/distinfo 2016/12/30 00:10:02 1.26
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.25 2015/12/13 20:37:31 wiedi Exp $ 1$NetBSD: distinfo,v 1.26 2016/12/30 00:10:02 gdt Exp $
2 2
3SHA1 (viking-1.6.tar.bz2) = 364365dfe23742aef36dfd08fd81560000a18ffe 3SHA1 (viking-1.6.2.tar.bz2) = 362ca955b64c0af0ffb5119d559c1ee7a8ce4c2b
4RMD160 (viking-1.6.tar.bz2) = b348bf666753adae0344023d7d32e5ae78dc7554 4RMD160 (viking-1.6.2.tar.bz2) = b17f3e641a76b3c72b9dd77d45082170cb886a3d
5SHA512 (viking-1.6.tar.bz2) = 7716f5720bcd410fa4a2a89ff87548c82a83132003733e6a3f516c51df99ffed4fa3b19631cec9ccedd27b222188a0f092c28ab9af1cefd8d8137b5801eff042 5SHA512 (viking-1.6.2.tar.bz2) = 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8
6Size (viking-1.6.tar.bz2) = 3060389 bytes 6Size (viking-1.6.2.tar.bz2) = 3324897 bytes
7SHA1 (patch-aa) = c7db1eb5562132c463b9472fd7a1a7e559af8d9a 7SHA1 (patch-aa) = c7db1eb5562132c463b9472fd7a1a7e559af8d9a
 8SHA1 (patch-configure) = e80de955f841607d97c45c940db6258ad806123d
8SHA1 (patch-src_gpx.c) = bcc13b87f4fbc9d64abdacbab344e7d5a10549cf 9SHA1 (patch-src_gpx.c) = bcc13b87f4fbc9d64abdacbab344e7d5a10549cf

File Added: pkgsrc/geography/viking/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2016/12/30 00:10:03 gdt Exp $

Remediate bashisms.  I believe this has been reported upstream, but
that should be verified with upstream head.

--- configure.orig	2015-11-24 22:18:34.000000000 +0000
+++ configure
@@ -8585,7 +8585,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
 if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
       INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
 else
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.not-random && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
 fi
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -12428,7 +12428,7 @@ $as_echo "no" >&6; }
 fi
 
 
- if test "x$XP" != "x" && test -r "$DB2MAN_XSL" && test "${HAVE_SCROLLKEEPER}" == "yes" ; then
+ if test "x$XP" != "x" && test -r "$DB2MAN_XSL" && test "${HAVE_SCROLLKEEPER}" = "yes" ; then
   GEN_MANPAGES_TRUE=
   GEN_MANPAGES_FALSE='#'
 else