Index: head/x11/Makefile =================================================================== --- head/x11/Makefile (revision 378359) +++ head/x11/Makefile (revision 378360) @@ -1,492 +1,493 @@ # $FreeBSD$ # COMMENT = Ports to support the X window system SUBDIR += 3ddesktop SUBDIR += 9box SUBDIR += 9menu SUBDIR += alltray SUBDIR += antimicro SUBDIR += appres SUBDIR += apwal SUBDIR += arandr SUBDIR += aterm SUBDIR += avant-window-navigator SUBDIR += babl SUBDIR += bbappconf SUBDIR += bbdock SUBDIR += bbrun SUBDIR += beforelight SUBDIR += bgrot SUBDIR += bgs SUBDIR += bigreqsproto SUBDIR += bitmap SUBDIR += blast SUBDIR += bmpanel2 SUBDIR += bricons SUBDIR += brightside SUBDIR += cinnamon SUBDIR += cinnamon-desktop SUBDIR += cinnamon-menus SUBDIR += cinnamon-screensaver SUBDIR += cinnamon-session SUBDIR += cl-clx SUBDIR += compositeproto SUBDIR += cool-retro-term SUBDIR += damageproto SUBDIR += decurs SUBDIR += deforaos-desktop SUBDIR += deforaos-keyboard SUBDIR += deforaos-libdesktop SUBDIR += deforaos-locker SUBDIR += deforaos-panel SUBDIR += deskmenu SUBDIR += deskpaint SUBDIR += dgs SUBDIR += dmenu SUBDIR += dmxproto SUBDIR += docker SUBDIR += dri2proto SUBDIR += dri3proto SUBDIR += dxpc SUBDIR += dynamag SUBDIR += dzen2 SUBDIR += eaglemode SUBDIR += editres SUBDIR += emprint SUBDIR += erun SUBDIR += eterm SUBDIR += evieext SUBDIR += evilvte SUBDIR += fbdesk SUBDIR += fbpanel SUBDIR += fireflies SUBDIR += fixesproto SUBDIR += florence SUBDIR += fluxbg SUBDIR += fpc-x11 SUBDIR += fstobdf SUBDIR += gcb SUBDIR += gdkxft SUBDIR += gdm SUBDIR += glproto SUBDIR += gmessage SUBDIR += gmrun SUBDIR += gnome-clipboard-daemon SUBDIR += gnome-desktop SUBDIR += gnome-desktop-reference SUBDIR += gnome-menus SUBDIR += gnome-session SUBDIR += gnome-shell SUBDIR += gnome-shell-extensions SUBDIR += gnome-terminal SUBDIR += gnome3 SUBDIR += gnome3-lite SUBDIR += gnustep-app SUBDIR += gpctool SUBDIR += grabc SUBDIR += gromit SUBDIR += gskrab SUBDIR += gstreamer1-plugins-x SUBDIR += gstreamer1-plugins-ximagesrc SUBDIR += gsynaptics SUBDIR += gtk-launch SUBDIR += gtk-theme-switch SUBDIR += gtk-theme-switch2 SUBDIR += gtkchtheme SUBDIR += gtkterm2 SUBDIR += guake SUBDIR += hotwire-shell SUBDIR += hs-X11 SUBDIR += hs-X11-xft SUBDIR += hs-xmobar SUBDIR += i3lock SUBDIR += i3status SUBDIR += iceauth SUBDIR += ico SUBDIR += idesk SUBDIR += imwheel SUBDIR += innerspace SUBDIR += inputproto SUBDIR += ipager SUBDIR += kactivities SUBDIR += kactivitymanagerd SUBDIR += kb2mb2 SUBDIR += kbproto SUBDIR += kde4 SUBDIR += kde4-baseapps SUBDIR += kde4-runtime SUBDIR += kde4-workspace SUBDIR += kdelibs4 SUBDIR += keybinder SUBDIR += keybinder-gtk3 SUBDIR += keyboardcast SUBDIR += keylaunch SUBDIR += keynav SUBDIR += kgamma SUBDIR += konsole SUBDIR += leechcraft SUBDIR += libICE SUBDIR += libSM SUBDIR += libX11 SUBDIR += libXScrnSaver SUBDIR += libXTrap SUBDIR += libXau SUBDIR += libXcm SUBDIR += libXcomposite SUBDIR += libXcursor SUBDIR += libXdamage SUBDIR += libXdmcp SUBDIR += libXevie SUBDIR += libXext SUBDIR += libXfixes SUBDIR += libXi SUBDIR += libXinerama SUBDIR += libXp SUBDIR += libXpm SUBDIR += libXprintAppUtil SUBDIR += libXprintUtil SUBDIR += libXrandr SUBDIR += libXrender SUBDIR += libXres SUBDIR += libXtst SUBDIR += libXv SUBDIR += libXvMC SUBDIR += libXxf86dga SUBDIR += libXxf86misc SUBDIR += libXxf86vm SUBDIR += libdmx SUBDIR += libdnd SUBDIR += libexo SUBDIR += libfm SUBDIR += libgnome SUBDIR += libgnome-reference SUBDIR += libgnomekbd SUBDIR += libgnomemm26 SUBDIR += libkonq SUBDIR += libmatekbd SUBDIR += liboldX SUBDIR += libsx SUBDIR += libsynaptics SUBDIR += libxcb SUBDIR += libxdg-basedir SUBDIR += libxfce4menu SUBDIR += libxfce4util SUBDIR += libxkbcommon SUBDIR += libxkbfile SUBDIR += libxkbui SUBDIR += libxklavier SUBDIR += libxshmfence SUBDIR += linux-c6-xorg-libs SUBDIR += linux-f10-xorg-libs SUBDIR += listres SUBDIR += lsw SUBDIR += luit SUBDIR += lumina SUBDIR += lupe SUBDIR += lxde-meta SUBDIR += lxmenu-data SUBDIR += lxpanel SUBDIR += lxrandr SUBDIR += mate SUBDIR += mate-applets SUBDIR += mate-base SUBDIR += mate-desktop SUBDIR += mate-dialogs SUBDIR += mate-menus SUBDIR += mate-panel SUBDIR += mate-screensaver SUBDIR += mate-session-manager SUBDIR += mate-terminal SUBDIR += menu-cache SUBDIR += metalock SUBDIR += metisse SUBDIR += mkcomposecache SUBDIR += mlterm SUBDIR += mrxvt SUBDIR += mrxvt-devel SUBDIR += multi-aterm SUBDIR += mxico SUBDIR += numlockx SUBDIR += nvidia-driver SUBDIR += nvidia-driver-173 SUBDIR += nvidia-driver-304 + SUBDIR += nvidia-driver-340 SUBDIR += nvidia-settings SUBDIR += nvidia-xconfig SUBDIR += nxcomp SUBDIR += ooxcb SUBDIR += p5-Clipboard SUBDIR += p5-X11-GUITest SUBDIR += p5-X11-IdleTime SUBDIR += p5-X11-Protocol SUBDIR += p5-X11-Resolution SUBDIR += pixman SUBDIR += plasma-scriptengine-python SUBDIR += plasma-scriptengine-ruby SUBDIR += presentproto SUBDIR += printproto SUBDIR += printscreen SUBDIR += props SUBDIR += py-qt4-opengl SUBDIR += qimageblitz SUBDIR += qt4-graphicssystems-opengl SUBDIR += qt4-inputmethods SUBDIR += qt5-qev SUBDIR += qt5-x11extras SUBDIR += qxkb SUBDIR += randrproto SUBDIR += recordproto SUBDIR += rendercheck SUBDIR += renderproto SUBDIR += resourceproto SUBDIR += rgb SUBDIR += rofi SUBDIR += rox-wallpaper SUBDIR += roxbg SUBDIR += roxterm SUBDIR += rsibreak-kde4 SUBDIR += rstart SUBDIR += ruby-X11 SUBDIR += rubygem-gnome2 SUBDIR += rxvt SUBDIR += rxvt-unicode SUBDIR += sakura SUBDIR += sbxkb SUBDIR += scripts SUBDIR += scrnsaverproto SUBDIR += sessreg SUBDIR += setlayout SUBDIR += setxkbmap SUBDIR += simdock SUBDIR += sisctrl SUBDIR += slim SUBDIR += slock SUBDIR += slop SUBDIR += smproxy SUBDIR += sselp SUBDIR += stalonetray SUBDIR += startup-notification SUBDIR += sterm SUBDIR += stjerm SUBDIR += swarp SUBDIR += sxhkd SUBDIR += sxpc SUBDIR += tabbed SUBDIR += temperature.app SUBDIR += terminal.app SUBDIR += terminator SUBDIR += terminology SUBDIR += thinglaunch SUBDIR += thingylaunch SUBDIR += tilda SUBDIR += tint SUBDIR += tkXwin SUBDIR += trapproto SUBDIR += trayer SUBDIR += tycoon SUBDIR += urxvt-perls SUBDIR += vdesk SUBDIR += videoproto SUBDIR += viewres SUBDIR += virtualgl SUBDIR += wbar SUBDIR += wbarconf SUBDIR += wdm SUBDIR += wmappl SUBDIR += wmblob SUBDIR += wmbutton SUBDIR += wmcliphist SUBDIR += wmctrl SUBDIR += wmdrawer SUBDIR += wmmatrix SUBDIR += wmxss SUBDIR += workrave SUBDIR += x11perf SUBDIR += x3270 SUBDIR += xaniroc SUBDIR += xantfarm SUBDIR += xascii SUBDIR += xauth SUBDIR += xautolock SUBDIR += xautomation SUBDIR += xbacklight SUBDIR += xballoon SUBDIR += xbanner SUBDIR += xbelld SUBDIR += xbiff SUBDIR += xbindkeys SUBDIR += xbitmaps SUBDIR += xbrightness SUBDIR += xcalc SUBDIR += xcalib SUBDIR += xcb SUBDIR += xcb-proto SUBDIR += xcb-util SUBDIR += xcb-util-cursor SUBDIR += xcb-util-image SUBDIR += xcb-util-keysyms SUBDIR += xcb-util-renderutil SUBDIR += xcb-util-wm SUBDIR += xclick SUBDIR += xclip SUBDIR += xclipboard SUBDIR += xcm SUBDIR += xcmd SUBDIR += xcmiscproto SUBDIR += xcmsdb SUBDIR += xco SUBDIR += xcoloredit SUBDIR += xcolors SUBDIR += xcolorsel SUBDIR += xconsole SUBDIR += xcurs SUBDIR += xcursorgen SUBDIR += xcut SUBDIR += xdbedizzy SUBDIR += xdialog SUBDIR += xditview SUBDIR += xdm SUBDIR += xdotool SUBDIR += xdpyinfo SUBDIR += xdriinfo SUBDIR += xdtm SUBDIR += xedit SUBDIR += xev SUBDIR += xextproto SUBDIR += xeyes SUBDIR += xf86dga SUBDIR += xf86dgaproto SUBDIR += xf86driproto SUBDIR += xf86miscproto SUBDIR += xf86rushproto SUBDIR += xf86vidmodeproto SUBDIR += xfce4-clipman-plugin SUBDIR += xfce4-conf SUBDIR += xfce4-dashboard SUBDIR += xfce4-embed-plugin SUBDIR += xfce4-quicklauncher-plugin SUBDIR += xfce4-screenshooter-plugin SUBDIR += xfce4-taskmanager SUBDIR += xfce4-terminal SUBDIR += xfce4-verve-plugin SUBDIR += xfce4-whiskermenu-plugin SUBDIR += xfce4-wmdock-plugin SUBDIR += xfd SUBDIR += xfindproxy SUBDIR += xfishtank SUBDIR += xforward SUBDIR += xfree86_xkb_xml SUBDIR += xfwp SUBDIR += xgamma SUBDIR += xgc SUBDIR += xgrab SUBDIR += xhost SUBDIR += xidle SUBDIR += xineramaproto SUBDIR += xinit SUBDIR += xinput SUBDIR += xkbcomp SUBDIR += xkbctrl SUBDIR += xkbevd SUBDIR += xkbprint SUBDIR += xkbset SUBDIR += xkbutils SUBDIR += xkeyboard-config SUBDIR += xkeycaps SUBDIR += xkeywrap SUBDIR += xkill SUBDIR += xload SUBDIR += xloadimage SUBDIR += xlockmore SUBDIR += xlogo SUBDIR += xlogout SUBDIR += xlsatoms SUBDIR += xlsclients SUBDIR += xlupe SUBDIR += xmag SUBDIR += xman SUBDIR += xmangekyou SUBDIR += xmascot SUBDIR += xmessage SUBDIR += xmh SUBDIR += xmodmap SUBDIR += xmon SUBDIR += xmore SUBDIR += xmotd SUBDIR += xmove SUBDIR += xmsg SUBDIR += xmx SUBDIR += xnee SUBDIR += xnodecor SUBDIR += xorg SUBDIR += xorg-apps SUBDIR += xorg-cf-files SUBDIR += xorg-docs SUBDIR += xorg-libraries SUBDIR += xorg-minimal SUBDIR += xplsprinters SUBDIR += xpr SUBDIR += xpra SUBDIR += xprehashprinterlist SUBDIR += xprompt SUBDIR += xprop SUBDIR += xproto SUBDIR += xproxymanagementprotocol SUBDIR += xpyb SUBDIR += xrandr SUBDIR += xrdb SUBDIR += xrefresh SUBDIR += xrestop SUBDIR += xrootconsole SUBDIR += xrsh SUBDIR += xrsi SUBDIR += xrx SUBDIR += xscreensaver SUBDIR += xscreensaver-gnome SUBDIR += xscreensaver-gnome-hacks SUBDIR += xscreensaver.app SUBDIR += xsel SUBDIR += xsel-conrad SUBDIR += xset SUBDIR += xsetmode SUBDIR += xsetpointer SUBDIR += xsetroot SUBDIR += xskyroot SUBDIR += xsm SUBDIR += xsnow SUBDIR += xstarroll SUBDIR += xstdcmap SUBDIR += xstroke SUBDIR += xtacy SUBDIR += xterm SUBDIR += xtermcontrol SUBDIR += xtermset SUBDIR += xtestpicture SUBDIR += xtoolwait SUBDIR += xtrans SUBDIR += xtrap SUBDIR += xtrlock SUBDIR += xtset SUBDIR += xvattr SUBDIR += xvidtune SUBDIR += xvinfo SUBDIR += xvkbd SUBDIR += xvmcinfo SUBDIR += xvt SUBDIR += xwatchwin SUBDIR += xwd SUBDIR += xwininfo SUBDIR += xwinwrap SUBDIR += xwit SUBDIR += xwud SUBDIR += xxkb SUBDIR += xzoom SUBDIR += yad SUBDIR += yakuake-kde4 SUBDIR += yalias SUBDIR += yeahconsole SUBDIR += yelp SUBDIR += zenity .include Index: head/x11/nvidia-driver/Makefile =================================================================== --- head/x11/nvidia-driver/Makefile (revision 378359) +++ head/x11/nvidia-driver/Makefile (revision 378360) @@ -1,326 +1,325 @@ # Created by: Stijn Hoop # $FreeBSD$ # # For those wondering why this port is not under `x11-drivers' category, # have a look at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=121930. # # Starting with version 1.0-7667, NVidia has dropped support for numerous # "legacy" GPUs. Consult NVidia README (the Appendix) to find out whether # you need to use legacy driver version and install one of corresponding -# `x11/nvidia-driver-71', `x11/nvidia-driver-96', `x11/nvidia-driver-173', -# or `x11/nvidia-driver-304' slave ports. +# slave ports instead (`x11/nvidia-driver-173', `x11/nvidia-driver-304', +# or `x11/nvidia-driver-340'). PORTNAME= nvidia-driver -DISTVERSION?= 340.76 +DISTVERSION?= 346.35 # Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_NVIDIA} # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} MAINTAINER= danfe@FreeBSD.org COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering LICENSE= NVIDIA LICENSE_NAME= License For Customer Use of NVIDIA Software LICENSE_FILE= ${WRKSRC}/doc/license.txt LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept ARCH_SUFX= x86${ARCH:S/i386//:S/amd/_/} USES= kmod uidfix USE_XORG= xorg-server USE_GL= gl USE_LDCONFIG= yes # NVIDIA_ROOT is not set in src/Makefile, which results in bogus -I/src # passed to compiler and broken build on HEAD since r221320 when option # -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 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 PORTDOCS= * # NVVERSION is float since r372065 (integer values become less readable # after minor version could occupy three digits) .if ${DISTVERSION:C/[0-9]+//g} == ".." # major.minor.update NVVERSION= ${DISTVERSION:S/./.0/:R}${DISTVERSION:E} .else # major.minor . if ${DISTVERSION:E} < 100 NVVERSION= ${DISTVERSION:S/./.0/} # allow minor > 99 . else NVVERSION= ${DISTVERSION} . endif .endif .if ${NVVERSION} >= 195.022 MASTER_SITE_SUBDIR= XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} ONLY_FOR_ARCHS= i386 amd64 .else MASTER_SITE_SUBDIR= freebsd/${DISTVERSION} ONLY_FOR_ARCHS= i386 .endif .if ${NVVERSION} <= 190.042 EXTRA_PATCHES= ${FILESDIR}/legacy-patch-mk-nvidia.lib.mk .else EXTRA_PATCHES= ${FILESDIR}/extra-patch-mk-nvidia.lib.mk .endif .if ${NVVERSION} >= 304.088 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-Makefile \ ${FILESDIR}/extra-patch-src-nv-freebsd.h \ ${FILESDIR}/extra-patch-src-nv-misc.h .endif .if ${NVVERSION} >= 304.125 # 331.020 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11-driver-Makefile .else EXTRA_PATCHES+= ${FILESDIR}/legacy-patch-x11-driver-Makefile .endif # Fix recent arbitrary memory access vulnerability in legacy drivers .if ${NVVERSION} <= 190.053 . if ${NVVERSION} != 173.01435 EXTRA_PATCHES+= ${FILESDIR}/security-patch-CVE-2012-0946 . endif EXTRA_PATCHES+= ${FILESDIR}/security-patch-CVE-2012-4225 .endif OPTIONS_DEFINE= ACPI_PM LINUX DOCS OPTIONS_DEFAULT= LINUX ACPI_PM_DESC= ACPI Power Management support LINUX_DESC= Linux compatibility support .if ${NVVERSION} < 310.014 OPTIONS_DEFINE+= FREEBSD_AGP FREEBSD_AGP_DESC= Use FreeBSD AGP GART driver .endif .if ${NVVERSION} >= 195.022 OPTIONS_DEFINE+= WBINVD WBINVD_DESC= Flush CPU caches directly with WBINVD .endif .if ${NVVERSION} >= 304.088 OPTIONS_DEFINE_i386= PAE PAE_DESC= Physical Address Extensions support .endif 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} <= 71.08615 -BROKEN= does not compile -.endif - .if ${PORT_OPTIONS:MLINUX} -CONFLICTS= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]* +CONFLICTS_INSTALL= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]* USE_LINUX= yes PLIST_SUB+= LINUX="" .else PLIST_SUB+= LINUX="@comment " # Propagate WITHOUT_LINUX variable down to inner Makefiles MAKE_ENV+= WITHOUT_LINUX=yes .endif .if ${NVVERSION} < 195.022 # ABI version is hardcoded inside the binary, so specify it explicitly here LIB_DEPENDS= libm.so.3:${PORTSDIR}/misc/compat5x .endif post-patch: .SILENT # We should support -CURRENT: kill the check ${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/nv-freebsd.h # Adjust legacy drivers for updated d_mmap() since FreeBSD src SVN r201223 .if ${OSVERSION} > 900005 && ${NVVERSION} < 195.022 ${REINPLACE_CMD} -e 's/vm_offset_t offset/vm_ooffset_t offset/ ; \ s/vm_offset_t \*address/vm_paddr_t *address/ ; \ s/int nprot/&, vm_memattr_t *memattr/' \ ${WRKSRC}/src/nvidia_dev.c .endif # In the legacy drivers: remove page queue locking and add page locking # around vm_page_(un)wire() after FreeBSD src SVN r207410, r207617, and # r207644; also remove page queue locking around vm_page_wakeup() after # FreeBSD src SVN r163622 .if ${OSVERSION} > 900011 && ${NVVERSION} < 304.064 ${REINPLACE_CMD} -E '/vm_page_(un)?lock_queues\(\);/d ; \ s/(vm_page_(un)?wire\()([^,]+)(, 0)?(\);)/vm_page_lock(\3); & vm_page_unlock(\3);/' \ ${WRKSRC}/src/nvidia_subr.c .endif # Catch up legacy drivers with FreeBSD src SVN r225617 .if ${OSVERSION} > 900043 && ${NVVERSION} < 195.022 ${REINPLACE_CMD} -e '/return/s/ioctl/sys_&/' \ ${WRKSRC}/src/nvidia_linux.c .endif # Adjust Linux headers #include's after FreeBSD src SVN r246085 .if ${OSVERSION} > 1000027 && ${NVVERSION} >= 96.04323 ${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \ { x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \ ${WRKSRC}/src/nvidia_linux.c .endif # Adjust vm_object locking after FreeBSD src SVN r248084 .if ${OSVERSION} > 1000029 ${REINPLACE_CMD} -e '/#include / \ { x ; s/.*/#include / ; G ; }' \ ${WRKSRC}/src/nv-freebsd.h ${REINPLACE_CMD} -E 's/(VM_OBJECT_)(UN)?(LOCK)/\1W\2\3/' \ ${WRKSRC}/src/nvidia_subr.c .endif # Adjust kmem(9) calls after FreeBSD src SVN r254025 .if ${OSVERSION} > 1000040 && ${NVVERSION} < 331.067 ${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \ ${WRKSRC}/src/nvidia_subr.c .endif # Argument count of vm_map_find() changed in FreeBSD src SVN r255426 .if ${OSVERSION} > 1000054 && ${NVVERSION} < 304.123 # < 331.067 ${REINPLACE_CMD} -e 's/virtual_address, size,/& 0,/' \ ${WRKSRC}/src/nvidia_subr.c .endif # Fix CTLFLAG_* values for SYSCTL_ADD_PROC() after FreeBSD src SVN r273377 .if ${OSVERSION} > 1100039 || ${OSVERSION} > 1001501 && ${OSVERSION} < 1100000 ${REINPLACE_CMD} -e '/SYSCTL_ADD_PROC/,/;/ \ s/^[[:blank:]]*CTLFLAG_RD/CTLTYPE_STRING |&/' \ ${WRKSRC}/src/nvidia_sysctl.c .endif # Replace d_thread_t (compat shim to support FreeBSD 4) with `struct thread' ${REINPLACE_CMD} -e 's/d_thread_t/struct thread/' \ ${WRKSRC}/src/nvidia_ctl.c ${WRKSRC}/src/nvidia_dev.c \ ${WRKSRC}/src/nvidia_linux.c # Fix stack buffer overflow in nvidia_sysctl_bus_type() ${REINPLACE_CMD} -e 's/8 bus_type\[4\]/8 bus_type[8]/' \ ${WRKSRC}/src/nvidia_sysctl.c # Unbreak the build of 173.14.xx legacy series on recent -CURRENT .if ${NVVERSION} < 195.022 && ${NVVERSION} >= 169.004 ${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/' \ ${WRKSRC}/src/nv-freebsd.h .endif .if ${PORT_OPTIONS:MACPI_PM} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif .if ! ${PORT_OPTIONS:MLINUX} ${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif .if ${PORT_OPTIONS:MPAE} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_PAE)/define \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif .if ${PORT_OPTIONS:MWBINVD} ${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif ${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 .if ${NVVERSION} >= 180.029 ${REINPLACE_CMD} -e '/libvdpau[[:blank:]_][^n]/d ; \ s/name libvdpau/&_nvidia/' ${WRKSRC}/lib/Makefile .endif # Do not build any binaries (native nvidia-settings and nvidia-xconfig are # provided by corresponding ports) and manual pages .if ${NVVERSION} < 97.046 || ${NVVERSION} >= 195.022 ${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile .else ${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile .endif ${REINPLACE_CMD} -e '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile +# Also do not install libnvidia-gtk* libraries which are for nvidia-settings +.if ${NVVERSION} >= 346.016 + ${REINPLACE_CMD} -e '/libnvidia-gtk/d' ${WRKSRC}/lib/Makefile +.endif # Conditionally install documentation (but you generally want it) .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile .endif # Adjust installation paths of some conflicting files (shared also between # libGL, libEGL, libglesv2 and xorg-server) to ease package manager work. ${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \ ${WRKSRC}/x11/extension/Makefile ${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \ ${WRKSRC}/lib/libGL/Makefile .if ${NVVERSION} >= 331.013 ${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \ ${WRKSRC}/lib/libEGL/Makefile ${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \ ${WRKSRC}/lib/libGLESv2/Makefile .endif # 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/' \ ${WRKSRC}/lib/Makefile ${WRKSRC}/src/Makefile # /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we # won't adhere to this stupidity and install nvidia-application-profiles-* # files as part of documentation .if ${NVVERSION} >= 334.016 ${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \ ${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile .endif pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \ ${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions post-install: .SILENT ${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} < 81.074 ${REINPLACE_CMD} -e '/libnvidia-cfg/d' ${TMPPLIST} .endif .if ${NVVERSION} < 97.046 || ${NVVERSION} >= 195.022 ${REINPLACE_CMD} -e '/wfb/d' ${TMPPLIST} .endif .if ${NVVERSION} < 180.029 ${REINPLACE_CMD} -e '/vdpau/d' ${TMPPLIST} .endif .if ${NVVERSION} < 185.01829 ${REINPLACE_CMD} -e '/libcuda/d' ${TMPPLIST} .endif .if ${NVVERSION} >= 256.053 ${REINPLACE_CMD} -E 's/libGLcore/libnvidia-glcore/ ; \ /usr.*(glcore|tls).*so\.1$$/d' ${TMPPLIST} .endif .if ${NVVERSION} >= 310.019 ${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 .endif .if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016 ${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \ ${TMPPLIST} .endif .if ${NVVERSION} >= 195.022 ${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE} .endif # Target below can be used instead of standard `makesum' to correctly # update distinfo (i.e., keeping other driver version entries intact) .if ${.TARGETS:Mupdate-distinfo} DISTINFO_FILE= ${MASTERDIR}/distinfo.new JOIN?= /usr/bin/join .endif update-distinfo: makesum .SILENT ${REINPLACE_CMD} -i '' -e '/${ARCH_SUFX}-${NVVERSION:R}/s/^/~/' \ ${MASTERDIR}/distinfo ${DISTINFO_FILE} ${SED} -e '/^~/s/(.*//' ${MASTERDIR}/distinfo | ${JOIN} -a 1 \ - ${DISTINFO_FILE} | ${SED} -e 's/^~//' \ > ${MASTERDIR}/distinfo.tmp ${MV} ${MASTERDIR}/distinfo.tmp ${MASTERDIR}/distinfo ${RM} ${DISTINFO_FILE} .include Index: head/x11/nvidia-driver/distinfo =================================================================== --- head/x11/nvidia-driver/distinfo (revision 378359) +++ head/x11/nvidia-driver/distinfo (revision 378360) @@ -1,10 +1,14 @@ +SHA256 (NVIDIA-FreeBSD-x86_64-346.35.tar.gz) = 0a1c92efb9e29d0d4e1c099a5f2c69a29ac2431dbc33009cc83a35c794c48d33 +SIZE (NVIDIA-FreeBSD-x86_64-346.35.tar.gz) = 58753495 +SHA256 (NVIDIA-FreeBSD-x86-346.35.tar.gz) = c2decd38b2ff3e46a611acfd2ca41fd887b7223f6aee1f57f52717b4206e2be3 +SIZE (NVIDIA-FreeBSD-x86-346.35.tar.gz) = 57980205 SHA256 (NVIDIA-FreeBSD-x86_64-340.76.tar.gz) = 60037d035b9af9f1d4dcdd5033e1b28b0cd4c7ca94f6bcb8d267e037a930fdc0 SIZE (NVIDIA-FreeBSD-x86_64-340.76.tar.gz) = 60206978 SHA256 (NVIDIA-FreeBSD-x86-340.76.tar.gz) = 0abbcc3bed3f017e7f1887a5c2d014e2b5a020462071998986ed49cdb8e7119f SIZE (NVIDIA-FreeBSD-x86-340.76.tar.gz) = 59362290 SHA256 (NVIDIA-FreeBSD-x86_64-304.125.tar.gz) = 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d SIZE (NVIDIA-FreeBSD-x86_64-304.125.tar.gz) = 35498616 SHA256 (NVIDIA-FreeBSD-x86-304.125.tar.gz) = 806d0bff9d394390b3a257472bc342857f150e9dba6673e6b930f47a93ec0269 SIZE (NVIDIA-FreeBSD-x86-304.125.tar.gz) = 34494889 SHA256 (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SIZE (NVIDIA-FreeBSD-x86-173.14.39.tar.gz) = 20038266 Index: head/x11/nvidia-driver-340/Makefile =================================================================== --- head/x11/nvidia-driver-340/Makefile (nonexistent) +++ head/x11/nvidia-driver-340/Makefile (revision 378360) @@ -0,0 +1,11 @@ +# Created by: Alexey Dokuchaev +# $FreeBSD$ + +DISTVERSION= 340.76 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../nvidia-driver +PKGNAMESUFFIX= -340 + +.include "${MASTERDIR}/Makefile" Property changes on: head/x11/nvidia-driver-340/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property