Moving to X11 bleeding edge and back

[Ryan Hinton]

I'm having trouble with X11 on my hardware when I switch to the console and back (http://bugs.freedesktop.org/show_bug.cgi?id=11269). Apparently there have been some recent changes to the Xorg git source that may fix my problem.  I would like to try these changes and then fall back to the -stable port at some point (immediately if bad things happen, eventually if my problem is fixed).

In the past, building and installing an application outside of the ports system caused problems when I tried to install the (-stable) port later on.  I may be doing something wrong; please let me know or show me where I can learn.  In general, is there a good way in general to update a port to its bleeding edge (within or outside the FreeBSD ports system) and then jump back to -stable later on?

In this case, I believe X11 is a particularly large and complicated port.  Is there a good way to update the FreeBSD X11 port to the latest git source within the ports system?  

Thank you for your time and help!

---
Ryan Hinton
iobass at email.com