xorg-server patch error

[Andriy Kornatskyy]

If I remove `work` directory for xorg-server, the error is a bit different:

===>  Found saved configuration for xorg-server-1.10.6_2,1
===>  Extracting for xorg-server-1.10.6_2,1
=> SHA256 Checksum OK for xorg/xserver/xorg-server-1.10.6.tar.bz2.
===>   xorg-server-1.10.6_2,1 depends on file: /usr/local/bin/perl5.14.2 - found
===>  Patching for xorg-server-1.10.6_2,1
===>   xorg-server-1.10.6_2,1 depends on file: /usr/local/bin/perl5.14.2 - found
===>  Applying extra patch /usr/ports/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
===>  Applying extra patch /usr/ports/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
===>  Applying extra patch /usr/ports/x11-servers/xorg-server/files/extra-clang
===>  Applying extra patch /usr/ports/x11-servers/xorg-server/files/extra-new-arch-i386
1 out of 1 hunks failed--saving rejects to hw/xfree86/common/compiler.h.rej
*** [do-patch] Error code 1

Thanks.

Andriy

----------------------------------------
> From: andriy.kornatskyy at live.com
> To: c.kworr at gmail.com
> Subject: RE: xorg-server patch error
> Date: Fri, 1 Feb 2013 15:35:22 +0300
> CC: freebsd-stable at freebsd.org
>
>
> Volodymyr,
>
> Thank you for the reply. Here is what I have (via: portsnap fetch update):
>
> # ls -lh /usr/ports/x11-servers/xorg-server/*
> -rw-r--r-- 1 root wheel 5.3k Jan 19 14:47 /usr/ports/x11-servers/xorg-server/Makefile
> -rw-r--r-- 1 root wheel 344B Apr 21 2012 /usr/ports/x11-servers/xorg-server/distinfo
> -rw-r--r-- 1 root wheel 118B Feb 25 2011 /usr/ports/x11-servers/xorg-server/pkg-descr
> -rw-r--r-- 1 root wheel 6.2k Aug 31 18:44 /usr/ports/x11-servers/xorg-server/pkg-plist
>
> /usr/ports/x11-servers/xorg-server/files:
> total 76
> -rw-r--r-- 1 root wheel 5.4k Apr 21 2012 extra-arch-ia64
> -rw-r--r-- 1 root wheel 438B May 5 2010 extra-arch-powerpc
> -rw-r--r-- 1 root wheel 1.7k Dec 14 13:08 extra-clang
> -rw-r--r-- 1 root wheel 3.4k Apr 24 2012 extra-dix_events.c
> -rw-r--r-- 1 root wheel 2.3k Apr 21 2012 extra-hw_dmx_glxProxy_compsize.h
> -rw-r--r-- 1 root wheel 1.8k Apr 21 2012 extra-hw_dmx_glxProxy_glxcmds.h
> -rw-r--r-- 1 root wheel 799B Apr 21 2012 extra-include_eventstr.h
> -rw-r--r-- 1 root wheel 493B Jan 19 14:47 extra-new-arch-i386
> -rw-r--r-- 1 root wheel 511B Jan 19 14:47 extra-old-arch-i386
> -rw-r--r-- 1 root wheel 645B Apr 21 2012 extra-patch-os-utils.c
> -rw-r--r-- 1 root wheel 384B May 19 2007 patch-Xserver-hw-xfree86-common-xf86Config.c
> -rw-r--r-- 1 root wheel 469B May 19 2007 patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
> -rw-r--r-- 1 root wheel 402B Mar 31 2009 patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
> -rw-r--r-- 1 root wheel 350B May 19 2007 patch-Xserver-os-xprintf.c
> -rw-r--r-- 1 root wheel 320B May 19 2007 patch-servermd.h
> -rw-r--r-- 1 root wheel 471B May 19 2007 patch-xorgconf.cpp
> -rw-r--r-- 1 root wheel 244B Aug 31 18:44 pkg-deinstall.in
> -rw-r--r-- 1 root wheel 638B Aug 31 18:44 pkg-install.in
>
> Thanks.
>
> Andriy
>
>
> ----------------------------------------
> > Date: Fri, 1 Feb 2013 14:18:10 +0200
> > From: c.kworr at gmail.com
> > To: andriy.kornatskyy at live.com
> > Subject: Re: xorg-server patch error
> > CC: freebsd-stable at freebsd.org
> >
> > 01.02.2013 10:07, Andriy Kornatskyy:
> >
> > > # make install clean -sC /usr/ports/x11/xorg-minimal
> > >
> > > ===> Installing for xorg-minimal-7.5.2
> > > ===> xorg-minimal-7.5.2 depends on file: /usr/local/bin/Xorg - not found
> > > ===> Verifying install for /usr/local/bin/Xorg in /usr/ports/x11-servers/xorg-server
> > > ===> Patching for xorg-server-1.10.6_2,1
> > > ===> xorg-server-1.10.6_2,1 depends on file: /usr/local/bin/perl5.14.2 - found
> > > ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h
> > > ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h
> > > ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/extra-clang
> > > Ignoring previously applied (or reversed) patch.
> > > 1 out of 1 hunks ignored--saving rejects to hw/xfree86/common/xf86Xinput.c.rej
> > > Ignoring previously applied (or reversed) patch.
> > > 1 out of 1 hunks ignored--saving rejects to hw/xfree86/parser/InputClass.c.rej
> > > Ignoring previously applied (or reversed) patch.
> > > 3 out of 3 hunks ignored--saving rejects to hw/xfree86/dri2/dri2.c.rej
> > > *** [do-patch] Error code 5
> >
> > Just a wild guess, can there be any old patches in
> > /usr/ports/x11-servers/xorg-server/files? At revision 311359 port should
> > contain only:
> >
> > # svn status -v
> > 311359 310652 zeising .
> > 311359 310652 zeising Makefile
> > 311359 300897 beat distinfo
> > 311359 310652 zeising files
> > 311359 300897 beat files/extra-arch-ia64
> > 311359 300897 beat files/extra-arch-powerpc
> > 311359 308898 zeising files/extra-clang
> > 311359 300897 beat files/extra-dix_events.c
> > 311359 300897 beat
> > files/extra-hw_dmx_glxProxy_compsize.h
> > 311359 300897 beat
> > files/extra-hw_dmx_glxProxy_glxcmds.h
> > 311359 300897 beat files/extra-include_eventstr.h
> > 311359 310652 zeising files/extra-new-arch-i386
> > 311359 310652 zeising files/extra-old-arch-i386
> > 311359 300897 beat files/extra-patch-os-utils.c
> > 311359 300897 beat
> > files/patch-Xserver-hw-xfree86-common-xf86Config.c
> > 311359 300897 beat
> > files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
> > 311359 300897 beat
> > files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
> > 311359 300897 beat files/patch-Xserver-os-xprintf.c
> > 311359 300897 beat files/patch-servermd.h
> > 311359 300897 beat files/patch-xorgconf.cpp
> > 311359 303429 kwm files/pkg-deinstall.in
> > 311359 303429 kwm files/pkg-install.in
> > 311359 300897 beat pkg-descr
> > 311359 303429 kwm pkg-plist
> >
> > --
> > Sphinx of black quartz, judge my vow.
> > _______________________________________________
> > freebsd-stable at freebsd.org mailing list
> > http://lists.freebsd.org/mailman/listinfo/freebsd-stable
> > To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"
>
> _______________________________________________
> freebsd-stable at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-stable
> To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"