Index: x11/nvidia-driver/Makefile =================================================================== --- x11/nvidia-driver/Makefile (revision 343059) +++ x11/nvidia-driver/Makefile (working copy) @@ -42,8 +42,6 @@ NVVERSION= ${DISTVERSION:S/.//g}00 .endif -.include - .if ${NVVERSION} >= 1952200 MASTER_SITE_SUBDIR= XFree86/FreeBSD-x86${ARCH_SUFX}/${DISTVERSION} ONLY_FOR_ARCHS= i386 amd64 @@ -64,12 +62,6 @@ EXTRA_PATCHES+= ${FILESDIR}/legacy-patch-x11__driver__Makefile .endif -.if ${OSVERSION} >= 1000000 -.if ${NVVERSION} == 1731435 || ${NVVERSION} == 718615 -BROKEN= does not compile -.endif -.endif - # Fix recent arbitrary memory access vulnerability in legacy drivers .if ${NVVERSION} <= 1905300 . if ${NVVERSION} != 1731435 @@ -94,11 +86,18 @@ WBINVD_DESC= Flush CPU caches directly with WBINVD .endif +.include .include PLIST_SUB+= LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \ MODULESDIR=${MODULESDIR} +.if ${OSVERSION} >= 1000000 +.if ${NVVERSION} == 1731435 || ${NVVERSION} == 718615 +BROKEN= does not compile +.endif +.endif + .if ${PORT_OPTIONS:MLINUX} CONFLICTS= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]* USE_LINUX= yes