ports/104825: astro/google-earth - supersede PR ports/104396

[Frank W. Josellis]

>Number:         104825
>Category:       ports
>Synopsis:       astro/google-earth - supersede PR ports/104396
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 26 09:50:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Frank W. Josellis
>Release:        FreeBSD 5.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD pollux.senax.net 5.5-STABLE FreeBSD 5.5-STABLE #10: Fri Sep 22 02:51:52 CEST 2006 root at pollux.senax.net:/usr/obj/usr/src/sys/POLLUX i386


	
>Description:
The fixed packing list from ports/104396 looks still incomplete to me; I'm
not sure if it's complete now. In addition, to avoid unnecessary downloads
in future I'd propose to make the fetching conditional, i.e., do not fetch 
${REAL_DISTFILE} in case that ${DISTDIR}/${TARGET_DISTFILE} exists.

>How-To-Repeat:
	
>Fix:

	

--- google-earth.patch begins here ---
diff -Nur google-earth.orig/Makefile google-earth/Makefile
--- google-earth.orig/Makefile	Sat Oct 21 20:59:21 2006
+++ google-earth/Makefile	Thu Oct 26 10:42:41 2006
@@ -19,7 +19,6 @@
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
 FORBIDDEN=	Buffer-overflow vulnerability: http://vuxml.FreeBSD.org/5c9a2769-5ade-11db-a5ae-00508d6a62df.html
-BROKEN=		Incomplete pkg-plist
 
 RESTRICTED=	Not sure about redistribution rights
 
@@ -49,8 +48,10 @@
 .endif
 
 do-fetch:
-	@cd ${DISTDIR}; \
-		${FETCH_CMD} ${FETCH_BEFORE_ARGS} -1 ${MASTER_SITES:S|$|${REAL_DISTFILE}|g} ${FETCH_AFTER_ARGS}
+	@if [ ! -f ${DISTDIR}/${TARGET_DISTFILE} ]; then \
+		cd ${DISTDIR}; \
+		${FETCH_CMD} ${FETCH_BEFORE_ARGS} -1 ${MASTER_SITES:S|$|${REAL_DISTFILE}|g} ${FETCH_AFTER_ARGS}; \
+	fi
 
 do-build:
 	@${MKDIR} ${WRKSRC}
diff -Nur google-earth.orig/pkg-plist google-earth/pkg-plist
--- google-earth.orig/pkg-plist	Thu Sep 21 20:37:13 2006
+++ google-earth/pkg-plist	Thu Oct 26 10:40:33 2006
@@ -1965,6 +1965,13 @@
 %%DATADIR%%/xml/navigate.module.xml
 %%DATADIR%%/xml/render.module.xml
 %%DATADIR%%/xml/web.module.xml
+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%%/res/pal2
 @dirrm %%DATADIR%%/res/pal3
--- google-earth.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: