diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 6 | ||||
| -rw-r--r-- | x11/nvidia-driver/distinfo | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 632c20a817e1..1e3402a5202d 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nvidia-driver -DISTVERSION?= 185.18.29 +DISTVERSION?= 185.18.36 PORTREVISION?= 0 # As a reminder it can be overridden CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} @@ -61,6 +61,8 @@ PLIST_SUB+= XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \ MODULESDIR=${MODULESDIR} .if !defined(WITHOUT_LINUX) +CONFLICTS= linux-dri-[0-9]* linux-f10-dri-[0-9]* linux-f8-dri-[0-9]* \ + linux_dri-[0-9]* linux_dri-devel-[0-9]* USE_LINUX= yes PLIST_SUB+= LINUX="" .else @@ -105,7 +107,7 @@ pre-su-install: @${MKDIR} ${PREFIX}/${MODULESDIR}/drivers post-install: -# pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's +# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's .if ${NVVERSION} < 817400 @${REINPLACE_CMD} '/libnvidia-cfg/d' ${TMPPLIST} .endif diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo index 132d76a7e349..f0c75a7303ee 100644 --- a/x11/nvidia-driver/distinfo +++ b/x11/nvidia-driver/distinfo @@ -1,6 +1,6 @@ -MD5 (NVIDIA-FreeBSD-x86-185.18.29.tar.gz) = 14b054dc1dd2fdfa1a06d95a2b77cfed -SHA256 (NVIDIA-FreeBSD-x86-185.18.29.tar.gz) = 843fbb119f9cf0d624dbd1efae25caad20e26a5894c245f9b014da09a0e53bca -SIZE (NVIDIA-FreeBSD-x86-185.18.29.tar.gz) = 19243110 +MD5 (NVIDIA-FreeBSD-x86-185.18.36.tar.gz) = feff4da79a8c3a2f194f46c95c545adb +SHA256 (NVIDIA-FreeBSD-x86-185.18.36.tar.gz) = 890b9543d3c81bccc72d60c653647a719c9037f8fc7a88144a18b2a012fbd4a7 +SIZE (NVIDIA-FreeBSD-x86-185.18.36.tar.gz) = 19245550 MD5 (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = 54869428baee8878c04c19751a2a8047 SHA256 (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = c5a27324d96391ada41b4ccbbf2a321c3d86693e54d1e9d1139d97c3132530f3 SIZE (NVIDIA-FreeBSD-x86-173.14.20.tar.gz) = 16211218 |