Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Jan 2014 19:06:45 +0000 (UTC)
From:      Juergen Lock <nox@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341259 - head/astro/google-earth
Message-ID:  <201401261906.s0QJ6j8d084931@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nox
Date: Sun Jan 26 19:06:44 2014
New Revision: 341259
URL: http://svnweb.freebsd.org/changeset/ports/341259
QAT: https://qat.redports.org/buildarchive/r341259/

Log:
  - Switch to USES= shared-mime-info desktop-file-utils.
  - Stagify.

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

Modified: head/astro/google-earth/Makefile
==============================================================================
--- head/astro/google-earth/Makefile	Sun Jan 26 18:52:05 2014	(r341258)
+++ head/astro/google-earth/Makefile	Sun Jan 26 19:06:44 2014	(r341259)
@@ -14,17 +14,14 @@ MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Explore, Search, and Discover
 
 EXTRACT_DEPENDS=	unmakeself:${PORTSDIR}/archivers/unmakeself
-RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
 RESTRICTED=	Not really sure about the redistribution terms
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/
 
-NO_STAGE=	yes
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
-USE_GNOME=	desktopfileutils
-USES=		perl5
+USES=		perl5 shared-mime-info desktop-file-utils
 USE_PERL5=	patch build
 
 .include <bsd.port.pre.mk>
@@ -67,14 +64,18 @@ pre-su-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/googleearth-mimetypes.xml ${PREFIX}/share/mime/packages/
-	${INSTALL_DATA} ${WRKSRC}/Google-googleearth.desktop ${PREFIX}/share/applications/googleearth.desktop
-	${CP} -rp ${WRKSRC}/* ${DATADIR}
-	${RM} -f ${DATADIR}/googleearth-mimetypes.xml ${DATADIR}/googleearth.desktop
-	${INSTALL_SCRIPT} ${FILESDIR}/browserwrapper ${DATADIR}/bin
-	${LN} -sf ${DATADIR}/bin/googleearth ${PREFIX}/bin/
-	-@update-mime-database ${PREFIX}/share/mime
-	-@update-desktop-database
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
+	${INSTALL_DATA} ${WRKSRC}/googleearth-mimetypes.xml \
+		${STAGEDIR}${PREFIX}/share/mime/packages/
+	${INSTALL_DATA} ${WRKSRC}/Google-googleearth.desktop \
+		${STAGEDIR}${PREFIX}/share/applications/googleearth.desktop
+	${CP} -rp ${WRKSRC}/* ${STAGEDIR}${DATADIR}
+	${RM} -f ${STAGEDIR}${DATADIR}/googleearth-mimetypes.xml \
+		${STAGEDIR}${DATADIR}/googleearth.desktop
+	${INSTALL_SCRIPT} ${FILESDIR}/browserwrapper \
+		${STAGEDIR}${DATADIR}/bin/
+	${LN} -sf ${DATADIR}/bin/googleearth \
+		${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.post.mk>

Modified: head/astro/google-earth/pkg-plist
==============================================================================
--- head/astro/google-earth/pkg-plist	Sun Jan 26 18:52:05 2014	(r341258)
+++ head/astro/google-earth/pkg-plist	Sun Jan 26 19:06:44 2014	(r341259)
@@ -561,10 +561,6 @@ bin/googleearth
 %%DATADIR%%/shaders/watersurface.ps_2_0
 %%DATADIR%%/shaders/watersurface.vs_2_0
 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%%/desktop_icons/consumer



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401261906.s0QJ6j8d084931>