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

Collapse All | Expand All

(-)nvidia-driver/Makefile (-11 / +6 lines)
Lines 6-23 Link Here
6
#
6
#
7
7
8
PORTNAME=	nvidia-driver
8
PORTNAME=	nvidia-driver
9
DISTVERSION?=	256.53
9
DISTVERSION?=	270.18
10
PORTREVISION?=	0			# 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
ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
14
# 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
15
DISTNAME=	NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION}
14
DISTNAME=	NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION}
16
15
17
MAINTAINER=	danfe@FreeBSD.org
16
MAINTAINER=	danfe@FreeBSD.org
18
COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering
17
COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering
19
18
20
NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
19
ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
20
USE_XORG=	xorg-server
21
USE_GL=		gl
21
USE_GL=		gl
22
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
23
SUB_FILES=	pkg-message
23
SUB_FILES=	pkg-message
Lines 57-70 Link Here
57
57
58
.include <bsd.port.pre.mk>
58
.include <bsd.port.pre.mk>
59
59
60
# XXX Should use ${PKG_INFO} but it does not expand for some reason XXX
60
XSERVVERSION!=	${PKG_INFO} -qO x11-servers/xorg-server 2>/dev/null || true
61
#
61
LIBGLVERSION!=	${PKG_INFO} -qO graphics/libGL 2>/dev/null || true
62
XSERVVERSION!=	/usr/sbin/pkg_info -qO x11-servers/xorg-server 2>/dev/null || true
63
LIBGLVERSION!=	/usr/sbin/pkg_info -qO graphics/libGL 2>/dev/null || true
64
65
.if empty(XSERVVERSION)
66
IGNORE=		needs an X server implementation installed
67
.endif
68
62
69
PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \
63
PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \
70
		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
64
		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
Lines 138-143 Link Here
138
pre-su-install:
132
pre-su-install:
139
# XXX This port silently assumes PREFIX == LOCALBASE XXX
133
# XXX This port silently assumes PREFIX == LOCALBASE XXX
140
	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
134
	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
135
	@${MKDIR} ${PREFIX}/${MODULESDIR}/extensions
141
136
142
post-install: .SILENT
137
post-install: .SILENT
143
# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
138
# 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.18.tar.gz) = 416f4fb383e4f7f942642fcaa56abd4c9a86b8a92eb0386541cc4408d7a45659
2
SIZE (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 26347367
2
SIZE (NVIDIA-FreeBSD-x86-270.18.tar.gz) = 28184265
3
SHA256 (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 2b849ec63dca049a36ba3d2d97fdf8af06bd3d9c0051ebeec1e0cb60bec416a2
3
SHA256 (NVIDIA-FreeBSD-x86_64-270.18.tar.gz) = dcdaa1f1685ccea437d44ff7a8a2a312ed74510fe28deb739726e6a4ac3a7683
4
SIZE (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 26963917
4
SIZE (NVIDIA-FreeBSD-x86_64-270.18.tar.gz) = 28851861
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