From owner-freebsd-ports@FreeBSD.ORG Sat Jun 23 18:51:55 2012 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 941A41065676; Sat, 23 Jun 2012 18:51:55 +0000 (UTC) (envelope-from naylor.b.david@gmail.com) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id DE5AF8FC0C; Sat, 23 Jun 2012 18:51:54 +0000 (UTC) Received: by wgbds11 with SMTP id ds11so2671534wgb.31 for ; Sat, 23 Jun 2012 11:51:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; bh=BZN6sqq5GaX+Vtn4DWXK1sqftzaQpu2g9QIDp84ghV0=; b=E0hd9ktjtvj83SluvOKj/7+Z27wDR3iIL+0obExhfzUo+mgGicmHV5EmvGN1y2x3YO ScaO2ifEMYYHimBBdT/aupECF0jm4T0EQHAyG/43VXLE1e2HzCbtsuhzzxboaO8ew9t8 wftGhrtp40DEI1uEPXsQ91vCuY+e8o00hVUZjxtl4IbsV4IQaQ8huvUL5ePCy9Vsf5Mj EZtxekp6UMJkQ9VD2ixEM+iDEG993s+EqF+glkC4DHBKkTBdYDpRr7IZ91RfR3KmeLf7 tfHpY5+Mlf+hgfC/ObPByoCnkYvDAVNSaBlWt6/4RM5aT+jsKi5kWkAKxpCGCqlWpKT/ fpDw== Received: by 10.180.100.37 with SMTP id ev5mr9749273wib.5.1340477513689; Sat, 23 Jun 2012 11:51:53 -0700 (PDT) Received: from dragon.dg (41-135-0-78.dsl.mweb.co.za. [41.135.0.78]) by mx.google.com with ESMTPS id gb9sm5296884wib.8.2012.06.23.11.51.50 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 23 Jun 2012 11:51:52 -0700 (PDT) From: David Naylor To: Jan Beich Date: Sat, 23 Jun 2012 20:51:38 +0200 User-Agent: KMail/1.13.7 (FreeBSD/9.0-STABLE; KDE/4.8.4; amd64; ; ) References: <201206161035.09956.naylor.b.david@gmail.com> <1Si15V-0006xZ-36@internal.tormail.org> In-Reply-To: <1Si15V-0006xZ-36@internal.tormail.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1491856.W4nzrsz927"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <201206232051.41909.naylor.b.david@gmail.com> 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 18:51:55 -0000 --nextPart1491856.W4nzrsz927 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable On Friday, 22 June 2012 12:26:50 Jan Beich wrote: > (ports@ folk may know more about pkgng) >=20 > David Naylor writes: > > Hi, > >=20 > > Packages [1] for wine-fbsd64-1.5.6 have been uploaded to mediafire [2].= =20 > > The packages for FreeBSD 10 use the pkgng* [3] format. >=20 > [...] >=20 > > * Support for pkgng has been added to the nvidia-patch script >=20 > pkgng seems to be more pedantic regarding conflicting files. And I > haven't found a way to force register a package. I have reported this issue to both pkgng and FreeBSD ports. I managed to g= et=20 it to register by tweaking pkg-plist, also not defining WITH_PKGNG may work= =20 (and with the changes to nvidia.sh it will fall back to `pkg_info` if `pkg= =20 info` doesn\t yield). =20 > --- patch-nvidia.sh~ > +++ patch-nvidia.sh > @@ -92,12 +92,20 @@ do > done >=20 > version() { > + local ret pkg=3D"$1" > if [ -f "/usr/local/sbin/pkg" ] > then > - echo `pkg query -g '%v' $1` > + ret=3D`pkg query -g '%v' $pkg` > else > - echo `pkg_info -E $1'*' | cut -f 3 -d -` > + ret=3D`pkg_info -E $pkg'*' | cut -f 3 -d -` > fi > + # installed manually or failed to register > + if [ -z "$ret" ] && [ "$pkg" =3D "nvidia-driver" ] > + then > + ret=3D`sed 2>/dev/null -n 's/.*Version: //p' \ > + $PREFIX/share/doc/NVIDIA_GLX-1.0/README || true` > + fi > + echo "$ret" > } >=20 > [ `whoami` =3D root ] \ Thanks for your patch. I have updates the nvidia.sh script and given you=20 credit. This will be available from wine 1.5.7. Regards --nextPart1491856.W4nzrsz927 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEABECAAYFAk/mED0ACgkQUaaFgP9pFrKiFQCfVLeKAinIAEmsuyImS6NLcSrl /YUAn2FpcM5bJD8Wbo7OlnjFyalSO381 =FDRG -----END PGP SIGNATURE----- --nextPart1491856.W4nzrsz927--