Problem upgrading dockyard-devel

"N. Thompson" <[email protected]> Sat, 29 Jan 2005 16:55:32 -0600
Newsgroups gmane.linux.arklinux.devel
Message-ID <[email protected]>
I'm running dockyard-devel 20041217 according to mission control and I am 
unable to upgrade a few packages, I am not using the latest dockyard-devel 
because I've heard that RTL 8139 nics are still not supported.

The error I get from RPM is:
file /usr/include/GL conflicts between attempted installs of 
freeglut-devel-2.2.0-2ark and xorg-Mesa-devel-6.8.2-0.20050125.1ark
E: Error while running transaction

Any suggestions on how to get the update to work?