diff options
author | Florent Thoumie <flz@FreeBSD.org> | 2007-04-13 11:39:30 +0000 |
---|---|---|
committer | Florent Thoumie <flz@FreeBSD.org> | 2007-04-13 11:39:30 +0000 |
commit | a068f3d69e70c2ac955a73beb7abb4ec15a0ac16 (patch) | |
tree | f0804d6e54f45b7e38ad916faf587d6633d1a119 | |
parent | s/apropriate/appropriate (diff) |
- Update google-earth to 4.0.2735.
- Break do-build in smaller and more sensible targets.
- Unmark FORBIDDEN.
PR: ports/108864
Submitted by: Eric P. Scott <eps+pbug0702@ana.com>
Notes
Notes:
svn path=/head/; revision=189898
-rw-r--r-- | astro/google-earth/Makefile | 20 | ||||
-rw-r--r-- | astro/google-earth/distinfo | 6 | ||||
-rw-r--r-- | astro/google-earth/pkg-plist | 33 |
3 files changed, 45 insertions, 14 deletions
diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile index 4ff00bd98df4..bddd8ad5dd9c 100644 --- a/astro/google-earth/Makefile +++ b/astro/google-earth/Makefile @@ -6,7 +6,7 @@ # PORTNAME= google-earth -PORTVERSION= 4.0.2414 +PORTVERSION= 4.0.2735 CATEGORIES= astro deskutils MASTER_SITES= http://dl.google.com/earth/GE${PORTVERSION:C/\..*//g}/ DISTFILES= ${TARGET_DISTFILE} @@ -15,14 +15,9 @@ EXTRACT_ONLY= # none MAINTAINER= flz@FreeBSD.org COMMENT= Explore, Search and Discover -BUILD_DEPENDS= unmakeself:${PORTSDIR}/archivers/unmakeself +EXTRACT_DEPENDS= unmakeself:${PORTSDIR}/archivers/unmakeself RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info -# Current version of Google Earth might not be vulnerable anymore. -# Use NO_IGNORE=yes and DISABLE_VULNERABILITIES=yes if you're using portaudit -# to bypass the security checks. -FORBIDDEN= Buffer-overflow vulnerability: http://vuxml.FreeBSD.org/5c9a2769-5ade-11db-a5ae-00508d6a62df.html - RESTRICTED= Not sure about redistribution rights WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/ @@ -52,17 +47,21 @@ do-fetch: ${FETCH_CMD} ${FETCH_BEFORE_ARGS} -1 ${MASTER_SITES:S|$|${REAL_DISTFILE}|g} ${FETCH_AFTER_ARGS}; \ fi -do-build: +do-extract: @${MKDIR} ${WRKSRC} @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} @cd ${WRKSRC} && ${UNMAKESELF} ${DISTFILES} && ${RM} -f ${DISTFILES} @cd ${WRKSRC} && ${TAR} xf googleearth-data.tar && ${RM} -f googleearth-data.tar @cd ${WRKSRC} && ${TAR} xf googleearth-linux-x86.tar && ${RM} -f googleearth-linux-x86.tar + +do-patch: @${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 @${REINPLACE_CMD} -i "" -e 's|\"\$$SETUP_INSTALLPATH/|\"${WRKSRC}/|' ${WRKSRC}/postinstall.sh @${REINPLACE_CMD} -i "" -e 's|\$$SETUP_INSTALLPATH/googleearth |${PREFIX}/bin/googleearth |' ${WRKSRC}/postinstall.sh + +do-build: @${SETENV} SETUP_INSTALLPATH=${DATADIR} ${WRKSRC}/postinstall.sh @cd ${WRKSRC} && ${RM} -rf setup.* preuninstall.sh postinstall.sh @${CHOWN} -R ${SHAREDOWN}:${SHAREDGRP} ${WRKSRC} @@ -71,9 +70,8 @@ do-install: ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/googleearth-mimetypes.xml ${PREFIX}/share/mime/packages/ ${INSTALL_DATA} ${WRKSRC}/googleearth.desktop ${PREFIX}/share/applications/ - ${CP} -r ${WRKSRC}/* ${DATADIR} - @${RM} -f ${DATADIR}/googleearth-mimetypes.xml - @${RM} -f ${DATADIR}/googleearth.desktop + ${CP} -rp ${WRKSRC}/* ${DATADIR} + ${RM} -f ${DATADIR}/googleearth-mimetypes.xml ${DATADIR}/googleearth.desktop ${LN} -sf ${DATADIR}/bin/googleearth ${PREFIX}/bin/ -@update-mime-database ${PREFIX}/share/mime -@update-desktop-database diff --git a/astro/google-earth/distinfo b/astro/google-earth/distinfo index abf3750d894f..ff5a4dc5981c 100644 --- a/astro/google-earth/distinfo +++ b/astro/google-earth/distinfo @@ -1,3 +1,3 @@ -MD5 (GoogleEarthLinux-4.0.2414.bin) = f666eca674b77104df9e701cbc0cc206 -SHA256 (GoogleEarthLinux-4.0.2414.bin) = 7b49f2dd3638e3c3f96505035330fd32cf1aef04c639f1c8f4faa11387098097 -SIZE (GoogleEarthLinux-4.0.2414.bin) = 21466938 +MD5 (GoogleEarthLinux-4.0.2735.bin) = 3a4051c185afc719bf807a4a693c44b0 +SHA256 (GoogleEarthLinux-4.0.2735.bin) = 96b1870f9a8c131bf94f726c22b3f547503c1af21e136e7e8a3d0198e4317f9d +SIZE (GoogleEarthLinux-4.0.2735.bin) = 21607408 diff --git a/astro/google-earth/pkg-plist b/astro/google-earth/pkg-plist index 83bd3d755d9f..af955a60ffff 100644 --- a/astro/google-earth/pkg-plist +++ b/astro/google-earth/pkg-plist @@ -214,6 +214,8 @@ bin/googleearth %%DATADIR%%/res/paddle/blu-square.png %%DATADIR%%/res/paddle/blu-stars-lv.png %%DATADIR%%/res/paddle/blu-stars.png +%%DATADIR%%/res/paddle/go-lv.png +%%DATADIR%%/res/paddle/go.png %%DATADIR%%/res/paddle/grn-blank-lv.png %%DATADIR%%/res/paddle/grn-blank.png %%DATADIR%%/res/paddle/grn-circle-lv.png @@ -224,6 +226,8 @@ bin/googleearth %%DATADIR%%/res/paddle/grn-square.png %%DATADIR%%/res/paddle/grn-stars-lv.png %%DATADIR%%/res/paddle/grn-stars.png +%%DATADIR%%/res/paddle/pause-lv.png +%%DATADIR%%/res/paddle/pause.png %%DATADIR%%/res/paddle/purple-circle-lv.png %%DATADIR%%/res/paddle/purple-circle.png %%DATADIR%%/res/paddle/purple-diamond-lv.png @@ -240,6 +244,9 @@ bin/googleearth %%DATADIR%%/res/paddle/red-square.png %%DATADIR%%/res/paddle/red-stars-lv.png %%DATADIR%%/res/paddle/red-stars.png +%%DATADIR%%/res/paddle/route.png +%%DATADIR%%/res/paddle/stop-lv.png +%%DATADIR%%/res/paddle/stop.png %%DATADIR%%/res/paddle/wht-blank-lv.png %%DATADIR%%/res/paddle/wht-blank.png %%DATADIR%%/res/paddle/wht-circle-lv.png @@ -1108,6 +1115,14 @@ bin/googleearth %%DATADIR%%/res/palette-3.png %%DATADIR%%/res/palette-4.png %%DATADIR%%/res/palette-5.png +%%DATADIR%%/res/progress0.png +%%DATADIR%%/res/progress1.png +%%DATADIR%%/res/progress2.png +%%DATADIR%%/res/progress3.png +%%DATADIR%%/res/progress4.png +%%DATADIR%%/res/progress5.png +%%DATADIR%%/res/progress6.png +%%DATADIR%%/res/progress7.png %%DATADIR%%/res/pushpin/blue-pushpin.png %%DATADIR%%/res/pushpin/grn-pushpin.png %%DATADIR%%/res/pushpin/ltblu-pushpin.png @@ -1414,6 +1429,7 @@ bin/googleearth %%DATADIR%%/resources/dc_benchmark_mask.png %%DATADIR%%/resources/de.locale/default_myplaces.kml %%DATADIR%%/resources/de.locale/license.txt +%%DATADIR%%/resources/de.locale/releasenotes.txt %%DATADIR%%/resources/decal.png %%DATADIR%%/resources/descrip_center.png %%DATADIR%%/resources/descrip_l.png @@ -1473,18 +1489,25 @@ bin/googleearth %%DATADIR%%/resources/email_on.png %%DATADIR%%/resources/en.locale/default_myplaces.kml %%DATADIR%%/resources/en.locale/license.txt +%%DATADIR%%/resources/en.locale/releasenotes.txt %%DATADIR%%/resources/en_AU.locale/default_myplaces.kml %%DATADIR%%/resources/en_AU.locale/license.txt +%%DATADIR%%/resources/en_AU.locale/releasenotes.txt %%DATADIR%%/resources/en_CA.locale/default_myplaces.kml %%DATADIR%%/resources/en_CA.locale/license.txt +%%DATADIR%%/resources/en_CA.locale/releasenotes.txt %%DATADIR%%/resources/en_GB.locale/default_myplaces.kml %%DATADIR%%/resources/en_GB.locale/license.txt +%%DATADIR%%/resources/en_GB.locale/releasenotes.txt %%DATADIR%%/resources/en_NZ.locale/default_myplaces.kml %%DATADIR%%/resources/en_NZ.locale/license.txt +%%DATADIR%%/resources/en_NZ.locale/releasenotes.txt %%DATADIR%%/resources/en_US.locale/default_myplaces.kml %%DATADIR%%/resources/en_US.locale/license.txt +%%DATADIR%%/resources/en_US.locale/releasenotes.txt %%DATADIR%%/resources/es.locale/default_myplaces.kml %%DATADIR%%/resources/es.locale/license.txt +%%DATADIR%%/resources/es.locale/releasenotes.txt %%DATADIR%%/resources/fast-food.png %%DATADIR%%/resources/flatarrow.png %%DATADIR%%/resources/fonts_mask.png @@ -1500,6 +1523,7 @@ bin/googleearth %%DATADIR%%/resources/fr-layers.png %%DATADIR%%/resources/fr.locale/default_myplaces.kml %%DATADIR%%/resources/fr.locale/license.txt +%%DATADIR%%/resources/fr.locale/releasenotes.txt %%DATADIR%%/resources/french-flag.png %%DATADIR%%/resources/full-picture.png %%DATADIR%%/resources/full-picture2.png @@ -1507,6 +1531,8 @@ bin/googleearth %%DATADIR%%/resources/geforce_cursor.png %%DATADIR%%/resources/geforce_cursor_32.png %%DATADIR%%/resources/gmail.png +%%DATADIR%%/resources/go-lv.png +%%DATADIR%%/resources/go.png %%DATADIR%%/resources/go_off.png %%DATADIR%%/resources/go_on.png %%DATADIR%%/resources/google_earth_splash.jpg @@ -1809,9 +1835,11 @@ bin/googleearth %%DATADIR%%/resources/invisible.png %%DATADIR%%/resources/it.locale/default_myplaces.kml %%DATADIR%%/resources/it.locale/license.txt +%%DATADIR%%/resources/it.locale/releasenotes.txt %%DATADIR%%/resources/italian-flag.png %%DATADIR%%/resources/ja.locale/default_myplaces.kml %%DATADIR%%/resources/ja.locale/license.txt +%%DATADIR%%/resources/ja.locale/releasenotes.txt %%DATADIR%%/resources/joystick-md.png %%DATADIR%%/resources/joystick-mo.png %%DATADIR%%/resources/joystick-norm.png @@ -1828,6 +1856,8 @@ bin/googleearth %%DATADIR%%/resources/joystickon_right.png %%DATADIR%%/resources/joystickon_rightdown.png %%DATADIR%%/resources/joystickon_up.png +%%DATADIR%%/resources/keyholelogo-sm.png +%%DATADIR%%/resources/keyholelogo.png %%DATADIR%%/resources/large_traffic_count_16.png %%DATADIR%%/resources/layers_16.png %%DATADIR%%/resources/left.png @@ -1958,6 +1988,7 @@ bin/googleearth %%DATADIR%%/resources/path-pl.png %%DATADIR%%/resources/path.png %%DATADIR%%/resources/pause-dis.png +%%DATADIR%%/resources/pause-lv.png %%DATADIR%%/resources/pause.png %%DATADIR%%/resources/pause_click.png %%DATADIR%%/resources/pause_glow.png @@ -2075,6 +2106,7 @@ bin/googleearth %%DATADIR%%/resources/rotright_glow_1.png %%DATADIR%%/resources/rotright_off.png %%DATADIR%%/resources/rotright_off_1.png +%%DATADIR%%/resources/route.png %%DATADIR%%/resources/ruler-gr.png %%DATADIR%%/resources/ruler-md.png %%DATADIR%%/resources/ruler-mo.png @@ -2135,6 +2167,7 @@ bin/googleearth %%DATADIR%%/resources/star.png %%DATADIR%%/resources/statue_of_liberty_mask.png %%DATADIR%%/resources/stop-dis.png +%%DATADIR%%/resources/stop-lv.png %%DATADIR%%/resources/stop.png %%DATADIR%%/resources/stop_click.png %%DATADIR%%/resources/stop_glow.png |