Re: [Viking-devel] 1.6.2 changes from 1.6

2016-11-02 Thread Greg Troxel

I tried adding gtk-doc as a dependency and doing --enable-gtk-doc, but
then it failed to build; I have mapnik disabled (because I haven't
gotten to checking it in packaging and trying it as an option, not
because I don't want to), and apparently the gtk-scan looks for the
symbol even though the build didn't make it.   Not a big deal, but I'm
not really sure how I should be packaging things.



signature.asc
Description: PGP signature
--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi___
Viking-devel mailing list
Viking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/viking-devel
Viking home page: http://viking.sf.net/

[Viking-devel] 1.6.2 buglets

2016-11-02 Thread Greg Troxel

I know I should make separate commits and push a branch, but I have the
following in pkgsrc.  The issues are the use of $RANDOM and ==, both of
which are outside of POSIX's sh specification and hence unportable.  ==
is easy; it should just be = and there is no downside.  RANDOM may be
harder, but I don't see a lot of configure collisions and it seems $$
(pid) or mkstemp is the sticking-to-posix way.

$NetBSD$

--- configure.orig  2015-11-24 22:18:34.0 +
+++ 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



signature.asc
Description: PGP signature
--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi___
Viking-devel mailing list
Viking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/viking-devel
Viking home page: http://viking.sf.net/

[Viking-devel] 1.6.2 changes from 1.6

2016-11-02 Thread Greg Troxel

I am (belatedly) updating the viking package in pkgsrc from 1.6 to
1.6.2.  I am seeing the following diff in the list of installed
packages.  I realize there are two new translations, but there are no
more help files and there is viking-C.omf instead of datasources.xml.

Is this expected?  Or a clue that some help-making program is required
but my version is undeclared as a dependency or out of date?

--- PLIST   2015-09-01 10:05:05.0 -0400
+++ PLIST.new   2016-11-02 19:53:16.0 -0400
@@ -1,47 +1,9 @@
 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
-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/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
-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/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
+share/locale/ca/LC_MESSAGES/viking.mo
 share/locale/cs/LC_MESSAGES/viking.mo
 share/locale/da/LC_MESSAGES/viking.mo
 share/locale/de/LC_MESSAGES/viking.mo
@@ -68,10 +30,11 @@
 share/locale/sk/LC_MESSAGES/viking.mo
 share/locale/sl/LC_MESSAGES/viking.mo
 share/locale/sv/LC_MESSAGES/viking.mo
+share/locale/tr/LC_MESSAGES/viking.mo
 share/locale/uk/LC_MESSAGES/viking.mo
 share/locale/zh_CN/LC_MESSAGES/viking.mo
 share/locale/zh_TW/LC_MESSAGES/viking.mo
-share/omf/viking/viking-C.omf
+share/viking/datasources.xml
 share/viking/external_tools.xml
 share/viking/goto_tools.xml
 share/viking/latlontz.txt



signature.asc
Description: PGP signature
--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi___
Viking-devel mailing list
Viking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/viking-devel
Viking home page: http://viking.sf.net/