From owner-svn-ports-all@FreeBSD.ORG Thu Feb 27 07:50:05 2014 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 6A8EB200; Thu, 27 Feb 2014 07:50:05 +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 54AEF1485; Thu, 27 Feb 2014 07:50:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1R7o5ok098039; Thu, 27 Feb 2014 07:50:05 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1R7o4Aj098027; Thu, 27 Feb 2014 07:50:04 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201402270750.s1R7o4Aj098027@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 27 Feb 2014 07:50:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346243 - in head/x11/nvidia-driver: . files 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: Thu, 27 Feb 2014 07:50:05 -0000 Author: danfe Date: Thu Feb 27 07:50:03 2014 New Revision: 346243 URL: http://svnweb.freebsd.org/changeset/ports/346243 QAT: https://qat.redports.org/buildarchive/r346243/ Log: - Unbreak the build of 173.14.xx legacy version on recent -CURRENT, and use more accurate OSVERSION value in the check (1000000 -> 1000041) - Fix regression introduced in r342061, when was included before OPTIONS definitions - Rename patches to get rid of those ugly double underscores (yuck!) - Wrap couple of overly long lines after STAGEDIR conversion in r342050 - Create `drivers' and `extensions' directories in pre-install, not in pre-su-install: no longer needed for stagified port - Fix regex when patching lib/Makefile for WITHOUT_LINUX handling, and improve nearby expressions while here as well Added: head/x11/nvidia-driver/files/extra-patch-mk-nvidia.lib.mk - copied unchanged from r346241, head/x11/nvidia-driver/files/extra-patch-mk__nvidia.lib.mk head/x11/nvidia-driver/files/extra-patch-x11-driver-Makefile - copied unchanged from r346202, head/x11/nvidia-driver/files/extra-patch-x11__driver__Makefile head/x11/nvidia-driver/files/legacy-patch-mk-nvidia.lib.mk - copied unchanged from r346202, head/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk head/x11/nvidia-driver/files/legacy-patch-x11-driver-Makefile - copied unchanged from r346202, head/x11/nvidia-driver/files/legacy-patch-x11__driver__Makefile Deleted: head/x11/nvidia-driver/files/extra-patch-mk__nvidia.lib.mk head/x11/nvidia-driver/files/extra-patch-x11__driver__Makefile head/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk head/x11/nvidia-driver/files/legacy-patch-x11__driver__Makefile Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Thu Feb 27 07:49:26 2014 (r346242) +++ head/x11/nvidia-driver/Makefile Thu Feb 27 07:50:03 2014 (r346243) @@ -42,8 +42,6 @@ NVVERSION= ${DISTVERSION:S/.//g} NVVERSION= ${DISTVERSION:S/.//g}00 .endif -.include - .if ${NVVERSION} >= 1952200 MASTER_SITE_SUBDIR= XFree86/FreeBSD-x86${ARCH_SUFX}/${DISTVERSION} ONLY_FOR_ARCHS= i386 amd64 @@ -53,21 +51,15 @@ ONLY_FOR_ARCHS= i386 .endif .if ${NVVERSION} <= 1904200 -EXTRA_PATCHES= ${FILESDIR}/legacy-patch-nvidia.lib.mk +EXTRA_PATCHES= ${FILESDIR}/legacy-patch-mk-nvidia.lib.mk .else -EXTRA_PATCHES= ${FILESDIR}/extra-patch-mk__nvidia.lib.mk +EXTRA_PATCHES= ${FILESDIR}/extra-patch-mk-nvidia.lib.mk .endif .if ${NVVERSION} >= 3312000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11__driver__Makefile +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11-driver-Makefile .else -EXTRA_PATCHES+= ${FILESDIR}/legacy-patch-x11__driver__Makefile -.endif - -.if ${OSVERSION} >= 1000000 -.if ${NVVERSION} == 1731435 || ${NVVERSION} == 718615 -BROKEN= does not compile -.endif +EXTRA_PATCHES+= ${FILESDIR}/legacy-patch-x11-driver-Makefile .endif # Fix recent arbitrary memory access vulnerability in legacy drivers @@ -94,11 +86,16 @@ OPTIONS_DEFINE+= WBINVD WBINVD_DESC= Flush CPU caches directly with WBINVD .endif -.include - PLIST_SUB+= LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \ MODULESDIR=${MODULESDIR} +.include + +# FreeBSD src SVN r254138 had broken 71.86.xx legacy series :( +.if ${OSVERSION} > 1000041 && ${NVVERSION} <= 718615 +BROKEN= does not compile +.endif + .if ${PORT_OPTIONS:MLINUX} CONFLICTS= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]* USE_LINUX= yes @@ -175,6 +172,11 @@ post-patch: .SILENT /return SYSCTL_OUT\(req, bus_type/d' \ ${WRKSRC}/src/nvidia_sysctl.c .endif +# Unbreak the build of 173.14.xx legacy series on recent -CURRENT +.if ${NVVERSION} < 1952200 && ${NVVERSION} >= 1690400 + ${REINPLACE_CMD} -E 's/os_(alloc|free)_contig_pages/NV_API_CALL &/' \ + ${WRKSRC}/src/nv-freebsd.h +.endif # Process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \ @@ -192,7 +194,7 @@ post-patch: .SILENT ${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif - ${REINPLACE_CMD} -e '/exists/s/$$/ \&\& !defined(WITHOUT_LINUX)/' \ + ${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& !defined(WITHOUT_LINUX)/' \ ${WRKSRC}/lib/Makefile # Do not install VDPAU libraries which are provided by `multimedia/libvdpau' # port for a while now @@ -220,19 +222,20 @@ post-patch: .SILENT ${WRKSRC}/lib/libGL/Makefile # Do not execute afterinstall target (prevent automatic module registration # and "smart" installation of conflicting files heuristics) - ${REINPLACE_CMD} -e 's/afterinstall/dontexecute/' ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's/beforeinstall/dontexecute/' \ + ${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \ ${WRKSRC}/lib/Makefile ${WRKSRC}/src/Makefile -pre-su-install: +pre-install: # While this port silently assumes PREFIX == LOCALBASE, at least try to # pretend we support different paths thereof and make sure these directories # exist - @cd ${STAGEDIR}${PREFIX} && ${MKDIR} ${MODULESDIR} - @cd ${STAGEDIR}${PREFIX}/${MODULESDIR} && ${MKDIR} drivers extensions + @${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \ + ${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions post-install: .SILENT - ${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \ + ${STAGEDIR}${PREFIX}/bin # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's .if ${NVVERSION} < 817400 ${REINPLACE_CMD} -e '/libnvidia-cfg/d' ${TMPPLIST} @@ -253,7 +256,8 @@ post-install: .SILENT .if ${NVVERSION} >= 3101900 ${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST} .else # some applications need this symlink (see PR ports/72877) - ${LN} -sf libXvMCNVIDIA.so.1 ${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1 + ${LN} -sf libXvMCNVIDIA.so.1 \ + ${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1 .endif .if ${NVVERSION} < 3311300 || ${ARCH} == amd64 ${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \ @@ -263,4 +267,4 @@ post-install: .SILENT ${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE} .endif -.include +.include Copied: head/x11/nvidia-driver/files/extra-patch-mk-nvidia.lib.mk (from r346241, head/x11/nvidia-driver/files/extra-patch-mk__nvidia.lib.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/nvidia-driver/files/extra-patch-mk-nvidia.lib.mk Thu Feb 27 07:50:03 2014 (r346243, copy of r346241, head/x11/nvidia-driver/files/extra-patch-mk__nvidia.lib.mk) @@ -0,0 +1,13 @@ +--- mk/nvidia.lib.mk.orig 2013-08-16 10:53:30.000000000 +0200 ++++ mk/nvidia.lib.mk 2014-01-27 16:55:39.000000000 +0100 +@@ -46,8 +46,8 @@ + .endif + .endif + .if defined(AUXLINK_TGT) +- @rm -f ${AUXLINK_LINK} +- @ln -fs ${AUXLINK_TGT} ${AUXLINK_LINK} ++ @rm -f ${DESTDIR}${AUXLINK_LINK} ++ @ln -fs ${AUXLINK_TGT} ${DESTDIR}${AUXLINK_LINK} + .endif + .if defined(STATICLIB_NAME) + @rm -f ${DESTDIR}${LIBDIR}/${STATICLIB_NAME} Copied: head/x11/nvidia-driver/files/extra-patch-x11-driver-Makefile (from r346202, head/x11/nvidia-driver/files/extra-patch-x11__driver__Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/nvidia-driver/files/extra-patch-x11-driver-Makefile Thu Feb 27 07:50:03 2014 (r346243, copy of r346202, head/x11/nvidia-driver/files/extra-patch-x11__driver__Makefile) @@ -0,0 +1,11 @@ +--- x11/driver/Makefile.orig 2013-08-16 10:53:30.000000000 +0200 ++++ x11/driver/Makefile 2014-01-27 18:25:14.000000000 +0100 +@@ -5,7 +5,7 @@ + .endif + + DRIVERS= nvidia_drv.o nvidia_drv.so +-.if exists(${LOCALBASE}/lib/xorg/modules/drivers) ++.if exists(${DESTDIR}${LOCALBASE}/lib/xorg/modules/drivers) + DRIVERDIR= ${LOCALBASE}/lib/xorg/modules/drivers + .else + DRIVERDIR= ${LOCALBASE}/lib/modules/drivers Copied: head/x11/nvidia-driver/files/legacy-patch-mk-nvidia.lib.mk (from r346202, head/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/nvidia-driver/files/legacy-patch-mk-nvidia.lib.mk Thu Feb 27 07:50:03 2014 (r346243, copy of r346202, head/x11/nvidia-driver/files/legacy-patch-nvidia.lib.mk) @@ -0,0 +1,10 @@ +--- mk/nvidia.lib.mk.orig ++++ mk/nvidia.lib.mk +@@ -17,6 +17,7 @@ + + install: + .if defined(SHLIB_NAME) ++ @mkdir -p ${DESTDIR}${LIBDIR} + @rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME} + @${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${NVIDIA_ROOT}/${OBJDIR}/${SHLIB_NAME} \ Copied: head/x11/nvidia-driver/files/legacy-patch-x11-driver-Makefile (from r346202, head/x11/nvidia-driver/files/legacy-patch-x11__driver__Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/nvidia-driver/files/legacy-patch-x11-driver-Makefile Thu Feb 27 07:50:03 2014 (r346243, copy of r346202, head/x11/nvidia-driver/files/legacy-patch-x11__driver__Makefile) @@ -0,0 +1,11 @@ +--- x11/driver/Makefile.orig 2012-12-12 15:39:41.000000000 +0100 ++++ x11/driver/Makefile 2014-01-28 22:28:05.000000000 +0100 +@@ -5,7 +5,7 @@ + .endif + + DRIVERS= nvidia_drv.o nvidia_drv.so +-.if exists(${X11BASE}/lib/xorg/modules/drivers) ++.if exists(${DESTDIR}${X11BASE}/lib/xorg/modules/drivers) + DRIVERDIR= ${X11BASE}/lib/xorg/modules/drivers + .else + DRIVERDIR= ${X11BASE}/lib/modules/drivers