Long anticipated update to version 1.0-7174, the latest from nVidia.

Release Highlights:

    * Supports FreeBSD 5-STABLE (5.3-RELEASE or later).  For FreeBSD 4.x
      and 5.2.1 users we stick to previous version (6113), since 7174 does
      not play nicely with legacy FreeBSD releases
    * Added support for the latest NVIDIA GPUs, including the GeForce 6600
      and 6200 with TurboCache(TM)
    * Added support for the KSE threading libraries

Prodded by:	many
Tested by:	several
Tested on:	FreeBSD 4.11 and 5.3

4 files changed, 40 insertions, 29 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index e43bd7f5bd5b..8089efc9d830 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	nvidia-driver
 PORTVERSION=	1.0.${NVVERSION}
-PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
 		ftp://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
@@ -20,16 +19,26 @@ COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering
 
 ONLY_FOR_ARCHS=	i386
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
 INSTALLS_SHLIB=	yes
 
-NVVERSION=	6113
-
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 503000
-LIB_DEPENDS+=	m.2:${PORTSDIR}/misc/compat4x
+# Newer releases from NVidia do not play nicely with FreeBSD prior to 5.3.
+# While we support 4.x/5.2.1 releases, stick to 6113 version of driver for
+# that old versions of FreeBSD.  This can go away when we stop supporting
+# them.  For details, please refer to PR ports/79571.
+#
+.if ${OSVERSION} < 503000
+NVVERSION=	6113
+PORTREVISION=	4
+EXTRA_PATCHES+=	6113-patch-src::nvidia_pci.c
+PLIST_SUB+=	DIFFS=""
+.else
+NVVERSION=	7174
+PLIST_SUB+=	DIFFS="@comment "
 .endif
 
 # XXX Should use ${PKG_INFO} XXX
@@ -37,7 +46,7 @@ LIB_DEPENDS+=	m.2:${PORTSDIR}/misc/compat4x
 XSERVVERSION!=	/usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | ${GREP} Server- || /usr/sbin/pkg_info -O x11-servers/xorg-server 2>/dev/null | ${GREP} server- || true
 XLIBVERSION!=	/usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O x11/xorg-libraries 2>/dev/null | ${GREP} libraries- || true
 
-PLIST_SUB=	XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
+PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
 		LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION}
 
 .if !defined(WITHOUT_LINUX)
@@ -49,7 +58,7 @@ PLIST_SUB+=	LINUX="@comment "
 .endif
 
 .if ${OSVERSION} < 490000 || ${OSVERSION} >= 500000 && ${OSVERSION} < 502001
-IGNORE=		supports FreeBSD -STABLE (4.9 or later), or FreeBSD -CURRENT (5.2.1 or later)
+IGNORE=		supports FreeBSD -STABLE (4.9 or later, 5.2.1 or later), or FreeBSD -CURRENT
 .endif
 
 .if ${OSVERSION} < 500000
@@ -72,26 +81,26 @@ pre-everything::
 	@${ECHO_MSG} "Define WITHOUT_LINUX to build without support for Linux compatibility"
 .endif
 
-.if defined(WITH_FREEBSD_AGP) || defined(WITH_VM86_INT10CALL) || defined(WITH_ACPI) || defined(WITHOUT_LINUX)
-USE_REINPLACE=	yes
-
-post-patch:
-. if defined(WITH_FREEBSD_AGP)
-	@${REINPLACE_CMD} 's/undef NV_SUPPORT_OS_AGP/define NV_SUPPORT_OS_AGP/' \
+post-patch: .SILENT
+# We should support -CURRENT: kill the check
+.if ${NVVERSION} == 7174
+	${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h
+.endif
+.if defined(WITH_FREEBSD_AGP)
+	${REINPLACE_CMD} 's/undef NV_SUPPORT_OS_AGP/define NV_SUPPORT_OS_AGP/' \
 		${WRKSRC}/src/nv-freebsd.h
-. endif
-. if defined(WITH_VM86_INT10CALL)
-	@${REINPLACE_CMD} 's/undef NV_USE_OS_VM86_INT10CALL/define NV_USE_OS_VM86_INT10CALL/' \
+.endif
+.if defined(WITH_VM86_INT10CALL)
+	${REINPLACE_CMD} 's/undef NV_USE_OS_VM86_INT10CALL/define NV_USE_OS_VM86_INT10CALL/' \
 		${WRKSRC}/src/nv-freebsd.h
-. endif
-. if defined(WITH_ACPI)
-	@${REINPLACE_CMD} 's/undef NV_SUPPORT_ACPI_PM/define NV_SUPPORT_ACPI_PM/' \
+.endif
+.if defined(WITH_ACPI)
+	${REINPLACE_CMD} 's/undef NV_SUPPORT_ACPI_PM/define NV_SUPPORT_ACPI_PM/' \
 		${WRKSRC}/src/nv-freebsd.h
-. endif
-. if defined(WITHOUT_LINUX)
-	@${REINPLACE_CMD} 's/define NV_SUPPORT_LINUX_COMPAT/undef NV_SUPPORT_LINUX_COMPAT/' \
+.endif
+.if defined(WITHOUT_LINUX)
+	${REINPLACE_CMD} 's/define NV_SUPPORT_LINUX_COMPAT/undef NV_SUPPORT_LINUX_COMPAT/' \
 		${WRKSRC}/src/nv-freebsd.h
-. endif
 .endif
 
 post-install:
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 32087daaee45..7213c6402748 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,2 +1,4 @@
 MD5 (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 1dab16b9ebf3ab4253811b6ba29fc701
 SIZE (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 6215565
+MD5 (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = b57a03e0325617092016144229ae6114
+SIZE (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = 8433799
diff --git a/x11/nvidia-driver/files/patch-src::nvidia_pci.c b/x11/nvidia-driver/files/6113-patch-src::nvidia_pci.c
index 082db9f51d82..082db9f51d82 100644
--- a/x11/nvidia-driver/files/patch-src::nvidia_pci.c
+++ b/x11/nvidia-driver/files/6113-patch-src::nvidia_pci.c
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index bb421706b6c9..e9cf4798e765 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -36,12 +36,12 @@ lib/modules/extensions/libglx.so.1
 %%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/glx.h
 %%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/glext.h
 %%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/glxtokens.h
-%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/agp.ko-hints.diff
-%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/machdep.c.diff
-%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/vm_map.c_4.10.diff
-%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/device_pager.c_4.10.diff
-%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/vm_object.c_5.2.diff
-%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/device_pager.c_5.2.diff
+%%DIFFS%%%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/agp.ko-hints.diff
+%%DIFFS%%%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/machdep.c.diff
+%%DIFFS%%%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/vm_map.c_4.10.diff
+%%DIFFS%%%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/device_pager.c_4.10.diff
+%%DIFFS%%%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/vm_object.c_5.2.diff
+%%DIFFS%%%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/device_pager.c_5.2.diff
 %%PORTDOCS%%@dirrm share/doc/NVIDIA_GLX-1.0
 %%FREEBSD4%%@cwd /modules
 %%FREEBSD5%%@cwd /boot/modules