Update opencpn to 4.8.0.

As a successor to OpenCPN Version 4.6.1, OpenCPN Version 4.8.0 contains several
incremental corrections and improvements.
Among them are:
- Expanded integrated vector graphics icon set for improved rendering of waypoints and routes.

5 files changed, 327 insertions, 54 deletions

diff --git a/geography/opencpn/Makefile b/geography/opencpn/Makefile
index 9f2c948e0d6..e818f1f68c6 100644
--- a/geography/opencpn/Makefile
+++ b/geography/opencpn/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2017/04/30 01:21:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2017/08/24 12:56:57 bouyer Exp $
 #
 
-VERSION=	4.6.1
+VERSION=	4.8.0
 #PKGREVISION=	0
 DISTNAME=	OpenCPN-${VERSION}
 PKGNAME=	opencpn-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenCPN/}
 GITHUB_PROJECT=	OpenCPN
-GITHUB_TAG=	89f78e06c52683faac51c30baa1f25fee7ed6c97
+GITHUB_TAG=	a13bc435462ae6c029660f1caa458dca79c927ec
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	bouyer@NetBSD.org
diff --git a/geography/opencpn/PLIST b/geography/opencpn/PLIST
index 9b97369efde..d85f8f77290 100644
--- a/geography/opencpn/PLIST
+++ b/geography/opencpn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/04/14 16:20:15 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/08/24 12:56:57 bouyer Exp $
 bin/opencpn
 lib/opencpn/libchartdldr_pi.so
 lib/opencpn/libdashboard_pi.so
@@ -1041,6 +1041,324 @@ share/opencpn/uidata/journeyman_flat/gps3Bar.svg
 share/opencpn/uidata/journeyman_flat/gpsGrn.svg
 share/opencpn/uidata/journeyman_flat/gpsGry.svg
 share/opencpn/uidata/journeyman_flat/gpsRed.svg
+share/opencpn/uidata/markicons/1st-Active-Waypoint.svg
+share/opencpn/uidata/markicons/1st-Anchorage.svg
+share/opencpn/uidata/markicons/1st-Diamond.svg
+share/opencpn/uidata/markicons/1st-Man-Overboard.svg
+share/opencpn/uidata/markicons/1st-No-Anchoring.svg
+share/opencpn/uidata/markicons/Activity-Campfire.svg
+share/opencpn/uidata/markicons/Activity-Camping.svg
+share/opencpn/uidata/markicons/Activity-Diving-Scuba-Flag.svg
+share/opencpn/uidata/markicons/Activity-Diving-Scuba-Tank.svg
+share/opencpn/uidata/markicons/Activity-Diving-Snorkel.svg
+share/opencpn/uidata/markicons/Activity-Diving-Spearing.svg
+share/opencpn/uidata/markicons/Activity-Fishing.svg
+share/opencpn/uidata/markicons/Authority-Customs.svg
+share/opencpn/uidata/markicons/Authority-Health.svg
+share/opencpn/uidata/markicons/Authority-Immigration.svg
+share/opencpn/uidata/markicons/Authority-Police.svg
+share/opencpn/uidata/markicons/Authority-Quarantine-Area.svg
+share/opencpn/uidata/markicons/Authority-Quarantine-Building.svg
+share/opencpn/uidata/markicons/Authority-Quarantine-Flag.svg
+share/opencpn/uidata/markicons/Hazard-Airplane.svg
+share/opencpn/uidata/markicons/Hazard-Animals-Crocodile.svg
+share/opencpn/uidata/markicons/Hazard-Animals-Jellyfish.svg
+share/opencpn/uidata/markicons/Hazard-Animals-Shark.svg
+share/opencpn/uidata/markicons/Hazard-Danger.svg
+share/opencpn/uidata/markicons/Hazard-Dredging.svg
+share/opencpn/uidata/markicons/Hazard-Fish-Aquatic-Farm.svg
+share/opencpn/uidata/markicons/Hazard-Fish-Lobster-String.svg
+share/opencpn/uidata/markicons/Hazard-Fish-Nets.svg
+share/opencpn/uidata/markicons/Hazard-Lighthouse.svg
+share/opencpn/uidata/markicons/Hazard-Obstruction-Deep.svg
+share/opencpn/uidata/markicons/Hazard-Obstruction-Dry.svg
+share/opencpn/uidata/markicons/Hazard-Obstruction-Shallow.svg
+share/opencpn/uidata/markicons/Hazard-Oil-Platform.svg
+share/opencpn/uidata/markicons/Hazard-Overfalls.svg
+share/opencpn/uidata/markicons/Hazard-Pollution-Air.svg
+share/opencpn/uidata/markicons/Hazard-Pollution-Bio.svg
+share/opencpn/uidata/markicons/Hazard-Pollution-Nuclear.svg
+share/opencpn/uidata/markicons/Hazard-Pollution-Oil.svg
+share/opencpn/uidata/markicons/Hazard-Pollution-Quarantine-Area.svg
+share/opencpn/uidata/markicons/Hazard-Power-Cable.svg
+share/opencpn/uidata/markicons/Hazard-Power-Line1.svg
+share/opencpn/uidata/markicons/Hazard-Power-Line2.svg
+share/opencpn/uidata/markicons/Hazard-Rock-Awash.svg
+share/opencpn/uidata/markicons/Hazard-Rock-Exposed.svg
+share/opencpn/uidata/markicons/Hazard-Sandbar.svg
+share/opencpn/uidata/markicons/Hazard-Snag.svg
+share/opencpn/uidata/markicons/Hazard-Warning.svg
+share/opencpn/uidata/markicons/Hazard-Wind-Farm.svg
+share/opencpn/uidata/markicons/Hazard-Wreck1.svg
+share/opencpn/uidata/markicons/Hazard-Wreck2.svg
+share/opencpn/uidata/markicons/Info-Fish-Haven.svg
+share/opencpn/uidata/markicons/Info-Fish-Pelagic.svg
+share/opencpn/uidata/markicons/Info-Fish-Reef.svg
+share/opencpn/uidata/markicons/Info-Fish-Shark.svg
+share/opencpn/uidata/markicons/Info-Fish-Whale.svg
+share/opencpn/uidata/markicons/Info-Fish.svg
+share/opencpn/uidata/markicons/Info-Info.svg
+share/opencpn/uidata/markicons/Info-No-Discharge.svg
+share/opencpn/uidata/markicons/Info-Photo.svg
+share/opencpn/uidata/markicons/Info-Video.svg
+share/opencpn/uidata/markicons/Landmarks-Bridge1.svg
+share/opencpn/uidata/markicons/Landmarks-Bridge2.svg
+share/opencpn/uidata/markicons/Landmarks-Bridge3.svg
+share/opencpn/uidata/markicons/Landmarks-Pier1.svg
+share/opencpn/uidata/markicons/Landmarks-Pier2.svg
+share/opencpn/uidata/markicons/Landmarks-Pier3.svg
+share/opencpn/uidata/markicons/Landmarks-Stream-River.svg
+share/opencpn/uidata/markicons/Landmarks-Waterfall.svg
+share/opencpn/uidata/markicons/Marks-Active-Waypoint.svg
+share/opencpn/uidata/markicons/Marks-Beacon-Danger.svg
+share/opencpn/uidata/markicons/Marks-Beacon-SafeWater.svg
+share/opencpn/uidata/markicons/Marks-Blank.svg
+share/opencpn/uidata/markicons/Marks-Boarding-Location.svg
+share/opencpn/uidata/markicons/Marks-Boundary.svg
+share/opencpn/uidata/markicons/Marks-Buoy-Danger.svg
+share/opencpn/uidata/markicons/Marks-Buoy-Safe-Water.svg
+share/opencpn/uidata/markicons/Marks-Buoy-TypeA.svg
+share/opencpn/uidata/markicons/Marks-Buoy-TypeB.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-East-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-East.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-North-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-North.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-South-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-South.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-West-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-West.svg
+share/opencpn/uidata/markicons/Marks-Caution-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Caution.svg
+share/opencpn/uidata/markicons/Marks-Danger-Topmark-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Danger-Topmark.svg
+share/opencpn/uidata/markicons/Marks-Lateral-Port-IALA-A-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Lateral-Port-IALA-A.svg
+share/opencpn/uidata/markicons/Marks-Lateral-Port-IALA-B-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Lateral-Port-IALA-B.svg
+share/opencpn/uidata/markicons/Marks-Lateral-Starboard-IALA-A-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Lateral-Starboard-IALA-A.svg
+share/opencpn/uidata/markicons/Marks-Lateral-Starboard-IALA-B-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Lateral-Starboard-IALA-B.svg
+share/opencpn/uidata/markicons/Marks-Light-Green.svg
+share/opencpn/uidata/markicons/Marks-Light-Red-Green.svg
+share/opencpn/uidata/markicons/Marks-Light-Red.svg
+share/opencpn/uidata/markicons/Marks-Light-TypeA.svg
+share/opencpn/uidata/markicons/Marks-Light-TypeB.svg
+share/opencpn/uidata/markicons/Marks-Light-Vessel.svg
+share/opencpn/uidata/markicons/Marks-Mooring-Buoy-Super.svg
+share/opencpn/uidata/markicons/Marks-Mooring-Buoy.svg
+share/opencpn/uidata/markicons/Marks-Mooring-Float.svg
+share/opencpn/uidata/markicons/Marks-Mooring-Pile.svg
+share/opencpn/uidata/markicons/Marks-Race-Committee-Start-Boat.svg
+share/opencpn/uidata/markicons/Marks-Race-Finish.svg
+share/opencpn/uidata/markicons/Marks-Race-Start.svg
+share/opencpn/uidata/markicons/Marks-Race-Tetrahedron-Mark1.svg
+share/opencpn/uidata/markicons/Marks-Race-Tetrahedron-Mark2.svg
+share/opencpn/uidata/markicons/Marks-Race-Tetrahedron-Mark3.svg
+share/opencpn/uidata/markicons/Marks-Race-Tetrahedron-Mark4.svg
+share/opencpn/uidata/markicons/Marks-Race-Tetrahedron-Mark5.svg
+share/opencpn/uidata/markicons/Sea-Current-Eastbound.svg
+share/opencpn/uidata/markicons/Sea-Current-N-Eastbound.svg
+share/opencpn/uidata/markicons/Sea-Current-N-Westbound.svg
+share/opencpn/uidata/markicons/Sea-Current-Northbound.svg
+share/opencpn/uidata/markicons/Sea-Current-S-Eastbound.svg
+share/opencpn/uidata/markicons/Sea-Current-S-Westbound.svg
+share/opencpn/uidata/markicons/Sea-Current-Southbound.svg
+share/opencpn/uidata/markicons/Sea-Current-Westbound.svg
+share/opencpn/uidata/markicons/Sea-DepthA-Black.svg
+share/opencpn/uidata/markicons/Sea-DepthA-Blue.svg
+share/opencpn/uidata/markicons/Sea-DepthA-Green.svg
+share/opencpn/uidata/markicons/Sea-DepthA-Magenta.svg
+share/opencpn/uidata/markicons/Sea-DepthA-Orange.svg
+share/opencpn/uidata/markicons/Sea-DepthA-Red.svg
+share/opencpn/uidata/markicons/Sea-DepthA-White.svg
+share/opencpn/uidata/markicons/Sea-DepthA-Yellow.svg
+share/opencpn/uidata/markicons/Sea-DepthB-Black.svg
+share/opencpn/uidata/markicons/Sea-DepthB-Blue.svg
+share/opencpn/uidata/markicons/Sea-DepthB-Green.svg
+share/opencpn/uidata/markicons/Sea-DepthB-Magenta.svg
+share/opencpn/uidata/markicons/Sea-DepthB-Orange.svg
+share/opencpn/uidata/markicons/Sea-DepthB-Red.svg
+share/opencpn/uidata/markicons/Sea-DepthB-White.svg
+share/opencpn/uidata/markicons/Sea-DepthB-Yellow.svg
+share/opencpn/uidata/markicons/Sea-Eddies-Black.svg
+share/opencpn/uidata/markicons/Sea-Eddies-Blue.svg
+share/opencpn/uidata/markicons/Sea-Eddies-Green.svg
+share/opencpn/uidata/markicons/Sea-Eddies-Magenta.svg
+share/opencpn/uidata/markicons/Sea-Eddies-Orange.svg
+share/opencpn/uidata/markicons/Sea-Eddies-Red.svg
+share/opencpn/uidata/markicons/Sea-Eddies-White.svg
+share/opencpn/uidata/markicons/Sea-Eddies-Yellow.svg
+share/opencpn/uidata/markicons/Sea-Floor-Coral.svg
+share/opencpn/uidata/markicons/Sea-Floor-Sea-Weed.svg
+share/opencpn/uidata/markicons/Sea-Floor-Text-Clay.svg
+share/opencpn/uidata/markicons/Sea-Floor-Text-Coral.svg
+share/opencpn/uidata/markicons/Sea-Floor-Text-Grass.svg
+share/opencpn/uidata/markicons/Sea-Floor-Text-Mud.svg
+share/opencpn/uidata/markicons/Sea-Floor-Text-Rock.svg
+share/opencpn/uidata/markicons/Sea-Floor-Text-Sand.svg
+share/opencpn/uidata/markicons/Sea-Height-Black.svg
+share/opencpn/uidata/markicons/Sea-Height-Blue.svg
+share/opencpn/uidata/markicons/Sea-Height-Green.svg
+share/opencpn/uidata/markicons/Sea-Height-Magenta.svg
+share/opencpn/uidata/markicons/Sea-Height-Orange.svg
+share/opencpn/uidata/markicons/Sea-Height-Red.svg
+share/opencpn/uidata/markicons/Sea-Height-White.svg
+share/opencpn/uidata/markicons/Sea-Height-Yellow.svg
+share/opencpn/uidata/markicons/Service-Chandlery.svg
+share/opencpn/uidata/markicons/Service-Dock-Dinghy.svg
+share/opencpn/uidata/markicons/Service-Dock.svg
+share/opencpn/uidata/markicons/Service-Food.svg
+share/opencpn/uidata/markicons/Service-Fuel-Jerry-Diesel.svg
+share/opencpn/uidata/markicons/Service-Fuel-Jerry-Petrol.svg
+share/opencpn/uidata/markicons/Service-Fuel-Jerry.svg
+share/opencpn/uidata/markicons/Service-Fuel-LPG.svg
+share/opencpn/uidata/markicons/Service-Fuel-Pump-Diesel&Petrol.svg
+share/opencpn/uidata/markicons/Service-Fuel-Pump-Diesel.svg
+share/opencpn/uidata/markicons/Service-Fuel-Pump-Petrol.svg
+share/opencpn/uidata/markicons/Service-Grocery1.svg
+share/opencpn/uidata/markicons/Service-Grocery2.svg
+share/opencpn/uidata/markicons/Service-Haulout.svg
+share/opencpn/uidata/markicons/Service-Ice1.svg
+share/opencpn/uidata/markicons/Service-Ice2.svg
+share/opencpn/uidata/markicons/Service-Ice3.svg
+share/opencpn/uidata/markicons/Service-Internet-Cafe.svg
+share/opencpn/uidata/markicons/Service-Internet-WiFi.svg
+share/opencpn/uidata/markicons/Service-Laundry.svg
+share/opencpn/uidata/markicons/Service-Marina.svg
+share/opencpn/uidata/markicons/Service-Public-Landing.svg
+share/opencpn/uidata/markicons/Service-Pump-Out-Boat.svg
+share/opencpn/uidata/markicons/Service-Pump-Out-Facility.svg
+share/opencpn/uidata/markicons/Service-Repairs.svg
+share/opencpn/uidata/markicons/Service-Water1.svg
+share/opencpn/uidata/markicons/Service-Water2.svg
+share/opencpn/uidata/markicons/Service-Wine&Dine.svg
+share/opencpn/uidata/markicons/Service-Yacht-Club.svg
+share/opencpn/uidata/markicons/Symbol-Anchor1.svg
+share/opencpn/uidata/markicons/Symbol-Anchor2.svg
+share/opencpn/uidata/markicons/Symbol-Anchor3.svg
+share/opencpn/uidata/markicons/Symbol-Arrow-Black.svg
+share/opencpn/uidata/markicons/Symbol-Arrow-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Arrow-Green.svg
+share/opencpn/uidata/markicons/Symbol-Arrow-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Arrow-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Arrow-Red.svg
+share/opencpn/uidata/markicons/Symbol-Arrow-White.svg
+share/opencpn/uidata/markicons/Symbol-Arrow-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Circle-Black.svg
+share/opencpn/uidata/markicons/Symbol-Circle-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Circle-Green.svg
+share/opencpn/uidata/markicons/Symbol-Circle-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Circle-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Circle-Red.svg
+share/opencpn/uidata/markicons/Symbol-Circle-White.svg
+share/opencpn/uidata/markicons/Symbol-Circle-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Circle.svg
+share/opencpn/uidata/markicons/Symbol-Diamond-Black.svg
+share/opencpn/uidata/markicons/Symbol-Diamond-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Diamond-Green.svg
+share/opencpn/uidata/markicons/Symbol-Diamond-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Diamond-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Diamond-Red.svg
+share/opencpn/uidata/markicons/Symbol-Diamond-White.svg
+share/opencpn/uidata/markicons/Symbol-Diamond-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Empty.svg
+share/opencpn/uidata/markicons/Symbol-Exclamation-Black.svg
+share/opencpn/uidata/markicons/Symbol-Exclamation-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Exclamation-Green.svg
+share/opencpn/uidata/markicons/Symbol-Exclamation-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Exclamation-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Exclamation-Red.svg
+share/opencpn/uidata/markicons/Symbol-Exclamation-White.svg
+share/opencpn/uidata/markicons/Symbol-Exclamation-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Glow-LargeBlack.svg
+share/opencpn/uidata/markicons/Symbol-Glow-LargeBlue.svg
+share/opencpn/uidata/markicons/Symbol-Glow-LargeGreen.svg
+share/opencpn/uidata/markicons/Symbol-Glow-LargeMagenta.svg
+share/opencpn/uidata/markicons/Symbol-Glow-LargeOrange.svg
+share/opencpn/uidata/markicons/Symbol-Glow-LargeRed.svg
+share/opencpn/uidata/markicons/Symbol-Glow-LargeWhite.svg
+share/opencpn/uidata/markicons/Symbol-Glow-LargeYellow.svg
+share/opencpn/uidata/markicons/Symbol-Glow-Small-Black.svg
+share/opencpn/uidata/markicons/Symbol-Glow-Small-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Glow-Small-Green.svg
+share/opencpn/uidata/markicons/Symbol-Glow-Small-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Glow-Small-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Glow-Small-Red.svg
+share/opencpn/uidata/markicons/Symbol-Glow-Small-White.svg
+share/opencpn/uidata/markicons/Symbol-Glow-Small-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Pin-Black.svg
+share/opencpn/uidata/markicons/Symbol-Pin-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Pin-Green.svg
+share/opencpn/uidata/markicons/Symbol-Pin-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Pin-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Pin-Red.svg
+share/opencpn/uidata/markicons/Symbol-Pin-White.svg
+share/opencpn/uidata/markicons/Symbol-Pin-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Question-Black.svg
+share/opencpn/uidata/markicons/Symbol-Question-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Question-Green.svg
+share/opencpn/uidata/markicons/Symbol-Question-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Question-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Question-Red.svg
+share/opencpn/uidata/markicons/Symbol-Question-White.svg
+share/opencpn/uidata/markicons/Symbol-Question-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Spot-Black.svg
+share/opencpn/uidata/markicons/Symbol-Spot-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Spot-Green.svg
+share/opencpn/uidata/markicons/Symbol-Spot-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Spot-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Spot-Red.svg
+share/opencpn/uidata/markicons/Symbol-Spot-White.svg
+share/opencpn/uidata/markicons/Symbol-Spot-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Square-Black.svg
+share/opencpn/uidata/markicons/Symbol-Square-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Square-Green.svg
+share/opencpn/uidata/markicons/Symbol-Square-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Square-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Square-Red.svg
+share/opencpn/uidata/markicons/Symbol-Square-White.svg
+share/opencpn/uidata/markicons/Symbol-Square-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Square.svg
+share/opencpn/uidata/markicons/Symbol-Star-Black.svg
+share/opencpn/uidata/markicons/Symbol-Star-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Star-Green.svg
+share/opencpn/uidata/markicons/Symbol-Star-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Star-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Star-Red.svg
+share/opencpn/uidata/markicons/Symbol-Star-White.svg
+share/opencpn/uidata/markicons/Symbol-Star-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Tick-Black.svg
+share/opencpn/uidata/markicons/Symbol-Tick-Blue.svg
+share/opencpn/uidata/markicons/Symbol-Tick-Green.svg
+share/opencpn/uidata/markicons/Symbol-Tick-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-Tick-Orange.svg
+share/opencpn/uidata/markicons/Symbol-Tick-Red.svg
+share/opencpn/uidata/markicons/Symbol-Tick-White.svg
+share/opencpn/uidata/markicons/Symbol-Tick-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-Triangle.svg
+share/opencpn/uidata/markicons/Symbol-X-Large-Black.svg
+share/opencpn/uidata/markicons/Symbol-X-Large-Blue.svg
+share/opencpn/uidata/markicons/Symbol-X-Large-Green.svg
+share/opencpn/uidata/markicons/Symbol-X-Large-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-X-Large-Orange.svg
+share/opencpn/uidata/markicons/Symbol-X-Large-Red.svg
+share/opencpn/uidata/markicons/Symbol-X-Large-White.svg
+share/opencpn/uidata/markicons/Symbol-X-Large-Yellow.svg
+share/opencpn/uidata/markicons/Symbol-X-Small-Black.svg
+share/opencpn/uidata/markicons/Symbol-X-Small-Blue.svg
+share/opencpn/uidata/markicons/Symbol-X-Small-Green.svg
+share/opencpn/uidata/markicons/Symbol-X-Small-Magenta.svg
+share/opencpn/uidata/markicons/Symbol-X-Small-Orange.svg
+share/opencpn/uidata/markicons/Symbol-X-Small-Red.svg
+share/opencpn/uidata/markicons/Symbol-X-Small-White.svg
+share/opencpn/uidata/markicons/Symbol-X-Small-Yellow.svg
+share/opencpn/uidata/markicons/Weather-Hurricane-NH.svg
+share/opencpn/uidata/markicons/Weather-Hurricane-SH.svg
+share/opencpn/uidata/markicons/Weather-Tropical Depression.svg
+share/opencpn/uidata/markicons/Weather-Tropical High.svg
+share/opencpn/uidata/markicons/Weather-Tropical-Storm-NH.svg
+share/opencpn/uidata/markicons/Weather-Tropical-Storm-SH.svg
 share/opencpn/uidata/styles.xml
 share/opencpn/uidata/toolicons_journeyman.png
 share/opencpn/uidata/toolicons_journeyman_flat.png
diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo
index b1e54aa4942..6eb47bc1747 100644
--- a/geography/opencpn/distinfo
+++ b/geography/opencpn/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2017/04/18 13:31:55 bouyer Exp $
+$NetBSD: distinfo,v 1.13 2017/08/24 12:56:57 bouyer Exp $
 
-SHA1 (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = e977ab8292c2ec5836eea2dce7257f60d0d4ad52
-RMD160 (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = eb840b5d694f17ae12caa7d08134986d6d143acf
-SHA512 (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = 8ef95ee173084d91d54651c13e155112df88ce87c32d5124695da0a4507a2650f3e0094cea3287a750c8f90fd9f6240d8ab4faf665d9b15cbbcebcc131ea8efa
-Size (OpenCPN-4.6.1-89f78e06c52683faac51c30baa1f25fee7ed6c97.zip) = 55864452 bytes
+SHA1 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 33ecc34915951c270fd758ec00a69574bc44ea25
+RMD160 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 084ad8ace3336954402a17b7610c3e2807a270a1
+SHA512 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = eed40678a6ff8cae45da0e44cbf3fe1d65c2a76668ecc26bbbc15a845e1c937f54a424ab6c1776dd3d74348d67ac6e11f7381da3f5132cbf680528dcc7184fc0
+Size (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 56307636 bytes
 SHA1 (patch-CMakeLists.txt) = c20b25c64790f5a595a5ef2940f430e588ffdf14
 SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
 SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85
@@ -17,6 +17,4 @@ SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
 SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
 SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62
 SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb
-SHA1 (patch-src_printtable.cpp) = 940e7f42dd7e6a9776db2009027989ca79429cb1
-SHA1 (patch-src_routeprintout.cpp) = bbf135bd71e3fc87100b0c6d4e200f68754937c3
 SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040
diff --git a/geography/opencpn/patches/patch-src_printtable.cpp b/geography/opencpn/patches/patch-src_printtable.cpp
deleted file mode 100644
index c9ebebbfd7c..00000000000
--- a/geography/opencpn/patches/patch-src_printtable.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_printtable.cpp,v 1.1 2016/04/01 19:56:02 joerg Exp $
-
---- src/printtable.cpp.orig	2016-04-01 19:47:54.585451048 +0000
-+++ src/printtable.cpp
-@@ -28,7 +28,6 @@
- #include <sstream>
- #include <vector>
- #include <algorithm>
--using namespace std;
- 
- #include "wx/wxprec.h"
- 
-@@ -74,6 +73,8 @@ using namespace std;
- 
- #include "printtable.h"
- 
-+using namespace std;
-+
- void PrintCell::Init( const wxString& _content, wxDC* _dc, int _width, int _cellpadding, bool _bold_font )
- {
-     bold_font   = _bold_font;
diff --git a/geography/opencpn/patches/patch-src_routeprintout.cpp b/geography/opencpn/patches/patch-src_routeprintout.cpp
deleted file mode 100644
index 055a7fb62a0..00000000000
--- a/geography/opencpn/patches/patch-src_routeprintout.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_routeprintout.cpp,v 1.1 2016/04/01 19:56:02 joerg Exp $
-
---- src/routeprintout.cpp.orig	2016-04-01 19:46:52.064847404 +0000
-+++ src/routeprintout.cpp
-@@ -24,7 +24,6 @@
-  **************************************************************************/
- 
- #include <iostream>
--using namespace std;
- 
- #include "wx/wxprec.h"
- 
-@@ -72,6 +71,8 @@ using namespace std;
- #include "printtable.h"
- #include "wx28compat.h"
- 
-+using namespace std;
-+
- #define PRINT_WP_NAME 0
- #define PRINT_WP_POSITION 1
- #define PRINT_WP_COURSE 2