3 files changed, 372 insertions, 342 deletions

diff --git a/comms/yaac/Makefile b/comms/yaac/Makefile
index 60b0dd059d71..d649fd6f4082 100644
--- a/comms/yaac/Makefile
+++ b/comms/yaac/Makefile
@@ -1,21 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	yaac
-PORTVERSION=	1.0b89
+PORTVERSION=	1.0b114
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/yetanotheraprsc/
-DISTNAME=	YAACSrc_20160321
+DISTNAME=	YAACsrc_20170920
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Platform-independent Java application for the APRS network
 
 LICENSE=	LGPL3
 
-BROKEN=		No public distfiles
-USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USES=		zip
 USE_ANT=	yes
+USE_JAVA=	yes
 ALL_TARGET=	DISTRO
 SUB_FILES=	yaac.sh
 
diff --git a/comms/yaac/distinfo b/comms/yaac/distinfo
index 90de912b0c88..ca38e592e987 100644
--- a/comms/yaac/distinfo
+++ b/comms/yaac/distinfo
@@ -1,2 +1,3 @@
-SHA256 (YAACSrc_20160321.zip) = 89e6f9357c14512d3de9e7e1e1a8772fec411cb58b782802627355b68793da2a
-SIZE (YAACSrc_20160321.zip) = 19479299
+TIMESTAMP = 1509587907
+SHA256 (YAACsrc_20170920.zip) = 185501817994d96814c2362b51bdc04b8f7fdfd6a7cae31877c6a8a3341fca42
+SIZE (YAACsrc_20170920.zip) = 26947097
diff --git a/comms/yaac/pkg-plist b/comms/yaac/pkg-plist
index 49ba4aae4720..74d23ce1b66b 100644
--- a/comms/yaac/pkg-plist
+++ b/comms/yaac/pkg-plist
@@ -1,337 +1,367 @@
 bin/yaac
-%%JAVASHAREDIR%%/yaac/YAAC.jar
-%%JAVASHAREDIR%%/yaac/cleaner.jar
-%%JAVASHAREDIR%%/yaac/upgrade.jar
-%%JAVASHAREDIR%%/yaac/YAACpluginSDK.zip
-%%JAVASHAREDIR%%/yaac/images/alcohol.png
-%%JAVASHAREDIR%%/yaac/images/allicon2.png
-%%JAVASHAREDIR%%/yaac/images/allicons.png
-%%JAVASHAREDIR%%/yaac/images/amusementpark.png
-%%JAVASHAREDIR%%/yaac/images/animal_boarding.png
-%%JAVASHAREDIR%%/yaac/images/archaeological_site.png
-%%JAVASHAREDIR%%/yaac/images/atm.png
-%%JAVASHAREDIR%%/yaac/images/bakery.png
-%%JAVASHAREDIR%%/yaac/images/bank.png
-%%JAVASHAREDIR%%/yaac/images/bar.png
-%%JAVASHAREDIR%%/yaac/images/barber.png
-%%JAVASHAREDIR%%/yaac/images/battery.png
-%%JAVASHAREDIR%%/yaac/images/beauty.png
-%%JAVASHAREDIR%%/yaac/images/beer.png
-%%JAVASHAREDIR%%/yaac/images/bench.png
-%%JAVASHAREDIR%%/yaac/images/beverage.png
-%%JAVASHAREDIR%%/yaac/images/bicycle.png
-%%JAVASHAREDIR%%/yaac/images/bicycle_parking.png
-%%JAVASHAREDIR%%/yaac/images/bicycle_rental.png
-%%JAVASHAREDIR%%/yaac/images/bicycle_repair.png
-%%JAVASHAREDIR%%/yaac/images/boat_launch.png
-%%JAVASHAREDIR%%/yaac/images/bomb_crater.png
-%%JAVASHAREDIR%%/yaac/images/bomb_shelter.png
-%%JAVASHAREDIR%%/yaac/images/book.png
-%%JAVASHAREDIR%%/yaac/images/bowling.png
-%%JAVASHAREDIR%%/yaac/images/bullring.png
-%%JAVASHAREDIR%%/yaac/images/burningman.png
-%%JAVASHAREDIR%%/yaac/images/bus_station.png
-%%JAVASHAREDIR%%/yaac/images/bus_stop.png
-%%JAVASHAREDIR%%/yaac/images/butcher.png
-%%JAVASHAREDIR%%/yaac/images/camp_site.png
-%%JAVASHAREDIR%%/yaac/images/car.png
-%%JAVASHAREDIR%%/yaac/images/car_rental.png
-%%JAVASHAREDIR%%/yaac/images/car_repair.png
-%%JAVASHAREDIR%%/yaac/images/car_sharing.png
-%%JAVASHAREDIR%%/yaac/images/castle.png
-%%JAVASHAREDIR%%/yaac/images/cave.png
-%%JAVASHAREDIR%%/yaac/images/church.png
-%%JAVASHAREDIR%%/yaac/images/cinema.png
-%%JAVASHAREDIR%%/yaac/images/circus.png
-%%JAVASHAREDIR%%/yaac/images/clock.png
-%%JAVASHAREDIR%%/yaac/images/clothes.png
-%%JAVASHAREDIR%%/yaac/images/coffee.png
-%%JAVASHAREDIR%%/yaac/images/confectionary.png
-%%JAVASHAREDIR%%/yaac/images/convenience.png
-%%JAVASHAREDIR%%/yaac/images/court.png
-%%JAVASHAREDIR%%/yaac/images/defibrillator.png
-%%JAVASHAREDIR%%/yaac/images/dentist.png
-%%JAVASHAREDIR%%/yaac/images/department_store.png
-%%JAVASHAREDIR%%/yaac/images/disco.png
-%%JAVASHAREDIR%%/yaac/images/doctor.png
-%%JAVASHAREDIR%%/yaac/images/doityourself.png
-%%JAVASHAREDIR%%/yaac/images/donut.png
-%%JAVASHAREDIR%%/yaac/images/downarrow.png
-%%JAVASHAREDIR%%/yaac/images/drinkingwater.png
-%%JAVASHAREDIR%%/yaac/images/dump_station.png
-%%JAVASHAREDIR%%/yaac/images/electronics.png
-%%JAVASHAREDIR%%/yaac/images/embassy.png
-%%JAVASHAREDIR%%/yaac/images/emergencyphone.png
-%%JAVASHAREDIR%%/yaac/images/ev_plugin.png
-%%JAVASHAREDIR%%/yaac/images/fastfood.png
-%%JAVASHAREDIR%%/yaac/images/fish.png
-%%JAVASHAREDIR%%/yaac/images/florist.png
-%%JAVASHAREDIR%%/yaac/images/fountain.png
-%%JAVASHAREDIR%%/yaac/images/fuel.png
-%%JAVASHAREDIR%%/yaac/images/furniture.png
-%%JAVASHAREDIR%%/yaac/images/gate.png
-%%JAVASHAREDIR%%/yaac/images/gift.png
-%%JAVASHAREDIR%%/yaac/images/glasses.png
-%%JAVASHAREDIR%%/yaac/images/go.png
-%%JAVASHAREDIR%%/yaac/images/go_selected.png
-%%JAVASHAREDIR%%/yaac/images/golf_course.png
-%%JAVASHAREDIR%%/yaac/images/graveyard.png
-%%JAVASHAREDIR%%/yaac/images/greenpushpin.png
-%%JAVASHAREDIR%%/yaac/images/gust.png
-%%JAVASHAREDIR%%/yaac/images/hairdresser.png
-%%JAVASHAREDIR%%/yaac/images/healthcare.png
-%%JAVASHAREDIR%%/yaac/images/hostel.png
-%%JAVASHAREDIR%%/yaac/images/hotel.png
-%%JAVASHAREDIR%%/yaac/images/humid.png
-%%JAVASHAREDIR%%/yaac/images/hydrant.png
-%%JAVASHAREDIR%%/yaac/images/icecream.png
-%%JAVASHAREDIR%%/yaac/images/jewelry.png
-%%JAVASHAREDIR%%/yaac/images/leftarrow.png
-%%JAVASHAREDIR%%/yaac/images/library.png
-%%JAVASHAREDIR%%/yaac/images/lifering.png
-%%JAVASHAREDIR%%/yaac/images/lighthouse.png
-%%JAVASHAREDIR%%/yaac/images/lineStyle.png
-%%JAVASHAREDIR%%/yaac/images/lumin.png
-%%JAVASHAREDIR%%/yaac/images/martialarts.png
-%%JAVASHAREDIR%%/yaac/images/masonic_hall.png
-%%JAVASHAREDIR%%/yaac/images/mast.png
-%%JAVASHAREDIR%%/yaac/images/memorial.png
-%%JAVASHAREDIR%%/yaac/images/mobilephone.png
-%%JAVASHAREDIR%%/yaac/images/monument.png
-%%JAVASHAREDIR%%/yaac/images/mosque.png
-%%JAVASHAREDIR%%/yaac/images/msg.png
-%%JAVASHAREDIR%%/yaac/images/museum.png
-%%JAVASHAREDIR%%/yaac/images/music.png
-%%JAVASHAREDIR%%/yaac/images/news.png
-%%JAVASHAREDIR%%/yaac/images/openfile.png
-%%JAVASHAREDIR%%/yaac/images/osm-Rendering-area-natural-marsh-osmarender.png
-%%JAVASHAREDIR%%/yaac/images/oval.png
-%%JAVASHAREDIR%%/yaac/images/palette.png
-%%JAVASHAREDIR%%/yaac/images/parking.png
-%%JAVASHAREDIR%%/yaac/images/pawnshop.png
-%%JAVASHAREDIR%%/yaac/images/pet.png
-%%JAVASHAREDIR%%/yaac/images/pharmacy.png
-%%JAVASHAREDIR%%/yaac/images/picnictable.png
-%%JAVASHAREDIR%%/yaac/images/pizza.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_bahai.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_buddhist.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_hindu.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_jain.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_pagan.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_pastafarian.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_scientologist.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_shinto.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_sikh.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_taoist.png
-%%JAVASHAREDIR%%/yaac/images/placeofworship_zoroastrian.png
-%%JAVASHAREDIR%%/yaac/images/playground.png
-%%JAVASHAREDIR%%/yaac/images/polyline.png
-%%JAVASHAREDIR%%/yaac/images/poolballs.png
-%%JAVASHAREDIR%%/yaac/images/post_office.png
-%%JAVASHAREDIR%%/yaac/images/power_tower.png
-%%JAVASHAREDIR%%/yaac/images/pressure.png
-%%JAVASHAREDIR%%/yaac/images/pressure_Pa.png
-%%JAVASHAREDIR%%/yaac/images/pressure_hPa.png
-%%JAVASHAREDIR%%/yaac/images/pressure_inHg.png
-%%JAVASHAREDIR%%/yaac/images/pressure_kPa.png
-%%JAVASHAREDIR%%/yaac/images/pressure_mmHg.png
-%%JAVASHAREDIR%%/yaac/images/pressure_psi.png
-%%JAVASHAREDIR%%/yaac/images/prison.png
-%%JAVASHAREDIR%%/yaac/images/pub.png
-%%JAVASHAREDIR%%/yaac/images/radius_gale.png
-%%JAVASHAREDIR%%/yaac/images/radius_hc.png
-%%JAVASHAREDIR%%/yaac/images/radius_ts.png
-%%JAVASHAREDIR%%/yaac/images/railway_station.png
-%%JAVASHAREDIR%%/yaac/images/rain.png
-%%JAVASHAREDIR%%/yaac/images/rain_h.png
-%%JAVASHAREDIR%%/yaac/images/rain_m.png
-%%JAVASHAREDIR%%/yaac/images/ranger.png
-%%JAVASHAREDIR%%/yaac/images/rect.png
-%%JAVASHAREDIR%%/yaac/images/recycling.png
-%%JAVASHAREDIR%%/yaac/images/redpushpin.png
-%%JAVASHAREDIR%%/yaac/images/restaurant.png
-%%JAVASHAREDIR%%/yaac/images/rightarrow.png
-%%JAVASHAREDIR%%/yaac/images/rollerskate.png
-%%JAVASHAREDIR%%/yaac/images/save.png
-%%JAVASHAREDIR%%/yaac/images/select.png
-%%JAVASHAREDIR%%/yaac/images/sex.png
-%%JAVASHAREDIR%%/yaac/images/shelter.png
-%%JAVASHAREDIR%%/yaac/images/shoes.png
-%%JAVASHAREDIR%%/yaac/images/snow.png
-%%JAVASHAREDIR%%/yaac/images/stop.png
-%%JAVASHAREDIR%%/yaac/images/stop_selected.png
-%%JAVASHAREDIR%%/yaac/images/stormtype.png
-%%JAVASHAREDIR%%/yaac/images/studio.png
-%%JAVASHAREDIR%%/yaac/images/supermarket.png
-%%JAVASHAREDIR%%/yaac/images/swimmingpool.png
-%%JAVASHAREDIR%%/yaac/images/symbols/3123.png
-%%JAVASHAREDIR%%/yaac/images/symbols/3223.png
-%%JAVASHAREDIR%%/yaac/images/symbols/3226.png
-%%JAVASHAREDIR%%/yaac/images/symbols/3323.png
-%%JAVASHAREDIR%%/yaac/images/symbols/3673.png
-%%JAVASHAREDIR%%/yaac/images/symbols/3741.png
-%%JAVASHAREDIR%%/yaac/images/symbols/3752.png
-%%JAVASHAREDIR%%/yaac/images/symbols/3838.png
-%%JAVASHAREDIR%%/yaac/images/symbols/3f23.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4123.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4141.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4144.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4159.png
-%%JAVASHAREDIR%%/yaac/images/symbols/415c.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4161.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4244.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4245.png
-%%JAVASHAREDIR%%/yaac/images/symbols/424f.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4259.png
-%%JAVASHAREDIR%%/yaac/images/symbols/425b.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4273.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4275.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4325.png
-%%JAVASHAREDIR%%/yaac/images/symbols/432d.png
-%%JAVASHAREDIR%%/yaac/images/symbols/434f.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4375.png
-%%JAVASHAREDIR%%/yaac/images/symbols/437a.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4423.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4426.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4441.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4445.png
-%%JAVASHAREDIR%%/yaac/images/symbols/445e.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4460.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4461.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4463.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4473.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4521.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4525.png
-%%JAVASHAREDIR%%/yaac/images/symbols/452d.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4532.png
-%%JAVASHAREDIR%%/yaac/images/symbols/453e.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4541.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4560.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4573.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4628.png
-%%JAVASHAREDIR%%/yaac/images/symbols/463b.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4644.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4645.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4660.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4673.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4725.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4738.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4761.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4775.png
-%%JAVASHAREDIR%%/yaac/images/symbols/477a.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4825.png
-%%JAVASHAREDIR%%/yaac/images/symbols/483e.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4841.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4844.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4845.png
-%%JAVASHAREDIR%%/yaac/images/symbols/485b.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4860.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4868.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4875.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4923.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4926.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4932.png
-%%JAVASHAREDIR%%/yaac/images/symbols/493b.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4941.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4959.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4a73.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4b52.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4b59.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4c23.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4c24.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4c44.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4c49.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4c73.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4d4f.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4d52.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4d5e.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4d73.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4d7a.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4e23.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4e25.png
-%%JAVASHAREDIR%%/yaac/images/symbols/4f73.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5023.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5025.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5028.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5173.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5223.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5226.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5241.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5244.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5248.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5249.png
-%%JAVASHAREDIR%%/yaac/images/symbols/524f.png
-%%JAVASHAREDIR%%/yaac/images/symbols/525b.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5260.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5261.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5263.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5323.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5325.png
-%%JAVASHAREDIR%%/yaac/images/symbols/533e.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5344.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5345.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5349.png
-%%JAVASHAREDIR%%/yaac/images/symbols/535b.png
-%%JAVASHAREDIR%%/yaac/images/symbols/535e.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5360.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5361.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5363.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5373.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5423.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5426.png
-%%JAVASHAREDIR%%/yaac/images/symbols/544f.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5475.png
-%%JAVASHAREDIR%%/yaac/images/symbols/547a.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5523.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5524.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5573.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5621.png
-%%JAVASHAREDIR%%/yaac/images/symbols/563e.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5725.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5728.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5730.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5748.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5761.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5841.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5848.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5924.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5959.png
-%%JAVASHAREDIR%%/yaac/images/symbols/5973.png
-%%JAVASHAREDIR%%/yaac/images/synagogue.png
-%%JAVASHAREDIR%%/yaac/images/taxi.png
-%%JAVASHAREDIR%%/yaac/images/text.png
-%%JAVASHAREDIR%%/yaac/images/theatre.png
-%%JAVASHAREDIR%%/yaac/images/thermo.png
-%%JAVASHAREDIR%%/yaac/images/tobacco.png
-%%JAVASHAREDIR%%/yaac/images/tocalls.dense.json
-%%JAVASHAREDIR%%/yaac/images/toilets.png
-%%JAVASHAREDIR%%/yaac/images/townhall.png
-%%JAVASHAREDIR%%/yaac/images/trafficsignal.png
-%%JAVASHAREDIR%%/yaac/images/trailer.png
-%%JAVASHAREDIR%%/yaac/images/tyre.png
-%%JAVASHAREDIR%%/yaac/images/uparrow.png
-%%JAVASHAREDIR%%/yaac/images/vendingmachine.png
-%%JAVASHAREDIR%%/yaac/images/veterinarian.png
-%%JAVASHAREDIR%%/yaac/images/watch.png
-%%JAVASHAREDIR%%/yaac/images/water.png
-%%JAVASHAREDIR%%/yaac/images/watermill.png
-%%JAVASHAREDIR%%/yaac/images/watertower.png
-%%JAVASHAREDIR%%/yaac/images/welding.png
-%%JAVASHAREDIR%%/yaac/images/winddir.png
-%%JAVASHAREDIR%%/yaac/images/windmill.png
-%%JAVASHAREDIR%%/yaac/images/windspeed.png
-%%JAVASHAREDIR%%/yaac/images/wine.png
-%%JAVASHAREDIR%%/yaac/images/worship.png
-%%JAVASHAREDIR%%/yaac/images/yaaclogo32.ico
-%%JAVASHAREDIR%%/yaac/images/yaaclogo64.ico
-%%JAVASHAREDIR%%/yaac/images/yoga.png
-%%JAVASHAREDIR%%/yaac/images/zoo.png
-%%JAVASHAREDIR%%/yaac/lib/commons-compress-1.4.jar
-%%JAVASHAREDIR%%/yaac/lib/commons-math3-3.0.jar
-%%JAVASHAREDIR%%/yaac/lib/jh.jar
-%%JAVASHAREDIR%%/yaac/lib/milStd2525_png.jar
-%%JAVASHAREDIR%%/yaac/lib/omcorba.jar
-%%JAVASHAREDIR%%/yaac/lib/omj3d.jar
-%%JAVASHAREDIR%%/yaac/lib/omsvg.jar
-%%JAVASHAREDIR%%/yaac/lib/openmap.jar
-%%JAVASHAREDIR%%/yaac/plugins/sampleplugin.jar
+%%DATADIR%%/YAAC.jar
+%%DATADIR%%/cleaner.jar
+%%DATADIR%%/upgrade.jar
+%%DATADIR%%/YAACpluginSDK.zip
+%%DATADIR%%/images/alcohol.png
+%%DATADIR%%/images/allicon2.png
+%%DATADIR%%/images/allicons.png
+%%DATADIR%%/images/amusementpark.png
+%%DATADIR%%/images/animal_boarding.png
+%%DATADIR%%/images/archaeological_site.png
+%%DATADIR%%/images/atm.png
+%%DATADIR%%/images/bakery.png
+%%DATADIR%%/images/bank.png
+%%DATADIR%%/images/bar.png
+%%DATADIR%%/images/barber.png
+%%DATADIR%%/images/battery.png
+%%DATADIR%%/images/beauty.png
+%%DATADIR%%/images/beer.png
+%%DATADIR%%/images/bench.png
+%%DATADIR%%/images/beverage.png
+%%DATADIR%%/images/bicycle.png
+%%DATADIR%%/images/bicycle_parking.png
+%%DATADIR%%/images/bicycle_rental.png
+%%DATADIR%%/images/bicycle_repair.png
+%%DATADIR%%/images/boat_launch.png
+%%DATADIR%%/images/bomb_crater.png
+%%DATADIR%%/images/bomb_shelter.png
+%%DATADIR%%/images/book.png
+%%DATADIR%%/images/bowling.png
+%%DATADIR%%/images/bullring.png
+%%DATADIR%%/images/burningman.png
+%%DATADIR%%/images/bus_station.png
+%%DATADIR%%/images/bus_stop.png
+%%DATADIR%%/images/butcher.png
+%%DATADIR%%/images/camp_site.png
+%%DATADIR%%/images/car.png
+%%DATADIR%%/images/car_rental.png
+%%DATADIR%%/images/car_repair.png
+%%DATADIR%%/images/car_sharing.png
+%%DATADIR%%/images/castle.png
+%%DATADIR%%/images/cave.png
+%%DATADIR%%/images/church.png
+%%DATADIR%%/images/cinema.png
+%%DATADIR%%/images/circus.png
+%%DATADIR%%/images/clock.png
+%%DATADIR%%/images/clothes.png
+%%DATADIR%%/images/coffee.png
+%%DATADIR%%/images/confectionary.png
+%%DATADIR%%/images/convenience.png
+%%DATADIR%%/images/court.png
+%%DATADIR%%/images/defibrillator.png
+%%DATADIR%%/images/dentist.png
+%%DATADIR%%/images/department_store.png
+%%DATADIR%%/images/disco.png
+%%DATADIR%%/images/doctor.png
+%%DATADIR%%/images/doityourself.png
+%%DATADIR%%/images/donut.png
+%%DATADIR%%/images/downarrow.png
+%%DATADIR%%/images/drinkingwater.png
+%%DATADIR%%/images/dump_station.png
+%%DATADIR%%/images/electronics.png
+%%DATADIR%%/images/embassy.png
+%%DATADIR%%/images/emergencyphone.png
+%%DATADIR%%/images/ev_plugin.png
+%%DATADIR%%/images/fastfood.png
+%%DATADIR%%/images/fire_extinguisher.png
+%%DATADIR%%/images/fish.png
+%%DATADIR%%/images/florist.png
+%%DATADIR%%/images/fountain.png
+%%DATADIR%%/images/fuel.png
+%%DATADIR%%/images/furniture.png
+%%DATADIR%%/images/gate.png
+%%DATADIR%%/images/gift.png
+%%DATADIR%%/images/glasses.png
+%%DATADIR%%/images/go.png
+%%DATADIR%%/images/go_selected.png
+%%DATADIR%%/images/golf_course.png
+%%DATADIR%%/images/graveyard.png
+%%DATADIR%%/images/greenpushpin.png
+%%DATADIR%%/images/gust.png
+%%DATADIR%%/images/hairdresser.png
+%%DATADIR%%/images/healthcare.png
+%%DATADIR%%/images/hostel.png
+%%DATADIR%%/images/hotel.png
+%%DATADIR%%/images/humid.png
+%%DATADIR%%/images/hydrant.png
+%%DATADIR%%/images/icecream.png
+%%DATADIR%%/images/jewelry.png
+%%DATADIR%%/images/leftarrow.png
+%%DATADIR%%/images/library.png
+%%DATADIR%%/images/lifering.png
+%%DATADIR%%/images/lighthouse.png
+%%DATADIR%%/images/lineStyle.png
+%%DATADIR%%/images/lumin.png
+%%DATADIR%%/images/martialarts.png
+%%DATADIR%%/images/masonic_hall.png
+%%DATADIR%%/images/mast.png
+%%DATADIR%%/images/memorial.png
+%%DATADIR%%/images/mobilephone.png
+%%DATADIR%%/images/monument.png
+%%DATADIR%%/images/mosque.png
+%%DATADIR%%/images/msg.png
+%%DATADIR%%/images/museum.png
+%%DATADIR%%/images/music.png
+%%DATADIR%%/images/news.png
+%%DATADIR%%/images/openfile.png
+%%DATADIR%%/images/osm-Rendering-area-natural-marsh-osmarender.png
+%%DATADIR%%/images/oval.png
+%%DATADIR%%/images/palette.png
+%%DATADIR%%/images/parking.png
+%%DATADIR%%/images/pawnshop.png
+%%DATADIR%%/images/peak.png
+%%DATADIR%%/images/pet.png
+%%DATADIR%%/images/pharmacy.png
+%%DATADIR%%/images/picnictable.png
+%%DATADIR%%/images/pizza.png
+%%DATADIR%%/images/placeofworship_bahai.png
+%%DATADIR%%/images/placeofworship_buddhist.png
+%%DATADIR%%/images/placeofworship_hindu.png
+%%DATADIR%%/images/placeofworship_jain.png
+%%DATADIR%%/images/placeofworship_pagan.png
+%%DATADIR%%/images/placeofworship_pastafarian.png
+%%DATADIR%%/images/placeofworship_scientologist.png
+%%DATADIR%%/images/placeofworship_shinto.png
+%%DATADIR%%/images/placeofworship_sikh.png
+%%DATADIR%%/images/placeofworship_taoist.png
+%%DATADIR%%/images/placeofworship_zoroastrian.png
+%%DATADIR%%/images/playground.png
+%%DATADIR%%/images/polyline.png
+%%DATADIR%%/images/poolballs.png
+%%DATADIR%%/images/post_office.png
+%%DATADIR%%/images/power_tower.png
+%%DATADIR%%/images/pressure.png
+%%DATADIR%%/images/pressure_Pa.png
+%%DATADIR%%/images/pressure_hPa.png
+%%DATADIR%%/images/pressure_inHg.png
+%%DATADIR%%/images/pressure_kPa.png
+%%DATADIR%%/images/pressure_mmHg.png
+%%DATADIR%%/images/pressure_psi.png
+%%DATADIR%%/images/prison.png
+%%DATADIR%%/images/pub.png
+%%DATADIR%%/images/public_bookcase.png
+%%DATADIR%%/images/pumpjack.png
+%%DATADIR%%/images/radius_gale.png
+%%DATADIR%%/images/radius_hc.png
+%%DATADIR%%/images/radius_ts.png
+%%DATADIR%%/images/railway_station.png
+%%DATADIR%%/images/rain.png
+%%DATADIR%%/images/rain_h.png
+%%DATADIR%%/images/rain_m.png
+%%DATADIR%%/images/ranger.png
+%%DATADIR%%/images/rect.png
+%%DATADIR%%/images/recycling.png
+%%DATADIR%%/images/redpushpin.png
+%%DATADIR%%/images/restaurant.png
+%%DATADIR%%/images/rightarrow.png
+%%DATADIR%%/images/rollerskate.png
+%%DATADIR%%/images/save.png
+%%DATADIR%%/images/select.png
+%%DATADIR%%/images/sex.png
+%%DATADIR%%/images/shelter.png
+%%DATADIR%%/images/shoes.png
+%%DATADIR%%/images/smoking_area.png
+%%DATADIR%%/images/snow.png
+%%DATADIR%%/images/spring.png
+%%DATADIR%%/images/stop.png
+%%DATADIR%%/images/stop_selected.png
+%%DATADIR%%/images/stormtype.png
+%%DATADIR%%/images/studio.png
+%%DATADIR%%/images/supermarket.png
+%%DATADIR%%/images/swimmingpool.png
+%%DATADIR%%/images/symbols/3123.png
+%%DATADIR%%/images/symbols/3223.png
+%%DATADIR%%/images/symbols/3226.png
+%%DATADIR%%/images/symbols/3323.png
+%%DATADIR%%/images/symbols/3673.png
+%%DATADIR%%/images/symbols/3741.png
+%%DATADIR%%/images/symbols/3752.png
+%%DATADIR%%/images/symbols/3838.png
+%%DATADIR%%/images/symbols/3f23.png
+%%DATADIR%%/images/symbols/4123.png
+%%DATADIR%%/images/symbols/4130.png
+%%DATADIR%%/images/symbols/4141.png
+%%DATADIR%%/images/symbols/4144.png
+%%DATADIR%%/images/symbols/4159.png
+%%DATADIR%%/images/symbols/415c.png
+%%DATADIR%%/images/symbols/4161.png
+%%DATADIR%%/images/symbols/416b.png
+%%DATADIR%%/images/symbols/423e.png
+%%DATADIR%%/images/symbols/4244.png
+%%DATADIR%%/images/symbols/4245.png
+%%DATADIR%%/images/symbols/424f.png
+%%DATADIR%%/images/symbols/4259.png
+%%DATADIR%%/images/symbols/425b.png
+%%DATADIR%%/images/symbols/4273.png
+%%DATADIR%%/images/symbols/4275.png
+%%DATADIR%%/images/symbols/4325.png
+%%DATADIR%%/images/symbols/432d.png
+%%DATADIR%%/images/symbols/434f.png
+%%DATADIR%%/images/symbols/4363.png
+%%DATADIR%%/images/symbols/4375.png
+%%DATADIR%%/images/symbols/437a.png
+%%DATADIR%%/images/symbols/4423.png
+%%DATADIR%%/images/symbols/4426.png
+%%DATADIR%%/images/symbols/4441.png
+%%DATADIR%%/images/symbols/4445.png
+%%DATADIR%%/images/symbols/445e.png
+%%DATADIR%%/images/symbols/4460.png
+%%DATADIR%%/images/symbols/4461.png
+%%DATADIR%%/images/symbols/4463.png
+%%DATADIR%%/images/symbols/4473.png
+%%DATADIR%%/images/symbols/4521.png
+%%DATADIR%%/images/symbols/4525.png
+%%DATADIR%%/images/symbols/452d.png
+%%DATADIR%%/images/symbols/4530.png
+%%DATADIR%%/images/symbols/4532.png
+%%DATADIR%%/images/symbols/453e.png
+%%DATADIR%%/images/symbols/4541.png
+%%DATADIR%%/images/symbols/4560.png
+%%DATADIR%%/images/symbols/4573.png
+%%DATADIR%%/images/symbols/457a.png
+%%DATADIR%%/images/symbols/4628.png
+%%DATADIR%%/images/symbols/463b.png
+%%DATADIR%%/images/symbols/463e.png
+%%DATADIR%%/images/symbols/4644.png
+%%DATADIR%%/images/symbols/4645.png
+%%DATADIR%%/images/symbols/4660.png
+%%DATADIR%%/images/symbols/4673.png
+%%DATADIR%%/images/symbols/4725.png
+%%DATADIR%%/images/symbols/4738.png
+%%DATADIR%%/images/symbols/4761.png
+%%DATADIR%%/images/symbols/4775.png
+%%DATADIR%%/images/symbols/4777.png
+%%DATADIR%%/images/symbols/477a.png
+%%DATADIR%%/images/symbols/4825.png
+%%DATADIR%%/images/symbols/483e.png
+%%DATADIR%%/images/symbols/4841.png
+%%DATADIR%%/images/symbols/4844.png
+%%DATADIR%%/images/symbols/4845.png
+%%DATADIR%%/images/symbols/485b.png
+%%DATADIR%%/images/symbols/4860.png
+%%DATADIR%%/images/symbols/4868.png
+%%DATADIR%%/images/symbols/4875.png
+%%DATADIR%%/images/symbols/4923.png
+%%DATADIR%%/images/symbols/4926.png
+%%DATADIR%%/images/symbols/4930.png
+%%DATADIR%%/images/symbols/4932.png
+%%DATADIR%%/images/symbols/493b.png
+%%DATADIR%%/images/symbols/4941.png
+%%DATADIR%%/images/symbols/4959.png
+%%DATADIR%%/images/symbols/4a73.png
+%%DATADIR%%/images/symbols/4b52.png
+%%DATADIR%%/images/symbols/4b59.png
+%%DATADIR%%/images/symbols/4c23.png
+%%DATADIR%%/images/symbols/4c24.png
+%%DATADIR%%/images/symbols/4c44.png
+%%DATADIR%%/images/symbols/4c49.png
+%%DATADIR%%/images/symbols/4c73.png
+%%DATADIR%%/images/symbols/4d48.png
+%%DATADIR%%/images/symbols/4d4f.png
+%%DATADIR%%/images/symbols/4d52.png
+%%DATADIR%%/images/symbols/4d5e.png
+%%DATADIR%%/images/symbols/4d73.png
+%%DATADIR%%/images/symbols/4d77.png
+%%DATADIR%%/images/symbols/4d7a.png
+%%DATADIR%%/images/symbols/4e23.png
+%%DATADIR%%/images/symbols/4e25.png
+%%DATADIR%%/images/symbols/4e77.png
+%%DATADIR%%/images/symbols/4f73.png
+%%DATADIR%%/images/symbols/5023.png
+%%DATADIR%%/images/symbols/5025.png
+%%DATADIR%%/images/symbols/5026.png
+%%DATADIR%%/images/symbols/5028.png
+%%DATADIR%%/images/symbols/503e.png
+%%DATADIR%%/images/symbols/5173.png
+%%DATADIR%%/images/symbols/5223.png
+%%DATADIR%%/images/symbols/5226.png
+%%DATADIR%%/images/symbols/5241.png
+%%DATADIR%%/images/symbols/5244.png
+%%DATADIR%%/images/symbols/5248.png
+%%DATADIR%%/images/symbols/5249.png
+%%DATADIR%%/images/symbols/524f.png
+%%DATADIR%%/images/symbols/525b.png
+%%DATADIR%%/images/symbols/5260.png
+%%DATADIR%%/images/symbols/5261.png
+%%DATADIR%%/images/symbols/5263.png
+%%DATADIR%%/images/symbols/5277.png
+%%DATADIR%%/images/symbols/5323.png
+%%DATADIR%%/images/symbols/5325.png
+%%DATADIR%%/images/symbols/533b.png
+%%DATADIR%%/images/symbols/533e.png
+%%DATADIR%%/images/symbols/5344.png
+%%DATADIR%%/images/symbols/5345.png
+%%DATADIR%%/images/symbols/5349.png
+%%DATADIR%%/images/symbols/535b.png
+%%DATADIR%%/images/symbols/535e.png
+%%DATADIR%%/images/symbols/5360.png
+%%DATADIR%%/images/symbols/5361.png
+%%DATADIR%%/images/symbols/5363.png
+%%DATADIR%%/images/symbols/5373.png
+%%DATADIR%%/images/symbols/5377.png
+%%DATADIR%%/images/symbols/5423.png
+%%DATADIR%%/images/symbols/5426.png
+%%DATADIR%%/images/symbols/543e.png
+%%DATADIR%%/images/symbols/544f.png
+%%DATADIR%%/images/symbols/5475.png
+%%DATADIR%%/images/symbols/547a.png
+%%DATADIR%%/images/symbols/5523.png
+%%DATADIR%%/images/symbols/5524.png
+%%DATADIR%%/images/symbols/5573.png
+%%DATADIR%%/images/symbols/5621.png
+%%DATADIR%%/images/symbols/5630.png
+%%DATADIR%%/images/symbols/563e.png
+%%DATADIR%%/images/symbols/5725.png
+%%DATADIR%%/images/symbols/5726.png
+%%DATADIR%%/images/symbols/5728.png
+%%DATADIR%%/images/symbols/5730.png
+%%DATADIR%%/images/symbols/573b.png
+%%DATADIR%%/images/symbols/5748.png
+%%DATADIR%%/images/symbols/5761.png
+%%DATADIR%%/images/symbols/5841.png
+%%DATADIR%%/images/symbols/5848.png
+%%DATADIR%%/images/symbols/5924.png
+%%DATADIR%%/images/symbols/5959.png
+%%DATADIR%%/images/symbols/5961.png
+%%DATADIR%%/images/symbols/5973.png
+%%DATADIR%%/images/symbols/5977.png
+%%DATADIR%%/images/synagogue.png
+%%DATADIR%%/images/taxi.png
+%%DATADIR%%/images/text.png
+%%DATADIR%%/images/theatre.png
+%%DATADIR%%/images/thermo.png
+%%DATADIR%%/images/tobacco.png
+%%DATADIR%%/images/tocalls.dense.json
+%%DATADIR%%/images/toilets.png
+%%DATADIR%%/images/townhall.png
+%%DATADIR%%/images/trafficsignal.png
+%%DATADIR%%/images/trailer.png
+%%DATADIR%%/images/tree.png
+%%DATADIR%%/images/tyre.png
+%%DATADIR%%/images/uparrow.png
+%%DATADIR%%/images/vendingmachine.png
+%%DATADIR%%/images/veterinarian.png
+%%DATADIR%%/images/watch.png
+%%DATADIR%%/images/water.png
+%%DATADIR%%/images/watermill.png
+%%DATADIR%%/images/watertower.png
+%%DATADIR%%/images/welding.png
+%%DATADIR%%/images/winddir.png
+%%DATADIR%%/images/windmill.png
+%%DATADIR%%/images/windspeed.png
+%%DATADIR%%/images/wine.png
+%%DATADIR%%/images/worship.png
+%%DATADIR%%/images/yaaclogo32.ico
+%%DATADIR%%/images/yaaclogo64.ico
+%%DATADIR%%/images/yoga.png
+%%DATADIR%%/images/zoo.png
+%%DATADIR%%/lib/commons-compress-1.12.jar
+%%DATADIR%%/lib/commons-math3-3.6.1.jar
+%%DATADIR%%/lib/jh.jar
+%%DATADIR%%/lib/milStd2525_png.jar
+%%DATADIR%%/lib/omcorba.jar
+%%DATADIR%%/lib/omj3d.jar
+%%DATADIR%%/lib/omsvg.jar
+%%DATADIR%%/lib/openmap.jar
+%%DATADIR%%/plugins/sampleplugin.jar