svn commit: r375756 - in head/emulators: i386-wine-compholio i386-wine-devel i386-wine-devel/files wine-compholio wine-devel
David Naylor
dbn at FreeBSD.org
Sun Dec 28 20:39:50 UTC 2014
Author: dbn
Date: Sun Dec 28 20:39:48 2014
New Revision: 375756
URL: https://svnweb.freebsd.org/changeset/ports/375756
QAT: https://qat.redports.org/buildarchive/r375756/
Log:
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]
Modified:
head/emulators/i386-wine-compholio/Makefile
head/emulators/i386-wine-devel/Makefile.i386
head/emulators/i386-wine-devel/files/nvidia.sh
head/emulators/wine-compholio/Makefile
head/emulators/wine-devel/Makefile
Modified: head/emulators/i386-wine-compholio/Makefile
==============================================================================
--- head/emulators/i386-wine-compholio/Makefile Sun Dec 28 20:32:58 2014 (r375755)
+++ head/emulators/i386-wine-compholio/Makefile Sun Dec 28 20:39:48 2014 (r375756)
@@ -5,7 +5,7 @@ COMMENT= 32bit Wine built with the comph
SLAVE_PORT= i386-wine-devel
-CONFLICTS= i386-wine-[0-9]* wine-[0-9]* wine-compholio-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]*
+CONFLICTS_INSTALL= i386-wine-[0-9]* wine-[0-9]* wine-compholio-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]*
OPTIONS_SET= COMPHOLIO LIBXSLT GNUTLS HAL X11
Modified: head/emulators/i386-wine-devel/Makefile.i386
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.i386 Sun Dec 28 20:32:58 2014 (r375755)
+++ head/emulators/i386-wine-devel/Makefile.i386 Sun Dec 28 20:39:48 2014 (r375756)
@@ -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
Modified: head/emulators/i386-wine-devel/files/nvidia.sh
==============================================================================
--- head/emulators/i386-wine-devel/files/nvidia.sh Sun Dec 28 20:32:58 2014 (r375755)
+++ head/emulators/i386-wine-devel/files/nvidia.sh Sun Dec 28 20:39:48 2014 (r375756)
@@ -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..."
Modified: head/emulators/wine-compholio/Makefile
==============================================================================
--- head/emulators/wine-compholio/Makefile Sun Dec 28 20:32:58 2014 (r375755)
+++ head/emulators/wine-compholio/Makefile Sun Dec 28 20:39:48 2014 (r375756)
@@ -5,7 +5,8 @@ COMMENT= Wine built with the compholio p
SLAVE_PORT= wine-devel
-CONFLICTS= wine-[0-9]* wine-devel-[0-9]*
+CONFLICTS_INSTALL= wine-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \
+ i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]*
OPTIONS_SET= COMPHOLIO LIBXSLT MPG123 GNUTLS HAL V4L X11
Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile Sun Dec 28 20:32:58 2014 (r375755)
+++ head/emulators/wine-devel/Makefile Sun Dec 28 20:39:48 2014 (r375756)
@@ -3,7 +3,7 @@
PORTNAME= wine
DISTVERSION= 1.7.33
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
@@ -22,7 +22,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${P
prelink:${PORTSDIR}/sysutils/prelink
LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
-CONFLICTS_INSTALL= i386-wine-[0-9]* i386-wine-devel-[0-9]* wine-[0-9]*
+CONFLICTS_INSTALL= wine-[0-9]* wine-compholio-[0-9]* i386-wine-[0-9]* \
+ i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]*
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
More information about the svn-ports-head
mailing list