- Move mainstream version to 346.xx (update to 346.35) and create another

  legacy slave port `x11/nvidia-driver-340'; update top comment accordingly
- No longer explicitly advertise brokenness for ${OSVERSION} > 1000041 and
  ${NVVERSION} <= 71.08615 combination: not only old legacy ports recently
  had been removed, but frankly users of those old gfx cards should either
  not be running FreeBSD 10.x or totally rely on self-support, thus making
  this BROKEN statement merely an annoyance for them (other checks for some
  older driver versions still remain as being functional)
- Change CONFLICTS to CONFLICTS_INSTALL (honestly, this change *should* be
  no-op since CONFLICTS should be installation-time conflicts in the first
  place, but adhere to this stupidity of the framework for the time being)

2 files changed, 12 insertions, 9 deletions

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index b0093f18698b..9d6824173804 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -7,11 +7,11 @@
 # Starting with version 1.0-7667, NVidia has dropped support for numerous
 # "legacy" GPUs.  Consult NVidia README (the Appendix) to find out whether
 # you need to use legacy driver version and install one of corresponding
-# `x11/nvidia-driver-71', `x11/nvidia-driver-96', `x11/nvidia-driver-173',
-# or `x11/nvidia-driver-304' slave ports.
+# slave ports instead (`x11/nvidia-driver-173', `x11/nvidia-driver-304',
+# or `x11/nvidia-driver-340').
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	340.76
+DISTVERSION?=	346.35
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
@@ -117,13 +117,8 @@ PLIST_SUB+=	LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
 
 .include <bsd.port.options.mk>
 
-# FreeBSD src SVN r254138 had broken 71.86.xx legacy series :(
-.if ${OSVERSION} > 1000041 && ${NVVERSION} <= 71.08615
-BROKEN=		does not compile
-.endif
-
 .if ${PORT_OPTIONS:MLINUX}
-CONFLICTS=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
+CONFLICTS_INSTALL=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
 USE_LINUX=	yes
 PLIST_SUB+=	LINUX=""
 .else
@@ -240,6 +235,10 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile
 .endif
 	${REINPLACE_CMD} -e '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile
+# Also do not install libnvidia-gtk* libraries which are for nvidia-settings
+.if ${NVVERSION} >= 346.016
+	${REINPLACE_CMD} -e '/libnvidia-gtk/d' ${WRKSRC}/lib/Makefile
+.endif
 # Conditionally install documentation (but you generally want it)
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 98ae676d848b..26575393a18a 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,3 +1,7 @@
+SHA256 (NVIDIA-FreeBSD-x86_64-346.35.tar.gz) = 0a1c92efb9e29d0d4e1c099a5f2c69a29ac2431dbc33009cc83a35c794c48d33
+SIZE (NVIDIA-FreeBSD-x86_64-346.35.tar.gz) = 58753495
+SHA256 (NVIDIA-FreeBSD-x86-346.35.tar.gz) = c2decd38b2ff3e46a611acfd2ca41fd887b7223f6aee1f57f52717b4206e2be3
+SIZE (NVIDIA-FreeBSD-x86-346.35.tar.gz) = 57980205
 SHA256 (NVIDIA-FreeBSD-x86_64-340.76.tar.gz) = 60037d035b9af9f1d4dcdd5033e1b28b0cd4c7ca94f6bcb8d267e037a930fdc0
 SIZE (NVIDIA-FreeBSD-x86_64-340.76.tar.gz) = 60206978
 SHA256 (NVIDIA-FreeBSD-x86-340.76.tar.gz) = 0abbcc3bed3f017e7f1887a5c2d014e2b5a020462071998986ed49cdb8e7119f