- Update stable version to 173.14.12, and legacy versions to 71.86.06 and

  96.43.07
- Minor Makefile retouch

Reminded by:	miwi

6 files changed, 15 insertions, 30 deletions

diff --git a/x11/nvidia-driver-71/Makefile b/x11/nvidia-driver-71/Makefile
index 03bcf2d7f091..6f6976360361 100644
--- a/x11/nvidia-driver-71/Makefile
+++ b/x11/nvidia-driver-71/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	71.86.04
-PORTREVISION=	1
+DISTVERSION=	71.86.06
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
diff --git a/x11/nvidia-driver-71xx/Makefile b/x11/nvidia-driver-71xx/Makefile
index 03bcf2d7f091..6f6976360361 100644
--- a/x11/nvidia-driver-71xx/Makefile
+++ b/x11/nvidia-driver-71xx/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	71.86.04
-PORTREVISION=	1
+DISTVERSION=	71.86.06
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
diff --git a/x11/nvidia-driver-96/Makefile b/x11/nvidia-driver-96/Makefile
index 308eb6cdabf8..0794e6a59f74 100644
--- a/x11/nvidia-driver-96/Makefile
+++ b/x11/nvidia-driver-96/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	96.43.05
-PORTREVISION=	1
+DISTVERSION=	96.43.07
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
diff --git a/x11/nvidia-driver-96xx/Makefile b/x11/nvidia-driver-96xx/Makefile
index 308eb6cdabf8..0794e6a59f74 100644
--- a/x11/nvidia-driver-96xx/Makefile
+++ b/x11/nvidia-driver-96xx/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 #
 
-DISTVERSION=	96.43.05
-PORTREVISION=	1
+DISTVERSION=	96.43.07
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 487c5a73d771..ee5708617ea0 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	173.14.09
-PORTREVISION?=	0			# For consistency with slave ports
+DISTVERSION?=	173.14.12
+PORTREVISION?=	0			# As a reminder it can be overridden
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
 MASTER_SITE_SUBDIR=	freebsd/${DISTVERSION}
@@ -68,7 +68,6 @@ MAKE_ENV+=	WITHOUT_LINUX=yes
 .if ${OSVERSION} < 503000
 IGNORE=		supports FreeBSD-STABLE (5.3 or later), or FreeBSD-CURRENT
 .endif
-
 .if ${OSVERSION} >= 600033
 LIB_DEPENDS+=	m.3:${PORTSDIR}/misc/compat5x
 .endif
@@ -86,16 +85,6 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e '15s,^,#include <sys/priv.h>,' \
 		${WRKSRC}/src/nvidia_os.c
 .endif
-# Correct prototypes to fix the build with FreeBSD AGP support
-.if ${NVVERSION} >= 1690700
-	${REINPLACE_CMD} -e '406,407s/(/(nv_stack_t *, /' \
-		${WRKSRC}/src/nv-freebsd.h
-.endif
-# Do not implement certain pmap API functions on systems that have them
-.if ${NVVERSION} >= 1731405
-	${REINPLACE_CMD} -E 's,if( __FreeBSD_version )(< 700055),if\1< 602110 ||\1>= 700000 \&\&\1\2,' \
-		${WRKSRC}/src/nv-freebsd.h
-.endif
 .if defined(WITH_FREEBSD_AGP)
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
 		${WRKSRC}/src/nv-freebsd.h
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 485af70db1cd..63cfd8ad2ea5 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,9 +1,9 @@
-MD5 (NVIDIA-FreeBSD-x86-71.86.04.tar.gz) = 676154f37ee2b611a2d2387ae44a2a34
-SHA256 (NVIDIA-FreeBSD-x86-71.86.04.tar.gz) = 0f73894983adc6610c40960427a6a0026d35537081d3f91e37ee1e4ddab022eb
-SIZE (NVIDIA-FreeBSD-x86-71.86.04.tar.gz) = 8021968
-MD5 (NVIDIA-FreeBSD-x86-96.43.05.tar.gz) = 24f35b17d6df075cf626469c3311437e
-SHA256 (NVIDIA-FreeBSD-x86-96.43.05.tar.gz) = 2be502f2321d835837db9f744c61894e71f6d182fa8c7fd26c801139dc69342b
-SIZE (NVIDIA-FreeBSD-x86-96.43.05.tar.gz) = 9670707
-MD5 (NVIDIA-FreeBSD-x86-173.14.09.tar.gz) = 09b4059a8673bf00cdd21c0dc0817ec3
-SHA256 (NVIDIA-FreeBSD-x86-173.14.09.tar.gz) = be69a164e60c48e8dc272dbf503a201256f374760d67e4fddca74b23e4aa2cee
-SIZE (NVIDIA-FreeBSD-x86-173.14.09.tar.gz) = 15858904
+MD5 (NVIDIA-FreeBSD-x86-71.86.06.tar.gz) = cc69784a5aa6dd124f15864768f67a2f
+SHA256 (NVIDIA-FreeBSD-x86-71.86.06.tar.gz) = cab7f506dc4aeb4c6f0b7ad1f4c287b753ef8f203dbabc17fd3d1f0622ec8ad4
+SIZE (NVIDIA-FreeBSD-x86-71.86.06.tar.gz) = 8021247
+MD5 (NVIDIA-FreeBSD-x86-96.43.07.tar.gz) = 233608c2705848ea3e503166e0b680c2
+SHA256 (NVIDIA-FreeBSD-x86-96.43.07.tar.gz) = 8fb5e791c5ee4c6b95bb31dae6118f8ff9512ec0180ec4d05be6753dc4ccd9bb
+SIZE (NVIDIA-FreeBSD-x86-96.43.07.tar.gz) = 6794935
+MD5 (NVIDIA-FreeBSD-x86-173.14.12.tar.gz) = d3a622573ed0e2ef14013c51daa3c326
+SHA256 (NVIDIA-FreeBSD-x86-173.14.12.tar.gz) = 0b9849d0f2b09533c384227370c94469a45384adc216a8b716a02bfc9a7340be
+SIZE (NVIDIA-FreeBSD-x86-173.14.12.tar.gz) = 15856061