From owner-freebsd-ports@FreeBSD.ORG Sat Jun 23 13:47:14 2012 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 59DA31065674; Sat, 23 Jun 2012 13:47:14 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id 081058FC19; Sat, 23 Jun 2012 13:47:13 +0000 (UTC) Received: from [199.48.147.45] (port=47469 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1Si16c-002SW2-I6; Fri, 22 Jun 2012 06:28:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:Subject:Cc:To:From; bh=PqpHox796t5XLvjue8qha2q+v7Nf3bYgtEYu7UL+NmI=; b=fBDZShKHrw9ychYjoiTXYgAQSHjXpI302eS+CwX6fvDOWUclLbX+axCtr45+KQZd+PNgvUZTTI1TrdS1ExO4Fl/x8bbSDyFFbFvI5cZCpn7IqYR3aM5nhjCNP2I6RT5oqc34jEIU31RZ/CL45KUM8Go7GqKGiUqu6m0YDHjjUvE=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1Si15V-0006xZ-36; Fri, 22 Jun 2012 10:27:38 +0000 From: Jan Beich To: David Naylor Date: Fri, 22 Jun 2012 09:26:50 -0100 References: <201206161035.09956.naylor.b.david@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1Si15V-0006xZ-36@internal.tormail.org> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server2.allsitecontrol.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tormail.org X-Source: X-Source-Args: X-Source-Dir: Cc: freebsd-emulation@freebsd.org, freebsd-ports@freebsd.org Subject: Re: Wine-fbsd64 updated to 1.5.6 (32bit Wine for 64bit FreeBSD) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jun 2012 13:47:14 -0000 (ports@ folk may know more about pkgng) David Naylor writes: > Hi, > > Packages [1] for wine-fbsd64-1.5.6 have been uploaded to mediafire [2]. The > packages for FreeBSD 10 use the pkgng* [3] format. [...] > * Support for pkgng has been added to the nvidia-patch script pkgng seems to be more pedantic regarding conflicting files. And I haven't found a way to force register a package. $ sudo /usr/local/share/wine/patch-nvidia.sh ===> Patching wine-fbsd64 to work with x11/nvidia-driver: => Detected wine-fbsd64: 1.5.6,1 !!! Unable to detect nvidia-driver, please install first !!! Terminating... Exit 1 $ make deinstall install -C x11/nvidia-driver [...] ===> Registering installation for nvidia-driver-302.17 Installing nvidia-driver-302.17...pkg: nvidia-driver-302.17 conflicts with xorg-server-1.12.1,1 (installs files into the same place). Problematic file: /usr/local/lib/xorg/modules/extensions/libglx.so *** [fake-pkg] Error code 3 $ pkg info nvidia-driver pkg: No package(s) matching nvidia-driver Exit 70 --- patch-nvidia.sh~ +++ patch-nvidia.sh @@ -92,12 +92,20 @@ do done version() { + local ret pkg="$1" if [ -f "/usr/local/sbin/pkg" ] then - echo `pkg query -g '%v' $1` + ret=`pkg query -g '%v' $pkg` else - echo `pkg_info -E $1'*' | cut -f 3 -d -` + ret=`pkg_info -E $pkg'*' | cut -f 3 -d -` fi + # installed manually or failed to register + if [ -z "$ret" ] && [ "$pkg" = "nvidia-driver" ] + then + ret=`sed 2>/dev/null -n 's/.*Version: //p' \ + $PREFIX/share/doc/NVIDIA_GLX-1.0/README || true` + fi + echo "$ret" } [ `whoami` = root ] \