xorg-clients broken patches on 5.3-RC1

root_at_CubeMonster# make patch
===>  Patching for xorg-clients-6.7.0_4
===>  Applying extra patch
/usr/ports/x11-servers/xorg-server/files/patch-FreeBSD.cf
===>  Applying extra patch
/usr/ports/x11-servers/xorg-server/files/patch-Imake.rules
===>  Applying extra patch
/usr/ports/x11-servers/xorg-server/files/patch-Imake.tmpl
===>  Applying extra patch
/usr/ports/x11-servers/xorg-server/files/patch-Library.tmpl
===>  Applying extra patch
/usr/ports/x11-servers/xorg-server/files/patch-X11.rules
===>  Applying extra patch
/usr/ports/x11-servers/xorg-server/files/patch-X11.tmpl
===>  Applying FreeBSD patches for xorg-clients-6.7.0_4
Ignoring previously applied (or reversed) patch.
2 out of 2 hunks ignored--saving rejects to programs/dpsinfo/Imakefile.rej
>> Patch patch-dpsinfo-Imakefile.org failed to apply cleanly.
>> Patch(es) patch-dpsinfo-Imakefile applied cleanly.
*** Error code 1

Stop in /usr/ports/x11/xorg-clients.


root_at_CubeMonster# cat work/xc/programs/dpsinfo/Imakefile
XCOMM $XFree86: xc/programs/dpsinfo/Imakefile,v 1.4tsi Exp $
XCOMM XTOOLLIB is currently needed by our version of DPSLIB

        DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXONLYLIB)
LOCAL_LIBRARIES = $(DPSLIB) $(XTOOLLIB) $(XONLYLIB)

SRCS = iwraps.psw dpsinfo.c

OBJS = iwraps.o dpsinfo.o

DERIVED_FILES = iwraps.h iwraps.c

.SUFFIXES: .psw .h

.psw.c : PsWrapDependency
        RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)

.psw.h : PsWrapDependency
        RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)

depend:: $(DERIVED_FILES)

ComplexProgramTarget(dpsinfo)

clean ::
        $(RM) $(DERIVED_FILES)

root_at_CubeMonster# make patch
===>  Patching for xorg-clients-6.7.0_4
===>  Applying extra patch
/usr/ports/x11-servers/xorg-server/files/patch-FreeBSD.cf
Ignoring previously applied (or reversed) patch.
6 out of 6 hunks ignored--saving rejects to config/cf/FreeBSD.cf.rej
*** Error code 6

Stop in /usr/ports/x11/xorg-clients.

root_at_CubeMonster# cat work/xc/config/cf/FreeBSD.cf.rej
***************
*** 109,115 ****
  # endif
  # define HasPosixThreads      YES
  # define ThreadedX            YES
- # define SystemMTDefines      -D_REENTRANT -D_THREAD_SAFE
  /*
   * FreeBSD has tread-safe api but no getpwnam_r yet.
   */
--- 109,115 ----
  # endif
  # define HasPosixThreads      YES
  # define ThreadedX            YES
+ # define SystemMTDefines      FreeBSDPTHREAD_CFLAGS
  /*
   * FreeBSD has tread-safe api but no getpwnam_r yet.
   */
***************
*** 119,127 ****
  # else
  #  define MTSafeAPIDefines    -DXUSE_MTSAFE_API
  # endif
- # if HasLibPthread
- #  define ThreadsLibraries    -lpthread
- # else
  #  if OSRelVersion >= 500043
  #   define BuildThreadStubLibrary  NO
  #   define NeedUIThrStubs          NO
--- 119,126 ----
  # else
  #  define MTSafeAPIDefines    -DXUSE_MTSAFE_API
  # endif
+ # define ThreadsLibraries     FreeBSDPTHREAD_LIBS
+ # if !HasLibPthread
  #  if OSRelVersion >= 500043
  #   define BuildThreadStubLibrary  NO*** 130,139 ****
  #   define NeedUIThrStubs          YES
  #  endif
  #  if (OSRelVersion >= 500016)
- #   define ThreadsLibraries   -lc_r
  #   define SharedGLReqs               $(LDPRELIBS) $(XLIB) -lc
- #  else
- #   define ThreadsLibraries   -pthread
  #  endif
  #  define SharedX11Reqs               $(LDPRELIB) $(XTHRSTUBLIB)
  #  define SharedXtReqs                $(LDPRELIB) $(XONLYLIB)
$(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
--- 129,135 ----
  #   define NeedUIThrStubs          YES
  #  endif
  #  if (OSRelVersion >= 500016)
  #   define SharedGLReqs               $(LDPRELIBS) $(XLIB) -lc
  #  endif
  #  define SharedX11Reqs               $(LDPRELIB) $(XTHRSTUBLIB)
  #  define SharedXtReqs                $(LDPRELIB) $(XONLYLIB)
$(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
***************
*** 192,202 ****
   *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
   */
  #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
- # define CcCmd                        $(CLIENTENVSETUP) cc
- # define CplusplusCmd         $(CLIENTENVSETUP) c++
  #else
- # define CcCmd                        cc
- # define CplusplusCmd         c++
  #endif
  
  #define CppCmd                        /usr/bin/cpp
--- 188,198 ----
   *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
   */
  #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
+ # define CcCmd                        $(CLIENTENVSETUP) FreeBSDCC
+ # define CplusplusCmd         $(CLIENTENVSETUP) FreeBSDCXX
  #else
+ # define CcCmd                        FreeBSDCC
+ # define CplusplusCmd         FreeBSDCXX
  #endif
  
  #define CppCmd                        /usr/bin/cpp
***************
*** 359,365 ****
  #ifndef LibraryRpathLoadFlags
  # if UseRpath
  #  if UseElfFormat
- #   define LibraryRpathLoadFlags      -rpath $(USRLIBDIRPATH)
  #  else
  #   define LibraryRpathLoadFlags      -R $(USRLIBDIRPATH)
  #  endif
--- 355,361 ----
  #ifndef LibraryRpathLoadFlags
  # if UseRpath
  #  if UseElfFormat
+ #   define LibraryRpathLoadFlags      -Wl,-rpath $(USRLIBDIRPATH)
  #  else
  #   define LibraryRpathLoadFlags  *** 452,469 ****
  #define XawI18nDefines                -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  #endif
  
- /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
- #ifndef DefaultGcc2i386Opt
- #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >
1) || (OSMajorVersion == 2 && OSMinorVersion == 1 &&
 OSTeenyVersion >= 5)
- #define DefaultGcc2i386Opt -O2 GccAliasingArgs
- #endif
- #endif
- 
- #ifdef i386Architecture
- # define OptimizedCDebugFlags DefaultGcc2i386Opt
- #else
- # define OptimizedCDebugFlags -O
- #endif
  
  #ifndef PreIncDir
  # define PreIncDir    /usr/include
--- 450,457 ----
  #define XawI18nDefines                -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
  #endif
  
+ #define DefaultGcc2i386Opt
+ #define OptimizedCDebugFlags FreeBSDCFLAGS
  
  #ifndef PreIncDir
  # define PreIncDir    /usr/include
    -R $(USRLIBDIRPATH)
  #  endif
***************

  #   define NeedUIThrStubs          NO
***************