From owner-svn-ports-head@FreeBSD.ORG Thu Mar 26 06:59:32 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E2CF595; Thu, 26 Mar 2015 06:59:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5801B806; Thu, 26 Mar 2015 06:59:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2Q6xWoo088305; Thu, 26 Mar 2015 06:59:32 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2Q6xV8d088302; Thu, 26 Mar 2015 06:59:31 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201503260659.t2Q6xV8d088302@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Thu, 26 Mar 2015 06:59:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382292 - in 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2015 06:59:32 -0000 Author: dbn Date: Thu Mar 26 06:59:30 2015 New Revision: 382292 URL: https://svnweb.freebsd.org/changeset/ports/382292 QAT: https://qat.redports.org/buildarchive/r382292/ Log: 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] Modified: head/emulators/i386-wine-devel/Makefile.inc head/emulators/i386-wine-devel/distinfo head/emulators/i386-wine-devel/files/nvidia.sh Modified: head/emulators/i386-wine-devel/Makefile.inc ============================================================================== --- head/emulators/i386-wine-devel/Makefile.inc Thu Mar 26 04:48:20 2015 (r382291) +++ head/emulators/i386-wine-devel/Makefile.inc Thu Mar 26 06:59:30 2015 (r382292) @@ -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} Modified: head/emulators/i386-wine-devel/distinfo ============================================================================== --- head/emulators/i386-wine-devel/distinfo Thu Mar 26 04:48:20 2015 (r382291) +++ head/emulators/i386-wine-devel/distinfo Thu Mar 26 06:59:30 2015 (r382292) @@ -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 Modified: head/emulators/i386-wine-devel/files/nvidia.sh ============================================================================== --- head/emulators/i386-wine-devel/files/nvidia.sh Thu Mar 26 04:48:20 2015 (r382291) +++ head/emulators/i386-wine-devel/files/nvidia.sh Thu Mar 26 06:59:30 2015 (r382292) @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2010, 2011, 2012, 2013 David Naylor . +# Copyright 2010 to 2015 David Naylor # Copyright 2012 Jan Beich # 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 wi 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}"