From owner-svn-ports-all@FreeBSD.ORG Wed Dec 25 16:24:38 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B9DA76F; Wed, 25 Dec 2013 16:24:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0B5561112; Wed, 25 Dec 2013 16:24:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPGObo6002861; Wed, 25 Dec 2013 16:24:37 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPGObwf002859; Wed, 25 Dec 2013 16:24:37 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201312251624.rBPGObwf002859@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 25 Dec 2013 16:24:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337429 - head/x11/nvidia-driver 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.17 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, 25 Dec 2013 16:24:38 -0000 Author: danfe Date: Wed Dec 25 16:24:37 2013 New Revision: 337429 URL: http://svnweb.freebsd.org/changeset/ports/337429 Log: In sight of upcoming update, do some cleaning: convert to Uses=kmod and then do not explicitly set SSP_UNSAFE and augment CATEGORIES; also sort pkg-plist. Modified: head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/pkg-plist Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Wed Dec 25 15:09:12 2013 (r337428) +++ head/x11/nvidia-driver/Makefile Wed Dec 25 16:24:37 2013 (r337429) @@ -5,7 +5,7 @@ PORTNAME= nvidia-driver DISTVERSION?= 319.32 # Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 -CATEGORIES= x11 kld +CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_NVIDIA} # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION DISTNAME= NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION} @@ -18,8 +18,8 @@ LICENSE_NAME= License For Customer Use o LICENSE_FILE= ${WRKSRC}/doc/license.txt LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept -SSP_UNSAFE= kernel module does not support ssp ARCH_SUFX= ${ARCH:S/i386//:S/amd/_/} +USES= kmod USE_XORG= xorg-server USE_GL= gl USE_LDCONFIG= yes @@ -29,9 +29,8 @@ USE_LDCONFIG= yes # -Wmissing-include-dirs was added for kernel sources. Until properly # fixed upstream (across all versions, including legacy ones), use this # hack below to universally set NVIDIA_ROOT. Also provide X11BASE value -# since it is going away from `Mk/bsd.port.mk' as deprecated. -MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE} \ - SYSDIR=${SRC_BASE}/sys +# since it is still used by legacy drivers. +MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE} SUB_FILES= pkg-deinstall pkg-install pkg-message DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules Modified: head/x11/nvidia-driver/pkg-plist ============================================================================== --- head/x11/nvidia-driver/pkg-plist Wed Dec 25 15:09:12 2013 (r337428) +++ head/x11/nvidia-driver/pkg-plist Wed Dec 25 16:24:37 2013 (r337429) @@ -2,28 +2,27 @@ bin/nvidia-bug-report.sh lib/.nvidia/libGL.so lib/.nvidia/libGL.so.1 @dirrm lib/.nvidia -lib/libnvidia-tls.so.1 -lib/libnvidia-tls.so -lib/libnvidia-cfg.so.1 -lib/libnvidia-cfg.so -lib/libGLcore.so.1 lib/libGLcore.so -lib/vdpau/libvdpau_nvidia.so.1 -lib/libvdpau_nvidia.so -lib/libXvMCNVIDIA.so.1 -lib/libXvMCNVIDIA.so +lib/libGLcore.so.1 lib/libXvMCNVIDIA.a +lib/libXvMCNVIDIA.so +lib/libXvMCNVIDIA.so.1 lib/libXvMCNVIDIA_dynamic.so.1 +lib/libnvidia-cfg.so +lib/libnvidia-cfg.so.1 +lib/libnvidia-tls.so +lib/libnvidia-tls.so.1 +lib/libvdpau_nvidia.so +lib/vdpau/libvdpau_nvidia.so.1 @dirrmtry lib/vdpau -%%MODULESDIR%%/libnvidia-wfb.so.1 %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/.nvidia/libglx.so %%MODULESDIR%%/extensions/.nvidia/libglx.so.1 +%%MODULESDIR%%/libnvidia-wfb.so.1 @dirrm %%MODULESDIR%%/extensions/.nvidia @dirrmtry %%MODULESDIR%%/drivers -@cwd /boot/modules +@cwd /%%KMODDIR%% nvidia.ko -@unexec kldxref %D %%LINUX%%@cwd %%LINUXBASE%% %%LINUX%%usr/lib/libGL.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libGL.so.1