From owner-svn-ports-all@freebsd.org Wed Jul 10 15:41:56 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 675DF15DA8B7; Wed, 10 Jul 2019 15:41:56 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 044EE919DA; Wed, 10 Jul 2019 15:41:56 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D35351937B; Wed, 10 Jul 2019 15:41:55 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6AFftJ4050287; Wed, 10 Jul 2019 15:41:55 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6AFftt8050286; Wed, 10 Jul 2019 15:41:55 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201907101541.x6AFftt8050286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Wed, 10 Jul 2019 15:41:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506356 - head/x11/nvidia-driver X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: head/x11/nvidia-driver X-SVN-Commit-Revision: 506356 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 044EE919DA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jul 2019 15:41:56 -0000 Author: tijl Date: Wed Jul 10 15:41:55 2019 New Revision: 506356 URL: https://svnweb.freebsd.org/changeset/ports/506356 Log: Use LINUX_DEFAULT unmodified. The _64 suffix is no longer used. Also compare with c6 instead of c7 because c6 is expected to be the only distribution that doesn't use libglvnd from now on. Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Wed Jul 10 15:10:38 2019 (r506355) +++ head/x11/nvidia-driver/Makefile Wed Jul 10 15:41:55 2019 (r506356) @@ -296,7 +296,7 @@ PLIST_SUB+= LINUXBASE=${LINUXBASE} \ .include .if ${PORT_OPTIONS:MLINUX} -.if ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT:S/_64//} == c7 +.if ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6 USE_LINUX+= libglvnd PLIST_RE+= '\,${LINUXBASE}.*libEGL\.so,d' \ '\,${LINUXBASE}.*libGL\.so,d' \ @@ -392,7 +392,7 @@ LINUX32_LIBS+= libGLdispatch.so.0 \ PLIST_RE+= '\,${LINUXBASE}.*libGLdispatch\.so,d' \ '\,${LINUXBASE}.*libOpenGL\.so,d' .endif -.endif # ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT:S/_64//} == c7 +.endif # ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6 .if ${ARCH} == amd64 .if ${NVVERSION} >= 310.014