head	1.6;
access;
symbols
	netbsd-7-2-RELEASE:1.5
	netbsd-7-1-2-RELEASE:1.5
	netbsd-7-1-1-RELEASE:1.5
	netbsd-7-1:1.5.0.28
	netbsd-7-1-RELEASE:1.5
	netbsd-7-1-RC2:1.5
	netbsd-7-1-RC1:1.5
	netbsd-7-0-2-RELEASE:1.5
	netbsd-7-0-1-RELEASE:1.5
	netbsd-7-0:1.5.0.26
	netbsd-7-0-RELEASE:1.5
	netbsd-7-0-RC3:1.5
	netbsd-7-0-RC2:1.5
	netbsd-7-0-RC1:1.5
	netbsd-5-2-3-RELEASE:1.5
	netbsd-5-1-5-RELEASE:1.5
	netbsd-6-0-6-RELEASE:1.5
	netbsd-6-1-5-RELEASE:1.5
	netbsd-7:1.5.0.24
	netbsd-7-base:1.5
	netbsd-6-1-4-RELEASE:1.5
	netbsd-6-0-5-RELEASE:1.5
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.5
	riastradh-drm2:1.5.0.22
	riastradh-drm2-base:1.5
	netbsd-6-1-3-RELEASE:1.5
	netbsd-6-0-4-RELEASE:1.5
	netbsd-5-2-2-RELEASE:1.5
	netbsd-5-1-4-RELEASE:1.5
	netbsd-6-1-2-RELEASE:1.5
	netbsd-6-0-3-RELEASE:1.5
	netbsd-5-2-1-RELEASE:1.5
	netbsd-5-1-3-RELEASE:1.5
	netbsd-6-1-1-RELEASE:1.5
	netbsd-6-1:1.5.0.20
	netbsd-6-0-2-RELEASE:1.5
	netbsd-6-1-RELEASE:1.5
	netbsd-6-1-RC4:1.5
	netbsd-6-1-RC3:1.5
	netbsd-6-1-RC2:1.5
	netbsd-6-1-RC1:1.5
	netbsd-5-2:1.5.0.18
	netbsd-6-0-1-RELEASE:1.5
	netbsd-5-2-RELEASE:1.5
	netbsd-5-2-RC1:1.5
	netbsd-6-0:1.5.0.16
	netbsd-6-0-RELEASE:1.5
	netbsd-6-0-RC2:1.5
	netbsd-6-0-RC1:1.5
	netbsd-6:1.5.0.14
	netbsd-6-base:1.5
	netbsd-5-1-2-RELEASE:1.5
	netbsd-5-1-1-RELEASE:1.5
	netbsd-5-1:1.5.0.12
	netbsd-5-1-RELEASE:1.5
	netbsd-5-1-RC4:1.5
	netbsd-5-1-RC3:1.5
	netbsd-5-1-RC2:1.5
	netbsd-5-1-RC1:1.5
	netbsd-5-0-2-RELEASE:1.5
	netbsd-5-0-1-RELEASE:1.5
	netbsd-5-0:1.5.0.10
	netbsd-5-0-RELEASE:1.5
	netbsd-5-0-RC4:1.5
	netbsd-5-0-RC3:1.5
	netbsd-5-0-RC2:1.5
	netbsd-5-0-RC1:1.5
	netbsd-5:1.5.0.8
	netbsd-5-base:1.5
	netbsd-4-0-1-RELEASE:1.5
	netbsd-4-0:1.5.0.6
	netbsd-4-0-RELEASE:1.5
	netbsd-4-0-RC5:1.5
	netbsd-4-0-RC4:1.5
	netbsd-4-0-RC3:1.5
	netbsd-4-0-RC2:1.5
	netbsd-4-0-RC1:1.5
	netbsd-3-1-1-RELEASE:1.4.6.1
	netbsd-3-0-3-RELEASE:1.4.6.1
	abandoned-netbsd-4-base:1.5
	abandoned-netbsd-4:1.5.0.2
	netbsd-3-1:1.4.6.1.0.4
	netbsd-3-1-RELEASE:1.4.6.1
	netbsd-3-0-2-RELEASE:1.4.6.1
	netbsd-3-1-RC4:1.4.6.1
	netbsd-3-1-RC3:1.4.6.1
	netbsd-3-1-RC2:1.4.6.1
	netbsd-3-1-RC1:1.4.6.1
	netbsd-4:1.5.0.4
	netbsd-4-base:1.5
	netbsd-3-0-1-RELEASE:1.4.6.1
	netbsd-3-0:1.4.6.1.0.2
	netbsd-3-0-RELEASE:1.4.6.1
	netbsd-3-0-RC6:1.4.6.1
	netbsd-3-0-RC5:1.4.6.1
	netbsd-3-0-RC4:1.4.6.1
	netbsd-3-0-RC3:1.4.6.1
	netbsd-3-0-RC2:1.4.6.1
	netbsd-3-0-RC1:1.4.6.1
	netbsd-2-0-3-RELEASE:1.4
	netbsd-2-1:1.4.0.8
	netbsd-2-1-RELEASE:1.4
	netbsd-2-1-RC6:1.4
	netbsd-2-1-RC5:1.4
	netbsd-2-1-RC4:1.4
	netbsd-2-1-RC3:1.4
	netbsd-2-1-RC2:1.4
	netbsd-2-1-RC1:1.4
	netbsd-2-0-2-RELEASE:1.4
	v4-5-0:1.1.1.7
	v4-5-0_beforeimport:1.4
	netbsd-3:1.4.0.6
	netbsd-3-base:1.4
	netbsd-2-0-1-RELEASE:1.4
	netbsd-2:1.4.0.4
	netbsd-2-base:1.4
	netbsd-2-0-RELEASE:1.4
	netbsd-2-0-RC5:1.4
	netbsd-2-0-RC4:1.4
	netbsd-2-0-RC3:1.4
	netbsd-2-0-RC2:1.4
	netbsd-2-0-RC1:1.4
	netbsd-2-0:1.4.0.2
	netbsd-2-0-base:1.4
	v4-4-0:1.1.1.6
	v4-4-0_beforeimport:1.3
	netbsd-1-6-PATCH002-RELEASE:1.3
	netbsd-1-6-PATCH002:1.3
	netbsd-1-6-PATCH002-RC4:1.3
	v4-3-0-2003-12-19:1.1.1.5
	netbsd-1-6-PATCH002-RC3:1.3
	netbsd-1-6-PATCH002-RC2:1.3
	netbsd-1-6-PATCH002-RC1:1.3
	netbsd-1-6:1.3.0.2
	netbsd-1-6-base:1.3
	v4-3-0-fix:1.1.1.5
	v4-3-0:1.1.1.5
	v4-3-0_beforeimport:1.1.1.4
	netbsd-1-6-PATCH001:1.1.1.4
	netbsd-1-6-RELEASE:1.1.1.4
	v4-2-1:1.1.1.4
	v4-2-1_beforeimport:1.1.1.4
	netbsd-1-5-PATCH003:1.1.1.4
	v4-2-0:1.1.1.4
	netbsd-1-5-PATCH002:1.1.1.3
	netbsd-1-5-PATCH001:1.1.1.2
	v4-1-0:1.1.1.3
	v4-0-3:1.1.1.2
	v4-0-2:1.1.1.1
	XF86:1.1.1;
locks; strict;
comment	@# @;


1.6
date	2015.07.23.08.13.05;	author mrg;	state dead;
branches;
next	1.5;
commitid	3Fk7MoycOv7VSnuy;

1.5
date	2005.03.18.14.55.00;	author tron;	state Exp;
branches;
next	1.4;

1.4
date	2004.03.05.16.32.51;	author tron;	state Exp;
branches
	1.4.6.1;
next	1.3;

1.3
date	2003.02.28.16.56.55;	author tron;	state Exp;
branches;
next	1.2;

1.2
date	2003.02.28.14.18.06;	author tron;	state dead;
branches;
next	1.1;

1.1
date	2001.01.01.12.51.02;	author veego;	state Exp;
branches
	1.1.1.1;
next	;

1.4.6.1
date	2005.04.06.20.00.06;	author tron;	state Exp;
branches;
next	;

1.1.1.1
date	2001.01.01.12.51.02;	author veego;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2001.03.18.17.04.03;	author veego;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2001.06.09.16.27.09;	author tron;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2002.01.19.17.46.02;	author tron;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2003.02.28.15.15.11;	author tron;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2004.03.05.14.32.41;	author tron;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2005.03.18.13.20.29;	author tron;	state Exp;
branches;
next	;


desc
@@


1.6
log
@remove obsolete XFree86 sources.
@
text
@XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.6 2004/03/02 19:43:20 dawes Exp $

LUXIFONTS = luximb.ttf luximbi.ttf luximr.ttf luximri.ttf \
	luxirb.ttf luxirbi.ttf luxirr.ttf luxirri.ttf \
	luxisb.ttf luxisbi.ttf luxisr.ttf luxisri.ttf

VERASRCDIR = $(TOP)/extras/fonts/Bitstream-Vera
VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf \
	VeraMoBd.ttf VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf

FONTS = $(LUXIFONTS) $(VERAFONTS)
OBJS = $(FONTS)

FONTINSTDIR = $(FONTDIR)/TTF

MakeFontsScale($(OBJS))
MakeFontsDir(fonts.scale)

#if UseFreetype2
MakeFcCache($(FONTS))
#endif

InstallFonts($(FONTINSTDIR))
InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
#if UseFreetype2
InstallFcCache($(FONTINSTDIR))
#endif

#ifdef IHaveSubdirs
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
#endif

LinkSourceFile(Vera.ttf,$(VERASRCDIR))
LinkSourceFile(VeraBI.ttf,$(VERASRCDIR))
LinkSourceFile(VeraBd.ttf,$(VERASRCDIR))
LinkSourceFile(VeraIt.ttf,$(VERASRCDIR))
LinkSourceFile(VeraMoBI.ttf,$(VERASRCDIR))
LinkSourceFile(VeraMoBd.ttf,$(VERASRCDIR))
LinkSourceFile(VeraMoIt.ttf,$(VERASRCDIR))
LinkSourceFile(VeraMono.ttf,$(VERASRCDIR))
LinkSourceFile(VeraSe.ttf,$(VERASRCDIR))
LinkSourceFile(VeraSeBd.ttf,$(VERASRCDIR))

@


1.5
log
@Resolve conflicts from import of XFree86 4.5.0.
@
text
@@


1.4
log
@Resolve conflicts from import of XFree86 4.4.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.5 2003/12/31 19:30:39 dawes Exp $
d8 2
a9 2
VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraMoBI.ttf VeraMoBd.ttf \
	VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
@


1.4.6.1
log
@Apply patch (requested by jmc in ticket #114):
Update XFree86 to version 4.5.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.6 2004/03/02 19:43:20 dawes Exp $
d8 2
a9 2
VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf \
	VeraMoBd.ttf VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
@


1.3
log
@Restore accidently deleted files.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.4 2002/05/22 04:30:13 keithp Exp $
d3 3
a5 3
FONTS = luximb.ttf luximbi.ttf luximr.ttf luximri.ttf \
        luxirb.ttf luxirbi.ttf luxirr.ttf luxirri.ttf \
        luxisb.ttf luxisbi.ttf luxisr.ttf luxisri.ttf
d7 5
d16 1
a23 1
InstallFontScale($(FONTINSTDIR))
d33 12
@


1.2
log
@Resolve conflicts from import of XFree86 4.3.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.1 1999/01/31 04:59:14 dawes Exp $
d3 25
a27 1
/* This is a place holder */
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Initial import of XFree86 4.x
@
text
@@


1.1.1.2
log
@Import of XFree86 4.0.3
@
text
@d1 1
a1 1
XCOMM $XFree86$
@


1.1.1.3
log
@Import of XFree86 4.1.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.1 1999/01/31 04:59:14 dawes Exp $
@


1.1.1.4
log
@Import of XFree86 4.2.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.2 2001/11/21 21:31:21 dawes Exp $
d3 1
a3 25
FONTS = luximb.ttf luximbi.ttf luximr.ttf luximri.ttf \
        luxirb.ttf luxirbi.ttf luxirr.ttf luxirri.ttf \
        luxisb.ttf luxisbi.ttf luxisr.ttf luxisri.ttf

OBJS = $(FONTS)

FONTINSTDIR = $(FONTDIR)/TTF

MakeFontsDir(fonts.scale)

#if UseFreeType2
MakeXftCache($(FONTS))
#endif

InstallFonts($(FONTINSTDIR))
InstallFontScale($(FONTINSTDIR))
InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
#if UseFreeType2
InstallXftCache($(FONTINSTDIR))
#endif

#ifdef IHaveSubdirs
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
#endif
@


1.1.1.5
log
@Import of XFree86 4.3.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.4 2002/05/22 04:30:13 keithp Exp $
d13 2
a14 2
#if UseFreetype2
MakeFcCache($(FONTS))
d20 2
a21 2
#if UseFreetype2
InstallFcCache($(FONTINSTDIR))
@


1.1.1.6
log
@Import of XFree86 4.4.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.5 2003/12/31 19:30:39 dawes Exp $
d3 3
a5 3
LUXIFONTS = luximb.ttf luximbi.ttf luximr.ttf luximri.ttf \
	luxirb.ttf luxirbi.ttf luxirr.ttf luxirri.ttf \
	luxisb.ttf luxisbi.ttf luxisr.ttf luxisri.ttf
a6 5
VERASRCDIR = $(TOP)/extras/fonts/Bitstream-Vera
VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraMoBI.ttf VeraMoBd.ttf \
	VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf

FONTS = $(LUXIFONTS) $(VERAFONTS)
a10 1
MakeFontsScale($(OBJS))
d18 1
a27 12

LinkSourceFile(Vera.ttf,$(VERASRCDIR))
LinkSourceFile(VeraBI.ttf,$(VERASRCDIR))
LinkSourceFile(VeraBd.ttf,$(VERASRCDIR))
LinkSourceFile(VeraIt.ttf,$(VERASRCDIR))
LinkSourceFile(VeraMoBI.ttf,$(VERASRCDIR))
LinkSourceFile(VeraMoBd.ttf,$(VERASRCDIR))
LinkSourceFile(VeraMoIt.ttf,$(VERASRCDIR))
LinkSourceFile(VeraMono.ttf,$(VERASRCDIR))
LinkSourceFile(VeraSe.ttf,$(VERASRCDIR))
LinkSourceFile(VeraSeBd.ttf,$(VERASRCDIR))

@


1.1.1.7
log
@Import of XFree86 4.5.0.
@
text
@d1 1
a1 1
XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.6 2004/03/02 19:43:20 dawes Exp $
d8 2
a9 2
VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf \
	VeraMoBd.ttf VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
@