- Update to version 173.14.05, the latest from NVidia

- Remove NVVERSION hacks and corresponding comments
- Fix X11BASE reference in a comment

7 files changed, 6 insertions, 35 deletions

diff --git a/x11/nvidia-driver-71/Makefile b/x11/nvidia-driver-71/Makefile
index d70663f90a80..03bcf2d7f091 100644
--- a/x11/nvidia-driver-71/Makefile
+++ b/x11/nvidia-driver-71/Makefile
@@ -8,9 +8,6 @@
 DISTVERSION=	71.86.04
 PORTREVISION=	1
 
-# XXX Should be set in master port XXX
-NVVERSION=	${DISTVERSION:S/.//g}
-
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver-71xx/Makefile b/x11/nvidia-driver-71xx/Makefile
index d70663f90a80..03bcf2d7f091 100644
--- a/x11/nvidia-driver-71xx/Makefile
+++ b/x11/nvidia-driver-71xx/Makefile
@@ -8,9 +8,6 @@
 DISTVERSION=	71.86.04
 PORTREVISION=	1
 
-# XXX Should be set in master port XXX
-NVVERSION=	${DISTVERSION:S/.//g}
-
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver-96/Makefile b/x11/nvidia-driver-96/Makefile
index 0e1edbff9b9f..308eb6cdabf8 100644
--- a/x11/nvidia-driver-96/Makefile
+++ b/x11/nvidia-driver-96/Makefile
@@ -8,9 +8,6 @@
 DISTVERSION=	96.43.05
 PORTREVISION=	1
 
-# XXX Should be set in master port XXX
-NVVERSION=	${DISTVERSION:S/.//g}
-
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver-96xx/Makefile b/x11/nvidia-driver-96xx/Makefile
index 0e1edbff9b9f..308eb6cdabf8 100644
--- a/x11/nvidia-driver-96xx/Makefile
+++ b/x11/nvidia-driver-96xx/Makefile
@@ -8,9 +8,6 @@
 DISTVERSION=	96.43.05
 PORTREVISION=	1
 
-# XXX Should be set in master port XXX
-NVVERSION=	${DISTVERSION:S/.//g}
-
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 94d37ecf94ab..83d8b1c2d353 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	169.12
+DISTVERSION?=	173.14.05
 PORTREVISION?=	0			# For consistency with slave ports
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
@@ -36,12 +36,7 @@ OPTIONS=	FREEBSD_AGP	"Use FreeBSD AGP GART driver" off \
 # you need to use legacy driver version and install one of corresponding
 # `x11/nvidia-driver-71xx' or `x11/nvidia-driver-96xx' slave ports.
 #
-# NVidia played it tricky with their versioning scheme once again.  To make
-# stable and legacy versions comparable, employ some sad ugly hackery: assign
-# NVVERSION for slave ports independently of master.  Hopefully, this is a
-# temporary measure and will go away soon.
-#
-NVVERSION?=	${DISTVERSION:S/.//g}00
+NVVERSION=	${DISTVERSION:S/.//g}
 
 .include <bsd.port.pre.mk>
 
@@ -127,7 +122,7 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e 's/afterinstall/dontexecute/' ${WRKSRC}/Makefile
 
 pre-su-install:
-# XXX This port silently assumes PREFIX == X11BASE XXX
+# XXX This port silently assumes PREFIX == LOCALBASE XXX
 	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
 # xorg-server-1.4 installs its own ${LOCALBASE}/lib/xorg/modules/libwfb.so,
 # so back it up so it can be later restored similarly to what NVidia does:
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index b2f418f3a53b..492b7ebd5c86 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -4,6 +4,6 @@ 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-169.12.tar.gz) = 1e81dce17cdd2474e5492b43d0aaf804
-SHA256 (NVIDIA-FreeBSD-x86-169.12.tar.gz) = a237da7664ddcfd2f68336765734ac84de2a2ce0f6535063534b3e6f32f0ac3b
-SIZE (NVIDIA-FreeBSD-x86-169.12.tar.gz) = 13862817
+MD5 (NVIDIA-FreeBSD-x86-173.14.05.tar.gz) = ffcced1076fee0befc5a76736125fe4f
+SHA256 (NVIDIA-FreeBSD-x86-173.14.05.tar.gz) = a8b1782656ee0faaa1e60f7f49a5d922c126785273de642deac3ae935dcc2556
+SIZE (NVIDIA-FreeBSD-x86-173.14.05.tar.gz) = 15856727
diff --git a/x11/nvidia-driver/files/patch-src::nv-freebsd.h b/x11/nvidia-driver/files/patch-src::nv-freebsd.h
deleted file mode 100644
index 33dcd6f96347..000000000000
--- a/x11/nvidia-driver/files/patch-src::nv-freebsd.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/nv-freebsd.h.orig	Wed Feb 25 18:55:35 2004
-+++ src/nv-freebsd.h	Wed Feb 25 18:55:49 2004
-@@ -217,7 +217,9 @@
- } nvidia_softc_t;
- 
- 
-+#if __FreeBSD_version < 502103
- #define CDEV_MAJOR      180
-+#endif
- #define CDEV_CTL_MINOR  255
- 
- extern devclass_t nvidia_devclass;