[Midnightbsd-cvs] mports [20393] trunk/x11/nvidia-driver: update depends
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 3 00:15:37 EDT 2015
Revision: 20393
http://svnweb.midnightbsd.org/mports/?rev=20393
Author: laffer1
Date: 2015-10-03 00:15:37 -0400 (Sat, 03 Oct 2015)
Log Message:
-----------
update depends
Modified Paths:
--------------
trunk/x11/nvidia-driver/Makefile
trunk/x11/nvidia-driver/files/pkg-deinstall.in
trunk/x11/nvidia-driver/files/pkg-install.in
trunk/x11/nvidia-driver/pkg-plist
Modified: trunk/x11/nvidia-driver/Makefile
===================================================================
--- trunk/x11/nvidia-driver/Makefile 2015-10-03 04:14:45 UTC (rev 20392)
+++ trunk/x11/nvidia-driver/Makefile 2015-10-03 04:15:37 UTC (rev 20393)
@@ -3,11 +3,11 @@
PORTNAME= nvidia-driver
DISTVERSION?= 346.47
# Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?= 0
+PORTREVISION?= 1
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}
+DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
MAINTAINER= luke at midnightbsd.org
COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering
@@ -15,11 +15,20 @@
LICENSE= nvidia
LICENSE_FILE= ${WRKSRC}/doc/license.txt
-ARCH_SUFX= ${ARCH:S/i386//:S/amd/_/}
+FAKE_OPTS= trueprefix
+
+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
@@ -26,43 +35,39 @@
MODULESDIR= lib/xorg/modules
PORTDOCS= *
-FAKE_OPTS+= trueprefix
-
-# 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', or `x11/nvidia-driver-173'
-# slave ports.
-#
-# XXX Until NVidia starts to name their releases consistently, employ this
-# ugly hack below to derive NVVERSION. XXX
-#
-.if ${DISTVERSION:C/[0-9]+//g} == ".." # major.minor.update
-NVVERSION= ${DISTVERSION:S/.//g}
-.else # major.minor
-NVVERSION= ${DISTVERSION:S/.//g}00
+# 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} >= 1952200
-MASTER_SITE_SUBDIR= XFree86/FreeBSD-x86${ARCH_SUFX}/${DISTVERSION}
+.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} <= 1904200
+.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} >= 3048800
+.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} >= 3312000
+.if ${NVVERSION} >= 304.125 # 331.020
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11-driver-Makefile
.else
EXTRA_PATCHES+= ${FILESDIR}/legacy-patch-x11-driver-Makefile
@@ -69,8 +74,8 @@
.endif
# Fix recent arbitrary memory access vulnerability in legacy drivers
-.if ${NVVERSION} <= 1905300
-. if ${NVVERSION} != 1731435
+.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
@@ -82,19 +87,19 @@
ACPI_PM_DESC= ACPI Power Management support
LINUX_DESC= Linux compatibility support
-.if ${NVVERSION} < 3101400
+.if ${NVVERSION} < 310.014
OPTIONS_DEFINE+= FREEBSD_AGP
FREEBSD_AGP_DESC= Use FreeBSD AGP GART driver
.endif
-.if ${NVVERSION} >= 1952200
+.if ${NVVERSION} >= 195.022
OPTIONS_DEFINE+= WBINVD
WBINVD_DESC= Flush CPU caches directly with WBINVD
.endif
-.if ${NVVERSION} >= 3048800
+.if ${NVVERSION} >= 304.088
OPTIONS_DEFINE_i386= PAE
-PAE_DESC= Physical Address Extensions Kernel
+PAE_DESC= Physical Address Extensions support
.endif
PLIST_SUB+= LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
@@ -103,7 +108,7 @@
.include <bsd.mport.options.mk>
.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
@@ -112,14 +117,11 @@
MAKE_ENV+= WITHOUT_LINUX=yes
.endif
-.if ${OSVERSION} < 4001 && ${NVVERSION} >= 1952200
-IGNORE= requires fairly recent CURRENT
+.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
-.if ${NVVERSION} < 1952200
-LIB_DEPENDS+= m.3:${PORTSDIR}/misc/compat5x
-.endif
-
post-patch: .SILENT
${MKDIR} ${FAKE_DESTDIR}/boot/kernel
${MKDIR} ${FAKE_DESTDIR}/boot/modules
@@ -126,8 +128,8 @@
${MKDIR} ${FAKE_DESTDIR}${TRUE_PREFIX}/${MODULESDIR}/extensions
# 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 early 9.X
-.if ${OSVERSION} > 4015 && ${NVVERSION} < 1952200
+# Adjust legacy drivers for updated d_mmap() since FreeBSD src SVN r201223
+.if ${OSVERSION} > 4015 && ${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/' \
@@ -137,18 +139,18 @@
# 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} > 4014 && ${NVVERSION} < 3046400
+.if ${OSVERSION} > 4014 && ${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} > 4015 && ${NVVERSION} < 1952200
+.if ${OSVERSION} > 4015 && ${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} >= 964323
+.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
@@ -162,30 +164,30 @@
${WRKSRC}/src/nvidia_subr.c
.endif
# Adjust kmem(9) calls after FreeBSD src SVN r254025
-.if ${OSVERSION} > 1000040
+.if ${OSVERSION} > 1000040 && ${NVVERSION} < 331.067
${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \
${WRKSRC}/src/nvidia_subr.c
.endif
-# Adopt to cap_rights_t type change in FreeBSD src SVN r255219
-.if ${OSVERSION} > 1000052
- ${REINPLACE_CMD} -e 's/u_long cmd;/& cap_rights_t rights;/ ; \
- s/CAP_IOCTL/cap_rights_init(\&rights, &)/' \
- ${WRKSRC}/src/nvidia_linux.c
-.endif
# Argument count of vm_map_find() changed in FreeBSD src SVN r255426
-.if ${OSVERSION} > 1000054
+.if ${OSVERSION} > 1000054 && ${NVVERSION} < 304.123 # < 331.067
${REINPLACE_CMD} -e 's/virtual_address, size,/& 0,/' \
${WRKSRC}/src/nvidia_subr.c
.endif
-# Fix stack buffer overflow in nvidia_sysctl_bus_type()
-.if ${NVVERSION} < 3192300
- ${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \
- s/sprintf\(bus_type, (".+")/return SYSCTL_OUT(req, \1, sizeof(\1)/ ; \
- /return SYSCTL_OUT\(req, bus_type/d' \
+# 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} < 1952200 && ${NVVERSION} >= 1690400
+.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
@@ -214,70 +216,86 @@
${WRKSRC}/lib/Makefile
# Do not install VDPAU libraries which are provided by `multimedia/libvdpau'
# port for a while now
-.if ${NVVERSION} >= 1802900
+.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} < 974600 || ${NVVERSION} >= 1952200
+.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 and xorg-server) to ease package manager work, esp. with pkgng
+# 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:
-# While this port silently assumes PREFIX == LOCALBASE, at least try to
-# pretend we support different paths thereof and make sure these directories
-# exist
- @cd ${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 ${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
+.if ${NVVERSION} < 81.074
${REINPLACE_CMD} -e '/libnvidia-cfg/d' ${TMPPLIST}
.endif
-.if ${NVVERSION} < 974600 || ${NVVERSION} >= 1952200
+.if ${NVVERSION} < 97.046 || ${NVVERSION} >= 195.022
${REINPLACE_CMD} -e '/wfb/d' ${TMPPLIST}
.endif
-.if ${NVVERSION} < 1802900
+.if ${NVVERSION} < 180.029
${REINPLACE_CMD} -e '/vdpau/d' ${TMPPLIST}
.endif
-.if ${NVVERSION} < 1851829
+.if ${NVVERSION} < 185.01829
${REINPLACE_CMD} -e '/libcuda/d' ${TMPPLIST}
.endif
-.if ${NVVERSION} >= 2565300
+.if ${NVVERSION} >= 256.053
${REINPLACE_CMD} -E 's/libGLcore/libnvidia-glcore/ ; \
/usr.*(glcore|tls).*so\.1$$/d' ${TMPPLIST}
.endif
-.if ${NVVERSION} >= 3101900
+.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} < 3311300 || ${ARCH} == amd64
+.if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016
${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \
${TMPPLIST}
.endif
-.if ${NVVERSION} >= 1952200
+.if ${NVVERSION} >= 195.022
${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE}
.endif
@@ -289,7 +307,7 @@
.endif
update-distinfo: makesum .SILENT
- ${REINPLACE_CMD} -i '' -e '/${DISTNAME:R:R}/s/^/~/' \
+ ${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/^~//' \
Modified: trunk/x11/nvidia-driver/files/pkg-deinstall.in
===================================================================
--- trunk/x11/nvidia-driver/files/pkg-deinstall.in 2015-10-03 04:14:45 UTC (rev 20392)
+++ trunk/x11/nvidia-driver/files/pkg-deinstall.in 2015-10-03 04:15:37 UTC (rev 20393)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD$
+# $FreeBSD: head/x11/nvidia-driver/files/pkg-deinstall.in 373483 2014-11-27 13:14:04Z kwm $
#
PREFIX=${PKG_PREFIX-/usr/local}
@@ -10,9 +10,24 @@
/bin/rm -f ${PREFIX}/lib/libGL.so*
/bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.so*
- /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so
- /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1
+ /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so
+ /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1
+ /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1.2.0
/bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.xorg/libglx.so \
${PREFIX}/lib/xorg/modules/extensions/libglx.so
+
+
+ if [ -f ${PREFIX}/lib/.mesa/libEGL.so.1 ]; then
+ /bin/rm -f ${PREFIX}/lib/libEGL.so*
+ /bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so
+ /bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so.1
+ /bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so.1.0.0
+ fi
+ if [ -f ${PREFIX}/lib/.mesa/libGLESv2.so.2 ]; then
+ /bin/rm -f ${PREFIX}/lib/libGLESv2.so*
+ /bin/ln -f ${PREFIX}/lib/.mesa/libGLESv2.so.2.0.0 ${PREFIX}/lib/libGLESv2.so
+ /bin/ln -f ${PREFIX}/lib/.mesa/libGLESv2.so.2.0.0 ${PREFIX}/lib/libGLESv2.so.2
+ /bin/ln -f ${PREFIX}/lib/.mesa/libGLESv2.so.2.0.0 ${PREFIX}/lib/libGLESv2.so.2.0.0
+ fi
;;
esac
Modified: trunk/x11/nvidia-driver/files/pkg-install.in
===================================================================
--- trunk/x11/nvidia-driver/files/pkg-install.in 2015-10-03 04:14:45 UTC (rev 20392)
+++ trunk/x11/nvidia-driver/files/pkg-install.in 2015-10-03 04:15:37 UTC (rev 20393)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD$
+# $FreeBSD: head/x11/nvidia-driver/files/pkg-install.in 373483 2014-11-27 13:14:04Z kwm $
#
PREFIX=${PKG_PREFIX-/usr/local}
@@ -7,8 +7,19 @@
case $2 in
POST-INSTALL)
+ /bin/rm -f ${PREFIX}/lib/libGL.so*
/bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so
/bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1
+ if [ -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ]; then
+ /bin/rm -f ${PREFIX}/lib/libEGL.so*
+ /bin/ln -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ${PREFIX}/lib/libEGL.so
+ /bin/ln -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ${PREFIX}/lib/libEGL.so.1
+ fi
+ if [ -f ${PREFIX}/lib/.nvidia/libGLESv2.so.2 ]; then
+ /bin/rm -f ${PREFIX}/lib/libGLESv2.so*
+ /bin/ln -f ${PREFIX}/lib/.nvidia/libGLESv2.so.2 ${PREFIX}/lib/libGLESv2.so
+ /bin/ln -f ${PREFIX}/lib/.nvidia/libGLESv2.so.2 ${PREFIX}/lib/libGLESv2.so.2
+ fi
/bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so.1 \
${PREFIX}/lib/xorg/modules/extensions/libglx.so
;;
Modified: trunk/x11/nvidia-driver/pkg-plist
===================================================================
--- trunk/x11/nvidia-driver/pkg-plist 2015-10-03 04:14:45 UTC (rev 20392)
+++ trunk/x11/nvidia-driver/pkg-plist 2015-10-03 04:15:37 UTC (rev 20393)
@@ -1,13 +1,12 @@
bin/nvidia-bug-report.sh
lib/.nvidia/libGL.so
lib/.nvidia/libGL.so.1
- at dirrm lib/.nvidia
-lib/libEGL.so
-lib/libEGL.so.1
+lib/.nvidia/libEGL.so
+lib/.nvidia/libEGL.so.1
lib/libGLESv1_CM.so
lib/libGLESv1_CM.so.1
-lib/libGLESv2.so
-lib/libGLESv2.so.2
+lib/.nvidia/libGLESv2.so
+lib/.nvidia/libGLESv2.so.2
lib/libGLcore.so
lib/libGLcore.so.1
lib/libXvMCNVIDIA.a
More information about the Midnightbsd-cvs
mailing list