Date: Sat, 23 Jun 2012 20:51:38 +0200 From: David Naylor <naylor.b.david@gmail.com> To: Jan Beich <jbeich@tormail.org> Cc: freebsd-emulation@freebsd.org, freebsd-ports@freebsd.org Subject: Re: Wine-fbsd64 updated to 1.5.6 (32bit Wine for 64bit FreeBSD) Message-ID: <201206232051.41909.naylor.b.david@gmail.com> In-Reply-To: <1Si15V-0006xZ-36@internal.tormail.org> References: <201206161035.09956.naylor.b.david@gmail.com> <1Si15V-0006xZ-36@internal.tormail.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On Friday, 22 June 2012 12:26:50 Jan Beich wrote:
> (ports@ folk may know more about pkgng)
>
> David Naylor <naylor.b.david@gmail.com> 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.
I have reported this issue to both pkgng and FreeBSD ports. I managed to get
it to register by tweaking pkg-plist, also not defining WITH_PKGNG may work
(and with the changes to nvidia.sh it will fall back to `pkg_info` if `pkg
info` doesn\t yield).
> --- 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 ] \
Thanks for your patch. I have updates the nvidia.sh script and given you
credit. This will be available from wine 1.5.7.
Regards
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)
iEYEABECAAYFAk/mED0ACgkQUaaFgP9pFrKiFQCfVLeKAinIAEmsuyImS6NLcSrl
/YUAn2FpcM5bJD8Wbo7OlnjFyalSO381
=FDRG
-----END PGP SIGNATURE-----
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206232051.41909.naylor.b.david>