+ update reachover lib/* for xf4.4

XXX font/Makefile needs to be re-examined, but builds for now.
2004-03-06 03:05:39 +00:00 · 2004-03-06 03:05:39 +00:00 · 9db533ef43
commit 9db533ef43
parent 61ba4636ab
22 changed files with 346 additions and 179 deletions
--- a/x11/lib/GL/Makefile
+++ b/x11/lib/GL/Makefile
@ -1,15 +1,121 @@
-#	$NetBSD: Makefile,v 1.4 2003/09/30 06:41:30 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

 LIB=		GL

+# glx
 .PATH:		${X11SRCDIR.xc}/lib/GL/glx
+SRCS.glx=	clientattrib.c compsize.c dispatch.c eval.c g_render.c \
+		g_single.c g_vendpriv.c glthread.c glxcmds.c glxext.c \
+		glxextensions.c glcontextmodes.c indirect_init.c \
+		pixel.c pixelstore.c render2.c renderpix.c single2.c \
+		singlepix.c vertarr.c xfont.c
+
+.PATH:	${X11SRCDIR.xc}/extras/Mesa/src
+SRCS.glx+=	glapi.c
+
+.if ${MACHINE} == "i386"
+.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/X86
+SRCS.glx+=	glapi_x86.S
+.for fn in ${SRCS.glx}
+CPPFLAGS.${fn}=	-DUSE_X86_ASM
+.endfor
+.endif
+
+
+.if ${X11DRI} != "no"
+# dri
+.PATH:		${X11SRCDIR.xc}/lib/GL/dri
+SRCS.dri=	XF86dri.c dri_glx.c
+.for fn in ${SRCS.dri}
+CPPFLAGS.${fn}=-DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules\"
+.endfor
+
+
+# drm
+.PATH:		${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/linux/drm
+SRCS.drm=	xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
+
+
+# mesa
 .PATH:		${X11SRCDIR.xc}/extras/Mesa/src
-SRCS=		clientattrib.c compsize.c dispatch.c eval.c g_render.c \
-		g_single.c g_vendpriv.c glapi.c glthread.c glxcmds.c \
-		glxext.c indirect_init.c pixel.c pixelstore.c \
-		render2.c renderpix.c single2.c singlepix.c vertarr.c xfont.c
+SRCS.mesa=	accum.c api_arrayelt.c api_eval.c api_loopback.c \
+		api_noop.c api_validate.c attrib.c blend.c buffers.c \
+		clip.c colortab.c context.c convolve.c debug.c depth.c \
+		dispatch.c dlist.c drawpix.c enable.c enums.c \
+		MESAeval.c extensions.c feedback.c fog.c get.c \
+		MESApixel.c glthread.c hash.c hint.c histogram.c image.c \
+		imports.c light.c lines.c matrix.c mmath.c \
+		points.c polygon.c rastpos.c state.c stencil.c \
+		texcompress.c texformat.c teximage.c texobj.c texstate.c \
+		texstore.c texutil.c varray.c vtxfmt.c vpexec.c \
+		vpparse.c  vpstate.c 
+
+# XXX  avoid source name clashes with glx
+BUILDSYMLINKS=	${X11SRCDIR.xc}/extras/Mesa/src/pixel.c MESApixel.c \
+		${X11SRCDIR.xc}/extras/Mesa/src/eval.c MESAeval.c
+
+
+# array_cache
+.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/array_cache
+SRCS.ac=	ac_context.c ac_import.c
+
+
+# math
+.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/math
+SRCS.math=	m_debug_clip.c m_debug_norm.c m_debug_xform.c \
+		m_eval.c m_matrix.c m_translate.c m_vector.c m_xform.c
+
+
+# swrast
+.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/swrast
+SRCS.swrast=	s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
+		s_alphabuf.c s_bitmap.c s_blend.c s_buffers.c \
+		s_context.c s_copypix.c s_depth.c s_drawpix.c \
+		s_feedback.c s_fog.c s_histogram.c s_imaging.c \
+		s_lines.c s_logic.c s_masking.c s_pixeltex.c \
+		s_points.c s_readpix.c s_span.c s_stencil.c \
+		s_texstore.c s_texture.c s_triangle.c s_zoom.c
+
+
+# swrast_setup
+.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup
+SRCS.ss=	ss_context.c ss_triangle.c ss_vb.c
+
+
+# tnl
+.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/tnl
+SRCS.tnl=	t_array_api.c t_array_import.c t_context.c t_eval_api.c \
+		t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \
+		t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \
+		t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
+		t_vb_points.c t_vb_program.c t_vb_render.c t_vb_texgen.c \
+		t_vb_texmat.c t_vb_vertex.c
+
+
+.for fn in ${SRCS.glx} ${SRCS.dri} ${SRCS.drm} ${SRCS.mesa ${SRCS.ac} \
+	   ${SRCS.math} ${SRCS.swrast} ${SRCS.ss} ${SRCS.tnl}
+CPPFLAGS.${fn}+=-I${X11SRCDIR.xc}/lib/GL/dri \
+		-I${X11SRCDIR.xc}/lib/GL/glx \
+		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel \
+		-I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
+		-I${X11SRCDIR.xc}/extras/Mesa/src/array_cache \
+		-I${X11SRCDIR.xc}/extras/Mesa/src/math \
+		-I${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup \
+		-I${X11SRCDIR.xc}/extras/Mesa/src/tnl \
+		-I${X11SRCDIR.xc}/extras/Mesa/src/include
+CPPFLAGS.${fn}+=${X11FLAGS.DRI}
+
+# -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+.endfor
+
+SRCS+=	${SRCS.dri} ${SRCS.drm} ${SRCS.mesa} ${SRCS.ac} ${SRCS.math} \
+	${SRCS.swrast} ${SRCS.ss} ${SRCS.tnl}
+.endif
+
+SRCS+=	${SRCS.glx}

 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
@ -22,3 +128,4 @@ DPADD+=		${LIBXEXT} ${LIBX11}

 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
+
--- a/x11/lib/GLw/Makefile
+++ b/x11/lib/GLw/Makefile
@ -1,6 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:43 lukem Exp $
-
-NOPIC=	1
+#	$NetBSD: Makefile,v 1.3 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

--- a/x11/lib/GLw/shlib_version
+++ b/x11/lib/GLw/shlib_version
@ -0,0 +1,4 @@
+#	$NetBSD: shlib_version,v 1.1 2004/03/06 03:05:39 rtr Exp $
+#
+major=1
+minor=0
--- a/x11/lib/OSmesa/Makefile
+++ b/x11/lib/OSmesa/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2004/02/09 04:30:05 lukem Exp $
+#	$NetBSD: Makefile,v 1.11 2004/03/06 03:05:39 rtr Exp $

 NOLINT=		1	# XTODO: 3dnow.ln barfs on src/math/m_vertices.h

@ -6,41 +6,51 @@ NOLINT=		1	# XTODO: 3dnow.ln barfs on src/math/m_vertices.h

 LIB=		OSMesa

-.PATH:		${X11SRCDIR.xc}/extras/Mesa/src
-.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/OSmesa
-.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/array_cache
-.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/math
-.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/swrast
-.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup
-.PATH:		${X11SRCDIR.xc}/extras/Mesa/src/tnl
+.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/OSmesa
+SRCS=	osmesa.c

-SRCS=		osmesa.c accum.c api_arrayelt.c api_eval.c \
-		api_loopback.c api_noop.c api_validate.c attrib.c \
-		blend.c buffers.c clip.c colortab.c config.c \
-		context.c convolve.c debug.c depth.c dlist.c \
-		drawpix.c enable.c enums.c eval.c extensions.c \
-		feedback.c fog.c get.c hash.c hint.c histogram.c \
-		image.c imports.c light.c lines.c matrix.c mem.c \
-		mmath.c pixel.c points.c polygon.c rastpos.c state.c \
-		stencil.c texformat.c teximage.c texobj.c texstate.c \
-		texstore.c texutil.c varray.c vtxfmt.c ac_context.c \
-		ac_import.c m_debug_clip.c m_debug_norm.c \
-		m_debug_xform.c m_debug_vertex.c m_eval.c m_matrix.c \
-		m_translate.c m_vector.c m_vertices.c m_xform.c \
-		s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
-		s_alphabuf.c s_bitmap.c s_blend.c s_buffers.c \
-		s_context.c s_copypix.c s_depth.c s_drawpix.c \
-		s_feedback.c s_fog.c s_histogram.c s_imaging.c \
-		s_lines.c s_logic.c s_masking.c s_pb.c s_pixeltex.c \
-		s_points.c s_readpix.c s_scissor.c s_span.c \
-		s_stencil.c s_texstore.c s_texture.c s_triangle.c \
-		s_zoom.c ss_context.c ss_triangle.c ss_vb.c \
-		t_array_api.c t_array_import.c t_context.c t_eval_api.c \
-		t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \
-		t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \
-		t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
-		t_vb_points.c t_vb_render.c t_vb_texgen.c t_vb_texmat.c \
-		t_vb_vertex.c
+.PATH:	${X11SRCDIR.xc}/extras/Mesa/src
+SRCS+=	accum.c api_arrayelt.c api_eval.c api_loopback.c api_noop.c \
+	api_validate.c attrib.c blend.c buffers.c clip.c colortab.c \
+	context.c convolve.c debug.c depth.c dlist.c drawpix.c \
+	enable.c enums.c eval.c extensions.c feedback.c fog.c get.c \
+	hash.c hint.c histogram.c image.c imports.c light.c lines.c \
+	matrix.c mmath.c pixel.c points.c polygon.c rastpos.c \
+	state.c stencil.c texformat.c teximage.c texobj.c \
+	texstate.c texstore.c texutil.c varray.c vtxfmt.c
+
+.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/array_cache
+SRCS+=	ac_context.c ac_import.c
+
+.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/math
+SRCS+=	m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c \
+	m_matrix.c m_translate.c m_vector.c m_xform.c
+
+.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/swrast
+SRCS+=	s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_alphabuf.c \
+	s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c \
+	s_depth.c s_drawpix.c s_feedback.c s_fog.c s_histogram.c \
+	s_imaging.c s_lines.c s_logic.c s_masking.c s_pixeltex.c \
+	s_points.c s_readpix.c s_span.c s_stencil.c s_texstore.c \
+	s_texture.c s_triangle.c s_zoom.c
+
+.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup
+SRCS+=	ss_context.c ss_triangle.c ss_vb.c
+
+.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/tnl
+SRCS+=	t_array_api.c t_array_import.c t_context.c t_eval_api.c \
+	t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \
+	t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \
+	t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
+	t_vb_points.c t_vb_render.c t_vb_texgen.c t_vb_texmat.c \
+	t_vb_vertex.c
+
+.if ${X11DRI} != "no"
+CPPFLAGS+=	${X11FLAGS.DRI}
+.endif
+
+# XXX removed in xf44 if not found to be needed remove by > xf44
+# config.c, m_debug_vertex.c, m_vertices.c, mem.c, s_pb.c, s_scissor.c

 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xc}/lib/GL/include \
@ -51,12 +61,16 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 .if ${MACHINE_ARCH} == "i386"
 .PATH:		${X11SRCDIR.xc}/extras/Mesa/src/X86
 SRCS+=		common_x86.c common_x86_asm.S x86.c x86_cliptest.S \
-		x86_vertex.S x86_xform2.S x86_xform3.S x86_xform4.S \
+		x86_xform2.S x86_xform3.S x86_xform4.S \
 		mmx_blend.S \
-		3dnow.c 3dnow_normal.S 3dnow_vertex.S 3dnow_xform1.S \
+		3dnow.c 3dnow_normal.S 3dnow_xform1.S \
 		3dnow_xform2.S 3dnow_xform3.S 3dnow_xform4.S \
-		sse.c sse_normal.S sse_vertex.S sse_xform1.S \
+		sse.c sse_normal.S sse_xform1.S \
 		sse_xform2.S sse_xform3.S sse_xform4.S
+
+# XXX removed in xf44 if not found to be needed remove by > xf44
+# 3dnow_vertex.S, sse_vertex.S, x86_vertex.S
+
 CPPFLAGS+=	-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 COMPILE.S=	${COMPILE.s}		# XXX don't want -traditional-cpp
 AFLAGS+=	-DUSE_GAS -I. -I${X11SRCDIR.xc}/extras/Mesa/src/X86
--- a/x11/lib/Xau/Makefile
+++ b/x11/lib/Xau/Makefile
@ -1,6 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:45 lukem Exp $
-
-NOPIC=	1
+#	$NetBSD: Makefile,v 1.3 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

--- a/x11/lib/Xau/shlib_version
+++ b/x11/lib/Xau/shlib_version
@ -0,0 +1,4 @@
+#	$NetBSD: shlib_version,v 1.1 2004/03/06 03:05:39 rtr Exp $
+#
+major=6
+minor=0
--- a/x11/lib/Xdmcp/Makefile
+++ b/x11/lib/Xdmcp/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/10/20 05:12:41 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.4 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

@ -9,8 +9,7 @@ SRCS=	A8Eq.c AA16.c AA32.c AA8.c Alloc.c AofA8.c CA8.c CmpKey.c DA16.c \
 	DA32.c DA8.c DAofA8.c DecKey.c Fill.c Flush.c GenKey.c \
 	IncKey.c RA16.c RA32.c RA8.c RAofA8.c RC16.c RC32.c RC8.c \
 	RHead.c RR.c RaA16.c RaA32.c RaA8.c RaAoA8.c Unwrap.c WA16.c \
-	WA32.c WA8.c WAofA8.c WC16.c WC32.c WC8.c Whead.c Wrap.c \
-	Wraphelp.c
+	WA32.c WA8.c WAofA8.c WC16.c WC32.c WC8.c Whead.c Wrap.c Wraphelp.c

 INCS=	Xdmcp.h
 INCSDIR=${X11INCDIR}/X11
--- a/x11/lib/Xdmcp/shlib_version
+++ b/x11/lib/Xdmcp/shlib_version
@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.1 2003/10/20 05:12:41 jdolecek Exp $
+#	$NetBSD: shlib_version,v 1.2 2004/03/06 03:05:39 rtr Exp $
 #
-major=1
+major=6
 minor=0
--- a/x11/lib/Xmuu/Makefile
+++ b/x11/lib/Xmuu/Makefile
@ -1,9 +1,8 @@
-#	$NetBSD: Makefile,v 1.3 2003/09/13 20:18:49 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

 LIB=	Xmuu
-.PATH:	${X11SRCDIR.xc}/lib/${LIB}
 .PATH:	${X11SRCDIR.xc}/lib/Xmu

 SRCS=	ClientWin.c CursorName.c DefErrMsg.c GetHost.c Lower.c
--- a/x11/lib/Xpm/Makefile
+++ b/x11/lib/Xpm/Makefile
@ -1,9 +1,8 @@
-#	$NetBSD: Makefile,v 1.3 2003/09/13 20:18:49 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

 LIB=	Xpm
-.PATH:	${X11SRCDIR.xc}/lib/${LIB}
 .PATH:	${X11SRCDIR.xc}/extras/Xpm/lib

 SRCS=	Attrib.c CrBufFrI.c CrBufFrP.c CrDatFrI.c CrDatFrP.c \
--- a/x11/lib/Xxf86dga/Makefile
+++ b/x11/lib/Xxf86dga/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/10/20 05:12:41 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.4 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

@ -9,5 +9,7 @@ SRCS=	XF86DGA.c XF86DGA2.c

 CPPFLAGS+=	${X11FLAGS.THREADLIB}

+CPPFLAGS.XF86DGA2.c=	-Wno-error	# gcc3
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
--- a/x11/lib/expat/Makefile
+++ b/x11/lib/expat/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2003/11/08 13:57:29 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

@ -9,20 +9,9 @@ DIST=	${X11SRCDIR.xc}/lib/${LIB}

 SRCS=	xmlparse.c xmlrole.c xmltok.c

-INCS=	expat.h
-INCSDIR=${X11INCDIR}
-
 .include "Makefile.expatdefs"

 CPPFLAGS+=	${EXPAT_FLAGS} -I${DIST}

-expat.h: expat.h.in
-	${_MKTARGET_CREATE}
-	rm -f ${.TARGET}
-	sed -e 's/@EXPAT_MAJOR_VERSION@/${EXPAT_MAJOR_VERSION}/' \
-	    -e 's/@EXPAT_MINOR_VERSION@/${EXPAT_MINOR_VERSION}/' \
-	    -e 's/@EXPAT_EDIT@/${EXPAT_MICRO_VERSION}/' ${.ALLSRC} > ${.TARGET}
-CLEANFILES+=	expat.h
-
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
--- a/x11/lib/expat/shlib_version
+++ b/x11/lib/expat/shlib_version
@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.1.1.1 2003/09/11 18:37:08 lukem Exp $
+#	$NetBSD: shlib_version,v 1.2 2004/03/06 03:05:39 rtr Exp $
 #
-major=1
+major=4
 minor=0
--- a/x11/lib/font/Makefile
+++ b/x11/lib/font/Makefile
@ -1,126 +1,175 @@
-#	$NetBSD: Makefile,v 1.6 2004/01/10 23:35:55 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

 LIB=	Xfont
-.PATH:	${X11SRCDIR.xc}/lib/font
+#.PATH:	${X11SRCDIR.xc}/lib/font

-SRCS.bitmap=	bdfread.c bdfutils.c bitmap.c bitmapfunc.c bitmaputil.c \
-		bitscale.c fontink.c pcfread.c pcfwrite.c snfread.c
+# bitmap
 .PATH:		${X11SRCDIR.xc}/lib/font/bitmap
+SRCS.bitmap=	bdfread.c bdfutils.c bitmap.c bitmaputil.c bitscale.c \
+		bitmapfunc.c pcfread.c pcfwrite.c snfread.c fontink.c
 .for fn in ${SRCS.bitmap}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include \
-		-DBDFFORMAT -DPCFFORMAT -DSNFFORMAT
+CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/font/include \
+		-I${X11SRCDIR.xc}/include/fonts
+CPPFLAGS.${fn}+=-DBDFFORMAT -DPCFFORMAT -DSNFFORMAT
 .endfor
 CPPFLAGS.bitmapfunc.c+=	-DX_GZIP_FONT_COMPRESSION
 CPPFLAGS.bitscale.c+=	-DX_GZIP_FONT_COMPRESSION

-SRCS.fontfile=	bitsource.c bufio.c decompress.c defaults.c dirfile.c \
-		encparse.c ffcheck.c fileio.c filewr.c fontdir.c \
-		fontenc.c fontencc.c fontfile.c fontscale.c gunzip.c \
-		printerfont.c register.c renderers.c
+
+# fontfile
 .PATH:		${X11SRCDIR.xc}/lib/font/fontfile
+SRCS.fontfile=	dirfile.c fontdir.c fontfile.c fileio.c fontscale.c \
+		defaults.c bitsource.c register.c renderers.c bufio.c \
+		decompress.c filewr.c printerfont.c ffcheck.c \
+		fontenc.c encparse.c fontencc.c gunzip.c
 .for fn in ${SRCS.fontfile}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-DFONTDIRATTRIB -DBUILD_SPEEDO -DBUILD_TYPE1 -DBUILD_CID \
-		-DBUILD_FREETYPE -DX_GZIP_FONT_COMPRESSION \
-		-DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\"
+CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/font/include \
+		-I${X11SRCDIR.xc}/include/fonts \
+		-I${X11SRCDIR.xc}/programs/Xserver/include
+CPPFLAGS.${fn}+=-DFONTDIRATTRIB -DBUILD_SPEEDO -DBUILD_TYPE1 \
+		-DBUILD_CID -DBUILD_FREETYPE -DX_GZIP_FONT_COMPRESSION \
+                -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\"
 .endfor

-SRCS.fc=	fsconvert.c fserve.c fsio.c transport.c
+
+# fc
 .PATH:		${X11SRCDIR.xc}/lib/font/fc
 .PATH:		${X11SRCDIR.xc}/lib/xtrans
+SRCS.fc=	fsconvert.c fserve.c fsio.c transport.c
 .for fn in ${SRCS.fc}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/include/fonts \
+CPPFLAGS.${fn}=	-I${DESTDIR}${X11INCDIR}/X11/fonts \
 		-I${X11SRCDIR.xc}/lib/font/include \
-		${X11FLAGS.CONNECTION} \
-		-DFONT_t -DTRANS_CLIENT -DTRANS_SERVER -DTRANS_REOPEN \
-		-DBSD44SOCKETS
+		-I${X11SRCDIR.xc}/include/fonts
+CPPFLAGS.${fn}+=${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_CLIENT \
+		-DTRANS_SERVER -DTRANS_REOPEN -DBSD44SOCKETS
 .endfor

-SRCS.fontcache=	fontcache.c
 .PATH:		${X11SRCDIR.xc}/lib/font/fontcache
-.for fn in ${SRCS.fontcache}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/font/fontcache \
-		-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include \
-		-I${X11SRCDIR.xc}/lib/font/fontcache \
-		-DFONTCACHE
-.endfor
+SRCS.fontcache=	fontcache.c
+CPPFLAGS.fontcache.c=	-DFONTCACHE
+CPPFLAGS.fontcache.c+=	-I${X11SRCDIR.xc}/lib/font/include \
+			-I${X11SRCDIR.xc}/include/fonts

-SRCS.Speedo=	bics-unicode.c do_char.c do_trns.c out_bl2d.c \
-		out_blk.c out_scrn.c out_util.c reset.c set_spcs.c \
-		set_trns.c spencode.c sperr.c spfile.c spfont.c \
-		spfuncs.c spglyph.c spinfo.c
+
+# Speedo
 .PATH:		${X11SRCDIR.xc}/lib/font/Speedo
+SRCS.Speedo=	spfuncs.c spfile.c spinfo.c sperr.c spfont.c spglyph.c \
+		spencode.c bics-unicode.c do_char.c do_trns.c \
+		out_bl2d.c out_blk.c out_scrn.c out_util.c reset.c \
+		set_spcs.c set_trns.c
 .for fn in ${SRCS.Speedo}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include \
+CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/font/include \
+		-I${X11SRCDIR.xc}/include/fonts \
 		-I${X11SRCDIR.xc}/programs/Xserver/include
 .endfor

-SRCS.Type1=	afm.c arith.c cidchar.c curves.c fontfcn.c hints.c \
-		lines.c objects.c paths.c regions.c scanfont.c \
-		spaces.c t1funcs.c t1info.c t1io.c t1malloc.c \
-		t1snap.c t1stub.c t1unicode.c token.c Type1-type1.c util.c
-.for fn in ${SRCS.Type1}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-DBUILDCID -DHAVE_CFM -DUSE_MMAP
-.endfor
-BUILDSYMLINKS+=	${X11SRCDIR.xc}/lib/font/Type1/type1.c Type1-type1.c
-CPPFLAGS.Type1-type1.c+=	-I${X11SRCDIR.xc}/lib/font/Type1

-SRCS.FreeType=	autohint.c cff.c ftbase.c ftenc.c ftfuncs.c ftglyph.c \
-		ftinit.c ftsystem.c fttools.c fttype1.c ftxf86.c \
-		psaux.c pshinter.c psnames.c raster.c sfnt.c \
-		truetype.c FreeType-type1.c
-.PATH:		${X11SRCDIR.xc}/lib/font/FreeType
+# Type1
 .PATH:		${X11SRCDIR.xc}/lib/font/Type1
-FREETYPESRC=	${X11SRCDIR.xc}/extras/freetype2/src
-.PATH:		${FREETYPESRC}/autohint
-.PATH:		${FREETYPESRC}/base
-.PATH:		${FREETYPESRC}/cff
-.PATH:		${FREETYPESRC}/psaux
-.PATH:		${FREETYPESRC}/pshinter
-.PATH:		${FREETYPESRC}/psnames
-.PATH:		${FREETYPESRC}/raster
-.PATH:		${FREETYPESRC}/sfnt
-.PATH:		${FREETYPESRC}/truetype
+SRCS.Type1=	arith.c curves.c fontfcn.c hints.c lines.c objects.c \
+		paths.c regions.c scanfont.c spaces.c t1funcs.c \
+		t1info.c t1io.c t1malloc.c t1snap.c t1stub.c token.c \
+		type1.c util.c cidchar.c afm.c t1unicode.c
+.for fn in ${SRCS.Type1}
+CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/font/include \
+		-I${X11SRCDIR.xc}/include/fonts \
+		-I${X11SRCDIR.xc}/programs/Xserver/include \
+		-I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS.${fn}+=-DBUILDCID -DHAVE_CFM -DUSE_MMAP
+.endfor
+
+
+# FreeType
+.PATH:		${X11SRCDIR.xc}/lib/font/FreeType
+SRCS.FreeType=	xttcap.c ftfuncs.c ftenc.c fttools.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/base
+#SRCS.FreeType+=	ftbase.c ftinit.c ftglyph.c ftbbox.c ftsystem.c fttype1.c ftxf86.c ftbdf.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/bdf
+#SRCS.FreeType+=	bdfdrivr.c bdflib.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/raster
+#SRCS.FreeType+=	ftrend1.c ftraster.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/smooth
+#SRCS.FreeType+=	ftsmooth.c ftgrays.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/truetype
+#SRCS.FreeType+=	ttdriver.c ttobjs.c ttpload.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/psaux
+#SRCS.FreeType+=	psauxmod.c psobjs.c t1cmap.c t1decode.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/type1
+#SRCS.FreeType+=	t1driver.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/cid
+#SRCS.FreeType+=	cidriver.c cidgload.c cidobjs.c cidload.c cidparse.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/type42
+#SRCS.FreeType+=	t42drivr.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/psnames
+#SRCS.FreeType+=	psmodule.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/sfnt
+#SRCS.FreeType+=	sfdriver.c ttload.c ttpost.c ttsbit.c ttcmap.c sfobjs.c ttcmap0.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/winfonts
+#SRCS.FreeType+=	winfnt.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/autohint
+#SRCS.FreeType+=	ahmodule.c ahhint.c ahglyph.c ahangles.c ahglobal.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/cff
+#SRCS.FreeType+=	cffdrivr.c cffobjs.c cffload.c cffparse.c cffcmap.c cffgload.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/pfr
+#SRCS.FreeType+=	pfrdrivr.c pfrobjs.c pfrload.c pfrgload.c pfrcmap.c
+#.PATH:		${X11SRCDIR.xc}/extras/freetype2/src/pcf
+#SRCS.FreeType+=	pcfdriver.c pcfutil.c
 .for fn in ${SRCS.FreeType}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/font/FreeType \
+CPPFLAGS.${fn}=	-I${DESTDIR}${X11INCDIR}/freetype2 \
 		-I${X11SRCDIR.xc}/include/fonts \
 		-I${X11SRCDIR.xc}/lib/font/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${DESTDIR}${X11INCDIR}/freetype2 \
-		-DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \
-		-DXFreeXDGA -DXvExtension -DXFree86LOADER  -DXFree86Server \
-		-DXF86VIDMODE -DXvMCExtension  -DSMART_SCHEDULE -DBUILDDEBUG \
-		-DXResExtension
+		-I${X11SRCDIR.xc}/extras/freetype2/src/truetype \
+		-I${X11SRCDIR.xc}/extras/freetype2/src/pcf 
+CPPFLAGS.${fn}+=${X11FLAGS.SERVER} -DXFreeXDGA -DXFree86LOADER \
+		-DXF86VIDMODE -DXFREE86_FT2
 .endfor
-BUILDSYMLINKS+=	${X11SRCDIR.xc}/extras/freetype2/src/type1/type1.c FreeType-type1.c
-CPPFLAGS.FreeType-type1.c+=	-I${X11SRCDIR.xc}/extras/freetype2/src/type1

-SRCS.util=	atom.c fontaccel.c fontnames.c fontutil.c fontxlfd.c \
-		format.c miscutil.c patcache.c private.c utilbitmap.c
+
+# X-TrueType
+# .PATH:		${X11SRCDIR.xc}/lib/font/X-TrueType
+# .PATH:		${X11SRCDIR.xc}/extras/FreeType/lib/arch/unix
+# SRCS.X-TrueType=xttprop.c xttfuncs.c xttcconv.c xttcap.c xttmisc.c \
+#		xttblit.c freetype.c ftxcmap.c ftxsbit.c
+#.for fn in ${SRCS.X-TrueType}
+#CPPFLAGS.${fn}=	-DTT_MAKE_OPTION_SINGLE_OBJECT=1 \
+#		-DTT_CONFIG_OPTION_EXTEND_ENGINE \
+#		-DCCONV_MODULE -DCCONV_MODULE_DIR=\"${X11USRLIBDIR}/modules\" \
+#		-DCCONV_MODULE_SUBDIR=\"${X11USRLIBDIR}/modules/codeconv\" \
+#		-DOPT_ENCODINGS -DFREETYPE1_BUILD_DEFINES
+# .endfor
+
+
+# builtins
+#.PATH:		${X11SRCDIR.xc}/lib/font/builtins
+#SRCS.builtins= 	dir.c file.c fonts.c fpe.c render.c
+#.for fn in ${SRCS.builtins}
+#CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/font/include \
+#		-I${X11SRCDIR.xc}/include/fonts
+#.endfor
+
+
+# util
 .PATH:		${X11SRCDIR.xc}/lib/font/util
+SRCS.util=	utilbitmap.c fontnames.c fontutil.c fontxlfd.c \
+		format.c fontaccel.c atom.c miscutil.c private.c \
+		patcache.c
 .for fn in ${SRCS.util}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include
+CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/font/include \
+		-I${X11SRCDIR.xc}/include/fonts
 .endfor

-SRCS=	${SRCS.bitmap} ${SRCS.fontfile} ${SRCS.fc} ${SRCS.fontcache} \
-	${SRCS.Speedo} ${SRCS.Type1} ${SRCS.FreeType} ${SRCS.util}
-
+SRCS=		${SRCS.bitmap} ${SRCS.fontfile} ${SRCS.fc} \
+		${SRCS.fontcache} ${SRCS.Speedo} ${SRCS.Type1} \
+		${SRCS.FreeType} ${SRCS.X-TrueType} ${SRCS.builtins} \
+		${SRCS.util}

 SUBDIR=	stubs xtt

 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
 .include <bsd.subdir.mk>
+
--- a/x11/lib/font/shlib_version
+++ b/x11/lib/font/shlib_version
@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.1.1.1 2003/09/11 18:37:09 lukem Exp $
+#	$NetBSD: shlib_version,v 1.2 2004/03/06 03:05:39 rtr Exp $
 #
 major=1
-minor=4
+minor=5
--- a/x11/lib/fontconfig/Makefile
+++ b/x11/lib/fontconfig/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2004/02/09 05:58:25 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2004/03/06 03:05:39 rtr Exp $

 .include <bsd.own.mk>

@ -12,7 +12,7 @@ SCRIPTS=	fontconfig-config
 CLEANFILES+= ${FILES} ${SCRIPTS}
 realall: ${FILES}

-FONTCONFIGDIR=	${X11SRCDIR.xc}/lib/fontconfig
+FONTCONFIGDIR=	${X11SRCDIR.xc}/extras/fontconfig
 CONFIG_SUBST=	${HOST_SH} ${FONTCONFIGDIR}/config/config-subst \
 		prefix="${X11ROOTDIR}" \
 		exec_prefix="${X11BINDIR}" \
--- a/x11/lib/fontconfig/etc/Makefile
+++ b/x11/lib/fontconfig/etc/Makefile
@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:55 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2004/03/06 03:05:40 rtr Exp $

 XTODO=	only install on make distribution??

 .include <bsd.own.mk>

-.PATH:	${X11SRCDIR.xc}/lib/fontconfig
+.PATH:	${X11SRCDIR.xc}/extras/fontconfig

 FILESDIR=/etc/fonts
 FILES=	fonts.conf fonts.dtd
--- a/x11/lib/fontconfig/fontconfig/Makefile
+++ b/x11/lib/fontconfig/fontconfig/Makefile
@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:55 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2004/03/06 03:05:40 rtr Exp $

 .include <bsd.own.mk>

-.PATH:	${X11SRCDIR.xc}/lib/fontconfig/fontconfig
+.PATH:	${X11SRCDIR.xc}/extras/fontconfig/fontconfig

 INCSDIR=${X11INCDIR}/fontconfig

--- a/x11/lib/fontconfig/src/Makefile
+++ b/x11/lib/fontconfig/src/Makefile
@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.4 2004/02/23 05:47:47 rtr Exp $
+#	$NetBSD: Makefile,v 1.5 2004/03/06 03:05:40 rtr Exp $

 .include <bsd.own.mk>

 LIB=	fontconfig
-.PATH:	${X11SRCDIR.xc}/lib/fontconfig/src
+.PATH:	${X11SRCDIR.xc}/extras/fontconfig/src

 SRCS=	fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
 	fcdefault.c fcdir.c fcfreetype.c fcfs.c fcinit.c fclang.c \
@ -15,7 +15,8 @@ DPADD=	${LIBEXPAT}
 MAN=	fontconfig.3

 CPPFLAGS+=	${X11FLAGS.THREADLIB}
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2 \
+		-I${X11SRCDIR.xc}/extras/expat/lib
 CPPFLAGS+=	-DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' -DHAVE_EXPAT

 .include <bsd.x11.mk>
--- a/x11/lib/freetype2/Makefile
+++ b/x11/lib/freetype2/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/09/30 06:41:31 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2004/03/06 03:05:40 rtr Exp $

 .include <bsd.own.mk>

@ -9,10 +9,11 @@ FREETYPESRC=	${FREETYPETOP}/src

 SUBDIR=	freetype

-SRCS=	autohint.c bdf.c cff.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \
-	ftglyph.c ftinit.c ftmm.c ftsynth.c ftsystem.c fttype1.c \
-	ftxf86.c pcf.c pfr.c psaux.c pshinter.c psnames.c raster.c \
-	sfnt.c smooth.c truetype.c type1.c type1cid.c type42.c winfnt.c
+SRCS=	ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
+	ftinit.c ftmm.c ftpfr.c ftstroker.c ftsynth.c ftsystem.c \
+	fttype1.c ftwinfnt.c ftxf86.c autohint.c bdf.c cff.c \
+	type1cid.c ftgzip.c pcf.c pfr.c psaux.c pshinter.c psnames.c \
+	raster.c sfnt.c smooth.c truetype.c type1.c type42.c winfnt.c

 INCS=	ft2build.h
 INCSDIR=${X11INCDIR}/freetype2
@ -26,6 +27,7 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2
 .PATH:	${FREETYPESRC}/bdf
 .PATH:	${FREETYPESRC}/cff
 .PATH:	${FREETYPESRC}/cid
+.PATH:	${FREETYPESRC}/gzip
 .PATH:	${FREETYPESRC}/pcf
 .PATH:	${FREETYPESRC}/pfr
 .PATH:	${FREETYPESRC}/psaux
--- a/x11/lib/freetype2/freetype/Makefile
+++ b/x11/lib/freetype2/freetype/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2004/02/09 05:58:25 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2004/03/06 03:05:40 rtr Exp $

 .include <bsd.own.mk>

@ -8,11 +8,12 @@ SUBDIR=	cache config internal

 INCSDIR=${X11INCDIR}/freetype2/freetype

-INCS=	ftbdf.h fterrdef.h ftsysio.h ftsysmem.h ftxf86.h freetype.h \
-	ftbbox.h ftcache.h ftchapters.h fterrors.h ftglyph.h \
-	ftimage.h ftlist.h ftmac.h ftmm.h ftmoderr.h ftmodule.h \
-	ftoutln.h ftrender.h ftsizes.h ftsnames.h ftsynth.h ftsystem.h \
-	fttrigon.h fttypes.h t1tables.h ttnameid.h tttables.h tttags.h
+INCS=	freetype.h ftbbox.h ftbdf.h ftcache.h ftchapters.h fterrdef.h \
+	fterrors.h ftglyph.h ftgzip.h ftimage.h ftincrem.h ftlist.h \
+	ftmac.h ftmm.h ftmoderr.h ftmodule.h ftoutln.h ftpfr.h \
+	ftrender.h ftsizes.h ftsnames.h ftstroker.h ftsynth.h ftsysio.h \
+	ftsysmem.h ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h \
+	t1tables.h ttnameid.h tttables.h tttags.h

 SCRIPTS=	freetype-config

--- a/x11/lib/freetype2/freetype/internal/Makefile
+++ b/x11/lib/freetype2/freetype/internal/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:18:57 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2004/03/06 03:05:40 rtr Exp $

 .include <bsd.own.mk>

@ -6,10 +6,11 @@

 INCSDIR=${X11INCDIR}/freetype2/freetype/internal

-INCS=	autohint.h bdftypes.h cfftypes.h fnttypes.h ftcalc.h ftcore.h \
-	ftdebug.h ftdriver.h ftexcept.h ftgloadr.h fthash.h ftmemory.h \
-	ftobject.h ftobjs.h ftstream.h fttrace.h internal.h pcftypes.h \
-	psaux.h pshints.h psnames.h sfnt.h t1types.h t42types.h tttypes.h
+INCS=	autohint.h bdftypes.h cfftypes.h fnttypes.h ftcalc.h \
+	ftcore.h ftdebug.h ftdriver.h ftexcept.h ftgloadr.h \
+	fthash.h ftmemory.h ftobject.h ftobjs.h ftstream.h \
+	fttrace.h internal.h pcftypes.h psaux.h pfr.h pshints.h \
+	psnames.h sfnt.h t1types.h t42types.h tttypes.h

 .include <bsd.x11.mk>
 .include <bsd.prog.mk>