On Fri, Mar 07, 2003 at 03:55:53PM -0800, Eric Anholt
wrote:> On Fri, 2003-03-07 at 01:52, Gunnar Flygt wrote:
> > cvsuped a few minutes ago the ports tree. In all of the directories
> > connected to XFree86-4 4.3.0 the pkg-comment is missing. Therefore
> > patches don't apply clean.
> >
> > Used the ver -11 of the pacthes leading to 4.3.0
>
> The -12 patches at the site now should fix that.
> http://people.freebsd.org/~anholt/X/files.html
The patch applies fine, but I still have problem with:
bash-2.05b# portupgrade -R -p XFree86-FontServer
---> Upgrading 'XFree86-FontServer-4.2.0_1' to
'XFree86-FontServer-4.3.0' (x11-
servers/XFree86-4-FontServer)
---> Building '/usr/ports/x11-servers/XFree86-4-FontServer'
===> Cleaning for libiconv-1.8_2
===> Cleaning for gettext-0.11.5_1
===> Cleaning for gmake-3.80
===> Cleaning for imake-4.3.0
===> Cleaning for libtool-1.3.4_4
===> Cleaning for pkgconfig-0.15.0
===> Cleaning for perl-5.6.1_11
===> Cleaning for freetype2-2.1.3_1
===> Cleaning for expat-1.95.6_1
===> Cleaning for fontconfig-2.1_5
===> Cleaning for XFree86-libraries-4.3.0
===> Cleaning for XFree86-FontServer-4.3.0
===> Extracting for XFree86-FontServer-4.3.0>> Checksum OK for xc/X430src-1.tgz.
>> Checksum OK for xc/X430src-2.tgz.
>> Checksum OK for xc/X430src-3.tgz.
===> Patching for XFree86-FontServer-4.3.0
===> Applying FreeBSD patches for XFree86-FontServer-4.3.0
I can't seem to find a patch in there anywhere.
===> Ignoring patchfile
/usr/ports/x11-servers/XFree86-4-FontServer/../../x11/
XFree86-4-libraries/files/patch-2.orig
I can't seem to find a patch in there anywhere.
===> Ignoring patchfile
/usr/ports/x11-servers/XFree86-4-FontServer/../../x11/
XFree86-4-libraries/files/patch-DRI.orig
Ignoring previously applied (or reversed) patch.
5 out of 5 hunks ignored--saving rejects to
config/cf/FreeBSD.cf.rej>> Patch patch-FreeBSD.cf failed to apply cleanly.
>> Patch(es) patch-2 patch-DRI applied cleanly.
*** Error code 1
Stop in /usr/ports/x11-servers/XFree86-4-FontServer.
** Command failed [exit code 1]: /usr/bin/script -qa /tmp/portupgrade821.4 make
DEPENDS_TARGET=package
** Fix the problem and try again.
** The following packages were not installed or upgraded (*:skipped / !:failed)
! x11-servers/XFree86-4-FontServer (XFree86-FontServer-4.2.0_1) (patch e
rror)
I cvsupped right before applying the patch>
> --
> Eric Anholt eta@lclark.edu
> http://people.freebsd.org/~anholt/ anholt@FreeBSD.org
--
Gunnar Flygt, Postmaster SR