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

Collapse All | Expand All

(-)nvidia-driver/Makefile (-7 / +4 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	nvidia-driver
8
PORTNAME=	nvidia-driver
9
DISTVERSION?=	256.53
9
DISTVERSION?=	270.41.06
10
PORTREVISION?=	1			# As a reminder it can be overridden
10
PORTREVISION?=	0			# As a reminder it can be overridden
11
CATEGORIES=	x11 kld
11
CATEGORIES=	x11 kld
12
MASTER_SITES=	${MASTER_SITE_NVIDIA}
12
MASTER_SITES=	${MASTER_SITE_NVIDIA}
13
# MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
13
# MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
Lines 22-28 Link Here
22
LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
22
LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
23
23
24
ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
24
ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
25
NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
25
USE_XORG=	xorg-server
26
USE_GL=		gl
26
USE_GL=		gl
27
USE_LDCONFIG=	yes
27
USE_LDCONFIG=	yes
28
SUB_FILES=	pkg-message
28
SUB_FILES=	pkg-message
Lines 65-74 Link Here
65
XSERVVERSION!=	${PKG_INFO} -qO x11-servers/xorg-server 2>/dev/null || true
65
XSERVVERSION!=	${PKG_INFO} -qO x11-servers/xorg-server 2>/dev/null || true
66
LIBGLVERSION!=	${PKG_INFO} -qO graphics/libGL 2>/dev/null || true
66
LIBGLVERSION!=	${PKG_INFO} -qO graphics/libGL 2>/dev/null || true
67
67
68
.if empty(XSERVVERSION)
69
IGNORE=		needs an X server implementation installed
70
.endif
71
72
PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \
68
PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \
73
		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
69
		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
74
		MODULESDIR=${MODULESDIR}
70
		MODULESDIR=${MODULESDIR}
Lines 141-146 Link Here
141
pre-su-install:
137
pre-su-install:
142
# XXX This port silently assumes PREFIX == LOCALBASE XXX
138
# XXX This port silently assumes PREFIX == LOCALBASE XXX
143
	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
139
	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
140
	@${MKDIR} ${PREFIX}/${MODULESDIR}/extensions
144
141
145
post-install: .SILENT
142
post-install: .SILENT
146
# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
143
# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
(-)nvidia-driver/distinfo (-4 / +4 lines)
Lines 1-7 Link Here
1
SHA256 (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 3c3d3a96f6ec79b86815423c4be38c819b2ff26124a8885421e34f60a3c70655
1
SHA256 (NVIDIA-FreeBSD-x86-270.41.06.tar.gz) = c7dc6f7d1b26ccadbbaea1e1541f9edb3b6d8ab384b45334a9b9b95f54cb102a
2
SIZE (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 26347367
2
SIZE (NVIDIA-FreeBSD-x86-270.41.06.tar.gz) = 28472171
3
SHA256 (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 2b849ec63dca049a36ba3d2d97fdf8af06bd3d9c0051ebeec1e0cb60bec416a2
3
SHA256 (NVIDIA-FreeBSD-x86_64-270.41.06.tar.gz) = 9d06bbeb9ac5c905ffe6804ed5e086a76682145d36a75c59843a688e1067c79d
4
SIZE (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 26963917
4
SIZE (NVIDIA-FreeBSD-x86_64-270.41.06.tar.gz) = 29156364
5
SHA256 (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 3389c1b2faf68bab3ebd55593539580e418ef3beba29428ae2fe11a9a5154ebb
5
SHA256 (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 3389c1b2faf68bab3ebd55593539580e418ef3beba29428ae2fe11a9a5154ebb
6
SIZE (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 17555603
6
SIZE (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 17555603
7
SHA256 (NVIDIA-FreeBSD-x86-96.43.19.tar.gz) = b5dce181cc654a729ba06dd528a180d14a792b0328fcfbf86bb0f819285c0dd5
7
SHA256 (NVIDIA-FreeBSD-x86-96.43.19.tar.gz) = b5dce181cc654a729ba06dd528a180d14a792b0328fcfbf86bb0f819285c0dd5
(-)nvidia-driver/pkg-plist (-6 / +2 lines)
Lines 1-14 Link Here
1
@comment I can't add the below files to the package because pkg_delete
2
@comment will complain when removing this package:
3
@comment     %%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
4
@comment     %%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
5
@comment     lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
6
@comment They are however restored when this package is removed:
7
@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
1
@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
8
@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
2
@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
9
@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
3
@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
4
%%MODULESDIR%%/extensions/libglx.so
10
@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
5
@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
11
@exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
6
@exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
7
lib/libGL.so.1
12
@unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
8
@unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
13
lib/libnvidia-tls.so.1
9
lib/libnvidia-tls.so.1
14
lib/libnvidia-tls.so
10
lib/libnvidia-tls.so

Return to bug 152400