svn commit: r320362 - in head/emulators/i386-wine-devel: . files

[Jan Beich]

David Naylor <dbn at FreeBSD.org> writes:

> Author: dbn
> Date: Sun Jun  9 17:42:57 2013
> New Revision: 320362
> URL: http://svnweb.freebsd.org/changeset/ports/320362
>
> Log:
>    - Follow the example of mesagl/nvidia-driver wrt library handing
[...]
> @@ -168,11 +184,15 @@ for i in $EXTRACT_LIST
>  do
>    EXTRACT_ARGS="$EXTRACT_ARGS --include NVIDIA-FreeBSD-x86-${NV}/obj/$i"
>  done
> -[ -f ${PREFIX}/lib32/libGL.so.1~ ] \
> -  || cp ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/libGL.so.1~
>  umask 0333

Thats a bogus umask for a directory.

$ ls -l /usr/local/lib32/.nvidia/libGL.so.1
ls: /usr/local/lib32/.nvidia/libGL.so.1: Permission denied

$ ls -ld /usr/local/lib32/.nvidia
dr--r--r--  2 root  wheel  3 Jun 14 20:53 /usr/local/lib32/.nvidia

>  tar $EXTRACT_ARGS -xvf NVIDIA-FreeBSD-x86-${NV}.tar.gz \
>    || terminate 3 "Failed to extract NVIDIA-FreeBSD-x86-${NV}.tar.gz"
> +mkdir -p ${PREFIX}/lib32/.nvidia \
> +  || terminate 9 "Failed to create .nvidia shadow directory"
> +mv ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/.nvidia/ \
> +  || terminate 10 "Failed to move libGL.so.1 to .nvidia/ shadow directory"
> +ln -s .nvidia/libGL.so.1 ${PREFIX}/lib32/libGL.so.1 \
> +  || terminate 11 "Failed to link to .nvidia/libGL.so.1 in the shadow directory"
>  
>  echo "=> Cleaning up..."
>  [ -n "$NO_REMOVE_NVIDIA" ] || rm -vf NVIDIA-FreeBSD-x86-${NV}.tar.gz \