View | Details | Raw Unified | Return to bug 201693 | Differences between
and this patch

Collapse All | Expand All

(-)google-earth/Makefile (-3 / +15 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	google-earth
3
PORTNAME=	google-earth
4
PORTVERSION=	6.0.3.2197
4
PORTVERSION=	6.0.3.2197
5
PORTREVISION=	2
5
PORTREVISION=	3
6
PORTEPOCH=	3
6
PORTEPOCH=	3
7
CATEGORIES=	astro deskutils geography
7
CATEGORIES=	astro deskutils geography
8
MASTER_SITES=	http://dl.google.com/earth/client/advanced/previous/:previous \
8
MASTER_SITES=	http://dl.google.com/earth/client/advanced/previous/:previous \
Lines 20-26 Link Here
20
20
21
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/
21
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/
22
22
23
OPTIONS_DEFINE=	NVIDIA
23
OPTIONS_DEFAULT=LINUX_DRI
24
OPTIONS_SINGLE=LIBGL
25
OPTIONS_SINGLE_LIBGL=	LINUX_DRI NVIDIA_GL NVIDIA_GL_340 NVIDIA_GL_304 NVIDIA_GL_173
26
LINUX_DRI_DESC=	libGL support via linux dri libraries 
27
NVIDIA_GL_340_DESC=	libGL support via nvidia-driver-340
28
NVIDIA_GL_304_DESC=	libGL support via nvidia-driver-304
29
NVIDIA_GL_173_DESC=	libGL support via nvidia-driver-173
24
30
25
USE_LINUX=	yes
31
USE_LINUX=	yes
26
USE_LINUX_APPS=	xorglibs curl
32
USE_LINUX_APPS=	xorglibs curl
Lines 33-40 Link Here
33
39
34
UNMAKESELF=	${LOCALBASE}/bin/unmakeself
40
UNMAKESELF=	${LOCALBASE}/bin/unmakeself
35
41
36
.if ${PORT_OPTIONS:MNVIDIA}
42
.if ${PORT_OPTIONS:MNVIDIA_GL}
37
RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
43
RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
44
.elif ${PORT_OPTIONS:MNVIDIA_GL_340}
45
RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver-340
46
.elif ${PORT_OPTIONS:MNVIDIA_GL_304}
47
RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver-304
48
.elif ${PORT_OPTIONS:MNVIDIA_GL_173}
49
RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver-173
38
.else
50
.else
39
USE_LINUX_APPS+=	dri libpciaccess
51
USE_LINUX_APPS+=	dri libpciaccess
40
LIBGL_ALWAYS_SOFTWARE=LIBGL_ALWAYS_SOFTWARE=yes
52
LIBGL_ALWAYS_SOFTWARE=LIBGL_ALWAYS_SOFTWARE=yes

Return to bug 201693