From nobody@FreeBSD.org  Tue Jul 31 01:21:39 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 51B2B106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Jul 2012 01:21:39 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 2230F8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Jul 2012 01:21:39 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q6V1Lcif054896
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Jul 2012 01:21:38 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q6V1LcT7054895;
	Tue, 31 Jul 2012 01:21:38 GMT
	(envelope-from nobody)
Message-Id: <201207310121.q6V1LcT7054895@red.freebsd.org>
Date: Tue, 31 Jul 2012 01:21:38 GMT
From: "4721@hushmail.com" <4721@hushmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] use one version for x11/nvidia-driver x11/nvidia-xconfig x11/nvidia-settings
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: r4721@tormail.org

>Number:         170289
>Category:       ports
>Synopsis:       [patch] use one version for x11/nvidia-driver x11/nvidia-xconfig x11/nvidia-settings
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danfe
>State:          analyzed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 31 01:30:04 UTC 2012
>Closed-Date:    
>Last-Modified:  Thu Jun 27 11:10:00 UTC 2013
>Originator:     4721@hushmail.com
>Release:        
>Organization:
>Environment:
>Description:
patch puts version in one file, instead of 3 duplicate versions in 3 files.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: x11/nvidia-driver/Makefile.common
===================================================================
--- x11/nvidia-driver/Makefile.common	(revision 0)
+++ x11/nvidia-driver/Makefile.common	(working copy)
@@ -0,0 +1 @@
+DISTVERSION?=	295.59
Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile	(revision 301689)
+++ x11/nvidia-driver/Makefile	(working copy)
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	295.59
 PORTREVISION?=	0			# As a reminder it can be overridden
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
@@ -21,6 +20,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
Index: x11/nvidia-settings/Makefile
===================================================================
--- x11/nvidia-settings/Makefile	(revision 301689)
+++ x11/nvidia-settings/Makefile	(working copy)
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	nvidia-settings
-PORTVERSION=	295.59
 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
Index: x11/nvidia-xconfig/Makefile
===================================================================
--- x11/nvidia-xconfig/Makefile	(revision 301689)
+++ x11/nvidia-xconfig/Makefile	(working copy)
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	nvidia-xconfig
-PORTVERSION=	295.59
 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
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->danfe 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jul 31 01:30:16 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170289 
State-Changed-From-To: open->analyzed 
State-Changed-By: danfe 
State-Changed-When: Mon Sep 10 02:36:14 UTC 2012 
State-Changed-Why:  
While I understand what are you trying to achieve here, it is not completely 
clear if this change is indeed safe and convenient for everyone to be added. 
It needs more investigation. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170289 

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170289: [patch] use one version for x11/nvidia-driver
 x11/nvidia-xconfig x11/nvidia-settings
Date: Thu, 27 Dec 2012 01:21:51 +0100

 I need the same Version for
 
 nvidia-driver
 nvidia-settings
 nvidia-xconfig
 
 and this with 
 
 nvidia-driver/Makefile.common
 
 is very good, this is used too for QT Ports.

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170289: [patch] use one version for x11/nvidia-driver
 x11/nvidia-xconfig x11/nvidia-settings
Date: Sat, 29 Dec 2012 19:33:43 +0100

 --MP_/v29y_eCCAZ8VMox7Ej_yMZo
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Here are diff for version 310.19, which works here great
 
 nvidia-driver
 nvidia-settings
 nvidia-xconfig
 
 
 portlint -A
 looks usual.
 
 port test: clean
 --MP_/v29y_eCCAZ8VMox7Ej_yMZo
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=nvidia-unified.diff
 
 ===> 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
 
 --MP_/v29y_eCCAZ8VMox7Ej_yMZo--

From: r4721@tormail.org
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/170289: [patch] use one version for x11/nvidia-driver
 x11/nvidia-xconfig x11/nvidia-settings
Date: Sun, 20 Jan 2013 16:55:21 -0000

 ------=_20130120165521_93238
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Transfer-Encoding: 8bit
 
 updated patch:
 * handle removal of XvMC after 304.64
 * fix the Makefile.common usage for the older x11/nvidia-driver-* ports
 * create new port x11/nvidia-driver-304 for legacy driver
 * update x11/nvidia-driver x11/nvidia-xconfig x11/nvidia-settings to 310.19
 * use unified version to avoid the different ports getting out of sync
 ------=_20130120165521_93238
 Content-Type: text/plain; name="nvidia.txt"
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment; filename="nvidia.txt"
 
 Index: x11/Makefile
 ===================================================================
 --- x11/Makefile	(revision 310622)
 +++ x11/Makefile	(working copy)
 @@ -208,6 +208,7 @@
      SUBDIR += numlockx
      SUBDIR += nvidia-driver
      SUBDIR += nvidia-driver-173
 +    SUBDIR += nvidia-driver-304
      SUBDIR += nvidia-driver-71
      SUBDIR += nvidia-driver-96
      SUBDIR += nvidia-settings
 Index: x11/nvidia-driver/Makefile
 ===================================================================
 --- x11/nvidia-driver/Makefile	(revision 310622)
 +++ x11/nvidia-driver/Makefile	(working copy)
 @@ -4,11 +4,10 @@
  # Starting with version 1.0-7667, NVidia has dropped support for numerous
  # "legacy" GPUs.  Consult NVidia README (the Appendix) to find out whether
  # you need to use legacy driver version and install one of corresponding
 -# `x11/nvidia-driver-71', `x11/nvidia-driver-96', or `x11/nvidia-driver-173'
 -# slave ports.
 +# `x11/nvidia-driver-71', `x11/nvidia-driver-96', `x11/nvidia-driver-173',
 +# or `x11/nvidia-driver-304' 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}/../nvidia-driver/Makefile.common"
 +
  ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
  USE_XORG=	xorg-server
  USE_GL=		gl
 @@ -190,8 +191,13 @@
  	${REINPLACE_CMD} -E 's/libGLcore/libnvidia-glcore/ ; \
  		/usr.*(glcore|tls).*so\.1$$/d' ${TMPPLIST}
  .endif
 -# Some applications need this symlink (see PR ports/72877)
 +.if ${NVVERSION} > 3046400
 +	${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST}
 +.endif
 +.if ${NVVERSION} <= 3046400
 +	# Some applications need this symlink (see PR ports/72877)
  	${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 +.endif
  .if ${NVVERSION} >= 1952200
  . if ${OSVERSION} > 800090
  	${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE}
 Index: x11/nvidia-driver/Makefile.common
 ===================================================================
 --- x11/nvidia-driver/Makefile.common	(revision 0)
 +++ x11/nvidia-driver/Makefile.common	(working copy)
 @@ -0,0 +1 @@
 +DISTVERSION?=	310.19
 Index: x11/nvidia-driver/distinfo
 ===================================================================
 --- x11/nvidia-driver/distinfo	(revision 310622)
 +++ x11/nvidia-driver/distinfo	(working copy)
 @@ -1,3 +1,7 @@
 +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_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
 Index: x11/nvidia-driver-304/Makefile
 ===================================================================
 --- x11/nvidia-driver-304/Makefile	(revision 0)
 +++ x11/nvidia-driver-304/Makefile	(working copy)
 @@ -0,0 +1,10 @@
 +# $FreeBSD$
 +
 +DISTVERSION=	304.64
 +# Explicitly set PORTREVISION as it can be overridden by the master port
 +PORTREVISION=	1
 +
 +MASTERDIR=	${.CURDIR}/../nvidia-driver
 +NO_LATEST_LINK=	yes
 +
 +.include "${MASTERDIR}/Makefile"
 Index: x11/nvidia-settings/Makefile
 ===================================================================
 --- x11/nvidia-settings/Makefile	(revision 310622)
 +++ x11/nvidia-settings/Makefile	(working copy)
 @@ -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
 Index: x11/nvidia-settings/distinfo
 ===================================================================
 --- x11/nvidia-settings/distinfo	(revision 310622)
 +++ x11/nvidia-settings/distinfo	(working copy)
 @@ -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
 Index: x11/nvidia-xconfig/Makefile
 ===================================================================
 --- x11/nvidia-xconfig/Makefile	(revision 310622)
 +++ x11/nvidia-xconfig/Makefile	(working copy)
 @@ -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
  
 Index: x11/nvidia-xconfig/distinfo
 ===================================================================
 --- x11/nvidia-xconfig/distinfo	(revision 310622)
 +++ x11/nvidia-xconfig/distinfo	(working copy)
 @@ -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
 ------=_20130120165521_93238--
 
 

From: r4721@tormail.org
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/170289: [patch] use one version for x11/nvidia-driver
 x11/nvidia-xconfig x11/nvidia-settings
Date: Thu, 14 Mar 2013 18:38:54 -0000

 ------=_20130314183854_23382
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Transfer-Encoding: 8bit
 
 updated patch for 310.40.
 ------=_20130314183854_23382
 Content-Type: text/plain; name="nvidia.txt"
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment; filename="nvidia.txt"
 
 Index: x11/nvidia-driver/Makefile
 ===================================================================
 --- x11/nvidia-driver/Makefile	(revision 314128)
 +++ x11/nvidia-driver/Makefile	(working copy)
 @@ -11,7 +11,6 @@
  # or `x11/nvidia-driver-304' slave ports.
  
  PORTNAME=	nvidia-driver
 -DISTVERSION?=	310.32
  # Always try to set PORTREVISION as can be overridden by the slave ports
  PORTREVISION?=	0
  CATEGORIES=	x11 kld
 @@ -27,6 +26,8 @@
  LICENSE_FILE=	${WRKSRC}/doc/license.txt
  LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
  
 +.include "${.CURDIR}/../nvidia-driver/Makefile.common"
 +
  ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
  USE_XORG=	xorg-server
  USE_GL=		gl
 Index: x11/nvidia-driver/Makefile.common
 ===================================================================
 --- x11/nvidia-driver/Makefile.common	(revision 0)
 +++ x11/nvidia-driver/Makefile.common	(working copy)
 @@ -0,0 +1 @@
 +DISTVERSION?=	310.40
 Index: x11/nvidia-driver/distinfo
 ===================================================================
 --- x11/nvidia-driver/distinfo	(revision 314128)
 +++ x11/nvidia-driver/distinfo	(working copy)
 @@ -1,7 +1,7 @@
 -SHA256 (NVIDIA-FreeBSD-x86_64-310.32.tar.gz) = f0935abf74a1298471a5eb0ede56ab913e358b76935557d618915a97efda9224
 -SIZE (NVIDIA-FreeBSD-x86_64-310.32.tar.gz) = 33511666
 -SHA256 (NVIDIA-FreeBSD-x86-310.32.tar.gz) = 3f00f5a13dc04f51b2a1b000ad53741ac6b81bd6e70258e7b9f200daf8f52b2d
 -SIZE (NVIDIA-FreeBSD-x86-310.32.tar.gz) = 32541283
 +SHA256 (NVIDIA-FreeBSD-x86_64-310.40.tar.gz) = f010d62498864fb61367577d0f19e186d6f7867281a451db21b89e15d812c74a
 +SIZE (NVIDIA-FreeBSD-x86_64-310.40.tar.gz) = 33553148
 +SHA256 (NVIDIA-FreeBSD-x86-310.40.tar.gz) = 0b591930dff9d4c8fd45859b510247be078957b2efac3bd743b0c215d7595884
 +SIZE (NVIDIA-FreeBSD-x86-310.40.tar.gz) = 32582005
  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
 Index: x11/nvidia-settings/Makefile
 ===================================================================
 --- x11/nvidia-settings/Makefile	(revision 314128)
 +++ x11/nvidia-settings/Makefile	(working copy)
 @@ -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
 Index: x11/nvidia-settings/distinfo
 ===================================================================
 --- x11/nvidia-settings/distinfo	(revision 314128)
 +++ x11/nvidia-settings/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-settings-310.14.tar.bz2) = 3859513192e4ae921bdb71818ca329e6b9d5e11f1b72aa7f48e4fc7fd16d7626
 -SIZE (nvidia-settings-310.14.tar.bz2) = 1477588
 +SHA256 (nvidia-settings-310.40.tar.bz2) = 161c47fac12f72f58433f400890b9de5b8965c92ef8cf05b3a44886acbb8100b
 +SIZE (nvidia-settings-310.40.tar.bz2) = 1485133
 Index: x11/nvidia-xconfig/Makefile
 ===================================================================
 --- x11/nvidia-xconfig/Makefile	(revision 314128)
 +++ x11/nvidia-xconfig/Makefile	(working copy)
 @@ -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
  
 Index: x11/nvidia-xconfig/distinfo
 ===================================================================
 --- x11/nvidia-xconfig/distinfo	(revision 314128)
 +++ x11/nvidia-xconfig/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-xconfig-310.14.tar.bz2) = 34524033eac86a422bbf813a309f218368dd9f95265cf730ef425b1edd1fe364
 -SIZE (nvidia-xconfig-310.14.tar.bz2) = 101116
 +SHA256 (nvidia-xconfig-310.40.tar.bz2) = 8d0c6a08d93fbf8290509e5f3bb4e4650a28a914ea46d8811ffa61a8ccfc0fe1
 +SIZE (nvidia-xconfig-310.40.tar.bz2) = 101175
 ------=_20130314183854_23382--
 
 

From: r4721@tormail.org
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/170289: [patch] use one version for x11/nvidia-driver
 x11/nvidia-xconfig x11/nvidia-settings
Date: Sun, 7 Apr 2013 16:24:54 -0000

 ------=_20130407162454_65677
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Transfer-Encoding: 8bit
 
 updated patch for 310.44.
 ------=_20130407162454_65677
 Content-Type: text/plain; name="nvidia.txt"
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment; filename="nvidia.txt"
 
 Index: x11/nvidia-driver/Makefile
 ===================================================================
 --- x11/nvidia-driver/Makefile	(revision 315754)
 +++ x11/nvidia-driver/Makefile	(working copy)
 @@ -11,7 +11,6 @@
  # or `x11/nvidia-driver-304' slave ports.
  
  PORTNAME=	nvidia-driver
 -DISTVERSION?=	310.32
  # Always try to set PORTREVISION as it can be overridden by the slave ports
  PORTREVISION?=	0
  CATEGORIES=	x11 kld
 @@ -27,6 +26,8 @@
  LICENSE_FILE=	${WRKSRC}/doc/license.txt
  LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
  
 +.include "${.CURDIR}/../nvidia-driver/Makefile.common"
 +
  ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
  USE_XORG=	xorg-server
  USE_GL=		gl
 Index: x11/nvidia-driver/Makefile.common
 ===================================================================
 --- x11/nvidia-driver/Makefile.common	(revision 0)
 +++ x11/nvidia-driver/Makefile.common	(working copy)
 @@ -0,0 +1 @@
 +DISTVERSION?=	310.44
 Index: x11/nvidia-driver/distinfo
 ===================================================================
 --- x11/nvidia-driver/distinfo	(revision 315754)
 +++ x11/nvidia-driver/distinfo	(working copy)
 @@ -1,7 +1,7 @@
 -SHA256 (NVIDIA-FreeBSD-x86_64-310.32.tar.gz) = f0935abf74a1298471a5eb0ede56ab913e358b76935557d618915a97efda9224
 -SIZE (NVIDIA-FreeBSD-x86_64-310.32.tar.gz) = 33511666
 -SHA256 (NVIDIA-FreeBSD-x86-310.32.tar.gz) = 3f00f5a13dc04f51b2a1b000ad53741ac6b81bd6e70258e7b9f200daf8f52b2d
 -SIZE (NVIDIA-FreeBSD-x86-310.32.tar.gz) = 32541283
 +SHA256 (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = bd4f780907e3208b233e0f911e9ee2a6cfe163efd33bc29c06ecc249041c961b
 +SIZE (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = 33558256
 +SHA256 (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 3f425b5f86d3cd764188e6e3f8c63cb4245734e11ba3b3d3ecc66786bbc279e6
 +SIZE (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 32589992
  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
 Index: x11/nvidia-settings/Makefile
 ===================================================================
 --- x11/nvidia-settings/Makefile	(revision 315754)
 +++ x11/nvidia-settings/Makefile	(working copy)
 @@ -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
 Index: x11/nvidia-settings/distinfo
 ===================================================================
 --- x11/nvidia-settings/distinfo	(revision 315754)
 +++ x11/nvidia-settings/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-settings-310.14.tar.bz2) = 3859513192e4ae921bdb71818ca329e6b9d5e11f1b72aa7f48e4fc7fd16d7626
 -SIZE (nvidia-settings-310.14.tar.bz2) = 1477588
 +SHA256 (nvidia-settings-310.44.tar.bz2) = 2562c2381c50092ad8652caaea57a07d53ee17119429f3d784df64e007379719
 +SIZE (nvidia-settings-310.44.tar.bz2) = 1485377
 Index: x11/nvidia-xconfig/Makefile
 ===================================================================
 --- x11/nvidia-xconfig/Makefile	(revision 315754)
 +++ x11/nvidia-xconfig/Makefile	(working copy)
 @@ -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
  
 Index: x11/nvidia-xconfig/distinfo
 ===================================================================
 --- x11/nvidia-xconfig/distinfo	(revision 315754)
 +++ x11/nvidia-xconfig/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-xconfig-310.14.tar.bz2) = 34524033eac86a422bbf813a309f218368dd9f95265cf730ef425b1edd1fe364
 -SIZE (nvidia-xconfig-310.14.tar.bz2) = 101116
 +SHA256 (nvidia-xconfig-310.44.tar.bz2) = ec43566e5398091be9da305802193e5a0ed228c4f9a2ba7ef7d29a53ef9cfed3
 +SIZE (nvidia-xconfig-310.44.tar.bz2) = 101172
 ------=_20130407162454_65677--
 
 

From: r4721@tormail.org
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/170289: [patch] use one version for x11/nvidia-driver
 x11/nvidia-xconfig x11/nvidia-settings
Date: Mon, 6 May 2013 21:16:46 -0000

 ------=_20130506211646_32652
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Transfer-Encoding: 8bit
 
 updated patch for 319.17
 
 nvidia-settings now uses libvdpau to show vdpau codec information.
 ------=_20130506211646_32652
 Content-Type: text/plain; name="nvidia.txt"
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment; filename="nvidia.txt"
 
 Index: x11/nvidia-driver/Makefile
 ===================================================================
 --- x11/nvidia-driver/Makefile	(revision 317438)
 +++ x11/nvidia-driver/Makefile	(working copy)
 @@ -11,9 +11,8 @@
  # or `x11/nvidia-driver-304' slave ports.
  
  PORTNAME=	nvidia-driver
 -DISTVERSION?=	310.44
  # Always try to set PORTREVISION as it can be overridden by the slave ports
 -PORTREVISION?=	1
 +PORTREVISION?=	0
  CATEGORIES=	x11 kld
  MASTER_SITES=	${MASTER_SITE_NVIDIA}
  # MASTER_SITE_SUBDIR it set later because it depends on NVVERSION
 @@ -27,6 +26,8 @@
  LICENSE_FILE=	${WRKSRC}/doc/license.txt
  LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
  
 +.include "${.CURDIR}/../nvidia-driver/Makefile.common"
 +
  ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
  USE_XORG=	xorg-server
  USE_GL=		gl
 Index: x11/nvidia-driver/Makefile.common
 ===================================================================
 --- x11/nvidia-driver/Makefile.common	(revision 0)
 +++ x11/nvidia-driver/Makefile.common	(working copy)
 @@ -0,0 +1 @@
 +DISTVERSION?=	319.17
 Index: x11/nvidia-driver/distinfo
 ===================================================================
 --- x11/nvidia-driver/distinfo	(revision 317438)
 +++ x11/nvidia-driver/distinfo	(working copy)
 @@ -1,7 +1,7 @@
 -SHA256 (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = bd4f780907e3208b233e0f911e9ee2a6cfe163efd33bc29c06ecc249041c961b
 -SIZE (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = 33558256
 -SHA256 (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 3f425b5f86d3cd764188e6e3f8c63cb4245734e11ba3b3d3ecc66786bbc279e6
 -SIZE (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 32589992
 +SHA256 (NVIDIA-FreeBSD-x86_64-319.17.tar.gz) = fc618f46a532cb387b000e74573a5235a2fdc05f01917fb033690eda0b6ac61b
 +SIZE (NVIDIA-FreeBSD-x86_64-319.17.tar.gz) = 34424474
 +SHA256 (NVIDIA-FreeBSD-x86-319.17.tar.gz) = c5e2ab023a8a32a7ca174e54afdfa173a55668e0638a843d77c7dbc19174ae99
 +SIZE (NVIDIA-FreeBSD-x86-319.17.tar.gz) = 34029600
  SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
  SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
  SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d
 Index: x11/nvidia-settings/Makefile
 ===================================================================
 --- x11/nvidia-settings/Makefile	(revision 317438)
 +++ x11/nvidia-settings/Makefile	(working copy)
 @@ -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,10 @@
  
  LICENSE=	GPLv2
  
 +LIB_DEPENDS=	vdpau:${PORTSDIR}/multimedia/libvdpau
 +
 +.include "${.CURDIR}/../nvidia-driver/Makefile.common"
 +
  USE_BZIP2=	yes
  USE_GNOME=	gtk20
  USE_GMAKE=	yes
 Index: x11/nvidia-settings/distinfo
 ===================================================================
 --- x11/nvidia-settings/distinfo	(revision 317438)
 +++ x11/nvidia-settings/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-settings-310.14.tar.bz2) = 3859513192e4ae921bdb71818ca329e6b9d5e11f1b72aa7f48e4fc7fd16d7626
 -SIZE (nvidia-settings-310.14.tar.bz2) = 1477588
 +SHA256 (nvidia-settings-319.17.tar.bz2) = 49712c56590df4521d6eb988a8eab0a8f754b9f6c62a51c23c53d8a40df0b87d
 +SIZE (nvidia-settings-319.17.tar.bz2) = 1536915
 Index: x11/nvidia-xconfig/Makefile
 ===================================================================
 --- x11/nvidia-xconfig/Makefile	(revision 317438)
 +++ x11/nvidia-xconfig/Makefile	(working copy)
 @@ -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
  
 Index: x11/nvidia-xconfig/distinfo
 ===================================================================
 --- x11/nvidia-xconfig/distinfo	(revision 317438)
 +++ x11/nvidia-xconfig/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-xconfig-310.14.tar.bz2) = 34524033eac86a422bbf813a309f218368dd9f95265cf730ef425b1edd1fe364
 -SIZE (nvidia-xconfig-310.14.tar.bz2) = 101116
 +SHA256 (nvidia-xconfig-319.17.tar.bz2) = 14d2b3c89ee95de290ea648e1c131b73310a9f03c31e718eaba438077cf46946
 +SIZE (nvidia-xconfig-319.17.tar.bz2) = 102015
 ------=_20130506211646_32652--
 
 

From: r4721@tormail.org
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/170289: [patch] use one version for x11/nvidia-driver
 x11/nvidia-xconfig x11/nvidia-settings
Date: Wed, 5 Jun 2013 12:26:32 -0000

 ------=_20130605122632_25820
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Transfer-Encoding: 8bit
 
 updated patch for 319.23. new version adds support for 4K video via VDPAU,
 if your gpu is capable.
 ------=_20130605122632_25820
 Content-Type: text/plain; name="nvidia.txt"
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment; filename="nvidia.txt"
 
 Index: x11/nvidia-driver/Makefile
 ===================================================================
 --- x11/nvidia-driver/Makefile	(revision 319948)
 +++ x11/nvidia-driver/Makefile	(working copy)
 @@ -11,9 +11,8 @@
  # or `x11/nvidia-driver-304' slave ports.
  
  PORTNAME=	nvidia-driver
 -DISTVERSION?=	310.44
  # Always try to set PORTREVISION as it can be overridden by the slave ports
 -PORTREVISION?=	1
 +PORTREVISION?=	0
  CATEGORIES=	x11 kld
  MASTER_SITES=	${MASTER_SITE_NVIDIA}
  # MASTER_SITE_SUBDIR it set later because it depends on NVVERSION
 @@ -27,6 +26,8 @@
  LICENSE_FILE=	${WRKSRC}/doc/license.txt
  LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
  
 +.include "${.CURDIR}/../nvidia-driver/Makefile.common"
 +
  ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
  USE_XORG=	xorg-server
  USE_GL=		gl
 Index: x11/nvidia-driver/Makefile.common
 ===================================================================
 --- x11/nvidia-driver/Makefile.common	(revision 0)
 +++ x11/nvidia-driver/Makefile.common	(working copy)
 @@ -0,0 +1 @@
 +DISTVERSION?=	319.23
 Index: x11/nvidia-driver/distinfo
 ===================================================================
 --- x11/nvidia-driver/distinfo	(revision 319948)
 +++ x11/nvidia-driver/distinfo	(working copy)
 @@ -1,7 +1,7 @@
 -SHA256 (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = bd4f780907e3208b233e0f911e9ee2a6cfe163efd33bc29c06ecc249041c961b
 -SIZE (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = 33558256
 -SHA256 (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 3f425b5f86d3cd764188e6e3f8c63cb4245734e11ba3b3d3ecc66786bbc279e6
 -SIZE (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 32589992
 +SHA256 (NVIDIA-FreeBSD-x86_64-319.23.tar.gz) = 1a946f01ac044d18ee945836009088726ff313f85e8068fe71d8317ea1b51c92
 +SIZE (NVIDIA-FreeBSD-x86_64-319.23.tar.gz) = 34422044
 +SHA256 (NVIDIA-FreeBSD-x86-319.23.tar.gz) = e5ce02bfb464de70e93ff3b5c86cfcf5e727a57c23c393342e4e005c76dbe6a4
 +SIZE (NVIDIA-FreeBSD-x86-319.23.tar.gz) = 34030220
  SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
  SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
  SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d
 Index: x11/nvidia-settings/Makefile
 ===================================================================
 --- x11/nvidia-settings/Makefile	(revision 319948)
 +++ x11/nvidia-settings/Makefile	(working copy)
 @@ -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,10 @@
  
  LICENSE=	GPLv2
  
 +LIB_DEPENDS=	vdpau:${PORTSDIR}/multimedia/libvdpau
 +
 +.include "${.CURDIR}/../nvidia-driver/Makefile.common"
 +
  USE_BZIP2=	yes
  USE_GNOME=	gtk20
  USE_GMAKE=	yes
 Index: x11/nvidia-settings/distinfo
 ===================================================================
 --- x11/nvidia-settings/distinfo	(revision 319948)
 +++ x11/nvidia-settings/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-settings-310.14.tar.bz2) = 3859513192e4ae921bdb71818ca329e6b9d5e11f1b72aa7f48e4fc7fd16d7626
 -SIZE (nvidia-settings-310.14.tar.bz2) = 1477588
 +SHA256 (nvidia-settings-319.23.tar.bz2) = 8729538a6857143229ab064b320570fe71550aa9fcb89307636dfd61e4bd17d6
 +SIZE (nvidia-settings-319.23.tar.bz2) = 1535627
 Index: x11/nvidia-xconfig/Makefile
 ===================================================================
 --- x11/nvidia-xconfig/Makefile	(revision 319948)
 +++ x11/nvidia-xconfig/Makefile	(working copy)
 @@ -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
  
 Index: x11/nvidia-xconfig/distinfo
 ===================================================================
 --- x11/nvidia-xconfig/distinfo	(revision 319948)
 +++ x11/nvidia-xconfig/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-xconfig-310.14.tar.bz2) = 34524033eac86a422bbf813a309f218368dd9f95265cf730ef425b1edd1fe364
 -SIZE (nvidia-xconfig-310.14.tar.bz2) = 101116
 +SHA256 (nvidia-xconfig-319.23.tar.bz2) = 47d3756f8cc92287194c19f2409ddff4a7396d9138773532b06ca6ac8c53c92d
 +SIZE (nvidia-xconfig-319.23.tar.bz2) = 102016
 ------=_20130605122632_25820--
 
 

From: r4721@tormail.org
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/170289: [patch] use one version for x11/nvidia-driver
 x11/nvidia-xconfig x11/nvidia-settings
Date: Thu, 27 Jun 2013 10:58:54 -0000

 ------=_20130627105854_20988
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Transfer-Encoding: 8bit
 
 updated version 319.32
 ------=_20130627105854_20988
 Content-Type: text/plain; name="nvidia.txt"
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment; filename="nvidia.txt"
 
 Index: x11/nvidia-driver/Makefile
 ===================================================================
 --- x11/nvidia-driver/Makefile	(revision 321824)
 +++ x11/nvidia-driver/Makefile	(working copy)
 @@ -11,9 +11,8 @@
  # or `x11/nvidia-driver-304' slave ports.
  
  PORTNAME=	nvidia-driver
 -DISTVERSION?=	310.44
  # Always try to set PORTREVISION as it can be overridden by the slave ports
 -PORTREVISION?=	1
 +PORTREVISION?=	0
  CATEGORIES=	x11 kld
  MASTER_SITES=	${MASTER_SITE_NVIDIA}
  # MASTER_SITE_SUBDIR it set later because it depends on NVVERSION
 @@ -27,6 +26,8 @@
  LICENSE_FILE=	${WRKSRC}/doc/license.txt
  LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
  
 +.include "${.CURDIR}/../nvidia-driver/Makefile.common"
 +
  ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
  USE_XORG=	xorg-server
  USE_GL=		gl
 Index: x11/nvidia-driver/Makefile.common
 ===================================================================
 --- x11/nvidia-driver/Makefile.common	(revision 0)
 +++ x11/nvidia-driver/Makefile.common	(working copy)
 @@ -0,0 +1 @@
 +DISTVERSION?=	319.32
 Index: x11/nvidia-driver/distinfo
 ===================================================================
 --- x11/nvidia-driver/distinfo	(revision 321824)
 +++ x11/nvidia-driver/distinfo	(working copy)
 @@ -1,7 +1,7 @@
 -SHA256 (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = bd4f780907e3208b233e0f911e9ee2a6cfe163efd33bc29c06ecc249041c961b
 -SIZE (NVIDIA-FreeBSD-x86_64-310.44.tar.gz) = 33558256
 -SHA256 (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 3f425b5f86d3cd764188e6e3f8c63cb4245734e11ba3b3d3ecc66786bbc279e6
 -SIZE (NVIDIA-FreeBSD-x86-310.44.tar.gz) = 32589992
 +SHA256 (NVIDIA-FreeBSD-x86_64-319.32.tar.gz) = d434055e1c11e5d091054531049d2fcaecdc4856756ce5998fe70130c542426f
 +SIZE (NVIDIA-FreeBSD-x86_64-319.32.tar.gz) = 34441850
 +SHA256 (NVIDIA-FreeBSD-x86-319.32.tar.gz) = 7aa65881e014a001a2b19b17f3ff8a510c306062466cdf1acb1a4c993466487e
 +SIZE (NVIDIA-FreeBSD-x86-319.32.tar.gz) = 34048762
  SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
  SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
  SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d
 Index: x11/nvidia-settings/Makefile
 ===================================================================
 --- x11/nvidia-settings/Makefile	(revision 321824)
 +++ x11/nvidia-settings/Makefile	(working copy)
 @@ -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,10 @@
  
  LICENSE=	GPLv2
  
 +LIB_DEPENDS=	vdpau:${PORTSDIR}/multimedia/libvdpau
 +
 +.include "${.CURDIR}/../nvidia-driver/Makefile.common"
 +
  USE_BZIP2=	yes
  USE_GNOME=	gtk20
  USE_GMAKE=	yes
 Index: x11/nvidia-settings/distinfo
 ===================================================================
 --- x11/nvidia-settings/distinfo	(revision 321824)
 +++ x11/nvidia-settings/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-settings-310.14.tar.bz2) = 3859513192e4ae921bdb71818ca329e6b9d5e11f1b72aa7f48e4fc7fd16d7626
 -SIZE (nvidia-settings-310.14.tar.bz2) = 1477588
 +SHA256 (nvidia-settings-319.32.tar.bz2) = bc29e5b1b92a3ffe42c93e1cb8830131f5c948f9516d4d1b05d2615b99bf3494
 +SIZE (nvidia-settings-319.32.tar.bz2) = 1536552
 Index: x11/nvidia-xconfig/Makefile
 ===================================================================
 --- x11/nvidia-xconfig/Makefile	(revision 321824)
 +++ x11/nvidia-xconfig/Makefile	(working copy)
 @@ -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
  
 Index: x11/nvidia-xconfig/distinfo
 ===================================================================
 --- x11/nvidia-xconfig/distinfo	(revision 321824)
 +++ x11/nvidia-xconfig/distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (nvidia-xconfig-310.14.tar.bz2) = 34524033eac86a422bbf813a309f218368dd9f95265cf730ef425b1edd1fe364
 -SIZE (nvidia-xconfig-310.14.tar.bz2) = 101116
 +SHA256 (nvidia-xconfig-319.32.tar.bz2) = c87f1b63db5010cac73f2aa9e3e879e3f7c2014184b975532a8697eaa8a7298f
 +SIZE (nvidia-xconfig-319.32.tar.bz2) = 101954
 ------=_20130627105854_20988--
 
 
>Unformatted:
