X.Org 6.8.2 - (most probably) final patch

Dejan Lesjak dejan.lesjak at ijs.si
Tue Feb 22 13:31:42 GMT 2005


On Tuesday 22 of February 2005 11:34, Dag-Erling Smørgrav wrote:
> David Adam <zanchey at ucc.gu.uwa.edu.au> writes:
> > 17 minutes ~is~ a long time for extraction (particularly over several
> > ports) but I think it's a problem best solved by split distfiles, not by
> > lower compression.
> >
> > Is there any way around it (turning off cleaning, unbzip2ing and
> > modification of the Makefile/distinfo)?
>
> One possibility is to create a port that installs a patched source
> tree into /usr/X11R6/src/${PORTVERSION}, and have the other ports
> BUILD_DEPEND on it and lndir(1) the source code into their WRKDIR.
> This would have the added advantage of eliminating the current mess
> with random xorg ports nicking patches from eachother.
>
> DES

Excellent idea!
I was pondering on how this would handle the case where a patch would need to 
be added to single port, say xorg-vfbserver... If a patch would go to this 
port then lndir wouldn't help, since it would patch the installed source file 
(and on next rebuild fail because of previously applied patch). If a patch 
would go into this source port, then lndir would work, but there needs to be 
a way for xorg-vfbserver to know that the patch has been applied. I was 
pondering at first that source port would rather install 
into /usr/X11R6/src/${PORTVERSION}_${PORTREVISION} and xorg-vfbserver would 
depend on this location. But that would require changing all of the other 
ports to depend on new location of source. I'm now thinking of two 
possibilities:
- defining proper src location in xorg-source port Makefile.inc or some such 
and including this in all xorg- ports
- installing in /usr/X11R6/src/${PORTVERSION} but with placeholder files 
like /usr/X11R6/src/${PORTVERSION}/.foopatch-applied and depending on that 
(with proper if(source installed) && !exists(.foopatch-applied) echo 
"somekindofexplanation")
Anyway, this seems doable so far. I'm still hoping that there will be split 
distfiles for this release since this upgrade is now quite far, and I'm not 
sure whether portmgr will want another test run with such change (the 
packages contents and installed files should stay the same so this is rather 
internal xorg- ports change, but configure parts would probably need to be 
reworked and all...). Nevertheless, if nobody comes up with a scenario in 
which this way would fail I think this is the way to go :)
I was thinking of doing something to use the same source for all of separate 
ports through using WRKSRC or somesuch, but never thought of actually 
installing the source. Nifty trick, thanks :)


Dejan


More information about the freebsd-x11 mailing list