X.org update broke emulators/wine with old version of X

[Gerald Pfeifer]

On my FreeBSD 6.2 test system with xorg-libraries-6.9.0 I am getting
the following build failure after the X.org update:

  ../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./ddraw.spec 
  clipper.o ddraw.o ddraw_thunks.o device.o direct3d.o executebuffer.o 
  gamma.o light.o main.o material.o palette.o parent.o regsvr.o surface.o 
  surface_thunks.o texture.o utils.o vertexbuffer.o viewport.o version.res 
  -o ddraw.dll.so -lole32 -luser32 -lgdi32 -ladvapi32 -lkernel32 -lntdll 
  -ldxguid -luuid -L/usr/local/lib -R/usr/local/lib -lXext -lX11 
  ../../libs/port/libwine_port.a -L/files/pfeifer/porttest/wine/lib 
  -L/usr/local/lib -Wl,-rpath,/files/pfeifer/porttest/wine/lib/wine
  /usr/bin/ld: cannot find -lXext
  winegcc: cc failed.
  gmake[2]: *** [ddraw.dll.so] Error 2

I believe this happens because of the changes to Mk/bsd.xorg.mk. The 
libraries are still there, but I assume the old /usr/X11R6/lib path is
not provided any longer:

  % find /usr/X11R6/ -name '*libXext*'
  /usr/X11R6/lib/libXext.a
  /usr/X11R6/lib/libXext.so
  /usr/X11R6/lib/libXext.so.6

Can someone more familiar with this lend a helping hand, please?  I
assume we do want to support users still running older versions of X,
don't we?

Gerald @FreeBSD.org
-- 
Gerald (Jerry) Pfeifer   gerald at pfeifer.com   http://www.pfeifer.com/gerald/