emulators/i386-wine-devel: update to 1.7.39.

Changes:
 patch-nvidia.sh:
   - handle nvidia-driver with package name suffix [1]
   - handle i386-wine with arbitary package name suffix
   - remove support for old pkg_ tools

PR:		198497 [1]

3 files changed, 26 insertions, 26 deletions

diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index a42ce56bebcf..6947ed35e618 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.7.38
+PORTVERSION=	1.7.39
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION}
diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo
index a102cc9b2e83..c4372a0c0282 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,16 +1,16 @@
-SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.38,1.txz) = 30f6591e38a4d4965cae6d4907b0f79a95904db7298e631027950a2c84a366b5
-SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.38,1.txz) = 49046512
-SHA256 (freebsd:8:x86:64/i386-wine-compholio-1.7.38,1.txz) = 81547c4955282bad3b1ed200da693afc88e34191f8fae24c44c6aa311287fbae
-SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.38,1.txz) = 51990216
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.38,1.txz) = 90d78184615eed1f9bc6489bea4bef4ca62bd8c8aaab3cd9261e77782acf0207
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.38,1.txz) = 47604836
-SHA256 (freebsd:9:x86:64/i386-wine-compholio-1.7.38,1.txz) = b97dee3a5115989c1b720b7fec42269ffe0da8767bc3e50c894ec796b6f12381
-SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.38,1.txz) = 50564384
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.38,1.txz) = 95f0caeb402422bc0930335605acf04e7fd7d21e6667eb9a2fc2efe9290b6153
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.38,1.txz) = 33451232
-SHA256 (freebsd:10:x86:64/i386-wine-compholio-1.7.38,1.txz) = d1ecf6b81dfa184c99d617ae7ccbb67009a66d0d744d8eb47c892028c02c5338
-SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.38,1.txz) = 36385284
-SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.38,1.txz) = b049a1597a7ba1def69bbc2e83410bd8d6808ce79ce18125e2e18ed57cb63936
-SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.38,1.txz) = 36777020
-SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.38,1.txz) = 776f8f41729f4ef72fafeb3083aa9e9020cd74904f8b6015a231912eca22b0f6
-SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.38,1.txz) = 42339692
+SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.39,1.txz) = f04b929cf4f33e1fa43176bd42228dba0a94c0d9aca66a02a541e7aca3c8528b
+SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.39,1.txz) = 49173680
+SHA256 (freebsd:8:x86:64/i386-wine-compholio-1.7.39,1.txz) = b1442aae1decce3020bbff69d59920e1c01a50966672cb17ca65b0295cd793a0
+SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.39,1.txz) = 52121512
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.39,1.txz) = d96666f2900bec7d1478f762e08001d0220897aa70fdb159cd8a2fa39b415e8a
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.39,1.txz) = 47711356
+SHA256 (freebsd:9:x86:64/i386-wine-compholio-1.7.39,1.txz) = b363958a41c08031851b59e04ba6acc6a990325db111cf5c3a8f7a49ea800ade
+SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.39,1.txz) = 50669060
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.39,1.txz) = e764b053c5e91b8f22a15614c03189cb0ff0334958cb9f2b499b346b5b0ad479
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.39,1.txz) = 33573184
+SHA256 (freebsd:10:x86:64/i386-wine-compholio-1.7.39,1.txz) = dbf9796b1af3a5c8d564c649385221167a68b754390626773d636a65f8f09245
+SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.39,1.txz) = 36505136
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.39,1.txz) = 7991ce05c6061a249c45edb3385368a13120303a8f68b3cab08d6f47dbebe1ba
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.39,1.txz) = 36823548
+SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.39,1.txz) = 429293e2806eee8230f5d988c9deb796fca05a89bed69916b500c587a166d2d8
+SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.39,1.txz) = 42170216
diff --git a/emulators/i386-wine-devel/files/nvidia.sh b/emulators/i386-wine-devel/files/nvidia.sh
index 77bc58d84618..220b748bbe18 100644
--- a/emulators/i386-wine-devel/files/nvidia.sh
+++ b/emulators/i386-wine-devel/files/nvidia.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2010, 2011, 2012, 2013 David Naylor <naylor.b.david@gmail.com>.
+# Copyright 2010 to 2015 David Naylor <dbn@FreeBSD.org>
 # Copyright 2012 Jan Beich <jbeich@tormail.org>
 #       All rights reserved.
 #
@@ -68,6 +68,10 @@
 # Version 1.14 - 2014/12/26
 #  - gracefully handle a corrupt nVidia tarball
 #  - provide checksum and size information for nVidia tarball
+# Version 1.15 - 2015/03/10
+#  - handle nvidia-driver with package name suffix
+#  - handle i386-wine with arbitary package name suffix
+#  - remove support for old pkg_ tools
 
 set -e
 
@@ -129,15 +133,11 @@ version() {
   local ret pkg="$1"
   if [ -f "/usr/local/sbin/pkg" ]
   then
-    ret=`pkg query -g '%v' $pkg || true`
+    ret=`pkg query -g '%v' "$pkg" || true`
   fi
 
-  if [ -z "$ret" ]
-  then
-    ret=`pkg_info -E $pkg'*' | cut -f 3 -d - || true`
-  fi
   # installed manually or failed to register
-  if [ -z "$ret" ] && [ "$pkg" = "nvidia-driver" ]
+  if [ -z "$ret" ] && [ "$pkg" = "nvidia-driver*" ]
   then
     ret=`sed -n "s/.*Version: //p" 2> /dev/null \
       $PREFIX/share/doc/NVIDIA_GLX-1.0/README || true`
@@ -152,13 +152,13 @@ echo "===> Patching i386-wine to work with x11/nvidia-driver:"
 
 if [ -z "${WINE}" ]
 then
-  WINE=`version i386-wine; version i386-wine-devel; version i386-wine-compholio`
+  WINE=`version 'i386-wine*'`
 fi
 [ -n "$WINE" ] \
   || terminate 255 "Unable to detect i386-wine, please install first"
 echo "=> Detected i386-wine: ${WINE}"
 
-NV=`version nvidia-driver`
+NV=`version 'nvidia-driver*'`
 [ -n "$NV" ] \
   || terminate 1 "Unable to detect nvidia-driver, please install first"
 echo "=> Detected nvidia-driver: ${NV}"