aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2009-01-11 18:45:31 +0000
committerJuergen Lock <nox@FreeBSD.org>2009-01-11 18:45:31 +0000
commit77a07dce0478656d2c65ba8bf93a9c1b5c918b8a (patch)
tree6f0ee025adab0421b9b8917ab8619703cb90f43e
parent588995ea2d575aeb62fb31e9aa6713d048ce7cd6 (diff)
downloadports-77a07dce0478656d2c65ba8bf93a9c1b5c918b8a.tar.gz
ports-77a07dce0478656d2c65ba8bf93a9c1b5c918b8a.zip
Notes
-rw-r--r--astro/google-earth/Makefile18
-rw-r--r--astro/google-earth/distinfo6
2 files changed, 7 insertions, 17 deletions
diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index 567de8756c8b..e6e13e33c02e 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -10,7 +10,9 @@ PORTVERSION= 4.3.7284.3916
PORTREVISION= 2
CATEGORIES= astro deskutils geography
MASTER_SITES= http://dl.google.com/earth/client/current/
-DISTFILES= ${TARGET_DISTFILE}
+DISTNAME= GoogleEarthLinux
+EXTRACT_SUFX= .bin
+DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
EXTRACT_ONLY= # none
MAINTAINER= nox@FreeBSD.org
@@ -28,12 +30,6 @@ USE_LINUX= yes
USE_GNOME= desktopfileutils
USE_XLIB= yes
-REAL_DISTFILE= GoogleEarthLinux.bin
-TARGET_DISTFILE= GoogleEarthLinux-${PORTVERSION}.bin
-
-FETCH_CMD= /usr/bin/fetch -ARm
-FETCH_BEFORE_ARGS= -o ${TARGET_DISTFILE}
-
.include <bsd.port.pre.mk>
UNMAKESELF= ${LOCALBASE}/bin/unmakeself
@@ -44,15 +40,9 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
.endif
-do-fetch:
- @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-extract:
@${MKDIR} ${WRKSRC}
- @${CP} ${DISTDIR}/${DISTFILES} ${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
diff --git a/astro/google-earth/distinfo b/astro/google-earth/distinfo
index 1d4b562f07be..1475af2eff13 100644
--- a/astro/google-earth/distinfo
+++ b/astro/google-earth/distinfo
@@ -1,3 +1,3 @@
-MD5 (GoogleEarthLinux-4.3.7284.3916.bin) = 8e9eb1acc7ee4c80542756386de1bf78
-SHA256 (GoogleEarthLinux-4.3.7284.3916.bin) = aeb71c8e191df4b3689ef45e6b2346b4b7c3910738f92deadb265a044e68277e
-SIZE (GoogleEarthLinux-4.3.7284.3916.bin) = 20554977
+MD5 (google-earth/4.3.7284.3916/GoogleEarthLinux.bin) = 8e9eb1acc7ee4c80542756386de1bf78
+SHA256 (google-earth/4.3.7284.3916/GoogleEarthLinux.bin) = aeb71c8e191df4b3689ef45e6b2346b4b7c3910738f92deadb265a044e68277e
+SIZE (google-earth/4.3.7284.3916/GoogleEarthLinux.bin) = 20554977