Attachment 126543 Details for Bug 170289 – nvidia-unified.diff

[patch] nvidia-unified.diff

nvidia-unified.diff (text/plain), 4.31 KB, created by nemysis on 2012-12-29 18:33:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2012-12-29 18:33:43 UTC

Size: 4.31 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/x11/nvidia-driver/Makefile ./Makefile
>--- /usr/ports/x11/nvidia-driver/Makefile	2012-12-05 00:42:38.000000000 +0100
>+++ ./Makefile	2012-12-29 18:56:39.000000000 +0100
>@@ -8,7 +8,6 @@
> # slave ports.
> 
> PORTNAME=	nvidia-driver
>-DISTVERSION?=	304.64
> # Always try to set PORTREVISION as can be overridden by the slave ports
> PORTREVISION?=	0
> CATEGORIES=	x11 kld
>@@ -24,6 +23,8 @@
> LICENSE_FILE=	${WRKSRC}/doc/license.txt
> LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
> 
>+.include "${.CURDIR}/Makefile.common"
>+
> ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
> USE_XORG=	xorg-server
> USE_GL=		gl
>diff -ruN --exclude=CVS /usr/ports/x11/nvidia-driver/Makefile.common ./Makefile.common
>--- /usr/ports/x11/nvidia-driver/Makefile.common	1970-01-01 01:00:00.000000000 +0100
>+++ ./Makefile.common	2012-12-27 00:05:19.000000000 +0100
>@@ -0,0 +1 @@
>+DISTVERSION?=	310.19
>diff -ruN --exclude=CVS /usr/ports/x11/nvidia-driver/distinfo ./distinfo
>--- /usr/ports/x11/nvidia-driver/distinfo	2012-12-05 00:42:38.000000000 +0100
>+++ ./distinfo	2012-12-29 19:05:43.000000000 +0100
>@@ -1,7 +1,7 @@
>-SHA256 (NVIDIA-FreeBSD-x86_64-304.64.tar.gz) = 9887e4147fcb16141dcb6b153ff71a28c73cf2a4c16b60e4c6fcb8586a1c5400
>-SIZE (NVIDIA-FreeBSD-x86_64-304.64.tar.gz) = 34247065
>-SHA256 (NVIDIA-FreeBSD-x86-304.64.tar.gz) = e129d0d0e8d256d6328cddc4c18edb96c1e444c354f7c806ece4192621a1c1b5
>-SIZE (NVIDIA-FreeBSD-x86-304.64.tar.gz) = 33320263
>+SHA256 (NVIDIA-FreeBSD-x86_64-310.19.tar.gz) = 82607fdd14c666867b842205be3ec8b8095fb0c9da1cb2286b0bf85a769eb9ae
>+SIZE (NVIDIA-FreeBSD-x86_64-310.19.tar.gz) = 33184883
>+SHA256 (NVIDIA-FreeBSD-x86-310.19.tar.gz) = 29635a45e87fd240d472868dcd1ff9030f7eb85d78ffe85dea0f420be390d3e0
>+SIZE (NVIDIA-FreeBSD-x86-310.19.tar.gz) = 32264033
> SHA256 (NVIDIA-FreeBSD-x86-173.14.35.tar.gz) = 51e82a12db81b5af4ae5ee59612875c0dbef52cb641d61a44c72f2e1cd7f4c78
> SIZE (NVIDIA-FreeBSD-x86-173.14.35.tar.gz) = 18748428
> SHA256 (NVIDIA-FreeBSD-x86-96.43.23.tar.gz) = 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78
>===> Done
>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/x11/nvidia-settings/Makefile ./Makefile
>--- /usr/ports/x11/nvidia-settings/Makefile	2012-12-05 00:42:38.000000000 +0100
>+++ ./Makefile	2012-12-29 18:57:53.000000000 +0100
>@@ -6,7 +6,6 @@
> #
> 
> PORTNAME=	nvidia-settings
>-PORTVERSION=	310.14
> CATEGORIES=	x11
> MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
> 		ftp://download1.nvidia.com/XFree86/nvidia-settings/
>@@ -16,6 +15,8 @@
> 
> LICENSE=	GPLv2
> 
>+.include "${.CURDIR}/../nvidia-driver/Makefile.common"
>+
> USE_BZIP2=	yes
> USE_GNOME=	gtk20
> USE_GMAKE=	yes
>diff -ruN --exclude=CVS /usr/ports/x11/nvidia-settings/distinfo ./distinfo
>--- /usr/ports/x11/nvidia-settings/distinfo	2012-12-05 00:42:38.000000000 +0100
>+++ ./distinfo	2012-12-29 18:59:04.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (nvidia-settings-310.14.tar.bz2) = 3859513192e4ae921bdb71818ca329e6b9d5e11f1b72aa7f48e4fc7fd16d7626
>-SIZE (nvidia-settings-310.14.tar.bz2) = 1477588
>+SHA256 (nvidia-settings-310.19.tar.bz2) = 1af2cd902c2adf261a6951b1d729523e515f37e45f86785675404fc58ec1c03a
>+SIZE (nvidia-settings-310.19.tar.bz2) = 1482012
>===> Done
>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/x11/nvidia-xconfig/Makefile ./Makefile
>--- /usr/ports/x11/nvidia-xconfig/Makefile	2012-12-05 00:42:40.000000000 +0100
>+++ ./Makefile	2012-12-29 18:58:12.000000000 +0100
>@@ -6,7 +6,6 @@
> #
> 
> PORTNAME=	nvidia-xconfig
>-PORTVERSION=	310.14
> CATEGORIES=	x11
> MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-xconfig/ \
> 		ftp://download1.nvidia.com/XFree86/nvidia-xconfig/
>@@ -16,6 +15,8 @@
> 
> LICENSE=	GPLv2
> 
>+.include "${.CURDIR}/../nvidia-driver/Makefile.common"
>+
> USE_BZIP2=	yes
> USE_GMAKE=	yes
> 
>diff -ruN --exclude=CVS /usr/ports/x11/nvidia-xconfig/distinfo ./distinfo
>--- /usr/ports/x11/nvidia-xconfig/distinfo	2012-12-05 00:42:40.000000000 +0100
>+++ ./distinfo	2012-12-29 18:58:33.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (nvidia-xconfig-310.14.tar.bz2) = 34524033eac86a422bbf813a309f218368dd9f95265cf730ef425b1edd1fe364
>-SIZE (nvidia-xconfig-310.14.tar.bz2) = 101116
>+SHA256 (nvidia-xconfig-310.19.tar.bz2) = c9c417bbc14482876a7760fd143d95c7f42a2315a0f5cfa9053f448ccb74f1e9
>+SIZE (nvidia-xconfig-310.19.tar.bz2) = 101131
>===> Done

Actions: View | Diff

Attachments on bug 170289: 126542 | 126543 | 126544 | 126545 | 126546 | 126547 | 126548 | 126549