diff --git a/share/mk/bsd.x11.mk b/share/mk/bsd.x11.mk
index 30d8eb18f0d5..cf854e1d7d35 100644
--- a/share/mk/bsd.x11.mk
+++ b/share/mk/bsd.x11.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.44 2005/01/11 10:39:47 tron Exp $
+#	$NetBSD: bsd.x11.mk,v 1.45 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.init.mk>
 
@@ -13,9 +13,6 @@ X11FLAGS.VERSION=	-DOSMAJORVERSION=1 -DOSMINORVERSION=6		# XXX
 X11FLAGS.THREADS=	-DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API \
 			-DXNO_MTSAFE_PWDAPI
 
-#	 THREADS_DEFINES for libraries
-X11FLAGS.THREADLIB=	${X11FLAGS.THREADS}
-
 #	 CONNECTION_FLAGS
 X11FLAGS.CONNECTION=	-DTCPCONN -DUNIXCONN -DHAS_STICKY_DIR_BIT \
 			-DHAS_FCHOWN
diff --git a/x11/Xserver/GL/dri/mga_dri/Makefile b/x11/Xserver/GL/dri/mga_dri/Makefile
index 06a347961e9d..94a9a80ee7d0 100644
--- a/x11/Xserver/GL/dri/mga_dri/Makefile
+++ b/x11/Xserver/GL/dri/mga_dri/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2004/03/06 10:30:26 rtr Exp $
+#	$NetBSD: Makefile,v 1.2 2005/01/21 05:15:36 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -123,7 +123,7 @@ CPPFLAGS.${fn}+=-DX_BYTE_ORDER=${X_BYTE_ORDER}
 
 SRCS=	${SRCS.dri} ${SRCS.drm} ${SRCS.mesa} ${SRCS.common} ${SRCS.mga}
 
-CPPFLAGS+=	${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADLIB} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+CPPFLAGS+=	${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADS} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 
 LDADD=	-lm
 DPADD=	${LIBM}
diff --git a/x11/Xserver/GL/dri/radeon_dri/Makefile b/x11/Xserver/GL/dri/radeon_dri/Makefile
index 4f5d2963b22c..86c506e23d34 100644
--- a/x11/Xserver/GL/dri/radeon_dri/Makefile
+++ b/x11/Xserver/GL/dri/radeon_dri/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2004/03/06 10:30:26 rtr Exp $
+#	$NetBSD: Makefile,v 1.2 2005/01/21 05:15:36 rtr Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -127,7 +127,7 @@ CPPFLAGS.${fn}+=-DX_BYTE_ORDER=${X_BYTE_ORDER}
 
 SRCS=	${SRCS.dri} ${SRCS.drm} ${SRCS.mesa} ${SRCS.common} ${SRCS.radeon}
 
-CPPFLAGS+=	${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADLIB} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+CPPFLAGS+=	${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADS} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 
 LDADD=	-lm
 DPADD=	${LIBM}
diff --git a/x11/lib/GL/Makefile b/x11/lib/GL/Makefile
index 1142e3478f86..daea51c59f44 100644
--- a/x11/lib/GL/Makefile
+++ b/x11/lib/GL/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.9 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -119,7 +119,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${X11SRCDIR.xc}/lib/GL/include \
 		-I${X11SRCDIR.xc}/extras/Mesa/src \
-		${X11FLAGS.THREADLIB} -DGLXEXT -DGLX_USE_MESA
+		${X11FLAGS.THREADS} -DGLXEXT -DGLX_USE_MESA
 
 LIBDPLIBS=	Xext	${.CURDIR}/../Xext \
 		X11	${.CURDIR}/../X11/dynamic
diff --git a/x11/lib/OSmesa/Makefile b/x11/lib/OSmesa/Makefile
index 5ba0f9e2c549..fde4eef8d587 100644
--- a/x11/lib/OSmesa/Makefile
+++ b/x11/lib/OSmesa/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.15 2005/01/21 05:15:36 rtr Exp $
 
 NOLINT=		1	# XTODO: 3dnow.ln barfs on src/math/m_vertices.h
 
@@ -55,7 +55,7 @@ CPPFLAGS+=	${X11FLAGS.DRI}
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xc}/lib/GL/include \
 		-I${X11SRCDIR.xc}/extras/Mesa/src \
-		${X11FLAGS.THREADLIB} \
+		${X11FLAGS.THREADS} \
 		-DGLXEXT -DGLX_USE_MESA
 
 .if ${MACHINE_ARCH} == "i386"
diff --git a/x11/lib/X11/Makefile.libx11 b/x11/lib/X11/Makefile.libx11
index 3673b4e57af5..668d64388f0c 100644
--- a/x11/lib/X11/Makefile.libx11
+++ b/x11/lib/X11/Makefile.libx11
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libx11,v 1.4 2003/09/30 06:41:30 lukem Exp $
+#	$NetBSD: Makefile.libx11,v 1.5 2005/01/21 05:15:36 rtr Exp $
 
 LIB=	X11
 .PATH:	${X11SRCDIR.xc}/lib/${LIB}
@@ -80,7 +80,7 @@ SRCS+=	SetLocale.c imConv.c imKStoUCS.c lcCT.c lcCharSet.c lcConv.c \
 	lcDB.c lcDefConv.c lcFile.c lcGeneric.c lcInit.c lcPrTxt.c \
 	lcPubWrap.c lcPublic.c lcRM.c lcStd.c lcTxtPr.c lcUTF8.c lcUtil.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-I. -DHAS_SNPRINTF -DLIBX11 -DPOSTLOCALELIBDIR=\"lib\"
 
 CMS_DEFINES=		-DXCMSDB=\"${X11LIBDIR}/Xcms.txt\"
diff --git a/x11/lib/XRes/Makefile b/x11/lib/XRes/Makefile
index c6ff509e75ea..ab993e90d8cc 100644
--- a/x11/lib/XRes/Makefile
+++ b/x11/lib/XRes/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2004/04/28 14:17:57 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@ MLINKS=	XRes.3 XResQueryClientPixmapBytes.3 \
 	XRes.3 XResQueryExtension.3 \
 	XRes.3 XResQueryVersion.3
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/x11/lib/XTrap/Makefile b/x11/lib/XTrap/Makefile
index ae210dbb9c39..482268c75e06 100644
--- a/x11/lib/XTrap/Makefile
+++ b/x11/lib/XTrap/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@ LIB=	XTrap
 SRCS=	XECallBcks.c XEConTxt.c XEDsptch.c XEPrInfo.c XERqsts.c \
 	XEStrMap.c XETrapInit.c XEWrappers.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 CPPFLAGS.XEWrappers.c=	-I${X11SRCDIR.xc}/lib/Xt -I${DESTDIR}${X11INCDIR}/X11
 
diff --git a/x11/lib/Xau/Makefile b/x11/lib/Xau/Makefile
index d00864718432..14f868d655f1 100644
--- a/x11/lib/Xau/Makefile
+++ b/x11/lib/Xau/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2004/03/06 03:05:39 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@ SRCS=	AuDispose.c AuFileName.c AuGetAddr.c AuGetBest.c AuLock.c \
 INCS=	Xauth.h
 INCSDIR=${X11INCDIR}/X11
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/x11/lib/Xcursor/Makefile b/x11/lib/Xcursor/Makefile
index 6ee45a537ebb..2973fe086c5e 100644
--- a/x11/lib/Xcursor/Makefile
+++ b/x11/lib/Xcursor/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.10 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -12,7 +12,7 @@ INCSDIR=${X11INCDIR}/X11/Xcursor
 
 MAN=	Xcursor.3
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-DICONDIR=\"${X11LIBDIR}/icons\"
 
 LIBDPLIBS=\
diff --git a/x11/lib/Xdmcp/Makefile b/x11/lib/Xdmcp/Makefile
index 888e536a2389..e849fe36057b 100644
--- a/x11/lib/Xdmcp/Makefile
+++ b/x11/lib/Xdmcp/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2004/03/06 03:05:39 rtr Exp $
+#	$NetBSD: Makefile,v 1.5 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@ SRCS=	A8Eq.c AA16.c AA32.c AA8.c Alloc.c AofA8.c CA8.c CmpKey.c DA16.c \
 INCS=	Xdmcp.h
 INCSDIR=${X11INCDIR}/X11
 
-CPPFLAGS+=${X11FLAGS.THREADLIB}
+CPPFLAGS+=${X11FLAGS.THREADS}
 CPPFLAGS+=-DHASXDMAUTH
 
 CPPFLAGS.Fill.c=	${X11FLAGS.CONNECTION}
diff --git a/x11/lib/Xext/Makefile b/x11/lib/Xext/Makefile
index 0191cf4a84b3..ba7d4565fc98 100644
--- a/x11/lib/Xext/Makefile
+++ b/x11/lib/Xext/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@ LIB=	Xext
 SRCS=	DPMS.c MITMisc.c XAppgroup.c XEVI.c XLbx.c XMultibuf.c XSecurity.c \
 	XShape.c XShm.c XSync.c XTestExt1.c Xcup.c Xdbe.c extutil.c globals.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/X11
 
 LIBDPLIBS=	X11	${.CURDIR}/../X11/dynamic
diff --git a/x11/lib/Xfontcache/Makefile b/x11/lib/Xfontcache/Makefile
index 44cac5af157b..d31b361e3c9e 100644
--- a/x11/lib/Xfontcache/Makefile
+++ b/x11/lib/Xfontcache/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2004/04/28 14:17:57 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@ MLINKS=	Xfontcache.3 FontCacheChangeCacheSettings.3 \
 	Xfontcache.3 FontCacheQueryExtension.3 \
 	Xfontcache.3 FontCacheQueryVersion.3
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/x11/lib/Xft/Makefile b/x11/lib/Xft/Makefile
index 3c96ef2ea355..800408ee321b 100644
--- a/x11/lib/Xft/Makefile
+++ b/x11/lib/Xft/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2004/04/29 05:18:25 lukem Exp $
+#	$NetBSD: Makefile,v 1.9 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@ INCSDIR=${X11INCDIR}/X11/Xft
 
 MAN=	Xft.3
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
 
 # XXX it would be really swell if SCRIPTS was available from bsd.lib.mk
diff --git a/x11/lib/Xft1/Makefile b/x11/lib/Xft1/Makefile
index 23a3dac16095..2b5561ad5250 100644
--- a/x11/lib/Xft1/Makefile
+++ b/x11/lib/Xft1/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2004/04/29 05:18:26 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 2005/01/21 05:15:36 rtr Exp $
 
 NOCHECKVER=	yes	# we want to install an older version ...
 MKLINKLIB=	no
@@ -13,7 +13,7 @@ SRCS=	xftcfg.c xftcolor.c xftcore.c xftdbg.c xftdir.c xftdpy.c \
 	xftglyphs.c xftinit.c xftlist.c xftmatch.c xftmatrix.c \
 	xftname.c xftpat.c xftrender.c xftstr.c xftxlfd.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
 
 .include <bsd.x11.mk>
diff --git a/x11/lib/Xi/Makefile b/x11/lib/Xi/Makefile
index 20c001a00590..9d835957a00c 100644
--- a/x11/lib/Xi/Makefile
+++ b/x11/lib/Xi/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@ SRCS=	XAllowDv.c XChgDCtl.c XChgFCtl.c XChgKMap.c XChgKbd.c \
 	XSetMMap.c XSetMode.c XSndExEv.c XStFocus.c XUngrDev.c \
 	XUngrDvB.c XUngrDvK.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 LIBDPLIBS=\
 	Xext	${.CURDIR}/../Xext \
diff --git a/x11/lib/Xinerama/Makefile b/x11/lib/Xinerama/Makefile
index c1115467c6a1..14b08ddbf292 100644
--- a/x11/lib/Xinerama/Makefile
+++ b/x11/lib/Xinerama/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/10/20 05:12:41 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.4 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@ LIB=	Xinerama
 
 SRCS=	Xinerama.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/x11/lib/Xmu/Makefile b/x11/lib/Xmu/Makefile
index 5ce15311c536..62c712bc8e34 100644
--- a/x11/lib/Xmu/Makefile
+++ b/x11/lib/Xmu/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -21,7 +21,7 @@ INCS=	Atoms.h CharSet.h CloseHook.h Converters.h CurUtil.h \
 	StdSel.h SysUtil.h WidgetNode.h WinUtil.h Xct.h Xmu.h
 INCSDIR=${X11INCDIR}/X11/Xmu
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-DHAS_SNPRINTF
 CPPFLAGS+=	-DXTSTRINGDEFINES	#XTODO is this correct?
 
diff --git a/x11/lib/Xp/Makefile b/x11/lib/Xp/Makefile
index f5ce36519055..abd162a3420b 100644
--- a/x11/lib/Xp/Makefile
+++ b/x11/lib/Xp/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@ SRCS=	XpAttr.c XpContext.c XpDoc.c XpExtUtil.c XpExtVer.c \
 	XpNotifyPdm.c XpPage.c XpPageDim.c XpPrinter.c XpPutData.c \
 	XpScreens.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 LIBDPLIBS=\
 	Xau	${.CURDIR}/../Xau \
diff --git a/x11/lib/Xrandr/Makefile b/x11/lib/Xrandr/Makefile
index 183b3c75bc56..f6aef69586cd 100644
--- a/x11/lib/Xrandr/Makefile
+++ b/x11/lib/Xrandr/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@ SRCS=	Xrandr.c
 INCS=	Xrandr.h
 INCSDIR=${X11INCDIR}/X11/extensions
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/extensions
 
 MAN=	Xrandr.3
diff --git a/x11/lib/Xrender/Makefile b/x11/lib/Xrender/Makefile
index ecee8dfab063..d9dba0ed6fcc 100644
--- a/x11/lib/Xrender/Makefile
+++ b/x11/lib/Xrender/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@ SRCS=	Color.c Composite.c Cursor.c FillRect.c FillRects.c Filter.c \
 INCS=	Xrender.h
 INCSDIR=${X11INCDIR}/X11/extensions
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/extensions
 CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/X11
 
diff --git a/x11/lib/Xt/Makefile b/x11/lib/Xt/Makefile
index 42b46d1929c0..33a7bb79d4bf 100644
--- a/x11/lib/Xt/Makefile
+++ b/x11/lib/Xt/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.13 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -21,7 +21,7 @@ INCS=	Composite.h CompositeP.h ConstrainP.h Constraint.h Core.h \
 	RectObjP.h Shell.h ShellP.h StringDefs.h Vendor.h VendorP.h
 INCSDIR=${X11INCDIR}/X11
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-DUSE_POLL -DUSE_SNPRINTF -DLIBXT -I.
 
 CPPFLAGS.Intrinsic.c=	-DXFILESEARCHPATHDEFAULT=\"${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S\"
diff --git a/x11/lib/Xtst/Makefile b/x11/lib/Xtst/Makefile
index ea94e1680462..a0a420d4a548 100644
--- a/x11/lib/Xtst/Makefile
+++ b/x11/lib/Xtst/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@ LIB=	Xtst
 
 SRCS=	XTest.c XRecord.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 LIBDPLIBS=\
 	Xext	${.CURDIR}/../Xext \
diff --git a/x11/lib/Xv/Makefile b/x11/lib/Xv/Makefile
index c95c00018362..4b64ba0a3e84 100644
--- a/x11/lib/Xv/Makefile
+++ b/x11/lib/Xv/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@ LIB=	Xv
 
 SRCS=	Xv.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 LIBDPLIBS=\
 	Xext	${.CURDIR}/../Xext \
diff --git a/x11/lib/XvMC/Makefile b/x11/lib/XvMC/Makefile
index c31e6034b345..6c8d423567aa 100644
--- a/x11/lib/XvMC/Makefile
+++ b/x11/lib/XvMC/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2004/01/05 02:29:30 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@ LIB=	XvMC
 
 SRCS=	XvMC.c
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff --git a/x11/lib/Xxf86dga/Makefile b/x11/lib/Xxf86dga/Makefile
index cbb574a710c0..b09f39c66a58 100644
--- a/x11/lib/Xxf86dga/Makefile
+++ b/x11/lib/Xxf86dga/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2004/04/28 14:17:57 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -29,7 +29,7 @@ MLINKS=	XDGA.3 XF86DGA.3 \
 	XDGA.3 XDGASetViewport.3 \
 	XDGA.3 XDGASync.3
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 CPPFLAGS.XF86DGA2.c=	-Wno-error	# gcc3
 
diff --git a/x11/lib/fontconfig/src/Makefile b/x11/lib/fontconfig/src/Makefile
index ca762f28e51a..5aa55d33d5af 100644
--- a/x11/lib/fontconfig/src/Makefile
+++ b/x11/lib/fontconfig/src/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2004/08/05 01:28:48 lukem Exp $
+#	$NetBSD: Makefile,v 1.9 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@ LIBDPLIBS=\
 
 MAN=	fontconfig.3
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2 \
 		-I${X11SRCDIR.xc}/extras/expat/lib
 CPPFLAGS+=	-DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' -DHAVE_EXPAT
diff --git a/x11/lib/freetype2/Makefile b/x11/lib/freetype2/Makefile
index d81ed7aa0922..3809026bbe07 100644
--- a/x11/lib/freetype2/Makefile
+++ b/x11/lib/freetype2/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2004/04/29 05:18:26 lukem Exp $
+#	$NetBSD: Makefile,v 1.8 2005/01/21 05:15:36 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -19,7 +19,7 @@ INCS=	ft2build.h
 INCSDIR=${X11INCDIR}
 .PATH:	${FREETYPETOP}/include
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB} -DXFREE86_FT2
+CPPFLAGS+=	${X11FLAGS.THREADS} -DXFREE86_FT2
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2
 
 .if defined(MKTTINTERP) && ${MKTTINTERP} != "no"
diff --git a/x11/lib/xlibi18n/Makefile.xlibi18n b/x11/lib/xlibi18n/Makefile.xlibi18n
index 1b0eaeb845d1..13a36527b25e 100644
--- a/x11/lib/xlibi18n/Makefile.xlibi18n
+++ b/x11/lib/xlibi18n/Makefile.xlibi18n
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xlibi18n,v 1.5 2004/08/04 08:37:05 lukem Exp $
+#	$NetBSD: Makefile.xlibi18n,v 1.6 2005/01/21 05:15:37 rtr Exp $
 
 MKLINKLIB=	no
 
@@ -9,7 +9,7 @@ MKLINKLIB=	no
 SHLIB_MAJOR=	2
 SHLIB_MINOR=	0
 
-CPPFLAGS+=	${X11FLAGS.THREADLIB}
+CPPFLAGS+=	${X11FLAGS.THREADS}
 
 LIBDPLIBS=X11 ${NETBSDSRCDIR}/x11/lib/X11/dynamic