XFree86 meta-package can be now installed with or without xpkgwedge,

installation prefix is ${X11PREFIX}/X11R6.

Bump PKGREVISION.

16 files changed, 2167 insertions, 2091 deletions

diff --git a/meta-pkgs/XFree86/Makefile b/meta-pkgs/XFree86/Makefile
index 6b805005f99..bfc44172627 100644
--- a/meta-pkgs/XFree86/Makefile
+++ b/meta-pkgs/XFree86/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/01/24 09:12:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/02 14:08:27 xtraeme Exp $
 
 DISTNAME=	# empty
 PKGNAME=	XFree86-${XF_VER}
+PKGREVISION=	1
 CATEGORIES=	meta-pkgs x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 DISTFILES=	# empty
@@ -35,5 +36,4 @@ do-install:
 	# empty
 
 .include "../../meta-pkgs/XFree86/Makefile.common"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common
index 87c0a197182..9622e2656d6 100644
--- a/meta-pkgs/XFree86/Makefile.common
+++ b/meta-pkgs/XFree86/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/01/31 19:08:47 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/02/02 14:08:28 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -26,6 +26,7 @@ USE_GNU_TOOLS+= make
 WRKSRC?=	${WRKDIR}/xc
 USE_X11BASE=	YES
 USE_X11_LINKS=	NO
+X11ROOT=	${X11PREFIX}/X11R6
 
 MASTER_SITE_XFREE+=	\
 	ftp://archive.progeny.com/XFree86/${XF_VER}/source/ \
@@ -36,7 +37,7 @@ MASTER_SITE_XFREE+=	\
 
 XF_VER=	4.3.0
 
-IMAKE=		${X11PREFIX}/bin/imake
+IMAKE=		${X11ROOT}/bin/imake
 
 XINSTALL_DIRS?=	${XBUILD_DIRS}
 _XINCLUDE_DIRS=	include ${XBUILD_DIRS} ${XINCLUDE_DIRS}
@@ -55,20 +56,20 @@ post-extract:
 		-e "s|@MAKE@|${MAKE_PROGRAM}|g" \
 		-e "s|@MAKE_PROGRAM@|${MAKE_PROGRAM}|g" \
 		-e "s|@IMAKE@|${IMAKE}|g" \
-		-e "s|@RMAN@|${X11PREFIX}/bin/rman|g" \
-		-e "s|@MKHTMLINDEX@|${X11PREFIX}/bin/mkhtmlindex|g" \
-		-e "s|@GCCMAKEDEP@|${X11PREFIX}/bin/gccmakedep|g" \
-		-e "s|@MAKEDEPEND@|${X11PREFIX}/bin/makedepend|g" \
-		-e "s|@REVPATH@|${X11PREFIX}/bin/revpath|g" \
-		-e "s|@PREFIX@|${X11PREFIX}|g" \
+		-e "s|@RMAN@|${X11ROOT}/bin/rman|g" \
+		-e "s|@MKHTMLINDEX@|${X11ROOT}/bin/mkhtmlindex|g" \
+		-e "s|@GCCMAKEDEP@|${X11ROOT}/bin/gccmakedep|g" \
+		-e "s|@MAKEDEPEND@|${X11ROOT}/bin/makedepend|g" \
+		-e "s|@REVPATH@|${X11ROOT}/bin/revpath|g" \
+		-e "s|@PREFIX@|${X11ROOT}|g" \
 		-e "s|@LOCALBASE@|${LOCALBASE}|g" \
 		-e "s|@LDFLAGS@|${LDFLAGS}|g" \
 		${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def
-	@${LN} -sf ${PREFIX}/bin/gccmakedep ${WRKSRC}/config/util
-	@${LN} -sf ${PREFIX}/bin/revpath ${WRKSRC}/config/util
-	@${LN} -sf ${PREFIX}/bin/pswrap ${WRKSRC}/config/pswrap
-	@${LN} -sf ${PREFIX}/lib/X11/config/version.def ${WRKSRC}/config/cf
-	@${LN} -sf ${PREFIX}/lib/X11/config/date.def ${WRKSRC}/config/cf
+	@${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util
+	@${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util
+	@${LN} -sf ${X11ROOT}/bin/pswrap ${WRKSRC}/config/pswrap
+	@${LN} -sf ${X11ROOT}/lib/X11/config/version.def ${WRKSRC}/config/cf
+	@${LN} -sf ${X11ROOT}/lib/X11/config/date.def ${WRKSRC}/config/cf
 .if exists(${FILESDIR}/ucs2any.c)
 	@${CP} ${FILESDIR}/ucs2any.c ${WRKSRC}/fonts/util
 .endif
@@ -155,4 +156,4 @@ do-install:
 	done
 .endif
 
-.endif # ! NO_XFREE86_TARGETS
+.endif # NO_XFREE86_TARGETS
diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile
index 6718b20be45..385660617ab 100644
--- a/x11/XFree86-clients/Makefile
+++ b/x11/XFree86-clients/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/01/31 16:15:12 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/02 14:16:07 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-clients-${XF_VER}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
 DISTFILES=		X430src-1.tgz X430src-2.tgz \
@@ -22,6 +23,12 @@ XINSTALL_MAN_DIRS=	programs
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "NetBSD"
+PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX}
+.else
+PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
+.endif
+
 .if ${OPSYS} == "Linux"
 .  include "../../security/PAM/buildlink2.mk"
 .endif
@@ -30,7 +37,7 @@ post-configure:
 	@${MKDIR} ${WRKSRC}/exports/lib
 	@for l in fntstubs Xss FS fontenc Xau Xxf86vm Xxf86dga xkbfile \
 		Xxf86misc Xdmcp Xfontcache Xinerama Xfont; do \
-		${LN} -sf ${PREFIX}/lib/lib$${l}.a ${WRKSRC}/exports/lib/; \
+		${LN} -sf ${X11ROOT}/lib/lib$${l}.a ${WRKSRC}/exports/lib/; \
 	done
 
 .include "../../fonts/Xft2/buildlink2.mk"
diff --git a/x11/XFree86-clients/PLIST b/x11/XFree86-clients/PLIST
index 09571451768..90f549fb863 100644
--- a/x11/XFree86-clients/PLIST
+++ b/x11/XFree86-clients/PLIST
@@ -1,846 +1,888 @@
-@comment $NetBSD: PLIST,v 1.1 2004/01/31 15:27:14 xtraeme Exp $
-bin/Xmark
-bin/appres
-bin/atobm
-bin/bdftopcf
-bin/bdftruncate
-bin/beforelight
-bin/bitmap
-bin/bmtoa
-bin/cxpm
-bin/dga
-bin/dpsexec
-bin/dpsinfo
-bin/editres
-bin/fslsfonts
-bin/fstobdf
-bin/glxgears
-bin/glxinfo
-bin/iceauth
-bin/ico
-bin/lbxproxy
-bin/listres
-bin/luit
-bin/makepsres
-bin/mkcfm
-bin/mkfontdir
-bin/mkfontscale
-bin/oclock
-bin/proxymngr
-bin/resize
-bin/rstart
-bin/rstartd
-bin/sessreg
-bin/setxkbmap
-bin/showfont
-bin/showrgb
-bin/smproxy
-bin/startx
-bin/sxpm
-bin/texteroids
-bin/twm
-bin/ucs2any
-bin/uxterm
-bin/viewres
-bin/x11perf
-bin/x11perfcomp
-bin/xauth
-bin/xbiff
-bin/xcalc
-bin/xclipboard
-bin/xclock
-bin/xcmsdb
-bin/xconsole
-bin/xcursorgen
-bin/xcutsel
-bin/xditview
-bin/xdm
-bin/xdpyinfo
-bin/xedit
-bin/xev
-bin/xeyes
-bin/xfd
-bin/xfindproxy
-bin/xfontsel
-bin/xfsinfo
-bin/xfwp
-bin/xgamma
-bin/xgc
-bin/xhost
-bin/xinit
-bin/xkbbell
-bin/xkbcomp
-bin/xkbevd
-bin/xkbprint
-bin/xkbvleds
-bin/xkbwatch
-bin/xkill
-bin/xload
-bin/xlogo
-bin/xlsatoms
-bin/xlsclients
-bin/xlsfonts
-bin/xmag
-bin/xman
-bin/xmessage
-bin/xmh
-bin/xmodmap
-bin/xon
-bin/xprop
-bin/xrandr
-bin/xrdb
-bin/xrefresh
-bin/xset
-bin/xsetmode
-bin/xsetpointer
-bin/xsetroot
-bin/xsm
-bin/xstdcmap
-bin/xterm
-bin/xtrapchar
-bin/xtrapin
-bin/xtrapinfo
-bin/xtrapout
-bin/xtrapproto
-bin/xtrapreset
-bin/xtrapstats
-bin/xvidtune
-bin/xvinfo
-bin/xwd
-bin/xwininfo
-bin/xwud
-lib/X11/app-defaults/Beforelight
-lib/X11/app-defaults/Bitmap
-lib/X11/app-defaults/Bitmap-color
-lib/X11/app-defaults/Chooser
-lib/X11/app-defaults/Clock-color
-lib/X11/app-defaults/Editres
-lib/X11/app-defaults/Editres-color
-lib/X11/app-defaults/UXTerm
-lib/X11/app-defaults/Viewres
-lib/X11/app-defaults/XCalc
-lib/X11/app-defaults/XCalc-color
-lib/X11/app-defaults/XClipboard
-lib/X11/app-defaults/XClock
-lib/X11/app-defaults/XConsole
-lib/X11/app-defaults/XFontSel
-lib/X11/app-defaults/XLoad
-lib/X11/app-defaults/XLogo
-lib/X11/app-defaults/XLogo-color
-lib/X11/app-defaults/XSm
-lib/X11/app-defaults/XTerm
-lib/X11/app-defaults/XTerm-color
-lib/X11/app-defaults/Xditview
-lib/X11/app-defaults/Xditview-chrtr
-lib/X11/app-defaults/Xedit
-lib/X11/app-defaults/Xedit-color
-lib/X11/app-defaults/Xfd
-lib/X11/app-defaults/Xgc
-lib/X11/app-defaults/Xmag
-lib/X11/app-defaults/Xman
-lib/X11/app-defaults/Xmessage
-lib/X11/app-defaults/Xmessage-color
-lib/X11/app-defaults/Xmh
-lib/X11/app-defaults/Xvidtune
-include/X11/PM/PM.h
-include/X11/PM/PMproto.h
-include/X11/bitmaps/Dashes
-include/X11/bitmaps/Down
-include/X11/bitmaps/Excl
-include/X11/bitmaps/FlipHoriz
-include/X11/bitmaps/FlipVert
-include/X11/bitmaps/Fold
-include/X11/bitmaps/Left
-include/X11/bitmaps/Right
-include/X11/bitmaps/RotateLeft
-include/X11/bitmaps/RotateRight
-include/X11/bitmaps/Stipple
-include/X11/bitmaps/Term
-include/X11/bitmaps/Up
-include/X11/bitmaps/black6
-include/X11/bitmaps/box6
-include/X11/bitmaps/ldblarrow
-include/X11/bitmaps/rdblarrow
-lib/X11/etc/xterm.termcap
-lib/X11/etc/xterm.terminfo
-lib/X11/fonts/util/map-ISO8859-1
-lib/X11/fonts/util/map-ISO8859-10
-lib/X11/fonts/util/map-ISO8859-11
-lib/X11/fonts/util/map-ISO8859-13
-lib/X11/fonts/util/map-ISO8859-14
-lib/X11/fonts/util/map-ISO8859-15
-lib/X11/fonts/util/map-ISO8859-16
-lib/X11/fonts/util/map-ISO8859-2
-lib/X11/fonts/util/map-ISO8859-3
-lib/X11/fonts/util/map-ISO8859-4
-lib/X11/fonts/util/map-ISO8859-5
-lib/X11/fonts/util/map-ISO8859-7
-lib/X11/fonts/util/map-ISO8859-8
-lib/X11/fonts/util/map-ISO8859-9
-lib/X11/fonts/util/map-JISX0201.1976-0
-lib/X11/fonts/util/map-KOI8-R
-lib/X11/icons/default/index.theme
-lib/X11/icons/handhelds/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-lib/X11/icons/handhelds/cursors/X_cursor
-lib/X11/icons/handhelds/cursors/arrow
-lib/X11/icons/handhelds/cursors/based_arrow_down
-lib/X11/icons/handhelds/cursors/based_arrow_up
-lib/X11/icons/handhelds/cursors/bottom_left_corner
-lib/X11/icons/handhelds/cursors/bottom_right_corner
-lib/X11/icons/handhelds/cursors/bottom_side
-lib/X11/icons/handhelds/cursors/bottom_tee
-lib/X11/icons/handhelds/cursors/center_ptr
-lib/X11/icons/handhelds/cursors/circle
-lib/X11/icons/handhelds/cursors/cross
-lib/X11/icons/handhelds/cursors/cross_reverse
-lib/X11/icons/handhelds/cursors/crosshair
-lib/X11/icons/handhelds/cursors/dot
-lib/X11/icons/handhelds/cursors/dotbox
-lib/X11/icons/handhelds/cursors/double_arrow
-lib/X11/icons/handhelds/cursors/draft_large
-lib/X11/icons/handhelds/cursors/draft_small
-lib/X11/icons/handhelds/cursors/draped_box
-lib/X11/icons/handhelds/cursors/fleur
-lib/X11/icons/handhelds/cursors/gumby
-lib/X11/icons/handhelds/cursors/hand2
-lib/X11/icons/handhelds/cursors/left_ptr
-lib/X11/icons/handhelds/cursors/left_ptr_watch
-lib/X11/icons/handhelds/cursors/left_side
-lib/X11/icons/handhelds/cursors/left_tee
-lib/X11/icons/handhelds/cursors/ll_angle
-lib/X11/icons/handhelds/cursors/pencil
-lib/X11/icons/handhelds/cursors/plus
-lib/X11/icons/handhelds/cursors/right_ptr
-lib/X11/icons/handhelds/cursors/right_side
-lib/X11/icons/handhelds/cursors/right_tee
-lib/X11/icons/handhelds/cursors/sb_h_double_arrow
-lib/X11/icons/handhelds/cursors/sb_right_arrow
-lib/X11/icons/handhelds/cursors/sb_up_arrow
-lib/X11/icons/handhelds/cursors/sb_v_double_arrow
-lib/X11/icons/handhelds/cursors/shuttle
-lib/X11/icons/handhelds/cursors/tcross
-lib/X11/icons/handhelds/cursors/top_left_arrow
-lib/X11/icons/handhelds/cursors/top_left_corner
-lib/X11/icons/handhelds/cursors/top_right_corner
-lib/X11/icons/handhelds/cursors/top_side
-lib/X11/icons/handhelds/cursors/top_tee
-lib/X11/icons/handhelds/cursors/watch
-lib/X11/icons/handhelds/cursors/xterm
-lib/X11/icons/redglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-lib/X11/icons/redglass/cursors/X_cursor
-lib/X11/icons/redglass/cursors/arrow
-lib/X11/icons/redglass/cursors/based_arrow_down
-lib/X11/icons/redglass/cursors/based_arrow_up
-lib/X11/icons/redglass/cursors/bottom_left_corner
-lib/X11/icons/redglass/cursors/bottom_right_corner
-lib/X11/icons/redglass/cursors/bottom_side
-lib/X11/icons/redglass/cursors/bottom_tee
-lib/X11/icons/redglass/cursors/center_ptr
-lib/X11/icons/redglass/cursors/circle
-lib/X11/icons/redglass/cursors/cross
-lib/X11/icons/redglass/cursors/cross_reverse
-lib/X11/icons/redglass/cursors/crosshair
-lib/X11/icons/redglass/cursors/dot
-lib/X11/icons/redglass/cursors/dotbox
-lib/X11/icons/redglass/cursors/double_arrow
-lib/X11/icons/redglass/cursors/draft_large
-lib/X11/icons/redglass/cursors/draft_small
-lib/X11/icons/redglass/cursors/draped_box
-lib/X11/icons/redglass/cursors/fleur
-lib/X11/icons/redglass/cursors/gumby
-lib/X11/icons/redglass/cursors/hand2
-lib/X11/icons/redglass/cursors/left_ptr
-lib/X11/icons/redglass/cursors/left_ptr_watch
-lib/X11/icons/redglass/cursors/left_side
-lib/X11/icons/redglass/cursors/left_tee
-lib/X11/icons/redglass/cursors/ll_angle
-lib/X11/icons/redglass/cursors/pencil
-lib/X11/icons/redglass/cursors/plus
-lib/X11/icons/redglass/cursors/right_ptr
-lib/X11/icons/redglass/cursors/right_side
-lib/X11/icons/redglass/cursors/right_tee
-lib/X11/icons/redglass/cursors/sb_h_double_arrow
-lib/X11/icons/redglass/cursors/sb_right_arrow
-lib/X11/icons/redglass/cursors/sb_up_arrow
-lib/X11/icons/redglass/cursors/sb_v_double_arrow
-lib/X11/icons/redglass/cursors/shuttle
-lib/X11/icons/redglass/cursors/tcross
-lib/X11/icons/redglass/cursors/top_left_arrow
-lib/X11/icons/redglass/cursors/top_left_corner
-lib/X11/icons/redglass/cursors/top_right_corner
-lib/X11/icons/redglass/cursors/top_side
-lib/X11/icons/redglass/cursors/top_tee
-lib/X11/icons/redglass/cursors/watch
-lib/X11/icons/redglass/cursors/xterm
-lib/X11/icons/whiteglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-lib/X11/icons/whiteglass/cursors/X_cursor
-lib/X11/icons/whiteglass/cursors/arrow
-lib/X11/icons/whiteglass/cursors/base_arrow_down
-lib/X11/icons/whiteglass/cursors/base_arrow_up
-lib/X11/icons/whiteglass/cursors/boat
-lib/X11/icons/whiteglass/cursors/bottom_left_corner
-lib/X11/icons/whiteglass/cursors/bottom_right_corner
-lib/X11/icons/whiteglass/cursors/bottom_side
-lib/X11/icons/whiteglass/cursors/bottom_tee
-lib/X11/icons/whiteglass/cursors/center_ptr
-lib/X11/icons/whiteglass/cursors/circle
-lib/X11/icons/whiteglass/cursors/cross
-lib/X11/icons/whiteglass/cursors/cross_reverse
-lib/X11/icons/whiteglass/cursors/crosshair
-lib/X11/icons/whiteglass/cursors/dot
-lib/X11/icons/whiteglass/cursors/dot_box_mask
-lib/X11/icons/whiteglass/cursors/double_arrow
-lib/X11/icons/whiteglass/cursors/draft_large
-lib/X11/icons/whiteglass/cursors/draft_small
-lib/X11/icons/whiteglass/cursors/draped_box
-lib/X11/icons/whiteglass/cursors/exchange
-lib/X11/icons/whiteglass/cursors/fleur
-lib/X11/icons/whiteglass/cursors/gumby
-lib/X11/icons/whiteglass/cursors/hand1
-lib/X11/icons/whiteglass/cursors/hand2
-lib/X11/icons/whiteglass/cursors/left_ptr
-lib/X11/icons/whiteglass/cursors/left_ptr_watch
-lib/X11/icons/whiteglass/cursors/left_side
-lib/X11/icons/whiteglass/cursors/left_tee
-lib/X11/icons/whiteglass/cursors/ll_angle
-lib/X11/icons/whiteglass/cursors/lr_angle
-lib/X11/icons/whiteglass/cursors/pencil
-lib/X11/icons/whiteglass/cursors/pirate
-lib/X11/icons/whiteglass/cursors/plus
-lib/X11/icons/whiteglass/cursors/question_arrow
-lib/X11/icons/whiteglass/cursors/right_ptr
-lib/X11/icons/whiteglass/cursors/right_side
-lib/X11/icons/whiteglass/cursors/right_tee
-lib/X11/icons/whiteglass/cursors/sailboat
-lib/X11/icons/whiteglass/cursors/sb_down_arrow
-lib/X11/icons/whiteglass/cursors/sb_h_double_arrow
-lib/X11/icons/whiteglass/cursors/sb_left_arrow
-lib/X11/icons/whiteglass/cursors/sb_right_arrow
-lib/X11/icons/whiteglass/cursors/sb_up_arrow
-lib/X11/icons/whiteglass/cursors/sb_v_double_arrow
-lib/X11/icons/whiteglass/cursors/shuttle
-lib/X11/icons/whiteglass/cursors/sizing
-lib/X11/icons/whiteglass/cursors/target
-lib/X11/icons/whiteglass/cursors/tcross
-lib/X11/icons/whiteglass/cursors/top_left_arrow
-lib/X11/icons/whiteglass/cursors/top_left_corner
-lib/X11/icons/whiteglass/cursors/top_right_corner
-lib/X11/icons/whiteglass/cursors/top_side
-lib/X11/icons/whiteglass/cursors/top_tee
-lib/X11/icons/whiteglass/cursors/trek
-lib/X11/icons/whiteglass/cursors/ul_angle
-lib/X11/icons/whiteglass/cursors/ur_angle
-lib/X11/icons/whiteglass/cursors/watch
-lib/X11/icons/whiteglass/cursors/xterm
-lib/X11/lbxproxy/AtomControl
-lib/X11/proxymngr/pmconfig
-lib/X11/rgb.txt
-lib/X11/rstart/commands/@List
-lib/X11/rstart/commands/ListContexts
-lib/X11/rstart/commands/ListGenericCommands
-lib/X11/rstart/commands/x
-lib/X11/rstart/commands/x11
-lib/X11/rstart/commands/x11r6/@List
-lib/X11/rstart/commands/x11r6/LoadMonitor
-lib/X11/rstart/commands/x11r6/Terminal
-lib/X11/rstart/config
-lib/X11/rstart/contexts/@List
-lib/X11/rstart/contexts/default
-lib/X11/rstart/contexts/x
-lib/X11/rstart/contexts/x11
-lib/X11/rstart/contexts/x11r6
-lib/X11/rstart/rstartd.real
-lib/X11/twm/system.twmrc
-lib/X11/x11perfcomp/fillblnk
-lib/X11/x11perfcomp/perfboth
-lib/X11/x11perfcomp/perfratio
-lib/X11/xdm/GiveConsole
-lib/X11/xdm/TakeConsole
-lib/X11/xdm/Xaccess
-lib/X11/xdm/Xresources
-lib/X11/xdm/Xservers
-lib/X11/xdm/Xsession
-lib/X11/xdm/Xwilling
-lib/X11/xdm/chooser
-lib/X11/xdm/pixmaps/XFree86.xpm
-lib/X11/xdm/pixmaps/XFree86bw.xpm
-lib/X11/xdm/xdm-config
-lib/X11/xedit/lisp/indent.lsp
-lib/X11/xedit/lisp/lisp.lsp
-lib/X11/xedit/lisp/progmodes/c.lsp
-lib/X11/xedit/lisp/progmodes/html.lsp
-lib/X11/xedit/lisp/progmodes/imake.lsp
-lib/X11/xedit/lisp/progmodes/lisp.lsp
-lib/X11/xedit/lisp/progmodes/make.lsp
-lib/X11/xedit/lisp/progmodes/man.lsp
-lib/X11/xedit/lisp/progmodes/rpm.lsp
-lib/X11/xedit/lisp/progmodes/sgml.lsp
-lib/X11/xedit/lisp/progmodes/sh.lsp
-lib/X11/xedit/lisp/progmodes/xconf.lsp
-lib/X11/xedit/lisp/progmodes/xlog.lsp
-lib/X11/xedit/lisp/progmodes/xrdb.lsp
-lib/X11/xedit/lisp/syntax.lsp
-lib/X11/xedit/lisp/xedit.lsp
-lib/X11/xinit/xinitrc
-lib/X11/xkb/README
-lib/X11/xkb/README.config
-lib/X11/xkb/README.enhancing
-lib/X11/xkb/compat.dir
-lib/X11/xkb/compat/README
-lib/X11/xkb/compat/accessx
-lib/X11/xkb/compat/basic
-lib/X11/xkb/compat/complete
-lib/X11/xkb/compat/default
-lib/X11/xkb/compat/group_led
-lib/X11/xkb/compat/iso9995
-lib/X11/xkb/compat/japan
-lib/X11/xkb/compat/keypad
-lib/X11/xkb/compat/leds
-lib/X11/xkb/compat/misc
-lib/X11/xkb/compat/mousekeys
-lib/X11/xkb/compat/norepeat
-lib/X11/xkb/compat/pc
-lib/X11/xkb/compat/pc98
-lib/X11/xkb/compat/xfree86
-lib/X11/xkb/compat/xtest
-lib/X11/xkb/compiled/README
-lib/X11/xkb/geometry.dir
-lib/X11/xkb/geometry/README
-lib/X11/xkb/geometry/amiga
-lib/X11/xkb/geometry/ataritt
-lib/X11/xkb/geometry/dell
-lib/X11/xkb/geometry/digital/lk
-lib/X11/xkb/geometry/digital/pc
-lib/X11/xkb/geometry/digital/unix
-lib/X11/xkb/geometry/everex
-lib/X11/xkb/geometry/fujitsu
-lib/X11/xkb/geometry/hp
-lib/X11/xkb/geometry/keytronic
-lib/X11/xkb/geometry/kinesis
-lib/X11/xkb/geometry/macintosh
-lib/X11/xkb/geometry/microsoft
-lib/X11/xkb/geometry/nec
-lib/X11/xkb/geometry/northgate
-lib/X11/xkb/geometry/pc
-lib/X11/xkb/geometry/sgi/O2
-lib/X11/xkb/geometry/sgi/indigo
-lib/X11/xkb/geometry/sgi/indy
-lib/X11/xkb/geometry/sony
-lib/X11/xkb/geometry/sun
-lib/X11/xkb/geometry/winbook
-lib/X11/xkb/keycodes.dir
-lib/X11/xkb/keycodes/README
-lib/X11/xkb/keycodes/aliases
-lib/X11/xkb/keycodes/amiga
-lib/X11/xkb/keycodes/ataritt
-lib/X11/xkb/keycodes/digital/lk
-lib/X11/xkb/keycodes/digital/pc
-lib/X11/xkb/keycodes/fujitsu
-lib/X11/xkb/keycodes/hp
-lib/X11/xkb/keycodes/ibm
-lib/X11/xkb/keycodes/macintosh
-lib/X11/xkb/keycodes/powerpcps2
-lib/X11/xkb/keycodes/sgi/indigo
-lib/X11/xkb/keycodes/sgi/indy
-lib/X11/xkb/keycodes/sgi/iris
-lib/X11/xkb/keycodes/sony
-lib/X11/xkb/keycodes/sun
-lib/X11/xkb/keycodes/xfree86
-lib/X11/xkb/keycodes/xfree98
-lib/X11/xkb/keymap.dir
-lib/X11/xkb/keymap/README
-lib/X11/xkb/keymap/amiga
-lib/X11/xkb/keymap/ataritt
-lib/X11/xkb/keymap/digital/us
-lib/X11/xkb/keymap/macintosh
-lib/X11/xkb/keymap/sgi/be
-lib/X11/xkb/keymap/sgi/bg
-lib/X11/xkb/keymap/sgi/ca
-lib/X11/xkb/keymap/sgi/cz
-lib/X11/xkb/keymap/sgi/cz_qwerty
-lib/X11/xkb/keymap/sgi/de
-lib/X11/xkb/keymap/sgi/de_CH
-lib/X11/xkb/keymap/sgi/dk
-lib/X11/xkb/keymap/sgi/dvorak
-lib/X11/xkb/keymap/sgi/en_US
-lib/X11/xkb/keymap/sgi/es
-lib/X11/xkb/keymap/sgi/fi
-lib/X11/xkb/keymap/sgi/fr
-lib/X11/xkb/keymap/sgi/fr_CH
-lib/X11/xkb/keymap/sgi/gb
-lib/X11/xkb/keymap/sgi/hu
-lib/X11/xkb/keymap/sgi/it
-lib/X11/xkb/keymap/sgi/jp
-lib/X11/xkb/keymap/sgi/no
-lib/X11/xkb/keymap/sgi/pl
-lib/X11/xkb/keymap/sgi/pt
-lib/X11/xkb/keymap/sgi/ru
-lib/X11/xkb/keymap/sgi/se
-lib/X11/xkb/keymap/sgi/sk
-lib/X11/xkb/keymap/sgi/sk_qwerty
-lib/X11/xkb/keymap/sgi/th
-lib/X11/xkb/keymap/sgi/us
-lib/X11/xkb/keymap/sony
-lib/X11/xkb/keymap/sun/de
-lib/X11/xkb/keymap/sun/es
-lib/X11/xkb/keymap/sun/fi
-lib/X11/xkb/keymap/sun/fr
-lib/X11/xkb/keymap/sun/no
-lib/X11/xkb/keymap/sun/pl
-lib/X11/xkb/keymap/sun/ru
-lib/X11/xkb/keymap/sun/se
-lib/X11/xkb/keymap/sun/uk
-lib/X11/xkb/keymap/sun/us
-lib/X11/xkb/keymap/xfree86
-lib/X11/xkb/keymap/xfree98
-lib/X11/xkb/rules/README
-lib/X11/xkb/rules/sgi
-lib/X11/xkb/rules/sgi.lst
-lib/X11/xkb/rules/sun
-lib/X11/xkb/rules/sun.lst
-lib/X11/xkb/rules/xfree86
-lib/X11/xkb/rules/xfree86-it.lst
-lib/X11/xkb/rules/xfree86.lst
-lib/X11/xkb/rules/xfree86.xml
-lib/X11/xkb/semantics/basic
-lib/X11/xkb/semantics/complete
-lib/X11/xkb/semantics/default
-lib/X11/xkb/semantics/xtest
-lib/X11/xkb/symbols.dir
-lib/X11/xkb/symbols/README
-lib/X11/xkb/symbols/al
-lib/X11/xkb/symbols/altwin
-lib/X11/xkb/symbols/am
-lib/X11/xkb/symbols/ar
-lib/X11/xkb/symbols/az
-lib/X11/xkb/symbols/be
-lib/X11/xkb/symbols/ben
-lib/X11/xkb/symbols/bg
-lib/X11/xkb/symbols/br
-lib/X11/xkb/symbols/bs
-lib/X11/xkb/symbols/by
-lib/X11/xkb/symbols/ca
-lib/X11/xkb/symbols/ca_enhanced
-lib/X11/xkb/symbols/compose
-lib/X11/xkb/symbols/ctrl
-lib/X11/xkb/symbols/cz
-lib/X11/xkb/symbols/cz_qwerty
-lib/X11/xkb/symbols/czsk
-lib/X11/xkb/symbols/de
-lib/X11/xkb/symbols/de_CH
-lib/X11/xkb/symbols/dev
-lib/X11/xkb/symbols/digital/lk
-lib/X11/xkb/symbols/digital/pc
-lib/X11/xkb/symbols/digital/us
-lib/X11/xkb/symbols/digital/vt
-lib/X11/xkb/symbols/dk
-lib/X11/xkb/symbols/dvorak
-lib/X11/xkb/symbols/ee
-lib/X11/xkb/symbols/el
-lib/X11/xkb/symbols/en_US
-lib/X11/xkb/symbols/es
-lib/X11/xkb/symbols/fi
-lib/X11/xkb/symbols/fr
-lib/X11/xkb/symbols/fr_CH
-lib/X11/xkb/symbols/fujitsu/jp
-lib/X11/xkb/symbols/fujitsu/us
-lib/X11/xkb/symbols/gb
-lib/X11/xkb/symbols/ge_la
-lib/X11/xkb/symbols/ge_ru
-lib/X11/xkb/symbols/group
-lib/X11/xkb/symbols/guj
-lib/X11/xkb/symbols/gur
-lib/X11/xkb/symbols/hp/us
-lib/X11/xkb/symbols/hr
-lib/X11/xkb/symbols/hu
-lib/X11/xkb/symbols/hu_US
-lib/X11/xkb/symbols/hu_qwerty
-lib/X11/xkb/symbols/ie
-lib/X11/xkb/symbols/il
-lib/X11/xkb/symbols/il_phonetic
-lib/X11/xkb/symbols/inet
-lib/X11/xkb/symbols/ir
-lib/X11/xkb/symbols/is
-lib/X11/xkb/symbols/iso9995-3
-lib/X11/xkb/symbols/it
-lib/X11/xkb/symbols/iu
-lib/X11/xkb/symbols/jp
-lib/X11/xkb/symbols/kan
-lib/X11/xkb/symbols/keypad
-lib/X11/xkb/symbols/la
-lib/X11/xkb/symbols/level3
-lib/X11/xkb/symbols/lo
-lib/X11/xkb/symbols/lock
-lib/X11/xkb/symbols/lt
-lib/X11/xkb/symbols/lt_std
-lib/X11/xkb/symbols/lv
-lib/X11/xkb/symbols/macintosh/de
-lib/X11/xkb/symbols/macintosh/de_CH
-lib/X11/xkb/symbols/macintosh/dk
-lib/X11/xkb/symbols/macintosh/es
-lib/X11/xkb/symbols/macintosh/fi
-lib/X11/xkb/symbols/macintosh/fr
-lib/X11/xkb/symbols/macintosh/fr_CH
-lib/X11/xkb/symbols/macintosh/gb
-lib/X11/xkb/symbols/macintosh/it
-lib/X11/xkb/symbols/macintosh/nl
-lib/X11/xkb/symbols/macintosh/no
-lib/X11/xkb/symbols/macintosh/pt
-lib/X11/xkb/symbols/macintosh/se
-lib/X11/xkb/symbols/macintosh/us
-lib/X11/xkb/symbols/mk
-lib/X11/xkb/symbols/ml
-lib/X11/xkb/symbols/mm
-lib/X11/xkb/symbols/mt
-lib/X11/xkb/symbols/mt_us
-lib/X11/xkb/symbols/nec/jp
-lib/X11/xkb/symbols/nl
-lib/X11/xkb/symbols/no
-lib/X11/xkb/symbols/ogham
-lib/X11/xkb/symbols/ori
-lib/X11/xkb/symbols/pc/al
-lib/X11/xkb/symbols/pc/am
-lib/X11/xkb/symbols/pc/ar
-lib/X11/xkb/symbols/pc/be
-lib/X11/xkb/symbols/pc/ben
-lib/X11/xkb/symbols/pc/bg
-lib/X11/xkb/symbols/pc/br
-lib/X11/xkb/symbols/pc/by
-lib/X11/xkb/symbols/pc/cz
-lib/X11/xkb/symbols/pc/cz_qwerty
-lib/X11/xkb/symbols/pc/de
-lib/X11/xkb/symbols/pc/dev
-lib/X11/xkb/symbols/pc/dk
-lib/X11/xkb/symbols/pc/dvorak
-lib/X11/xkb/symbols/pc/ee
-lib/X11/xkb/symbols/pc/el
-lib/X11/xkb/symbols/pc/en_US
-lib/X11/xkb/symbols/pc/es
-lib/X11/xkb/symbols/pc/fi
-lib/X11/xkb/symbols/pc/fr
-lib/X11/xkb/symbols/pc/fr-latin9
-lib/X11/xkb/symbols/pc/gb
-lib/X11/xkb/symbols/pc/ge_la
-lib/X11/xkb/symbols/pc/ge_ru
-lib/X11/xkb/symbols/pc/guj
-lib/X11/xkb/symbols/pc/gur
-lib/X11/xkb/symbols/pc/hr
-lib/X11/xkb/symbols/pc/ie
-lib/X11/xkb/symbols/pc/il
-lib/X11/xkb/symbols/pc/il_phonetic
-lib/X11/xkb/symbols/pc/ir
-lib/X11/xkb/symbols/pc/is
-lib/X11/xkb/symbols/pc/it
-lib/X11/xkb/symbols/pc/iu
-lib/X11/xkb/symbols/pc/kan
-lib/X11/xkb/symbols/pc/la
-lib/X11/xkb/symbols/pc/latin
-lib/X11/xkb/symbols/pc/lo
-lib/X11/xkb/symbols/pc/lt
-lib/X11/xkb/symbols/pc/lv
-lib/X11/xkb/symbols/pc/mk
-lib/X11/xkb/symbols/pc/ml
-lib/X11/xkb/symbols/pc/mm
-lib/X11/xkb/symbols/pc/mt
-lib/X11/xkb/symbols/pc/mt_us
-lib/X11/xkb/symbols/pc/nl
-lib/X11/xkb/symbols/pc/no
-lib/X11/xkb/symbols/pc/ogham
-lib/X11/xkb/symbols/pc/ori
-lib/X11/xkb/symbols/pc/pc
-lib/X11/xkb/symbols/pc/pl
-lib/X11/xkb/symbols/pc/pl2
-lib/X11/xkb/symbols/pc/pt
-lib/X11/xkb/symbols/pc/ro
-lib/X11/xkb/symbols/pc/ru
-lib/X11/xkb/symbols/pc/sapmi
-lib/X11/xkb/symbols/pc/se
-lib/X11/xkb/symbols/pc/si
-lib/X11/xkb/symbols/pc/sk
-lib/X11/xkb/symbols/pc/sk_qwerty
-lib/X11/xkb/symbols/pc/sr
-lib/X11/xkb/symbols/pc/syr
-lib/X11/xkb/symbols/pc/syr_phonetic
-lib/X11/xkb/symbols/pc/tel
-lib/X11/xkb/symbols/pc/th
-lib/X11/xkb/symbols/pc/tj
-lib/X11/xkb/symbols/pc/tml
-lib/X11/xkb/symbols/pc/tr
-lib/X11/xkb/symbols/pc/ua
-lib/X11/xkb/symbols/pc/us
-lib/X11/xkb/symbols/pc/yu
-lib/X11/xkb/symbols/pl
-lib/X11/xkb/symbols/pl2
-lib/X11/xkb/symbols/pt
-lib/X11/xkb/symbols/ralt
-lib/X11/xkb/symbols/ro
-lib/X11/xkb/symbols/ru
-lib/X11/xkb/symbols/ru_yawerty
-lib/X11/xkb/symbols/sapmi
-lib/X11/xkb/symbols/se
-lib/X11/xkb/symbols/se_FI
-lib/X11/xkb/symbols/se_NO
-lib/X11/xkb/symbols/se_SE
-lib/X11/xkb/symbols/sgi/jp
-lib/X11/xkb/symbols/si
-lib/X11/xkb/symbols/sk
-lib/X11/xkb/symbols/sk_qwerty
-lib/X11/xkb/symbols/sony/us
-lib/X11/xkb/symbols/sr
-lib/X11/xkb/symbols/srvr_ctrl
-lib/X11/xkb/symbols/sun/se
-lib/X11/xkb/symbols/sun/us
-lib/X11/xkb/symbols/syr
-lib/X11/xkb/symbols/syr_phonetic
-lib/X11/xkb/symbols/tel
-lib/X11/xkb/symbols/th
-lib/X11/xkb/symbols/tj
-lib/X11/xkb/symbols/tml
-lib/X11/xkb/symbols/tr
-lib/X11/xkb/symbols/tr_f
-lib/X11/xkb/symbols/ua
-lib/X11/xkb/symbols/us
-lib/X11/xkb/symbols/us_group2
-lib/X11/xkb/symbols/us_group3
-lib/X11/xkb/symbols/us_intl
-lib/X11/xkb/symbols/vn
-lib/X11/xkb/symbols/xfree68/amiga
-lib/X11/xkb/symbols/xfree68/ataritt
-lib/X11/xkb/symbols/yu
-lib/X11/xkb/types.dir
-lib/X11/xkb/types/README
-lib/X11/xkb/types/basic
-lib/X11/xkb/types/caps
-lib/X11/xkb/types/complete
-lib/X11/xkb/types/default
-lib/X11/xkb/types/extra
-lib/X11/xkb/types/iso9995
-lib/X11/xkb/types/mousekeys
-lib/X11/xkb/types/pc
-lib/X11/xkb/xkbcomp
-lib/X11/xman.help
-lib/X11/xsm/system.xsm
-${IMAKE_MAN_DIR}/Xmark.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/appres.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/atobm.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/bdftopcf.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/beforelight.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/bitmap.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/bmtoa.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/cxpm.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/dga.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/dpsexec.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/dpsinfo.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/editres.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/fslsfonts.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/fstobdf.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/glxgears.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/glxinfo.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/iceauth.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/ico.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/lbxproxy.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/listres.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/luit.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/makepsres.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/mkcfm.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/mkfontdir.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/mkfontscale.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/oclock.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/proxymngr.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/resize.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/rstart.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/rstartd.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/sessreg.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/setxkbmap.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/showfont.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/showrgb.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/smproxy.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/startx.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/sxpm.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/texteroids.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/twm.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/viewres.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/x11perf.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/x11perfcomp.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xauth.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xbiff.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xcalc.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xclipboard.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xclock.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xcmsdb.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xconsole.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xcursorgen.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xcutsel.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xditview.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xdm.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xdpyinfo.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xedit.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xev.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xeyes.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xfd.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xfindproxy.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xfontsel.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xfsinfo.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xfwp.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xgamma.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xgc.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xhost.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xinit.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xkbcomp.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xkbevd.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xkbprint.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xkill.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xload.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xlogo.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xlsatoms.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xlsclients.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xlsfonts.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xmag.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xman.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xmessage.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xmh.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xmodmap.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xon.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xprop.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xrandr.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xrdb.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xrefresh.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xset.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xsetmode.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xsetpointer.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xsetroot.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xsm.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xstdcmap.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xterm.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xtrap.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xtrapchar.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xtrapin.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xtrapinfo.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xtrapout.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xtrapproto.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xtrapreset.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xtrapstats.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xvidtune.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xvinfo.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xwd.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xwininfo.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/xwud.${IMAKE_MAN_SUFFIX}
-@dirrm lib/X11/icons/whiteglass/cursors
-@dirrm lib/X11/icons/whiteglass
-@dirrm lib/X11/icons/redglass/cursors
-@dirrm lib/X11/icons/redglass
-@dirrm lib/X11/icons/handhelds/cursors
-@dirrm lib/X11/icons/handhelds
-@dirrm lib/X11/icons/default
-@dirrm lib/X11/icons
-@dirrm lib/X11/xkb/types
-@dirrm lib/X11/xkb/symbols/xfree68
-@dirrm lib/X11/xkb/symbols/sgi
-@dirrm lib/X11/xkb/symbols/pc
-@dirrm lib/X11/xkb/symbols/macintosh
-@dirrm lib/X11/xkb/symbols/hp
-@dirrm lib/X11/xedit/lisp/progmodes
-@dirrm lib/X11/xedit/lisp
-@dirrm lib/X11/xedit
-@dirrm lib/X11/xdm/pixmaps
-@dirrm lib/X11/fonts/util
+@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:16:07 xtraeme Exp $
+X11R6/bin/Xmark
+X11R6/bin/appres
+X11R6/bin/atobm
+X11R6/bin/bdftopcf
+X11R6/bin/bdftruncate
+X11R6/bin/beforelight
+X11R6/bin/bitmap
+X11R6/bin/bmtoa
+X11R6/bin/cxpm
+X11R6/bin/dga
+X11R6/bin/dpsexec
+X11R6/bin/dpsinfo
+X11R6/bin/editres
+X11R6/bin/fslsfonts
+X11R6/bin/fstobdf
+X11R6/bin/glxgears
+X11R6/bin/glxinfo
+X11R6/bin/iceauth
+X11R6/bin/ico
+X11R6/bin/lbxproxy
+X11R6/bin/listres
+X11R6/bin/luit
+X11R6/bin/makepsres
+X11R6/bin/mkcfm
+X11R6/bin/mkfontdir
+X11R6/bin/mkfontscale
+X11R6/bin/oclock
+X11R6/bin/proxymngr
+X11R6/bin/resize
+X11R6/bin/rstart
+X11R6/bin/rstartd
+X11R6/bin/sessreg
+X11R6/bin/setxkbmap
+X11R6/bin/showfont
+X11R6/bin/showrgb
+X11R6/bin/smproxy
+X11R6/bin/startx
+X11R6/bin/sxpm
+X11R6/bin/texteroids
+X11R6/bin/twm
+X11R6/bin/ucs2any
+X11R6/bin/uxterm
+X11R6/bin/viewres
+X11R6/bin/x11perf
+X11R6/bin/x11perfcomp
+X11R6/bin/xauth
+X11R6/bin/xbiff
+X11R6/bin/xcalc
+X11R6/bin/xclipboard
+X11R6/bin/xclock
+X11R6/bin/xcmsdb
+X11R6/bin/xconsole
+X11R6/bin/xcursorgen
+X11R6/bin/xcutsel
+X11R6/bin/xditview
+X11R6/bin/xdm
+X11R6/bin/xdpyinfo
+X11R6/bin/xedit
+X11R6/bin/xev
+X11R6/bin/xeyes
+X11R6/bin/xfd
+X11R6/bin/xfindproxy
+X11R6/bin/xfontsel
+X11R6/bin/xfsinfo
+X11R6/bin/xfwp
+X11R6/bin/xgamma
+X11R6/bin/xgc
+X11R6/bin/xhost
+X11R6/bin/xinit
+X11R6/bin/xkbbell
+X11R6/bin/xkbcomp
+X11R6/bin/xkbevd
+X11R6/bin/xkbprint
+X11R6/bin/xkbvleds
+X11R6/bin/xkbwatch
+X11R6/bin/xkill
+X11R6/bin/xload
+X11R6/bin/xlogo
+X11R6/bin/xlsatoms
+X11R6/bin/xlsclients
+X11R6/bin/xlsfonts
+X11R6/bin/xmag
+X11R6/bin/xman
+X11R6/bin/xmessage
+X11R6/bin/xmh
+X11R6/bin/xmodmap
+X11R6/bin/xon
+X11R6/bin/xprop
+X11R6/bin/xrandr
+X11R6/bin/xrdb
+X11R6/bin/xrefresh
+X11R6/bin/xset
+X11R6/bin/xsetmode
+X11R6/bin/xsetpointer
+X11R6/bin/xsetroot
+X11R6/bin/xsm
+X11R6/bin/xstdcmap
+X11R6/bin/xterm
+X11R6/bin/xtrapchar
+X11R6/bin/xtrapin
+X11R6/bin/xtrapinfo
+X11R6/bin/xtrapout
+X11R6/bin/xtrapproto
+X11R6/bin/xtrapreset
+X11R6/bin/xtrapstats
+X11R6/bin/xvidtune
+X11R6/bin/xvinfo
+X11R6/bin/xwd
+X11R6/bin/xwininfo
+X11R6/bin/xwud
+X11R6/include/X11/PM/PM.h
+X11R6/include/X11/PM/PMproto.h
+X11R6/include/X11/bitmaps/Dashes
+X11R6/include/X11/bitmaps/Down
+X11R6/include/X11/bitmaps/Excl
+X11R6/include/X11/bitmaps/FlipHoriz
+X11R6/include/X11/bitmaps/FlipVert
+X11R6/include/X11/bitmaps/Fold
+X11R6/include/X11/bitmaps/Left
+X11R6/include/X11/bitmaps/Right
+X11R6/include/X11/bitmaps/RotateLeft
+X11R6/include/X11/bitmaps/RotateRight
+X11R6/include/X11/bitmaps/Stipple
+X11R6/include/X11/bitmaps/Term
+X11R6/include/X11/bitmaps/Up
+X11R6/include/X11/bitmaps/black6
+X11R6/include/X11/bitmaps/box6
+X11R6/include/X11/bitmaps/ldblarrow
+X11R6/include/X11/bitmaps/rdblarrow
+X11R6/lib/X11/app-defaults/Beforelight
+X11R6/lib/X11/app-defaults/Bitmap
+X11R6/lib/X11/app-defaults/Bitmap-color
+X11R6/lib/X11/app-defaults/Chooser
+X11R6/lib/X11/app-defaults/Clock-color
+X11R6/lib/X11/app-defaults/Editres
+X11R6/lib/X11/app-defaults/Editres-color
+X11R6/lib/X11/app-defaults/UXTerm
+X11R6/lib/X11/app-defaults/Viewres
+X11R6/lib/X11/app-defaults/XCalc
+X11R6/lib/X11/app-defaults/XCalc-color
+X11R6/lib/X11/app-defaults/XClipboard
+X11R6/lib/X11/app-defaults/XClock
+X11R6/lib/X11/app-defaults/XConsole
+X11R6/lib/X11/app-defaults/XFontSel
+X11R6/lib/X11/app-defaults/XLoad
+X11R6/lib/X11/app-defaults/XLogo
+X11R6/lib/X11/app-defaults/XLogo-color
+X11R6/lib/X11/app-defaults/XSm
+X11R6/lib/X11/app-defaults/XTerm
+X11R6/lib/X11/app-defaults/XTerm-color
+X11R6/lib/X11/app-defaults/Xditview
+X11R6/lib/X11/app-defaults/Xditview-chrtr
+X11R6/lib/X11/app-defaults/Xedit
+X11R6/lib/X11/app-defaults/Xedit-color
+X11R6/lib/X11/app-defaults/Xfd
+X11R6/lib/X11/app-defaults/Xgc
+X11R6/lib/X11/app-defaults/Xmag
+X11R6/lib/X11/app-defaults/Xman
+X11R6/lib/X11/app-defaults/Xmessage
+X11R6/lib/X11/app-defaults/Xmessage-color
+X11R6/lib/X11/app-defaults/Xmh
+X11R6/lib/X11/app-defaults/Xvidtune
+X11R6/lib/X11/etc/xterm.termcap
+X11R6/lib/X11/etc/xterm.terminfo
+X11R6/lib/X11/fonts/util/map-ISO8859-1
+X11R6/lib/X11/fonts/util/map-ISO8859-10
+X11R6/lib/X11/fonts/util/map-ISO8859-11
+X11R6/lib/X11/fonts/util/map-ISO8859-13
+X11R6/lib/X11/fonts/util/map-ISO8859-14
+X11R6/lib/X11/fonts/util/map-ISO8859-15
+X11R6/lib/X11/fonts/util/map-ISO8859-16
+X11R6/lib/X11/fonts/util/map-ISO8859-2
+X11R6/lib/X11/fonts/util/map-ISO8859-3
+X11R6/lib/X11/fonts/util/map-ISO8859-4
+X11R6/lib/X11/fonts/util/map-ISO8859-5
+X11R6/lib/X11/fonts/util/map-ISO8859-7
+X11R6/lib/X11/fonts/util/map-ISO8859-8
+X11R6/lib/X11/fonts/util/map-ISO8859-9
+X11R6/lib/X11/fonts/util/map-JISX0201.1976-0
+X11R6/lib/X11/fonts/util/map-KOI8-R
+X11R6/lib/X11/icons/default/index.theme
+X11R6/lib/X11/icons/handhelds/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+X11R6/lib/X11/icons/handhelds/cursors/X_cursor
+X11R6/lib/X11/icons/handhelds/cursors/arrow
+X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
+X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
+X11R6/lib/X11/icons/handhelds/cursors/bottom_left_corner
+X11R6/lib/X11/icons/handhelds/cursors/bottom_right_corner
+X11R6/lib/X11/icons/handhelds/cursors/bottom_side
+X11R6/lib/X11/icons/handhelds/cursors/bottom_tee
+X11R6/lib/X11/icons/handhelds/cursors/center_ptr
+X11R6/lib/X11/icons/handhelds/cursors/circle
+X11R6/lib/X11/icons/handhelds/cursors/cross
+X11R6/lib/X11/icons/handhelds/cursors/cross_reverse
+X11R6/lib/X11/icons/handhelds/cursors/crosshair
+X11R6/lib/X11/icons/handhelds/cursors/dot
+X11R6/lib/X11/icons/handhelds/cursors/dotbox
+X11R6/lib/X11/icons/handhelds/cursors/double_arrow
+X11R6/lib/X11/icons/handhelds/cursors/draft_large
+X11R6/lib/X11/icons/handhelds/cursors/draft_small
+X11R6/lib/X11/icons/handhelds/cursors/draped_box
+X11R6/lib/X11/icons/handhelds/cursors/fleur
+X11R6/lib/X11/icons/handhelds/cursors/gumby
+X11R6/lib/X11/icons/handhelds/cursors/hand2
+X11R6/lib/X11/icons/handhelds/cursors/left_ptr
+X11R6/lib/X11/icons/handhelds/cursors/left_ptr_watch
+X11R6/lib/X11/icons/handhelds/cursors/left_side
+X11R6/lib/X11/icons/handhelds/cursors/left_tee
+X11R6/lib/X11/icons/handhelds/cursors/ll_angle
+X11R6/lib/X11/icons/handhelds/cursors/pencil
+X11R6/lib/X11/icons/handhelds/cursors/plus
+X11R6/lib/X11/icons/handhelds/cursors/right_ptr
+X11R6/lib/X11/icons/handhelds/cursors/right_side
+X11R6/lib/X11/icons/handhelds/cursors/right_tee
+X11R6/lib/X11/icons/handhelds/cursors/sb_h_double_arrow
+X11R6/lib/X11/icons/handhelds/cursors/sb_right_arrow
+X11R6/lib/X11/icons/handhelds/cursors/sb_up_arrow
+X11R6/lib/X11/icons/handhelds/cursors/sb_v_double_arrow
+X11R6/lib/X11/icons/handhelds/cursors/shuttle
+X11R6/lib/X11/icons/handhelds/cursors/tcross
+X11R6/lib/X11/icons/handhelds/cursors/top_left_arrow
+X11R6/lib/X11/icons/handhelds/cursors/top_left_corner
+X11R6/lib/X11/icons/handhelds/cursors/top_right_corner
+X11R6/lib/X11/icons/handhelds/cursors/top_side
+X11R6/lib/X11/icons/handhelds/cursors/top_tee
+X11R6/lib/X11/icons/handhelds/cursors/watch
+X11R6/lib/X11/icons/handhelds/cursors/xterm
+X11R6/lib/X11/icons/redglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+X11R6/lib/X11/icons/redglass/cursors/X_cursor
+X11R6/lib/X11/icons/redglass/cursors/arrow
+X11R6/lib/X11/icons/redglass/cursors/based_arrow_down
+X11R6/lib/X11/icons/redglass/cursors/based_arrow_up
+X11R6/lib/X11/icons/redglass/cursors/bottom_left_corner
+X11R6/lib/X11/icons/redglass/cursors/bottom_right_corner
+X11R6/lib/X11/icons/redglass/cursors/bottom_side
+X11R6/lib/X11/icons/redglass/cursors/bottom_tee
+X11R6/lib/X11/icons/redglass/cursors/center_ptr
+X11R6/lib/X11/icons/redglass/cursors/circle
+X11R6/lib/X11/icons/redglass/cursors/cross
+X11R6/lib/X11/icons/redglass/cursors/cross_reverse
+X11R6/lib/X11/icons/redglass/cursors/crosshair
+X11R6/lib/X11/icons/redglass/cursors/dot
+X11R6/lib/X11/icons/redglass/cursors/dotbox
+X11R6/lib/X11/icons/redglass/cursors/double_arrow
+X11R6/lib/X11/icons/redglass/cursors/draft_large
+X11R6/lib/X11/icons/redglass/cursors/draft_small
+X11R6/lib/X11/icons/redglass/cursors/draped_box
+X11R6/lib/X11/icons/redglass/cursors/fleur
+X11R6/lib/X11/icons/redglass/cursors/gumby
+X11R6/lib/X11/icons/redglass/cursors/hand2
+X11R6/lib/X11/icons/redglass/cursors/left_ptr
+X11R6/lib/X11/icons/redglass/cursors/left_ptr_watch
+X11R6/lib/X11/icons/redglass/cursors/left_side
+X11R6/lib/X11/icons/redglass/cursors/left_tee
+X11R6/lib/X11/icons/redglass/cursors/ll_angle
+X11R6/lib/X11/icons/redglass/cursors/pencil
+X11R6/lib/X11/icons/redglass/cursors/plus
+X11R6/lib/X11/icons/redglass/cursors/right_ptr
+X11R6/lib/X11/icons/redglass/cursors/right_side
+X11R6/lib/X11/icons/redglass/cursors/right_tee
+X11R6/lib/X11/icons/redglass/cursors/sb_h_double_arrow
+X11R6/lib/X11/icons/redglass/cursors/sb_right_arrow
+X11R6/lib/X11/icons/redglass/cursors/sb_up_arrow
+X11R6/lib/X11/icons/redglass/cursors/sb_v_double_arrow
+X11R6/lib/X11/icons/redglass/cursors/shuttle
+X11R6/lib/X11/icons/redglass/cursors/tcross
+X11R6/lib/X11/icons/redglass/cursors/top_left_arrow
+X11R6/lib/X11/icons/redglass/cursors/top_left_corner
+X11R6/lib/X11/icons/redglass/cursors/top_right_corner
+X11R6/lib/X11/icons/redglass/cursors/top_side
+X11R6/lib/X11/icons/redglass/cursors/top_tee
+X11R6/lib/X11/icons/redglass/cursors/watch
+X11R6/lib/X11/icons/redglass/cursors/xterm
+X11R6/lib/X11/icons/whiteglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+X11R6/lib/X11/icons/whiteglass/cursors/X_cursor
+X11R6/lib/X11/icons/whiteglass/cursors/arrow
+X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_down
+X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_up
+X11R6/lib/X11/icons/whiteglass/cursors/boat
+X11R6/lib/X11/icons/whiteglass/cursors/bottom_left_corner
+X11R6/lib/X11/icons/whiteglass/cursors/bottom_right_corner
+X11R6/lib/X11/icons/whiteglass/cursors/bottom_side
+X11R6/lib/X11/icons/whiteglass/cursors/bottom_tee
+X11R6/lib/X11/icons/whiteglass/cursors/center_ptr
+X11R6/lib/X11/icons/whiteglass/cursors/circle
+X11R6/lib/X11/icons/whiteglass/cursors/cross
+X11R6/lib/X11/icons/whiteglass/cursors/cross_reverse
+X11R6/lib/X11/icons/whiteglass/cursors/crosshair
+X11R6/lib/X11/icons/whiteglass/cursors/dot
+X11R6/lib/X11/icons/whiteglass/cursors/dot_box_mask
+X11R6/lib/X11/icons/whiteglass/cursors/double_arrow
+X11R6/lib/X11/icons/whiteglass/cursors/draft_large
+X11R6/lib/X11/icons/whiteglass/cursors/draft_small
+X11R6/lib/X11/icons/whiteglass/cursors/draped_box
+X11R6/lib/X11/icons/whiteglass/cursors/exchange
+X11R6/lib/X11/icons/whiteglass/cursors/fleur
+X11R6/lib/X11/icons/whiteglass/cursors/gumby
+X11R6/lib/X11/icons/whiteglass/cursors/hand1
+X11R6/lib/X11/icons/whiteglass/cursors/hand2
+X11R6/lib/X11/icons/whiteglass/cursors/left_ptr
+X11R6/lib/X11/icons/whiteglass/cursors/left_ptr_watch
+X11R6/lib/X11/icons/whiteglass/cursors/left_side
+X11R6/lib/X11/icons/whiteglass/cursors/left_tee
+X11R6/lib/X11/icons/whiteglass/cursors/ll_angle
+X11R6/lib/X11/icons/whiteglass/cursors/lr_angle
+X11R6/lib/X11/icons/whiteglass/cursors/pencil
+X11R6/lib/X11/icons/whiteglass/cursors/pirate
+X11R6/lib/X11/icons/whiteglass/cursors/plus
+X11R6/lib/X11/icons/whiteglass/cursors/question_arrow
+X11R6/lib/X11/icons/whiteglass/cursors/right_ptr
+X11R6/lib/X11/icons/whiteglass/cursors/right_side
+X11R6/lib/X11/icons/whiteglass/cursors/right_tee
+X11R6/lib/X11/icons/whiteglass/cursors/sailboat
+X11R6/lib/X11/icons/whiteglass/cursors/sb_down_arrow
+X11R6/lib/X11/icons/whiteglass/cursors/sb_h_double_arrow
+X11R6/lib/X11/icons/whiteglass/cursors/sb_left_arrow
+X11R6/lib/X11/icons/whiteglass/cursors/sb_right_arrow
+X11R6/lib/X11/icons/whiteglass/cursors/sb_up_arrow
+X11R6/lib/X11/icons/whiteglass/cursors/sb_v_double_arrow
+X11R6/lib/X11/icons/whiteglass/cursors/shuttle
+X11R6/lib/X11/icons/whiteglass/cursors/sizing
+X11R6/lib/X11/icons/whiteglass/cursors/target
+X11R6/lib/X11/icons/whiteglass/cursors/tcross
+X11R6/lib/X11/icons/whiteglass/cursors/top_left_arrow
+X11R6/lib/X11/icons/whiteglass/cursors/top_left_corner
+X11R6/lib/X11/icons/whiteglass/cursors/top_right_corner
+X11R6/lib/X11/icons/whiteglass/cursors/top_side
+X11R6/lib/X11/icons/whiteglass/cursors/top_tee
+X11R6/lib/X11/icons/whiteglass/cursors/trek
+X11R6/lib/X11/icons/whiteglass/cursors/ul_angle
+X11R6/lib/X11/icons/whiteglass/cursors/ur_angle
+X11R6/lib/X11/icons/whiteglass/cursors/watch
+X11R6/lib/X11/icons/whiteglass/cursors/xterm
+X11R6/lib/X11/lbxproxy/AtomControl
+X11R6/lib/X11/proxymngr/pmconfig
+X11R6/lib/X11/rgb.txt
+X11R6/lib/X11/rstart/commands/@List
+X11R6/lib/X11/rstart/commands/ListContexts
+X11R6/lib/X11/rstart/commands/ListGenericCommands
+X11R6/lib/X11/rstart/commands/x
+X11R6/lib/X11/rstart/commands/x11
+X11R6/lib/X11/rstart/commands/x11r6/@List
+X11R6/lib/X11/rstart/commands/x11r6/LoadMonitor
+X11R6/lib/X11/rstart/commands/x11r6/Terminal
+X11R6/lib/X11/rstart/config
+X11R6/lib/X11/rstart/contexts/@List
+X11R6/lib/X11/rstart/contexts/default
+X11R6/lib/X11/rstart/contexts/x
+X11R6/lib/X11/rstart/contexts/x11
+X11R6/lib/X11/rstart/contexts/x11r6
+X11R6/lib/X11/rstart/rstartd.real
+X11R6/lib/X11/twm/system.twmrc
+X11R6/lib/X11/x11perfcomp/fillblnk
+X11R6/lib/X11/x11perfcomp/perfboth
+X11R6/lib/X11/x11perfcomp/perfratio
+X11R6/lib/X11/xdm/GiveConsole
+X11R6/lib/X11/xdm/TakeConsole
+X11R6/lib/X11/xdm/Xaccess
+X11R6/lib/X11/xdm/Xresources
+X11R6/lib/X11/xdm/Xservers
+X11R6/lib/X11/xdm/Xsession
+X11R6/lib/X11/xdm/Xsetup_0
+X11R6/lib/X11/xdm/Xwilling
+X11R6/lib/X11/xdm/chooser
+X11R6/lib/X11/xdm/pixmaps/XFree86.xpm
+X11R6/lib/X11/xdm/pixmaps/XFree86bw.xpm
+X11R6/lib/X11/xdm/xdm-config
+X11R6/lib/X11/xedit/lisp/indent.lsp
+X11R6/lib/X11/xedit/lisp/lisp.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/c.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/html.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/imake.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/lisp.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/make.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/man.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/rpm.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/sgml.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/sh.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/xconf.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/xlog.lsp
+X11R6/lib/X11/xedit/lisp/progmodes/xrdb.lsp
+X11R6/lib/X11/xedit/lisp/syntax.lsp
+X11R6/lib/X11/xedit/lisp/xedit.lsp
+X11R6/lib/X11/xinit/xinitrc
+X11R6/lib/X11/xkb/README
+X11R6/lib/X11/xkb/README.config
+X11R6/lib/X11/xkb/README.enhancing
+X11R6/lib/X11/xkb/compat.dir
+X11R6/lib/X11/xkb/compat/README
+X11R6/lib/X11/xkb/compat/accessx
+X11R6/lib/X11/xkb/compat/basic
+X11R6/lib/X11/xkb/compat/complete
+X11R6/lib/X11/xkb/compat/default
+X11R6/lib/X11/xkb/compat/group_led
+X11R6/lib/X11/xkb/compat/iso9995
+X11R6/lib/X11/xkb/compat/japan
+X11R6/lib/X11/xkb/compat/keypad
+X11R6/lib/X11/xkb/compat/leds
+X11R6/lib/X11/xkb/compat/misc
+X11R6/lib/X11/xkb/compat/mousekeys
+X11R6/lib/X11/xkb/compat/norepeat
+X11R6/lib/X11/xkb/compat/pc
+X11R6/lib/X11/xkb/compat/pc98
+X11R6/lib/X11/xkb/compat/xfree86
+X11R6/lib/X11/xkb/compat/xtest
+X11R6/lib/X11/xkb/compiled/README
+X11R6/lib/X11/xkb/geometry.dir
+X11R6/lib/X11/xkb/geometry/README
+X11R6/lib/X11/xkb/geometry/amiga
+X11R6/lib/X11/xkb/geometry/ataritt
+X11R6/lib/X11/xkb/geometry/dell
+X11R6/lib/X11/xkb/geometry/digital/lk
+X11R6/lib/X11/xkb/geometry/digital/pc
+X11R6/lib/X11/xkb/geometry/digital/unix
+X11R6/lib/X11/xkb/geometry/everex
+X11R6/lib/X11/xkb/geometry/fujitsu
+X11R6/lib/X11/xkb/geometry/hp
+X11R6/lib/X11/xkb/geometry/keytronic
+X11R6/lib/X11/xkb/geometry/kinesis
+X11R6/lib/X11/xkb/geometry/macintosh
+X11R6/lib/X11/xkb/geometry/microsoft
+X11R6/lib/X11/xkb/geometry/nec
+X11R6/lib/X11/xkb/geometry/northgate
+X11R6/lib/X11/xkb/geometry/pc
+X11R6/lib/X11/xkb/geometry/sgi/O2
+X11R6/lib/X11/xkb/geometry/sgi/indigo
+X11R6/lib/X11/xkb/geometry/sgi/indy
+X11R6/lib/X11/xkb/geometry/sony
+X11R6/lib/X11/xkb/geometry/sun
+X11R6/lib/X11/xkb/geometry/winbook
+X11R6/lib/X11/xkb/keycodes.dir
+X11R6/lib/X11/xkb/keycodes/README
+X11R6/lib/X11/xkb/keycodes/aliases
+X11R6/lib/X11/xkb/keycodes/amiga
+X11R6/lib/X11/xkb/keycodes/ataritt
+X11R6/lib/X11/xkb/keycodes/digital/lk
+X11R6/lib/X11/xkb/keycodes/digital/pc
+X11R6/lib/X11/xkb/keycodes/fujitsu
+X11R6/lib/X11/xkb/keycodes/hp
+X11R6/lib/X11/xkb/keycodes/ibm
+X11R6/lib/X11/xkb/keycodes/macintosh
+X11R6/lib/X11/xkb/keycodes/powerpcps2
+X11R6/lib/X11/xkb/keycodes/sgi/indigo
+X11R6/lib/X11/xkb/keycodes/sgi/indy
+X11R6/lib/X11/xkb/keycodes/sgi/iris
+X11R6/lib/X11/xkb/keycodes/sony
+X11R6/lib/X11/xkb/keycodes/sun
+X11R6/lib/X11/xkb/keycodes/xfree86
+X11R6/lib/X11/xkb/keycodes/xfree98
+X11R6/lib/X11/xkb/keymap.dir
+X11R6/lib/X11/xkb/keymap/README
+X11R6/lib/X11/xkb/keymap/amiga
+X11R6/lib/X11/xkb/keymap/ataritt
+X11R6/lib/X11/xkb/keymap/digital/us
+X11R6/lib/X11/xkb/keymap/macintosh
+X11R6/lib/X11/xkb/keymap/sgi/be
+X11R6/lib/X11/xkb/keymap/sgi/bg
+X11R6/lib/X11/xkb/keymap/sgi/ca
+X11R6/lib/X11/xkb/keymap/sgi/cz
+X11R6/lib/X11/xkb/keymap/sgi/cz_qwerty
+X11R6/lib/X11/xkb/keymap/sgi/de
+X11R6/lib/X11/xkb/keymap/sgi/de_CH
+X11R6/lib/X11/xkb/keymap/sgi/dk
+X11R6/lib/X11/xkb/keymap/sgi/dvorak
+X11R6/lib/X11/xkb/keymap/sgi/en_US
+X11R6/lib/X11/xkb/keymap/sgi/es
+X11R6/lib/X11/xkb/keymap/sgi/fi
+X11R6/lib/X11/xkb/keymap/sgi/fr
+X11R6/lib/X11/xkb/keymap/sgi/fr_CH
+X11R6/lib/X11/xkb/keymap/sgi/gb
+X11R6/lib/X11/xkb/keymap/sgi/hu
+X11R6/lib/X11/xkb/keymap/sgi/it
+X11R6/lib/X11/xkb/keymap/sgi/jp
+X11R6/lib/X11/xkb/keymap/sgi/no
+X11R6/lib/X11/xkb/keymap/sgi/pl
+X11R6/lib/X11/xkb/keymap/sgi/pt
+X11R6/lib/X11/xkb/keymap/sgi/ru
+X11R6/lib/X11/xkb/keymap/sgi/se
+X11R6/lib/X11/xkb/keymap/sgi/sk
+X11R6/lib/X11/xkb/keymap/sgi/sk_qwerty
+X11R6/lib/X11/xkb/keymap/sgi/th
+X11R6/lib/X11/xkb/keymap/sgi/us
+X11R6/lib/X11/xkb/keymap/sony
+X11R6/lib/X11/xkb/keymap/sun/de
+X11R6/lib/X11/xkb/keymap/sun/es
+X11R6/lib/X11/xkb/keymap/sun/fi
+X11R6/lib/X11/xkb/keymap/sun/fr
+X11R6/lib/X11/xkb/keymap/sun/no
+X11R6/lib/X11/xkb/keymap/sun/pl
+X11R6/lib/X11/xkb/keymap/sun/ru
+X11R6/lib/X11/xkb/keymap/sun/se
+X11R6/lib/X11/xkb/keymap/sun/uk
+X11R6/lib/X11/xkb/keymap/sun/us
+X11R6/lib/X11/xkb/keymap/xfree86
+X11R6/lib/X11/xkb/keymap/xfree98
+X11R6/lib/X11/xkb/rules/README
+X11R6/lib/X11/xkb/rules/sgi
+X11R6/lib/X11/xkb/rules/sgi.lst
+X11R6/lib/X11/xkb/rules/sun
+X11R6/lib/X11/xkb/rules/sun.lst
+X11R6/lib/X11/xkb/rules/xfree86
+X11R6/lib/X11/xkb/rules/xfree86-it.lst
+X11R6/lib/X11/xkb/rules/xfree86.lst
+X11R6/lib/X11/xkb/rules/xfree86.xml
+X11R6/lib/X11/xkb/semantics/basic
+X11R6/lib/X11/xkb/semantics/complete
+X11R6/lib/X11/xkb/semantics/default
+X11R6/lib/X11/xkb/semantics/xtest
+X11R6/lib/X11/xkb/symbols.dir
+X11R6/lib/X11/xkb/symbols/README
+X11R6/lib/X11/xkb/symbols/al
+X11R6/lib/X11/xkb/symbols/altwin
+X11R6/lib/X11/xkb/symbols/am
+X11R6/lib/X11/xkb/symbols/ar
+X11R6/lib/X11/xkb/symbols/az
+X11R6/lib/X11/xkb/symbols/be
+X11R6/lib/X11/xkb/symbols/ben
+X11R6/lib/X11/xkb/symbols/bg
+X11R6/lib/X11/xkb/symbols/br
+X11R6/lib/X11/xkb/symbols/bs
+X11R6/lib/X11/xkb/symbols/by
+X11R6/lib/X11/xkb/symbols/ca
+X11R6/lib/X11/xkb/symbols/ca_enhanced
+X11R6/lib/X11/xkb/symbols/compose
+X11R6/lib/X11/xkb/symbols/ctrl
+X11R6/lib/X11/xkb/symbols/cz
+X11R6/lib/X11/xkb/symbols/cz_qwerty
+X11R6/lib/X11/xkb/symbols/czsk
+X11R6/lib/X11/xkb/symbols/de
+X11R6/lib/X11/xkb/symbols/de_CH
+X11R6/lib/X11/xkb/symbols/dev
+X11R6/lib/X11/xkb/symbols/digital/lk
+X11R6/lib/X11/xkb/symbols/digital/pc
+X11R6/lib/X11/xkb/symbols/digital/us
+X11R6/lib/X11/xkb/symbols/digital/vt
+X11R6/lib/X11/xkb/symbols/dk
+X11R6/lib/X11/xkb/symbols/dvorak
+X11R6/lib/X11/xkb/symbols/ee
+X11R6/lib/X11/xkb/symbols/el
+X11R6/lib/X11/xkb/symbols/en_US
+X11R6/lib/X11/xkb/symbols/es
+X11R6/lib/X11/xkb/symbols/fi
+X11R6/lib/X11/xkb/symbols/fr
+X11R6/lib/X11/xkb/symbols/fr_CH
+X11R6/lib/X11/xkb/symbols/fujitsu/jp
+X11R6/lib/X11/xkb/symbols/fujitsu/us
+X11R6/lib/X11/xkb/symbols/gb
+X11R6/lib/X11/xkb/symbols/ge_la
+X11R6/lib/X11/xkb/symbols/ge_ru
+X11R6/lib/X11/xkb/symbols/group
+X11R6/lib/X11/xkb/symbols/guj
+X11R6/lib/X11/xkb/symbols/gur
+X11R6/lib/X11/xkb/symbols/hp/us
+X11R6/lib/X11/xkb/symbols/hr
+X11R6/lib/X11/xkb/symbols/hu
+X11R6/lib/X11/xkb/symbols/hu_US
+X11R6/lib/X11/xkb/symbols/hu_qwerty
+X11R6/lib/X11/xkb/symbols/ie
+X11R6/lib/X11/xkb/symbols/il
+X11R6/lib/X11/xkb/symbols/il_phonetic
+X11R6/lib/X11/xkb/symbols/inet
+X11R6/lib/X11/xkb/symbols/ir
+X11R6/lib/X11/xkb/symbols/is
+X11R6/lib/X11/xkb/symbols/iso9995-3
+X11R6/lib/X11/xkb/symbols/it
+X11R6/lib/X11/xkb/symbols/iu
+X11R6/lib/X11/xkb/symbols/jp
+X11R6/lib/X11/xkb/symbols/kan
+X11R6/lib/X11/xkb/symbols/keypad
+X11R6/lib/X11/xkb/symbols/la
+X11R6/lib/X11/xkb/symbols/level3
+X11R6/lib/X11/xkb/symbols/lo
+X11R6/lib/X11/xkb/symbols/lock
+X11R6/lib/X11/xkb/symbols/lt
+X11R6/lib/X11/xkb/symbols/lt_std
+X11R6/lib/X11/xkb/symbols/lv
+X11R6/lib/X11/xkb/symbols/macintosh/de
+X11R6/lib/X11/xkb/symbols/macintosh/de_CH
+X11R6/lib/X11/xkb/symbols/macintosh/dk
+X11R6/lib/X11/xkb/symbols/macintosh/es
+X11R6/lib/X11/xkb/symbols/macintosh/fi
+X11R6/lib/X11/xkb/symbols/macintosh/fr
+X11R6/lib/X11/xkb/symbols/macintosh/fr_CH
+X11R6/lib/X11/xkb/symbols/macintosh/gb
+X11R6/lib/X11/xkb/symbols/macintosh/it
+X11R6/lib/X11/xkb/symbols/macintosh/nl
+X11R6/lib/X11/xkb/symbols/macintosh/no
+X11R6/lib/X11/xkb/symbols/macintosh/pt
+X11R6/lib/X11/xkb/symbols/macintosh/se
+X11R6/lib/X11/xkb/symbols/macintosh/us
+X11R6/lib/X11/xkb/symbols/mk
+X11R6/lib/X11/xkb/symbols/ml
+X11R6/lib/X11/xkb/symbols/mm
+X11R6/lib/X11/xkb/symbols/mt
+X11R6/lib/X11/xkb/symbols/mt_us
+X11R6/lib/X11/xkb/symbols/nec/jp
+X11R6/lib/X11/xkb/symbols/nl
+X11R6/lib/X11/xkb/symbols/no
+X11R6/lib/X11/xkb/symbols/ogham
+X11R6/lib/X11/xkb/symbols/ori
+X11R6/lib/X11/xkb/symbols/pc/al
+X11R6/lib/X11/xkb/symbols/pc/am
+X11R6/lib/X11/xkb/symbols/pc/ar
+X11R6/lib/X11/xkb/symbols/pc/be
+X11R6/lib/X11/xkb/symbols/pc/ben
+X11R6/lib/X11/xkb/symbols/pc/bg
+X11R6/lib/X11/xkb/symbols/pc/br
+X11R6/lib/X11/xkb/symbols/pc/by
+X11R6/lib/X11/xkb/symbols/pc/cz
+X11R6/lib/X11/xkb/symbols/pc/cz_qwerty
+X11R6/lib/X11/xkb/symbols/pc/de
+X11R6/lib/X11/xkb/symbols/pc/dev
+X11R6/lib/X11/xkb/symbols/pc/dk
+X11R6/lib/X11/xkb/symbols/pc/dvorak
+X11R6/lib/X11/xkb/symbols/pc/ee
+X11R6/lib/X11/xkb/symbols/pc/el
+X11R6/lib/X11/xkb/symbols/pc/en_US
+X11R6/lib/X11/xkb/symbols/pc/es
+X11R6/lib/X11/xkb/symbols/pc/fi
+X11R6/lib/X11/xkb/symbols/pc/fr
+X11R6/lib/X11/xkb/symbols/pc/fr-latin9
+X11R6/lib/X11/xkb/symbols/pc/gb
+X11R6/lib/X11/xkb/symbols/pc/ge_la
+X11R6/lib/X11/xkb/symbols/pc/ge_ru
+X11R6/lib/X11/xkb/symbols/pc/guj
+X11R6/lib/X11/xkb/symbols/pc/gur
+X11R6/lib/X11/xkb/symbols/pc/hr
+X11R6/lib/X11/xkb/symbols/pc/ie
+X11R6/lib/X11/xkb/symbols/pc/il
+X11R6/lib/X11/xkb/symbols/pc/il_phonetic
+X11R6/lib/X11/xkb/symbols/pc/ir
+X11R6/lib/X11/xkb/symbols/pc/is
+X11R6/lib/X11/xkb/symbols/pc/it
+X11R6/lib/X11/xkb/symbols/pc/iu
+X11R6/lib/X11/xkb/symbols/pc/kan
+X11R6/lib/X11/xkb/symbols/pc/la
+X11R6/lib/X11/xkb/symbols/pc/latin
+X11R6/lib/X11/xkb/symbols/pc/lo
+X11R6/lib/X11/xkb/symbols/pc/lt
+X11R6/lib/X11/xkb/symbols/pc/lv
+X11R6/lib/X11/xkb/symbols/pc/mk
+X11R6/lib/X11/xkb/symbols/pc/ml
+X11R6/lib/X11/xkb/symbols/pc/mm
+X11R6/lib/X11/xkb/symbols/pc/mt
+X11R6/lib/X11/xkb/symbols/pc/mt_us
+X11R6/lib/X11/xkb/symbols/pc/nl
+X11R6/lib/X11/xkb/symbols/pc/no
+X11R6/lib/X11/xkb/symbols/pc/ogham
+X11R6/lib/X11/xkb/symbols/pc/ori
+X11R6/lib/X11/xkb/symbols/pc/pc
+X11R6/lib/X11/xkb/symbols/pc/pl
+X11R6/lib/X11/xkb/symbols/pc/pl2
+X11R6/lib/X11/xkb/symbols/pc/pt
+X11R6/lib/X11/xkb/symbols/pc/ro
+X11R6/lib/X11/xkb/symbols/pc/ru
+X11R6/lib/X11/xkb/symbols/pc/sapmi
+X11R6/lib/X11/xkb/symbols/pc/se
+X11R6/lib/X11/xkb/symbols/pc/si
+X11R6/lib/X11/xkb/symbols/pc/sk
+X11R6/lib/X11/xkb/symbols/pc/sk_qwerty
+X11R6/lib/X11/xkb/symbols/pc/sr
+X11R6/lib/X11/xkb/symbols/pc/syr
+X11R6/lib/X11/xkb/symbols/pc/syr_phonetic
+X11R6/lib/X11/xkb/symbols/pc/tel
+X11R6/lib/X11/xkb/symbols/pc/th
+X11R6/lib/X11/xkb/symbols/pc/tj
+X11R6/lib/X11/xkb/symbols/pc/tml
+X11R6/lib/X11/xkb/symbols/pc/tr
+X11R6/lib/X11/xkb/symbols/pc/ua
+X11R6/lib/X11/xkb/symbols/pc/us
+X11R6/lib/X11/xkb/symbols/pc/yu
+X11R6/lib/X11/xkb/symbols/pc104
+X11R6/lib/X11/xkb/symbols/pl
+X11R6/lib/X11/xkb/symbols/pl2
+X11R6/lib/X11/xkb/symbols/pt
+X11R6/lib/X11/xkb/symbols/ralt
+X11R6/lib/X11/xkb/symbols/ro
+X11R6/lib/X11/xkb/symbols/ru
+X11R6/lib/X11/xkb/symbols/ru_yawerty
+X11R6/lib/X11/xkb/symbols/sapmi
+X11R6/lib/X11/xkb/symbols/se
+X11R6/lib/X11/xkb/symbols/se_FI
+X11R6/lib/X11/xkb/symbols/se_NO
+X11R6/lib/X11/xkb/symbols/se_SE
+X11R6/lib/X11/xkb/symbols/sgi/jp
+X11R6/lib/X11/xkb/symbols/si
+X11R6/lib/X11/xkb/symbols/sk
+X11R6/lib/X11/xkb/symbols/sk_qwerty
+X11R6/lib/X11/xkb/symbols/sony/us
+X11R6/lib/X11/xkb/symbols/sr
+X11R6/lib/X11/xkb/symbols/srvr_ctrl
+X11R6/lib/X11/xkb/symbols/sun/se
+X11R6/lib/X11/xkb/symbols/sun/us
+X11R6/lib/X11/xkb/symbols/syr
+X11R6/lib/X11/xkb/symbols/syr_phonetic
+X11R6/lib/X11/xkb/symbols/tel
+X11R6/lib/X11/xkb/symbols/th
+X11R6/lib/X11/xkb/symbols/tj
+X11R6/lib/X11/xkb/symbols/tml
+X11R6/lib/X11/xkb/symbols/tr
+X11R6/lib/X11/xkb/symbols/tr_f
+X11R6/lib/X11/xkb/symbols/ua
+X11R6/lib/X11/xkb/symbols/us
+X11R6/lib/X11/xkb/symbols/us_group2
+X11R6/lib/X11/xkb/symbols/us_group3
+X11R6/lib/X11/xkb/symbols/us_intl
+X11R6/lib/X11/xkb/symbols/vn
+X11R6/lib/X11/xkb/symbols/xfree68/amiga
+X11R6/lib/X11/xkb/symbols/xfree68/ataritt
+X11R6/lib/X11/xkb/symbols/yu
+X11R6/lib/X11/xkb/types.dir
+X11R6/lib/X11/xkb/types/README
+X11R6/lib/X11/xkb/types/basic
+X11R6/lib/X11/xkb/types/caps
+X11R6/lib/X11/xkb/types/complete
+X11R6/lib/X11/xkb/types/default
+X11R6/lib/X11/xkb/types/extra
+X11R6/lib/X11/xkb/types/iso9995
+X11R6/lib/X11/xkb/types/mousekeys
+X11R6/lib/X11/xkb/types/pc
+X11R6/lib/X11/xkb/xkbcomp
+X11R6/lib/X11/xman.help
+X11R6/lib/X11/xsm/system.xsm
+X11R6/${IMAKE_MAN_DIR}/Xmark.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/appres.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/atobm.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/bdftopcf.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/beforelight.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/bitmap.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/bmtoa.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/cxpm.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/dga.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/dpsexec.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/dpsinfo.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/editres.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/fslsfonts.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/fstobdf.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/glxgears.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/glxinfo.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/iceauth.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/ico.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/lbxproxy.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/listres.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/luit.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/makepsres.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/mkcfm.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/mkfontdir.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/mkfontscale.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/oclock.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/proxymngr.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/resize.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/rstart.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/rstartd.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/sessreg.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/setxkbmap.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/showfont.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/showrgb.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/smproxy.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/startx.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/sxpm.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/texteroids.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/twm.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/viewres.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/x11perf.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/x11perfcomp.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xauth.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xbiff.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xcalc.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xclipboard.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xclock.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xcmsdb.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xconsole.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xcursorgen.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xcutsel.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xditview.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xdm.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xdpyinfo.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xedit.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xev.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xeyes.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfd.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfindproxy.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfontsel.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfsinfo.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfwp.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xgamma.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xgc.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xhost.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xinit.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xkbcomp.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xkbevd.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xkbprint.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xkill.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xload.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xlogo.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xlsatoms.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xlsclients.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xlsfonts.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xmag.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xman.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xmessage.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xmh.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xmodmap.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xon.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xprop.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xrandr.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xrdb.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xrefresh.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xset.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xsetmode.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xsetpointer.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xsetroot.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xsm.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xstdcmap.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xterm.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrap.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapchar.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapin.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapinfo.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapout.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapproto.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapreset.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapstats.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xvidtune.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xvinfo.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xwd.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xwininfo.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xwud.${MANPAGE_SUFFIX}
+@dirrm X11R6/lib/X11/xsm
+@dirrm X11R6/lib/X11/xkb/types
+@dirrm X11R6/lib/X11/xkb/symbols/xfree68
+@dirrm X11R6/lib/X11/xkb/symbols/sun
+@dirrm X11R6/lib/X11/xkb/symbols/sony
+@dirrm X11R6/lib/X11/xkb/symbols/sgi
+@dirrm X11R6/lib/X11/xkb/symbols/pc
+@dirrm X11R6/lib/X11/xkb/symbols/nec
+@dirrm X11R6/lib/X11/xkb/symbols/macintosh
+@dirrm X11R6/lib/X11/xkb/symbols/hp
+@dirrm X11R6/lib/X11/xkb/symbols/fujitsu
+@dirrm X11R6/lib/X11/xkb/symbols/digital
+@dirrm X11R6/lib/X11/xkb/symbols
+@dirrm X11R6/lib/X11/xkb/semantics
+@dirrm X11R6/lib/X11/xkb/rules
+@dirrm X11R6/lib/X11/xkb/keymap/sun
+@dirrm X11R6/lib/X11/xkb/keymap/sgi
+@dirrm X11R6/lib/X11/xkb/keymap/digital
+@dirrm X11R6/lib/X11/xkb/keymap
+@dirrm X11R6/lib/X11/xkb/keycodes/sgi
+@dirrm X11R6/lib/X11/xkb/keycodes/digital
+@dirrm X11R6/lib/X11/xkb/keycodes
+@dirrm X11R6/lib/X11/xkb/geometry/sgi
+@dirrm X11R6/lib/X11/xkb/geometry/digital
+@dirrm X11R6/lib/X11/xkb/geometry
+@dirrm X11R6/lib/X11/xkb/compiled
+@dirrm X11R6/lib/X11/xkb/compat
+@dirrm X11R6/lib/X11/xkb
+@dirrm X11R6/lib/X11/xinit
+@dirrm X11R6/lib/X11/xedit/lisp/progmodes
+@dirrm X11R6/lib/X11/xedit/lisp
+@dirrm X11R6/lib/X11/xedit
+@dirrm X11R6/lib/X11/xdm/pixmaps
+@dirrm X11R6/lib/X11/xdm
+@dirrm X11R6/lib/X11/x11perfcomp
+@dirrm X11R6/lib/X11/twm
+@dirrm X11R6/lib/X11/rstart/contexts
+@dirrm X11R6/lib/X11/rstart/commands/x11r6
+@dirrm X11R6/lib/X11/rstart/commands
+@dirrm X11R6/lib/X11/rstart
+@dirrm X11R6/lib/X11/proxymngr
+@dirrm X11R6/lib/X11/lbxproxy
+@dirrm X11R6/lib/X11/icons/whiteglass/cursors
+@dirrm X11R6/lib/X11/icons/whiteglass
+@dirrm X11R6/lib/X11/icons/redglass/cursors
+@dirrm X11R6/lib/X11/icons/redglass
+@dirrm X11R6/lib/X11/icons/handhelds/cursors
+@dirrm X11R6/lib/X11/icons/handhelds
+@dirrm X11R6/lib/X11/icons/default
+@dirrm X11R6/lib/X11/icons
+@dirrm X11R6/lib/X11/fonts/util
+@dirrm X11R6/lib/X11/fonts
+@dirrm X11R6/lib/X11/etc
+@dirrm X11R6/lib/X11/app-defaults
+@dirrm X11R6/lib/X11
+@dirrm X11R6/include/X11/bitmaps
+@dirrm X11R6/include/X11/PM
+@dirrm X11R6/include/X11
+@dirrm X11R6/bin
diff --git a/x11/XFree86-clients/files/host.def b/x11/XFree86-clients/files/host.def
index e9b2e1df1be..493e895682d 100644
--- a/x11/XFree86-clients/files/host.def
+++ b/x11/XFree86-clients/files/host.def
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: host.def,v 1.1.1.1 2004/01/24 08:45:42 xtraeme Exp $
+ * $NetBSD: host.def,v 1.2 2004/02/02 14:16:07 xtraeme Exp $
  *
  * XFree86 packages for pkgsrc system
  */ 
@@ -51,7 +51,7 @@
 
 #define ExtraLoadFlags @LDFLAGS@
 #define LibInstallBuild  YES
-#define StandardIncludes -I@BLNK@/include
+#define StandardIncludes -I@BLNK@/include -I@PREFIX@/include
 #define DontUseLibPathVar YES
 #define PreloadSetup
 #define UseInstalledPrograms YES
diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile
index 869c11de946..6efc137abbd 100644
--- a/x11/XFree86-libs/Makefile
+++ b/x11/XFree86-libs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/02 14:15:27 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-libs-${XF_VER}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
 DISTFILES=		X430src-1.tgz X430src-2.tgz \
@@ -20,6 +21,15 @@ DEPENDS=		imake>=4.3.0:../../x11/imake
 
 .include "../../mk/bsd.prefs.mk"
 
+FILES_SUBST+=		PKGBASE=${PKGBASE}
+FILES_SUBST+=		X11ROOT=${X11ROOT}
+
+.if ${OPSYS} == "NetBSD"
+PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX}
+.else
+PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
+.endif
+
 # XXX later should add CONFLICTS with XFree86-libs to these packages too
 .if ${X11PREFIX} == ${LOCALBASE}
 CONFLICTS+=		render-[0-9]*
@@ -37,7 +47,7 @@ XINSTALL_DIRS=		include lib nls programs/Xserver/include \
 XINSTALL_MAN_DIRS=	${XINSTALL_DIRS}
 
 post-patch:
-	@${SED} -e 's,@MAKESTRS@,${X11PREFIX}/bin/makestrs,g' \
+	@${SED} -e 's,@MAKESTRS@,${X11PREFIX}/X11R6/bin/makestrs,g' \
 		${WRKSRC}/config/cf/Library.tmpl \
 		> ${WRKSRC}/config/cf/Library.tmpl.tmp && \
 		${MV} ${WRKSRC}/config/cf/Library.tmpl.tmp \
diff --git a/x11/XFree86-libs/PLIST.Linux b/x11/XFree86-libs/PLIST.Linux
index 95bce20ab38..808dbdb356f 100644
--- a/x11/XFree86-libs/PLIST.Linux
+++ b/x11/XFree86-libs/PLIST.Linux
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
-include/X11/extensions/xf86rush.h
-include/X11/extensions/xf86rushstr.h
-lib/libI810XvMC.a
-lib/libXxf86rush.a
-lib/libGL.so.1.2
-lib/libGLU.so.1.3
-lib/libICE.so.6.3
-lib/libOSMesa.so.4.0
-lib/libSM.so.6.0
-lib/libX11.so.6.2
-lib/libXThrStub.so
-lib/libXThrStub.so.6
-lib/libXThrStub.so.6.1
-lib/libXTrap.so.6.4
-lib/libXaw.so.6.1
-lib/libXaw.so.7.0
-lib/libXcursor.so.1.0
-lib/libXext.so.6.4
-lib/libXfont.so.1.4
-lib/libXi.so.6.0
-lib/libXinerama.so.1.0
-lib/libXmu.so.6.2
-lib/libXmuu.so.1.0
-lib/libXp.so.6.2
-lib/libXpm.so.4.11
-lib/libXrandr.so.2.0
-lib/libXrender.so.1.2
-lib/libXt.so.6.0
-lib/libXtst.so.6.1
-lib/libXv.so.1.0
-lib/libdps.so.1.0
-lib/libdpstk.so.1.0
-lib/liboldX.so.6.0
-lib/libpsres.so.1.0
+@comment $NetBSD: PLIST.Linux,v 1.3 2004/02/02 14:15:27 xtraeme Exp $
+X11R6/include/X11/extensions/xf86rush.h
+X11R6/include/X11/extensions/xf86rushstr.h
+X11R6/lib/libI810XvMC.a
+X11R6/lib/libXxf86rush.a
+X11R6/lib/libGL.so.1.2
+X11R6/lib/libGLU.so.1.3
+X11R6/lib/libICE.so.6.3
+X11R6/lib/libOSMesa.so.4.0
+X11R6/lib/libSM.so.6.0
+X11R6/lib/libX11.so.6.2
+X11R6/lib/libXThrStub.so
+X11R6/lib/libXThrStub.so.6
+X11R6/lib/libXThrStub.so.6.1
+X11R6/lib/libXTrap.so.6.4
+X11R6/lib/libXaw.so.6.1
+X11R6/lib/libXaw.so.7.0
+X11R6/lib/libXcursor.so.1.0
+X11R6/lib/libXext.so.6.4
+X11R6/lib/libXfont.so.1.4
+X11R6/lib/libXi.so.6.0
+X11R6/lib/libXinerama.so.1.0
+X11R6/lib/libXmu.so.6.2
+X11R6/lib/libXmuu.so.1.0
+X11R6/lib/libXp.so.6.2
+X11R6/lib/libXpm.so.4.11
+X11R6/lib/libXrandr.so.2.0
+X11R6/lib/libXrender.so.1.2
+X11R6/lib/libXt.so.6.0
+X11R6/lib/libXtst.so.6.1
+X11R6/lib/libXv.so.1.0
+X11R6/lib/libdps.so.1.0
+X11R6/lib/libdpstk.so.1.0
+X11R6/lib/liboldX.so.6.0
+X11R6/lib/libpsres.so.1.0
diff --git a/x11/XFree86-libs/PLIST.NetBSD b/x11/XFree86-libs/PLIST.NetBSD
index d0c1d3e1410..6237c7ef832 100644
--- a/x11/XFree86-libs/PLIST.NetBSD
+++ b/x11/XFree86-libs/PLIST.NetBSD
@@ -1,31 +1,31 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
-lib/libGL.so.1.2
-lib/libGLU.so.1.3
-lib/libICE.so.6.3
-lib/libOSMesa.so.4.0
-lib/libSM.so.6.0
-lib/libX11.so.6.2
-lib/libXThrStub.so
-lib/libXThrStub.so.6
-lib/libXThrStub.so.6.1
-lib/libXTrap.so.6.4
-lib/libXaw.so.6.1
-lib/libXaw.so.7.0
-lib/libXcursor.so.1.0
-lib/libXext.so.6.4
-lib/libXfont.so.1.4
-lib/libXi.so.6.0
-lib/libXinerama.so.1.0
-lib/libXmu.so.6.2
-lib/libXmuu.so.1.0
-lib/libXp.so.6.2
-lib/libXpm.so.4.11
-lib/libXrandr.so.2.0
-lib/libXrender.so.1.2
-lib/libXt.so.6.0
-lib/libXtst.so.6.1
-lib/libXv.so.1.0
-lib/libdps.so.1.0
-lib/libdpstk.so.1.0
-lib/liboldX.so.6.0
-lib/libpsres.so.1.0
+@comment $NetBSD: PLIST.NetBSD,v 1.3 2004/02/02 14:15:27 xtraeme Exp $
+X11R6/lib/libGL.so.1.2
+X11R6/lib/libGLU.so.1.3
+X11R6/lib/libICE.so.6.3
+X11R6/lib/libOSMesa.so.4.0
+X11R6/lib/libSM.so.6.0
+X11R6/lib/libX11.so.6.2
+X11R6/lib/libXThrStub.so
+X11R6/lib/libXThrStub.so.6
+X11R6/lib/libXThrStub.so.6.1
+X11R6/lib/libXTrap.so.6.4
+X11R6/lib/libXaw.so.6.1
+X11R6/lib/libXaw.so.7.0
+X11R6/lib/libXcursor.so.1.0
+X11R6/lib/libXext.so.6.4
+X11R6/lib/libXfont.so.1.4
+X11R6/lib/libXi.so.6.0
+X11R6/lib/libXinerama.so.1.0
+X11R6/lib/libXmu.so.6.2
+X11R6/lib/libXmuu.so.1.0
+X11R6/lib/libXp.so.6.2
+X11R6/lib/libXpm.so.4.11
+X11R6/lib/libXrandr.so.2.0
+X11R6/lib/libXrender.so.1.2
+X11R6/lib/libXt.so.6.0
+X11R6/lib/libXtst.so.6.1
+X11R6/lib/libXv.so.1.0
+X11R6/lib/libdps.so.1.0
+X11R6/lib/libdpstk.so.1.0
+X11R6/lib/liboldX.so.6.0
+X11R6/lib/libpsres.so.1.0
diff --git a/x11/XFree86-libs/PLIST.common b/x11/XFree86-libs/PLIST.common
index 84aa76fb431..520007ab1a1 100644
--- a/x11/XFree86-libs/PLIST.common
+++ b/x11/XFree86-libs/PLIST.common
@@ -1,663 +1,663 @@
-@comment $NetBSD: PLIST.common,v 1.2 2004/01/31 15:06:24 xtraeme Exp $
-bin/xcursor-config
-include/DPS/ColorSB.h
-include/DPS/ColorSBP.h
-include/DPS/DPSScrollW.h
-include/DPS/DPSScrollWP.h
-include/DPS/FontCreatP.h
-include/DPS/FontCreato.h
-include/DPS/FontSB.h
-include/DPS/FontSBP.h
-include/DPS/FontSamplP.h
-include/DPS/FontSample.h
-include/DPS/PSres.h
-include/DPS/XDPS.h
-include/DPS/XDPSlib.h
-include/DPS/XDPSproto.h
-include/DPS/dpsNXargs.h
-include/DPS/dpsXclient.h
-include/DPS/dpsXcommon.h
-include/DPS/dpsXpreview.h
-include/DPS/dpsXshare.h
-include/DPS/dpsXuserpath.h
-include/DPS/dpsclient.h
-include/DPS/dpsconfig.h
-include/DPS/dpsexcept.h
-include/DPS/dpsfriends.h
-include/DPS/dpsops.h
-include/DPS/psops.h
-include/GL/GLwDrawA.h
-include/GL/GLwDrawAP.h
-include/GL/GLwMDrawA.h
-include/GL/GLwMDrawAP.h
-include/GL/gl.h
-include/GL/glext.h
-include/GL/glu.h
-include/GL/glx.h
-include/GL/glxext.h
-include/GL/glxint.h
-include/GL/glxmd.h
-include/GL/glxproto.h
-include/GL/glxtokens.h
-include/GL/osmesa.h
-include/X11/Composite.h
-include/X11/CompositeP.h
-include/X11/ConstrainP.h
-include/X11/Constraint.h
-include/X11/Core.h
-include/X11/CoreP.h
-include/X11/DECkeysym.h
-include/X11/HPkeysym.h
-include/X11/ICE/ICE.h
-include/X11/ICE/ICEconn.h
-include/X11/ICE/ICElib.h
-include/X11/ICE/ICEmsg.h
-include/X11/ICE/ICEproto.h
-include/X11/ICE/ICEutil.h
-include/X11/Intrinsic.h
-include/X11/IntrinsicP.h
-include/X11/Object.h
-include/X11/ObjectP.h
-include/X11/RectObj.h
-include/X11/RectObjP.h
-include/X11/SM/SM.h
-include/X11/SM/SMlib.h
-include/X11/SM/SMproto.h
-include/X11/Shell.h
-include/X11/ShellP.h
-include/X11/StringDefs.h
-include/X11/Sunkeysym.h
-include/X11/Vendor.h
-include/X11/VendorP.h
-include/X11/X.h
-include/X11/X10.h
-include/X11/XF86keysym.h
-include/X11/XKBlib.h
-include/X11/XWDFile.h
-include/X11/Xalloca.h
-include/X11/Xarch.h
-include/X11/Xatom.h
-include/X11/Xauth.h
-include/X11/Xaw/AllWidgets.h
-include/X11/Xaw/AsciiSink.h
-include/X11/Xaw/AsciiSinkP.h
-include/X11/Xaw/AsciiSrc.h
-include/X11/Xaw/AsciiSrcP.h
-include/X11/Xaw/AsciiText.h
-include/X11/Xaw/AsciiTextP.h
-include/X11/Xaw/Box.h
-include/X11/Xaw/BoxP.h
-include/X11/Xaw/Cardinals.h
-include/X11/Xaw/Command.h
-include/X11/Xaw/CommandP.h
-include/X11/Xaw/Dialog.h
-include/X11/Xaw/DialogP.h
-include/X11/Xaw/Form.h
-include/X11/Xaw/FormP.h
-include/X11/Xaw/Grip.h
-include/X11/Xaw/GripP.h
-include/X11/Xaw/Label.h
-include/X11/Xaw/LabelP.h
-include/X11/Xaw/List.h
-include/X11/Xaw/ListP.h
-include/X11/Xaw/MenuButtoP.h
-include/X11/Xaw/MenuButton.h
-include/X11/Xaw/MultiSink.h
-include/X11/Xaw/MultiSinkP.h
-include/X11/Xaw/MultiSrc.h
-include/X11/Xaw/MultiSrcP.h
-include/X11/Xaw/Paned.h
-include/X11/Xaw/PanedP.h
-include/X11/Xaw/Panner.h
-include/X11/Xaw/PannerP.h
-include/X11/Xaw/Porthole.h
-include/X11/Xaw/PortholeP.h
-include/X11/Xaw/Repeater.h
-include/X11/Xaw/RepeaterP.h
-include/X11/Xaw/Reports.h
-include/X11/Xaw/Scrollbar.h
-include/X11/Xaw/ScrollbarP.h
-include/X11/Xaw/Simple.h
-include/X11/Xaw/SimpleMenP.h
-include/X11/Xaw/SimpleMenu.h
-include/X11/Xaw/SimpleP.h
-include/X11/Xaw/Sme.h
-include/X11/Xaw/SmeBSB.h
-include/X11/Xaw/SmeBSBP.h
-include/X11/Xaw/SmeLine.h
-include/X11/Xaw/SmeLineP.h
-include/X11/Xaw/SmeP.h
-include/X11/Xaw/StripCharP.h
-include/X11/Xaw/StripChart.h
-include/X11/Xaw/Template.c
-include/X11/Xaw/Template.h
-include/X11/Xaw/TemplateP.h
-include/X11/Xaw/Text.h
-include/X11/Xaw/TextP.h
-include/X11/Xaw/TextSink.h
-include/X11/Xaw/TextSinkP.h
-include/X11/Xaw/TextSrc.h
-include/X11/Xaw/TextSrcP.h
-include/X11/Xaw/Tip.h
-include/X11/Xaw/TipP.h
-include/X11/Xaw/Toggle.h
-include/X11/Xaw/ToggleP.h
-include/X11/Xaw/Tree.h
-include/X11/Xaw/TreeP.h
-include/X11/Xaw/VendorEP.h
-include/X11/Xaw/Viewport.h
-include/X11/Xaw/ViewportP.h
-include/X11/Xaw/XawImP.h
-include/X11/Xaw/XawInit.h
-include/X11/Xcms.h
-include/X11/Xcursor/Xcursor.h
-include/X11/Xdefs.h
-include/X11/Xdmcp.h
-include/X11/Xfuncproto.h
-include/X11/Xfuncs.h
-include/X11/Xlib.h
-include/X11/Xlibint.h
-include/X11/Xlocale.h
-include/X11/Xmd.h
-include/X11/Xmu/Atoms.h
-include/X11/Xmu/CharSet.h
-include/X11/Xmu/CloseHook.h
-include/X11/Xmu/Converters.h
-include/X11/Xmu/CurUtil.h
-include/X11/Xmu/CvtCache.h
-include/X11/Xmu/DisplayQue.h
-include/X11/Xmu/Drawing.h
-include/X11/Xmu/Editres.h
-include/X11/Xmu/EditresP.h
-include/X11/Xmu/Error.h
-include/X11/Xmu/ExtAgent.h
-include/X11/Xmu/Initer.h
-include/X11/Xmu/Lookup.h
-include/X11/Xmu/Misc.h
-include/X11/Xmu/StdCmap.h
-include/X11/Xmu/StdSel.h
-include/X11/Xmu/SysUtil.h
-include/X11/Xmu/WidgetNode.h
-include/X11/Xmu/WinUtil.h
-include/X11/Xmu/Xct.h
-include/X11/Xmu/Xmu.h
-include/X11/Xos.h
-include/X11/Xos_r.h
-include/X11/Xosdefs.h
-include/X11/Xpoll.h
-include/X11/Xproto.h
-include/X11/Xprotostr.h
-include/X11/Xresource.h
-include/X11/Xthreads.h
-include/X11/Xutil.h
-include/X11/ap_keysym.h
-include/X11/bitmaps/1x1
-include/X11/bitmaps/2x2
-include/X11/bitmaps/black
-include/X11/bitmaps/boxes
-include/X11/bitmaps/calculator
-include/X11/bitmaps/cntr_ptr
-include/X11/bitmaps/cntr_ptrmsk
-include/X11/bitmaps/cross_weave
-include/X11/bitmaps/dimple1
-include/X11/bitmaps/dimple3
-include/X11/bitmaps/dot
-include/X11/bitmaps/dropbar7
-include/X11/bitmaps/dropbar8
-include/X11/bitmaps/escherknot
-include/X11/bitmaps/flagdown
-include/X11/bitmaps/flagup
-include/X11/bitmaps/flipped_gray
-include/X11/bitmaps/gray
-include/X11/bitmaps/gray1
-include/X11/bitmaps/gray3
-include/X11/bitmaps/grid16
-include/X11/bitmaps/grid2
-include/X11/bitmaps/grid4
-include/X11/bitmaps/grid8
-include/X11/bitmaps/hlines2
-include/X11/bitmaps/hlines3
-include/X11/bitmaps/icon
-include/X11/bitmaps/keyboard16
-include/X11/bitmaps/left_ptr
-include/X11/bitmaps/left_ptrmsk
-include/X11/bitmaps/letters
-include/X11/bitmaps/light_gray
-include/X11/bitmaps/mailempty
-include/X11/bitmaps/mailemptymsk
-include/X11/bitmaps/mailfull
-include/X11/bitmaps/mailfullmsk
-include/X11/bitmaps/mensetmanus
-include/X11/bitmaps/menu10
-include/X11/bitmaps/menu12
-include/X11/bitmaps/menu16
-include/X11/bitmaps/menu6
-include/X11/bitmaps/menu8
-include/X11/bitmaps/noletters
-include/X11/bitmaps/opendot
-include/X11/bitmaps/opendotMask
-include/X11/bitmaps/plaid
-include/X11/bitmaps/right_ptr
-include/X11/bitmaps/right_ptrmsk
-include/X11/bitmaps/root_weave
-include/X11/bitmaps/scales
-include/X11/bitmaps/sipb
-include/X11/bitmaps/star
-include/X11/bitmaps/starMask
-include/X11/bitmaps/stipple
-include/X11/bitmaps/target
-include/X11/bitmaps/terminal
-include/X11/bitmaps/tie_fighter
-include/X11/bitmaps/vlines2
-include/X11/bitmaps/vlines3
-include/X11/bitmaps/weird_size
-include/X11/bitmaps/wide_weave
-include/X11/bitmaps/wingdogs
-include/X11/bitmaps/woman
-include/X11/bitmaps/xfd_icon
-include/X11/bitmaps/xlogo11
-include/X11/bitmaps/xlogo16
-include/X11/bitmaps/xlogo32
-include/X11/bitmaps/xlogo64
-include/X11/bitmaps/xsnow
-include/X11/cursorfont.h
-include/X11/extensions/MITMisc.h
-include/X11/extensions/Print.h
-include/X11/extensions/Printstr.h
-include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
-include/X11/extensions/XI.h
-include/X11/extensions/XIE.h
-include/X11/extensions/XIEproto.h
-include/X11/extensions/XIEprotost.h
-include/X11/extensions/XInput.h
-include/X11/extensions/XIproto.h
-include/X11/extensions/XKB.h
-include/X11/extensions/XKBbells.h
-include/X11/extensions/XKBconfig.h
-include/X11/extensions/XKBfile.h
-include/X11/extensions/XKBgeom.h
-include/X11/extensions/XKBproto.h
-include/X11/extensions/XKBrules.h
-include/X11/extensions/XKBsrv.h
-include/X11/extensions/XKBstr.h
-include/X11/extensions/XKBui.h
-include/X11/extensions/XKM.h
-include/X11/extensions/XKMformat.h
-include/X11/extensions/XLbx.h
-include/X11/extensions/XRes.h
-include/X11/extensions/XResproto.h
-include/X11/extensions/XShm.h
-include/X11/extensions/XTest.h
-include/X11/extensions/Xag.h
-include/X11/extensions/Xagsrv.h
-include/X11/extensions/Xagstr.h
-include/X11/extensions/Xcup.h
-include/X11/extensions/Xcupstr.h
-include/X11/extensions/Xdbe.h
-include/X11/extensions/Xdbeproto.h
-include/X11/extensions/Xext.h
-include/X11/extensions/Xinerama.h
-include/X11/extensions/Xrandr.h
-include/X11/extensions/Xrender.h
-include/X11/extensions/Xv.h
-include/X11/extensions/XvMC.h
-include/X11/extensions/XvMClib.h
-include/X11/extensions/XvMCproto.h
-include/X11/extensions/Xvlib.h
-include/X11/extensions/Xvproto.h
-include/X11/extensions/bigreqstr.h
-include/X11/extensions/dpms.h
-include/X11/extensions/dpmsstr.h
-include/X11/extensions/extutil.h
-include/X11/extensions/fontcache.h
-include/X11/extensions/fontcacheP.h
-include/X11/extensions/fontcachstr.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
-include/X11/extensions/panoramiXext.h
-include/X11/extensions/panoramiXproto.h
-include/X11/extensions/randr.h
-include/X11/extensions/randrproto.h
-include/X11/extensions/record.h
-include/X11/extensions/recordstr.h
-include/X11/extensions/render.h
-include/X11/extensions/renderproto.h
-include/X11/extensions/saver.h
-include/X11/extensions/saverproto.h
-include/X11/extensions/scrnsaver.h
-include/X11/extensions/security.h
-include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
-include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
-include/X11/extensions/xcmiscstr.h
-include/X11/extensions/xf86bigfont.h
-include/X11/extensions/xf86bigfstr.h
-include/X11/extensions/xf86dga.h
-include/X11/extensions/xf86dga1.h
-include/X11/extensions/xf86dga1str.h
-include/X11/extensions/xf86dgastr.h
-include/X11/extensions/xf86misc.h
-include/X11/extensions/xf86mscstr.h
-include/X11/extensions/xf86vmode.h
-include/X11/extensions/xf86vmstr.h
-include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
-include/X11/extensions/xtrapbits.h
-include/X11/extensions/xtrapddmi.h
-include/X11/extensions/xtrapdi.h
-include/X11/extensions/xtrapemacros.h
-include/X11/extensions/xtraplib.h
-include/X11/extensions/xtraplibp.h
-include/X11/extensions/xtrapproto.h
-include/X11/fonts/FS.h
-include/X11/fonts/FSlib.h
-include/X11/fonts/FSproto.h
-include/X11/fonts/codeconv/cconvversion.h
-include/X11/fonts/codeconv/xttcap.h
-include/X11/fonts/codeconv/xttcconv.h
-include/X11/fonts/codeconv/xttcconvP.h
-include/X11/fonts/codeconv/xttcommon.h
-include/X11/fonts/codeconv/xttversion.h
-include/X11/fonts/fontenc.h
-include/X11/fonts/fsmasks.h
-include/X11/keysym.h
-include/X11/keysymdef.h
-include/X11/xpm.h
-include/xf86Optrec.h
-include/xf86Parser.h
-lib/X11/XErrorDB
-lib/X11/XKeysymDB
-lib/X11/Xcms.txt
-lib/X11/locale/C/XI18N_OBJS
-lib/X11/locale/C/XLC_LOCALE
-lib/X11/locale/armscii-8/Compose
-lib/X11/locale/armscii-8/XI18N_OBJS
-lib/X11/locale/armscii-8/XLC_LOCALE
-lib/X11/locale/compose.dir
-lib/X11/locale/el_GR.UTF-8/Compose
-lib/X11/locale/en_US.UTF-8/Compose
-lib/X11/locale/en_US.UTF-8/XI18N_OBJS
-lib/X11/locale/en_US.UTF-8/XLC_LOCALE
-lib/X11/locale/georgian-academy/Compose
-lib/X11/locale/georgian-academy/XI18N_OBJS
-lib/X11/locale/georgian-academy/XLC_LOCALE
-lib/X11/locale/georgian-ps/Compose
-lib/X11/locale/georgian-ps/XI18N_OBJS
-lib/X11/locale/georgian-ps/XLC_LOCALE
-lib/X11/locale/ibm-cp1133/Compose
-lib/X11/locale/ibm-cp1133/XI18N_OBJS
-lib/X11/locale/ibm-cp1133/XLC_LOCALE
-lib/X11/locale/iscii-dev/XI18N_OBJS
-lib/X11/locale/iscii-dev/XLC_LOCALE
-lib/X11/locale/isiri-3342/XI18N_OBJS
-lib/X11/locale/isiri-3342/XLC_LOCALE
-lib/X11/locale/iso8859-1/Compose
-lib/X11/locale/iso8859-1/XI18N_OBJS
-lib/X11/locale/iso8859-1/XLC_LOCALE
-lib/X11/locale/iso8859-10/Compose
-lib/X11/locale/iso8859-10/XI18N_OBJS
-lib/X11/locale/iso8859-10/XLC_LOCALE
-lib/X11/locale/iso8859-11/XI18N_OBJS
-lib/X11/locale/iso8859-11/XLC_LOCALE
-lib/X11/locale/iso8859-13/Compose
-lib/X11/locale/iso8859-13/XI18N_OBJS
-lib/X11/locale/iso8859-13/XLC_LOCALE
-lib/X11/locale/iso8859-14/Compose
-lib/X11/locale/iso8859-14/XI18N_OBJS
-lib/X11/locale/iso8859-14/XLC_LOCALE
-lib/X11/locale/iso8859-15/Compose
-lib/X11/locale/iso8859-15/XI18N_OBJS
-lib/X11/locale/iso8859-15/XLC_LOCALE
-lib/X11/locale/iso8859-2/Compose
-lib/X11/locale/iso8859-2/XI18N_OBJS
-lib/X11/locale/iso8859-2/XLC_LOCALE
-lib/X11/locale/iso8859-3/Compose
-lib/X11/locale/iso8859-3/XI18N_OBJS
-lib/X11/locale/iso8859-3/XLC_LOCALE
-lib/X11/locale/iso8859-4/Compose
-lib/X11/locale/iso8859-4/XI18N_OBJS
-lib/X11/locale/iso8859-4/XLC_LOCALE
-lib/X11/locale/iso8859-5/Compose
-lib/X11/locale/iso8859-5/XI18N_OBJS
-lib/X11/locale/iso8859-5/XLC_LOCALE
-lib/X11/locale/iso8859-6/Compose
-lib/X11/locale/iso8859-6/XI18N_OBJS
-lib/X11/locale/iso8859-6/XLC_LOCALE
-lib/X11/locale/iso8859-7/Compose
-lib/X11/locale/iso8859-7/XI18N_OBJS
-lib/X11/locale/iso8859-7/XLC_LOCALE
-lib/X11/locale/iso8859-8/Compose
-lib/X11/locale/iso8859-8/XI18N_OBJS
-lib/X11/locale/iso8859-8/XLC_LOCALE
-lib/X11/locale/iso8859-9/Compose
-lib/X11/locale/iso8859-9/XI18N_OBJS
-lib/X11/locale/iso8859-9/XLC_LOCALE
-lib/X11/locale/iso8859-9e/Compose
-lib/X11/locale/iso8859-9e/XI18N_OBJS
-lib/X11/locale/iso8859-9e/XLC_LOCALE
-lib/X11/locale/ja.JIS/Compose
-lib/X11/locale/ja.JIS/XI18N_OBJS
-lib/X11/locale/ja.JIS/XLC_LOCALE
-lib/X11/locale/ja.SJIS/Compose
-lib/X11/locale/ja.SJIS/XI18N_OBJS
-lib/X11/locale/ja.SJIS/XLC_LOCALE
-lib/X11/locale/ja/Compose
-lib/X11/locale/ja/XI18N_OBJS
-lib/X11/locale/ja/XLC_LOCALE
-lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
-lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
-lib/X11/locale/ko/Compose
-lib/X11/locale/ko/XI18N_OBJS
-lib/X11/locale/ko/XLC_LOCALE
-lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
-lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
-lib/X11/locale/koi8-c/Compose
-lib/X11/locale/koi8-c/XI18N_OBJS
-lib/X11/locale/koi8-c/XLC_LOCALE
-lib/X11/locale/koi8-r/Compose
-lib/X11/locale/koi8-r/XI18N_OBJS
-lib/X11/locale/koi8-r/XLC_LOCALE
-lib/X11/locale/koi8-u/Compose
-lib/X11/locale/koi8-u/XI18N_OBJS
-lib/X11/locale/koi8-u/XLC_LOCALE
-lib/X11/locale/lib/common/ximcp.so.2
-lib/X11/locale/lib/common/xlcDef.so.2
-lib/X11/locale/lib/common/xlcUTF8Load.so.2
-lib/X11/locale/lib/common/xlibi18n.so.2
-lib/X11/locale/lib/common/xlocale.so.2
-lib/X11/locale/lib/common/xomGeneric.so.2
-lib/X11/locale/locale.alias
-lib/X11/locale/locale.dir
-lib/X11/locale/microsoft-cp1251/XI18N_OBJS
-lib/X11/locale/microsoft-cp1251/XLC_LOCALE
-lib/X11/locale/microsoft-cp1255/XI18N_OBJS
-lib/X11/locale/microsoft-cp1255/XLC_LOCALE
-lib/X11/locale/microsoft-cp1256/XI18N_OBJS
-lib/X11/locale/microsoft-cp1256/XLC_LOCALE
-lib/X11/locale/mulelao-1/Compose
-lib/X11/locale/mulelao-1/XI18N_OBJS
-lib/X11/locale/mulelao-1/XLC_LOCALE
-lib/X11/locale/nokhchi-1/XI18N_OBJS
-lib/X11/locale/nokhchi-1/XLC_LOCALE
-lib/X11/locale/tatar-cyr/XI18N_OBJS
-lib/X11/locale/tatar-cyr/XLC_LOCALE
-lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
-lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
-lib/X11/locale/th_TH/XI18N_OBJS
-lib/X11/locale/th_TH/XLC_LOCALE
-lib/X11/locale/tscii-0/XI18N_OBJS
-lib/X11/locale/tscii-0/XLC_LOCALE
-lib/X11/locale/vi_VN.tcvn/Compose
-lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
-lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
-lib/X11/locale/vi_VN.viscii/Compose
-lib/X11/locale/vi_VN.viscii/XI18N_OBJS
-lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-lib/X11/locale/zh_CN.gbk/Compose
-lib/X11/locale/zh_CN.gbk/XI18N_OBJS
-lib/X11/locale/zh_CN.gbk/XLC_LOCALE
-lib/X11/locale/zh_CN/Compose
-lib/X11/locale/zh_CN/XI18N_OBJS
-lib/X11/locale/zh_CN/XLC_LOCALE
-lib/X11/locale/zh_HK.big5/XLC_LOCALE
-lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
-lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_TW.big5/Compose
-lib/X11/locale/zh_TW.big5/XI18N_OBJS
-lib/X11/locale/zh_TW.big5/XLC_LOCALE
-lib/X11/locale/zh_TW/Compose
-lib/X11/locale/zh_TW/XI18N_OBJS
-lib/X11/locale/zh_TW/XLC_LOCALE
-lib/libFS.a
-lib/libGL.a
-lib/libGL.so
-lib/libGL.so.1
-lib/libGLU.a
-lib/libGLU.so
-lib/libGLU.so.1
-lib/libGLw.a
-lib/libICE.a
-lib/libICE.so
-lib/libICE.so.6
-lib/libOSMesa.a
-lib/libOSMesa.so
-lib/libOSMesa.so.4
-lib/libSM.a
-lib/libSM.so
-lib/libSM.so.6
-lib/libX11.a
-lib/libX11.so
-lib/libX11.so.6
-lib/libXRes.a
-lib/libXTrap.a
-lib/libXTrap.so
-lib/libXTrap.so.6
-lib/libXau.a
-lib/libXaw.a
-lib/libXaw.so
-lib/libXaw.so.6
-lib/libXaw.so.7
-lib/libXcursor.a
-lib/libXcursor.so
-lib/libXcursor.so.1
-lib/libXdmcp.a
-lib/libXext.a
-lib/libXext.so
-lib/libXext.so.6
-lib/libXfont.a
-lib/libXfont.so
-lib/libXfont.so.1
-lib/libXfontcache.a
-lib/libXi.a
-lib/libXi.so
-lib/libXi.so.6
-lib/libXinerama.a
-lib/libXinerama.so
-lib/libXinerama.so.1
-lib/libXmu.a
-lib/libXmu.so
-lib/libXmu.so.6
-lib/libXmuu.a
-lib/libXmuu.so
-lib/libXmuu.so.1
-lib/libXp.a
-lib/libXp.so
-lib/libXp.so.6
-lib/libXpm.a
-lib/libXpm.so
-lib/libXpm.so.4
-lib/libXrandr.a
-lib/libXrandr.so
-lib/libXrandr.so.2
-lib/libXrender.a
-lib/libXrender.so
-lib/libXrender.so.1
-lib/libXss.a
-lib/libXt.a
-lib/libXt.so
-lib/libXt.so.6
-lib/libXtst.a
-lib/libXtst.so
-lib/libXtst.so.6
-lib/libXv.a
-lib/libXv.so
-lib/libXv.so.1
-lib/libXvMC.a
-lib/libXxf86dga.a
-lib/libXxf86misc.a
-lib/libXxf86vm.a
-lib/libdps.a
-lib/libdps.so
-lib/libdps.so.1
-lib/libdpstk.a
-lib/libdpstk.so
-lib/libdpstk.so.1
-lib/libfntstubs.a
-lib/libfontenc.a
-lib/liboldX.a
-lib/liboldX.so
-lib/liboldX.so.6
-lib/libpsres.a
-lib/libpsres.so
-lib/libpsres.so.1
-lib/libxf86config.a
-lib/libxkbfile.a
-lib/libxkbui.a
-${IMAKE_LIBMAN_DIR}/Xaw.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/Xcursor.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/Xrandr.${IMAKE_LIBMAN_SUFFIX}
-@dirrm include/DPS
-@dirrm include/GL
-@dirrm include/X11/Xcursor
-@dirrm include/X11/fonts/codeconv
-@dirrm lib/X11/locale/armscii-8
-@dirrm lib/X11/locale/el_GR.UTF-8
-@dirrm lib/X11/locale/en_US.UTF-8
-@dirrm lib/X11/locale/georgian-academy
-@dirrm lib/X11/locale/georgian-ps
-@dirrm lib/X11/locale/ibm-cp1133
-@dirrm lib/X11/locale/iscii-dev
-@dirrm lib/X11/locale/isiri-3342
-@dirrm lib/X11/locale/iso8859-10
-@dirrm lib/X11/locale/iso8859-11
-@dirrm lib/X11/locale/iso8859-13
-@dirrm lib/X11/locale/iso8859-14
-@dirrm lib/X11/locale/iso8859-15
-@dirrm lib/X11/locale/iso8859-9e
-@dirrm lib/X11/locale/ja_JP.UTF-8
-@dirrm lib/X11/locale/ko_KR.UTF-8
-@dirrm lib/X11/locale/koi8-c
-@dirrm lib/X11/locale/koi8-u
-@dirrm lib/X11/locale/lib/common
-@dirrm lib/X11/locale/lib
-@dirrm lib/X11/locale/microsoft-cp1251
-@dirrm lib/X11/locale/microsoft-cp1255
-@dirrm lib/X11/locale/microsoft-cp1256
-@dirrm lib/X11/locale/mulelao-1
-@dirrm lib/X11/locale/nokhchi-1
-@dirrm lib/X11/locale/tatar-cyr
-@dirrm lib/X11/locale/th_TH
-@dirrm lib/X11/locale/th_TH.UTF-8
-@dirrm lib/X11/locale/tscii-0
-@dirrm lib/X11/locale/vi_VN.tcvn
-@dirrm lib/X11/locale/vi_VN.viscii
-@dirrm lib/X11/locale/zh_CN
-@dirrm lib/X11/locale/zh_CN.gbk
-@dirrm lib/X11/locale/zh_HK.big5
-@dirrm lib/X11/locale/zh_HK.big5hkscs
-@dirrm lib/X11/locale/zh_TW.UTF-8
-@dirrm lib/X11/locale/zh_TW.big5
+@comment $NetBSD: PLIST.common,v 1.3 2004/02/02 14:15:27 xtraeme Exp $
+X11R6/bin/xcursor-config
+X11R6/include/DPS/ColorSB.h
+X11R6/include/DPS/ColorSBP.h
+X11R6/include/DPS/DPSScrollW.h
+X11R6/include/DPS/DPSScrollWP.h
+X11R6/include/DPS/FontCreatP.h
+X11R6/include/DPS/FontCreato.h
+X11R6/include/DPS/FontSB.h
+X11R6/include/DPS/FontSBP.h
+X11R6/include/DPS/FontSamplP.h
+X11R6/include/DPS/FontSample.h
+X11R6/include/DPS/PSres.h
+X11R6/include/DPS/XDPS.h
+X11R6/include/DPS/XDPSlib.h
+X11R6/include/DPS/XDPSproto.h
+X11R6/include/DPS/dpsNXargs.h
+X11R6/include/DPS/dpsXclient.h
+X11R6/include/DPS/dpsXcommon.h
+X11R6/include/DPS/dpsXpreview.h
+X11R6/include/DPS/dpsXshare.h
+X11R6/include/DPS/dpsXuserpath.h
+X11R6/include/DPS/dpsclient.h
+X11R6/include/DPS/dpsconfig.h
+X11R6/include/DPS/dpsexcept.h
+X11R6/include/DPS/dpsfriends.h
+X11R6/include/DPS/dpsops.h
+X11R6/include/DPS/psops.h
+X11R6/include/GL/GLwDrawA.h
+X11R6/include/GL/GLwDrawAP.h
+X11R6/include/GL/GLwMDrawA.h
+X11R6/include/GL/GLwMDrawAP.h
+X11R6/include/GL/gl.h
+X11R6/include/GL/glext.h
+X11R6/include/GL/glu.h
+X11R6/include/GL/glx.h
+X11R6/include/GL/glxext.h
+X11R6/include/GL/glxint.h
+X11R6/include/GL/glxmd.h
+X11R6/include/GL/glxproto.h
+X11R6/include/GL/glxtokens.h
+X11R6/include/GL/osmesa.h
+X11R6/include/X11/Composite.h
+X11R6/include/X11/CompositeP.h
+X11R6/include/X11/ConstrainP.h
+X11R6/include/X11/Constraint.h
+X11R6/include/X11/Core.h
+X11R6/include/X11/CoreP.h
+X11R6/include/X11/DECkeysym.h
+X11R6/include/X11/HPkeysym.h
+X11R6/include/X11/ICE/ICE.h
+X11R6/include/X11/ICE/ICEconn.h
+X11R6/include/X11/ICE/ICElib.h
+X11R6/include/X11/ICE/ICEmsg.h
+X11R6/include/X11/ICE/ICEproto.h
+X11R6/include/X11/ICE/ICEutil.h
+X11R6/include/X11/Intrinsic.h
+X11R6/include/X11/IntrinsicP.h
+X11R6/include/X11/Object.h
+X11R6/include/X11/ObjectP.h
+X11R6/include/X11/RectObj.h
+X11R6/include/X11/RectObjP.h
+X11R6/include/X11/SM/SM.h
+X11R6/include/X11/SM/SMlib.h
+X11R6/include/X11/SM/SMproto.h
+X11R6/include/X11/Shell.h
+X11R6/include/X11/ShellP.h
+X11R6/include/X11/StringDefs.h
+X11R6/include/X11/Sunkeysym.h
+X11R6/include/X11/Vendor.h
+X11R6/include/X11/VendorP.h
+X11R6/include/X11/X.h
+X11R6/include/X11/X10.h
+X11R6/include/X11/XF86keysym.h
+X11R6/include/X11/XKBlib.h
+X11R6/include/X11/XWDFile.h
+X11R6/include/X11/Xalloca.h
+X11R6/include/X11/Xarch.h
+X11R6/include/X11/Xatom.h
+X11R6/include/X11/Xauth.h
+X11R6/include/X11/Xaw/AllWidgets.h
+X11R6/include/X11/Xaw/AsciiSink.h
+X11R6/include/X11/Xaw/AsciiSinkP.h
+X11R6/include/X11/Xaw/AsciiSrc.h
+X11R6/include/X11/Xaw/AsciiSrcP.h
+X11R6/include/X11/Xaw/AsciiText.h
+X11R6/include/X11/Xaw/AsciiTextP.h
+X11R6/include/X11/Xaw/Box.h
+X11R6/include/X11/Xaw/BoxP.h
+X11R6/include/X11/Xaw/Cardinals.h
+X11R6/include/X11/Xaw/Command.h
+X11R6/include/X11/Xaw/CommandP.h
+X11R6/include/X11/Xaw/Dialog.h
+X11R6/include/X11/Xaw/DialogP.h
+X11R6/include/X11/Xaw/Form.h
+X11R6/include/X11/Xaw/FormP.h
+X11R6/include/X11/Xaw/Grip.h
+X11R6/include/X11/Xaw/GripP.h
+X11R6/include/X11/Xaw/Label.h
+X11R6/include/X11/Xaw/LabelP.h
+X11R6/include/X11/Xaw/List.h
+X11R6/include/X11/Xaw/ListP.h
+X11R6/include/X11/Xaw/MenuButtoP.h
+X11R6/include/X11/Xaw/MenuButton.h
+X11R6/include/X11/Xaw/MultiSink.h
+X11R6/include/X11/Xaw/MultiSinkP.h
+X11R6/include/X11/Xaw/MultiSrc.h
+X11R6/include/X11/Xaw/MultiSrcP.h
+X11R6/include/X11/Xaw/Paned.h
+X11R6/include/X11/Xaw/PanedP.h
+X11R6/include/X11/Xaw/Panner.h
+X11R6/include/X11/Xaw/PannerP.h
+X11R6/include/X11/Xaw/Porthole.h
+X11R6/include/X11/Xaw/PortholeP.h
+X11R6/include/X11/Xaw/Repeater.h
+X11R6/include/X11/Xaw/RepeaterP.h
+X11R6/include/X11/Xaw/Reports.h
+X11R6/include/X11/Xaw/Scrollbar.h
+X11R6/include/X11/Xaw/ScrollbarP.h
+X11R6/include/X11/Xaw/Simple.h
+X11R6/include/X11/Xaw/SimpleMenP.h
+X11R6/include/X11/Xaw/SimpleMenu.h
+X11R6/include/X11/Xaw/SimpleP.h
+X11R6/include/X11/Xaw/Sme.h
+X11R6/include/X11/Xaw/SmeBSB.h
+X11R6/include/X11/Xaw/SmeBSBP.h
+X11R6/include/X11/Xaw/SmeLine.h
+X11R6/include/X11/Xaw/SmeLineP.h
+X11R6/include/X11/Xaw/SmeP.h
+X11R6/include/X11/Xaw/StripCharP.h
+X11R6/include/X11/Xaw/StripChart.h
+X11R6/include/X11/Xaw/Template.c
+X11R6/include/X11/Xaw/Template.h
+X11R6/include/X11/Xaw/TemplateP.h
+X11R6/include/X11/Xaw/Text.h
+X11R6/include/X11/Xaw/TextP.h
+X11R6/include/X11/Xaw/TextSink.h
+X11R6/include/X11/Xaw/TextSinkP.h
+X11R6/include/X11/Xaw/TextSrc.h
+X11R6/include/X11/Xaw/TextSrcP.h
+X11R6/include/X11/Xaw/Tip.h
+X11R6/include/X11/Xaw/TipP.h
+X11R6/include/X11/Xaw/Toggle.h
+X11R6/include/X11/Xaw/ToggleP.h
+X11R6/include/X11/Xaw/Tree.h
+X11R6/include/X11/Xaw/TreeP.h
+X11R6/include/X11/Xaw/VendorEP.h
+X11R6/include/X11/Xaw/Viewport.h
+X11R6/include/X11/Xaw/ViewportP.h
+X11R6/include/X11/Xaw/XawImP.h
+X11R6/include/X11/Xaw/XawInit.h
+X11R6/include/X11/Xcms.h
+X11R6/include/X11/Xcursor/Xcursor.h
+X11R6/include/X11/Xdefs.h
+X11R6/include/X11/Xdmcp.h
+X11R6/include/X11/Xfuncproto.h
+X11R6/include/X11/Xfuncs.h
+X11R6/include/X11/Xlib.h
+X11R6/include/X11/Xlibint.h
+X11R6/include/X11/Xlocale.h
+X11R6/include/X11/Xmd.h
+X11R6/include/X11/Xmu/Atoms.h
+X11R6/include/X11/Xmu/CharSet.h
+X11R6/include/X11/Xmu/CloseHook.h
+X11R6/include/X11/Xmu/Converters.h
+X11R6/include/X11/Xmu/CurUtil.h
+X11R6/include/X11/Xmu/CvtCache.h
+X11R6/include/X11/Xmu/DisplayQue.h
+X11R6/include/X11/Xmu/Drawing.h
+X11R6/include/X11/Xmu/Editres.h
+X11R6/include/X11/Xmu/EditresP.h
+X11R6/include/X11/Xmu/Error.h
+X11R6/include/X11/Xmu/ExtAgent.h
+X11R6/include/X11/Xmu/Initer.h
+X11R6/include/X11/Xmu/Lookup.h
+X11R6/include/X11/Xmu/Misc.h
+X11R6/include/X11/Xmu/StdCmap.h
+X11R6/include/X11/Xmu/StdSel.h
+X11R6/include/X11/Xmu/SysUtil.h
+X11R6/include/X11/Xmu/WidgetNode.h
+X11R6/include/X11/Xmu/WinUtil.h
+X11R6/include/X11/Xmu/Xct.h
+X11R6/include/X11/Xmu/Xmu.h
+X11R6/include/X11/Xos.h
+X11R6/include/X11/Xos_r.h
+X11R6/include/X11/Xosdefs.h
+X11R6/include/X11/Xpoll.h
+X11R6/include/X11/Xproto.h
+X11R6/include/X11/Xprotostr.h
+X11R6/include/X11/Xresource.h
+X11R6/include/X11/Xthreads.h
+X11R6/include/X11/Xutil.h
+X11R6/include/X11/ap_keysym.h
+X11R6/include/X11/bitmaps/1x1
+X11R6/include/X11/bitmaps/2x2
+X11R6/include/X11/bitmaps/black
+X11R6/include/X11/bitmaps/boxes
+X11R6/include/X11/bitmaps/calculator
+X11R6/include/X11/bitmaps/cntr_ptr
+X11R6/include/X11/bitmaps/cntr_ptrmsk
+X11R6/include/X11/bitmaps/cross_weave
+X11R6/include/X11/bitmaps/dimple1
+X11R6/include/X11/bitmaps/dimple3
+X11R6/include/X11/bitmaps/dot
+X11R6/include/X11/bitmaps/dropbar7
+X11R6/include/X11/bitmaps/dropbar8
+X11R6/include/X11/bitmaps/escherknot
+X11R6/include/X11/bitmaps/flagdown
+X11R6/include/X11/bitmaps/flagup
+X11R6/include/X11/bitmaps/flipped_gray
+X11R6/include/X11/bitmaps/gray
+X11R6/include/X11/bitmaps/gray1
+X11R6/include/X11/bitmaps/gray3
+X11R6/include/X11/bitmaps/grid16
+X11R6/include/X11/bitmaps/grid2
+X11R6/include/X11/bitmaps/grid4
+X11R6/include/X11/bitmaps/grid8
+X11R6/include/X11/bitmaps/hlines2
+X11R6/include/X11/bitmaps/hlines3
+X11R6/include/X11/bitmaps/icon
+X11R6/include/X11/bitmaps/keyboard16
+X11R6/include/X11/bitmaps/left_ptr
+X11R6/include/X11/bitmaps/left_ptrmsk
+X11R6/include/X11/bitmaps/letters
+X11R6/include/X11/bitmaps/light_gray
+X11R6/include/X11/bitmaps/mailempty
+X11R6/include/X11/bitmaps/mailemptymsk
+X11R6/include/X11/bitmaps/mailfull
+X11R6/include/X11/bitmaps/mailfullmsk
+X11R6/include/X11/bitmaps/mensetmanus
+X11R6/include/X11/bitmaps/menu10
+X11R6/include/X11/bitmaps/menu12
+X11R6/include/X11/bitmaps/menu16
+X11R6/include/X11/bitmaps/menu6
+X11R6/include/X11/bitmaps/menu8
+X11R6/include/X11/bitmaps/noletters
+X11R6/include/X11/bitmaps/opendot
+X11R6/include/X11/bitmaps/opendotMask
+X11R6/include/X11/bitmaps/plaid
+X11R6/include/X11/bitmaps/right_ptr
+X11R6/include/X11/bitmaps/right_ptrmsk
+X11R6/include/X11/bitmaps/root_weave
+X11R6/include/X11/bitmaps/scales
+X11R6/include/X11/bitmaps/sipb
+X11R6/include/X11/bitmaps/star
+X11R6/include/X11/bitmaps/starMask
+X11R6/include/X11/bitmaps/stipple
+X11R6/include/X11/bitmaps/target
+X11R6/include/X11/bitmaps/terminal
+X11R6/include/X11/bitmaps/tie_fighter
+X11R6/include/X11/bitmaps/vlines2
+X11R6/include/X11/bitmaps/vlines3
+X11R6/include/X11/bitmaps/weird_size
+X11R6/include/X11/bitmaps/wide_weave
+X11R6/include/X11/bitmaps/wingdogs
+X11R6/include/X11/bitmaps/woman
+X11R6/include/X11/bitmaps/xfd_icon
+X11R6/include/X11/bitmaps/xlogo11
+X11R6/include/X11/bitmaps/xlogo16
+X11R6/include/X11/bitmaps/xlogo32
+X11R6/include/X11/bitmaps/xlogo64
+X11R6/include/X11/bitmaps/xsnow
+X11R6/include/X11/cursorfont.h
+X11R6/include/X11/extensions/MITMisc.h
+X11R6/include/X11/extensions/Print.h
+X11R6/include/X11/extensions/Printstr.h
+X11R6/include/X11/extensions/XEVI.h
+X11R6/include/X11/extensions/XEVIstr.h
+X11R6/include/X11/extensions/XI.h
+X11R6/include/X11/extensions/XIE.h
+X11R6/include/X11/extensions/XIEproto.h
+X11R6/include/X11/extensions/XIEprotost.h
+X11R6/include/X11/extensions/XInput.h
+X11R6/include/X11/extensions/XIproto.h
+X11R6/include/X11/extensions/XKB.h
+X11R6/include/X11/extensions/XKBbells.h
+X11R6/include/X11/extensions/XKBconfig.h
+X11R6/include/X11/extensions/XKBfile.h
+X11R6/include/X11/extensions/XKBgeom.h
+X11R6/include/X11/extensions/XKBproto.h
+X11R6/include/X11/extensions/XKBrules.h
+X11R6/include/X11/extensions/XKBsrv.h
+X11R6/include/X11/extensions/XKBstr.h
+X11R6/include/X11/extensions/XKBui.h
+X11R6/include/X11/extensions/XKM.h
+X11R6/include/X11/extensions/XKMformat.h
+X11R6/include/X11/extensions/XLbx.h
+X11R6/include/X11/extensions/XRes.h
+X11R6/include/X11/extensions/XResproto.h
+X11R6/include/X11/extensions/XShm.h
+X11R6/include/X11/extensions/XTest.h
+X11R6/include/X11/extensions/Xag.h
+X11R6/include/X11/extensions/Xagsrv.h
+X11R6/include/X11/extensions/Xagstr.h
+X11R6/include/X11/extensions/Xcup.h
+X11R6/include/X11/extensions/Xcupstr.h
+X11R6/include/X11/extensions/Xdbe.h
+X11R6/include/X11/extensions/Xdbeproto.h
+X11R6/include/X11/extensions/Xext.h
+X11R6/include/X11/extensions/Xinerama.h
+X11R6/include/X11/extensions/Xrandr.h
+X11R6/include/X11/extensions/Xrender.h
+X11R6/include/X11/extensions/Xv.h
+X11R6/include/X11/extensions/XvMC.h
+X11R6/include/X11/extensions/XvMClib.h
+X11R6/include/X11/extensions/XvMCproto.h
+X11R6/include/X11/extensions/Xvlib.h
+X11R6/include/X11/extensions/Xvproto.h
+X11R6/include/X11/extensions/bigreqstr.h
+X11R6/include/X11/extensions/dpms.h
+X11R6/include/X11/extensions/dpmsstr.h
+X11R6/include/X11/extensions/extutil.h
+X11R6/include/X11/extensions/fontcache.h
+X11R6/include/X11/extensions/fontcacheP.h
+X11R6/include/X11/extensions/fontcachstr.h
+X11R6/include/X11/extensions/lbxbuf.h
+X11R6/include/X11/extensions/lbxbufstr.h
+X11R6/include/X11/extensions/lbxdeltastr.h
+X11R6/include/X11/extensions/lbximage.h
+X11R6/include/X11/extensions/lbxopts.h
+X11R6/include/X11/extensions/lbxstr.h
+X11R6/include/X11/extensions/lbxzlib.h
+X11R6/include/X11/extensions/mitmiscstr.h
+X11R6/include/X11/extensions/multibuf.h
+X11R6/include/X11/extensions/multibufst.h
+X11R6/include/X11/extensions/panoramiXext.h
+X11R6/include/X11/extensions/panoramiXproto.h
+X11R6/include/X11/extensions/randr.h
+X11R6/include/X11/extensions/randrproto.h
+X11R6/include/X11/extensions/record.h
+X11R6/include/X11/extensions/recordstr.h
+X11R6/include/X11/extensions/render.h
+X11R6/include/X11/extensions/renderproto.h
+X11R6/include/X11/extensions/saver.h
+X11R6/include/X11/extensions/saverproto.h
+X11R6/include/X11/extensions/scrnsaver.h
+X11R6/include/X11/extensions/security.h
+X11R6/include/X11/extensions/securstr.h
+X11R6/include/X11/extensions/shape.h
+X11R6/include/X11/extensions/shapestr.h
+X11R6/include/X11/extensions/shmstr.h
+X11R6/include/X11/extensions/sync.h
+X11R6/include/X11/extensions/syncstr.h
+X11R6/include/X11/extensions/xcmiscstr.h
+X11R6/include/X11/extensions/xf86bigfont.h
+X11R6/include/X11/extensions/xf86bigfstr.h
+X11R6/include/X11/extensions/xf86dga.h
+X11R6/include/X11/extensions/xf86dga1.h
+X11R6/include/X11/extensions/xf86dga1str.h
+X11R6/include/X11/extensions/xf86dgastr.h
+X11R6/include/X11/extensions/xf86misc.h
+X11R6/include/X11/extensions/xf86mscstr.h
+X11R6/include/X11/extensions/xf86vmode.h
+X11R6/include/X11/extensions/xf86vmstr.h
+X11R6/include/X11/extensions/xtestext1.h
+X11R6/include/X11/extensions/xteststr.h
+X11R6/include/X11/extensions/xtrapbits.h
+X11R6/include/X11/extensions/xtrapddmi.h
+X11R6/include/X11/extensions/xtrapdi.h
+X11R6/include/X11/extensions/xtrapemacros.h
+X11R6/include/X11/extensions/xtraplib.h
+X11R6/include/X11/extensions/xtraplibp.h
+X11R6/include/X11/extensions/xtrapproto.h
+X11R6/include/X11/fonts/FS.h
+X11R6/include/X11/fonts/FSlib.h
+X11R6/include/X11/fonts/FSproto.h
+X11R6/include/X11/fonts/codeconv/cconvversion.h
+X11R6/include/X11/fonts/codeconv/xttcap.h
+X11R6/include/X11/fonts/codeconv/xttcconv.h
+X11R6/include/X11/fonts/codeconv/xttcconvP.h
+X11R6/include/X11/fonts/codeconv/xttcommon.h
+X11R6/include/X11/fonts/codeconv/xttversion.h
+X11R6/include/X11/fonts/fontenc.h
+X11R6/include/X11/fonts/fsmasks.h
+X11R6/include/X11/keysym.h
+X11R6/include/X11/keysymdef.h
+X11R6/include/X11/xpm.h
+X11R6/include/xf86Optrec.h
+X11R6/include/xf86Parser.h
+X11R6/lib/X11/XErrorDB
+X11R6/lib/X11/XKeysymDB
+X11R6/lib/X11/Xcms.txt
+X11R6/lib/X11/locale/C/XI18N_OBJS
+X11R6/lib/X11/locale/C/XLC_LOCALE
+X11R6/lib/X11/locale/armscii-8/Compose
+X11R6/lib/X11/locale/armscii-8/XI18N_OBJS
+X11R6/lib/X11/locale/armscii-8/XLC_LOCALE
+X11R6/lib/X11/locale/compose.dir
+X11R6/lib/X11/locale/el_GR.UTF-8/Compose
+X11R6/lib/X11/locale/en_US.UTF-8/Compose
+X11R6/lib/X11/locale/en_US.UTF-8/XI18N_OBJS
+X11R6/lib/X11/locale/en_US.UTF-8/XLC_LOCALE
+X11R6/lib/X11/locale/georgian-academy/Compose
+X11R6/lib/X11/locale/georgian-academy/XI18N_OBJS
+X11R6/lib/X11/locale/georgian-academy/XLC_LOCALE
+X11R6/lib/X11/locale/georgian-ps/Compose
+X11R6/lib/X11/locale/georgian-ps/XI18N_OBJS
+X11R6/lib/X11/locale/georgian-ps/XLC_LOCALE
+X11R6/lib/X11/locale/ibm-cp1133/Compose
+X11R6/lib/X11/locale/ibm-cp1133/XI18N_OBJS
+X11R6/lib/X11/locale/ibm-cp1133/XLC_LOCALE
+X11R6/lib/X11/locale/iscii-dev/XI18N_OBJS
+X11R6/lib/X11/locale/iscii-dev/XLC_LOCALE
+X11R6/lib/X11/locale/isiri-3342/XI18N_OBJS
+X11R6/lib/X11/locale/isiri-3342/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-1/Compose
+X11R6/lib/X11/locale/iso8859-1/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-1/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-10/Compose
+X11R6/lib/X11/locale/iso8859-10/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-10/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-11/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-11/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-13/Compose
+X11R6/lib/X11/locale/iso8859-13/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-13/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-14/Compose
+X11R6/lib/X11/locale/iso8859-14/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-14/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-15/Compose
+X11R6/lib/X11/locale/iso8859-15/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-15/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-2/Compose
+X11R6/lib/X11/locale/iso8859-2/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-2/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-3/Compose
+X11R6/lib/X11/locale/iso8859-3/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-3/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-4/Compose
+X11R6/lib/X11/locale/iso8859-4/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-4/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-5/Compose
+X11R6/lib/X11/locale/iso8859-5/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-5/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-6/Compose
+X11R6/lib/X11/locale/iso8859-6/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-6/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-7/Compose
+X11R6/lib/X11/locale/iso8859-7/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-7/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-8/Compose
+X11R6/lib/X11/locale/iso8859-8/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-8/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-9/Compose
+X11R6/lib/X11/locale/iso8859-9/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-9/XLC_LOCALE
+X11R6/lib/X11/locale/iso8859-9e/Compose
+X11R6/lib/X11/locale/iso8859-9e/XI18N_OBJS
+X11R6/lib/X11/locale/iso8859-9e/XLC_LOCALE
+X11R6/lib/X11/locale/ja.JIS/Compose
+X11R6/lib/X11/locale/ja.JIS/XI18N_OBJS
+X11R6/lib/X11/locale/ja.JIS/XLC_LOCALE
+X11R6/lib/X11/locale/ja.SJIS/Compose
+X11R6/lib/X11/locale/ja.SJIS/XI18N_OBJS
+X11R6/lib/X11/locale/ja.SJIS/XLC_LOCALE
+X11R6/lib/X11/locale/ja/Compose
+X11R6/lib/X11/locale/ja/XI18N_OBJS
+X11R6/lib/X11/locale/ja/XLC_LOCALE
+X11R6/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+X11R6/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+X11R6/lib/X11/locale/ko/Compose
+X11R6/lib/X11/locale/ko/XI18N_OBJS
+X11R6/lib/X11/locale/ko/XLC_LOCALE
+X11R6/lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+X11R6/lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+X11R6/lib/X11/locale/koi8-c/Compose
+X11R6/lib/X11/locale/koi8-c/XI18N_OBJS
+X11R6/lib/X11/locale/koi8-c/XLC_LOCALE
+X11R6/lib/X11/locale/koi8-r/Compose
+X11R6/lib/X11/locale/koi8-r/XI18N_OBJS
+X11R6/lib/X11/locale/koi8-r/XLC_LOCALE
+X11R6/lib/X11/locale/koi8-u/Compose
+X11R6/lib/X11/locale/koi8-u/XI18N_OBJS
+X11R6/lib/X11/locale/koi8-u/XLC_LOCALE
+X11R6/lib/X11/locale/lib/common/ximcp.so.2
+X11R6/lib/X11/locale/lib/common/xlcDef.so.2
+X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2
+X11R6/lib/X11/locale/lib/common/xlibi18n.so.2
+X11R6/lib/X11/locale/lib/common/xlocale.so.2
+X11R6/lib/X11/locale/lib/common/xomGeneric.so.2
+X11R6/lib/X11/locale/locale.alias
+X11R6/lib/X11/locale/locale.dir
+X11R6/lib/X11/locale/microsoft-cp1251/XI18N_OBJS
+X11R6/lib/X11/locale/microsoft-cp1251/XLC_LOCALE
+X11R6/lib/X11/locale/microsoft-cp1255/XI18N_OBJS
+X11R6/lib/X11/locale/microsoft-cp1255/XLC_LOCALE
+X11R6/lib/X11/locale/microsoft-cp1256/XI18N_OBJS
+X11R6/lib/X11/locale/microsoft-cp1256/XLC_LOCALE
+X11R6/lib/X11/locale/mulelao-1/Compose
+X11R6/lib/X11/locale/mulelao-1/XI18N_OBJS
+X11R6/lib/X11/locale/mulelao-1/XLC_LOCALE
+X11R6/lib/X11/locale/nokhchi-1/XI18N_OBJS
+X11R6/lib/X11/locale/nokhchi-1/XLC_LOCALE
+X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS
+X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
+X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
+X11R6/lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
+X11R6/lib/X11/locale/th_TH/XI18N_OBJS
+X11R6/lib/X11/locale/th_TH/XLC_LOCALE
+X11R6/lib/X11/locale/tscii-0/XI18N_OBJS
+X11R6/lib/X11/locale/tscii-0/XLC_LOCALE
+X11R6/lib/X11/locale/vi_VN.tcvn/Compose
+X11R6/lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
+X11R6/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
+X11R6/lib/X11/locale/vi_VN.viscii/Compose
+X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
+X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+X11R6/lib/X11/locale/zh_CN.gbk/Compose
+X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
+X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
+X11R6/lib/X11/locale/zh_CN/Compose
+X11R6/lib/X11/locale/zh_CN/XI18N_OBJS
+X11R6/lib/X11/locale/zh_CN/XLC_LOCALE
+X11R6/lib/X11/locale/zh_HK.big5/XLC_LOCALE
+X11R6/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
+X11R6/lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
+X11R6/lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
+X11R6/lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+X11R6/lib/X11/locale/zh_TW.big5/Compose
+X11R6/lib/X11/locale/zh_TW.big5/XI18N_OBJS
+X11R6/lib/X11/locale/zh_TW.big5/XLC_LOCALE
+X11R6/lib/X11/locale/zh_TW/Compose
+X11R6/lib/X11/locale/zh_TW/XI18N_OBJS
+X11R6/lib/X11/locale/zh_TW/XLC_LOCALE
+X11R6/lib/libFS.a
+X11R6/lib/libGL.a
+X11R6/lib/libGL.so
+X11R6/lib/libGL.so.1
+X11R6/lib/libGLU.a
+X11R6/lib/libGLU.so
+X11R6/lib/libGLU.so.1
+X11R6/lib/libGLw.a
+X11R6/lib/libICE.a
+X11R6/lib/libICE.so
+X11R6/lib/libICE.so.6
+X11R6/lib/libOSMesa.a
+X11R6/lib/libOSMesa.so
+X11R6/lib/libOSMesa.so.4
+X11R6/lib/libSM.a
+X11R6/lib/libSM.so
+X11R6/lib/libSM.so.6
+X11R6/lib/libX11.a
+X11R6/lib/libX11.so
+X11R6/lib/libX11.so.6
+X11R6/lib/libXRes.a
+X11R6/lib/libXTrap.a
+X11R6/lib/libXTrap.so
+X11R6/lib/libXTrap.so.6
+X11R6/lib/libXau.a
+X11R6/lib/libXaw.a
+X11R6/lib/libXaw.so
+X11R6/lib/libXaw.so.6
+X11R6/lib/libXaw.so.7
+X11R6/lib/libXcursor.a
+X11R6/lib/libXcursor.so
+X11R6/lib/libXcursor.so.1
+X11R6/lib/libXdmcp.a
+X11R6/lib/libXext.a
+X11R6/lib/libXext.so
+X11R6/lib/libXext.so.6
+X11R6/lib/libXfont.a
+X11R6/lib/libXfont.so
+X11R6/lib/libXfont.so.1
+X11R6/lib/libXfontcache.a
+X11R6/lib/libXi.a
+X11R6/lib/libXi.so
+X11R6/lib/libXi.so.6
+X11R6/lib/libXinerama.a
+X11R6/lib/libXinerama.so
+X11R6/lib/libXinerama.so.1
+X11R6/lib/libXmu.a
+X11R6/lib/libXmu.so
+X11R6/lib/libXmu.so.6
+X11R6/lib/libXmuu.a
+X11R6/lib/libXmuu.so
+X11R6/lib/libXmuu.so.1
+X11R6/lib/libXp.a
+X11R6/lib/libXp.so
+X11R6/lib/libXp.so.6
+X11R6/lib/libXpm.a
+X11R6/lib/libXpm.so
+X11R6/lib/libXpm.so.4
+X11R6/lib/libXrandr.a
+X11R6/lib/libXrandr.so
+X11R6/lib/libXrandr.so.2
+X11R6/lib/libXrender.a
+X11R6/lib/libXrender.so
+X11R6/lib/libXrender.so.1
+X11R6/lib/libXss.a
+X11R6/lib/libXt.a
+X11R6/lib/libXt.so
+X11R6/lib/libXt.so.6
+X11R6/lib/libXtst.a
+X11R6/lib/libXtst.so
+X11R6/lib/libXtst.so.6
+X11R6/lib/libXv.a
+X11R6/lib/libXv.so
+X11R6/lib/libXv.so.1
+X11R6/lib/libXvMC.a
+X11R6/lib/libXxf86dga.a
+X11R6/lib/libXxf86misc.a
+X11R6/lib/libXxf86vm.a
+X11R6/lib/libdps.a
+X11R6/lib/libdps.so
+X11R6/lib/libdps.so.1
+X11R6/lib/libdpstk.a
+X11R6/lib/libdpstk.so
+X11R6/lib/libdpstk.so.1
+X11R6/lib/libfntstubs.a
+X11R6/lib/libfontenc.a
+X11R6/lib/liboldX.a
+X11R6/lib/liboldX.so
+X11R6/lib/liboldX.so.6
+X11R6/lib/libpsres.a
+X11R6/lib/libpsres.so
+X11R6/lib/libpsres.so.1
+X11R6/lib/libxf86config.a
+X11R6/lib/libxkbfile.a
+X11R6/lib/libxkbui.a
+X11R6/${IMAKE_LIBMAN_DIR}/Xaw.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/Xcursor.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/Xrandr.${MANPAGE_SUFFIX}
+@dirrm X11R6/include/DPS
+@dirrm X11R6/include/GL
+@dirrm X11R6/include/X11/Xcursor
+@dirrm X11R6/include/X11/fonts/codeconv
+@dirrm X11R6/lib/X11/locale/armscii-8
+@dirrm X11R6/lib/X11/locale/el_GR.UTF-8
+@dirrm X11R6/lib/X11/locale/en_US.UTF-8
+@dirrm X11R6/lib/X11/locale/georgian-academy
+@dirrm X11R6/lib/X11/locale/georgian-ps
+@dirrm X11R6/lib/X11/locale/ibm-cp1133
+@dirrm X11R6/lib/X11/locale/iscii-dev
+@dirrm X11R6/lib/X11/locale/isiri-3342
+@dirrm X11R6/lib/X11/locale/iso8859-10
+@dirrm X11R6/lib/X11/locale/iso8859-11
+@dirrm X11R6/lib/X11/locale/iso8859-13
+@dirrm X11R6/lib/X11/locale/iso8859-14
+@dirrm X11R6/lib/X11/locale/iso8859-15
+@dirrm X11R6/lib/X11/locale/iso8859-9e
+@dirrm X11R6/lib/X11/locale/ja_JP.UTF-8
+@dirrm X11R6/lib/X11/locale/ko_KR.UTF-8
+@dirrm X11R6/lib/X11/locale/koi8-c
+@dirrm X11R6/lib/X11/locale/koi8-u
+@dirrm X11R6/lib/X11/locale/lib/common
+@dirrm X11R6/lib/X11/locale/lib
+@dirrm X11R6/lib/X11/locale/microsoft-cp1251
+@dirrm X11R6/lib/X11/locale/microsoft-cp1255
+@dirrm X11R6/lib/X11/locale/microsoft-cp1256
+@dirrm X11R6/lib/X11/locale/mulelao-1
+@dirrm X11R6/lib/X11/locale/nokhchi-1
+@dirrm X11R6/lib/X11/locale/tatar-cyr
+@dirrm X11R6/lib/X11/locale/th_TH
+@dirrm X11R6/lib/X11/locale/th_TH.UTF-8
+@dirrm X11R6/lib/X11/locale/tscii-0
+@dirrm X11R6/lib/X11/locale/vi_VN.tcvn
+@dirrm X11R6/lib/X11/locale/vi_VN.viscii
+@dirrm X11R6/lib/X11/locale/zh_CN
+@dirrm X11R6/lib/X11/locale/zh_CN.gbk
+@dirrm X11R6/lib/X11/locale/zh_HK.big5
+@dirrm X11R6/lib/X11/locale/zh_HK.big5hkscs
+@dirrm X11R6/lib/X11/locale/zh_TW.UTF-8
+@dirrm X11R6/lib/X11/locale/zh_TW.big5
diff --git a/x11/XFree86-libs/buildlink2.mk b/x11/XFree86-libs/buildlink2.mk
index a9a341ca81a..30e62089a97 100644
--- a/x11/XFree86-libs/buildlink2.mk
+++ b/x11/XFree86-libs/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/01/24 08:47:27 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/02/02 14:15:27 xtraeme Exp $
 #
 # This Makefile fragment is included by packages that use XFree86-libs.
 #
@@ -15,65 +15,65 @@ BUILDLINK_DEPENDS.XFree86-libs?=		XFree86-libs>=4.3.0
 BUILDLINK_PKGSRCDIR.XFree86-libs?=		../../x11/XFree86-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.XFree86-libs=XFree86-libs
-BUILDLINK_PREFIX.XFree86-libs_DEFAULT=	${X11BASE}
-BUILDLINK_FILES.XFree86-libs+=	include/DPS/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/GL/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/X11/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/X11/ICE/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/X11/SM/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/X11/Xaw/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/X11/Xcursor/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/X11/Xmu/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/X11/extensions/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/X11/fonts/*.h
-BUILDLINK_FILES.XFree86-libs+=	include/*.h
-BUILDLINK_FILES.XFree86-libs+=	lib/X11/locale/lib/common/ximcp.*
-BUILDLINK_FILES.XFree86-libs+=	lib/X11/locale/lib/common/xlcDef.*
-BUILDLINK_FILES.XFree86-libs+=	lib/X11/locale/lib/common/xlcUTF8Load.*
-BUILDLINK_FILES.XFree86-libs+=	lib/X11/locale/lib/common/xlibi18n.*
-BUILDLINK_FILES.XFree86-libs+=	lib/X11/locale/lib/common/xlocale.*
-BUILDLINK_FILES.XFree86-libs+=	lib/X11/locale/lib/common/xomGeneric.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libGLw.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libICE.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libSM.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libX11.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXRes.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXTrap.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXau.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXaw.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXcursor.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXdmcp.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXext.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXfont.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXfontcache.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXi.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXinerama.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXmu.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXmuu.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXp.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXpm.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXrandr.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXrender.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXss.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXt.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXtst.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXv.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXvMC.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXxf86dga.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXxf86misc.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libXxf86vm.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libdps.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libdpstk.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libfntstubs.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libfontenc.*
-BUILDLINK_FILES.XFree86-libs+=	lib/liboldX.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libpsres.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libxf86config.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libxkbfile.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libxkbui.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libGL.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libGLU.*
-BUILDLINK_FILES.XFree86-libs+=	lib/libOSMesa.*
+BUILDLINK_PREFIX.XFree86-libs_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/DPS/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/GL/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/X11/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/X11/ICE/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/X11/SM/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/X11/Xaw/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/X11/Xcursor/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/X11/Xmu/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/X11/extensions/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/X11/fonts/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/include/*.h
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/X11/locale/lib/common/ximcp.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/X11/locale/lib/common/xlcDef.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/X11/locale/lib/common/xlcUTF8Load.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/X11/locale/lib/common/xlibi18n.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/X11/locale/lib/common/xlocale.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/X11/locale/lib/common/xomGeneric.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libGLw.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libICE.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libSM.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libX11.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXRes.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXTrap.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXau.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXaw.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXcursor.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXdmcp.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXext.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXfont.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXfontcache.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXi.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXinerama.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXmu.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXmuu.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXp.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXpm.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXrandr.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXrender.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXss.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXt.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXtst.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXv.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXvMC.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXxf86dga.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXxf86misc.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libXxf86vm.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libdps.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libdpstk.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libfntstubs.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libfontenc.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/liboldX.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libpsres.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libxf86config.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libxkbfile.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libxkbui.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libGL.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libGLU.*
+BUILDLINK_FILES.XFree86-libs+=	X11R6/lib/libOSMesa.*
 
 .include "../../fonts/fontconfig/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index b374e518004..ada8e0386e1 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/01/31 16:55:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/02 14:16:44 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-server-${XF_VER}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
 DISTFILES=		X430src-1.tgz X430src-2.tgz \
@@ -24,6 +25,14 @@ XINSTALL_MAN_DIRS=	programs/Xserver
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "NetBSD"
+PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX}
+PLIST_SUBST+=		MANPAGE_LIB_SUFFIX=${IMAKE_MANNEWSUFFIX}
+.else
+PLIST_SUBST+=		MANPAGE_LIB_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
+PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
+.endif
+
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
 PLIST_SUBST+=		DRIMODULES=
 USE_PERL5=		yes # Still we need perl (at least for now)
diff --git a/x11/XFree86-server/PLIST b/x11/XFree86-server/PLIST
index 65f77236551..f2e0338ee95 100644
--- a/x11/XFree86-server/PLIST
+++ b/x11/XFree86-server/PLIST
@@ -1,290 +1,290 @@
-@comment $NetBSD: PLIST,v 1.2 2004/01/31 16:57:56 xtraeme Exp $
-bin/X
-bin/XFree86
-bin/Xnest
-bin/Xprt
-bin/Xvfb
-bin/gtf
-bin/inb
-bin/inl
-bin/inw
-bin/ioport
-${KBDMODE}bin/kbd_mode
-bin/mmapr
-bin/mmapw
-bin/outb
-bin/outl
-bin/outw
-bin/pcitweak
-bin/scanpci
-bin/xf86cfg
-bin/xf86config
-include/X11/bitmaps/card.xbm
-include/X11/bitmaps/down.xbm
-include/X11/bitmaps/keyboard.xbm
-include/X11/bitmaps/left.xbm
-include/X11/bitmaps/monitor.xbm
-include/X11/bitmaps/mouse.xbm
-include/X11/bitmaps/narrower.xbm
-include/X11/bitmaps/right.xbm
-include/X11/bitmaps/shorter.xbm
-include/X11/bitmaps/taller.xbm
-include/X11/bitmaps/up.xbm
-include/X11/bitmaps/wider.xbm
-include/X11/pixmaps/card.xpm
-include/X11/pixmaps/computer.xpm
-include/X11/pixmaps/keyboard.xpm
-include/X11/pixmaps/monitor.xpm
-include/X11/pixmaps/mouse.xpm
-lib/X11/Cards
-lib/X11/Options
-lib/X11/XF86Config.98
-lib/X11/XF86Config.eg
-lib/X11/app-defaults/XF86Cfg
-lib/X11/doc/BUILD
-lib/X11/doc/BugReport
-lib/X11/doc/DESIGN
-lib/X11/doc/Install
-lib/X11/doc/LICENSE
-lib/X11/doc/README
-lib/X11/doc/README.DECtga
-lib/X11/doc/README.DGA
-lib/X11/doc/README.DRI
-lib/X11/doc/README.DRIcomp
-lib/X11/doc/README.I128
-lib/X11/doc/README.SiS
-lib/X11/doc/README.XKB-Config
-lib/X11/doc/README.XKB-Enhancing
-lib/X11/doc/README.apm
-lib/X11/doc/README.ati
-lib/X11/doc/README.chips
-lib/X11/doc/README.cyrix
-lib/X11/doc/README.dps
-lib/X11/doc/README.fonts
-lib/X11/doc/README.i740
-lib/X11/doc/README.i810
-lib/X11/doc/README.mouse
-lib/X11/doc/README.newport
-lib/X11/doc/README.r128
-lib/X11/doc/README.rapidaccess
-lib/X11/doc/README.rendition
-lib/X11/doc/README.s3virge
-lib/X11/doc/RELNOTES
-lib/X11/doc/ServersOnly
-lib/X11/doc/Status
-lib/X11/doc/Versions
-lib/X11/doc/VideoBoard98
-lib/X11/etc/Xinstall.sh
-lib/X11/etc/xmodmap.std
-lib/X11/xserver/SecurityPolicy
-lib/modules/codeconv/libARABIC.a
-lib/modules/codeconv/libARMSCII8.a
-lib/modules/codeconv/libBIG5.a
-lib/modules/codeconv/libBIG5HKSCS.a
-lib/modules/codeconv/libDOSENCODING.a
-lib/modules/codeconv/libGB2312.a
-lib/modules/codeconv/libGBK.a
-lib/modules/codeconv/libGEORGIAN.a
-lib/modules/codeconv/libISO8859_1.a
-lib/modules/codeconv/libISO8859_10.a
-lib/modules/codeconv/libISO8859_11.a
-lib/modules/codeconv/libISO8859_14.a
-lib/modules/codeconv/libISO8859_15.a
-lib/modules/codeconv/libISO8859_2.a
-lib/modules/codeconv/libISO8859_3.a
-lib/modules/codeconv/libISO8859_4.a
-lib/modules/codeconv/libISO8859_5.a
-lib/modules/codeconv/libISO8859_6.a
-lib/modules/codeconv/libISO8859_7.a
-lib/modules/codeconv/libISO8859_8.a
-lib/modules/codeconv/libISO8859_9.a
-lib/modules/codeconv/libJISX0201.a
-lib/modules/codeconv/libJISX0208.a
-lib/modules/codeconv/libJISX0212.a
-lib/modules/codeconv/libKOI8.a
-lib/modules/codeconv/libKSC5601.a
-lib/modules/codeconv/libKSCJOHAB.a
-lib/modules/codeconv/libMULEENCODING.a
-lib/modules/codeconv/libTCVN.a
-lib/modules/codeconv/libVISCII.a
-${LIBDRI}lib/modules/extensions/libdri.a
-${DRIMODULES}lib/modules/dri/gamma_dri.so
-${DRIMODULES}lib/modules/dri/i810_dri.so
-${DRIMODULES}lib/modules/dri/i830_dri.so
-${DRIMODULES}lib/modules/dri/mga_dri.so
-${DRIMODULES}lib/modules/dri/r128_dri.so
-${DRIMODULES}lib/modules/dri/r200_dri.so
-${DRIMODULES}lib/modules/dri/radeon_dri.so
-${DRIMODULES}lib/modules/dri/tdfx_dri.so
-lib/modules/drivers/apm_drv.o
-lib/modules/drivers/ark_drv.o
-lib/modules/drivers/ati_drv.o
-lib/modules/drivers/atimisc_drv.o
-lib/modules/drivers/chips_drv.o
-lib/modules/drivers/cirrus_alpine.o
-lib/modules/drivers/cirrus_drv.o
-lib/modules/drivers/cirrus_laguna.o
-lib/modules/drivers/cyrix_drv.o
-lib/modules/drivers/glint_drv.o
-lib/modules/drivers/i128_drv.o
-lib/modules/drivers/i740_drv.o
-lib/modules/drivers/i810_drv.o
-lib/modules/drivers/mga_drv.o
-lib/modules/drivers/neomagic_drv.o
-lib/modules/drivers/nsc_drv.o
-lib/modules/drivers/nv_drv.o
-lib/modules/drivers/r128_drv.o
-lib/modules/drivers/radeon_drv.o
-lib/modules/drivers/rendition_drv.o
-lib/modules/drivers/s3_drv.o
-lib/modules/drivers/s3virge_drv.o
-lib/modules/drivers/savage_drv.o
-lib/modules/drivers/siliconmotion_drv.o
-lib/modules/drivers/sis_drv.o
-lib/modules/drivers/tdfx_drv.o
-lib/modules/drivers/tga_drv.o
-lib/modules/drivers/trident_drv.o
-lib/modules/drivers/tseng_drv.o
-lib/modules/drivers/vesa_drv.o
-lib/modules/drivers/vga_drv.o
-lib/modules/drivers/vmware_drv.o
-lib/modules/extensions/libGLcore.a
-lib/modules/extensions/libdbe.a
-lib/modules/extensions/libextmod.a
-lib/modules/extensions/libglx.a
-lib/modules/extensions/librecord.a
-lib/modules/extensions/libxtrap.a
-lib/modules/fonts/libbitmap.a
-lib/modules/fonts/libfreetype.a
-lib/modules/fonts/libspeedo.a
-lib/modules/fonts/libtype1.a
-lib/modules/fonts/libxtt.a
-lib/modules/input/calcomp_drv.o
-lib/modules/input/citron_drv.o
-lib/modules/input/digitaledge_drv.o
-lib/modules/input/dmc_drv.o
-lib/modules/input/dynapro_drv.o
-lib/modules/input/elographics_drv.o
-lib/modules/input/fpit_drv.o
-lib/modules/input/hyperpen_drv.o
-lib/modules/input/js_x_drv.o
-lib/modules/input/kbd_drv.o
-lib/modules/input/magellan_drv.o
-lib/modules/input/microtouch_drv.o
-lib/modules/input/mouse_drv.o
-lib/modules/input/mutouch_drv.o
-lib/modules/input/palmax_drv.o
-lib/modules/input/penmount_drv.o
-lib/modules/input/spaceorb_drv.o
-lib/modules/input/summa_drv.o
-lib/modules/input/tek4957_drv.o
-lib/modules/input/void_drv.o
-lib/modules/input/wacom_drv.o
-lib/modules/libafb.a
-lib/modules/libcfb.a
-lib/modules/libcfb16.a
-lib/modules/libcfb24.a
-lib/modules/libcfb32.a
-lib/modules/libddc.a
-lib/modules/libfb.a
-lib/modules/libi2c.a
-lib/modules/libint10.a
-lib/modules/liblayer.a
-lib/modules/libmfb.a
-lib/modules/libpcidata.a
-lib/modules/librac.a
-lib/modules/libramdac.a
-lib/modules/libscanpci.a
-lib/modules/libshadow.a
-lib/modules/libshadowfb.a
-lib/modules/libvbe.a
-lib/modules/libvgahw.a
-lib/modules/libxaa.a
-lib/modules/libxf1bpp.a
-lib/modules/libxf24_32bpp.a
-lib/modules/libxf4bpp.a
-lib/modules/libxf8_16bpp.a
-lib/modules/libxf8_32bpp.a
-lib/modules/v10002d.uc
-lib/modules/v20002d.uc
-${IMAKE_MAN_DIR}/XFree86.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/Xnest.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/Xserver.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/Xvfb.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/gtf.${IMAKE_MANNEWSUFFIX}
-${KBDMODE}${IMAKE_MAN_DIR}/kbd_mode.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/pcitweak.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/scanpci.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xf86cfg.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xf86config.${IMAKE_MANNEWSUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidMode.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeDeleteModeLine.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetAllModeLines.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetDotClocks.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetGamma.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRamp.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetModeLine.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetMonitor.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetPermissions.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetViewPort.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeLockModeSwitch.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeModModeLine.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeQueryExtension.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeQueryVersion.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSetClientVersion.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSetGamma.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSetGammaRamp.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSetViewPort.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchMode.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchToMode.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeValidateModeLine.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/apm.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/cirrus.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/citron.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/cyrix.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/chips.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/dmc.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/dynapro.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/elographics.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/fbdevhw.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/fpit.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/glint.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/i128.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/i740.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/i810.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/js_x.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/kbd.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/keyboard.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/mga.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/microtouch.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/mouse.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/mutouch.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/neomagic.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/nsc.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/nv.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/palmax.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/penmount.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/r128.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/radeon.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/rendition.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/s3virge.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/savage.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/siliconmotion.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/sis.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/tdfx.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/tek4957.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/trident.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/tseng.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/vesa.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/vga.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/vmware.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/void.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/wacom.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_FILEMAN_DIR}/XF86Config.${IMAKE_FILEMAN_SUFFIX}
-@dirrm lib/modules/input
-@dirrm lib/modules/fonts
-@dirrm lib/modules/extensions
-@dirrm lib/modules/drivers
-@dirrm lib/X11/xserver
-@dirrm include/X11/pixmaps
+@comment $NetBSD: PLIST,v 1.3 2004/02/02 14:16:44 xtraeme Exp $
+X11R6/bin/X
+X11R6/bin/XFree86
+X11R6/bin/Xnest
+X11R6/bin/Xprt
+X11R6/bin/Xvfb
+X11R6/bin/gtf
+X11R6/bin/inb
+X11R6/bin/inl
+X11R6/bin/inw
+X11R6/bin/ioport
+${KBDMODE}X11R6/bin/kbd_mode
+X11R6/bin/mmapr
+X11R6/bin/mmapw
+X11R6/bin/outb
+X11R6/bin/outl
+X11R6/bin/outw
+X11R6/bin/pcitweak
+X11R6/bin/scanpci
+X11R6/bin/xf86cfg
+X11R6/bin/xf86config
+X11R6/include/X11/bitmaps/card.xbm
+X11R6/include/X11/bitmaps/down.xbm
+X11R6/include/X11/bitmaps/keyboard.xbm
+X11R6/include/X11/bitmaps/left.xbm
+X11R6/include/X11/bitmaps/monitor.xbm
+X11R6/include/X11/bitmaps/mouse.xbm
+X11R6/include/X11/bitmaps/narrower.xbm
+X11R6/include/X11/bitmaps/right.xbm
+X11R6/include/X11/bitmaps/shorter.xbm
+X11R6/include/X11/bitmaps/taller.xbm
+X11R6/include/X11/bitmaps/up.xbm
+X11R6/include/X11/bitmaps/wider.xbm
+X11R6/include/X11/pixmaps/card.xpm
+X11R6/include/X11/pixmaps/computer.xpm
+X11R6/include/X11/pixmaps/keyboard.xpm
+X11R6/include/X11/pixmaps/monitor.xpm
+X11R6/include/X11/pixmaps/mouse.xpm
+X11R6/lib/X11/Cards
+X11R6/lib/X11/Options
+X11R6/lib/X11/XF86Config.98
+X11R6/lib/X11/XF86Config.eg
+X11R6/lib/X11/app-defaults/XF86Cfg
+X11R6/lib/X11/doc/BUILD
+X11R6/lib/X11/doc/BugReport
+X11R6/lib/X11/doc/DESIGN
+X11R6/lib/X11/doc/Install
+X11R6/lib/X11/doc/LICENSE
+X11R6/lib/X11/doc/README
+X11R6/lib/X11/doc/README.DECtga
+X11R6/lib/X11/doc/README.DGA
+X11R6/lib/X11/doc/README.DRI
+X11R6/lib/X11/doc/README.DRIcomp
+X11R6/lib/X11/doc/README.I128
+X11R6/lib/X11/doc/README.SiS
+X11R6/lib/X11/doc/README.XKB-Config
+X11R6/lib/X11/doc/README.XKB-Enhancing
+X11R6/lib/X11/doc/README.apm
+X11R6/lib/X11/doc/README.ati
+X11R6/lib/X11/doc/README.chips
+X11R6/lib/X11/doc/README.cyrix
+X11R6/lib/X11/doc/README.dps
+X11R6/lib/X11/doc/README.fonts
+X11R6/lib/X11/doc/README.i740
+X11R6/lib/X11/doc/README.i810
+X11R6/lib/X11/doc/README.mouse
+X11R6/lib/X11/doc/README.newport
+X11R6/lib/X11/doc/README.r128
+X11R6/lib/X11/doc/README.rapidaccess
+X11R6/lib/X11/doc/README.rendition
+X11R6/lib/X11/doc/README.s3virge
+X11R6/lib/X11/doc/RELNOTES
+X11R6/lib/X11/doc/ServersOnly
+X11R6/lib/X11/doc/Status
+X11R6/lib/X11/doc/Versions
+X11R6/lib/X11/doc/VideoBoard98
+X11R6/lib/X11/etc/Xinstall.sh
+X11R6/lib/X11/etc/xmodmap.std
+X11R6/lib/X11/xserver/SecurityPolicy
+X11R6/lib/modules/codeconv/libARABIC.a
+X11R6/lib/modules/codeconv/libARMSCII8.a
+X11R6/lib/modules/codeconv/libBIG5.a
+X11R6/lib/modules/codeconv/libBIG5HKSCS.a
+X11R6/lib/modules/codeconv/libDOSENCODING.a
+X11R6/lib/modules/codeconv/libGB2312.a
+X11R6/lib/modules/codeconv/libGBK.a
+X11R6/lib/modules/codeconv/libGEORGIAN.a
+X11R6/lib/modules/codeconv/libISO8859_1.a
+X11R6/lib/modules/codeconv/libISO8859_10.a
+X11R6/lib/modules/codeconv/libISO8859_11.a
+X11R6/lib/modules/codeconv/libISO8859_14.a
+X11R6/lib/modules/codeconv/libISO8859_15.a
+X11R6/lib/modules/codeconv/libISO8859_2.a
+X11R6/lib/modules/codeconv/libISO8859_3.a
+X11R6/lib/modules/codeconv/libISO8859_4.a
+X11R6/lib/modules/codeconv/libISO8859_5.a
+X11R6/lib/modules/codeconv/libISO8859_6.a
+X11R6/lib/modules/codeconv/libISO8859_7.a
+X11R6/lib/modules/codeconv/libISO8859_8.a
+X11R6/lib/modules/codeconv/libISO8859_9.a
+X11R6/lib/modules/codeconv/libJISX0201.a
+X11R6/lib/modules/codeconv/libJISX0208.a
+X11R6/lib/modules/codeconv/libJISX0212.a
+X11R6/lib/modules/codeconv/libKOI8.a
+X11R6/lib/modules/codeconv/libKSC5601.a
+X11R6/lib/modules/codeconv/libKSCJOHAB.a
+X11R6/lib/modules/codeconv/libMULEENCODING.a
+X11R6/lib/modules/codeconv/libTCVN.a
+X11R6/lib/modules/codeconv/libVISCII.a
+${LIBDRI}X11R6/lib/modules/extensions/libdri.a
+${DRIMODULES}X11R6/lib/modules/dri/gamma_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/i810_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/i830_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/mga_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/r128_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/r200_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/radeon_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/tdfx_dri.so
+X11R6/lib/modules/drivers/apm_drv.o
+X11R6/lib/modules/drivers/ark_drv.o
+X11R6/lib/modules/drivers/ati_drv.o
+X11R6/lib/modules/drivers/atimisc_drv.o
+X11R6/lib/modules/drivers/chips_drv.o
+X11R6/lib/modules/drivers/cirrus_alpine.o
+X11R6/lib/modules/drivers/cirrus_drv.o
+X11R6/lib/modules/drivers/cirrus_laguna.o
+X11R6/lib/modules/drivers/cyrix_drv.o
+X11R6/lib/modules/drivers/glint_drv.o
+X11R6/lib/modules/drivers/i128_drv.o
+X11R6/lib/modules/drivers/i740_drv.o
+X11R6/lib/modules/drivers/i810_drv.o
+X11R6/lib/modules/drivers/mga_drv.o
+X11R6/lib/modules/drivers/neomagic_drv.o
+X11R6/lib/modules/drivers/nsc_drv.o
+X11R6/lib/modules/drivers/nv_drv.o
+X11R6/lib/modules/drivers/r128_drv.o
+X11R6/lib/modules/drivers/radeon_drv.o
+X11R6/lib/modules/drivers/rendition_drv.o
+X11R6/lib/modules/drivers/s3_drv.o
+X11R6/lib/modules/drivers/s3virge_drv.o
+X11R6/lib/modules/drivers/savage_drv.o
+X11R6/lib/modules/drivers/siliconmotion_drv.o
+X11R6/lib/modules/drivers/sis_drv.o
+X11R6/lib/modules/drivers/tdfx_drv.o
+X11R6/lib/modules/drivers/tga_drv.o
+X11R6/lib/modules/drivers/trident_drv.o
+X11R6/lib/modules/drivers/tseng_drv.o
+X11R6/lib/modules/drivers/vesa_drv.o
+X11R6/lib/modules/drivers/vga_drv.o
+X11R6/lib/modules/drivers/vmware_drv.o
+X11R6/lib/modules/extensions/libGLcore.a
+X11R6/lib/modules/extensions/libdbe.a
+X11R6/lib/modules/extensions/libextmod.a
+X11R6/lib/modules/extensions/libglx.a
+X11R6/lib/modules/extensions/librecord.a
+X11R6/lib/modules/extensions/libxtrap.a
+X11R6/lib/modules/fonts/libbitmap.a
+X11R6/lib/modules/fonts/libfreetype.a
+X11R6/lib/modules/fonts/libspeedo.a
+X11R6/lib/modules/fonts/libtype1.a
+X11R6/lib/modules/fonts/libxtt.a
+X11R6/lib/modules/input/calcomp_drv.o
+X11R6/lib/modules/input/citron_drv.o
+X11R6/lib/modules/input/digitaledge_drv.o
+X11R6/lib/modules/input/dmc_drv.o
+X11R6/lib/modules/input/dynapro_drv.o
+X11R6/lib/modules/input/elographics_drv.o
+X11R6/lib/modules/input/fpit_drv.o
+X11R6/lib/modules/input/hyperpen_drv.o
+X11R6/lib/modules/input/js_x_drv.o
+X11R6/lib/modules/input/kbd_drv.o
+X11R6/lib/modules/input/magellan_drv.o
+X11R6/lib/modules/input/microtouch_drv.o
+X11R6/lib/modules/input/mouse_drv.o
+X11R6/lib/modules/input/mutouch_drv.o
+X11R6/lib/modules/input/palmax_drv.o
+X11R6/lib/modules/input/penmount_drv.o
+X11R6/lib/modules/input/spaceorb_drv.o
+X11R6/lib/modules/input/summa_drv.o
+X11R6/lib/modules/input/tek4957_drv.o
+X11R6/lib/modules/input/void_drv.o
+X11R6/lib/modules/input/wacom_drv.o
+X11R6/lib/modules/libafb.a
+X11R6/lib/modules/libcfb.a
+X11R6/lib/modules/libcfb16.a
+X11R6/lib/modules/libcfb24.a
+X11R6/lib/modules/libcfb32.a
+X11R6/lib/modules/libddc.a
+X11R6/lib/modules/libfb.a
+X11R6/lib/modules/libi2c.a
+X11R6/lib/modules/libint10.a
+X11R6/lib/modules/liblayer.a
+X11R6/lib/modules/libmfb.a
+X11R6/lib/modules/libpcidata.a
+X11R6/lib/modules/librac.a
+X11R6/lib/modules/libramdac.a
+X11R6/lib/modules/libscanpci.a
+X11R6/lib/modules/libshadow.a
+X11R6/lib/modules/libshadowfb.a
+X11R6/lib/modules/libvbe.a
+X11R6/lib/modules/libvgahw.a
+X11R6/lib/modules/libxaa.a
+X11R6/lib/modules/libxf1bpp.a
+X11R6/lib/modules/libxf24_32bpp.a
+X11R6/lib/modules/libxf4bpp.a
+X11R6/lib/modules/libxf8_16bpp.a
+X11R6/lib/modules/libxf8_32bpp.a
+X11R6/lib/modules/v10002d.uc
+X11R6/lib/modules/v20002d.uc
+X11R6/${IMAKE_MAN_DIR}/XFree86.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/Xnest.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/Xserver.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/Xvfb.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/gtf.${IMAKE_MANNEWSUFFIX}
+${KBDMODE}X11R6/${IMAKE_MAN_DIR}/kbd_mode.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/pcitweak.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/scanpci.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xf86cfg.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xf86config.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidMode.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeDeleteModeLine.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetAllModeLines.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetDotClocks.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetGamma.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRamp.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetModeLine.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetMonitor.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetPermissions.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetViewPort.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeLockModeSwitch.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeModModeLine.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeQueryExtension.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeQueryVersion.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetClientVersion.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetGamma.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetGammaRamp.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetViewPort.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchMode.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchToMode.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeValidateModeLine.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/apm.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/cirrus.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/citron.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/cyrix.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/chips.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/dmc.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/dynapro.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/elographics.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/fbdevhw.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/fpit.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/glint.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/i128.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/i740.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/i810.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/js_x.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/kbd.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/keyboard.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/mga.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/microtouch.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/mouse.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/mutouch.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/neomagic.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/nsc.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/nv.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/palmax.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/penmount.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/r128.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/radeon.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/rendition.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/s3virge.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/savage.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/siliconmotion.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/sis.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/tdfx.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/tek4957.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/trident.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/tseng.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/vesa.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/vga.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/vmware.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/void.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/wacom.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_FILEMAN_DIR}/XF86Config.${MANPAGE_LIB_SUFFIX}
+@dirrm X11R6/lib/modules/input
+@dirrm X11R6/lib/modules/fonts
+@dirrm X11R6/lib/modules/extensions
+@dirrm X11R6/lib/modules/drivers
+@dirrm X11R6/lib/X11/xserver
+@dirrm X11R6/include/X11/pixmaps
diff --git a/x11/XFree86-server/files/host.def b/x11/XFree86-server/files/host.def
index ecee67f5e8f..8e186d7e25c 100644
--- a/x11/XFree86-server/files/host.def
+++ b/x11/XFree86-server/files/host.def
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: host.def,v 1.1.1.1 2004/01/24 08:49:00 xtraeme Exp $
+ * $NetBSD: host.def,v 1.2 2004/02/02 14:16:44 xtraeme Exp $
  *
  * XFree86 packages for pkgsrc system
  */
@@ -28,7 +28,7 @@
 #define BuildGLXLibrary YES
 #define BuildXFree86ConfigTools YES
 #define UseInstalledPrograms YES
-#define StandardIncludes -I@BLNK@/include
+#define StandardIncludes -I@BLNK@/include -I@PREFIX@/include
 
 #ifdef LinuxArchitecture
 #define InstallAppDefFiles YES
diff --git a/x11/imake/Makefile b/x11/imake/Makefile
index b3bc0e1d6fb..fedc3c936c5 100644
--- a/x11/imake/Makefile
+++ b/x11/imake/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/01/31 14:38:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/02 14:14:45 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	imake-${XF_VER}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 DISTFILES=	X430src-1.tgz X430src-3.tgz
@@ -18,7 +19,7 @@ NO_XFREE86_TARGETS=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_SUBST+=	IMAKE_MAN_DIR=${IMAKE_MAN_DIR}
-PLIST_SUBST+=	IMAKE_MAN_SUFFIX=${IMAKE_MAN_SUFFIX}
+PLIST_SUBST+=	IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
 
 .if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD"
 PLIST_SUBST+=	AVAILABLE=
diff --git a/x11/imake/PLIST b/x11/imake/PLIST
index 468bbb02b8d..49dab425300 100644
--- a/x11/imake/PLIST
+++ b/x11/imake/PLIST
@@ -1,137 +1,143 @@
-@comment $NetBSD: PLIST,v 1.1 2004/01/31 14:38:15 xtraeme Exp $
-bin/ccmakedep
-bin/cleanlinks
-bin/gccmakedep
-bin/imake
-bin/lndir
-bin/makedepend
-bin/makeg
-bin/makestrs
-bin/mergelib
-bin/mkdirhier
-bin/mkhtmlindex
-bin/pswrap
-bin/revpath
-bin/rman
-bin/xmkmf
-lib/X11/config/Amoeba.cf
-lib/X11/config/DGUX.cf
-lib/X11/config/FreeBSD.cf
-lib/X11/config/Imake.cf
-lib/X11/config/Imake.rules
-lib/X11/config/Imake.tmpl
-lib/X11/config/Library.tmpl
-lib/X11/config/Mips.cf
-lib/X11/config/Motif.rules
-lib/X11/config/Motif.tmpl
-lib/X11/config/NetBSD.cf
-lib/X11/config/Oki.cf
-lib/X11/config/OpenBSD.cf
-lib/X11/config/QNX4.cf
-lib/X11/config/QNX4.rules
-lib/X11/config/Server.tmpl
-lib/X11/config/ServerLib.tmpl
-lib/X11/config/Threads.tmpl
-lib/X11/config/Win32.cf
-lib/X11/config/Win32.rules
-lib/X11/config/WinLib.tmpl
-lib/X11/config/X11.rules
-lib/X11/config/X11.tmpl
-lib/X11/config/apollo.cf
-lib/X11/config/bsd.cf
-lib/X11/config/bsdLib.rules
-lib/X11/config/bsdLib.tmpl
-lib/X11/config/bsdi.cf
-lib/X11/config/cde.rules
-lib/X11/config/cde.tmpl
-lib/X11/config/convex.cf
-lib/X11/config/cray.cf
-lib/X11/config/cygwin.cf
-lib/X11/config/cygwin.rules
-lib/X11/config/cygwin.tmpl
-lib/X11/config/darwin.cf
-lib/X11/config/darwinLib.rules
-lib/X11/config/darwinLib.tmpl
-lib/X11/config/date.def
-lib/X11/config/fujitsu.cf
-lib/X11/config/generic.cf
-lib/X11/config/gnu.cf
-lib/X11/config/gnuLib.rules
-lib/X11/config/gnuLib.tmpl
-lib/X11/config/host.def
-lib/X11/config/hp.cf
-lib/X11/config/hpLib.rules
-lib/X11/config/hpLib.tmpl
-lib/X11/config/ibm.cf
-lib/X11/config/ibmLib.rules
-lib/X11/config/ibmLib.tmpl
-lib/X11/config/isc.cf
-lib/X11/config/linux.cf
-lib/X11/config/lnxLib.rules
-lib/X11/config/lnxLib.tmpl
-lib/X11/config/lnxdoc.rules
-lib/X11/config/lnxdoc.tmpl
-lib/X11/config/luna.cf
-lib/X11/config/lynx.cf
-lib/X11/config/macII.cf
-lib/X11/config/mach.cf
-lib/X11/config/minix.cf
-lib/X11/config/moto.cf
-lib/X11/config/ncr.cf
-lib/X11/config/nec.cf
-lib/X11/config/necLib.rules
-lib/X11/config/necLib.tmpl
-lib/X11/config/noop.rules
-lib/X11/config/nto.cf
-lib/X11/config/nto.rules
-lib/X11/config/oldlib.rules
-lib/X11/config/os2.cf
-lib/X11/config/os2.rules
-lib/X11/config/os2Lib.rules
-lib/X11/config/os2Lib.tmpl
-lib/X11/config/osf1.cf
-lib/X11/config/osfLib.rules
-lib/X11/config/osfLib.tmpl
-lib/X11/config/pegasus.cf
-lib/X11/config/sco.cf
-lib/X11/config/sco5.cf
-lib/X11/config/scoLib.rules
-lib/X11/config/sequent.cf
-lib/X11/config/sgi.cf
-lib/X11/config/sgiLib.rules
-lib/X11/config/sgiLib.tmpl
-lib/X11/config/site.def
-lib/X11/config/sony.cf
-lib/X11/config/sun.cf
-lib/X11/config/sunLib.rules
-lib/X11/config/sunLib.tmpl
-lib/X11/config/sv3Lib.rules
-lib/X11/config/sv3Lib.tmpl
-lib/X11/config/sv4Lib.rules
-lib/X11/config/sv4Lib.tmpl
-lib/X11/config/svr3.cf
-lib/X11/config/svr4.cf
-lib/X11/config/ultrix.cf
-lib/X11/config/usl.cf
-lib/X11/config/version.def
-lib/X11/config/x386.cf
-lib/X11/config/xf86.rules
-lib/X11/config/xf86.tmpl
-lib/X11/config/xf86site.def
-lib/X11/config/xfree86.cf
-${AVAILABLE}${IMAKE_MAN_DIR}/ccmakedep.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/cleanlinks.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/gccmakedep.${IMAKE_MAN_SUFFIX}
-${IMAKE_MAN_DIR}/imake.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/lndir.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/makedepend.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/makeg.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/makestrs.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/mergelib.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/mkdirhier.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/mkhtmlindex.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/pswrap.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/revpath.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/rman.${IMAKE_MAN_SUFFIX}
-${AVAILABLE}${IMAKE_MAN_DIR}/xmkmf.${IMAKE_MAN_SUFFIX}
-@dirrm lib/X11/config
+@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:14:45 xtraeme Exp $
+X11R6/bin/ccmakedep
+X11R6/bin/cleanlinks
+X11R6/bin/gccmakedep
+X11R6/bin/imake
+X11R6/bin/lndir
+X11R6/bin/makedepend
+X11R6/bin/makeg
+X11R6/bin/makestrs
+X11R6/bin/mergelib
+X11R6/bin/mkdirhier
+X11R6/bin/mkhtmlindex
+X11R6/bin/pswrap
+X11R6/bin/revpath
+X11R6/bin/rman
+X11R6/bin/xmkmf
+X11R6/lib/X11/config/Amoeba.cf
+X11R6/lib/X11/config/DGUX.cf
+X11R6/lib/X11/config/FreeBSD.cf
+X11R6/lib/X11/config/Imake.cf
+X11R6/lib/X11/config/Imake.rules
+X11R6/lib/X11/config/Imake.tmpl
+X11R6/lib/X11/config/Library.tmpl
+X11R6/lib/X11/config/Mips.cf
+X11R6/lib/X11/config/Motif.rules
+X11R6/lib/X11/config/Motif.tmpl
+X11R6/lib/X11/config/${OPSYS}.cf
+X11R6/lib/X11/config/Oki.cf
+X11R6/lib/X11/config/OpenBSD.cf
+X11R6/lib/X11/config/QNX4.cf
+X11R6/lib/X11/config/QNX4.rules
+X11R6/lib/X11/config/Server.tmpl
+X11R6/lib/X11/config/ServerLib.tmpl
+X11R6/lib/X11/config/Threads.tmpl
+X11R6/lib/X11/config/Win32.cf
+X11R6/lib/X11/config/Win32.rules
+X11R6/lib/X11/config/WinLib.tmpl
+X11R6/lib/X11/config/X11.rules
+X11R6/lib/X11/config/X11.tmpl
+X11R6/lib/X11/config/apollo.cf
+X11R6/lib/X11/config/bsd.cf
+X11R6/lib/X11/config/bsdLib.rules
+X11R6/lib/X11/config/bsdLib.tmpl
+X11R6/lib/X11/config/bsdi.cf
+X11R6/lib/X11/config/cde.rules
+X11R6/lib/X11/config/cde.tmpl
+X11R6/lib/X11/config/convex.cf
+X11R6/lib/X11/config/cray.cf
+X11R6/lib/X11/config/cygwin.cf
+X11R6/lib/X11/config/cygwin.rules
+X11R6/lib/X11/config/cygwin.tmpl
+X11R6/lib/X11/config/darwin.cf
+X11R6/lib/X11/config/darwinLib.rules
+X11R6/lib/X11/config/darwinLib.tmpl
+X11R6/lib/X11/config/date.def
+X11R6/lib/X11/config/fujitsu.cf
+X11R6/lib/X11/config/generic.cf
+X11R6/lib/X11/config/gnu.cf
+X11R6/lib/X11/config/gnuLib.rules
+X11R6/lib/X11/config/gnuLib.tmpl
+X11R6/lib/X11/config/host.def
+X11R6/lib/X11/config/hp.cf
+X11R6/lib/X11/config/hpLib.rules
+X11R6/lib/X11/config/hpLib.tmpl
+X11R6/lib/X11/config/ibm.cf
+X11R6/lib/X11/config/ibmLib.rules
+X11R6/lib/X11/config/ibmLib.tmpl
+X11R6/lib/X11/config/isc.cf
+X11R6/lib/X11/config/linux.cf
+X11R6/lib/X11/config/lnxLib.rules
+X11R6/lib/X11/config/lnxLib.tmpl
+X11R6/lib/X11/config/lnxdoc.rules
+X11R6/lib/X11/config/lnxdoc.tmpl
+X11R6/lib/X11/config/luna.cf
+X11R6/lib/X11/config/lynx.cf
+X11R6/lib/X11/config/macII.cf
+X11R6/lib/X11/config/mach.cf
+X11R6/lib/X11/config/minix.cf
+X11R6/lib/X11/config/moto.cf
+X11R6/lib/X11/config/ncr.cf
+X11R6/lib/X11/config/nec.cf
+X11R6/lib/X11/config/necLib.rules
+X11R6/lib/X11/config/necLib.tmpl
+X11R6/lib/X11/config/noop.rules
+X11R6/lib/X11/config/nto.cf
+X11R6/lib/X11/config/nto.rules
+X11R6/lib/X11/config/oldlib.rules
+X11R6/lib/X11/config/os2.cf
+X11R6/lib/X11/config/os2.rules
+X11R6/lib/X11/config/os2Lib.rules
+X11R6/lib/X11/config/os2Lib.tmpl
+X11R6/lib/X11/config/osf1.cf
+X11R6/lib/X11/config/osfLib.rules
+X11R6/lib/X11/config/osfLib.tmpl
+X11R6/lib/X11/config/pegasus.cf
+X11R6/lib/X11/config/sco.cf
+X11R6/lib/X11/config/sco5.cf
+X11R6/lib/X11/config/scoLib.rules
+X11R6/lib/X11/config/sequent.cf
+X11R6/lib/X11/config/sgi.cf
+X11R6/lib/X11/config/sgiLib.rules
+X11R6/lib/X11/config/sgiLib.tmpl
+X11R6/lib/X11/config/site.def
+X11R6/lib/X11/config/sony.cf
+X11R6/lib/X11/config/sun.cf
+X11R6/lib/X11/config/sunLib.rules
+X11R6/lib/X11/config/sunLib.tmpl
+X11R6/lib/X11/config/sv3Lib.rules
+X11R6/lib/X11/config/sv3Lib.tmpl
+X11R6/lib/X11/config/sv4Lib.rules
+X11R6/lib/X11/config/sv4Lib.tmpl
+X11R6/lib/X11/config/svr3.cf
+X11R6/lib/X11/config/svr4.cf
+X11R6/lib/X11/config/ultrix.cf
+X11R6/lib/X11/config/usl.cf
+X11R6/lib/X11/config/version.def
+X11R6/lib/X11/config/x386.cf
+X11R6/lib/X11/config/xf86.rules
+X11R6/lib/X11/config/xf86.tmpl
+X11R6/lib/X11/config/xf86site.def
+X11R6/lib/X11/config/xfree86.cf
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/ccmakedep.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/cleanlinks.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/gccmakedep.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/imake.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/lndir.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/makedepend.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/makeg.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/makestrs.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/mergelib.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/mkdirhier.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/mkhtmlindex.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/pswrap.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/revpath.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/rman.${IMAKE_MANNEWSUFFIX}
+${AVAILABLE}X11R6/${IMAKE_MAN_DIR}/xmkmf.${IMAKE_MANNEWSUFFIX}
+@dirrm X11R6/bin
+@dirrm X11R6/${IMAKE_MAN_DIR}
+@dirrm X11R6/man
+@dirrm X11R6/lib/X11/config
+@dirrm X11R6/lib/X11
+@dirrm X11R6/lib
+@dirrm X11R6
diff --git a/x11/imake/files/host.def b/x11/imake/files/host.def
index 19a9d8d25d2..7039cb0c511 100644
--- a/x11/imake/files/host.def
+++ b/x11/imake/files/host.def
@@ -1,10 +1,10 @@
 /*
- * $NetBSD: host.def,v 1.1.1.1 2004/01/24 08:43:29 xtraeme Exp $
+ * $NetBSD: host.def,v 1.2 2004/02/02 14:14:45 xtraeme Exp $
  *
  * XFree86 packages for pkgsrc system
  *
  */ 
 
-#define ProjectRoot @PREFIX@
+#define ProjectRoot @PREFIX@/X11R6
 #define BuildHtmlManPages NO
 #define MakeCmd @MAKE@