Upgrading Xorg from 6.9.0 to 7.2

[Sereno Ternullo]

Hi folks,
I'm encountering problems upgrading Xorg from version 6.9.0 to 7.2
I followed the procedure described in /usr/ports/UPDATING

[...]

# portupgrade -aP -x 'gstreamer*'

Even though my computer spent 24 hours compiling,
when I typed

# pkg_version -s xorg

I saw I still had my old 6.9.0 version.

So this morning I tried again, by typing:

# script xorg.upgrade portupgrade -Pr xorg

and this is what I get (tail of the script log ) :


if /bin/sh ../libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H  -I. 
-I. -I..     -I/usr/local/include/xorg -I/usr/local/include   
-I/usr/local/include -I/usr/local/include/drm 
-I/usr/local/include/X11/dri -O2 -fno-strict-aliasing -pipe -MT 
atibus.lo -MD -MP -MF ".deps/atibus.Tpo" -c -o atibus.lo atibus.c;  then 
mv -f ".deps/atibus.Tpo" ".deps/atibus.Plo"; else rm -f 
".deps/atibus.Tpo"; exit 1; fi

 cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/xorg 
-I/usr/local/include -I/usr/local/include -I/usr/local/include/drm 
-I/usr/local/include/X11/dri -O2 -fno-strict-aliasing -pipe -MT 
atibus.lo -MD -MP -MF .deps/atibus.Tpo -c atibus.c  -fPIC -DPIC -o 
.libs/atibus.o

In file included from atidripriv.h:40,

                 from atistruct.h:41,

                 from atibus.c:35:

/usr/local/include/GL/glxint.h:28:19: GL/gl.h: No such file or directory

In file included from atidripriv.h:40,

                 from atistruct.h:41,

                 from atibus.c:35:

/usr/local/include/GL/glxint.h:95: error: syntax error before "GLboolean"

*** Error code 1



Stop in /usr/ports/x11-drivers/xf86-video-ati/work/xf86-video-ati-6.6.3/src.

*** Error code 1



Stop in /usr/ports/x11-drivers/xf86-video-ati/work/xf86-video-ati-6.6.3.

*** Error code 1



Stop in /usr/ports/x11-drivers/xf86-video-ati/work/xf86-video-ati-6.6.3.

*** Error code 1



Stop in /usr/ports/x11-drivers/xf86-video-ati.

*** Error code 1



Stop in /usr/ports/x11-drivers/xf86-video-ati.

*** Error code 1



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

*** Error code 1



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

*** Error code 1



Stop in /usr/ports/x11/xorg.

*** Error code 1



Stop in /usr/ports/x11/xorg.

** Command failed [exit code 1]: /usr/bin/script -qa 
/tmp/portupgrade.39088.0 env UPGRADE_TOOL=portupgrade 
UPGRADE_PORT=xorg-6.9.0 UPGRADE_PORT_VER=6.9.0 make reinstall

--->  Restoring the old version

** Fix the installation problem and try again.

[Updating the pkgdb <format:bdb_btree> in /var/db/pkg ... - 449 packages 
found (-0 +33) ................................. done]

** Listing the failed packages (*:skipped / !:failed)

    ! x11/xorg (xorg-6.9.0)    (install error)

--->  Packages processed: 0 done, 0 ignored, 0 skipped and 1 failed

** Could not clean up temporary directory: Directory not empty - 
/var/tmp/portupgradeOnzxbl1v


The compiling process ends because I don't have any 
/usr/local/include/GL/gl.h
( and any ati device, indeed )

I'm running FreeBSD 6.2-release,
I have an nvidia GeForce 2.

Is there any broken port out there ?
How can I get gl.h ?

Any advice is welcomed !