diff options
| author | dbn <dbn@FreeBSD.org> | 2014-12-29 04:39:48 +0800 |
|---|---|---|
| committer | dbn <dbn@FreeBSD.org> | 2014-12-29 04:39:48 +0800 |
| commit | 932cedc474ef679e035abbb00b0579408d466f9d (patch) | |
| tree | 6669e177b253f20e1b53b822b5e571ab184d52fd /emulators/i386-wine-devel | |
| parent | 7db558fabb573a00000c115ab8850aa5879914c9 (diff) | |
| download | freebsd-ports-gnome-932cedc474ef679e035abbb00b0579408d466f9d.tar.gz freebsd-ports-gnome-932cedc474ef679e035abbb00b0579408d466f9d.tar.zst freebsd-ports-gnome-932cedc474ef679e035abbb00b0579408d466f9d.zip | |
Fix CONFLICTS_INSTALL for wine-devel and related ports.
Changes:
- Fix install conflicts [1] (for the "newly" added compholio port)
- nvidia.sh: Gracefully handle a corrupt nVidia tarball
- nvidia.sh: Provide checksum and size information for nVidia tarball
- Bump master port [1] due to changes to nvidia.sh and conflicts
Approved by: gerald@ [1]
Diffstat (limited to 'emulators/i386-wine-devel')
| -rw-r--r-- | emulators/i386-wine-devel/Makefile.i386 | 3 | ||||
| -rw-r--r-- | emulators/i386-wine-devel/files/nvidia.sh | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/emulators/i386-wine-devel/Makefile.i386 b/emulators/i386-wine-devel/Makefile.i386 index 949ba3a3aff8..4812c6774603 100644 --- a/emulators/i386-wine-devel/Makefile.i386 +++ b/emulators/i386-wine-devel/Makefile.i386 @@ -14,7 +14,8 @@ PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= dri>0:${PORTSDIR}/graphics/dri -CONFLICTS_INSTALLi?= i386-wine-[0-9]* wine-[0-9]* wine-devel-[0-9]* +CONFLICTS_INSTALL?= wine-[0-9]* wine-compholio-[0-9]* wine-devel-[0-9]* \ + i386-wine-[0-9]* i386-wine-compholio-[0-9]* ACTUAL-PACKAGE-DEPENDS= ${DO_NADA} WINELIBDIR= ${PREFIX}/lib32 diff --git a/emulators/i386-wine-devel/files/nvidia.sh b/emulators/i386-wine-devel/files/nvidia.sh index 94a06b9aefea..77bc58d84618 100644 --- a/emulators/i386-wine-devel/files/nvidia.sh +++ b/emulators/i386-wine-devel/files/nvidia.sh @@ -65,6 +65,9 @@ # - add detection for i386-wine-devel # Version 1.13 - 2014/08/05 # - add detection for i386-wine-compholio +# Version 1.14 - 2014/12/26 +# - gracefully handle a corrupt nVidia tarball +# - provide checksum and size information for nVidia tarball set -e @@ -163,13 +166,18 @@ echo "=> Detected nvidia-driver: ${NV}" NVIDIA=${NV} NV=`echo ${NV} | cut -f 1 -d _ | cut -f 1 -d ,` -if [ ! -f NVIDIA-FreeBSD-x86-${NV}.tar.gz ] +if [ ! -f NVIDIA-FreeBSD-x86-${NV}.tar.gz ] || !(tar -tf NVIDIA-FreeBSD-x86-${NV}.tar.gz > /dev/null 2>&1) then [ -n "$NO_FETCH" ] \ && terminate 8 "NVIDIA-FreeBSD-x86-${NV}.tar.gz unavailable" echo "=> Downloading NVIDIA-FreeBSD-x86-${NV}.tar.gz from ftp://download.nvidia.com..." + rm -f NVIDIA-FreeBSD-x86-${NV}.tar.gz fetch -apRr ftp://download.nvidia.com/XFree86/FreeBSD-x86/${NV}/NVIDIA-FreeBSD-x86-${NV}.tar.gz \ || terminate 2 "Failed to download NVIDIA-FreeBSD-x86-${NV}.tar.gz" + echo "=> Downloaded NVIDIA-FreeBSD-x86-${NV}.tar.gz" + echo "Please check the following information against /usr/ports/x11/nvidia-driver/distinfo" + sha256 NVIDIA-FreeBSD-x86-${NV}.tar.gz + echo "SIZE (NVIDIA-FreeBSD-x86-${NV}.tar.gz) = `stat -f "%z" NVIDIA-FreeBSD-x86-${NV}.tar.gz`" fi echo "=> Extracting NVIDIA-FreeBSD-x86-${NV}.tar.gz to $PREFIX/lib32..." |