From owner-svn-ports-head@FreeBSD.ORG Wed Jan 29 22:39:38 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E10EF9A; Wed, 29 Jan 2014 22:39:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 100841E0A; Wed, 29 Jan 2014 22:39:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0TMdbwG083017; Wed, 29 Jan 2014 22:39:37 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0TMdbhr083014; Wed, 29 Jan 2014 22:39:37 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201401292239.s0TMdbhr083014@svn.freebsd.org> From: Juergen Lock Date: Wed, 29 Jan 2014 22:39:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341788 - head/astro/google-earth X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2014 22:39:38 -0000 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