Introduce WITH_LEGACY_GPU_SUPPORT option, which sticks us to previous

version of NVidia driver release for the sake of supporting some "legacy"
GPUs.  Note that this options is unsupported, and presumably would only be
needed for a few unlucky souls out there.

PR:		ports/82758

3 files changed, 56 insertions, 4 deletions

diff --git a/UPDATING b/UPDATING
index dcd6ce419a0..a90b9425a6d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,24 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20050630:
+  AFFECTS: users of x11/nvidia-driver
+  AUTHOR: danfe@FreeBSD.org
+
+  Due to several complaints, new (unsupported) option had been added to port
+  Makefile: WITH_LEGACY_GPU_SUPPORT.  Starting with version 7667, NVidia has
+  dropped support for numerous "legacy" GPUs, while this option allows to go
+  with previous version of driver (this does not apply to older versions of
+  FreeBSD, since you have to use version 6113 of driver (if you did not yet
+  upgraded to FreeBSD 5.3 or later) which has support for those GPUs).
+
+  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.
+
+  Refer to x11/nvidia-driver/Makefile for further details.
+
 20050624:
   AFFECTS: users of lang/perl5.8
   AUTHOR: tobez@FreeBSD.org
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 5cdc4217ac4..2051b5dd480 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -31,8 +31,10 @@ 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 bsd.port.mk.
+# Get __FreeBSD_version.  Needed to set PORTREVISION before including of
+# <bsd.port.pre.mk>.
 # XXX This is not required for -CURRENT XXX
+#
 .if !defined(OSVERSION)
 .if exists(/sbin/sysctl)
 OSVERSION!=	/sbin/sysctl -n kern.osreldate
@@ -42,19 +44,49 @@ OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
 .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 6113 version of driver for
+# 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).
+#
+# 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.
+#
+# 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=	7174
+PORTREVISION=	1
+EXTRA_PATCHES+=	${FILESDIR}/6113-patch-lib::Makefile
 .else
 NVVERSION=	7667
+EXTRA_PATCHES+=	${FILESDIR}/${NVVERSION}-*
+.endif
 PLIST_SUB+=	DIFFS="@comment " DRVSO=""
 .endif
-EXTRA_PATCHES+=	${FILESDIR}/${NVVERSION}-*
 
 .include <bsd.port.pre.mk>
 
@@ -86,7 +118,7 @@ PLIST_SUB+=	FREEBSD5="" FREEBSD4="@comment "
 
 post-patch: .SILENT
 # We should support -CURRENT: kill the check
-.if ${NVVERSION} == 7667
+.if ${NVVERSION} >= 7174
 	${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h
 .endif
 .if defined(WITH_FREEBSD_AGP)
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 9d198837594..1c42de7b79a 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,4 +1,6 @@
 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
 MD5 (NVIDIA-FreeBSD-x86-1.0-7667.tar.gz) = d65d0e882aea8055ed49bf20d8e8d781
 SIZE (NVIDIA-FreeBSD-x86-1.0-7667.tar.gz) = 8438232