svn commit: r341788 - head/astro/google-earth

[Juergen Lock]

Author: nox
Date: Wed Jan 29 22:39:37 2014
New Revision: 341788
URL: http://svnweb.freebsd.org/changeset/ports/341788
QAT: https://qat.redports.org/buildarchive/r341788/

Log:
  - Switch to USE_LINUX_APPS= curl instead of shipped libcurl, this
    seems to fix the search box.
  - Bump PORTREVISION.

Modified:
  head/astro/google-earth/Makefile
  head/astro/google-earth/pkg-plist

Modified: head/astro/google-earth/Makefile
==============================================================================
--- head/astro/google-earth/Makefile	Wed Jan 29 22:03:24 2014	(r341787)
+++ head/astro/google-earth/Makefile	Wed Jan 29 22:39:37 2014	(r341788)
@@ -2,6 +2,7 @@
 
 PORTNAME=	google-earth
 PORTVERSION=	6.0.3.2197
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	astro deskutils geography
 MASTER_SITES=	http://dl.google.com/earth/client/advanced/previous/:previous \
@@ -20,7 +21,7 @@ RESTRICTED=	Not really sure about the re
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/
 
 USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX_APPS=	xorglibs curl
 USES=		perl5 shared-mime-info desktop-file-utils
 USE_PERL5=	patch build
 
@@ -53,6 +54,7 @@ post-patch:
 	@${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
+	${RM} ${WRKSRC}/libcurl.so.4
 	${PERL} -i -pe 's|/lib/ld-lsb.so.3\0\0\0|/lib/ld-linux.so.2\0|' ${WRKSRC}/googleearth-bin
 
 do-build:

Modified: head/astro/google-earth/pkg-plist
==============================================================================
--- head/astro/google-earth/pkg-plist	Wed Jan 29 22:03:24 2014	(r341787)
+++ head/astro/google-earth/pkg-plist	Wed Jan 29 22:39:37 2014	(r341788)
@@ -106,7 +106,6 @@ bin/googleearth
 %%DATADIR%%/libcommon_platform.so
 %%DATADIR%%/libcommon_webbrowser.so
 %%DATADIR%%/libcomponentframework.so
-%%DATADIR%%/libcurl.so.4
 %%DATADIR%%/libevll.so
 %%DATADIR%%/libflightsim.so
 %%DATADIR%%/libfusioncommon.so