From owner-svn-ports-all@freebsd.org Fri Aug 31 19:45:05 2018 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 5469EFDA5E0; Fri, 31 Aug 2018 19:45:05 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 07DC7824E0; Fri, 31 Aug 2018 19:45:05 +0000 (UTC) (envelope-from glebius@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 D8BBB1FB64; Fri, 31 Aug 2018 19:45:04 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7VJj4R8096796; Fri, 31 Aug 2018 19:45:04 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7VJj4io096795; Fri, 31 Aug 2018 19:45:04 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201808311945.w7VJj4io096795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 31 Aug 2018 19:45:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478606 - head/x11/nvidia-driver X-SVN-Group: ports-head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/x11/nvidia-driver X-SVN-Commit-Revision: 478606 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 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: Fri, 31 Aug 2018 19:45:05 -0000 Author: glebius (src committer) Date: Fri Aug 31 19:45:04 2018 New Revision: 478606 URL: https://svnweb.freebsd.org/changeset/ports/478606 Log: Unbreak nVidia drivers on recent -CURRENT, after change to kmem_free() in r338318. PR: 230780 Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Fri Aug 31 18:41:08 2018 (r478605) +++ head/x11/nvidia-driver/Makefile Fri Aug 31 19:45:04 2018 (r478606) @@ -12,7 +12,7 @@ PORTNAME= nvidia-driver DISTVERSION?= 390.77 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} @@ -113,9 +113,10 @@ MAKE_ENV+= WITHOUT_LINUX=yes .endif post-patch: .SILENT -# KPI of kmem_alloc_contig() changed in FreeBSD src r338143 +# KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318 .if ${OSVERSION} >= 1200079 ${REINPLACE_CMD} -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' ${WRKSRC}/src/${NVSRC}/nvidia_subr.c + ${REINPLACE_CMD} -e 's/kmem_free(kmem_arena, /kmem_free(/' ${WRKSRC}/src/${NVSRC}/nvidia_subr.c .endif # We should support -CURRENT: kill the check ${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/${NVSRC}/nv-freebsd.h