From owner-svn-ports-head@freebsd.org Thu Jun 7 16:04:43 2018 Return-Path: Delivered-To: svn-ports-head@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 3EC60FE2AFC; Thu, 7 Jun 2018 16:04:43 +0000 (UTC) (envelope-from danfe@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 E404B717BD; Thu, 7 Jun 2018 16:04:42 +0000 (UTC) (envelope-from danfe@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 C6267225F2; Thu, 7 Jun 2018 16:04:42 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w57G4gex012469; Thu, 7 Jun 2018 16:04:42 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w57G4g9o012468; Thu, 7 Jun 2018 16:04:42 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201806071604.w57G4g9o012468@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 7 Jun 2018 16:04:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471930 - head/x11/nvidia-driver X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/x11/nvidia-driver X-SVN-Commit-Revision: 471930 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2018 16:04:43 -0000 Author: danfe Date: Thu Jun 7 16:04:42 2018 New Revision: 471930 URL: https://svnweb.freebsd.org/changeset/ports/471930 Log: Garbage-collect some no longer relevant patching (it does nothing these days); these are not the changes being made, these are previous changes being removed: - Fix CTLFLAG_* values for SYSCTL_ADD_PROC() after FreeBSD src r273377 - Replace `d_thread_t' (FreeBSD 4 support compat shim) with `struct thread' Reviewed by: grep(1), diff(1), sha1(1) Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Thu Jun 7 16:01:09 2018 (r471929) +++ head/x11/nvidia-driver/Makefile Thu Jun 7 16:04:42 2018 (r471930) @@ -137,19 +137,6 @@ post-patch: .SILENT ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c .endif -# Fix CTLFLAG_* values for SYSCTL_ADD_PROC() after FreeBSD src r273377 - ${REINPLACE_CMD} -e '/SYSCTL_ADD_PROC/,/;/ \ - s/^[[:blank:]]*CTLFLAG_RD/CTLTYPE_STRING |&/' \ - ${WRKSRC}/src/${NVSRC}/nvidia_sysctl.c -# Replace `d_thread_t' (FreeBSD 4 support compat shim) with `struct thread' - ${REINPLACE_CMD} -e 's/d_thread_t/struct thread/' \ - ${WRKSRC}/src/${NVSRC}/nvidia_ctl.c \ - ${WRKSRC}/src/${NVSRC}/nvidia_dev.c \ - ${WRKSRC}/src/${NVSRC}/nvidia_linux.c -.if ${NVVERSION} >= 358.009 - ${REINPLACE_CMD} -e 's/d_thread_t/struct thread/' \ - ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c -.endif # Respect WITHOUT_LINUX setting ${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& !defined(WITHOUT_LINUX)/' \ ${WRKSRC}/lib/Makefile