Date: Tue, 3 Feb 2015 16:18:34 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378360 - in head/x11: . nvidia-driver nvidia-driver-340 Message-ID: <201502031618.t13GIYfd032968@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Feb 3 16:18:34 2015 New Revision: 378360 URL: https://svnweb.freebsd.org/changeset/ports/378360 QAT: https://qat.redports.org/buildarchive/r378360/ Log: - 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) Added: head/x11/nvidia-driver-340/ head/x11/nvidia-driver-340/Makefile (contents, props changed) Modified: head/x11/Makefile head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/distinfo Modified: head/x11/Makefile ============================================================================== --- head/x11/Makefile Tue Feb 3 15:18:34 2015 (r378359) +++ head/x11/Makefile Tue Feb 3 16:18:34 2015 (r378360) @@ -212,6 +212,7 @@ SUBDIR += nvidia-driver SUBDIR += nvidia-driver-173 SUBDIR += nvidia-driver-304 + SUBDIR += nvidia-driver-340 SUBDIR += nvidia-settings SUBDIR += nvidia-xconfig SUBDIR += nxcomp Added: head/x11/nvidia-driver-340/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/nvidia-driver-340/Makefile Tue Feb 3 16:18:34 2015 (r378360) @@ -0,0 +1,11 @@ +# Created by: Alexey Dokuchaev <danfe@FreeBSD.org> +# $FreeBSD$ + +DISTVERSION= 340.76 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../nvidia-driver +PKGNAMESUFFIX= -340 + +.include "${MASTERDIR}/Makefile" Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Tue Feb 3 15:18:34 2015 (r378359) +++ head/x11/nvidia-driver/Makefile Tue Feb 3 16:18:34 2015 (r378360) @@ -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 .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 Modified: head/x11/nvidia-driver/distinfo ============================================================================== --- head/x11/nvidia-driver/distinfo Tue Feb 3 15:18:34 2015 (r378359) +++ head/x11/nvidia-driver/distinfo Tue Feb 3 16:18:34 2015 (r378360) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502031618.t13GIYfd032968>