From owner-svn-ports-all@freebsd.org Thu Nov 3 19:46:20 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A148C2DDBB; Thu, 3 Nov 2016 19:46:20 +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 mx1.freebsd.org (Postfix) with ESMTPS id 0A96B1F06; Thu, 3 Nov 2016 19:46:19 +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 uA3JkJ8O032418; Thu, 3 Nov 2016 19:46:19 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA3JkIs7032408; Thu, 3 Nov 2016 19:46:18 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201611031946.uA3JkIs7032408@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 3 Nov 2016 19:46:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425269 - in head: graphics/linux-c6-dri graphics/linux-c7-dri x11/nvidia-driver x11/nvidia-driver-304 x11/nvidia-driver-340 X-SVN-Group: ports-head 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.23 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: Thu, 03 Nov 2016 19:46:20 -0000 Author: tijl Date: Thu Nov 3 19:46:18 2016 New Revision: 425269 URL: https://svnweb.freebsd.org/changeset/ports/425269 Log: Allow linux-*-dri and nvidia-driver to coexist. Modified: head/graphics/linux-c6-dri/Makefile head/graphics/linux-c6-dri/pkg-plist.i386 head/graphics/linux-c6-dri/pkg-plist.x86_64 head/graphics/linux-c7-dri/Makefile head/graphics/linux-c7-dri/pkg-plist.i386 head/graphics/linux-c7-dri/pkg-plist.x86_64 head/x11/nvidia-driver-304/Makefile head/x11/nvidia-driver-340/Makefile head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/pkg-plist Modified: head/graphics/linux-c6-dri/Makefile ============================================================================== --- head/graphics/linux-c6-dri/Makefile Thu Nov 3 18:30:42 2016 (r425268) +++ head/graphics/linux-c6-dri/Makefile Thu Nov 3 19:46:18 2016 (r425269) @@ -3,6 +3,7 @@ PORTNAME= dri PORTVERSION= 11.0.7 +PORTREVISION= 1 CATEGORIES= graphics linux LIB_DISTFILES= mesa-libGL-${PORTVERSION}-4.el6${EXTRACT_SUFX} \ mesa-libGLU-${PORTVERSION}-4.el6${EXTRACT_SUFX} \ Modified: head/graphics/linux-c6-dri/pkg-plist.i386 ============================================================================== --- head/graphics/linux-c6-dri/pkg-plist.i386 Thu Nov 3 18:30:42 2016 (r425268) +++ head/graphics/linux-c6-dri/pkg-plist.i386 Thu Nov 3 19:46:18 2016 (r425269) @@ -1,4 +1,4 @@ -%%ETCDIR%%rc +etc/drirc lib/udev/rules.d/91-drm-modeset.rules usr/lib/dri/i915_dri.so usr/lib/dri/i965_dri.so @@ -9,7 +9,8 @@ usr/lib/dri/radeon_dri.so usr/lib/dri/radeonsi_dri.so usr/lib/dri/swrast_dri.so usr/lib/dri/vmwgfx_dri.so -usr/lib/libGL.so.1 +@postexec [ -e %D/usr/lib/libGL.so.1 ] || ln -sf libGL.so.1.2.0 %D/usr/lib/libGL.so.1 +@postunexec [ -e %D/usr/lib/libGL.so.1 ] || rm -f %D/usr/lib/libGL.so.1 usr/lib/libGL.so.1.2.0 usr/lib/libGLU.so.1 usr/lib/libGLU.so.1.3.1 Modified: head/graphics/linux-c6-dri/pkg-plist.x86_64 ============================================================================== --- head/graphics/linux-c6-dri/pkg-plist.x86_64 Thu Nov 3 18:30:42 2016 (r425268) +++ head/graphics/linux-c6-dri/pkg-plist.x86_64 Thu Nov 3 19:46:18 2016 (r425269) @@ -1,4 +1,4 @@ -%%ETCDIR%%rc +etc/drirc lib/udev/rules.d/91-drm-modeset.rules usr/lib/dri/i915_dri.so usr/lib/dri/i965_dri.so @@ -9,7 +9,8 @@ usr/lib/dri/radeon_dri.so usr/lib/dri/radeonsi_dri.so usr/lib/dri/swrast_dri.so usr/lib/dri/vmwgfx_dri.so -usr/lib/libGL.so.1 +@postexec [ -e %D/usr/lib/libGL.so.1 ] || ln -sf libGL.so.1.2.0 %D/usr/lib/libGL.so.1 +@postunexec [ -e %D/usr/lib/libGL.so.1 ] || rm -f %D/usr/lib/libGL.so.1 usr/lib/libGL.so.1.2.0 usr/lib/libGLU.so.1 usr/lib/libGLU.so.1.3.1 @@ -39,7 +40,8 @@ usr/lib64/dri/radeon_dri.so usr/lib64/dri/radeonsi_dri.so usr/lib64/dri/swrast_dri.so usr/lib64/dri/vmwgfx_dri.so -usr/lib64/libGL.so.1 +@postexec [ -e %D/usr/lib64/libGL.so.1 ] || ln -sf libGL.so.1.2.0 %D/usr/lib64/libGL.so.1 +@postunexec [ -e %D/usr/lib64/libGL.so.1 ] || rm -f %D/usr/lib64/libGL.so.1 usr/lib64/libGL.so.1.2.0 usr/lib64/libGLU.so.1 usr/lib64/libGLU.so.1.3.1 Modified: head/graphics/linux-c7-dri/Makefile ============================================================================== --- head/graphics/linux-c7-dri/Makefile Thu Nov 3 18:30:42 2016 (r425268) +++ head/graphics/linux-c7-dri/Makefile Thu Nov 3 19:46:18 2016 (r425269) @@ -3,6 +3,7 @@ PORTNAME= dri PORTVERSION= 10.6.5 +PORTREVISION= 1 CATEGORIES= graphics linux LIB_DISTFILES= mesa-libGL-${PORTVERSION}-3.20150824.el7${EXTRACT_SUFX} \ mesa-libGLU-9.0.0-4.el7${EXTRACT_SUFX} \ Modified: head/graphics/linux-c7-dri/pkg-plist.i386 ============================================================================== --- head/graphics/linux-c7-dri/pkg-plist.i386 Thu Nov 3 18:30:42 2016 (r425268) +++ head/graphics/linux-c7-dri/pkg-plist.i386 Thu Nov 3 19:46:18 2016 (r425269) @@ -8,7 +8,8 @@ usr/lib/dri/r600_dri.so usr/lib/dri/radeonsi_dri.so usr/lib/dri/swrast_dri.so usr/lib/dri/vmwgfx_dri.so -usr/lib/libGL.so.1 +@postexec [ -e %D/usr/lib/libGL.so.1 ] || ln -sf libGL.so.1.2.0 %D/usr/lib/libGL.so.1 +@postunexec [ -e %D/usr/lib/libGL.so.1 ] || rm -f %D/usr/lib/libGL.so.1 usr/lib/libGL.so.1.2.0 usr/lib/libGLU.so.1 usr/lib/libGLU.so.1.3.1 Modified: head/graphics/linux-c7-dri/pkg-plist.x86_64 ============================================================================== --- head/graphics/linux-c7-dri/pkg-plist.x86_64 Thu Nov 3 18:30:42 2016 (r425268) +++ head/graphics/linux-c7-dri/pkg-plist.x86_64 Thu Nov 3 19:46:18 2016 (r425269) @@ -8,7 +8,8 @@ usr/lib/dri/r600_dri.so usr/lib/dri/radeonsi_dri.so usr/lib/dri/swrast_dri.so usr/lib/dri/vmwgfx_dri.so -usr/lib/libGL.so.1 +@postexec [ -e %D/usr/lib/libGL.so.1 ] || ln -sf libGL.so.1.2.0 %D/usr/lib/libGL.so.1 +@postunexec [ -e %D/usr/lib/libGL.so.1 ] || rm -f %D/usr/lib/libGL.so.1 usr/lib/libGL.so.1.2.0 usr/lib/libGLU.so.1 usr/lib/libGLU.so.1.3.1 @@ -34,7 +35,8 @@ usr/lib64/dri/r600_dri.so usr/lib64/dri/radeonsi_dri.so usr/lib64/dri/swrast_dri.so usr/lib64/dri/vmwgfx_dri.so -usr/lib64/libGL.so.1 +@postexec [ -e %D/usr/lib64/libGL.so.1 ] || ln -sf libGL.so.1.2.0 %D/usr/lib64/libGL.so.1 +@postunexec [ -e %D/usr/lib64/libGL.so.1 ] || rm -f %D/usr/lib64/libGL.so.1 usr/lib64/libGL.so.1.2.0 usr/lib64/libGLU.so.1 usr/lib64/libGLU.so.1.3.1 Modified: head/x11/nvidia-driver-304/Makefile ============================================================================== --- head/x11/nvidia-driver-304/Makefile Thu Nov 3 18:30:42 2016 (r425268) +++ head/x11/nvidia-driver-304/Makefile Thu Nov 3 19:46:18 2016 (r425269) @@ -3,7 +3,7 @@ DISTVERSION= 304.131 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 1 +PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -304 Modified: head/x11/nvidia-driver-340/Makefile ============================================================================== --- head/x11/nvidia-driver-340/Makefile Thu Nov 3 18:30:42 2016 (r425268) +++ head/x11/nvidia-driver-340/Makefile Thu Nov 3 19:46:18 2016 (r425269) @@ -3,7 +3,7 @@ DISTVERSION= 340.96 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 1 +PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -340 Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Thu Nov 3 18:30:42 2016 (r425268) +++ head/x11/nvidia-driver/Makefile Thu Nov 3 19:46:18 2016 (r425269) @@ -12,7 +12,7 @@ PORTNAME= nvidia-driver DISTVERSION?= 367.44 # 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} Modified: head/x11/nvidia-driver/pkg-plist ============================================================================== --- head/x11/nvidia-driver/pkg-plist Thu Nov 3 18:30:42 2016 (r425268) +++ head/x11/nvidia-driver/pkg-plist Thu Nov 3 19:46:18 2016 (r425269) @@ -40,6 +40,7 @@ man/man1/nvidia-smi.1.gz %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so %%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.1 +%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%/usr/lib/libGL.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so