3 files changed, 54 insertions, 348 deletions

diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index 5669d9d77617..01c0091449fe 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	google-earth
-PORTVERSION=	5.2.1.1588
-PORTREVISION=	1
+PORTVERSION=	6.0.3.2197
 PORTEPOCH=	3
 CATEGORIES=	astro deskutils geography
 MASTER_SITES=	http://dl.google.com/earth/client/advanced/previous/:previous \
 		http://dl.google.com/earth/client/current/:current
-DISTFILES=	GoogleEarthLinux.bin:previous
+DISTFILES=	GoogleEarthLinux.bin:current
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=	# none
 
@@ -49,9 +48,10 @@ IGNORE=	FreeBSD>=7.X is needed with Linux emulation 2.6.x
 IGNORE=	needs non-default linux ports (define OVERRIDE_LINUX_BASE_PORT=f10 and OVERRIDE_LINUX_NONBASE_PORTS=f10)
 .endif
 
-.if ${OSVERSION} >= 900000 && ${ARCH} == "amd64"
-BROKEN=	seems to crash on >= 9.x/amd64: http://www.freebsd.org/cgi/query-pr.cgi?pr=160422
-.endif
+# Fixed by the first post-patch target line?  Also, linprocfs needs to be mounted.
+#.if ${OSVERSION} >= 900000 && ${ARCH} == "amd64"
+#BROKEN=	seems to crash on >= 9.x/amd64: http://www.freebsd.org/cgi/query-pr.cgi?pr=160422
+#.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
@@ -61,6 +61,7 @@ do-extract:
 	@cd ${WRKSRC} && ${TAR} xf googleearth-linux-x86.tar && ${RM} -f googleearth-linux-x86.tar
 
 post-patch:
+	@${REINPLACE_CMD} -i "" -e '/OS.*=/s|linux|FreeBSD|' ${WRKSRC}/drivers.ini
 	@${REINPLACE_CMD} -i "" -e 's|^# Set the home.*|GOOGLEEARTH_DATA_PATH=${DATADIR}|' ${WRKSRC}/bin/googleearth
 	@${REINPLACE_CMD} -i "" -e "s|^# Let's boogie.*|rm -f \$${HOME}/.googleearth/instance-running-lock|" ${WRKSRC}/bin/googleearth
 	@${REINPLACE_CMD} -i "" -e 's/^TMPPATH.*/exit 0/' ${WRKSRC}/postinstall.sh
diff --git a/astro/google-earth/distinfo b/astro/google-earth/distinfo
index 1567ff9063c6..396788753ff7 100644
--- a/astro/google-earth/distinfo
+++ b/astro/google-earth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (google-earth/5.2.1.1588/GoogleEarthLinux.bin) = 2e6fcbd2384446e2a6eed8ca23173e32c5f3f9ae4d1168e2e348c3924fd2bf30
-SIZE (google-earth/5.2.1.1588/GoogleEarthLinux.bin) = 31406473
+SHA256 (google-earth/6.0.3.2197/GoogleEarthLinux.bin) = 8c1cabb6a196e93224be05bd8a4786087813075f76e1734a17680c30a9ad972d
+SIZE (google-earth/6.0.3.2197/GoogleEarthLinux.bin) = 33688483
diff --git a/astro/google-earth/pkg-plist b/astro/google-earth/pkg-plist
index 857ad8e8beb4..db5a8916c51f 100644
--- a/astro/google-earth/pkg-plist
+++ b/astro/google-earth/pkg-plist
@@ -6,6 +6,33 @@ bin/googleearth
 %%DATADIR%%/README.linux
 %%DATADIR%%/bin/googleearth
 %%DATADIR%%/bin/browserwrapper
+%%DATADIR%%/desktop_icons/consumer/product_logo_128.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_16.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_22.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_24.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_256.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_32.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_32.xpm
+%%DATADIR%%/desktop_icons/consumer/product_logo_48.png
+%%DATADIR%%/desktop_icons/consumer/product_logo_64.png
+%%DATADIR%%/desktop_icons/ec/product_logo_128.png
+%%DATADIR%%/desktop_icons/ec/product_logo_16.png
+%%DATADIR%%/desktop_icons/ec/product_logo_22.png
+%%DATADIR%%/desktop_icons/ec/product_logo_24.png
+%%DATADIR%%/desktop_icons/ec/product_logo_256.png
+%%DATADIR%%/desktop_icons/ec/product_logo_32.png
+%%DATADIR%%/desktop_icons/ec/product_logo_32.xpm
+%%DATADIR%%/desktop_icons/ec/product_logo_48.png
+%%DATADIR%%/desktop_icons/ec/product_logo_64.png
+%%DATADIR%%/desktop_icons/pro/product_logo_128.png
+%%DATADIR%%/desktop_icons/pro/product_logo_16.png
+%%DATADIR%%/desktop_icons/pro/product_logo_22.png
+%%DATADIR%%/desktop_icons/pro/product_logo_24.png
+%%DATADIR%%/desktop_icons/pro/product_logo_256.png
+%%DATADIR%%/desktop_icons/pro/product_logo_32.png
+%%DATADIR%%/desktop_icons/pro/product_logo_32.xpm
+%%DATADIR%%/desktop_icons/pro/product_logo_48.png
+%%DATADIR%%/desktop_icons/pro/product_logo_64.png
 %%DATADIR%%/drivers.ini
 %%DATADIR%%/googleearth-bin
 %%DATADIR%%/googleearth-icon.png
@@ -114,6 +141,15 @@ bin/googleearth
 %%DATADIR%%/linux/xdg/xdg-mime
 %%DATADIR%%/plugins/imageformats/libqgif.so
 %%DATADIR%%/plugins/imageformats/libqjpeg.so
+%%DATADIR%%/product_logo_128.png
+%%DATADIR%%/product_logo_16.png
+%%DATADIR%%/product_logo_22.png
+%%DATADIR%%/product_logo_24.png
+%%DATADIR%%/product_logo_256.png
+%%DATADIR%%/product_logo_32.png
+%%DATADIR%%/product_logo_32.xpm
+%%DATADIR%%/product_logo_48.png
+%%DATADIR%%/product_logo_64.png
 %%DATADIR%%/qt.conf
 %%DATADIR%%/resources/ad.country/startinglocation.kml
 %%DATADIR%%/resources/ae.country/startinglocation.kml
@@ -122,7 +158,6 @@ bin/googleearth
 %%DATADIR%%/resources/ai.country/startinglocation.kml
 %%DATADIR%%/resources/al.country/startinglocation.kml
 %%DATADIR%%/resources/am.country/startinglocation.kml
-%%DATADIR%%/resources/american-flag.png
 %%DATADIR%%/resources/an.country/startinglocation.kml
 %%DATADIR%%/resources/ao.country/startinglocation.kml
 %%DATADIR%%/resources/application.rcc
@@ -130,18 +165,13 @@ bin/googleearth
 %%DATADIR%%/resources/ar.country/startinglocation.kml
 %%DATADIR%%/resources/ar.locale/default_myplaces.kml
 %%DATADIR%%/resources/as.country/startinglocation.kml
-%%DATADIR%%/resources/asian-flag.png
 %%DATADIR%%/resources/at.country/startinglocation.kml
 %%DATADIR%%/resources/au.country/startinglocation.kml
-%%DATADIR%%/resources/auto-service.png
-%%DATADIR%%/resources/auto.png
 %%DATADIR%%/resources/aw.country/startinglocation.kml
 %%DATADIR%%/resources/ax.country/startinglocation.kml
 %%DATADIR%%/resources/az.country/startinglocation.kml
 %%DATADIR%%/resources/ba.country/startinglocation.kml
 %%DATADIR%%/resources/balloons.rcc
-%%DATADIR%%/resources/bang.png
-%%DATADIR%%/resources/bars.png
 %%DATADIR%%/resources/bb.country/startinglocation.kml
 %%DATADIR%%/resources/bd.country/startinglocation.kml
 %%DATADIR%%/resources/be.country/startinglocation.kml
@@ -157,37 +187,24 @@ bin/googleearth
 %%DATADIR%%/resources/br.country/startinglocation.kml
 %%DATADIR%%/resources/bs.country/startinglocation.kml
 %%DATADIR%%/resources/bt.country/startinglocation.kml
-%%DATADIR%%/resources/building.png
-%%DATADIR%%/resources/button-dis-leftendcap-flat.png
-%%DATADIR%%/resources/button-dis-repeating-flat.png
-%%DATADIR%%/resources/button-dis-rightendcap-flat.png
-%%DATADIR%%/resources/button-md-leftendcap-flat.png
-%%DATADIR%%/resources/button-md-repeating-flat.png
-%%DATADIR%%/resources/button-md-rightendcap-flat.png
+%%DATADIR%%/resources/builtin_webdata.rcc
 %%DATADIR%%/resources/bv.country/startinglocation.kml
 %%DATADIR%%/resources/bw.country/startinglocation.kml
 %%DATADIR%%/resources/by.country/startinglocation.kml
 %%DATADIR%%/resources/bz.country/startinglocation.kml
 %%DATADIR%%/resources/ca.country/startinglocation.kml
 %%DATADIR%%/resources/ca.locale/default_myplaces.kml
-%%DATADIR%%/resources/camera32.png
 %%DATADIR%%/resources/cc.country/startinglocation.kml
 %%DATADIR%%/resources/cd.country/startinglocation.kml
 %%DATADIR%%/resources/cf.country/startinglocation.kml
 %%DATADIR%%/resources/cg.country/startinglocation.kml
 %%DATADIR%%/resources/ch.country/startinglocation.kml
-%%DATADIR%%/resources/check-sel.png
-%%DATADIR%%/resources/check-somechildsel.png
-%%DATADIR%%/resources/check-unsel.png
 %%DATADIR%%/resources/ci.country/startinglocation.kml
 %%DATADIR%%/resources/ck.country/startinglocation.kml
 %%DATADIR%%/resources/cl.country/startinglocation.kml
-%%DATADIR%%/resources/closednetworkfolder.png
 %%DATADIR%%/resources/cm.country/startinglocation.kml
 %%DATADIR%%/resources/cn.country/startinglocation.kml
 %%DATADIR%%/resources/co.country/startinglocation.kml
-%%DATADIR%%/resources/coffee_house_16.png
-%%DATADIR%%/resources/collapsedtree.png
 %%DATADIR%%/resources/cr.country/startinglocation.kml
 %%DATADIR%%/resources/cs.country/startinglocation.kml
 %%DATADIR%%/resources/cs.locale/default_myplaces.kml
@@ -201,17 +218,11 @@ bin/googleearth
 %%DATADIR%%/resources/da.locale/default_myplaces.kml
 %%DATADIR%%/resources/de.country/startinglocation.kml
 %%DATADIR%%/resources/de.locale/default_myplaces.kml
-%%DATADIR%%/resources/dining.png
-%%DATADIR%%/resources/dining_16.png
 %%DATADIR%%/resources/dj.country/startinglocation.kml
 %%DATADIR%%/resources/dk.country/startinglocation.kml
 %%DATADIR%%/resources/dm.country/startinglocation.kml
 %%DATADIR%%/resources/do.country/startinglocation.kml
 %%DATADIR%%/resources/doppler.txt
-%%DATADIR%%/resources/drawcircle.png
-%%DATADIR%%/resources/drawline.png
-%%DATADIR%%/resources/drawpolygon.png
-%%DATADIR%%/resources/drawpolyline.png
 %%DATADIR%%/resources/dz.country/startinglocation.kml
 %%DATADIR%%/resources/ec.country/startinglocation.kml
 %%DATADIR%%/resources/ee.country/startinglocation.kml
@@ -225,12 +236,9 @@ bin/googleearth
 %%DATADIR%%/resources/es.country/startinglocation.kml
 %%DATADIR%%/resources/es.locale/default_myplaces.kml
 %%DATADIR%%/resources/et.country/startinglocation.kml
-%%DATADIR%%/resources/fast-food.png
 %%DATADIR%%/resources/fi.country/startinglocation.kml
 %%DATADIR%%/resources/fi.locale/default_myplaces.kml
 %%DATADIR%%/resources/fil.locale/default_myplaces.kml
-%%DATADIR%%/resources/find-next-dis.png
-%%DATADIR%%/resources/find-prev-dis.png
 %%DATADIR%%/resources/fj.country/startinglocation.kml
 %%DATADIR%%/resources/fk.country/startinglocation.kml
 %%DATADIR%%/resources/flightsim/aircraft/f16.acf
@@ -256,17 +264,12 @@ bin/googleearth
 %%DATADIR%%/resources/flightsim/planet/earth.ini
 %%DATADIR%%/resources/fm.country/startinglocation.kml
 %%DATADIR%%/resources/fo.country/startinglocation.kml
-%%DATADIR%%/resources/four-dollars.png
-%%DATADIR%%/resources/fr-layers.png
 %%DATADIR%%/resources/fr.country/startinglocation.kml
 %%DATADIR%%/resources/fr.locale/default_myplaces.kml
-%%DATADIR%%/resources/french-flag.png
 %%DATADIR%%/resources/ga.country/startinglocation.kml
 %%DATADIR%%/resources/gb.country/startinglocation.kml
 %%DATADIR%%/resources/gd.country/startinglocation.kml
 %%DATADIR%%/resources/ge.country/startinglocation.kml
-%%DATADIR%%/resources/geforce_cursor.png
-%%DATADIR%%/resources/geforce_cursor_32.png
 %%DATADIR%%/resources/gf.country/startinglocation.kml
 %%DATADIR%%/resources/gg.country/startinglocation.kml
 %%DATADIR%%/resources/gh.country/startinglocation.kml
@@ -284,8 +287,6 @@ bin/googleearth
 %%DATADIR%%/resources/gy.country/startinglocation.kml
 %%DATADIR%%/resources/he.locale/default_myplaces.kml
 %%DATADIR%%/resources/hi.locale/default_myplaces.kml
-%%DATADIR%%/resources/high_res_places.png
-%%DATADIR%%/resources/highway_16.png
 %%DATADIR%%/resources/hk.country/startinglocation.kml
 %%DATADIR%%/resources/hm.country/startinglocation.kml
 %%DATADIR%%/resources/hn.country/startinglocation.kml
@@ -300,14 +301,12 @@ bin/googleearth
 %%DATADIR%%/resources/il.country/startinglocation.kml
 %%DATADIR%%/resources/im.country/startinglocation.kml
 %%DATADIR%%/resources/in.country/startinglocation.kml
-%%DATADIR%%/resources/invisible.png
 %%DATADIR%%/resources/io.country/startinglocation.kml
 %%DATADIR%%/resources/iq.country/startinglocation.kml
 %%DATADIR%%/resources/ir.country/startinglocation.kml
 %%DATADIR%%/resources/is.country/startinglocation.kml
 %%DATADIR%%/resources/it.country/startinglocation.kml
 %%DATADIR%%/resources/it.locale/default_myplaces.kml
-%%DATADIR%%/resources/italian-flag.png
 %%DATADIR%%/resources/ja.locale/default_myplaces.kml
 %%DATADIR%%/resources/je.country/startinglocation.kml
 %%DATADIR%%/resources/jm.country/startinglocation.kml
@@ -326,15 +325,13 @@ bin/googleearth
 %%DATADIR%%/resources/ky.country/startinglocation.kml
 %%DATADIR%%/resources/kz.country/startinglocation.kml
 %%DATADIR%%/resources/la.country/startinglocation.kml
-%%DATADIR%%/resources/large_traffic_count_16.png
-%%DATADIR%%/resources/layers_16.png
 %%DATADIR%%/resources/lb.country/startinglocation.kml
 %%DATADIR%%/resources/lc.country/startinglocation.kml
 %%DATADIR%%/resources/leftpanel-common.rcc
 %%DATADIR%%/resources/leftpanel-layer.rcc
 %%DATADIR%%/resources/li.country/startinglocation.kml
 %%DATADIR%%/resources/lk.country/startinglocation.kml
-%%DATADIR%%/resources/loading-image.png
+%%DATADIR%%/resources/localshapes.rcc
 %%DATADIR%%/resources/lr.country/startinglocation.kml
 %%DATADIR%%/resources/ls.country/startinglocation.kml
 %%DATADIR%%/resources/lt.country/startinglocation.kml
@@ -347,10 +344,8 @@ bin/googleearth
 %%DATADIR%%/resources/mc.country/startinglocation.kml
 %%DATADIR%%/resources/md.country/startinglocation.kml
 %%DATADIR%%/resources/me.country/startinglocation.kml
-%%DATADIR%%/resources/mexican-flag.png
 %%DATADIR%%/resources/mg.country/startinglocation.kml
 %%DATADIR%%/resources/mh.country/startinglocation.kml
-%%DATADIR%%/resources/misc-dining.png
 %%DATADIR%%/resources/mk.country/startinglocation.kml
 %%DATADIR%%/resources/ml.country/startinglocation.kml
 %%DATADIR%%/resources/mm.country/startinglocation.kml
@@ -378,210 +373,32 @@ bin/googleearth
 %%DATADIR%%/resources/nl.locale/default_myplaces.kml
 %%DATADIR%%/resources/no.country/startinglocation.kml
 %%DATADIR%%/resources/no.locale/default_myplaces.kml
-%%DATADIR%%/resources/node-closed.png
-%%DATADIR%%/resources/node-open.png
-%%DATADIR%%/resources/note.png
+%%DATADIR%%/resources/notifications.rcc
 %%DATADIR%%/resources/np.country/startinglocation.kml
 %%DATADIR%%/resources/nr.country/startinglocation.kml
 %%DATADIR%%/resources/nu.country/startinglocation.kml
 %%DATADIR%%/resources/nz.country/startinglocation.kml
 %%DATADIR%%/resources/om.country/startinglocation.kml
-%%DATADIR%%/resources/one-dollar.png
-%%DATADIR%%/resources/opennetworkfolder.png
-%%DATADIR%%/resources/opentree.png
 %%DATADIR%%/resources/pa.country/startinglocation.kml
-%%DATADIR%%/resources/paddle/1-lv.png
-%%DATADIR%%/resources/paddle/1.png
-%%DATADIR%%/resources/paddle/10-lv.png
-%%DATADIR%%/resources/paddle/10.png
-%%DATADIR%%/resources/paddle/2-lv.png
-%%DATADIR%%/resources/paddle/2.png
-%%DATADIR%%/resources/paddle/3-lv.png
-%%DATADIR%%/resources/paddle/3.png
-%%DATADIR%%/resources/paddle/4-lv.png
-%%DATADIR%%/resources/paddle/4.png
-%%DATADIR%%/resources/paddle/5-lv.png
-%%DATADIR%%/resources/paddle/5.png
-%%DATADIR%%/resources/paddle/6-lv.png
-%%DATADIR%%/resources/paddle/6.png
-%%DATADIR%%/resources/paddle/7-lv.png
-%%DATADIR%%/resources/paddle/7.png
-%%DATADIR%%/resources/paddle/8-lv.png
-%%DATADIR%%/resources/paddle/8.png
-%%DATADIR%%/resources/paddle/9-lv.png
-%%DATADIR%%/resources/paddle/9.png
-%%DATADIR%%/resources/paddle/a-lv.png
-%%DATADIR%%/resources/paddle/a.png
-%%DATADIR%%/resources/paddle/b-lv.png
-%%DATADIR%%/resources/paddle/b.png
-%%DATADIR%%/resources/paddle/blu-blank-lv.png
-%%DATADIR%%/resources/paddle/blu-blank.png
-%%DATADIR%%/resources/paddle/blu-circle-lv.png
-%%DATADIR%%/resources/paddle/blu-circle.png
-%%DATADIR%%/resources/paddle/blu-diamond-lv.png
-%%DATADIR%%/resources/paddle/blu-diamond.png
-%%DATADIR%%/resources/paddle/blu-square-lv.png
-%%DATADIR%%/resources/paddle/blu-square.png
-%%DATADIR%%/resources/paddle/blu-stars-lv.png
-%%DATADIR%%/resources/paddle/blu-stars.png
-%%DATADIR%%/resources/paddle/c-lv.png
-%%DATADIR%%/resources/paddle/c.png
-%%DATADIR%%/resources/paddle/d-lv.png
-%%DATADIR%%/resources/paddle/d.png
-%%DATADIR%%/resources/paddle/e-lv.png
-%%DATADIR%%/resources/paddle/e.png
-%%DATADIR%%/resources/paddle/f-lv.png
-%%DATADIR%%/resources/paddle/f.png
-%%DATADIR%%/resources/paddle/g-lv.png
-%%DATADIR%%/resources/paddle/g.png
-%%DATADIR%%/resources/paddle/go-lv.png
-%%DATADIR%%/resources/paddle/go.png
-%%DATADIR%%/resources/paddle/grn-blank-lv.png
-%%DATADIR%%/resources/paddle/grn-blank.png
-%%DATADIR%%/resources/paddle/grn-circle-lv.png
-%%DATADIR%%/resources/paddle/grn-circle.png
-%%DATADIR%%/resources/paddle/grn-diamond-lv.png
-%%DATADIR%%/resources/paddle/grn-diamond.png
-%%DATADIR%%/resources/paddle/grn-square-lv.png
-%%DATADIR%%/resources/paddle/grn-square.png
-%%DATADIR%%/resources/paddle/grn-stars-lv.png
-%%DATADIR%%/resources/paddle/grn-stars.png
-%%DATADIR%%/resources/paddle/h-lv.png
-%%DATADIR%%/resources/paddle/h.png
-%%DATADIR%%/resources/paddle/i-lv.png
-%%DATADIR%%/resources/paddle/i.png
-%%DATADIR%%/resources/paddle/j-lv.png
-%%DATADIR%%/resources/paddle/j.png
-%%DATADIR%%/resources/paddle/k-lv.png
-%%DATADIR%%/resources/paddle/k.png
-%%DATADIR%%/resources/paddle/l-lv.png
-%%DATADIR%%/resources/paddle/l.png
-%%DATADIR%%/resources/paddle/ltblu-blank-lv.png
-%%DATADIR%%/resources/paddle/ltblu-blank.png
-%%DATADIR%%/resources/paddle/ltblu-circle-lv.png
-%%DATADIR%%/resources/paddle/ltblu-circle.png
-%%DATADIR%%/resources/paddle/ltblu-diamond-lv.png
-%%DATADIR%%/resources/paddle/ltblu-diamond.png
-%%DATADIR%%/resources/paddle/ltblu-square-lv.png
-%%DATADIR%%/resources/paddle/ltblu-square.png
-%%DATADIR%%/resources/paddle/ltblu-stars-lv.png
-%%DATADIR%%/resources/paddle/ltblu-stars.png
-%%DATADIR%%/resources/paddle/m-lv.png
-%%DATADIR%%/resources/paddle/m.png
-%%DATADIR%%/resources/paddle/n-lv.png
-%%DATADIR%%/resources/paddle/n.png
-%%DATADIR%%/resources/paddle/o-lv.png
-%%DATADIR%%/resources/paddle/o.png
-%%DATADIR%%/resources/paddle/p-lv.png
-%%DATADIR%%/resources/paddle/p.png
-%%DATADIR%%/resources/paddle/pause-lv.png
-%%DATADIR%%/resources/paddle/pause.png
-%%DATADIR%%/resources/paddle/pink-blank-lv.png
-%%DATADIR%%/resources/paddle/pink-blank.png
-%%DATADIR%%/resources/paddle/pink-circle-lv.png
-%%DATADIR%%/resources/paddle/pink-circle.png
-%%DATADIR%%/resources/paddle/pink-diamond-lv.png
-%%DATADIR%%/resources/paddle/pink-diamond.png
-%%DATADIR%%/resources/paddle/pink-square-lv.png
-%%DATADIR%%/resources/paddle/pink-square.png
-%%DATADIR%%/resources/paddle/pink-stars-lv.png
-%%DATADIR%%/resources/paddle/pink-stars.png
-%%DATADIR%%/resources/paddle/purple-circle-lv.png
-%%DATADIR%%/resources/paddle/purple-circle.png
-%%DATADIR%%/resources/paddle/purple-diamond-lv.png
-%%DATADIR%%/resources/paddle/purple-diamond.png
-%%DATADIR%%/resources/paddle/purple-square-lv.png
-%%DATADIR%%/resources/paddle/purple-square.png
-%%DATADIR%%/resources/paddle/purple-stars-lv.png
-%%DATADIR%%/resources/paddle/purple-stars.png
-%%DATADIR%%/resources/paddle/q-lv.png
-%%DATADIR%%/resources/paddle/q.png
-%%DATADIR%%/resources/paddle/r-lv.png
-%%DATADIR%%/resources/paddle/r.png
-%%DATADIR%%/resources/paddle/red-circle-lv.png
-%%DATADIR%%/resources/paddle/red-circle.png
-%%DATADIR%%/resources/paddle/red-diamond-lv.png
-%%DATADIR%%/resources/paddle/red-diamond.png
-%%DATADIR%%/resources/paddle/red-square-lv.png
-%%DATADIR%%/resources/paddle/red-square.png
-%%DATADIR%%/resources/paddle/red-stars-lv.png
-%%DATADIR%%/resources/paddle/red-stars.png
-%%DATADIR%%/resources/paddle/route.png
-%%DATADIR%%/resources/paddle/s-lv.png
-%%DATADIR%%/resources/paddle/s.png
-%%DATADIR%%/resources/paddle/stop-lv.png
-%%DATADIR%%/resources/paddle/stop.png
-%%DATADIR%%/resources/paddle/t-lv.png
-%%DATADIR%%/resources/paddle/t.png
-%%DATADIR%%/resources/paddle/u-lv.png
-%%DATADIR%%/resources/paddle/u.png
-%%DATADIR%%/resources/paddle/v-lv.png
-%%DATADIR%%/resources/paddle/v.png
-%%DATADIR%%/resources/paddle/w-lv.png
-%%DATADIR%%/resources/paddle/w.png
-%%DATADIR%%/resources/paddle/wht-blank-lv.png
-%%DATADIR%%/resources/paddle/wht-blank.png
-%%DATADIR%%/resources/paddle/wht-circle-lv.png
-%%DATADIR%%/resources/paddle/wht-circle.png
-%%DATADIR%%/resources/paddle/wht-diamond-lv.png
-%%DATADIR%%/resources/paddle/wht-diamond.png
-%%DATADIR%%/resources/paddle/wht-square-lv.png
-%%DATADIR%%/resources/paddle/wht-square.png
-%%DATADIR%%/resources/paddle/wht-stars-lv.png
-%%DATADIR%%/resources/paddle/wht-stars.png
-%%DATADIR%%/resources/paddle/x-lv.png
-%%DATADIR%%/resources/paddle/x.png
-%%DATADIR%%/resources/paddle/y-lv.png
-%%DATADIR%%/resources/paddle/y.png
-%%DATADIR%%/resources/paddle/ylw-blank-lv.png
-%%DATADIR%%/resources/paddle/ylw-blank.png
-%%DATADIR%%/resources/paddle/ylw-circle-lv.png
-%%DATADIR%%/resources/paddle/ylw-circle.png
-%%DATADIR%%/resources/paddle/ylw-diamond-lv.png
-%%DATADIR%%/resources/paddle/ylw-diamond.png
-%%DATADIR%%/resources/paddle/ylw-square-lv.png
-%%DATADIR%%/resources/paddle/ylw-square.png
-%%DATADIR%%/resources/paddle/ylw-stars-lv.png
-%%DATADIR%%/resources/paddle/ylw-stars.png
-%%DATADIR%%/resources/paddle/z-lv.png
-%%DATADIR%%/resources/paddle/z.png
-%%DATADIR%%/resources/parks.png
 %%DATADIR%%/resources/pe.country/startinglocation.kml
 %%DATADIR%%/resources/pf.country/startinglocation.kml
 %%DATADIR%%/resources/pg.country/startinglocation.kml
 %%DATADIR%%/resources/ph.country/startinglocation.kml
-%%DATADIR%%/resources/photo_icon_64.png
-%%DATADIR%%/resources/photo_listview.png
 %%DATADIR%%/resources/pk.country/startinglocation.kml
 %%DATADIR%%/resources/pl.country/startinglocation.kml
 %%DATADIR%%/resources/pl.locale/default_myplaces.kml
 %%DATADIR%%/resources/pm.country/startinglocation.kml
 %%DATADIR%%/resources/pn.country/startinglocation.kml
 %%DATADIR%%/resources/pr.country/startinglocation.kml
-%%DATADIR%%/resources/premium_lock.png
-%%DATADIR%%/resources/premium_locked.png
-%%DATADIR%%/resources/premium_star.png
-%%DATADIR%%/resources/printlogo.png
 %%DATADIR%%/resources/progress.rcc
 %%DATADIR%%/resources/ps.country/startinglocation.kml
 %%DATADIR%%/resources/pt-PT.locale/default_myplaces.kml
 %%DATADIR%%/resources/pt.country/startinglocation.kml
 %%DATADIR%%/resources/pt.locale/default_myplaces.kml
-%%DATADIR%%/resources/pushpin/blue-pushpin.png
-%%DATADIR%%/resources/pushpin/grn-pushpin.png
-%%DATADIR%%/resources/pushpin/ltblu-pushpin.png
-%%DATADIR%%/resources/pushpin/pink-pushpin.png
-%%DATADIR%%/resources/pushpin/purple-pushpin.png
-%%DATADIR%%/resources/pushpin/red-pushpin.png
-%%DATADIR%%/resources/pushpin/wht-pushpin.png
-%%DATADIR%%/resources/pushpin/ylw-pushpin.png
 %%DATADIR%%/resources/pw.country/startinglocation.kml
 %%DATADIR%%/resources/py.country/startinglocation.kml
 %%DATADIR%%/resources/qa.country/startinglocation.kml
-%%DATADIR%%/resources/query.png
 %%DATADIR%%/resources/re.country/startinglocation.kml
-%%DATADIR%%/resources/recreation.png
-%%DATADIR%%/resources/red_tile.png
 %%DATADIR%%/resources/renderui.rcc
 %%DATADIR%%/resources/ro.country/startinglocation.kml
 %%DATADIR%%/resources/ro.locale/default_myplaces.kml
@@ -592,117 +409,10 @@ bin/googleearth
 %%DATADIR%%/resources/sa.country/startinglocation.kml
 %%DATADIR%%/resources/sb.country/startinglocation.kml
 %%DATADIR%%/resources/sc.country/startinglocation.kml
-%%DATADIR%%/resources/school_16.png
 %%DATADIR%%/resources/sd.country/startinglocation.kml
 %%DATADIR%%/resources/se.country/startinglocation.kml
 %%DATADIR%%/resources/sg.country/startinglocation.kml
 %%DATADIR%%/resources/sh.country/startinglocation.kml
-%%DATADIR%%/resources/shapes/airports.png
-%%DATADIR%%/resources/shapes/arrow-reverse.png
-%%DATADIR%%/resources/shapes/arrow.png
-%%DATADIR%%/resources/shapes/arts.png
-%%DATADIR%%/resources/shapes/bars.png
-%%DATADIR%%/resources/shapes/broken_link.png
-%%DATADIR%%/resources/shapes/bus.png
-%%DATADIR%%/resources/shapes/cabs.png
-%%DATADIR%%/resources/shapes/camera-lv.png
-%%DATADIR%%/resources/shapes/camera.png
-%%DATADIR%%/resources/shapes/campfire.png
-%%DATADIR%%/resources/shapes/campground.png
-%%DATADIR%%/resources/shapes/capital_big.png
-%%DATADIR%%/resources/shapes/capital_big_highlight.png
-%%DATADIR%%/resources/shapes/capital_small.png
-%%DATADIR%%/resources/shapes/capital_small_highlight.png
-%%DATADIR%%/resources/shapes/caution.png
-%%DATADIR%%/resources/shapes/church.png
-%%DATADIR%%/resources/shapes/coffee.png
-%%DATADIR%%/resources/shapes/convenience.png
-%%DATADIR%%/resources/shapes/cross-hairs.png
-%%DATADIR%%/resources/shapes/cross-hairs_highlight.png
-%%DATADIR%%/resources/shapes/cycling.png
-%%DATADIR%%/resources/shapes/dining.png
-%%DATADIR%%/resources/shapes/dollar.png
-%%DATADIR%%/resources/shapes/donut.png
-%%DATADIR%%/resources/shapes/earthquake.png
-%%DATADIR%%/resources/shapes/electronics.png
-%%DATADIR%%/resources/shapes/euro.png
-%%DATADIR%%/resources/shapes/falling_rocks.png
-%%DATADIR%%/resources/shapes/ferry.png
-%%DATADIR%%/resources/shapes/firedept.png
-%%DATADIR%%/resources/shapes/fishing.png
-%%DATADIR%%/resources/shapes/flag.png
-%%DATADIR%%/resources/shapes/forbidden.png
-%%DATADIR%%/resources/shapes/gas_stations.png
-%%DATADIR%%/resources/shapes/golf.png
-%%DATADIR%%/resources/shapes/grocery.png
-%%DATADIR%%/resources/shapes/heliport.png
-%%DATADIR%%/resources/shapes/highway.png
-%%DATADIR%%/resources/shapes/hiker.png
-%%DATADIR%%/resources/shapes/homegardenbusiness.png
-%%DATADIR%%/resources/shapes/horsebackriding.png
-%%DATADIR%%/resources/shapes/hospitals.png
-%%DATADIR%%/resources/shapes/info-i.png
-%%DATADIR%%/resources/shapes/info.png
-%%DATADIR%%/resources/shapes/info_circle.png
-%%DATADIR%%/resources/shapes/lodging.png
-%%DATADIR%%/resources/shapes/man.png
-%%DATADIR%%/resources/shapes/marina.png
-%%DATADIR%%/resources/shapes/mechanic.png
-%%DATADIR%%/resources/shapes/motorcycling.png
-%%DATADIR%%/resources/shapes/mountains.png
-%%DATADIR%%/resources/shapes/movies.png
-%%DATADIR%%/resources/shapes/open-diamond.png
-%%DATADIR%%/resources/shapes/parking_lot.png
-%%DATADIR%%/resources/shapes/parks.png
-%%DATADIR%%/resources/shapes/partly_cloudy.png
-%%DATADIR%%/resources/shapes/pharmacy_rx.png
-%%DATADIR%%/resources/shapes/phone.png
-%%DATADIR%%/resources/shapes/picnic.png
-%%DATADIR%%/resources/shapes/placemark_circle.png
-%%DATADIR%%/resources/shapes/placemark_circle_highlight.png
-%%DATADIR%%/resources/shapes/placemark_square.png
-%%DATADIR%%/resources/shapes/placemark_square_highlight.png
-%%DATADIR%%/resources/shapes/play.png
-%%DATADIR%%/resources/shapes/poi.png
-%%DATADIR%%/resources/shapes/police.png
-%%DATADIR%%/resources/shapes/polygon.png
-%%DATADIR%%/resources/shapes/post_office.png
-%%DATADIR%%/resources/shapes/rail.png
-%%DATADIR%%/resources/shapes/rainy.png
-%%DATADIR%%/resources/shapes/ranger_station.png
-%%DATADIR%%/resources/shapes/realestate.png
-%%DATADIR%%/resources/shapes/road_shield1.png
-%%DATADIR%%/resources/shapes/road_shield2.png
-%%DATADIR%%/resources/shapes/road_shield3.png
-%%DATADIR%%/resources/shapes/ruler.png
-%%DATADIR%%/resources/shapes/sailing.png
-%%DATADIR%%/resources/shapes/salon.png
-%%DATADIR%%/resources/shapes/schools.png
-%%DATADIR%%/resources/shapes/shaded_dot.png
-%%DATADIR%%/resources/shapes/shopping.png
-%%DATADIR%%/resources/shapes/ski.png
-%%DATADIR%%/resources/shapes/snack_bar.png
-%%DATADIR%%/resources/shapes/snowflake_simple.png
-%%DATADIR%%/resources/shapes/square.png
-%%DATADIR%%/resources/shapes/star.png
-%%DATADIR%%/resources/shapes/subway.png
-%%DATADIR%%/resources/shapes/sunny.png
-%%DATADIR%%/resources/shapes/swimming.png
-%%DATADIR%%/resources/shapes/target.png
-%%DATADIR%%/resources/shapes/terrain.png
-%%DATADIR%%/resources/shapes/thunderstorm.png
-%%DATADIR%%/resources/shapes/toilets.png
-%%DATADIR%%/resources/shapes/track.png
-%%DATADIR%%/resources/shapes/trail.png
-%%DATADIR%%/resources/shapes/tram.png
-%%DATADIR%%/resources/shapes/triangle.png
-%%DATADIR%%/resources/shapes/truck.png
-%%DATADIR%%/resources/shapes/volcano.png
-%%DATADIR%%/resources/shapes/water.png
-%%DATADIR%%/resources/shapes/webcam.png
-%%DATADIR%%/resources/shapes/wheel_chair_accessible.png
-%%DATADIR%%/resources/shapes/woman.png
-%%DATADIR%%/resources/shapes/yen.png
 %%DATADIR%%/resources/si.country/startinglocation.kml
 %%DATADIR%%/resources/sj.country/startinglocation.kml
 %%DATADIR%%/resources/sk.country/startinglocation.kml
@@ -717,21 +427,17 @@ bin/googleearth
 %%DATADIR%%/resources/sr.locale/default_myplaces.kml
 %%DATADIR%%/resources/st.country/startinglocation.kml
 %%DATADIR%%/resources/statusbar.rcc
-%%DATADIR%%/resources/streamed_layer.png
-%%DATADIR%%/resources/streamed_layers.png
 %%DATADIR%%/resources/sv.country/startinglocation.kml
 %%DATADIR%%/resources/sv.locale/default_myplaces.kml
 %%DATADIR%%/resources/sy.country/startinglocation.kml
 %%DATADIR%%/resources/sz.country/startinglocation.kml
 %%DATADIR%%/resources/tc.country/startinglocation.kml
 %%DATADIR%%/resources/td.country/startinglocation.kml
-%%DATADIR%%/resources/terrain_16.png
 %%DATADIR%%/resources/terrainmgr.rcc
 %%DATADIR%%/resources/tf.country/startinglocation.kml
 %%DATADIR%%/resources/tg.country/startinglocation.kml
 %%DATADIR%%/resources/th.country/startinglocation.kml
 %%DATADIR%%/resources/th.locale/default_myplaces.kml
-%%DATADIR%%/resources/three-dollars.png
 %%DATADIR%%/resources/tj.country/startinglocation.kml
 %%DATADIR%%/resources/tk.country/startinglocation.kml
 %%DATADIR%%/resources/tl.country/startinglocation.kml
@@ -743,12 +449,9 @@ bin/googleearth
 %%DATADIR%%/resources/tourcontrols.rcc
 %%DATADIR%%/resources/tr.country/startinglocation.kml
 %%DATADIR%%/resources/tr.locale/default_myplaces.kml
-%%DATADIR%%/resources/transp.png
-%%DATADIR%%/resources/transportation.png
 %%DATADIR%%/resources/tt.country/startinglocation.kml
 %%DATADIR%%/resources/tv.country/startinglocation.kml
 %%DATADIR%%/resources/tw.country/startinglocation.kml
-%%DATADIR%%/resources/two-dollars.png
 %%DATADIR%%/resources/tz.country/startinglocation.kml
 %%DATADIR%%/resources/ua.country/startinglocation.kml
 %%DATADIR%%/resources/ug.country/startinglocation.kml
@@ -768,7 +471,6 @@ bin/googleearth
 %%DATADIR%%/resources/vn.country/startinglocation.kml
 %%DATADIR%%/resources/vu.country/startinglocation.kml
 %%DATADIR%%/resources/webbrowser.rcc
-%%DATADIR%%/resources/webcam_16.png
 %%DATADIR%%/resources/wf.country/startinglocation.kml
 %%DATADIR%%/resources/ws.country/startinglocation.kml
 %%DATADIR%%/resources/ye.country/startinglocation.kml
@@ -861,8 +563,14 @@ bin/googleearth
 share/applications/googleearth.desktop
 share/mime/application/earthviewer.xml
 share/mime/application/keyhole.xml
+share/mime/application/vnd.google-earth.kml+xml.xml
+share/mime/application/vnd.google-earth.kmz.xml
 share/mime/packages/googleearth-mimetypes.xml
 @dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/desktop_icons/consumer
+@dirrm %%DATADIR%%/desktop_icons/ec
+@dirrm %%DATADIR%%/desktop_icons/pro
+@dirrm %%DATADIR%%/desktop_icons
 @dirrm %%DATADIR%%/lang
 @dirrm %%DATADIR%%/linux/xdg
 @dirrm %%DATADIR%%/linux
@@ -1070,7 +778,6 @@ share/mime/packages/googleearth-mimetypes.xml
 @dirrm %%DATADIR%%/resources/nz.country
 @dirrm %%DATADIR%%/resources/om.country
 @dirrm %%DATADIR%%/resources/pa.country
-@dirrm %%DATADIR%%/resources/paddle
 @dirrm %%DATADIR%%/resources/pe.country
 @dirrm %%DATADIR%%/resources/pf.country
 @dirrm %%DATADIR%%/resources/pg.country
@@ -1085,7 +792,6 @@ share/mime/packages/googleearth-mimetypes.xml
 @dirrm %%DATADIR%%/resources/pt-PT.locale
 @dirrm %%DATADIR%%/resources/pt.country
 @dirrm %%DATADIR%%/resources/pt.locale
-@dirrm %%DATADIR%%/resources/pushpin
 @dirrm %%DATADIR%%/resources/pw.country
 @dirrm %%DATADIR%%/resources/py.country
 @dirrm %%DATADIR%%/resources/qa.country
@@ -1103,7 +809,6 @@ share/mime/packages/googleearth-mimetypes.xml
 @dirrm %%DATADIR%%/resources/se.country
 @dirrm %%DATADIR%%/resources/sg.country
 @dirrm %%DATADIR%%/resources/sh.country
-@dirrm %%DATADIR%%/resources/shapes
 @dirrm %%DATADIR%%/resources/si.country
 @dirrm %%DATADIR%%/resources/sj.country
 @dirrm %%DATADIR%%/resources/sk.country