From owner-svn-ports-head@FreeBSD.ORG  Mon May  6 19:24:48 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3DD7ACE3;
 Mon,  6 May 2013 19:24:48 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 17F64DAF;
 Mon,  6 May 2013 19:24:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r46JOl7K030067;
 Mon, 6 May 2013 19:24:47 GMT (envelope-from dbn@svn.freebsd.org)
Received: (from dbn@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r46JOlwB030066;
 Mon, 6 May 2013 19:24:47 GMT (envelope-from dbn@svn.freebsd.org)
Message-Id: <201305061924.r46JOlwB030066@svn.freebsd.org>
From: David Naylor <dbn@FreeBSD.org>
Date: Mon, 6 May 2013 19:24:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317544 - head/emulators/i386-wine-devel/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 May 2013 19:24:48 -0000

Author: dbn
Date: Mon May  6 19:24:47 2013
New Revision: 317544
URL: http://svnweb.freebsd.org/changeset/ports/317544

Log:
  Fix emulators/i386-wine-devel's automatic nVidia patching.
  
  Due to naming and other issues the patch failed properly detect if itself or
  nVidia-driver was installed, and aborted the patching.  This fixes the
  patching for those who have nVidia-driver installed.
  
  Approved by:	eadler,bdrewery (mentors, implicit)

Modified:
  head/emulators/i386-wine-devel/files/nvidia.sh

Modified: head/emulators/i386-wine-devel/files/nvidia.sh
==============================================================================
--- head/emulators/i386-wine-devel/files/nvidia.sh	Mon May  6 19:09:58 2013	(r317543)
+++ head/emulators/i386-wine-devel/files/nvidia.sh	Mon May  6 19:24:47 2013	(r317544)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2010, 2011, 2012 David Naylor <naylor.b.david@gmail.com>.
+# Copyright 2010, 2011, 2012, 2013 David Naylor <naylor.b.david@gmail.com>.
 # Copyright 2012 Jan Beich <jbeich@tormail.org>
 #       All rights reserved.
 #
@@ -55,6 +55,9 @@
 #  - fix mixed pkg/pkgng operation
 # Version 1.9 - 2012/10/31
 #  - fix permission of extracts files
+# Version 1.10 - 2013/05/06
+#  - s/wine-fbsd64/i386-wine/
+#  - fix unwanted failures due to `set -e`
 
 set -e
 
@@ -103,12 +106,12 @@ version() {
   local ret pkg="$1"
   if [ -f "/usr/local/sbin/pkg" ]
   then
-    ret=`pkg query -g '%v' $pkg`
+    ret=`pkg query -g '%v' $pkg || true`
   fi
 
   if [ -z "$ret" ]
   then
-    ret=`pkg_info -E $pkg'*' | cut -f 3 -d -`
+    ret=`pkg_info -E $pkg'*' | cut -f 3 -d - || true`
   fi
   # installed manually or failed to register
   if [ -z "$ret" ] && [ "$pkg" = "nvidia-driver" ]
@@ -122,15 +125,15 @@ version() {
 [ `whoami` = root ] \
   || terminate 254 "This script should be run as root"
 
-echo "===> Patching wine-fbsd64 to work with x11/nvidia-driver:"
+echo "===> Patching i386-wine to work with x11/nvidia-driver:"
 
 if [ -z "${WINE}" ]
 then
-  WINE=`version wine-fbsd64`
+  WINE=`version i386-wine`
 fi
 [ -n "$WINE" ] \
-  || terminate 255 "Unable to detect wine-fbsd64, please install first"
-echo "=> Detected wine-fbsd64: ${WINE}"
+  || terminate 255 "Unable to detect i386-wine, please install first"
+echo "=> Detected i386-wine: ${WINE}"
 
 NV=`version nvidia-driver`
 [ -n "$NV" ] \
@@ -175,4 +178,4 @@ echo "=> Cleaning up..."
 [ -n "$NO_REMOVE_NVIDIA" ] || rm -vf NVIDIA-FreeBSD-x86-${NV}.tar.gz \
   || terminate 6 "Failed to remove files"
 
-echo "===> wine-fbsd64-${WINE} successfully patched for nvidia-driver-${NVIDIA}"
+echo "===> i386-wine-${WINE} successfully patched for nvidia-driver-${NVIDIA}"