trouble with xfree86-4 patches

[Andriy Gapon]

I am having strange problems while building various xfree86 4.5.0 ports
(separately) - e.g. when I am building X11 libraries I get errors about
"reversed patches":
patch-lib_X11_Imakefile
patch-lib_GL_mesa_drivers_osmesa_Imakefile
patch-lib_GL_mesa_drivers_dri_Imakefile
patch-lib_GL_GL_Imakefile
if I remove these files from x11/XFree86-4-libraries/files then I can
build the port successfully, but when I try to build server, it fails:
===>  Applying extra patch
/usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile
cannot open
/usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile:
No such file or directory

I can work around this problem by moving away and then moving back the
troublesome patches but it is quite annoying.

Is there something wrong with my setup or is the problem in the ports ?

-- 
Andriy Gapon