Attachment #111176 for bug #152400




#

PORTNAME=	nvidia-driver
DISTVERSION?=	260.19.29
PORTREVISION?=	0			# As a reminder it can be overridden
CATEGORIES=	x11 kld
MASTER_SITES=	${MASTER_SITE_NVIDIA}
ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
# MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
DISTNAME=	NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION}

MAINTAINER=	danfe@FreeBSD.org
COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering

ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
USE_XORG=	xorg-server
USE_GL=		gl
USE_LDCONFIG=	yes
SUB_FILES=	pkg-message


.include <bsd.port.pre.mk>

XSERVVERSION!=	${PKG_INFO} -qO x11-servers/xorg-server 2>/dev/null || true
LIBGLVERSION!=	${PKG_INFO} -qO graphics/libGL 2>/dev/null || true
XSERVVERSION!=	/usr/sbin/pkg_info -qO x11-servers/xorg-server 2>/dev/null || true
LIBGLVERSION!=	/usr/sbin/pkg_info -qO graphics/libGL 2>/dev/null || true

.if empty(XSERVVERSION)
IGNORE=		needs an X server implementation installed
.endif

PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \
		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \

pre-su-install:
# XXX This port silently assumes PREFIX == LOCALBASE XXX
	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
	@${MKDIR} ${PREFIX}/${MODULESDIR}/extensions

post-install: .SILENT
# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's

Lines 1-7 Link Here

(-)nvidia-driver/distinfo (-4 / +4 lines)
1	SHA256 (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 3c3d3a96f6ec79b86815423c4be38c819b2ff26124a8885421e34f60a3c70655	1	SHA256 (NVIDIA-FreeBSD-x86-260.19.29.tar.gz) = f7b3a450b2de30927207a0a6603b1baf0c778093ea98641921b55df660f149af
2	SIZE (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 26347367	2	SIZE (NVIDIA-FreeBSD-x86-260.19.29.tar.gz) = 27276949
3	SHA256 (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 2b849ec63dca049a36ba3d2d97fdf8af06bd3d9c0051ebeec1e0cb60bec416a2	3	SHA256 (NVIDIA-FreeBSD-x86_64-260.19.29.tar.gz) = 1ce7cbf053cbd60f4ece9c6ad8ae6d007b2c040c3d212fe5504f496f5faf9063
4	SIZE (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 26963917	4	SIZE (NVIDIA-FreeBSD-x86_64-260.19.29.tar.gz) = 27947491
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




@comment I can't add the below files to the package because pkg_delete
@comment will complain when removing this package:
@comment     %%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
@comment     %%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
@comment     lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
@comment They are however restored when this package is removed:
@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
%%MODULESDIR%%/extensions/libglx.so
@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
@exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
lib/libGL.so.1
@unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
lib/libnvidia-tls.so.1
lib/libnvidia-tls.so

Lines 6-12 Link Here

(-)nvidia-settings/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= nvidia-settings	8	PORTNAME= nvidia-settings
9	PORTVERSION= 256.53	9	PORTVERSION= 260.19.29
10	CATEGORIES= x11	10	CATEGORIES= x11
11	MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \	11	MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \
12	ftp://download1.nvidia.com/XFree86/nvidia-settings/	12	ftp://download1.nvidia.com/XFree86/nvidia-settings/

Lines 1-3 Link Here

(-)nvidia-settings/distinfo (-3 / +2 lines)
1	MD5 (nvidia-settings-256.53.tar.bz2) = 6bcc65485ec194791228a7df0ab62750	1	SHA256 (nvidia-settings-260.19.29.tar.bz2) = 60dc2e2693ac1950301f3a3f837e5ca6470087b1509efa54c26b6bd5544974f5
2	SHA256 (nvidia-settings-256.53.tar.bz2) = d2a7310c11c0fa83bf6c565ebf7bd6a2054b67edd0d34bb6caa2129579981f49	2	SIZE (nvidia-settings-260.19.29.tar.bz2) = 1536011
3	SIZE (nvidia-settings-256.53.tar.bz2) = 1458846

Lines 1-6 Link Here

(-)nvidia-settings/files/patch-Makefile (-3 / +3 lines)
1	--- Makefile.orig	1	--- Makefile.orig 2010-11-05 10:46:56.000000000 +0600
2	+++ Makefile	2	+++ Makefile 2010-11-19 14:24:16.000000000 +0600
3	@@ -149,11 +149,14 @@ install: NVIDIA_SETTINGS_install MANPAGE	3	@@ -155,11 +155,14 @@
4		4
5	NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS)	5	NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS)
6	$(MKDIR) $(bindir)	6	$(MKDIR) $(bindir)

Lines 6-12 Link Here

(-)nvidia-xconfig/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= nvidia-xconfig	8	PORTNAME= nvidia-xconfig
9	PORTVERSION= 256.53	9	PORTVERSION= 260.19.29
10	CATEGORIES= x11	10	CATEGORIES= x11
11	MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-xconfig/ \	11	MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-xconfig/ \
12	ftp://download1.nvidia.com/XFree86/nvidia-xconfig/	12	ftp://download1.nvidia.com/XFree86/nvidia-xconfig/

Lines 1-3 Link Here

(-)nvidia-xconfig/distinfo (-3 / +2 lines)
1	MD5 (nvidia-xconfig-256.53.tar.bz2) = 244c346026d0b562e9fa4ae6fcd40104	1	SHA256 (nvidia-xconfig-260.19.29.tar.bz2) = 66c30eaf75bb53b18c931e0ecceda704a9358afc16a98fae83652b03723fc781
2	SHA256 (nvidia-xconfig-256.53.tar.bz2) = e8f8ab26cbd2fc90ef1745fb6d9463be3332442e468c8cf89dd1505b69329777	2	SIZE (nvidia-xconfig-260.19.29.tar.bz2) = 97853
3	SIZE (nvidia-xconfig-256.53.tar.bz2) = 96488

Lines 1-6 Link Here

(-)nvidia-xconfig/files/patch-Makefile (-3 / +3 lines)
1	--- Makefile.orig 2010-10-13 22:56:07.000000000 +0900	1	--- Makefile.orig 2010-11-05 10:47:04.000000000 +0600
2	+++ Makefile 2010-10-13 22:58:01.000000000 +0900	2	+++ Makefile 2010-11-19 14:29:06.000000000 +0600
3	@@ -95,11 +95,11 @@	3	@@ -115,11 +115,11 @@
4		4
5	NVIDIA_XCONFIG_install: $(NVIDIA_XCONFIG)	5	NVIDIA_XCONFIG_install: $(NVIDIA_XCONFIG)
6	$(MKDIR) $(bindir)	6	$(MKDIR) $(bindir)

Return to bug 152400

Lines 6-23 Link Here

(-)nvidia-driver/Makefile (-11 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= nvidia-driver	8	PORTNAME= nvidia-driver
9	DISTVERSION?= 256.53	9	DISTVERSION?= 260.19.29
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

Lines 1-14 Link Here

(-)nvidia-driver/pkg-plist (-6 / +2 lines)
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