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

Collapse All | Expand All

(-)Makefile (-3 / +15 lines)
Lines 1-7 Link Here
1
# Created by: Stijn Hoop <stijn@win.tue.nl>
1
# Created by: Stijn Hoop <stijn@win.tue.nl>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	nvidia-driver
4
PORTNAME?=	nvidia-driver
5
DISTVERSION?=	331.67
5
DISTVERSION?=	331.67
6
# Always try to set PORTREVISION as it can be overridden by the slave ports
6
# Always try to set PORTREVISION as it can be overridden by the slave ports
7
PORTREVISION?=	0
7
PORTREVISION?=	0
Lines 31-37 Link Here
31
# hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
31
# hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
32
# since it is still used by legacy drivers.
32
# since it is still used by legacy drivers.
33
MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
33
MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
34
.if ${OPTIMUS}
35
SUB_FILES=	pkg-message
36
.else
34
SUB_FILES=	pkg-deinstall pkg-install pkg-message
37
SUB_FILES=	pkg-deinstall pkg-install pkg-message
38
.endif
39
35
DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
40
DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
36
MODULESDIR=	lib/xorg/modules
41
MODULESDIR=	lib/xorg/modules
37
PORTDOCS=	*
42
PORTDOCS=	*
Lines 76-83 Link Here
76
EXTRA_PATCHES+=	${FILESDIR}/security-patch-CVE-2012-4225
81
EXTRA_PATCHES+=	${FILESDIR}/security-patch-CVE-2012-4225
77
.endif
82
.endif
78
83
79
OPTIONS_DEFINE=	ACPI_PM LINUX DOCS
84
OPTIONS_DEFINE?=	ACPI_PM LINUX DOCS
80
OPTIONS_DEFAULT=	LINUX
85
OPTIONS_DEFAULT?=	LINUX
81
86
82
ACPI_PM_DESC=		ACPI Power Management support
87
ACPI_PM_DESC=		ACPI Power Management support
83
LINUX_DESC=		Linux compatibility support
88
LINUX_DESC=		Linux compatibility support
Lines 231-240 Link Here
231
.endif
236
.endif
232
# Adjust installation paths of some conflicting files (shared also between
237
# Adjust installation paths of some conflicting files (shared also between
233
# libGL and xorg-server) to ease package manager work, esp. with pkgng
238
# libGL and xorg-server) to ease package manager work, esp. with pkgng
239
.if !${OPTIMUS}
234
	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
240
	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
235
		${WRKSRC}/x11/extension/Makefile
241
		${WRKSRC}/x11/extension/Makefile
236
	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
242
	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
237
		${WRKSRC}/lib/libGL/Makefile
243
		${WRKSRC}/lib/libGL/Makefile
244
.else
245
	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia_optimus:' \
246
		${WRKSRC}/x11/extension/Makefile
247
	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia_optimus:' \
248
		${WRKSRC}/lib/libGL/Makefile
249
.endif
238
# Do not execute afterinstall target (prevent automatic module registration
250
# Do not execute afterinstall target (prevent automatic module registration
239
# and "smart" installation of conflicting files heuristics)
251
# and "smart" installation of conflicting files heuristics)
240
	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile
252
	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile

Return to bug 192617