head	1.2;
access;
symbols
	perseant-exfatfs-base-20250801:1.2
	perseant-exfatfs-base-20240630:1.2
	cjep_sun2x:1.2.0.12
	cjep_sun2x-base:1.2
	cjep_staticlib_x-base1:1.2
	cjep_staticlib_x:1.2.0.10
	cjep_staticlib_x-base:1.2
	phil-wifi-20200421:1.2
	phil-wifi-20200411:1.2
	phil-wifi-20200406:1.2
	pgoyette-compat-merge-20190127:1.2
	pgoyette-compat-20190127:1.2
	pgoyette-compat-20190118:1.2
	pgoyette-compat-1226:1.2
	pgoyette-compat-1126:1.2
	pgoyette-compat-1020:1.2
	pgoyette-compat-0930:1.2
	pgoyette-compat-0906:1.2
	netbsd-7-2-RELEASE:1.1
	pgoyette-compat-0728:1.2
	pgoyette-compat-0625:1.2
	pgoyette-compat-0521:1.2
	pgoyette-compat-0502:1.2
	pgoyette-compat-0422:1.2
	pgoyette-compat-0415:1.2
	pgoyette-compat-0407:1.2
	pgoyette-compat-0330:1.2
	pgoyette-compat-0322:1.2
	pgoyette-compat-0315:1.2
	netbsd-7-1-2-RELEASE:1.1
	pgoyette-compat:1.2.0.8
	pgoyette-compat-base:1.2
	netbsd-7-1-1-RELEASE:1.1
	prg-localcount2-base3:1.2
	prg-localcount2-base2:1.2
	prg-localcount2-base1:1.2
	prg-localcount2:1.2.0.6
	prg-localcount2-base:1.2
	pgoyette-localcount-20170426:1.2
	bouyer-socketcan-base1:1.2
	pgoyette-localcount-20170320:1.2
	netbsd-7-1:1.1.0.76
	netbsd-7-1-RELEASE:1.1
	netbsd-7-1-RC2:1.1
	netbsd-7-nhusb-base-20170116:1.1
	bouyer-socketcan:1.2.0.4
	bouyer-socketcan-base:1.2
	pgoyette-localcount-20170107:1.2
	netbsd-7-1-RC1:1.1
	pgoyette-localcount-20161104:1.2
	netbsd-7-0-2-RELEASE:1.1
	localcount-20160914:1.2
	netbsd-7-nhusb:1.1.0.74
	netbsd-7-nhusb-base:1.1
	pgoyette-localcount-20160806:1.2
	pgoyette-localcount-20160726:1.2
	pgoyette-localcount:1.2.0.2
	pgoyette-localcount-base:1.2
	netbsd-7-0-1-RELEASE:1.1
	netbsd-7-0:1.1.0.72
	netbsd-7-0-RELEASE:1.1
	netbsd-7-0-RC3:1.1
	netbsd-7-0-RC2:1.1
	netbsd-7-0-RC1:1.1
	netbsd-5-2-3-RELEASE:1.1
	netbsd-5-1-5-RELEASE:1.1
	netbsd-6-0-6-RELEASE:1.1
	netbsd-6-1-5-RELEASE:1.1
	netbsd-7:1.1.0.70
	netbsd-7-base:1.1
	yamt-pagecache-base9:1.1
	yamt-pagecache-tag8:1.1
	netbsd-6-1-4-RELEASE:1.1
	netbsd-6-0-5-RELEASE:1.1
	tls-earlyentropy:1.1.0.68
	tls-earlyentropy-base:1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1
	riastradh-drm2-base3:1.1
	netbsd-6-1-3-RELEASE:1.1
	netbsd-6-0-4-RELEASE:1.1
	netbsd-5-2-2-RELEASE:1.1
	netbsd-5-1-4-RELEASE:1.1
	netbsd-6-1-2-RELEASE:1.1
	netbsd-6-0-3-RELEASE:1.1
	netbsd-5-2-1-RELEASE:1.1
	netbsd-5-1-3-RELEASE:1.1
	netbsd-6-1-1-RELEASE:1.1
	riastradh-drm2-base2:1.1
	riastradh-drm2-base1:1.1
	riastradh-drm2:1.1.0.62
	riastradh-drm2-base:1.1
	netbsd-6-1:1.1.0.66
	netbsd-6-0-2-RELEASE:1.1
	netbsd-6-1-RELEASE:1.1
	netbsd-6-1-RC4:1.1
	netbsd-6-1-RC3:1.1
	agc-symver:1.1.0.64
	agc-symver-base:1.1
	netbsd-6-1-RC2:1.1
	netbsd-6-1-RC1:1.1
	yamt-pagecache-base8:1.1
	netbsd-5-2:1.1.0.60
	netbsd-6-0-1-RELEASE:1.1
	yamt-pagecache-base7:1.1
	netbsd-5-2-RELEASE:1.1
	netbsd-5-2-RC1:1.1
	matt-nb6-plus-nbase:1.1
	yamt-pagecache-base6:1.1
	netbsd-6-0:1.1.0.58
	netbsd-6-0-RELEASE:1.1
	netbsd-6-0-RC2:1.1
	tls-maxphys:1.1.0.56
	tls-maxphys-base:1.1
	matt-nb6-plus:1.1.0.54
	matt-nb6-plus-base:1.1
	netbsd-6-0-RC1:1.1
	yamt-pagecache-base5:1.1
	yamt-pagecache-base4:1.1
	netbsd-6:1.1.0.52
	netbsd-6-base:1.1
	netbsd-5-1-2-RELEASE:1.1
	netbsd-5-1-1-RELEASE:1.1
	yamt-pagecache-base3:1.1
	yamt-pagecache-base2:1.1
	yamt-pagecache:1.1.0.50
	yamt-pagecache-base:1.1
	cherry-xenmp:1.1.0.48
	cherry-xenmp-base:1.1
	bouyer-quota2-nbase:1.1
	bouyer-quota2:1.1.0.46
	bouyer-quota2-base:1.1
	matt-mips64-premerge-20101231:1.1
	matt-nb5-mips64-premerge-20101231:1.1
	matt-nb5-pq3:1.1.0.44
	matt-nb5-pq3-base:1.1
	netbsd-5-1:1.1.0.42
	netbsd-5-1-RELEASE:1.1
	netbsd-5-1-RC4:1.1
	matt-nb5-mips64-k15:1.1
	netbsd-5-1-RC3:1.1
	netbsd-5-1-RC2:1.1
	netbsd-5-1-RC1:1.1
	netbsd-5-0-2-RELEASE:1.1
	matt-nb5-mips64-premerge-20091211:1.1
	matt-premerge-20091211:1.1
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1
	matt-nb4-mips64-k7-u2a-k9b:1.1
	matt-nb5-mips64-u1-k1-k5:1.1
	matt-nb5-mips64:1.1.0.40
	netbsd-5-0-1-RELEASE:1.1
	jym-xensuspend-nbase:1.1
	netbsd-5-0:1.1.0.38
	netbsd-5-0-RELEASE:1.1
	netbsd-5-0-RC4:1.1
	netbsd-5-0-RC3:1.1
	netbsd-5-0-RC2:1.1
	jym-xensuspend:1.1.0.36
	jym-xensuspend-base:1.1
	netbsd-5-0-RC1:1.1
	netbsd-5:1.1.0.34
	netbsd-5-base:1.1
	matt-mips64-base2:1.1
	matt-mips64:1.1.0.32
	netbsd-4-0-1-RELEASE:1.1
	wrstuden-revivesa-base-3:1.1
	wrstuden-revivesa-base-2:1.1
	wrstuden-fixsa-newbase:1.1
	wrstuden-revivesa-base-1:1.1
	yamt-pf42-base4:1.1
	yamt-pf42-base3:1.1
	hpcarm-cleanup-nbase:1.1
	yamt-pf42-baseX:1.1
	yamt-pf42-base2:1.1
	wrstuden-revivesa:1.1.0.30
	wrstuden-revivesa-base:1.1
	yamt-pf42:1.1.0.28
	yamt-pf42-base:1.1
	keiichi-mipv6-nbase:1.1
	keiichi-mipv6:1.1.0.26
	keiichi-mipv6-base:1.1
	matt-armv6-nbase:1.1
	matt-armv6-prevmlocking:1.1
	wrstuden-fixsa-base-1:1.1
	netbsd-4-0:1.1.0.24
	netbsd-4-0-RELEASE:1.1
	cube-autoconf:1.1.0.22
	cube-autoconf-base:1.1
	netbsd-4-0-RC5:1.1
	netbsd-4-0-RC4:1.1
	netbsd-4-0-RC3:1.1
	netbsd-4-0-RC2:1.1
	netbsd-4-0-RC1:1.1
	matt-armv6:1.1.0.20
	matt-armv6-base:1.1
	matt-mips64-base:1.1
	hpcarm-cleanup:1.1.0.18
	hpcarm-cleanup-base:1.1
	netbsd-3-1-1-RELEASE:1.1
	netbsd-3-0-3-RELEASE:1.1
	wrstuden-fixsa:1.1.0.16
	wrstuden-fixsa-base:1.1
	abandoned-netbsd-4-base:1.1
	abandoned-netbsd-4:1.1.0.10
	netbsd-3-1:1.1.0.12
	netbsd-3-1-RELEASE:1.1
	netbsd-3-0-2-RELEASE:1.1
	netbsd-3-1-RC4:1.1
	netbsd-3-1-RC3:1.1
	netbsd-3-1-RC2:1.1
	netbsd-3-1-RC1:1.1
	netbsd-4:1.1.0.14
	netbsd-4-base:1.1
	netbsd-3-0-1-RELEASE:1.1
	netbsd-3-0:1.1.0.8
	netbsd-3-0-RELEASE:1.1
	netbsd-3-0-RC6:1.1
	netbsd-3-0-RC5:1.1
	netbsd-3-0-RC4:1.1
	netbsd-3-0-RC3:1.1
	netbsd-3-0-RC2:1.1
	netbsd-3-0-RC1:1.1
	netbsd-2-0-3-RELEASE:1.1.2.2
	netbsd-2-1:1.1.2.2.0.4
	netbsd-2-1-RELEASE:1.1.2.2
	netbsd-2-1-RC6:1.1.2.2
	netbsd-2-1-RC5:1.1.2.2
	netbsd-2-1-RC4:1.1.2.2
	netbsd-2-1-RC3:1.1.2.2
	netbsd-2-1-RC2:1.1.2.2
	netbsd-2-1-RC1:1.1.2.2
	netbsd-2-0-2-RELEASE:1.1.2.2
	v4-5-0_beforeimport:1.1
	netbsd-3:1.1.0.6
	netbsd-3-base:1.1
	netbsd-2-0-1-RELEASE:1.1.2.2
	netbsd-2:1.1.2.2.0.2
	netbsd-2-base:1.1.2.2
	netbsd-2-0-RELEASE:1.1.2.2
	rtr-xorg-branch:1.1.0.4
	rtr-xorg-branch-base:1.1
	netbsd-2-0-RC5:1.1.2.2
	netbsd-2-0-RC4:1.1.2.2
	netbsd-2-0-RC3:1.1.2.2
	netbsd-2-0-RC2:1.1.2.2
	netbsd-2-0-RC1:1.1.2.2
	netbsd-2-0:1.1.0.2
	netbsd-2-0-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2015.07.23.08.03.51;	author mrg;	state dead;
branches;
next	1.1;
commitid	nfGa2DVpEPUUPnuy;

1.1
date	2004.04.28.14.17.56;	author lukem;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2004.04.28.14.17.56;	author jmc;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2004.04.29.05.46.15;	author jmc;	state Exp;
branches;
next	;


desc
@@


1.2
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.1 2004/04/28 14:17:56 lukem Exp $

.include <bsd.own.mk>

FILESDIR=	${X11LIBDIR}/xkb/geometry/ibm
FILES=		thinkpad

.PATH:		${X11SRCDIR.xc}/programs/xkbcomp/geometry/ibm

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


1.1
log
@Fix up botches in X userland from upgrade from XFree86 4.3.0 -> 4.4.0.
(All paths are relative to usr/X11R6)

* Obsolete:
	bin/fontconfig-config

* Add directories:
	lib/X11/locale/zh_CN.UTF-8
	lib/X11/xkb/geometry/ibm

* Rename include/freetype2/ft2build.h to include/ft2build.h and obsolete former

* Add files:
	fonttosfnt(1) program & man page
	include/expat.h
	lib/X11/app-defaults/XClock-color
	lib/X11/fonts/TTF/Vera*.ttf
	some font encodings
	zn_CN.UTF-8 locale
	some font encodings
	various xkb config files
	lib/X11/xedit/lisp/progmodes/patch.lsp
	Xfontcache(3) and various links
	XDGA(3) and various links
	XRes(3) and various links
	Xss(3) and various XScreenSaver*(3) links

* Add some more TODO items

* Clean up lib/expat build now that the version is hard coded.
@
text
@d1 1
a1 1
#	$NetBSD$
@


1.1.2.1
log
@file Makefile was added on branch netbsd-2-0 on 2004-04-29 05:46:15 +0000
@
text
@d1 11
@


1.1.2.2
log
@Pullup rev 0-1.1 (requested by lukem in ticket #224)

Fix up botches in X userland from upgrade from XFree86 4.3.0 -> 4.4.0.
* Obsolete:
        bin/fontconfig-config

* Add directories:
        lib/X11/locale/zh_CN.UTF-8
        lib/X11/xkb/geometry/ibm

* Rename include/freetype2/ft2build.h to include/ft2build.h and obsolete former

* Add files:
        fonttosfnt(1) program & man page
        include/expat.h
        lib/X11/app-defaults/XClock-color
        lib/X11/fonts/TTF/Vera*.ttf
        some font encodings
        zn_CN.UTF-8 locale
        some font encodings
        various xkb config files
        lib/X11/xedit/lisp/progmodes/patch.lsp
        Xfontcache(3) and various links
        XDGA(3) and various links
        XRes(3) and various links
        Xss(3) and various XScreenSaver*(3) links

* Add some more TODO items

* Clean up lib/expat build now that the version is hard coded.
@
text
@a0 11
#	$NetBSD: Makefile,v 1.1.2.1 2004/04/29 05:46:15 jmc Exp $

.include <bsd.own.mk>

FILESDIR=	${X11LIBDIR}/xkb/geometry/ibm
FILES=		thinkpad

.PATH:		${X11SRCDIR.xc}/programs/xkbcomp/geometry/ibm

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