In sight of upcoming update, overhaul things slightly:

- NVVERSION is no longer user settable.  nVidia changed their versioning
  scheme, which made my life a bit harder.  Since this is master port and
  cares about legacy version slaves as well, derive NVVERSION from DIST-
  VERSION as doing so required less intrusive changes.  Update the comment
  accordingly.  UPDATING note will be committed separately
- Retire OSVERSION hack since it's no longer needed.  PORTREVISION are now
  set in all three nvidia-driver ports independently.  Previously it was
  not really safe because NVVERSION was user settable variable
- Introduce new variable, SHLIB_VERSION, and use it in PLIST_SUB, because
  it's not always equal to NVVERSION these days
- Mute MKDIR along the way

For slave ports:

- Rename port directory names to reflect future reality: their versions
  going to bump as well.  No repo copy since there's no history to preserve

7 files changed, 55 insertions, 39 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 7f72dc348408..b78b9708bd14 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -210,8 +210,8 @@
     SUBDIR += mxico
     SUBDIR += numlockx
     SUBDIR += nvidia-driver
-    SUBDIR += nvidia-driver-7184
-    SUBDIR += nvidia-driver-9631
+    SUBDIR += nvidia-driver-71xx
+    SUBDIR += nvidia-driver-96xx
     SUBDIR += nvidia-settings
     SUBDIR += nvidia-xconfig
     SUBDIR += oclock
diff --git a/x11/nvidia-driver-7184/Makefile b/x11/nvidia-driver-71/Makefile
index cc5a6a005590..17842e384951 100644
--- a/x11/nvidia-driver-7184/Makefile
+++ b/x11/nvidia-driver-71/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	nvidia-driver, legacy version 7184
+# New ports collection makefile for:	nvidia-driver, legacy version 71xx
 # Date created:				08 Feb 2007
 # Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-NVVERSION=	7184
+DISTVERSION=	1.0-7184
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
diff --git a/x11/nvidia-driver-9631/Makefile b/x11/nvidia-driver-71xx/Makefile
index 93e077535abf..17842e384951 100644
--- a/x11/nvidia-driver-9631/Makefile
+++ b/x11/nvidia-driver-71xx/Makefile
@@ -1,11 +1,11 @@
-# New ports collection makefile for:	nvidia-driver, legacy version 9631
+# New ports collection makefile for:	nvidia-driver, legacy version 71xx
 # Date created:				08 Feb 2007
 # Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-NVVERSION=	9631
+DISTVERSION=	1.0-7184
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 
diff --git a/x11/nvidia-driver-96/Makefile b/x11/nvidia-driver-96/Makefile
new file mode 100644
index 000000000000..51c2edc608f0
--- /dev/null
+++ b/x11/nvidia-driver-96/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	nvidia-driver, legacy version 96xx
+# Date created:				08 Feb 2007
+# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+DISTVERSION=	1.0-9631
+
+MASTERDIR=	${.CURDIR}/../nvidia-driver
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver-96xx/Makefile b/x11/nvidia-driver-96xx/Makefile
new file mode 100644
index 000000000000..51c2edc608f0
--- /dev/null
+++ b/x11/nvidia-driver-96xx/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	nvidia-driver, legacy version 96xx
+# Date created:				08 Feb 2007
+# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+DISTVERSION=	1.0-9631
+
+MASTERDIR=	${.CURDIR}/../nvidia-driver
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index fa914727962d..61743a75b80e 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	nvidia-driver
-PORTVERSION=	1.0.${NVVERSION}
-PORTREVISION=	5
+DISTVERSION?=	1.0-9746
+PORTREVISION?=	5
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
-MASTER_SITE_SUBDIR=	freebsd/1.0-${NVVERSION}
-DISTNAME=	NVIDIA-FreeBSD-x86-${PORTVERSION:S/0./0-/}
+MASTER_SITE_SUBDIR=	freebsd/${DISTVERSION}
+DISTNAME=	NVIDIA-FreeBSD-x86-${DISTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering
@@ -30,27 +30,19 @@ OPTIONS=	FREEBSD_AGP	"Use FreeBSD AGP GART driver" off \
 		ACPI		"Enable support for ACPI Power Management" off \
 		LINUX		"Build with support for Linux compatibility" on
 
-# Get __FreeBSD_version.  Needed to set PORTREVISION before including of
-# <bsd.port.pre.mk>.
-# XXX This is not required for -CURRENT XXX
+# Starting with version 7667, NVidia has dropped support for numerous
+# "legacy" GPUs.  Consult NVidia README (Appendix A) to find out whether
+# you need to use legacy driver version and install one of corresponding
+# `x11/nvidia-driver-71xx' or `x11/nvidia-driver-96xx' slave ports.
 #
-.if !defined(OSVERSION)
-.if exists(/sbin/sysctl)
-OSVERSION!=	/sbin/sysctl -n kern.osreldate
+.if ${DISTVERSION:M1.0-*}
+NVVERSION=	${DISTVERSION:S/1.0-//}
+SHLIB_VERSION=	${NVVERSION}
 .else
-OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
-.endif
+NVVERSION=	${DISTVERSION:S/.//g}
+SHLIB_VERSION=	${PORTVERSION}
 .endif
 
-# Starting with version 7667, NVidia has dropped support for numerous
-# "legacy" GPUs.  One can, however, build the port with specific NVVERSION
-# value set.  Currently supported "legacy" values are 7184 and 9631.
-# Consult NVidia README (Appendix A) to find out whether you need to use
-# legacy driver version.  Alternatively, you can install corresponding
-# `x11/nvidia-driver-XXXX' slave port, where XXXX == needed ${NVVERSION}.
-#
-NVVERSION?=	9746			# The latest version to date
-
 .if ${NVVERSION} == 7184
 EXTRA_PATCHES+=	${FILESDIR}/6113-patch-lib::Makefile
 .else
@@ -58,10 +50,6 @@ EXTRA_PATCHES+=	${FILESDIR}/7667-* \
 		${FILESDIR}/crash-patch-by-zander-1759235
 .endif
 
-.if ${OSVERSION} >= 600033
-LIB_DEPENDS+=	m.3:${PORTSDIR}/misc/compat5x
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${X_WINDOW_SYSTEM} == "xorg"
@@ -80,7 +68,7 @@ XSERVVERSION!=	/usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null |
 XLIBVERSION!=	/usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O graphics/libGL 2>/dev/null | ${GREP} libGL- || true
 
 PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
-		LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION} \
+		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${SHLIB_VERSION} \
 		MODULESDIR=${MODULESDIR} XORG=${XORG_SUB} XFREE86=${XFREE86_SUB}
 
 .if !defined(WITHOUT_LINUX)
@@ -99,6 +87,10 @@ MAKE_ENV+=	WITHOUT_LINUX=yes
 IGNORE=		supports FreeBSD-STABLE (5.3 or later), or FreeBSD-CURRENT
 .endif
 
+.if ${OSVERSION} >= 600033
+LIB_DEPENDS+=	m.3:${PORTSDIR}/misc/compat5x
+.endif
+
 post-patch: .SILENT
 # We should support -CURRENT: kill the check
 .if ${NVVERSION} >= 7174
@@ -143,7 +135,7 @@ post-patch: .SILENT
 	${REINPLACE_CMD} '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile
 
 pre-install:
-	${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
+	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
 
 post-install:
 # pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 0a08c138aae7..edde5179f945 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -96,12 +96,12 @@ lib/libXvMCNVIDIA.a
 nvidia.ko
 @unexec kldxref %D
 %%LINUX%%@cwd %%LINUXBASE%%
-%%LINUX%%usr/lib/libGL.so.1.0.%%NVVERSION%%
-%%LINUX%%usr/lib/libGLcore.so.1.0.%%NVVERSION%%
-%%LINUX%%usr/lib/libnvidia-tls.so.1.0.%%NVVERSION%%
-%%LINUX%%@exec ln -sf %D/usr/lib/libGL.so.1.0.%%NVVERSION%% %D/usr/lib/libGL.so.1
-%%LINUX%%@exec ln -sf %D/usr/lib/libGLcore.so.1.0.%%NVVERSION%% %D/usr/lib/libGLcore.so.1
-%%LINUX%%@exec ln -sf %D/usr/lib/libnvidia-tls.so.1.0.%%NVVERSION%% %D/usr/lib/libnvidia-tls.so.1
+%%LINUX%%usr/lib/libGL.so.1.0.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libGLcore.so.1.0.%%SHLIB_VERSION%%
+%%LINUX%%usr/lib/libnvidia-tls.so.1.0.%%SHLIB_VERSION%%
+%%LINUX%%@exec ln -sf %D/usr/lib/libGL.so.1.0.%%SHLIB_VERSION%% %D/usr/lib/libGL.so.1
+%%LINUX%%@exec ln -sf %D/usr/lib/libGLcore.so.1.0.%%SHLIB_VERSION%% %D/usr/lib/libGLcore.so.1
+%%LINUX%%@exec ln -sf %D/usr/lib/libnvidia-tls.so.1.0.%%SHLIB_VERSION%% %D/usr/lib/libnvidia-tls.so.1
 %%LINUX%%@unexec rm -f %D/usr/lib/libGL.so.1
 %%LINUX%%@unexec rm -f %D/usr/lib/libGLcore.so.1
 %%LINUX%%@unexec rm -f %D/usr/lib/libnvidia-tls.so.1