- Update to most recent version from nVidia, 9631

- As threatened, drop support for FreeBSD 4.X
- Apply minor fix for master sites [*]
- Add last padding line for pkg-message for prettier output

Tested on:	FreeBSD 6.2-PRERELEASE (i386)

[*] alepulver@ will take care of master sites in separate commit

6 files changed, 16 insertions, 106 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 01975f73bda9..d3f343105c77 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	nvidia-driver
 PORTVERSION=	1.0.${NVVERSION}
 CATEGORIES=	x11
-MASTER_SITES=	http://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
+MASTER_SITES=	http://us.download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
 		ftp://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
 		http://download1.nvidia.com/freebsd/1.0-${NVVERSION}/ \
 		ftp://download1.nvidia.com/freebsd/1.0-${NVVERSION}/
@@ -42,52 +42,34 @@ OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
 .endif
 .endif
 
-# 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 version 6113 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.
-#
 # Starting with version 7667, NVidia has dropped support for numerous
 # "legacy" GPUs.  One can, however, build the port with -DWITH_LEGACY_GPU_SUPPORT
-# to go with version 7174 of driver (this does not apply to older versions
-# of FreeBSD, since one has to use version 6113 of driver (if [s]he did not
-# yet upgraded to FreeBSD 5.3 or later) which has support for those GPUs).
+# to go with version 7184 of the driver.
 #
 # If you must use WITH_LEGACY_GPU_SUPPORT option, be sure to ``hold'' the
 # package by making appropriate entry in your pkgtools.conf, otherwise
 # portupgrade(1) will upgrade your port to latest NVidia release on the
 # next run, which is probably not what you want.
 #
-# 			ATTENTION!! ACHTUNG!! VNIMANIE!!
-#
-# This very Makefile is already overly complicated, thus support for
-# multiple versions of NVidia releases is going away once we stop caring for
-# ports on 4.x versions of FreeBSD.  This also applies to "legacy GPUs"
-# support.  Those poor souls^W^Wproud owners of RIVA's and Vanta's, frankly,
-# should consider buying a modern gfx card.
+# Please be aware that legacy GPUs support is probably going away in some
+# near future (once nVidia itself cancels support of those).  Those poor
+# souls^W^Wproud owners of RIVA's and Vanta's, frankly, should consider
+# buying a modern gfx card.
 #
 # XXX WITH_LEGACY_GPU_SUPPORT is not in OPTIONS because it has to be handled
 # _before_ including of <bsd.port.pre.mk>.  On the other hand, it is really
 # an UNSUPPORTED option anyway, so this is for good to hide it here XXX
 #
-.if ${OSVERSION} < 503000
-NVVERSION=	6113
-PORTREVISION=	4
-PLIST_SUB+=	DIFFS="" DRVSO="@comment "
-EXTRA_PATCHES+=	${FILESDIR}/${NVVERSION}-*
-.else
 .if defined(WITH_LEGACY_GPU_SUPPORT)
 NVVERSION=	7184
 EXTRA_PATCHES+=	${FILESDIR}/6113-patch-lib::Makefile
 .else
-NVVERSION=	8776
+NVVERSION=	9631
 EXTRA_PATCHES+=	${FILESDIR}/7667-*
 .endif
 .if ${OSVERSION} >= 600033
 LIB_DEPENDS+=	m.3:${PORTSDIR}/misc/compat5x
 .endif
-PLIST_SUB+=	DIFFS="@comment " DRVSO=""
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -109,14 +91,8 @@ PLIST_SUB+=	LINUX=""
 PLIST_SUB+=	LINUX="@comment "
 .endif
 
-.if ${OSVERSION} < 490000 || ${OSVERSION} >= 500000 && ${OSVERSION} < 502001
-IGNORE=		supports FreeBSD -STABLE (4.9 or later, 5.2.1 or later), or FreeBSD -CURRENT
-.endif
-
-.if ${OSVERSION} < 500000
-PLIST_SUB+=	FREEBSD5="@comment " FREEBSD4=""
-.else
-PLIST_SUB+=	FREEBSD5="" FREEBSD4="@comment "
+.if ${OSVERSION} < 503000
+IGNORE=		supports FreeBSD-STABLE (5.3 or later), or FreeBSD-CURRENT
 .endif
 
 post-patch: .SILENT
@@ -154,16 +130,6 @@ post-install:
 	@${REINPLACE_CMD} '/README\.Linux/d' ${TMPPLIST}
 .endif
 	${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
-.if ${OSVERSION} < 500000
-.for dev in 0 1 2 3
-	@${RM} -f /dev/nvidia${dev}
-	@mknod /dev/nvidia${dev} c 180 ${dev}
-	@${CHMOD} 0666 /dev/nvidia${dev}
-.endfor
-	@${RM} -f /dev/nvidiactl
-	@mknod /dev/nvidiactl c 180 255
-	@${CHMOD} 0666 /dev/nvidiactl
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 762146dc6049..fe930e618058 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,9 +1,6 @@
-MD5 (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 1dab16b9ebf3ab4253811b6ba29fc701
-SHA256 (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 0a52b6f7d928e6bee8d14defa46267bdce142a81a6aa4d6f6e4e19379e4995eb
-SIZE (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 6215565
 MD5 (NVIDIA-FreeBSD-x86-1.0-7184.tar.gz) = ee5907345b9f25527c3ec41f5ac269e3
 SHA256 (NVIDIA-FreeBSD-x86-1.0-7184.tar.gz) = f6de6961b540b852e79fb7aa5a95714a13c6984429968448432106d89493e02d
 SIZE (NVIDIA-FreeBSD-x86-1.0-7184.tar.gz) = 8441698
-MD5 (NVIDIA-FreeBSD-x86-1.0-8776.tar.gz) = 6a8bb2e699a967b6b20dc24a96bf363d
-SHA256 (NVIDIA-FreeBSD-x86-1.0-8776.tar.gz) = 404f25862031d8f3036de33d2a0fafc3c54821a9a08832c1c1616c145d93baa5
-SIZE (NVIDIA-FreeBSD-x86-1.0-8776.tar.gz) = 9448963
+MD5 (NVIDIA-FreeBSD-x86-1.0-9631.tar.gz) = d560b1e7d5b0209da7aa32526cdda921
+SHA256 (NVIDIA-FreeBSD-x86-1.0-9631.tar.gz) = 2b467da57bc3bb8e2216ce3d02909cf077da045ebcf294474b784cb521a5d550
+SIZE (NVIDIA-FreeBSD-x86-1.0-9631.tar.gz) = 9667093
diff --git a/x11/nvidia-driver/files/6113-patch-src::nvidia_pci.c b/x11/nvidia-driver/files/6113-patch-src::nvidia_pci.c
deleted file mode 100644
index 082db9f51d82..000000000000
--- a/x11/nvidia-driver/files/6113-patch-src::nvidia_pci.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/nvidia_pci.c.orig	Mon Aug 16 17:40:56 2004
-+++ src/nvidia_pci.c	Mon Aug 16 17:41:20 2004
-@@ -218,6 +218,9 @@
- };
- 
- DRIVER_MODULE(nvidia, pci, nvidia_pci_driver, nvidia_devclass, nvidia_modevent, 0);
-+#if __FreeBSD_version > 502126
-+MODULE_DEPEND(nvidia, mem, 1, 1, 1);
-+#endif
- 
- #ifdef NV_SUPPORT_OS_AGP
- MODULE_DEPEND(nvidia, agp, 1, 1, 1);
diff --git a/x11/nvidia-driver/files/6113-patch-src::nvidia_subr.c b/x11/nvidia-driver/files/6113-patch-src::nvidia_subr.c
deleted file mode 100644
index 7432e9861e6b..000000000000
--- a/x11/nvidia-driver/files/6113-patch-src::nvidia_subr.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/nvidia_subr.c.orig	Sat Feb 19 13:19:54 2005
-+++ src/nvidia_subr.c	Sat Feb 19 13:22:47 2005
-@@ -1115,10 +1115,15 @@
- 
- #if __FreeBSD_version < 500000
-         vm_page_wire(m);
-+#else
-+        VM_OBJECT_LOCK(m->object);
- #endif
-         vm_page_lock_queues();
-         vm_page_wakeup(m);
-         vm_page_unlock_queues();
-+#if __FreeBSD_version >= 500000
-+        VM_OBJECT_UNLOCK(m->object);
-+#endif
-     }
- 
-     at->object = object;
diff --git a/x11/nvidia-driver/files/pkg-message.in b/x11/nvidia-driver/files/pkg-message.in
index 622ade6121b3..4f0cbca2fa94 100644
--- a/x11/nvidia-driver/files/pkg-message.in
+++ b/x11/nvidia-driver/files/pkg-message.in
@@ -31,3 +31,4 @@ in /var/log/Xorg.0.log while actually you have ``options SYSVSHM''
 enabled in kernel, the sysctl ``kern.ipc.shmall'' should be increased.
 
 See %%PREFIX%%/share/doc/NVIDIA_GLX-1.0/README for more information.
+
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 977d5a79efae..ba65748f77a9 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -28,7 +28,7 @@ lib/libnvidia-tls.so.1
 @unexec rm -f %D/lib/libnvidia-tls.so
 lib/libXvMCNVIDIA.a
 lib/modules/drivers/nvidia_drv.o
-%%DRVSO%%lib/modules/drivers/nvidia_drv.so
+lib/modules/drivers/nvidia_drv.so
 lib/modules/extensions/libglx.so.1
 @exec ln -sf %D/lib/modules/extensions/libglx.so.1 %D/lib/modules/extensions/libglx.so
 %%PORTDOCS%%%%DOCSDIR%%/html/appendix-a.html
@@ -80,34 +80,10 @@ lib/modules/extensions/libglx.so.1
 %%PORTDOCS%%%%DOCSDIR%%/glx.h
 %%PORTDOCS%%%%DOCSDIR%%/glext.h
 %%PORTDOCS%%%%DOCSDIR%%/glxtokens.h
-%%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/agp.ko-hints.diff
-%%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/machdep.c.diff
-%%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/vm_map.c_4.10.diff
-%%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/device_pager.c_4.10.diff
-%%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/vm_object.c_5.2.diff
-%%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/device_pager.c_5.2.diff
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%FREEBSD4%%@cwd /modules
-%%FREEBSD5%%@cwd /boot/modules
+@cwd /boot/modules
 nvidia.ko
-%%FREEBSD5%%@unexec kldxref %D
-%%FREEBSD4%%@cwd /dev
-%%FREEBSD4%%MAKEDEV.nvidia
-%%FREEBSD4%%@exec mknod /dev/nvidia0 c 180 0
-%%FREEBSD4%%@exec chmod 0666 /dev/nvidia0
-%%FREEBSD4%%@exec mknod /dev/nvidia1 c 180 1
-%%FREEBSD4%%@exec chmod 0666 /dev/nvidia1
-%%FREEBSD4%%@exec mknod /dev/nvidia2 c 180 2
-%%FREEBSD4%%@exec chmod 0666 /dev/nvidia2
-%%FREEBSD4%%@exec mknod /dev/nvidia3 c 180 3
-%%FREEBSD4%%@exec chmod 0666 /dev/nvidia3
-%%FREEBSD4%%@exec mknod /dev/nvidiactl c 180 255
-%%FREEBSD4%%@exec chmod 0666 /dev/nvidiactl
-%%FREEBSD4%%@unexec rm -f /dev/nvidia0
-%%FREEBSD4%%@unexec rm -f /dev/nvidia1
-%%FREEBSD4%%@unexec rm -f /dev/nvidia2
-%%FREEBSD4%%@unexec rm -f /dev/nvidia3
-%%FREEBSD4%%@unexec rm -f /dev/nvidiactl
+@unexec kldxref %D
 %%LINUX%%@cwd %%LINUXBASE%%
 %%LINUX%%usr/lib/libGL.so.1.0.%%NVVERSION%%
 %%LINUX%%usr/lib/libGLcore.so.1.0.%%NVVERSION%%