head	1.7;
access;
symbols
	perseant-exfatfs-base-20250801:1.7
	perseant-exfatfs-base-20240630:1.7
	cjep_sun2x:1.7.0.12
	cjep_sun2x-base:1.7
	cjep_staticlib_x-base1:1.7
	cjep_staticlib_x:1.7.0.10
	cjep_staticlib_x-base:1.7
	phil-wifi-20200421:1.7
	phil-wifi-20200411:1.7
	phil-wifi-20200406:1.7
	pgoyette-compat-merge-20190127:1.7
	pgoyette-compat-20190127:1.7
	pgoyette-compat-20190118:1.7
	pgoyette-compat-1226:1.7
	pgoyette-compat-1126:1.7
	pgoyette-compat-1020:1.7
	pgoyette-compat-0930:1.7
	pgoyette-compat-0906:1.7
	netbsd-7-2-RELEASE:1.6
	pgoyette-compat-0728:1.7
	pgoyette-compat-0625:1.7
	pgoyette-compat-0521:1.7
	pgoyette-compat-0502:1.7
	pgoyette-compat-0422:1.7
	pgoyette-compat-0415:1.7
	pgoyette-compat-0407:1.7
	pgoyette-compat-0330:1.7
	pgoyette-compat-0322:1.7
	pgoyette-compat-0315:1.7
	netbsd-7-1-2-RELEASE:1.6
	pgoyette-compat:1.7.0.8
	pgoyette-compat-base:1.7
	netbsd-7-1-1-RELEASE:1.6
	prg-localcount2-base3:1.7
	prg-localcount2-base2:1.7
	prg-localcount2-base1:1.7
	prg-localcount2:1.7.0.6
	prg-localcount2-base:1.7
	pgoyette-localcount-20170426:1.7
	bouyer-socketcan-base1:1.7
	pgoyette-localcount-20170320:1.7
	netbsd-7-1:1.6.0.66
	netbsd-7-1-RELEASE:1.6
	netbsd-7-1-RC2:1.6
	netbsd-7-nhusb-base-20170116:1.6
	bouyer-socketcan:1.7.0.4
	bouyer-socketcan-base:1.7
	pgoyette-localcount-20170107:1.7
	netbsd-7-1-RC1:1.6
	pgoyette-localcount-20161104:1.7
	netbsd-7-0-2-RELEASE:1.6
	localcount-20160914:1.7
	netbsd-7-nhusb:1.6.0.64
	netbsd-7-nhusb-base:1.6
	pgoyette-localcount-20160806:1.7
	pgoyette-localcount-20160726:1.7
	pgoyette-localcount:1.7.0.2
	pgoyette-localcount-base:1.7
	netbsd-7-0-1-RELEASE:1.6
	netbsd-7-0:1.6.0.62
	netbsd-7-0-RELEASE:1.6
	netbsd-7-0-RC3:1.6
	netbsd-7-0-RC2:1.6
	netbsd-7-0-RC1:1.6
	netbsd-5-2-3-RELEASE:1.6
	netbsd-5-1-5-RELEASE:1.6
	netbsd-6-0-6-RELEASE:1.6
	netbsd-6-1-5-RELEASE:1.6
	netbsd-7:1.6.0.60
	netbsd-7-base:1.6
	yamt-pagecache-base9:1.6
	yamt-pagecache-tag8:1.6
	netbsd-6-1-4-RELEASE:1.6
	netbsd-6-0-5-RELEASE:1.6
	tls-earlyentropy:1.6.0.58
	tls-earlyentropy-base:1.6
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.6
	riastradh-drm2-base3:1.6
	netbsd-6-1-3-RELEASE:1.6
	netbsd-6-0-4-RELEASE:1.6
	netbsd-5-2-2-RELEASE:1.6
	netbsd-5-1-4-RELEASE:1.6
	netbsd-6-1-2-RELEASE:1.6
	netbsd-6-0-3-RELEASE:1.6
	netbsd-5-2-1-RELEASE:1.6
	netbsd-5-1-3-RELEASE:1.6
	netbsd-6-1-1-RELEASE:1.6
	riastradh-drm2-base2:1.6
	riastradh-drm2-base1:1.6
	riastradh-drm2:1.6.0.52
	riastradh-drm2-base:1.6
	netbsd-6-1:1.6.0.56
	netbsd-6-0-2-RELEASE:1.6
	netbsd-6-1-RELEASE:1.6
	netbsd-6-1-RC4:1.6
	netbsd-6-1-RC3:1.6
	agc-symver:1.6.0.54
	agc-symver-base:1.6
	netbsd-6-1-RC2:1.6
	netbsd-6-1-RC1:1.6
	yamt-pagecache-base8:1.6
	netbsd-5-2:1.6.0.50
	netbsd-6-0-1-RELEASE:1.6
	yamt-pagecache-base7:1.6
	netbsd-5-2-RELEASE:1.6
	netbsd-5-2-RC1:1.6
	matt-nb6-plus-nbase:1.6
	yamt-pagecache-base6:1.6
	netbsd-6-0:1.6.0.48
	netbsd-6-0-RELEASE:1.6
	netbsd-6-0-RC2:1.6
	tls-maxphys:1.6.0.46
	tls-maxphys-base:1.6
	matt-nb6-plus:1.6.0.44
	matt-nb6-plus-base:1.6
	netbsd-6-0-RC1:1.6
	yamt-pagecache-base5:1.6
	yamt-pagecache-base4:1.6
	netbsd-6:1.6.0.42
	netbsd-6-base:1.6
	netbsd-5-1-2-RELEASE:1.6
	netbsd-5-1-1-RELEASE:1.6
	yamt-pagecache-base3:1.6
	yamt-pagecache-base2:1.6
	yamt-pagecache:1.6.0.40
	yamt-pagecache-base:1.6
	cherry-xenmp:1.6.0.38
	cherry-xenmp-base:1.6
	bouyer-quota2-nbase:1.6
	bouyer-quota2:1.6.0.36
	bouyer-quota2-base:1.6
	matt-mips64-premerge-20101231:1.6
	matt-nb5-mips64-premerge-20101231:1.6
	matt-nb5-pq3:1.6.0.34
	matt-nb5-pq3-base:1.6
	netbsd-5-1:1.6.0.32
	netbsd-5-1-RELEASE:1.6
	netbsd-5-1-RC4:1.6
	matt-nb5-mips64-k15:1.6
	netbsd-5-1-RC3:1.6
	netbsd-5-1-RC2:1.6
	netbsd-5-1-RC1:1.6
	netbsd-5-0-2-RELEASE:1.6
	matt-nb5-mips64-premerge-20091211:1.6
	matt-premerge-20091211:1.6
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.6
	matt-nb4-mips64-k7-u2a-k9b:1.6
	matt-nb5-mips64-u1-k1-k5:1.6
	matt-nb5-mips64:1.6.0.30
	netbsd-5-0-1-RELEASE:1.6
	jym-xensuspend-nbase:1.6
	netbsd-5-0:1.6.0.28
	netbsd-5-0-RELEASE:1.6
	netbsd-5-0-RC4:1.6
	netbsd-5-0-RC3:1.6
	netbsd-5-0-RC2:1.6
	jym-xensuspend:1.6.0.26
	jym-xensuspend-base:1.6
	netbsd-5-0-RC1:1.6
	netbsd-5:1.6.0.24
	netbsd-5-base:1.6
	matt-mips64-base2:1.6
	matt-mips64:1.6.0.22
	netbsd-4-0-1-RELEASE:1.6
	wrstuden-revivesa-base-3:1.6
	wrstuden-revivesa-base-2:1.6
	wrstuden-fixsa-newbase:1.6
	wrstuden-revivesa-base-1:1.6
	yamt-pf42-base4:1.6
	yamt-pf42-base3:1.6
	hpcarm-cleanup-nbase:1.6
	yamt-pf42-baseX:1.6
	yamt-pf42-base2:1.6
	wrstuden-revivesa:1.6.0.20
	wrstuden-revivesa-base:1.6
	yamt-pf42:1.6.0.18
	yamt-pf42-base:1.6
	keiichi-mipv6-nbase:1.6
	keiichi-mipv6:1.6.0.16
	keiichi-mipv6-base:1.6
	matt-armv6-nbase:1.6
	matt-armv6-prevmlocking:1.6
	wrstuden-fixsa-base-1:1.6
	netbsd-4-0:1.6.0.14
	netbsd-4-0-RELEASE:1.6
	cube-autoconf:1.6.0.12
	cube-autoconf-base:1.6
	netbsd-4-0-RC5:1.6
	netbsd-4-0-RC4:1.6
	netbsd-4-0-RC3:1.6
	netbsd-4-0-RC2:1.6
	netbsd-4-0-RC1:1.6
	matt-armv6:1.6.0.10
	matt-armv6-base:1.6
	matt-mips64-base:1.6
	hpcarm-cleanup:1.6.0.8
	hpcarm-cleanup-base:1.6
	netbsd-3-1-1-RELEASE:1.5.8.1
	netbsd-3-0-3-RELEASE:1.5.8.1
	wrstuden-fixsa:1.6.0.6
	wrstuden-fixsa-base:1.6
	abandoned-netbsd-4-base:1.6
	abandoned-netbsd-4:1.6.0.2
	netbsd-3-1:1.5.8.1.0.4
	netbsd-3-1-RELEASE:1.5.8.1
	netbsd-3-0-2-RELEASE:1.5.8.1
	netbsd-3-1-RC4:1.5.8.1
	netbsd-3-1-RC3:1.5.8.1
	netbsd-3-1-RC2:1.5.8.1
	netbsd-3-1-RC1:1.5.8.1
	netbsd-4:1.6.0.4
	netbsd-4-base:1.6
	netbsd-3-0-1-RELEASE:1.5.8.1
	netbsd-3-0:1.5.8.1.0.2
	netbsd-3-0-RELEASE:1.5.8.1
	netbsd-3-0-RC6:1.5.8.1
	netbsd-3-0-RC5:1.5.8.1
	netbsd-3-0-RC4:1.5.8.1
	netbsd-3-0-RC3:1.5.8.1
	netbsd-3-0-RC2:1.5.8.1
	netbsd-3-0-RC1:1.5.8.1
	netbsd-2-0-3-RELEASE:1.5
	netbsd-2-1:1.5.0.10
	netbsd-2-1-RELEASE:1.5
	netbsd-2-1-RC6:1.5
	netbsd-2-1-RC5:1.5
	netbsd-2-1-RC4:1.5
	netbsd-2-1-RC3:1.5
	netbsd-2-1-RC2:1.5
	netbsd-2-1-RC1:1.5
	netbsd-2-0-2-RELEASE:1.5
	v4-5-0_beforeimport:1.5
	netbsd-3:1.5.0.8
	netbsd-3-base:1.5
	netbsd-2-0-1-RELEASE:1.5
	netbsd-2:1.5.0.6
	netbsd-2-base:1.5
	netbsd-2-0-RELEASE:1.5
	rtr-xorg-branch:1.5.0.4
	rtr-xorg-branch-base:1.5
	netbsd-2-0-RC5:1.5
	netbsd-2-0-RC4:1.5
	netbsd-2-0-RC3:1.5
	netbsd-2-0-RC2:1.5
	netbsd-2-0-RC1:1.5
	netbsd-2-0:1.5.0.2
	netbsd-2-0-base:1.5
	v4-4-0_beforeimport:1.2;
locks; strict;
comment	@# @;


1.7
date	2015.07.23.08.03.27;	author mrg;	state dead;
branches;
next	1.6;
commitid	nfGa2DVpEPUUPnuy;

1.6
date	2005.03.22.15.00.37;	author tron;	state Exp;
branches;
next	1.5;

1.5
date	2004.03.17.23.15.30;	author perry;	state Exp;
branches
	1.5.4.1
	1.5.8.1;
next	1.4;

1.4
date	2004.03.16.17.40.53;	author matt;	state Exp;
branches;
next	1.3;

1.3
date	2004.03.06.03.31.06;	author rtr;	state Exp;
branches;
next	1.2;

1.2
date	2004.02.07.06.52.04;	author lukem;	state Exp;
branches;
next	1.1;

1.1
date	2003.12.23.10.04.14;	author rtr;	state Exp;
branches;
next	;

1.5.4.1
date	2004.11.15.09.12.38;	author rtr;	state Exp;
branches;
next	1.5.4.2;

1.5.4.2
date	2004.11.21.00.20.22;	author rtr;	state Exp;
branches;
next	1.5.4.3;

1.5.4.3
date	2004.11.21.10.01.26;	author rtr;	state Exp;
branches;
next	;

1.5.8.1
date	2005.04.06.21.29.59;	author tron;	state Exp;
branches;
next	;


desc
@@


1.7
log
@remove the xfree86 reachover makefiles and the vast majority of
the support in the rest of the source tree.

X11 sets could use some cleaning up perhaps (just deletion, as
we've never really marked the old X11R6 as obsolete for native
xorg using platforms so far either.)
@
text
@#	$NetBSD: Makefile,v 1.6 2005/03/22 15:00:37 tron Exp $

XMODULEDIR=     ${X11USRLIBDIR}/modules/fonts

.include "../../Makefile.serverlib"

LIB=	freetype

FT2DIR=	${X11SRCDIR.xc}/extras/freetype2
FT2SRC=	${FT2DIR}/src

.PATH:	${X11SRCDIR.xc}/lib/font/FreeType
SRCS=	xttcap.c ftfuncs.c ftenc.c fttools.c

.PATH:	${X11SRCDIR.xc}/lib/font/FreeType/module
SRCS+=	ftmodule.c

.PATH:	${FT2SRC}/base
SRCS+=	ftbase.c ftinit.c ftglyph.c ftbbox.c ftsystem.c fttype1.c ftxf86.c ftbdf.c 
	
.PATH:	${FT2SRC}/gzip
SRCS+=	ftgzip.c

.PATH:	${FT2SRC}/raster
SRCS+=	raster.c

.PATH:	${FT2SRC}/sfnt
SRCS+=	sfnt.c

.PATH:	${FT2SRC}/truetype
SRCS+=	truetype.c

.PATH:	${FT2SRC}/cff
SRCS+=	cff.c

.PATH:	${FT2SRC}/type1
SRCS+=	type1.c

.PATH:	${FT2SRC}/psaux
SRCS+=	psaux.c

.PATH:	${FT2SRC}/psnames
SRCS+=	psnames.c

.PATH:	${FT2SRC}/pshinter
SRCS+=	pshinter.c

.PATH:	${FT2SRC}/autohint
SRCS+=	autohint.c

.PATH:	${FT2SRC}/bdf
SRCS+=	bdf.c

.PATH:	${FT2SRC}/pcf
SRCS+=	pcf.c

.PATH:	${FT2SRC}/lzw
SRCS+=	ftlzw.c


CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/font/FreeType/module \
		-I${X11SRCDIR.xc}/lib/font/FreeType \
		-I${X11SRCDIR.xc}/include/fonts \
		-I${X11SRCDIR.xc}/lib/font/include \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${X11SRCDIR.xc}/programs/Xserver/include \
		-I${FT2DIR}/include \
		-I${FT2SRC}/base \
		-I${FT2SRC}/gzip \
		-I${FT2SRC}/raster \
		-I${FT2SRC}/sfnt \
		-I${FT2SRC}/truetype \
		-I${FT2SRC}/cff \
		-I${FT2SRC}/type1 \
		-I${FT2SRC}/psaux \
		-I${FT2SRC}/psnames \
		-I${FT2SRC}/pshinter \
		-I${FT2SRC}/autohint \
		-I${FT2SRC}/bdf \
		-I${FT2SRC}/pcf \
		-I${XSERVERINCDIR}

CPPFLAGS+=	-DXFREE86_FT2

.include <bsd.x11.mk>

.if defined(MKTTINTERP) && ${MKTTINTERP} != "no"
CPPFLAGS+=	-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
.endif

.if !empty(X11FLAGS.LOADABLE)
CPPFLAGS+=	-DFONTMODULE
LIBDIR=	${XMODULEDIR}
.else
libinstall::
.endif

.include <bsd.lib.mk>
@


1.6
log
@Include missing source files in X11 server module build. This fixes e.g.
crashed when running Mozilla. Thanks to Steve Woodford for analyzing this
and sending me a patch.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2004/03/17 23:15:30 perry Exp $
@


1.5
log
@Add a compile flag, MKTTINTERP, that turns on the bytecode interpreter
when it is set to yes (typically in /etc/mk.conf)

The freetype bytecode interpreter is not on by default because it is
patented in some jurisdictions.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2004/03/16 17:40:53 matt Exp $
d57 3
@


1.5.8.1
log
@Pull up revision 1.6 (requested by jmc in ticket #114):
Include missing source files in X11 server module build. This fixes e.g.
crashed when running Mozilla. Thanks to Steve Woodford for analyzing this
and sending me a patch.
@
text
@d1 1
a1 1
#	$NetBSD$
a56 3
.PATH:	${FT2SRC}/lzw
SRCS+=	ftlzw.c

@


1.5.4.1
log
@static & xorg src/x11 build
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2004/03/17 23:15:30 perry Exp $
a23 3
.PATH:	${FT2SRC}/lzw
SRCS+=	lzw.c

d80 1
a80 1
CPPFLAGS+=	-DXFREE86_FT2 -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
d82 1
d88 1
d90 4
a94 2
.include <bsd.x11.mk>
LIBDIR=	${XMODULEDIR}
@


1.5.4.2
log
@lzw.c -> ftlzw.c
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5.4.1 2004/11/15 09:12:38 rtr Exp $
d25 1
a25 1
SRCS+=	ftlzw.c
@


1.5.4.3
log
@+ whitespace cleanups
+ remove extra bsd.own.mk's
+ separate module and lib handling into Makefile.serverlib and Makefile.servermod
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5.4.2 2004/11/21 00:20:22 rtr Exp $
a5 1
.include "../../Makefile.servermod"
@


1.4
log
@Don't build as fontmodules or install if X11FLAGS.LOADABLE is empty.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2004/03/06 03:31:06 rtr Exp $
d84 4
@


1.3
log
@+ update reachover Xserver/* for xf4.4
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2004/02/07 06:52:04 lukem Exp $
d80 1
a80 1
CPPFLAGS+=	-DFONTMODULE -DXFREE86_FT2
d83 3
d87 4
@


1.2
log
@Cache XSERVERLIB determination in Makefile.serverlib rather than
in 111 separate places.  Speeds up empty "cleandir" from 27.17s to 13.75s.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2003/12/23 10:04:14 rtr Exp $
d8 4
d13 2
d16 41
a56 14
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/autohint
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/cff
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/base
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/psaux
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/pshinter
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/psnames
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/raster
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/sfnt
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/truetype
.PATH:	${X11SRCDIR.xc}/extras/freetype2/src/type1

SRCS=	ftfuncs.c ftenc.c fttools.c ftbase.c ftinit.c ftglyph.c ftsystem.c \
	fttype1.c ftxf86.c raster.c sfnt.c truetype.c cff.c type1.c \
	psaux.c psnames.c pshinter.c  autohint.c ftmodule.c
d58 2
a59 1
CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/font/FreeType \
d64 14
a77 11
		-I${X11SRCDIR.xc}/extras/freetype2/include \
		-I${X11SRCDIR.xc}/extras/freetype2/src/base \
		-I${X11SRCDIR.xc}/extras/freetype2/src/raster \
		-I${X11SRCDIR.xc}/extras/freetype2/src/sfnt \
		-I${X11SRCDIR.xc}/extras/freetype2/src/truetype \
		-I${X11SRCDIR.xc}/extras/freetype2/src/cff \
		-I${X11SRCDIR.xc}/extras/freetype2/src/type1 \
		-I${X11SRCDIR.xc}/extras/freetype2/src/psaux \
		-I${X11SRCDIR.xc}/extras/freetype2/src/psnames \
		-I${X11SRCDIR.xc}/extras/freetype2/src/pshinter \
		-I${X11SRCDIR.xc}/extras/freetype2/src/autohint \
d80 1
a80 1
CPPFLAGS+=	-DFONTMODULE
@


1.1
log
@bitmap, type1 and freetype loadable mods for XFree86.
@
text
@d1 1
a1 1
#	$NetBSD$
a6 2
.include <bsd.own.mk>

a24 2
XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}

@