1 files changed, 20 insertions, 29 deletions

diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index 005f58cb3048..01ecd3be9944 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -6,24 +6,30 @@
 #
 
 PORTNAME=	google-earth
-PORTVERSION=	6.0.3.2197
+PORTVERSION=	6.1.0.5001
 PORTEPOCH=	1
 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:current
+DISTFILES=	google-earth-stable_current_i386.rpm:current
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
-EXTRACT_ONLY=	# none
 
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Explore, Search and Discover
 
-EXTRACT_DEPENDS=	unmakeself:${PORTSDIR}/archivers/unmakeself
+EXTRACT_DEPENDS+=	${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
+RPM2CPIO?=	${LOCALBASE}/bin/rpm2cpio
+EXTRACT_CMD?=	${RPM2CPIO}
+EXTRACT_BEFORE_ARGS?=
+EXTRACT_AFTER_ARGS?=	| ${CPIO} -id --quiet
+
 RESTRICTED=	Not sure about redistribution rights
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/
+WRKSRC=		${WRKDIR}
+SUB_FILES=	Google-googleearth.desktop
+NO_BUILD=	yes
 
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
@@ -32,8 +38,6 @@ USE_PERL5_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-UNMAKESELF=	${LOCALBASE}/bin/unmakeself
-
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
@@ -52,37 +56,24 @@ IGNORE=	needs non-default linux ports (define OVERRIDE_LINUX_BASE_PORT=f10 and O
 BROKEN=	seems to crash on >= 9.x/amd64: http://www.freebsd.org/cgi/query-pr.cgi?pr=160422
 .endif
 
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${_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
-
 post-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
-	${PERL} -i -pe 's|/lib/ld-lsb.so.3\0\0\0|/lib/ld-linux.so.2\0|' ${WRKSRC}/googleearth-bin
-
-do-build:
-	@${SETENV} SETUP_INSTALLPATH=${DATADIR} ${WRKSRC}/postinstall.sh
-	@cd ${WRKSRC} && ${RM} -rf setup.* preuninstall.sh postinstall.sh \
-		bin/googleearth.orig
+	@${REINPLACE_CMD} -i "" -e 's|^# Set the home.*|GOOGLEEARTH_DATA_PATH=${DATADIR}|' ${WRKSRC}/opt/google/earth/free/googleearth
+	@${REINPLACE_CMD} -i "" -e "s|^# Let's boogie.*|rm -f \$${HOME}/.googleearth/instance-running-lock|" ${WRKSRC}/opt/google/earth/free/googleearth
+	@${RM} ${WRKSRC}/opt/google/earth/free/googleearth.orig
+	@${RM} ${WRKSRC}/opt/google/earth/free/google-earth
+	${PERL} -i -pe 's|/lib/ld-lsb.so.3\0\0\0|/lib/ld-linux.so.2\0|' ${WRKSRC}/opt/google/earth/free/googleearth-bin
 
 pre-su-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/googleearth-mimetypes.xml ${PREFIX}/share/mime/packages/
+	${INSTALL_DATA} ${FILESDIR}/googleearth-mimetypes.xml ${PREFIX}/share/mime/packages/
 	${INSTALL_DATA} ${WRKSRC}/Google-googleearth.desktop ${PREFIX}/share/applications/googleearth.desktop
-	${CP} -rp ${WRKSRC}/* ${DATADIR}
+	${CP} -rp ${WRKSRC}/opt/google/earth/free/* ${DATADIR}
 	${RM} -f ${DATADIR}/googleearth-mimetypes.xml ${DATADIR}/googleearth.desktop
-	${INSTALL_SCRIPT} ${FILESDIR}/browserwrapper ${DATADIR}/bin
-	${LN} -sf ${DATADIR}/bin/googleearth ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${FILESDIR}/browserwrapper ${DATADIR}
+	${LN} -sf ${DATADIR}/googleearth ${PREFIX}/bin/
 	-@update-mime-database ${PREFIX}/share/mime
 	-@update-desktop-database