From: Doug Barton on
On 03/28/10 19:34, Garrett Cooper wrote:
> On Sun, Mar 28, 2010 at 7:17 PM, Aristedes Maniatis <ari(a)ish.com.au> wrote:
>> On 29/03/10 1:15 PM, Garrett Cooper wrote:
>>>
>>> portmaster -r png-
>>
>> Is that correct? I haven't seen that notation before (although I might just
>> have missed it in the docs).
>>
>> I would have used
>>
>> portmaster -r graphics/png

That won't work, the man page clearly says that it has to be a port
directory or glob pattern from /var/db/pkg. The "glob pattern" bit of
that was (unfortunately) broken up till version 2.20, which I just
committed.

> And yes, the directions are still wrong; it should be:
>
> portmaster -r 'png-*'

The * at the end of that is not necessary. In fact, portmaster strips it
off before creating the actual pattern to feed to find. The current
version of the instructions are correct. The - at the end of png is not
strictly necessary, but it will serve to disambiguate the port name if
there exists a pngfoo-1.23.


hth,

Doug

--

... and that's just a little bit of history repeating.
-- Propellerheads

Improve the effectiveness of your Internet presence with
a domain name makeover! http://SupersetSolutions.com/

_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: Dominic Fandrey on
On 28/03/2010 15:38, Ion-Mihai Tetcu wrote:
> We do _NOT_ recommend updating ports until this commits are all done,
> and the problems are fixed, except if you want to help testing / fixing.

The already committed graphics/imlib2 patch does not work,
i.e. it compiles, but png doesn't work, with this one it does:

diff -Nur imlib2.orig/files/patch-loader_png.c imlib2/files/patch-loader_png.c
--- imlib2.orig/files/patch-loader_png.c 2010-03-29 10:12:43.000000000 +0200
+++ imlib2/files/patch-loader_png.c 2010-03-29 10:08:41.000000000 +0200
@@ -5,7 +5,7 @@
/* if we haven't read the header before, set the header data */
fread(buf, 1, PNG_BYTES_TO_CHECK, f);
- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if (png_check_sig(buf, 0, PNG_BYTES_TO_CHECK))
++ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK) != 0)
{
fclose(f);
return 0;
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: Ion-Mihai Tetcu on
On Mon, 29 Mar 2010 10:15:23 +0200
Dominic Fandrey <kamikaze(a)bsdforen.de> wrote:

> On 28/03/2010 15:38, Ion-Mihai Tetcu wrote:
> > We do _NOT_ recommend updating ports until this commits are all
> > done, and the problems are fixed, except if you want to help
> > testing / fixing.
>
> The already committed graphics/imlib2 patch does not work,
> i.e. it compiles, but png doesn't work, with this one it does:

[ .. ]

Committed, thanks.


--
IOnut - Un^d^dregistered ;) FreeBSD "user"
"Intellectual Property" is nowhere near as valuable as "Intellect"
FreeBSD committer -> itetcu(a)FreeBSD.org, PGP Key ID 057E9F8B493A297B
From: Aristedes Maniatis on
On 29/03/10 7:04 PM, Doug Barton wrote:
>>> portmaster -r graphics/png
> That won't work, the man page clearly says that it has to be a port
> directory or glob pattern from /var/db/pkg. The "glob pattern" bit of
> that was (unfortunately) broken up till version 2.20, which I just
> committed.

I'm confused. The manual actually says:

[-R] -r name/glob of port in /var/db/pkg


When I try your suggestion I get this:

# portmaster -r png-

===>>> No valid installed port, or port directory given
===>>> Try portmaster --help


And this doesn't work either:

# portmaster -r graphics/png

===>>> No valid installed port, or port directory given
===>>> Try portmaster --help


So, as you say the pkg pattern is broken, but also 'port directory' doesn't work either unlike your suggestions above. It would be nice for both pkg and directory patterns to be more consistently available, but in the meantime readers of UPDATING are going to be confused.


Ari Maniatis





--
-------------------------->
Aristedes Maniatis
ish
http://www.ish.com.au
Level 1, 30 Wilson Street Newtown 2042 Australia
phone +61 2 9550 5001 fax +61 2 9550 4001
GPG fingerprint CBFB 84B4 738D 4E87 5E5C 5EFA EF6A 7D2E 3E49 102A
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: Garrett Cooper on
On Mon, Mar 29, 2010 at 2:27 AM, Aristedes Maniatis <ari(a)ish.com.au> wrote:
> On 29/03/10 7:04 PM, Doug Barton wrote:
>>>>
>>>>  portmaster -r graphics/png
>>
>> That won't work, the man page clearly says that it has to be a port
>> directory or glob pattern from /var/db/pkg. The "glob pattern" bit of
>> that was (unfortunately) broken up till version 2.20, which I just
>> committed.
>
> I'm confused. The manual actually says:
>
>  [-R] -r name/glob of port in /var/db/pkg
>
>
> When I try your suggestion I get this:
>
> # portmaster -r png-
>
> ===>>> No valid installed port, or port directory given
> ===>>> Try portmaster --help
>
>
> And this doesn't work either:
>
> # portmaster -r graphics/png
>
> ===>>> No valid installed port, or port directory given
> ===>>> Try portmaster --help
>
>
> So, as you say the pkg pattern is broken, but also 'port directory' doesn't
> work either unlike your suggestions above. It would be nice for both pkg and
> directory patterns to be more consistently available, but in the meantime
> readers of UPDATING are going to be confused.

Besides, when I read `glob' I don't think `regular expression'. A
glob is a simplified extension of regular expressions, made available
via fnmatch(3) and glob(3) ... The previous method I described works,
and works well:

portmaster -r 'png-*'

Not sure why graphics/png doesn't work though; hrrm...
Thanks,
-Garrett
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"