I had renamed some packages. I had commented out the conflicting lines on 
one system using x11-links and then on the system where I did my final 
test I didn't change the x11-links and wasn't using x11-links so I forgot 
to commit. Sorry. Can you please try the following?

(I have two more patches to commit too as sent to tech-pkg a couple hours 
ago.)

Index: pkgtools/x11-links/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- pkgtools/x11-links/Makefile	19 Jan 2006 01:05:24 -0000	1.76
+++ pkgtools/x11-links/Makefile	18 Apr 2006 23:27:02 -0000
@@ -4,7 +4,7 @@
 #	the x11-links dependency in buildlink3.mk to the correct version,
 #	usually the most recent.
 
-DISTNAME=	x11-links-0.28
+DISTNAME=	x11-links-0.29
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
Index: pkgtools/x11-links/xorg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/xorg.mk,v
retrieving revision 1.2
diff -u -r1.2 xorg.mk
--- pkgtools/x11-links/xorg.mk	16 Oct 2005 08:57:30 -0000	1.2
+++ pkgtools/x11-links/xorg.mk	18 Apr 2006 23:27:02 -0000
@@ -14,15 +14,15 @@
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/compositeext/buildlink3.mk"
-.include "../../x11/fixesext/buildlink3.mk"
-.include "../../x11/xextensions/buildlink3.mk"
+.include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/Xcomposite/buildlink3.mk"
 .include "../../x11/Xfixes/buildlink3.mk"
 .include "../../x11/Xrandr/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
-.include "../../x11/renderext/buildlink3.mk"
-.include "../../x11/randrext/buildlink3.mk"
+.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/xcursor/buildlink3.mk"
 
 # XXX  what is ${X11_MODULES} ?

 Jeremy C. Reed

echo ':6DB6=88>?;@69876tA=AC8BB5tA6487><' | tr '4-F' 'wu rofIn.lkigemca'