Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/geography/Makefile
+++ b/geography/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2015/06/10 01:50:09 wiedi Exp $
+# $NetBSD: Makefile,v 1.57 2015/09/11 18:45:01 bouyer Exp $
 #

 COMMENT=	Software for geographical-related uses
@@ -22,20 +22,25 @@ SUBDIR+=	gpsdrive
 SUBDIR+=	gpspoint
 SUBDIR+=	gpsutils
 SUBDIR+=	kplex
+SUBDIR+=	libchamplain012
 SUBDIR+=	libchamplain04
 SUBDIR+=	libchamplain06
 SUBDIR+=	libchamplain08
 SUBDIR+=	libdrg
 SUBDIR+=	libgeotiff
+SUBDIR+=	libmemphis02
 SUBDIR+=	libnova
 SUBDIR+=	mapserver
 SUBDIR+=	merkaartor
 SUBDIR+=	opencpn
 SUBDIR+=	opencpn-plugin-gshhs
 SUBDIR+=	opencpn-plugin-weather_routing
+SUBDIR+=	osm-gps-map
 SUBDIR+=	osm2pgsql
 SUBDIR+=	p5-Geo-Coordinates-UTM
 SUBDIR+=	p5-Geo-Distance
+SUBDIR+=	p5-Geo-Ellipsoid
+SUBDIR+=	p5-Geo-Gpx
 SUBDIR+=	p5-Geo-Mercator
 SUBDIR+=	p5-Geo-ShapeFile
 SUBDIR+=	p5-Geo-Weather
--- a/geography/R-countrycode/Makefile
+++ b/geography/R-countrycode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/09/19 20:53:02 brook Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/26 13:30:21 mef Exp $

 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_R_CRAN:=contrib/}
@@ -9,7 +9,7 @@ COMMENT=	Convert country names and country codes
 LICENSE=	gnu-gpl-v3

 R_PKGNAME=	countrycode
-R_PKGVER=	0.17
+R_PKGVER=	0.18

 .include "../../math/R/Makefile.extension"
 .include "../../mk/bsd.pkg.mk"
--- a/geography/R-countrycode/distinfo
+++ b/geography/R-countrycode/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2014/09/19 20:53:02 brook Exp $
+$NetBSD: distinfo,v 1.2 2015/07/26 13:30:21 mef Exp $

-SHA1 (R/countrycode_0.17.tar.gz) = 2fb432637a56b10c441dbd411a3deecacae7b6f6
-RMD160 (R/countrycode_0.17.tar.gz) = f3e126304d870b8016e51cf46024dd8726b9c5c5
-Size (R/countrycode_0.17.tar.gz) = 17555 bytes
+SHA1 (R/countrycode_0.18.tar.gz) = a2a00f1dea17cf2104d1c6b49f6fa5d16e807169
+RMD160 (R/countrycode_0.18.tar.gz) = ce148a4a15fbced3710855f1b21c4a7662d1cd97
+Size (R/countrycode_0.18.tar.gz) = 17552 bytes
--- a/geography/geos/Makefile
+++ b/geography/geos/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2013/08/30 16:37:38 gdt Exp $
+# $NetBSD: Makefile,v 1.25 2015/09/06 19:45:44 gdt Exp $

-DISTNAME=	geos-3.4.2
+DISTNAME=	geos-3.5.0
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 EXTRACT_SUFX=	.tar.bz2
--- a/geography/geos/PLIST
+++ b/geography/geos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2013/08/30 16:37:38 gdt Exp $
+@comment $NetBSD: PLIST,v 1.13 2015/09/06 19:45:44 gdt Exp $
 bin/geos-config
 include/geos.h
 include/geos/algorithm/Angle.h
@@ -262,6 +262,9 @@ include/geos/operation/distance/ConnectedElementLocationFilter.h
 include/geos/operation/distance/ConnectedElementPointFilter.h
 include/geos/operation/distance/DistanceOp.h
 include/geos/operation/distance/GeometryLocation.h
+include/geos/operation/intersection/Rectangle.h
+include/geos/operation/intersection/RectangleIntersection.h
+include/geos/operation/intersection/RectangleIntersectionBuilder.h
 include/geos/operation/linemerge/EdgeString.h
 include/geos/operation/linemerge/LineMergeDirectedEdge.h
 include/geos/operation/linemerge/LineMergeEdge.h
@@ -316,7 +319,6 @@ include/geos/operation/valid/RepeatedPointTester.h
 include/geos/operation/valid/SimpleNestedRingTester.h
 include/geos/operation/valid/SweeplineNestedRingTester.h
 include/geos/operation/valid/TopologyValidationError.h
-include/geos/platform.h
 include/geos/planargraph.h
 include/geos/planargraph/DirectedEdge.h
 include/geos/planargraph/DirectedEdgeStar.h
@@ -327,6 +329,7 @@ include/geos/planargraph/NodeMap.h
 include/geos/planargraph/PlanarGraph.h
 include/geos/planargraph/Subgraph.h
 include/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
+include/geos/platform.h
 include/geos/precision.h
 include/geos/precision/CommonBits.h
 include/geos/precision/CommonBitsOp.h
@@ -348,6 +351,7 @@ include/geos/spatialIndex.h
 include/geos/timeval.h
 include/geos/triangulate/DelaunayTriangulationBuilder.h
 include/geos/triangulate/IncrementalDelaunayTriangulator.h
+include/geos/triangulate/VoronoiDiagramBuilder.h
 include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h
 include/geos/triangulate/quadedge/LocateFailureException.h
 include/geos/triangulate/quadedge/QuadEdge.h
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.22 2013/08/30 16:37:38 gdt Exp $
+$NetBSD: distinfo,v 1.24 2015/09/08 18:48:04 joerg Exp $

-SHA1 (geos-3.4.2.tar.bz2) = b8aceab04dd09f4113864f2d12015231bb318e9a
-RMD160 (geos-3.4.2.tar.bz2) = d847a07996b298f3c700e1ee25e3564adfbd20f5
-Size (geos-3.4.2.tar.bz2) = 1813726 bytes
+SHA1 (geos-3.5.0.tar.bz2) = 142be1db41cb7c62afb9f6d3304769a39dd0b5ac
+RMD160 (geos-3.5.0.tar.bz2) = 273d665246b88beb051d4b5d83e9229eaf559bb3
+Size (geos-3.5.0.tar.bz2) = 1949397 bytes
 SHA1 (patch-ae) = 01ffd15e3562ff8fb191608dc12a2ee6918154b0
+SHA1 (patch-capi_geos__ts__c.cpp) = 0c266de00722606bcb9637f21f5c3c458f12cb47
--- a/geography/geos/patches/patch-capi_geostsc.cpp
+++ b/geography/geos/patches/patch-capi_geostsc.cpp
@@ -0,0 +1,40 @@
+$NetBSD: patch-capi_geos__ts__c.cpp,v 1.1 2015/09/08 18:48:04 joerg Exp $
+
+--- capi/geos_ts_c.cpp.orig	2015-09-08 16:31:02.000000000 +0000
+++ capi/geos_ts_c.cpp
+@@ -214,7 +214,7 @@ typedef struct GEOSContextHandle_HS
+     }
+ 
+     void
+-    NOTICE_MESSAGE(string fmt, ...)
+    NOTICE_MESSAGE(const char *fmt, ...)
+     {
+       if (NULL == noticeMessageOld && NULL == noticeMessageNew) {
+         return;
+@@ -222,7 +222,7 @@ typedef struct GEOSContextHandle_HS
+ 
+       va_list args;
+       va_start(args, fmt);
+-      int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt.c_str(), args);
+      int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt, args);
+       va_end(args);
+ 
+       if (result > 0) {
+@@ -235,7 +235,7 @@ typedef struct GEOSContextHandle_HS
+     }
+ 
+     void
+-    ERROR_MESSAGE(string fmt, ...)
+    ERROR_MESSAGE(const char *fmt, ...)
+     {
+       if (NULL == errorMessageOld && NULL == errorMessageNew) {
+         return;
+@@ -243,7 +243,7 @@ typedef struct GEOSContextHandle_HS
+ 
+       va_list args;
+       va_start(args, fmt);
+-      int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt.c_str(), args);
+      int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt, args);
+       va_end(args);
+ 
+       if (result > 0) {
--- a/geography/gpsbabel/distinfo
+++ b/geography/gpsbabel/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2015/06/06 12:57:58 gdt Exp $
+$NetBSD: distinfo,v 1.9 2015/09/07 18:57:47 gdt Exp $

 SHA1 (gpsbabel-1.5.2.tar.gz) = 4962a7e98bbfcbfd59baa970e9b33d1300053004
 RMD160 (gpsbabel-1.5.2.tar.gz) = 86a54f6e6647ed8eaa340641e9240565acf5ca99
 Size (gpsbabel-1.5.2.tar.gz) = 8392465 bytes
 SHA1 (patch-ad) = 9f7d481ddc1d2935fb05df687db25127fe3b37f0
 SHA1 (patch-af) = 5f066824b49f959ea8b06cdeccf21a4ce789fd1d
+SHA1 (patch-configure) = 1050c5c0117c41ea4aa276d774c34b47a89b56e2
+SHA1 (patch-configure.in) = f046a83e7ddf0a0f26d5623709ad799284875b49
 SHA1 (patch-testo) = 9c71a74aae088eb110c837114a7b691c3a8d9ff6
--- a/geography/gpsbabel/patches/patch-configure
+++ b/geography/gpsbabel/patches/patch-configure
@@ -0,0 +1,25 @@
+$NetBSD: patch-configure,v 1.1 2015/09/07 18:57:47 gdt Exp $
+
+--- configure.orig	2015-09-01 16:32:13.000000000 +0000
+++ configure
+@@ -4816,19 +4816,7 @@ rm -f core conftest.err conftest.$ac_obj
+       $as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
+ 
+ 
+-      # On Mac, use frameworks for includes and library files.
+-      # Macports uses a non-standard build of Qt with an added
+-      # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
+-      # version first.  That will fail on 'normal' Qt so fall
+-      # back to QT_INSTALL_LIBS.
+-      QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
+-      if test $QT_FW_OR_LIBS = "**Unknown**" ; then
+-         QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
+-      fi
+-      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+-      QT_INC="$QT_FW_OR_LIBS"
+-      QT_INC_OPT="-F"
+-      QT_SYSINC_OPT="-iframework"
+      # In pkgsrc, we use the installed qt, not the framework.
+       ;;
+     *-*-freebsd*)
+ 	GBSER=gbser_posix.o
--- a/geography/gpsbabel/patches/patch-configure.in
+++ b/geography/gpsbabel/patches/patch-configure.in
@@ -0,0 +1,32 @@
+$NetBSD: patch-configure.in,v 1.1 2015/09/07 18:57:47 gdt Exp $
+
+In pkgsrc, we don't provide Qt as a framework.
+
+It's not clear how/if this should be addressed upstream.
+
+--- configure.in.orig	2015-01-02 23:02:55.000000000 +0000
+++ configure.in
+@@ -214,20 +214,9 @@ case "$target" in
+       mac/libusb/usb.o "
+       USB_LIBS="-framework  IOKit -framework CoreFoundation"
+       AC_DEFINE(HAVE_LIBUSB, 1)
+- 
+-      # On Mac, use frameworks for includes and library files.
+-      # Macports uses a non-standard build of Qt with an added 
+-      # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
+-      # version first.  That will fail on 'normal' Qt so fall 
+-      # back to QT_INSTALL_LIBS.
+-      QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
+-      if test $QT_FW_OR_LIBS = "**Unknown**" ; then
+-         QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
+-      fi
+-      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+-      QT_INC="$QT_FW_OR_LIBS"
+-      QT_INC_OPT="-F"
+-      QT_SYSINC_OPT="-iframework"
+
+
+      # In pkgsrc, we use the installed qt, not the framework.
+       ;;
+     *-*-freebsd*)
+ 	GBSER=gbser_posix.o
--- a/geography/gpsd/Makefile
+++ b/geography/gpsd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2015/02/09 12:56:49 gdt Exp $
+# $NetBSD: Makefile,v 1.30 2015/08/18 07:31:09 wiz Exp $

 # gpsd 3.11 has been released.  It has only not been updated because
 # newer versions use scons.
 DISTNAME=	gpsd-2.96
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	geography
 MASTER_SITES=	http://download-mirror.savannah.gnu.org/releases/gpsd/

--- a/geography/libchamplain012/DESCR
+++ b/geography/libchamplain012/DESCR
@@ -0,0 +1,2 @@
+libchamplain is a Clutter based widget to display rich, eye-candy and
+interactive maps.
--- a/geography/libchamplain012/Makefile
+++ b/geography/libchamplain012/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1 2015/08/31 11:50:12 nros Exp $
+
+DISTNAME=	libchamplain-0.12.10
+PKGNAME=	libchamplain012-0.12.10
+CATEGORIES=	geography
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libchamplain/0.12/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://projects.gnome.org/libchamplain
+COMMENT=	Map widget
+LICENSE=	gnu-lgpl-v2.1
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake pkg-config
+
+CONFIGURE_ARGS+=--enable-gtk-doc
+CONFIGURE_ARGS+=--enable-memphis
+
+PKGCONFIG_OVERRIDE+=	champlain-gtk.pc.in
+PKGCONFIG_OVERRIDE+=	champlain.pc.in
+
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../geography/libmemphis02/buildlink3.mk"
+.include "../../graphics/clutter/buildlink3.mk"
+.include "../../graphics/clutter-gtk/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/geography/libchamplain012/PLIST
+++ b/geography/libchamplain012/PLIST
@@ -0,0 +1,128 @@
+@comment $NetBSD: PLIST,v 1.1 2015/08/31 11:50:12 nros Exp $
+include/libchamplain-0.12/champlain/champlain-adjustment.h
+include/libchamplain-0.12/champlain/champlain-bounding-box.h
+include/libchamplain-0.12/champlain/champlain-coordinate.h
+include/libchamplain-0.12/champlain/champlain-custom-marker.h
+include/libchamplain-0.12/champlain/champlain-defines.h
+include/libchamplain-0.12/champlain/champlain-enum-types.h
+include/libchamplain-0.12/champlain/champlain-error-tile-renderer.h
+include/libchamplain-0.12/champlain/champlain-features.h
+include/libchamplain-0.12/champlain/champlain-file-cache.h
+include/libchamplain-0.12/champlain/champlain-file-tile-source.h
+include/libchamplain-0.12/champlain/champlain-image-renderer.h
+include/libchamplain-0.12/champlain/champlain-kinetic-scroll-view.h
+include/libchamplain-0.12/champlain/champlain-label.h
+include/libchamplain-0.12/champlain/champlain-layer.h
+include/libchamplain-0.12/champlain/champlain-license.h
+include/libchamplain-0.12/champlain/champlain-location.h
+include/libchamplain-0.12/champlain/champlain-map-source-chain.h
+include/libchamplain-0.12/champlain/champlain-map-source-desc.h
+include/libchamplain-0.12/champlain/champlain-map-source-factory.h
+include/libchamplain-0.12/champlain/champlain-map-source.h
+include/libchamplain-0.12/champlain/champlain-marker-layer.h
+include/libchamplain-0.12/champlain/champlain-marker.h
+include/libchamplain-0.12/champlain/champlain-marshal.h
+include/libchamplain-0.12/champlain/champlain-memory-cache.h
+include/libchamplain-0.12/champlain/champlain-memphis-renderer.h
+include/libchamplain-0.12/champlain/champlain-network-bbox-tile-source.h
+include/libchamplain-0.12/champlain/champlain-network-tile-source.h
+include/libchamplain-0.12/champlain/champlain-null-tile-source.h
+include/libchamplain-0.12/champlain/champlain-path-layer.h
+include/libchamplain-0.12/champlain/champlain-point.h
+include/libchamplain-0.12/champlain/champlain-renderer.h
+include/libchamplain-0.12/champlain/champlain-scale.h
+include/libchamplain-0.12/champlain/champlain-tile-cache.h
+include/libchamplain-0.12/champlain/champlain-tile-source.h
+include/libchamplain-0.12/champlain/champlain-tile.h
+include/libchamplain-0.12/champlain/champlain-version.h
+include/libchamplain-0.12/champlain/champlain-view.h
+include/libchamplain-0.12/champlain/champlain-viewport.h
+include/libchamplain-0.12/champlain/champlain.h
+include/libchamplain-gtk-0.12/champlain-gtk/champlain-gtk-enum-types.h
+include/libchamplain-gtk-0.12/champlain-gtk/champlain-gtk-marshal.h
+include/libchamplain-gtk-0.12/champlain-gtk/champlain-gtk.h
+include/libchamplain-gtk-0.12/champlain-gtk/gtk-champlain-embed.h
+lib/libchamplain-0.12.la
+lib/libchamplain-gtk-0.12.la
+lib/pkgconfig/champlain-0.12.pc
+lib/pkgconfig/champlain-gtk-0.12.pc
+share/gtk-doc/html/libchamplain-0.12/ChamplainBoundingBox.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainCoordinate.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainCustomMarker.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainErrorTileRenderer.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainFileCache.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainFileTileSource.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainImageRenderer.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainLabel.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainLayer.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainLicense.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainLocation.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainMapSource.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainMapSourceChain.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainMapSourceDesc.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainMapSourceFactory.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainMarker.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainMarkerLayer.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainMemoryCache.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainNetworkBboxTileSource.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainNetworkTileSource.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainNullTileSource.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainPathLayer.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainPoint.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainRenderer.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainScale.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainTile.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainTileCache.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainTileSource.html
+share/gtk-doc/html/libchamplain-0.12/ChamplainView.html
+share/gtk-doc/html/libchamplain-0.12/annotation-glossary.html
+share/gtk-doc/html/libchamplain-0.12/ch01.html
+share/gtk-doc/html/libchamplain-0.12/ch02.html
+share/gtk-doc/html/libchamplain-0.12/ch03.html
+share/gtk-doc/html/libchamplain-0.12/ch04.html
+share/gtk-doc/html/libchamplain-0.12/ch05.html
+share/gtk-doc/html/libchamplain-0.12/ch06.html
+share/gtk-doc/html/libchamplain-0.12/home.png
+share/gtk-doc/html/libchamplain-0.12/index.html
+share/gtk-doc/html/libchamplain-0.12/index.sgml
+share/gtk-doc/html/libchamplain-0.12/ix01.html
+share/gtk-doc/html/libchamplain-0.12/ix02.html
+share/gtk-doc/html/libchamplain-0.12/ix03.html
+share/gtk-doc/html/libchamplain-0.12/ix04.html
+share/gtk-doc/html/libchamplain-0.12/ix05.html
+share/gtk-doc/html/libchamplain-0.12/ix06.html
+share/gtk-doc/html/libchamplain-0.12/ix07.html
+share/gtk-doc/html/libchamplain-0.12/ix08.html
+share/gtk-doc/html/libchamplain-0.12/ix09.html
+share/gtk-doc/html/libchamplain-0.12/left-insensitive.png
+share/gtk-doc/html/libchamplain-0.12/left.png
+share/gtk-doc/html/libchamplain-0.12/libchamplain-0.12.devhelp2
+share/gtk-doc/html/libchamplain-0.12/libchamplain-ChamplainVersion.html
+share/gtk-doc/html/libchamplain-0.12/pt01.html
+share/gtk-doc/html/libchamplain-0.12/pt02.html
+share/gtk-doc/html/libchamplain-0.12/pt03.html
+share/gtk-doc/html/libchamplain-0.12/pt04.html
+share/gtk-doc/html/libchamplain-0.12/pt05.html
+share/gtk-doc/html/libchamplain-0.12/pt06.html
+share/gtk-doc/html/libchamplain-0.12/pt07.html
+share/gtk-doc/html/libchamplain-0.12/right-insensitive.png
+share/gtk-doc/html/libchamplain-0.12/right.png
+share/gtk-doc/html/libchamplain-0.12/style.css
+share/gtk-doc/html/libchamplain-0.12/up-insensitive.png
+share/gtk-doc/html/libchamplain-0.12/up.png
+share/gtk-doc/html/libchamplain-gtk-0.12/GtkChamplainEmbed.html
+share/gtk-doc/html/libchamplain-gtk-0.12/annotation-glossary.html
+share/gtk-doc/html/libchamplain-gtk-0.12/home.png
+share/gtk-doc/html/libchamplain-gtk-0.12/index.html
+share/gtk-doc/html/libchamplain-gtk-0.12/index.sgml
+share/gtk-doc/html/libchamplain-gtk-0.12/left-insensitive.png
+share/gtk-doc/html/libchamplain-gtk-0.12/left.png
+share/gtk-doc/html/libchamplain-gtk-0.12/libchamplain-gtk-0.12.devhelp2
+share/gtk-doc/html/libchamplain-gtk-0.12/pt01.html
+share/gtk-doc/html/libchamplain-gtk-0.12/right-insensitive.png
+share/gtk-doc/html/libchamplain-gtk-0.12/right.png
+share/gtk-doc/html/libchamplain-gtk-0.12/style.css
+share/gtk-doc/html/libchamplain-gtk-0.12/up-insensitive.png
+share/gtk-doc/html/libchamplain-gtk-0.12/up.png
+share/vala/vapi/champlain-0.12.vapi
+share/vala/vapi/champlain-gtk-0.12.vapi
--- a/geography/libchamplain012/buildlink3.mk
+++ b/geography/libchamplain012/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/08/31 11:50:12 nros Exp $
+
+BUILDLINK_TREE+=	libchamplain012
+
+.if !defined(LIBCHAMPLAIN012_BUILDLINK3_MK)
+LIBCHAMPLAIN012_BUILDLINK3_MK:=
+
+BUILDLINK_ABI_DEPENDS.libchamplain012+= libchamplain012>=0.12.10
+BUILDLINK_API_DEPENDS.libchamplain012+=	libchamplain012>=0.12.9
+BUILDLINK_PKGSRCDIR.libchamplain012?=	../../geography/libchamplain012
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../geography/libmemphis02/buildlink3.mk"
+.include "../../graphics/clutter/buildlink3.mk"
+.include "../../graphics/clutter-gtk/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.endif	# LIBCHAMPLAIN012_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libchamplain012
--- a/geography/libchamplain012/distinfo
+++ b/geography/libchamplain012/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/08/31 11:50:12 nros Exp $
+
+SHA1 (libchamplain-0.12.10.tar.xz) = 8d32b4a3c20470e36065990a8bb4dabb675017d9
+RMD160 (libchamplain-0.12.10.tar.xz) = 546773195dcee0f118f2c25bacb7d2206c9f49a0
+Size (libchamplain-0.12.10.tar.xz) = 597476 bytes
--- a/geography/libmemphis02/DESCR
+++ b/geography/libmemphis02/DESCR
@@ -0,0 +1,3 @@
+Memphis is a library for OpenStreetMap written in C using eXpat,
+Cairo and GLib. It's licensed under the terms of the GNU Lesser
+General Public License.
--- a/geography/libmemphis02/Makefile
+++ b/geography/libmemphis02/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2015/08/22 17:42:53 nros Exp $
+
+DISTNAME=	memphis-0.2.3
+PKGNAME=	libmemphis02-0.2.3
+CATEGORIES=	geography
+MASTER_SITES=	${MASTER_SITE_GITHUB:=jiuka/}
+GITHUB_PROJECT=	memphis
+EXTRACT_USING=	bsdtar
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://github.com/jiuka/memphis
+COMMENT=	Library for OpenStreetMap
+LICENSE=	gnu-lgpl-v2.1
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	aclocal autoconf autoheader automake gmake pkg-config
+
+CONFIGURE_ARGS+=--enable-gtk-doc
+
+PKGCONFIG_OVERRIDE+=memphis.pc.in
+
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	libtoolize --copy; aclocal -I m4; \
+	gtkdocize --copy; autoheader; \
+	automake -a --foreign -i --add-missing; autoconf
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/geography/libmemphis02/PLIST
+++ b/geography/libmemphis02/PLIST
@@ -0,0 +1,32 @@
+@comment $NetBSD: PLIST,v 1.1 2015/08/22 17:42:53 nros Exp $
+include/libmemphis-0.2/memphis/memphis-data-pool.h
+include/libmemphis-0.2/memphis/memphis-debug.h
+include/libmemphis-0.2/memphis/memphis-map.h
+include/libmemphis-0.2/memphis/memphis-renderer.h
+include/libmemphis-0.2/memphis/memphis-rule-set.h
+include/libmemphis-0.2/memphis/memphis-rule.h
+include/libmemphis-0.2/memphis/memphis.h
+lib/libmemphis-0.2.la
+lib/pkgconfig/memphis-0.2.pc
+share/gtk-doc/html/libmemphis-0.2/MemphisDataPool.html
+share/gtk-doc/html/libmemphis-0.2/MemphisMap.html
+share/gtk-doc/html/libmemphis-0.2/MemphisRenderer.html
+share/gtk-doc/html/libmemphis-0.2/MemphisRule.html
+share/gtk-doc/html/libmemphis-0.2/MemphisRuleSet.html
+share/gtk-doc/html/libmemphis-0.2/annotation-glossary.html
+share/gtk-doc/html/libmemphis-0.2/api-index-full.html
+share/gtk-doc/html/libmemphis-0.2/ch01.html
+share/gtk-doc/html/libmemphis-0.2/home.png
+share/gtk-doc/html/libmemphis-0.2/index.html
+share/gtk-doc/html/libmemphis-0.2/index.sgml
+share/gtk-doc/html/libmemphis-0.2/left-insensitive.png
+share/gtk-doc/html/libmemphis-0.2/left.png
+share/gtk-doc/html/libmemphis-0.2/libmemphis-0.2.devhelp2
+share/gtk-doc/html/libmemphis-0.2/libmemphis-MemphisDebug.html
+share/gtk-doc/html/libmemphis-0.2/object-tree.html
+share/gtk-doc/html/libmemphis-0.2/right-insensitive.png
+share/gtk-doc/html/libmemphis-0.2/right.png
+share/gtk-doc/html/libmemphis-0.2/style.css
+share/gtk-doc/html/libmemphis-0.2/up-insensitive.png
+share/gtk-doc/html/libmemphis-0.2/up.png
+share/memphis-0.2/default-rules.xml
--- a/geography/libmemphis02/buildlink3.mk
+++ b/geography/libmemphis02/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/08/22 17:42:53 nros Exp $
+
+BUILDLINK_TREE+=	libmemphis02
+
+.if !defined(LIBMEMPHIS02_BUILDLINK3_MK)
+LIBMEMPHIS02_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libmemphis02+=	libmemphis02>=0.2.3
+BUILDLINK_PKGSRCDIR.libmemphis02?=	../../geography/libmemphis02
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.endif	# LIBMEMPHIS02_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libmemphis02
--- a/geography/libmemphis02/distinfo
+++ b/geography/libmemphis02/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2015/08/22 17:42:53 nros Exp $
+
+SHA1 (memphis-0.2.3.tar.gz) = dbc2f61e49b996dc9ca91df0de9a08eb7adbfa9b
+RMD160 (memphis-0.2.3.tar.gz) = e00f510a97b4b0adb738dcb0949f65d8a7fe21fb
+Size (memphis-0.2.3.tar.gz) = 3417472 bytes
+SHA1 (patch-demos_Makefile.am) = 72337c9220d63f00ef462612ff6b2e5062dc5c8d
+SHA1 (patch-docs_reference_Makefile.am) = 695e940e4f180968dce4caa868204369fb4e000d
--- a/geography/libmemphis02/patches/patch-demos_Makefile.am
+++ b/geography/libmemphis02/patches/patch-demos_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD: patch-demos_Makefile.am,v 1.1 2015/08/22 17:42:53 nros Exp $
+* install in versioned directory
+--- demos/Makefile.am.orig	2010-06-20 13:23:27.000000000 +0000
+++ demos/Makefile.am
+@@ -6,7 +6,7 @@ AM_LDFLAGS = $(DEPS_LIBS) ../memphis/lib
+ 
+ tile_renderer_SOURCES = tile-renderer.c
+ 
+-memphisrulesdir = $(datadir)/memphis
+memphisrulesdir = $(datadir)/memphis-0.2
+ memphisrules_DATA = \
+ 	default-rules.xml
+ 
--- a/geography/libmemphis02/patches/patch-docs_reference_Makefile.am
+++ b/geography/libmemphis02/patches/patch-docs_reference_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD: patch-docs_reference_Makefile.am,v 1.1 2015/08/22 17:42:53 nros Exp $
+* Install versioned docs
+--- docs/reference/Makefile.am.orig	2010-06-20 13:23:27.000000000 +0000
+++ docs/reference/Makefile.am
+@@ -12,7 +12,7 @@ AUTOMAKE_OPTIONS = 1.6
+ DOC_MODULE=libmemphis
+ 
+ # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
+-#DOC_MODULE_VERSION=2
+DOC_MODULE_VERSION=0.2
+ 
+ 
+ # The top-level SGML file. You can change this if you want to.
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2015/04/25 14:23:06 tnn Exp $
+# $NetBSD: Makefile,v 1.56 2015/06/30 09:57:36 ryoon Exp $

 DISTNAME=	mapserver-5.6.8
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	geography www
 MASTER_SITES=	http://download.osgeo.org/mapserver/

--- a/geography/opencpn-plugin-weather_routing/Makefile
+++ b/geography/opencpn-plugin-weather_routing/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2015/04/25 14:23:06 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2015/09/09 11:07:07 bouyer Exp $
 #

-VERSION=	20150201
+VERSION=	20150829
 DISTNAME=	weather_routing_pi-${VERSION}
 PKGNAME=	opencpn-plugin-weather_routing-${VERSION}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	geography
-MASTER_SITES=	http://ftp.fr.netbsd.org/~bouyer/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=seandepagnier/}
+GITHUB_PROJECT=	weather_routing_pi
+GITHUB_TAG=	e652536aca24809cd3514c8c903603806b22bb0d

 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://opencpn.org/ocpn/weather_routing_plugin
@@ -29,4 +31,5 @@ CMAKE_MODULE_PATH_OVERRIDE = \
 .include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.include "../../textproc/tinyxml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/geography/opencpn-plugin-weather_routing/PLIST
+++ b/geography/opencpn-plugin-weather_routing/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/02 20:41:34 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/09/09 11:07:07 bouyer Exp $
 lib/opencpn/libweather_routing_pi.so
 share/locale/ca/LC_MESSAGES/opencpn-weather_routing_pi.mo
 share/locale/cs/LC_MESSAGES/opencpn-weather_routing_pi.mo
@@ -20,3 +20,139 @@ share/locale/ru/LC_MESSAGES/opencpn-weather_routing_pi.mo
 share/locale/sv/LC_MESSAGES/opencpn-weather_routing_pi.mo
 share/locale/tr/LC_MESSAGES/opencpn-weather_routing_pi.mo
 share/locale/zh/LC_MESSAGES/opencpn-weather_routing_pi.mo
+share/opencpn/plugins/weather_routing_pi/data/WeatherRoutingInformation.html
+share/opencpn/plugins/weather_routing_pi/data/polars/60ft_mono.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/60ft_multi_1.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/60ft_multi_2.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/60ft_multi_3.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/60ftmono.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/60ftmulti_1.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/60ftmulti_2.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/60ftmulti_3.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Alberg35.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Alden52.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/BAVARIA_38_MATCH.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/BENETEAU_44.7.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Beneteau375.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Beneteau421.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Beowulf78.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/BlockIsland40.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Boat-C5.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Boat_OceanExpress.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/BountyII.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/COMFORTINA_38.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/C_C34.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/C_C372.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/C_C402.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/C_C44.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Cal2-46.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Cal239.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Cal36.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Cal40.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Catalina36.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Catalina36a.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Centurion47.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Cheoy_Lee44.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Colombia43.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Colombia50.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Contessa33.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Crealock34.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/DEHLER_33.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/DEHLER_36.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/DEHLER_44.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/DIVA_35.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/DUFOUR_34.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Deerfoot2_62.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Deerfoot62.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Deerfoot64K.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Deerfoot_74.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Endeavor40.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Erickson29.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Express37.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/FACIL_30.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/FARR_40.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/FINNGULF_33.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Farr40.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Farr_39CR.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Figaro2.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Freedom44CB.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/GRAND_SOLEIL_37.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/GRAND_SOLEiL_341.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/GRAND_SOLEiL_40.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Gulfstar44.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Gulfstar50.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/HR382_v1.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Hinckley50.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Hunter375.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Hylas54.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/IMX_38.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Irwin40.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Irwin54.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Islander36.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/J130.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/J34C.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/J40.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Jeanceau41.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Linjett_33.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Linjett_40.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Little_Hrb50.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Little_Hrb63.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Little_Hrb_48.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Morgan41.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Mumm30.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Mumm_30.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Mumm_36.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Navy44.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Newport41.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Norseman447.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Passport41.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Pearson33.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Peterson44.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Ranger37.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Sabre362.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Sabre402.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/SantaCruz70.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Santana35.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Shannon38-Rick.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Shock35.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Sundeer64K.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Swan391.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Swan46.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Swan46CB.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Swan60.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Swan_37.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Tartan37.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Tartan40.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Tartan41.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Tayana37.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Tayana42.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Tayana52.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Valiant40.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Valiant47.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/Volvo_70.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/X41.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/X_332.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/Yankee38.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/arcona400.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/arcona460.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/beowulf_78.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_A35.csv
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_A35.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_Bristol32-140Jib-Spin.csv
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_Bristol32-140Jib.csv
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_Class40.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_Hi5.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_Imoca.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_Imoca_2008.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_figaro2.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/boat_imoca2007.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/deerfoot_2_62.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/deerfoot_62.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/deerfoot_64k.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/dynamic_3000.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/figaro_1.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/figaro_2.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/hanse_400.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/mumm_30.pol
+share/opencpn/plugins/weather_routing_pi/data/polars/scanmar_33.txt
+share/opencpn/plugins/weather_routing_pi/data/polars/small_polar.pol
--- a/geography/opencpn-plugin-weather_routing/distinfo
+++ b/geography/opencpn-plugin-weather_routing/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2015/02/02 20:41:34 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2015/09/09 11:07:07 bouyer Exp $

-SHA1 (weather_routing_pi-20150201.tar.gz) = c52122dc3c655307b7e7e5bd50b083567a3a7dc0
-RMD160 (weather_routing_pi-20150201.tar.gz) = a5313bd09a069a87f6b05b7f253ad4dcc2e49084
-Size (weather_routing_pi-20150201.tar.gz) = 3184466 bytes
+SHA1 (weather_routing_pi-20150829-e652536aca24809cd3514c8c903603806b22bb0d.tar.gz) = ee3a7a485f9e0f6be60ba7a5d92309b27acea029
+RMD160 (weather_routing_pi-20150829-e652536aca24809cd3514c8c903603806b22bb0d.tar.gz) = f563544b3601b5f325e5c00bb60eff847b52b467
+Size (weather_routing_pi-20150829-e652536aca24809cd3514c8c903603806b22bb0d.tar.gz) = 787968 bytes
--- a/geography/osm-gps-map/DESCR
+++ b/geography/osm-gps-map/DESCR
@@ -0,0 +1,6 @@
+osm-gps-map is a Gtk mapping widget that when given GPS co-ordinates, draws a
+GPS track, and points of interest on a moving map display.
+
+osm-gps-map Downloads map data from a number of websites, including
+openstreetmap.org, openaerialmap.org and others and can be used to build desktop
+mapping or geolocation applications.
--- a/geography/osm-gps-map/Makefile
+++ b/geography/osm-gps-map/Makefile
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2015/07/13 02:31:55 rodent Exp $
+
+DISTNAME=	osm-gps-map-1.0.2
+CATEGORIES=	geography
+MASTER_SITES=	${MASTER_SITE_GITHUB:=nzjrs/}
+GITHUB_RELEASE=	1.0.2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	${MASTER_SITE_GITHUB:=nzjrs/osm-gps-map/}
+COMMENT=	Gtk+ Widget for Displaying OpenStreetMap tiles
+LICENSE=	gnu-gpl-v2
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake pkg-config
+
+PKGCONFIG_OVERRIDE+=	osmgpsmap-1.0.pc.in
+
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc
+
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../graphics/cairo-gobject/buildlink3.mk"
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/geography/osm-gps-map/PLIST
+++ b/geography/osm-gps-map/PLIST
@@ -0,0 +1,39 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/13 02:31:55 rodent Exp $
+include/osmgpsmap-1.0/osm-gps-map-compat.h
+include/osmgpsmap-1.0/osm-gps-map-image.h
+include/osmgpsmap-1.0/osm-gps-map-layer.h
+include/osmgpsmap-1.0/osm-gps-map-osd.h
+include/osmgpsmap-1.0/osm-gps-map-point.h
+include/osmgpsmap-1.0/osm-gps-map-source.h
+include/osmgpsmap-1.0/osm-gps-map-track.h
+include/osmgpsmap-1.0/osm-gps-map-widget.h
+include/osmgpsmap-1.0/osm-gps-map.h
+lib/girepository-1.0/OsmGpsMap-1.0.typelib
+lib/libosmgpsmap-1.0.la
+lib/pkgconfig/osmgpsmap-1.0.pc
+share/doc/osm-gps-map/AUTHORS
+share/doc/osm-gps-map/COPYING
+share/doc/osm-gps-map/ChangeLog
+share/doc/osm-gps-map/INSTALL
+share/doc/osm-gps-map/NEWS
+share/doc/osm-gps-map/README
+share/gir-1.0/OsmGpsMap-1.0.gir
+share/gtk-doc/html/libosmgpsmap/OsmGpsMap.html
+share/gtk-doc/html/libosmgpsmap/OsmGpsMapImage.html
+share/gtk-doc/html/libosmgpsmap/OsmGpsMapLayer.html
+share/gtk-doc/html/libosmgpsmap/OsmGpsMapPoint.html
+share/gtk-doc/html/libosmgpsmap/OsmGpsMapTrack.html
+share/gtk-doc/html/libosmgpsmap/annotation-glossary.html
+share/gtk-doc/html/libosmgpsmap/api-index-deprecated.html
+share/gtk-doc/html/libosmgpsmap/api-index-full.html
+share/gtk-doc/html/libosmgpsmap/api-reference-deprecated.html
+share/gtk-doc/html/libosmgpsmap/api-reference.html
+share/gtk-doc/html/libosmgpsmap/home.png
+share/gtk-doc/html/libosmgpsmap/index.html
+share/gtk-doc/html/libosmgpsmap/index.sgml
+share/gtk-doc/html/libosmgpsmap/left.png
+share/gtk-doc/html/libosmgpsmap/libosmgpsmap-OsmGpsMap-Deprecated.html
+share/gtk-doc/html/libosmgpsmap/libosmgpsmap.devhelp2
+share/gtk-doc/html/libosmgpsmap/right.png
+share/gtk-doc/html/libosmgpsmap/style.css
+share/gtk-doc/html/libosmgpsmap/up.png
--- a/geography/osm-gps-map/distinfo
+++ b/geography/osm-gps-map/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2015/07/13 02:31:55 rodent Exp $
+
+SHA1 (osm-gps-map-1.0.2.tar.gz) = 3b37f20490cbcdd87d9574b74912ebb3db4a7d70
+RMD160 (osm-gps-map-1.0.2.tar.gz) = a5ea3d5aea36ae808b5566f662b00d4ed795e639
+Size (osm-gps-map-1.0.2.tar.gz) = 431981 bytes
+SHA1 (patch-Makefile.in) = 2d016a65cc295d198265b6b3b5c06dbf0d200202
--- a/geography/osm-gps-map/patches/patch-Makefile.in
+++ b/geography/osm-gps-map/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2015/07/13 02:31:55 rodent Exp $
+
+Fix DOCDIR.
+
+--- Makefile.in.orig	2014-04-08 20:31:26.000000000 +0000
+++ Makefile.in
+@@ -299,7 +299,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
+     --enable-maintainer-flags
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+-osm_gps_mapdocdir = ${prefix}/doc/osm-gps-map
+osm_gps_mapdocdir = ${docdir}/osm-gps-map
+ osm_gps_mapdoc_DATA = \
+ 	README                                      \
+ 	COPYING                                     \
--- a/geography/osm2pgsql/Makefile
+++ b/geography/osm2pgsql/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2015/06/10 01:48:49 wiedi Exp $
+# $NetBSD: Makefile,v 1.2 2015/08/28 21:38:32 wiedi Exp $

-DISTNAME=	osm2pgsql-0.87.3
+DISTNAME=	osm2pgsql-0.88.1
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openstreetmap/}
 GITHUB_TAG=	${PKGVERSION_NOREV}
--- a/geography/osm2pgsql/distinfo
+++ b/geography/osm2pgsql/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1 2015/06/10 01:48:49 wiedi Exp $
+$NetBSD: distinfo,v 1.2 2015/08/28 21:38:32 wiedi Exp $

-SHA1 (osm2pgsql-0.87.3.tar.gz) = 977f1c6591a7603240dafd31ca67a18f01537ab8
-RMD160 (osm2pgsql-0.87.3.tar.gz) = bacfb31b95611cd9c02e005bbc50749f1ac1905b
-Size (osm2pgsql-0.87.3.tar.gz) = 2141464 bytes
+SHA1 (osm2pgsql-0.88.1.tar.gz) = 8dcdb563de23a641c94855b50bf020c799b6a869
+RMD160 (osm2pgsql-0.88.1.tar.gz) = 8d8ce268e00a015112ec3385dd93b7160032da83
+Size (osm2pgsql-0.88.1.tar.gz) = 2140606 bytes
 SHA1 (patch-middle-pgsql.cpp) = 71146a00bdfd486ae0b7ed74566270b4671175b7
-SHA1 (patch-node-persistent-cache.cpp) = db641099525c275af06f86377d30b7f67d1e273a
--- a/geography/osm2pgsql/patches/patch-node-persistent-cache.cpp
+++ b/geography/osm2pgsql/patches/patch-node-persistent-cache.cpp
@@ -1,35 +0,0 @@
-$NetBSD: patch-node-persistent-cache.cpp,v 1.1 2015/06/10 01:48:49 wiedi Exp $
-
-Use std namespace to find isnan
-
--- node-persistent-cache.cpp.orig	2015-04-30 04:15:07.000000000 +0000
-+++ node-persistent-cache.cpp
-@@ -450,7 +450,7 @@ int node_persistent_cache::set_append(os
-         block_id = load_block(block_offset);
- 
- #ifdef FIXED_POINT
-    if (isnan(lat) && isnan(lon))
-+    if (std::isnan(lat) && std::isnan(lon))
-     {
-         readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lat =
-                 INT_MIN;
-@@ -512,8 +512,8 @@ int node_persistent_cache::get(struct os
-         return 0;
-     }
- #else
-    if ((isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lat)) &&
-            (isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lon)))
-+    if ((std::isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lat)) &&
-+            (std::isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lon)))
-     {
-         return 1;
-     }
-@@ -547,7 +547,7 @@ int node_persistent_cache::get_list(node
- 
-     size_t wrtidx = 0;
-     for (size_t i = 0; i < nds.size(); i++) {
-        if (isnan(out[i].lat) && isnan(out[i].lon)) {
-+        if (std::isnan(out[i].lat) && std::isnan(out[i].lon)) {
-             if (get(&(out[wrtidx]), nds[i]) == 0)
-                 wrtidx++;
-         } else {
--- a/geography/p5-Geo-Ellipsoid/DESCR
+++ b/geography/p5-Geo-Ellipsoid/DESCR
@@ -0,0 +1,5 @@
+Geo::Ellipsoid performs geometrical calculations on the surface of an
+ellipsoid. An ellipsoid is a three-dimension object formed from the
+rotation of an ellipse about one of its axes. The approximate shape of the
+earth is an ellipsoid, so Geo::Ellipsoid can accurately calculate distance
+and bearing between two widely-separated locations on the earth's surface.
--- a/geography/p5-Geo-Ellipsoid/Makefile
+++ b/geography/p5-Geo-Ellipsoid/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1.1.1 2015/09/11 18:43:24 bouyer Exp $
+#
+
+DISTNAME=	Geo-Ellipsoid-1.12
+PKGNAME=	p5-${DISTNAME}
+CATEGORIES=	perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Geo/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://search.cpan.org/~jgibson/Geo-Ellipsoid-1.12/lib/Geo/Ellipsoid.pm
+COMMENT=	Geo::Ellipsoid - Longitude and latitude calculations using an ellipsoid model.
+LICENSE=	${PERL5_LICENSE}
+
+PERL5_PACKLIST=	auto/Geo/Ellipsoid/.packlist
+#PERL5_MODULE_TYPE=	Module::Install::Bundled
+MAKE_PARAMS+=	--skipdeps
+
+.include "../../lang/perl5/module.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/geography/p5-Geo-Ellipsoid/distinfo
+++ b/geography/p5-Geo-Ellipsoid/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2015/09/11 18:43:24 bouyer Exp $
+
+SHA1 (Geo-Ellipsoid-1.12.tar.gz) = b20f164032ffe4d357871604d61c4902a89a992c
+RMD160 (Geo-Ellipsoid-1.12.tar.gz) = b1340dd4a6b27a7939bdd765315ce8833d244a0d
+Size (Geo-Ellipsoid-1.12.tar.gz) = 80734 bytes
--- a/geography/p5-Geo-Gpx/DESCR
+++ b/geography/p5-Geo-Gpx/DESCR
@@ -0,0 +1,4 @@
+The original goal of this module was to produce GPX/XML files which were
+parseable by both GPX Spinner and EasyGPS. As of version 0.13 it has been
+extended to support general parsing and generation of GPX data.
+GPX 1.0 and 1.1 are supported.
--- a/geography/p5-Geo-Gpx/Makefile
+++ b/geography/p5-Geo-Gpx/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.2 2015/09/11 18:01:02 bouyer Exp $
+#
+
+DISTNAME=	Geo-Gpx-0.26
+PKGNAME=	p5-${DISTNAME}
+CATEGORIES=	perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Geo/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://search.cpan.org/~andya/Geo-Gpx-0.26/lib/Geo/Gpx.pm
+COMMENT=	Geo::Gpx - Create and parse GPX files.
+LICENSE=	${PERL5_LICENSE}
+
+PERL5_PACKLIST=	auto/Geo/Gpx/.packlist
+#PERL5_MODULE_TYPE=	Module::Install::Bundled
+MAKE_PARAMS+=	--skipdeps
+
+DEPENDS+=	p5-DateTime-Format-ISO8601>=0.0800:../../time/p5-DateTime-Format-ISO8601
+DEPENDS+=	p5-HTML-Parser>=3.71:../../www/p5-HTML-Parser
+DEPENDS+=	p5-XML-Descent>=1.04:../../textproc/p5-XML-Descent
+
+
+.include "../../lang/perl5/module.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/geography/p5-Geo-Gpx/distinfo
+++ b/geography/p5-Geo-Gpx/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2015/09/11 15:14:25 bouyer Exp $
+
+SHA1 (Geo-Gpx-0.26.tar.gz) = 8ac6c10f9e3fb81c56ba49930fd9afba1aa47107
+RMD160 (Geo-Gpx-0.26.tar.gz) = 0c091dedfa372bcc73089f18c2bd03c13da45e7b
+Size (Geo-Gpx-0.26.tar.gz) = 20452 bytes
--- a/geography/proj/Makefile
+++ b/geography/proj/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/03/14 18:52:30 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2015/09/13 23:22:23 gdt Exp $

-VERSION_BASE=	4.9.1
+VERSION_BASE=	4.9.2
 VERSION=	${VERSION_BASE}
 WRKSRC=		${WRKDIR}/proj-${VERSION_BASE}
 DISTNAME=	proj-${VERSION}
--- a/geography/proj/PLIST
+++ b/geography/proj/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/03/14 17:59:10 gdt Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/09/13 23:22:23 gdt Exp $
 bin/cs2cs
 bin/geod
 bin/invgeod
@@ -39,6 +39,7 @@ share/proj/ntv1_can.dat
 share/proj/null
 share/proj/nzgd2kgrid0005.gsb
 share/proj/other.extra
+share/proj/proj_def.dat
 share/proj/prvi
 share/proj/stgeorge
 share/proj/stlrnc
--- a/geography/proj/distinfo
+++ b/geography/proj/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2015/03/14 17:59:10 gdt Exp $
+$NetBSD: distinfo,v 1.4 2015/09/13 23:22:23 gdt Exp $

-SHA1 (proj-4.9.1.tar.gz) = 0bc63a41f1bdcff600d076c056f796007abf3f2f
-RMD160 (proj-4.9.1.tar.gz) = d13b21e7ab9c027d875a72baa5d5a491e464873a
-Size (proj-4.9.1.tar.gz) = 876386 bytes
+SHA1 (proj-4.9.2.tar.gz) = cdab24908f22b1e6bc0353e4fc42753269d75ab4
+RMD160 (proj-4.9.2.tar.gz) = 23e669036bcf2aae6438e44c1ac8c3e45c976d2e
+Size (proj-4.9.2.tar.gz) = 874816 bytes
 SHA1 (proj-datumgrid-1.5.tar.gz) = 38385e05f50445fe1b72243e54875360c4426a30
 RMD160 (proj-datumgrid-1.5.tar.gz) = 9a75d4c1652c6b1a614ee5e90c77138a2af34025
 Size (proj-datumgrid-1.5.tar.gz) = 2252308 bytes
-SHA1 (patch-README) = f8b38e806254135314f00f2583a744b39d38c527
+SHA1 (patch-README) = 05ec5a5aa1b1e3f54dc4b313b308a8124c236172
--- a/geography/proj/patches/patch-README
+++ b/geography/proj/patches/patch-README
@@ -1,8 +1,8 @@
-$NetBSD: patch-README,v 1.1 2012/03/14 23:36:06 gdt Exp $
+$NetBSD: patch-README,v 1.2 2015/09/13 23:22:23 gdt Exp $

 Sent upstream by email 20120309.

--- README.orig	2010-12-05 16:06:32.000000000 +0000
+--- README.orig	2015-09-08 15:17:17.000000000 +0000
 +++ README
@@ -40,6 +40,13 @@ After executing configure, execute:
 
--- a/geography/py-geojson/Makefile
+++ b/geography/py-geojson/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/10/23 14:21:29 kleink Exp $
+# $NetBSD: Makefile,v 1.4 2015/08/14 17:13:00 kleink Exp $

-DISTNAME=	geojson-1.0.9
+DISTNAME=	geojson-1.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	geography python
 MASTER_SITES=	http://pypi.python.org/packages/source/g/geojson/
--- a/geography/py-geojson/PLIST
+++ b/geography/py-geojson/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/10/23 14:21:29 kleink Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/08/06 10:15:12 kleink Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -34,3 +34,6 @@ ${PYSITELIB}/geojson/mapping.pyo
 ${PYSITELIB}/geojson/utils.py
 ${PYSITELIB}/geojson/utils.pyc
 ${PYSITELIB}/geojson/utils.pyo
+${PYSITELIB}/geojson/validation.py
+${PYSITELIB}/geojson/validation.pyc
+${PYSITELIB}/geojson/validation.pyo
--- a/geography/py-geojson/distinfo
+++ b/geography/py-geojson/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/10/23 14:21:29 kleink Exp $
+$NetBSD: distinfo,v 1.4 2015/08/14 17:13:00 kleink Exp $

-SHA1 (geojson-1.0.9.tar.gz) = 570cc1799acdff34ed823ef42247c3ee06bef1af
-RMD160 (geojson-1.0.9.tar.gz) = 844b5fd806c913c4ea6080348868f8ac2937a651
-Size (geojson-1.0.9.tar.gz) = 12823 bytes
+SHA1 (geojson-1.3.0.tar.gz) = 13b0c9162f973c1e1edb4c64340112caa1c348c5
+RMD160 (geojson-1.3.0.tar.gz) = a1a6019401a21194935a9ce1f30ffad253076936
+Size (geojson-1.3.0.tar.gz) = 16889 bytes
--- a/geography/py-proj/Makefile
+++ b/geography/py-proj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/03/19 16:16:58 gdt Exp $
+# $NetBSD: Makefile,v 1.17 2015/09/09 23:40:08 gdt Exp $

 VERSION=		1.9.4
 PKGNAMEBASE=		pyproj
@@ -6,12 +6,12 @@ DISTNAME=		v${VERSION}rel
 DIST_SUBDIR=		pyproj
 EGG_NAME=		${PKGNAMEBASE}-${VERSION}
 PKGNAME=		${PYPKGPREFIX}-${PKGNAMEBASE:S/pyproj/proj/}-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		geography
 MASTER_SITES=		${MASTER_SITE_GITHUB:=jswhit/pyproj/archive/}

 MAINTAINER=		gdt@NetBSD.org
-HOMEPAGE=		http://jswhit.github.io/pyproj/
-#			https://github.com/jswhit/pyproj
+HOMEPAGE=		https://jswhit.github.io/pyproj/
 COMMENT=		Python wrapper for proj
 LICENSE=		mit

@@ -19,6 +19,13 @@ WRKSRC=			${WRKDIR}/${PKGNAMEBASE}-${VERSION}rel

 INSTALLATION_DIRS=	share/doc/${PKGNAME_NOREV}

+# Horrible kludge: the package has a private copy of projects.h, which
+# proj used to not install, and the private copy has RCSID-type macros
+# which are needed.  Until this is fixed upstream, avoid the
+# proj-provided projects.h.
+pre-build:
+	rm ${WRKDIR}/.buildlink/include/projects.h
+
 post-install:
 	${INSTALL} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}

--- a/geography/py-trytond-country/distinfo
+++ b/geography/py-trytond-country/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2015/03/15 00:17:35 rodent Exp $
+$NetBSD: distinfo,v 1.4 2015/08/24 14:49:43 richard Exp $

-SHA1 (tryton-3.4/trytond_country-3.4.1.tar.gz) = e6c3c2052596e0568df485072bf24936340e2d64
-RMD160 (tryton-3.4/trytond_country-3.4.1.tar.gz) = fa5e1de7fbe71d3bd3479128c0b37c80f8d05213
-Size (tryton-3.4/trytond_country-3.4.1.tar.gz) = 1004548 bytes
+SHA1 (tryton-3.6/trytond_country-3.6.0.tar.gz) = 15428c6c2dfd02d5acd2aa6b3430acf928b1beaf
+RMD160 (tryton-3.6/trytond_country-3.6.0.tar.gz) = 8003b1641eecce982786d812e0cc445ebb67ecf8
+Size (tryton-3.6/trytond_country-3.6.0.tar.gz) = 1004156 bytes
--- a/geography/viking/Makefile
+++ b/geography/viking/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2015/06/12 10:50:08 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2015/08/31 00:16:38 gdt Exp $
 #

-VERSION=		1.5.1
+VERSION=		1.6
 DISTNAME=		viking-${VERSION}
-PKGREVISION=		2
 CATEGORIES=		geography
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/
 EXTRACT_SUFX=		.tar.bz2
@@ -23,6 +22,8 @@ CONFIGURE_ARGS+=	--disable-magic
 # Perhaps optionize use of gpsd (remove bl3, add this).
 # CONFIGURE_ARGS+=	--disable-realtime-gps-tracking

+CONFIGURE_ARGS+=	--disable-mapnik
+
 DEPENDS+=		gpsbabel-[0-9]*:../../geography/gpsbabel
 DEPENDS+=		p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 REPLACE_PERL=		viking-remote
@@ -33,6 +34,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config

 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
+.include "../../graphics/gexiv2/buildlink3.mk"
 .include "../../geography/gpsd/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
--- a/geography/viking/PLIST
+++ b/geography/viking/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2014/03/11 23:50:38 gdt Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $
 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
@@ -13,6 +16,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
@@ -31,7 +35,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
 share/locale/ast/LC_MESSAGES/viking.mo
@@ -50,6 +57,7 @@ share/locale/id/LC_MESSAGES/viking.mo
 share/locale/it/LC_MESSAGES/viking.mo
 share/locale/ja/LC_MESSAGES/viking.mo
 share/locale/jv/LC_MESSAGES/viking.mo
+share/locale/ko/LC_MESSAGES/viking.mo
 share/locale/lt/LC_MESSAGES/viking.mo
 share/locale/lv/LC_MESSAGES/viking.mo
 share/locale/nb/LC_MESSAGES/viking.mo
@@ -66,4 +74,5 @@ share/locale/zh_TW/LC_MESSAGES/viking.mo
 share/omf/viking/viking-C.omf
 share/viking/external_tools.xml
 share/viking/goto_tools.xml
+share/viking/latlontz.txt
 share/viking/maps.xml
--- a/geography/viking/distinfo
+++ b/geography/viking/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.22 2014/11/23 17:17:46 gdt Exp $
+$NetBSD: distinfo,v 1.23 2015/08/30 19:04:17 gdt Exp $

-SHA1 (viking-1.5.1.tar.bz2) = b23df806711d121799f3c9ad2d00f9f650415965
-RMD160 (viking-1.5.1.tar.bz2) = 27f3d828fdddeb423386da2eb598e9b39b8e1b35
-Size (viking-1.5.1.tar.bz2) = 1616172 bytes
+SHA1 (viking-1.6.tar.bz2) = 364365dfe23742aef36dfd08fd81560000a18ffe
+RMD160 (viking-1.6.tar.bz2) = b348bf666753adae0344023d7d32e5ae78dc7554
+Size (viking-1.6.tar.bz2) = 3060389 bytes
 SHA1 (patch-aa) = c7db1eb5562132c463b9472fd7a1a7e559af8d9a