diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-03-28 22:06:15 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-03-28 22:06:15 +0000 |
| commit | 770c956a77033bad4142a38dd44da1dee5051799 (patch) | |
| tree | 0a14a167a5e6fa293f4372364539467a1d5018de /x11 | |
| parent | 2b90b59091637afbbdd6268b0189129463c3973b (diff) | |
| download | pkgsrc-770c956a77033bad4142a38dd44da1dee5051799.tar.gz | |
Upgrade XFree86 packages to 4.4.0.
To see a full list of changes, please review:
http://xfree86.org/4.4.0/RELNOTES.html
These packages has been tested under NetBSD 1.6/-current, FreeBSD 4.x/5.x,
and GNU/Linux (i386) by Jeremy C. Reed, Michal Pasternak and myself.
Diffstat (limited to 'x11')
54 files changed, 2042 insertions, 4675 deletions
diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile index 9864ff64148..1d2b7e6641f 100644 --- a/x11/XFree86-clients/Makefile +++ b/x11/XFree86-clients/Makefile @@ -1,19 +1,18 @@ -# $NetBSD: Makefile,v 1.6 2004/02/04 23:29:26 xtraeme Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/28 22:06:15 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 \ - X430src-3.tgz X430src-4.tgz +DISTFILES= XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz XFree86-4.4.0-src-4.tgz MAINTAINER= xfree86@blef.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 client programs and related files -USE_IMAKE= yes -USE_BUILDLINK2= yes +USE_X11= yes +USE_BUILDLINK3= yes DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches @@ -21,22 +20,21 @@ XBUILD_DIRS= lib/xtrans lib/lbxutil programs fonts/util XINSTALL_DIRS= programs fonts/util XINSTALL_MAN_DIRS= programs -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Linux" -. include "../../security/PAM/buildlink2.mk" -.endif +post-buildlink: + @${MKDIR} ${WRKSRC}/exports/include + @${CP} ${X11ROOT}/include/X11/fonts/*.h ${BUILDLINK_DIR}/include 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 ${X11ROOT}/lib/lib$${l}.a ${WRKSRC}/exports/lib/; \ - done + @${CP} ${X11ROOT}/lib/lib* ${WRKSRC}/exports/lib -.include "../../fonts/Xft2/buildlink2.mk" -.include "../../graphics/png/buildlink2.mk" -.include "../../meta-pkgs/XFree86/Makefile.common" -.include "../../x11/XFree86-libs/buildlink2.mk" +post-install: + @${CHMOD} a+r ${X11ROOT}/bin/xterm +.include "../../fonts/Xft2/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../meta-pkgs/XFree86/Makefile.common" +.include "../../x11/Xrandr/buildlink3.mk" +.include "../../x11/xcursor/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/XFree86-clients/PLIST b/x11/XFree86-clients/PLIST index ee94c7c9300..43424d6a9c7 100644 --- a/x11/XFree86-clients/PLIST +++ b/x11/XFree86-clients/PLIST @@ -1,884 +1,903 @@ -@comment $NetBSD: PLIST,v 1.3 2004/02/04 23:29:26 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.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/appres.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/atobm.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/bdftopcf.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/beforelight.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/bitmap.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/bmtoa.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/cxpm.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/dga.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/dpsexec.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/dpsinfo.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/editres.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/fslsfonts.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/fstobdf.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/glxgears.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/glxinfo.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/iceauth.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/ico.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/lbxproxy.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/listres.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/luit.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/makepsres.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/mkcfm.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/mkfontdir.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/mkfontscale.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/oclock.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/proxymngr.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/resize.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/rstart.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/rstartd.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/sessreg.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/setxkbmap.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/showfont.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/showrgb.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/smproxy.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/startx.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/sxpm.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/texteroids.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/twm.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/viewres.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/x11perf.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/x11perfcomp.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xauth.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xbiff.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xcalc.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xclipboard.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xclock.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xcmsdb.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xconsole.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xcursorgen.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xcutsel.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xditview.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xdm.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xdpyinfo.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xedit.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xev.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xeyes.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xfd.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xfindproxy.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xfontsel.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xfsinfo.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xfwp.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xgamma.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xgc.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xhost.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xinit.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xkbcomp.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xkbevd.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xkbprint.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xkill.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xload.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xlogo.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xlsatoms.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xlsclients.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xlsfonts.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xmag.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xman.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xmessage.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xmh.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xmodmap.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xon.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xprop.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xrandr.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xrdb.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xrefresh.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xset.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xsetmode.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xsetpointer.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xsetroot.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xsm.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xstdcmap.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xterm.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xtrap.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xtrapchar.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xtrapin.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xtrapinfo.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xtrapout.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xtrapproto.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xtrapreset.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xtrapstats.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xvidtune.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xvinfo.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xwd.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xwininfo.${IMAKE_MANNEWSUFFIX} -X11R6/${IMAKE_MAN_DIR}/xwud.${IMAKE_MANNEWSUFFIX} -@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/include/X11/PM +@comment $NetBSD: PLIST,v 1.4 2004/03/28 22:06:15 xtraeme Exp $ +${X11ROOT_PREFIX}/bin/Xmark +${X11ROOT_PREFIX}/bin/appres +${X11ROOT_PREFIX}/bin/atobm +${X11ROOT_PREFIX}/bin/bdftopcf +${X11ROOT_PREFIX}/bin/bdftruncate +${X11ROOT_PREFIX}/bin/beforelight +${X11ROOT_PREFIX}/bin/bitmap +${X11ROOT_PREFIX}/bin/bmtoa +${X11ROOT_PREFIX}/bin/cxpm +${X11ROOT_PREFIX}/bin/dga +${X11ROOT_PREFIX}/bin/dpsexec +${X11ROOT_PREFIX}/bin/dpsinfo +${X11ROOT_PREFIX}/bin/editres +${X11ROOT_PREFIX}/bin/fonttosfnt +${X11ROOT_PREFIX}/bin/fslsfonts +${X11ROOT_PREFIX}/bin/fstobdf +${X11ROOT_PREFIX}/bin/glxgears +${X11ROOT_PREFIX}/bin/glxinfo +${X11ROOT_PREFIX}/bin/iceauth +${X11ROOT_PREFIX}/bin/ico +${X11ROOT_PREFIX}/bin/lbxproxy +${X11ROOT_PREFIX}/bin/listres +${X11ROOT_PREFIX}/bin/luit +${X11ROOT_PREFIX}/bin/makepsres +${X11ROOT_PREFIX}/bin/mkcfm +${X11ROOT_PREFIX}/bin/mkfontdir +${X11ROOT_PREFIX}/bin/mkfontscale +${X11ROOT_PREFIX}/bin/oclock +${X11ROOT_PREFIX}/bin/proxymngr +${X11ROOT_PREFIX}/bin/resize +${X11ROOT_PREFIX}/bin/rstart +${X11ROOT_PREFIX}/bin/rstartd +${X11ROOT_PREFIX}/bin/sessreg +${X11ROOT_PREFIX}/bin/setxkbmap +${X11ROOT_PREFIX}/bin/showfont +${X11ROOT_PREFIX}/bin/showrgb +${X11ROOT_PREFIX}/bin/smproxy +${X11ROOT_PREFIX}/bin/startx +${X11ROOT_PREFIX}/bin/sxpm +${X11ROOT_PREFIX}/bin/texteroids +${X11ROOT_PREFIX}/bin/twm +${X11ROOT_PREFIX}/bin/ucs2any +${X11ROOT_PREFIX}/bin/uxterm +${X11ROOT_PREFIX}/bin/viewres +${X11ROOT_PREFIX}/bin/x11perf +${X11ROOT_PREFIX}/bin/x11perfcomp +${X11ROOT_PREFIX}/bin/xauth +${X11ROOT_PREFIX}/bin/xbiff +${X11ROOT_PREFIX}/bin/xcalc +${X11ROOT_PREFIX}/bin/xclipboard +${X11ROOT_PREFIX}/bin/xclock +${X11ROOT_PREFIX}/bin/xcmsdb +${X11ROOT_PREFIX}/bin/xconsole +${X11ROOT_PREFIX}/bin/xcursorgen +${X11ROOT_PREFIX}/bin/xcutsel +${X11ROOT_PREFIX}/bin/xditview +${X11ROOT_PREFIX}/bin/xdm +${X11ROOT_PREFIX}/bin/xdpyinfo +${X11ROOT_PREFIX}/bin/xedit +${X11ROOT_PREFIX}/bin/xev +${X11ROOT_PREFIX}/bin/xeyes +${X11ROOT_PREFIX}/bin/xfd +${X11ROOT_PREFIX}/bin/xfindproxy +${X11ROOT_PREFIX}/bin/xfontsel +${X11ROOT_PREFIX}/bin/xfsinfo +${X11ROOT_PREFIX}/bin/xfwp +${X11ROOT_PREFIX}/bin/xgamma +${X11ROOT_PREFIX}/bin/xgc +${X11ROOT_PREFIX}/bin/xhost +${X11ROOT_PREFIX}/bin/xinit +${X11ROOT_PREFIX}/bin/xkbbell +${X11ROOT_PREFIX}/bin/xkbcomp +${X11ROOT_PREFIX}/bin/xkbevd +${X11ROOT_PREFIX}/bin/xkbprint +${X11ROOT_PREFIX}/bin/xkbvleds +${X11ROOT_PREFIX}/bin/xkbwatch +${X11ROOT_PREFIX}/bin/xkill +${X11ROOT_PREFIX}/bin/xload +${X11ROOT_PREFIX}/bin/xlogo +${X11ROOT_PREFIX}/bin/xlsatoms +${X11ROOT_PREFIX}/bin/xlsclients +${X11ROOT_PREFIX}/bin/xlsfonts +${X11ROOT_PREFIX}/bin/xmag +${X11ROOT_PREFIX}/bin/xman +${X11ROOT_PREFIX}/bin/xmessage +${X11ROOT_PREFIX}/bin/xmh +${X11ROOT_PREFIX}/bin/xmodmap +${X11ROOT_PREFIX}/bin/xon +${X11ROOT_PREFIX}/bin/xprop +${X11ROOT_PREFIX}/bin/xrandr +${X11ROOT_PREFIX}/bin/xrdb +${X11ROOT_PREFIX}/bin/xrefresh +${X11ROOT_PREFIX}/bin/xset +${X11ROOT_PREFIX}/bin/xsetmode +${X11ROOT_PREFIX}/bin/xsetpointer +${X11ROOT_PREFIX}/bin/xsetroot +${X11ROOT_PREFIX}/bin/xsm +${X11ROOT_PREFIX}/bin/xstdcmap +${X11ROOT_PREFIX}/bin/xterm +${X11ROOT_PREFIX}/bin/xtrapchar +${X11ROOT_PREFIX}/bin/xtrapin +${X11ROOT_PREFIX}/bin/xtrapinfo +${X11ROOT_PREFIX}/bin/xtrapout +${X11ROOT_PREFIX}/bin/xtrapproto +${X11ROOT_PREFIX}/bin/xtrapreset +${X11ROOT_PREFIX}/bin/xtrapstats +${X11ROOT_PREFIX}/bin/xvidtune +${X11ROOT_PREFIX}/bin/xvinfo +${X11ROOT_PREFIX}/bin/xwd +${X11ROOT_PREFIX}/bin/xwininfo +${X11ROOT_PREFIX}/bin/xwud +${X11ROOT_PREFIX}/include/X11/PM/PM.h +${X11ROOT_PREFIX}/include/X11/PM/PMproto.h +${X11ROOT_PREFIX}/include/X11/bitmaps/Dashes +${X11ROOT_PREFIX}/include/X11/bitmaps/Down +${X11ROOT_PREFIX}/include/X11/bitmaps/Excl +${X11ROOT_PREFIX}/include/X11/bitmaps/FlipHoriz +${X11ROOT_PREFIX}/include/X11/bitmaps/FlipVert +${X11ROOT_PREFIX}/include/X11/bitmaps/Fold +${X11ROOT_PREFIX}/include/X11/bitmaps/Left +${X11ROOT_PREFIX}/include/X11/bitmaps/Right +${X11ROOT_PREFIX}/include/X11/bitmaps/RotateLeft +${X11ROOT_PREFIX}/include/X11/bitmaps/RotateRight +${X11ROOT_PREFIX}/include/X11/bitmaps/Stipple +${X11ROOT_PREFIX}/include/X11/bitmaps/Term +${X11ROOT_PREFIX}/include/X11/bitmaps/Up +${X11ROOT_PREFIX}/include/X11/bitmaps/black6 +${X11ROOT_PREFIX}/include/X11/bitmaps/box6 +${X11ROOT_PREFIX}/include/X11/bitmaps/ldblarrow +${X11ROOT_PREFIX}/include/X11/bitmaps/rdblarrow +${X11ROOT_PREFIX}/lib/X11/app-defaults/Beforelight +${X11ROOT_PREFIX}/lib/X11/app-defaults/Bitmap +${X11ROOT_PREFIX}/lib/X11/app-defaults/Bitmap-color +${X11ROOT_PREFIX}/lib/X11/app-defaults/Chooser +${X11ROOT_PREFIX}/lib/X11/app-defaults/Clock-color +${X11ROOT_PREFIX}/lib/X11/app-defaults/Editres +${X11ROOT_PREFIX}/lib/X11/app-defaults/Editres-color +${X11ROOT_PREFIX}/lib/X11/app-defaults/UXTerm +${X11ROOT_PREFIX}/lib/X11/app-defaults/Viewres +${X11ROOT_PREFIX}/lib/X11/app-defaults/XCalc +${X11ROOT_PREFIX}/lib/X11/app-defaults/XCalc-color +${X11ROOT_PREFIX}/lib/X11/app-defaults/XClipboard +${X11ROOT_PREFIX}/lib/X11/app-defaults/XClock +${X11ROOT_PREFIX}/lib/X11/app-defaults/XClock-color +${X11ROOT_PREFIX}/lib/X11/app-defaults/XConsole +${X11ROOT_PREFIX}/lib/X11/app-defaults/XFontSel +${X11ROOT_PREFIX}/lib/X11/app-defaults/XLoad +${X11ROOT_PREFIX}/lib/X11/app-defaults/XLogo +${X11ROOT_PREFIX}/lib/X11/app-defaults/XLogo-color +${X11ROOT_PREFIX}/lib/X11/app-defaults/XSm +${X11ROOT_PREFIX}/lib/X11/app-defaults/XTerm +${X11ROOT_PREFIX}/lib/X11/app-defaults/XTerm-color +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xditview +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xditview-chrtr +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xedit +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xedit-color +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xfd +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xgc +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xmag +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xman +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xmessage +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xmessage-color +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xmh +${X11ROOT_PREFIX}/lib/X11/app-defaults/Xvidtune +${X11ROOT_PREFIX}/lib/X11/etc/xterm.termcap +${X11ROOT_PREFIX}/lib/X11/etc/xterm.terminfo +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-1 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-10 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-11 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-13 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-14 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-15 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-16 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-2 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-3 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-4 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-5 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-7 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-8 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-ISO8859-9 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-JISX0201.1976-0 +${X11ROOT_PREFIX}/lib/X11/fonts/util/map-KOI8-R +${X11ROOT_PREFIX}/lib/X11/icons/default/index.theme +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/08e8e1c95fe2fc01f976f1e063a24ccd +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/X_cursor +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/arrow +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/based_arrow_down +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/based_arrow_up +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/bottom_left_corner +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/bottom_right_corner +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/bottom_side +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/bottom_tee +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/center_ptr +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/circle +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/cross +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/cross_reverse +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/crosshair +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/dot +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/dotbox +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/double_arrow +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/draft_large +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/draft_small +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/draped_box +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/fleur +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/gumby +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/hand2 +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/left_ptr +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/left_ptr_watch +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/left_side +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/left_tee +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/ll_angle +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/pencil +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/plus +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/right_ptr +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/right_side +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/right_tee +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/sb_h_double_arrow +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/sb_right_arrow +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/sb_up_arrow +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/sb_v_double_arrow +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/shuttle +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/tcross +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/top_left_arrow +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/top_left_corner +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/top_right_corner +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/top_side +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/top_tee +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/watch +${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors/xterm +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/X_cursor +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/arrow +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/based_arrow_down +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/based_arrow_up +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/bottom_left_corner +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/bottom_right_corner +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/bottom_side +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/bottom_tee +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/center_ptr +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/circle +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/cross +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/cross_reverse +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/crosshair +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/dot +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/dotbox +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/double_arrow +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/draft_large +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/draft_small +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/draped_box +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/fleur +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/gumby +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/hand2 +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/left_ptr +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/left_ptr_watch +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/left_side +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/left_tee +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/ll_angle +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/pencil +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/plus +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/right_ptr +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/right_side +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/right_tee +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/sb_h_double_arrow +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/sb_right_arrow +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/sb_up_arrow +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/sb_v_double_arrow +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/shuttle +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/tcross +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/top_left_arrow +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/top_left_corner +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/top_right_corner +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/top_side +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/top_tee +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/watch +${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors/xterm +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/X_cursor +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/base_arrow_down +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/base_arrow_up +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/boat +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/bottom_left_corner +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/bottom_right_corner +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/bottom_side +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/bottom_tee +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/center_ptr +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/circle +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/cross +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/cross_reverse +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/crosshair +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/dot +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/dot_box_mask +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/double_arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/draft_large +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/draft_small +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/draped_box +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/exchange +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/fleur +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/gumby +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/hand1 +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/hand2 +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/left_ptr +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/left_ptr_watch +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/left_side +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/left_tee +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/ll_angle +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/lr_angle +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/pencil +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/pirate +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/plus +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/question_arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/right_ptr +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/right_side +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/right_tee +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/sailboat +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/sb_down_arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/sb_h_double_arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/sb_left_arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/sb_right_arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/sb_up_arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/sb_v_double_arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/shuttle +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/sizing +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/target +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/tcross +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/top_left_arrow +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/top_left_corner +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/top_right_corner +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/top_side +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/top_tee +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/trek +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/ul_angle +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/ur_angle +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/watch +${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors/xterm +${X11ROOT_PREFIX}/lib/X11/lbxproxy/AtomControl +${X11ROOT_PREFIX}/lib/X11/proxymngr/pmconfig +${X11ROOT_PREFIX}/lib/X11/rgb.txt +${X11ROOT_PREFIX}/lib/X11/rstart/commands/@List +${X11ROOT_PREFIX}/lib/X11/rstart/commands/ListContexts +${X11ROOT_PREFIX}/lib/X11/rstart/commands/ListGenericCommands +${X11ROOT_PREFIX}/lib/X11/rstart/commands/x +${X11ROOT_PREFIX}/lib/X11/rstart/commands/x11 +${X11ROOT_PREFIX}/lib/X11/rstart/commands/x11r6/@List +${X11ROOT_PREFIX}/lib/X11/rstart/commands/x11r6/LoadMonitor +${X11ROOT_PREFIX}/lib/X11/rstart/commands/x11r6/Terminal +${X11ROOT_PREFIX}/lib/X11/rstart/config +${X11ROOT_PREFIX}/lib/X11/rstart/contexts/@List +${X11ROOT_PREFIX}/lib/X11/rstart/contexts/default +${X11ROOT_PREFIX}/lib/X11/rstart/contexts/x +${X11ROOT_PREFIX}/lib/X11/rstart/contexts/x11 +${X11ROOT_PREFIX}/lib/X11/rstart/contexts/x11r6 +${X11ROOT_PREFIX}/lib/X11/rstart/rstartd.real +${X11ROOT_PREFIX}/lib/X11/twm/system.twmrc +${X11ROOT_PREFIX}/lib/X11/x11perfcomp/fillblnk +${X11ROOT_PREFIX}/lib/X11/x11perfcomp/perfboth +${X11ROOT_PREFIX}/lib/X11/x11perfcomp/perfratio +${X11ROOT_PREFIX}/lib/X11/xdm/GiveConsole +${X11ROOT_PREFIX}/lib/X11/xdm/TakeConsole +${X11ROOT_PREFIX}/lib/X11/xdm/Xaccess +${X11ROOT_PREFIX}/lib/X11/xdm/Xresources +${X11ROOT_PREFIX}/lib/X11/xdm/Xservers +${X11ROOT_PREFIX}/lib/X11/xdm/Xsession +${X11ROOT_PREFIX}/lib/X11/xdm/Xsetup_0 +${X11ROOT_PREFIX}/lib/X11/xdm/Xwilling +${X11ROOT_PREFIX}/lib/X11/xdm/chooser +${X11ROOT_PREFIX}/lib/X11/xdm/pixmaps/XFree86.xpm +${X11ROOT_PREFIX}/lib/X11/xdm/pixmaps/XFree86bw.xpm +${X11ROOT_PREFIX}/lib/X11/xdm/xdm-config +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/indent.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/lisp.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/c.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/html.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/imake.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/lisp.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/make.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/man.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/patch.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/rpm.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/sgml.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/sh.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/xconf.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/xlog.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/xrdb.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/syntax.lsp +${X11ROOT_PREFIX}/lib/X11/xedit/lisp/xedit.lsp +${X11ROOT_PREFIX}/lib/X11/xinit/xinitrc +${X11ROOT_PREFIX}/lib/X11/xkb/README +${X11ROOT_PREFIX}/lib/X11/xkb/README.config +${X11ROOT_PREFIX}/lib/X11/xkb/README.enhancing +${X11ROOT_PREFIX}/lib/X11/xkb/compat.dir +${X11ROOT_PREFIX}/lib/X11/xkb/compat/README +${X11ROOT_PREFIX}/lib/X11/xkb/compat/accessx +${X11ROOT_PREFIX}/lib/X11/xkb/compat/basic +${X11ROOT_PREFIX}/lib/X11/xkb/compat/complete +${X11ROOT_PREFIX}/lib/X11/xkb/compat/default +${X11ROOT_PREFIX}/lib/X11/xkb/compat/group_led +${X11ROOT_PREFIX}/lib/X11/xkb/compat/iso9995 +${X11ROOT_PREFIX}/lib/X11/xkb/compat/japan +${X11ROOT_PREFIX}/lib/X11/xkb/compat/keypad +${X11ROOT_PREFIX}/lib/X11/xkb/compat/leds +${X11ROOT_PREFIX}/lib/X11/xkb/compat/misc +${X11ROOT_PREFIX}/lib/X11/xkb/compat/mousekeys +${X11ROOT_PREFIX}/lib/X11/xkb/compat/norepeat +${X11ROOT_PREFIX}/lib/X11/xkb/compat/pc +${X11ROOT_PREFIX}/lib/X11/xkb/compat/pc98 +${X11ROOT_PREFIX}/lib/X11/xkb/compat/xfree86 +${X11ROOT_PREFIX}/lib/X11/xkb/compat/xtest +${X11ROOT_PREFIX}/lib/X11/xkb/compiled/README +${X11ROOT_PREFIX}/lib/X11/xkb/geometry.dir +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/README +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/amiga +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/ataritt +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/chicony +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/dell +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/digital/lk +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/digital/pc +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/digital/unix +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/everex +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/fujitsu +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/hp +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/ibm/thinkpad +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/keytronic +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/kinesis +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/macintosh +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/microsoft +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/nec +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/northgate +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/pc +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/sgi/O2 +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/sgi/indigo +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/sgi/indy +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/sony +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/sun +${X11ROOT_PREFIX}/lib/X11/xkb/geometry/winbook +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes.dir +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/README +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/aliases +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/amiga +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/ataritt +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/digital/lk +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/digital/pc +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/fujitsu +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/hp +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/ibm +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/macintosh +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/powerpcps2 +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/sgi/indigo +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/sgi/indy +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/sgi/iris +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/sony +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/sun +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/xfree86 +${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/xfree98 +${X11ROOT_PREFIX}/lib/X11/xkb/keymap.dir +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/README +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/amiga +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/ataritt +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/digital/us +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/macintosh +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/be +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/bg +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/ca +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/cz +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/cz_qwerty +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/de +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/de_CH +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/dk +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/dvorak +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/en_US +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/es +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/fi +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/fr +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/fr_CH +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/gb +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/hu +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/it +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/jp +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/no +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/pl +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/pt +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/ru +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/se +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/sk +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/sk_qwerty +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/th +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi/us +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sony +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/de +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/es +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/fi +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/fr +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/no +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/pl +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/ru +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/se +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/uk +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun/us +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/xfree86 +${X11ROOT_PREFIX}/lib/X11/xkb/keymap/xfree98 +${X11ROOT_PREFIX}/lib/X11/xkb/rules/README +${X11ROOT_PREFIX}/lib/X11/xkb/rules/sgi +${X11ROOT_PREFIX}/lib/X11/xkb/rules/sgi.lst +${X11ROOT_PREFIX}/lib/X11/xkb/rules/sun +${X11ROOT_PREFIX}/lib/X11/xkb/rules/sun.lst +${X11ROOT_PREFIX}/lib/X11/xkb/rules/xfree86 +${X11ROOT_PREFIX}/lib/X11/xkb/rules/xfree86-it.lst +${X11ROOT_PREFIX}/lib/X11/xkb/rules/xfree86.lst +${X11ROOT_PREFIX}/lib/X11/xkb/rules/xfree86.xml +${X11ROOT_PREFIX}/lib/X11/xkb/semantics/basic +${X11ROOT_PREFIX}/lib/X11/xkb/semantics/complete +${X11ROOT_PREFIX}/lib/X11/xkb/semantics/default +${X11ROOT_PREFIX}/lib/X11/xkb/semantics/xtest +${X11ROOT_PREFIX}/lib/X11/xkb/symbols.dir +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/README +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/al +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/altwin +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/am +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/apple +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ar +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/az +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/be +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ben +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/bg +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/br +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/bs +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/by +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ca +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ca_enhanced +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/compose +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ctrl +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/cz +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/cz_qwerty +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/czsk +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/de +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/de_CH +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/dev +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/digital/lk +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/digital/pc +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/digital/us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/digital/vt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/dk +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/dvorak +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ee +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/el +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/en_US +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/es +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/fi +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/fr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/fr_CH +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/fujitsu/jp +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/fujitsu/us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/gb +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ge_la +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ge_ru +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/group +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/guj +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/gur +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/hp/us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/hr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/hr_US +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/hu +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/hu_US +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/hu_qwerty +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ie +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/il +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/il_phonetic +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/inet +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ir +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/is +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/iso9995-3 +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/it +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/iu +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/jp +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/kan +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/keypad +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/la +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/level3 +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/lo +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/lock +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/lt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/lt_std +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/lv +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/de +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/de_CH +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/dk +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/es +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/fi +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/fr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/fr_CH +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/gb +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/it +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/nl +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/no +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/pt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/se +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh/us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/mk +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ml +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/mm +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/mt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/mt_us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/nec/jp +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/nl +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/no +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ogham +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ori +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/al +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/am +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ar +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/be +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ben +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/bg +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/br +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/by +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/cz +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/cz_qwerty +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/de +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/dev +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/dk +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/dvorak +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/dz +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ee +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/el +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/en_US +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/es +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/fi +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/fr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/fr-latin9 +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/gb +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ge_la +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ge_ru +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/guj +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/gur +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/hr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ie +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/il +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/il_phonetic +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ir +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/is +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/it +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/iu +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/kan +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/la +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/latin +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/lo +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/lt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/lv +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/mk +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ml +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/mm +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/mt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/mt_us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/nl +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/no +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ogham +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ori +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/pc +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/pl +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/pl2 +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/pt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ro +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ru +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/sapmi +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/se +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/se_FI +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/se_NO +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/se_SE +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/si +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/sk +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/sk_qwerty +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/sr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/syr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/syr_phonetic +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/tel +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/th +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/th_pat +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/th_tis +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/tj +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/tml +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/tr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/ua +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/us_intl +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/uz +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc/yu +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc104 +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pl +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pl2 +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ralt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ro +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ro2 +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ru +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sapmi +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/se +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/se_FI +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/se_NO +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/se_SE +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sgi/jp +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/si +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sk +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sk_qwerty +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sony/us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/srvr_ctrl +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sun/se +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sun/us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sun/usb +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/syr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/syr_phonetic +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/tel +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/th +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/th_pat +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/th_tis +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/tj +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/tml +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/tr +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/tr_f +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/ua +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/us +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/us_group2 +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/us_group3 +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/us_intl +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/uz +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/vn +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/xfree68/amiga +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/xfree68/ataritt +${X11ROOT_PREFIX}/lib/X11/xkb/symbols/yu +${X11ROOT_PREFIX}/lib/X11/xkb/types.dir +${X11ROOT_PREFIX}/lib/X11/xkb/types/README +${X11ROOT_PREFIX}/lib/X11/xkb/types/basic +${X11ROOT_PREFIX}/lib/X11/xkb/types/caps +${X11ROOT_PREFIX}/lib/X11/xkb/types/complete +${X11ROOT_PREFIX}/lib/X11/xkb/types/default +${X11ROOT_PREFIX}/lib/X11/xkb/types/extra +${X11ROOT_PREFIX}/lib/X11/xkb/types/iso9995 +${X11ROOT_PREFIX}/lib/X11/xkb/types/mousekeys +${X11ROOT_PREFIX}/lib/X11/xkb/types/numpad +${X11ROOT_PREFIX}/lib/X11/xkb/types/pc +${X11ROOT_PREFIX}/lib/X11/xkb/xkbcomp +${X11ROOT_PREFIX}/lib/X11/xman.help +${X11ROOT_PREFIX}/lib/X11/xsm/system.xsm +${X11ROOT_PREFIX}/${MAN_DIR}/Xmark.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/appres.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/atobm.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/bdftopcf.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/beforelight.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/bitmap.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/bmtoa.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/cxpm.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/dga.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/dpsexec.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/dpsinfo.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/editres.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/fonttosfnt.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/fslsfonts.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/fstobdf.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/glxgears.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/glxinfo.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/iceauth.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/ico.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/lbxproxy.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/listres.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/luit.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/makepsres.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/mkcfm.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/mkfontdir.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/mkfontscale.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/oclock.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/proxymngr.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/resize.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/rstart.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/rstartd.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/sessreg.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/setxkbmap.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/showfont.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/showrgb.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/smproxy.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/startx.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/sxpm.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/texteroids.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/twm.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/viewres.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/x11perf.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/x11perfcomp.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xauth.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xbiff.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xcalc.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xclipboard.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xclock.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xcmsdb.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xconsole.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xcursorgen.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xcutsel.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xditview.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xdm.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xdpyinfo.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xedit.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xev.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xeyes.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xfd.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xfindproxy.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xfontsel.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xfsinfo.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xfwp.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xgamma.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xgc.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xhost.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xinit.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xkbcomp.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xkbevd.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xkbprint.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xkill.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xload.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xlogo.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xlsatoms.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xlsclients.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xlsfonts.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xmag.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xman.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xmessage.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xmh.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xmodmap.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xon.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xprop.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xrandr.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xrdb.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xrefresh.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xset.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xsetmode.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xsetpointer.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xsetroot.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xsm.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xstdcmap.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xterm.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xtrap.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xtrapchar.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xtrapin.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xtrapinfo.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xtrapout.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xtrapproto.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xtrapreset.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xtrapstats.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xvidtune.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xvinfo.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xwd.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xwininfo.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xwud.${MAN_SUFFIX} +@dirrm ${X11ROOT_PREFIX}/lib/X11/xsm +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/types +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/xfree68 +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sun +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sony +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/sgi +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/pc +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/nec +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/macintosh +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/hp +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/fujitsu +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/digital +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/semantics +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/rules +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sun +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/keymap/sgi +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/keymap/digital +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/keymap +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/sgi +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/keycodes/digital +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/keycodes +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/geometry/sgi +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/geometry/ibm +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/geometry/digital +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/geometry +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/compiled +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/compat +@dirrm ${X11ROOT_PREFIX}/lib/X11/xkb +@dirrm ${X11ROOT_PREFIX}/lib/X11/xinit +@dirrm ${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes +@dirrm ${X11ROOT_PREFIX}/lib/X11/xedit/lisp +@dirrm ${X11ROOT_PREFIX}/lib/X11/xedit +@dirrm ${X11ROOT_PREFIX}/lib/X11/xdm/pixmaps +@dirrm ${X11ROOT_PREFIX}/lib/X11/xdm +@dirrm ${X11ROOT_PREFIX}/lib/X11/x11perfcomp +@dirrm ${X11ROOT_PREFIX}/lib/X11/twm +@dirrm ${X11ROOT_PREFIX}/lib/X11/rstart/contexts +@dirrm ${X11ROOT_PREFIX}/lib/X11/rstart/commands/x11r6 +@dirrm ${X11ROOT_PREFIX}/lib/X11/rstart/commands +@dirrm ${X11ROOT_PREFIX}/lib/X11/rstart +@dirrm ${X11ROOT_PREFIX}/lib/X11/proxymngr +@dirrm ${X11ROOT_PREFIX}/lib/X11/lbxproxy +@dirrm ${X11ROOT_PREFIX}/lib/X11/icons/whiteglass/cursors +@dirrm ${X11ROOT_PREFIX}/lib/X11/icons/whiteglass +@dirrm ${X11ROOT_PREFIX}/lib/X11/icons/redglass/cursors +@dirrm ${X11ROOT_PREFIX}/lib/X11/icons/redglass +@dirrm ${X11ROOT_PREFIX}/lib/X11/icons/handhelds/cursors +@dirrm ${X11ROOT_PREFIX}/lib/X11/icons/handhelds +@dirrm ${X11ROOT_PREFIX}/lib/X11/icons/default +@dirrm ${X11ROOT_PREFIX}/lib/X11/icons +@dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/util +@dirrm ${X11ROOT_PREFIX}/include/X11/PM diff --git a/x11/XFree86-clients/files/host.def b/x11/XFree86-clients/files/host.def index 493e895682d..24d66eae34c 100644 --- a/x11/XFree86-clients/files/host.def +++ b/x11/XFree86-clients/files/host.def @@ -1,8 +1,4 @@ -/* - * $NetBSD: host.def,v 1.2 2004/02/02 14:16:07 xtraeme Exp $ - * - * XFree86 packages for pkgsrc system - */ +/* $NetBSD: host.def,v 1.3 2004/03/28 22:06:15 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO @@ -49,9 +45,10 @@ #define InstallXinitConfig YES #define InstallAppDefFiles YES +#define StandardIncludes -I@BLNK@/include #define ExtraLoadFlags @LDFLAGS@ #define LibInstallBuild YES -#define StandardIncludes -I@BLNK@/include -I@PREFIX@/include + #define DontUseLibPathVar YES #define PreloadSetup #define UseInstalledPrograms YES diff --git a/x11/XFree86-clients/files/ucs2any.c b/x11/XFree86-clients/files/ucs2any.c deleted file mode 100644 index f272f43e328..00000000000 --- a/x11/XFree86-clients/files/ucs2any.c +++ /dev/null @@ -1,952 +0,0 @@ -/*- - * Copyright (c) 2003 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Ben Collver <collver1@attbi.com>. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * This utility allows you to generate from an ISO10646-1 encoded - * BDF font other BDF fonts in any possible encoding. This way, you can - * derive from a single ISO10646-1 master font a whole set of 8-bit - * fonts in all ISO 8859 and various other encodings. (Hopefully - * a future XFree86 release will have a similar facility built into - * the server, which can reencode ISO10646-1 on the fly, because - * storing the same fonts in many different encodings is clearly - * a waste of storage capacity). -*/ - -#include <ctype.h> -#include <errno.h> -#include <fcntl.h> -#include <limits.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -/* global variable for argv[0] */ -const char *my_name = NULL; - -static char *u_basename(char *pathname) -{ - char *ptr; - - ptr = strrchr(pathname, '/'); - return ((ptr == NULL) ? pathname : &ptr[1]); -} - -/* "CLASS" "z" string and memory manipulation */ - -void *zmalloc(size_t size) -{ - void *r; - r = malloc(size); - if (r == NULL) { - perror(my_name); - exit(errno); - } - memset(r, 0, size); - return r; -} - -void *zrealloc(void *ptr, size_t size) -{ - void *temp; - temp = realloc(ptr, size); - if (temp == NULL) { - perror(my_name); - exit(errno); - } - return temp; -} - -char *zstrdup(const char *str) -{ - char *retval; - - if (str == NULL) { - fprintf(stderr, "%s: zstrdup(NULL)\n", my_name); - exit(1); - } - retval = strdup(str); - if (retval == NULL) { - perror(my_name); - exit(errno); - } - return retval; -} - -void zstrcpy(char **dest, const char *source) -{ - if (*dest != NULL) - free(*dest); - *dest = zstrdup(source); -} - -void zquotedcpy(char **dest, const char *source) -{ - const char *start, *end; - - if (*dest != NULL) - free(*dest); - *dest = NULL; - start = source; - if (*start == '"') { - start = source+1; - end = strrchr(start, '"'); - if (!end) return; - *dest = zmalloc(end-start+1); - strncpy(*dest, start, end-start); - (*dest)[end-start] = '\0'; - } else { - *dest = zstrdup(source); - } -} - -void zstrcat(char **dest, const char *source) -{ - int dest_size = 1; - int source_size; - - if (*dest != NULL) - dest_size = strlen(*dest) + 1; - source_size = strlen(source); - *dest = zrealloc(*dest, dest_size + source_size); - strcpy(*dest + dest_size - 1, source); -} - -void zstrtoupper(char *s) -{ - char *t; - - for (t = s; *t != '\000'; t++) - *t = toupper(*t); -} - -char *zitoa(int value) -{ - static char zitoa_buf[23]; - char *p = zitoa_buf; - int n = value; - int i = 10; - - if (n < 0) { - *p++ = '-'; - n *= -1; - } - while (n / i) - i *= 10; - while (i > 9) { - i /= 10; - *p++ = '0' + n / i; - n -= n / i * i; - } - *p = '\000'; - return zitoa_buf; -} - -#define zs_true(x) (x != NULL && strcmp(x, "0") != 0) -#define zi_true(x) (x == 1) - -/* "CLASS" "dynamic array" */ - -typedef struct { - char *name; - int size; - int count; - void **values; - void *nv; -} da_t; - -da_t *da_new(char *name) -{ - da_t *da; - - da = zmalloc(sizeof(da_t)); - da->size = 0; - da->count = 0; - da->values = NULL; - da->nv = NULL; - da->name = NULL; - zstrcpy(&(da->name), name); - return da; -} - -void *da_fetch(da_t *da, int key) -{ - void *r = NULL; - - if (key >= 0 && key < da->size && da->values[key] != NULL) - r = da->values[key]; - else - if (key == -1 && da->nv != NULL) - r = da->nv; - - return r; -} - -int da_fetch_int(da_t *da, int key) -{ - int *t; - int r = -1; - t = da_fetch(da, key); - if (t != NULL) - r = *t; - return r; -} - -#define da_fetch_str(a,k) \ - (char *)da_fetch(a,k) - -void da_add(da_t *da, int key, void *value) -{ - int i = da->size; - if (key >= 0) { - if (key >= da->size) { - da->size = key + 1; - da->values = zrealloc(da->values, - da->size * sizeof(void *)); - for (; i < da->size; i++) - da->values[i] = NULL; - } - if (da->values[key] != NULL) { - free(da->values[key]); - } else { - if (value == NULL) { - if (da->count > 0) - da->count--; - } else { - da->count++; - } - } - da->values[key] = value; - } else if (key == -1) { - if (da->nv != NULL) - free(da->nv); - da->nv = value; - } -} - -void da_add_str(da_t *da, int key, char *value) -{ - da_add(da, key, value?zstrdup(value):NULL); -} - -void da_add_int(da_t *da, int key, int value) -{ - int *v; - - v = zmalloc(sizeof(int)); - *v = value; - da_add(da, key, v); -} - -#define da_count(da) (da->count) -#define da_size(da) (da->size) - -void da_clear(da_t *da) -{ - int i; - - for (i = da->size; i; i--) - free(da->values[i]); - if (da->values != NULL) - free(da->values); - da->size = 0; - da->count = 0; - da->values = NULL; -} - -/* "CLASS" file input */ - -#define TYPICAL_LINE_SIZE (80) - -/* read a line and strip trailing whitespace */ -int read_line(FILE *fp, char **buffer) -{ - int buffer_size = TYPICAL_LINE_SIZE; - int eof = 0; - int position = 0; - int c; - - *buffer = zmalloc(TYPICAL_LINE_SIZE); - (*buffer)[0] = '\0'; - - if ((c = getc(fp)) == EOF) - eof = 1; - - while (c != '\n' && !eof) { - if (position + 1 >= buffer_size) { - buffer_size = buffer_size * 2 + 1; - *buffer = zrealloc(*buffer, buffer_size); - } - (*buffer)[position++] = c; - (*buffer)[position] = '\0'; - c = getc(fp); - if (c == EOF) - eof = 1; - } - - if (eof) { - free(*buffer); - *buffer = NULL; - return 0; - } - - while (position > 1) { - position--; - if (!isspace((*buffer)[position])) - break; - (*buffer)[position] = '\0'; - } - - return 1; -} - -/* BEGIN */ - -/* -DEC VT100 graphics characters in the range 1-31 (as expected by -some old xterm versions and a few other applications) -*/ -#define decmap_size 31 -int decmap[decmap_size] = { - 0x25C6, /* BLACK DIAMOND */ - 0x2592, /* MEDIUM SHADE */ - 0x2409, /* SYMBOL FOR HORIZONTAL TABULATION */ - 0x240C, /* SYMBOL FOR FORM FEED */ - 0x240D, /* SYMBOL FOR CARRIAGE RETURN */ - 0x240A, /* SYMBOL FOR LINE FEED */ - 0x00B0, /* DEGREE SIGN */ - 0x00B1, /* PLUS-MINUS SIGN */ - 0x2424, /* SYMBOL FOR NEWLINE */ - 0x240B, /* SYMBOL FOR VERTICAL TABULATION */ - 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */ - 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */ - 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ - 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */ - 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ - 0x23BA, /* HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */ - 0x23BB, /* HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */ - 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */ - 0x23BC, /* HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */ - 0x23BD, /* HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */ - 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ - 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ - 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ - 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ - 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */ - 0x2264, /* LESS-THAN OR EQUAL TO */ - 0x2265, /* GREATER-THAN OR EQUAL TO */ - 0x03C0, /* GREEK SMALL LETTER PI */ - 0x2260, /* NOT EQUAL TO */ - 0x00A3, /* POUND SIGN */ - 0x00B7 /* MIDDLE DOT */ -}; - -int is_control(int ucs) -{ - return ((ucs >= 0x00 && ucs <= 0x1f) || - (ucs >= 0x7f && ucs <= 0x9f)); -} - -int is_blockgraphics(int ucs) -{ - return ucs >= 0x2500 && ucs <= 0x25FF; -} - -/* calculate the bounding box that covers both provided bounding boxes */ -typedef struct { - int cwidth; - int cheight; - int cxoff; - int cyoff; -} bbx_t; - -bbx_t *combine_bbx(int awidth, int aheight, int axoff, int ayoff, - int cwidth, int cheight, int cxoff, int cyoff, bbx_t *r) -{ - r->cwidth = cwidth; - r->cheight = cheight; - r->cxoff = cxoff; - r->cyoff = cyoff; - - if (axoff < r->cxoff) { - r->cwidth += r->cxoff - axoff; - r->cxoff = axoff; - } - if (ayoff < r->cyoff) { - r->cheight += r->cyoff - ayoff; - r->cyoff = ayoff; - } - if (awidth + axoff > r->cwidth + r->cxoff) { - r->cwidth = awidth + axoff - r->cxoff; - } - if (aheight + ayoff > r->cheight + r->cyoff) { - r->cheight = aheight + ayoff - r->cyoff; - } - - return r; -} - -void usage(void) { - printf("%s", "\n" -"Usage: ucs2any [+d|-d] <source-name> { <mapping-file> <registry-encoding> }\n" -"\n" -"where\n" -"\n" -" +d put DEC VT100 graphics characters in the C0 range\n" -" (default for upright charcell fonts)\n" -"\n" -" -d do not put DEC VT100 graphics characters in the\n" -" C0 range (default for all other font types)\n" -"\n" -" <source-name> is the name of an ISO10646-1 encoded BDF file\n" -"\n" -" <mapping-file> is the name of a character set table like those on\n" -" <ftp://ftp.unicode.org/Public/MAPPINGS/>\n" -"\n" -" <registry-encoding> are the CHARSET_REGISTRY and CHARSET_ENCODING\n" -" field values for the font name (XLFD) of the\n" -" target font, separated by a hyphen\n" -"\n" -"Example:\n" -"\n" -" ucs2any 6x13.bdf 8859-1.TXT iso8859-1 8859-2.TXT iso8859-2\n" -"\n" -"will generate the files 6x13-iso8859-1.bdf and 6x13-iso8859-2.bdf\n" -"\n"); -} - -int chars_compare(const void *aa, const void *bb) -{ - int a = *(int *)aa; - int b = *(int *)bb; - - return a - b; -} - -/* - * Return != 0 if "string" starts with "pattern" followed by whitespace. - * If it does, return a pointer to the first non space char. - */ -static const char * startswith(const char *string, const char *pattern) -{ - int l = strlen(pattern); - - if (strlen(string) <= l) return NULL; - if (strncmp(string, pattern, l) != 0) return NULL; - string += l; - if (!isspace(*string)) return NULL; - while (isspace(*string)) - string++; - return string; -} - -int main(int argc, char *argv[]) -{ - int ai = 1; - int dec_chars = -1; - char *fsource = NULL; - FILE *fsource_fp; - int properties; - int default_char; - char *l = NULL; - char *t = NULL; - const char *nextc = NULL; - char *startfont = NULL; - char *slant = NULL; - char *spacing = NULL; - char *sc = NULL; - int code = -1; - da_t *startchar; - da_t *my_char; - char *fmap = NULL; - char *registry = NULL; - char *encoding = NULL; - char *fontname = NULL; - FILE *fmap_fp; - da_t *map; - da_t *headers; - int nextheader = -1; - int default_char_index = -1; - int startproperties_index = -1; - int fontname_index = -1; - int charset_registry_index = -1; - int slant_index = -1; - int spacing_index = -1; - int charset_encoding_index = -1; - int fontboundingbox_index = -1; - int target; - int ucs; - int i; - int j; - int *chars = NULL; - bbx_t bbx; - char *fout = NULL; - FILE *fout_fp; - int k; - char *registry_encoding = NULL; - - my_name = argv[0]; - - startchar = da_new("startchar"); - my_char = da_new("my_char"); - map = da_new("map"); - headers = da_new("headers"); - - if (argc < 2) { - usage(); - exit(0); - } - - /* check options */ - if (strcmp(argv[ai], "+d") == 0) { - ai++; - dec_chars = 1; - } else if (strcmp(argv[ai], "-d") == 0) { - ai++; - dec_chars = 0; - } - if (ai >= argc) { - usage(); - exit(0); - } - - /* open and read source file */ - fsource = argv[ai]; - fsource_fp = fopen(fsource, "r"); - if (fsource_fp == NULL) { - fprintf(stderr, "%s: Can't read file '%s': %s!\n", my_name, - fsource, strerror(errno)); - exit(1); - } - - /* read header */ - properties = 0; - default_char = 0; - while (read_line(fsource_fp, &l)) { - if (startswith(l, "CHARS")) - break; - if (startswith(l, "STARTFONT")) { - zstrcpy(&startfont, l); - } else if (startswith(l, "_XMBDFED_INFO") || - startswith(l, "XFREE86_GLYPH_RANGES")) - { - properties--; - } else if ((nextc = startswith(l, "DEFAULT_CHAR")) != NULL) - { - default_char = atoi(nextc); - default_char_index = ++nextheader; - da_add_str(headers, default_char_index, NULL); - } else { - if ((nextc = startswith(l, "STARTPROPERTIES")) != NULL) - { - properties = atoi(nextc); - startproperties_index = ++nextheader; - da_add_str(headers, startproperties_index, NULL); - } else if ((nextc = startswith(l, "FONT")) != NULL) - { - char * term; - /* slightly simplistic check ... */ - zquotedcpy(&fontname, nextc); - if ((term = strstr(fontname, "-ISO10646-1")) == NULL) { - fprintf(stderr, - "%s: FONT name in '%s' is '%s' and not '*-ISO10646-1'!\n", - my_name, fsource, fontname); - exit(1); - } - *term = '\0'; - fontname_index = ++nextheader; - da_add_str(headers, fontname_index, NULL); - } else if ((nextc = startswith(l, "CHARSET_REGISTRY")) != NULL) - { - if (strcmp(nextc, "\"ISO10646\"") != 0) { - fprintf(stderr, - "%s: CHARSET_REGISTRY in '%s' is '%s' and not 'ISO10646'!\n", - my_name, fsource, nextc); - exit(1); - } - charset_registry_index = ++nextheader; - da_add_str(headers, charset_registry_index, NULL); - } else if ((nextc = startswith(l, "CHARSET_ENCODING")) != NULL) - { - if (strcmp(nextc, "\"1\"") != 0) { - fprintf(stderr, - "%s: CHARSET_ENCODING in '%s' is '%s' and not '1'!\n", - my_name, fsource, nextc); - exit(1); - } - charset_encoding_index = ++nextheader; - da_add_str(headers, charset_encoding_index, NULL); - } else if (startswith(l, "FONTBOUNDINGBOX")) { - fontboundingbox_index = ++nextheader; - da_add_str(headers, fontboundingbox_index, NULL); - } else if ((nextc = startswith(l, "SLANT")) != NULL) - { - zquotedcpy(&slant, nextc); - slant_index = ++nextheader; - da_add_str(headers, slant_index, NULL); - } else if ((nextc = startswith(l, "SPACING")) != NULL) - { - zquotedcpy(&spacing, nextc); - zstrtoupper(spacing); - spacing_index = ++nextheader; - da_add_str(headers, spacing_index, NULL); - } else if ((nextc = startswith(l, "COMMENT")) != NULL) { - if (strncmp(nextc, "$Id: ", 5)==0) { - char *header = NULL; - char *id = NULL, *end = NULL; - id = zstrdup(nextc + 5); - end = strrchr(id, '$'); - if (end) *end = '\0'; - zstrcpy(&header, "COMMENT Derived from "); - zstrcat(&header, id); - zstrcat(&header, "\n"); - free(id); - da_add_str(headers, ++nextheader, header); - free(header); - } else { - da_add_str(headers, ++nextheader, l); - } - } else { - da_add_str(headers, ++nextheader, l); - } - } - free(l); - } - - if (startfont == NULL) { - fprintf(stderr, "%s: No STARTFONT line found in '%s'!\n", - my_name, fsource); - exit(1); - } - - /* read characters */ - while (read_line(fsource_fp, &l)) { - if (startswith(l, "STARTCHAR")) { - zstrcpy(&sc, l); - zstrcat(&sc, "\n"); - code = -1; - } else if ((nextc = startswith(l, "ENCODING")) != NULL) { - code = atoi(nextc); - da_add_str(startchar, code, sc); - da_add_str(my_char, code, ""); - } else if (strcmp(l, "ENDFONT")==0) { - code = -1; - zstrcpy(&sc, "STARTCHAR ???\n"); - } else { - zstrcpy(&t, da_fetch_str(my_char, code)); - zstrcat(&t, l); - zstrcat(&t, "\n"); - da_add_str(my_char, code, t); - if (strcmp(l, "ENDCHAR")==0) { - code = -1; - zstrcpy(&sc, "STARTCHAR ???\n"); - } - } - free(l); - } - - fclose(fsource_fp); - - ai++; - while (ai < argc) { - zstrcpy(&fmap, argv[ai]); - i = ai + 1; - if (i < argc) { - char *temp = NULL; - char * hyphen = strchr(argv[i], '-'); - if (!hyphen || strchr(hyphen+1, '-') != NULL) { - fprintf(stderr, - "%s: Argument registry-encoding '%s' not in expected format!\n", - my_name, i < argc ? fmap : ""); - exit(1); - } - temp = zstrdup(argv[i]); - hyphen = strchr(temp, '-'); - if (hyphen) *hyphen = 0; - zstrcpy(®istry, temp); - zstrcpy(&encoding, hyphen+1); - free(temp); - } else { - fprintf(stderr, "map file argument \"%s\" needs a " - "coresponding registry-encoding argument\n", fmap); - exit(0); - } - - ai++; - ai++; - - /* open and read source file */ - fmap_fp = fopen(fmap, "r"); - if (fmap_fp == NULL) { - fprintf(stderr, - "%s: Can't read mapping file '%s': %s!\n", - my_name, fmap, strerror(errno)); - exit(1); - } - - da_clear(map); - - for (;read_line(fmap_fp, &l); free(l)) { - char *p, *endp; - - for (p = l; isspace(p[0]); p++) - ; - if (p[0] == '\0' || p[0] == '#') - continue; - if (p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { - target = strtol(p+2, &endp, 16); - if (*endp == '\0') goto bad; - p = endp; - } else - goto bad; - for (; isspace(p[0]); p++) - ; - if (p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { - ucs = strtol(p+2, &endp, 16); - if (*endp == '\0') goto bad; - p = endp; - } else - goto bad; - - if (!is_control(ucs)) { - if (zs_true(da_fetch_str(startchar, ucs))) - { - da_add_int(map, target, ucs); - } else { - if (!((is_blockgraphics(ucs) && - strcmp(slant, "R") != 0) || - (ucs >= 0x200e && - ucs <= 0x200f))) { - fprintf(stderr, - "No glyph for character U+%04X (0x%02x) available.\n", - ucs, target); - } - } - } - continue; - bad: - fprintf(stderr, "Unrecognized line in '%s':\n%s\n", fmap, l); - } - fclose(fmap_fp); - - /* add default character */ - if (!zi_true(da_fetch_int(map, 0))) { - if (zs_true(da_fetch_str(startchar, default_char))) { - da_add_int(map, 0, default_char); - da_add_str(startchar, default_char, - "STARTCHAR defaultchar\n"); - } else { - fprintf(stderr, "%s", - "No default character defined.\n"); - } - } - - if (dec_chars == 1 || - (dec_chars == -1 && strcmp(slant, "R") == 0 && - strcmp(spacing, "C") == 0)) - { - /* add DEC VT100 graphics characters in the range 1-31 - (as expected by some old xterm versions) */ - for (i = 0; i < decmap_size; i++) { - if (zs_true(da_fetch_str(startchar, decmap[i]))) - { - da_add_int(map, i + 1, decmap[i]); - } - } - } - - /* list of characters that will be written out */ - j = da_count(map); - if (j < 0) { - fprintf(stderr, - "No characters found for %s-%s.\n", - registry, encoding); - continue; - } - if (chars != NULL) - free(chars); - chars = zmalloc(j * sizeof(int)); - memset(chars, 0, j * sizeof(int)); - for (k = 0, i = 0; k < da_count(map) && i < da_size(map); i++) { - if (da_fetch(map, i) != NULL) - chars[k++] = i; - } - qsort(chars, j, sizeof(int), chars_compare); - - /* find overall font bounding box */ - bbx.cwidth = -1; - for (i = 0; i < j; i++) { - ucs = da_fetch_int(map, chars[i]); - zstrcpy(&t, da_fetch_str(my_char, ucs)); - if ((nextc = startswith(t, "BBX")) != NULL - || (nextc = strstr(t, "\nBBX")) != NULL) - { - char *endp; - long w, h, x, y; - - if (*nextc == '\n') { - nextc += 4; - while (isspace(*nextc)) - nextc++; - } - for (;isspace(*nextc);) - nextc++; - w = strtol(nextc, &endp, 10); - nextc = endp; - if (*nextc == '\0') goto bbxbad; - for (;isspace(*nextc);) - nextc++; - h = strtol(nextc, &endp, 10); - nextc = endp; - if (*nextc == '\0') goto bbxbad; - for (;isspace(*nextc);) - nextc++; - x = strtol(nextc, &endp, 10); - nextc = endp; - if (*nextc == '\0') goto bbxbad; - for (;isspace(*nextc);) - nextc++; - y = strtol(nextc, &endp, 10); - if (bbx.cwidth == -1) { - bbx.cwidth = w; - bbx.cheight = h; - bbx.cxoff = x; - bbx.cyoff = y; - } else { - combine_bbx(bbx.cwidth, bbx.cheight, - bbx.cxoff, bbx.cyoff, - w, h, x, y, &bbx); - } - continue; - bbxbad: - fprintf(stderr, "Unparsable BBX found for U+%04x!\n", ucs); - } else { - fprintf(stderr, - "Warning: No BBX found for U+%04X!\n", - ucs); - } - } - - if (!registry) registry = zstrdup(""); - if (!encoding) encoding = zstrdup(""); - - /* generate output file name */ - zstrcpy(®istry_encoding, "-"); - zstrcat(®istry_encoding, registry); - zstrcat(®istry_encoding, "-"); - zstrcat(®istry_encoding, encoding); - - { - char * p = strstr(fsource, ".bdf"); - if (p) { - zstrcpy(&fout, fsource); - p = strstr(fout, ".bdf"); - *p = 0; - zstrcat(&fout, registry_encoding); - zstrcat(&fout, ".bdf"); - } else { - zstrcpy(&fout, fsource); - zstrcat(&fout, registry_encoding); - } - } - - /* remove path prefix */ - zstrcpy(&t, u_basename(fout)); - zstrcpy(&fout, t); - - /* write new BDF file */ - fprintf(stderr, "Writing %d characters into file '%s'.\n", - j, fout); - fout_fp = fopen(fout, "w"); - if (fout_fp == NULL) { - fprintf(stderr, "%s: Can't write file '%s': %s!\n", - my_name, fout, strerror(errno)); - exit(1); - } - - fprintf(fout_fp, "%s\n", startfont); - fprintf(fout_fp, "%s", - "COMMENT AUTOMATICALLY GENERATED FILE. DO NOT EDIT!\n"); - fprintf(fout_fp, - "COMMENT Generated with 'ucs2any %s %s %s-%s'\n", - fsource, fmap, registry, encoding); - fprintf(fout_fp, "%s", - "COMMENT from an ISO10646-1 encoded source BDF font.\n"); - fprintf(fout_fp, "%s", - "COMMENT ucs2any by Ben Collver <collver1@attbi.com>, 2003.\n"); - fprintf(fout_fp, "%s", - "COMMENT based on ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 2000.\n"); - - for (i = 0; i <= nextheader; i++) { - if (i == default_char_index) - fprintf(fout_fp, "DEFAULT_CHAR %d\n", default_char); - else if (i == startproperties_index) - fprintf(fout_fp, "STARTPROPERTIES %d\n", properties); - else if (i == fontname_index) { - fprintf(fout_fp, "FONT %s%s\n", fontname, registry_encoding); - } - else if (i == charset_registry_index) - fprintf(fout_fp, "CHARSET_REGISTRY \"%s\"\n", registry); - else if (i == slant_index) - fprintf(fout_fp, "SLANT \"%s\"\n", slant); - else if (i == charset_encoding_index) - fprintf(fout_fp, "CHARSET_ENCODING \"%s\"\n", encoding); - else if (i == fontboundingbox_index) - fprintf(fout_fp, "FONTBOUNDINGBOX %d %d %d %d\n", bbx.cwidth, bbx.cheight, bbx.cxoff, bbx.cyoff); - else if (i == spacing_index) - fprintf(fout_fp, "SPACING \"%s\"\n", spacing); - else - fprintf(fout_fp, "%s\n", da_fetch_str(headers, i)); - } - - fprintf(fout_fp, "CHARS %d\n", j); - - /* Write characters */ - for (i = 0; i < j; i++) { - ucs = da_fetch_int(map, chars[i]); - fprintf(fout_fp, "%s", da_fetch_str(startchar, - ucs)); - fprintf(fout_fp, "ENCODING %d\n", chars[i]); - fprintf(fout_fp, "%s", da_fetch_str(my_char, - ucs)); - } - fprintf(fout_fp, "%s", "ENDFONT\n"); - fclose(fout_fp); - } - - exit(0); -} diff --git a/x11/XFree86-libs/MESSAGE b/x11/XFree86-libs/MESSAGE index 0c07a14e00e..6795da4bfcf 100644 --- a/x11/XFree86-libs/MESSAGE +++ b/x11/XFree86-libs/MESSAGE @@ -1,13 +1,10 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.1 2004/02/02 17:59:12 xtraeme Exp $ +$NetBSD: MESSAGE,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ Make sure you have defined X11BASE in /etc/mk.conf before try to install -pkgtools/x11-links. Then you can just add the following: +any package that uses X11 headers/libraries. Then you can just add the +following: - X11BASE=${X11PREFIX}/X11R6 - -If you had previously installed x11-links, make sure you have modified -X11BASE and then reinstalled x11-links before building any X11 -application. + X11BASE=${X11ROOT} ========================================================================== diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile index 2b1277450c9..b74e1c9146e 100644 --- a/x11/XFree86-libs/Makefile +++ b/x11/XFree86-libs/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2004/02/02 17:59:12 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/28 22:06:15 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 \ - X430src-3.tgz X430src-4.tgz +DISTFILES= XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz XFree86-4.4.0-src-4.tgz MAINTAINER= xfree86@blef.org HOMEPAGE= http://www.xfree86.org/ @@ -16,27 +15,16 @@ CONFLICTS+= xextensions-[0-9]* CONFLICTS+= libX11-[0-9]* CONFLICTS+= libXau-[0-9]* -USE_IMAKE= yes -DEPENDS= imake>=4.3.0:../../x11/imake +DEPENDS= imake>=4.4.0:../../x11/imake .include "../../mk/bsd.prefs.mk" -MESSAGE_SUBST+= X11PREFIX=${X11PREFIX} - -.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]* -CONFLICTS+= Xrender-[0-9]* CONFLICTS+= MesaLibs-[0-9]* .endif -USE_BUILDLINK2= YES +USE_BUILDLINK3= yes +BUILDLINK_PASSTHRU_DIRS+= ${X11ROOT}/lib XBUILD_DIRS= lib nls programs/Xserver/include \ programs/Xserver/hw/xfree86/parser @@ -45,16 +33,14 @@ XINSTALL_DIRS= include lib nls programs/Xserver/include \ programs/Xserver/hw/xfree86/parser XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} -post-patch: - @${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 \ - ${WRKSRC}/config/cf/Library.tmpl +SUBST_CLASSES= mkstrs +SUBST_STAGE.mkstrs= post-patch +SUBST_FILES.mkstrs= config/cf/Library.tmpl +SUBST_SED.mkstrs= -e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g' +SUBST_MESSAGE.mkstrs= "Fixing path of makestrs." -.include "../../fonts/fontconfig/buildlink2.mk" -.include "../../graphics/freetype2/buildlink2.mk" -.include "../../textproc/expat/buildlink2.mk" +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../meta-pkgs/XFree86/Makefile.common" - +.include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/XFree86-libs/PLIST.Linux b/x11/XFree86-libs/PLIST.Linux deleted file mode 100644 index 808dbdb356f..00000000000 --- a/x11/XFree86-libs/PLIST.Linux +++ /dev/null @@ -1,35 +0,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 deleted file mode 100644 index 6237c7ef832..00000000000 --- a/x11/XFree86-libs/PLIST.NetBSD +++ /dev/null @@ -1,31 +0,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 deleted file mode 100644 index 520007ab1a1..00000000000 --- a/x11/XFree86-libs/PLIST.common +++ /dev/null @@ -1,663 +0,0 @@ -@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 30e62089a97..86417a4471d 100644 --- a/x11/XFree86-libs/buildlink2.mk +++ b/x11/XFree86-libs/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2004/02/02 14:15:27 xtraeme Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2004/03/28 22:06:15 xtraeme Exp $ # # This Makefile fragment is included by packages that use XFree86-libs. # @@ -8,72 +8,64 @@ .if !defined(XFREE86_LIBS_BUILDLINK2_MK) XFREE86_LIBS_BUILDLINK2_MK= # defined -.include "../../mk/bsd.prefs.mk" +.include "../../XFree86/XFree86/Makefile.common" BUILDLINK_PACKAGES+= XFree86-libs -BUILDLINK_DEPENDS.XFree86-libs?= XFree86-libs>=4.3.0 -BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../x11/XFree86-libs +BUILDLINK_DEPENDS.XFree86-libs?= XFree86-libs>=4.4.0 +BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../XFree86/XFree86-libs EVAL_PREFIX+= BUILDLINK_PREFIX.XFree86-libs=XFree86-libs -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.* +BUILDLINK_PREFIX.XFree86-libs_DEFAULT= ${LOCALBASE}/${X11ROOT_PREFIX} +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/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/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.* .include "../../fonts/fontconfig/buildlink2.mk" .include "../../graphics/freetype2/buildlink2.mk" diff --git a/x11/XFree86-libs/buildlink3.mk b/x11/XFree86-libs/buildlink3.mk new file mode 100644 index 00000000000..e97f8b3b398 --- /dev/null +++ b/x11/XFree86-libs/buildlink3.mk @@ -0,0 +1,29 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/03/28 22:06:15 xtraeme Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +XFREE86_LIBS_BUILDLINK3_MK:= ${XFREE86_LIBS_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= XFree86-libs +.endif + +# +# XFree86-libs must come first so that packages listed later can overwrite +# any symlinks created by buildlinking XFree86-libs. +# +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXFree86-libs} +BUILDLINK_PACKAGES:= XFree86-libs ${BUILDLINK_PACKAGES} + +.if !empty(XFREE86_LIBS_BUILDLINK3_MK:M+) + +BUILDLINK_DEPENDS.XFree86-libs+= XFree86-libs>=4.4.0 +BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../XFree86/XFree86-libs +BUILDLINK_TRANSFORM.XFree86-libs+= -e "s|/X11R6/|/|" + +.endif # XFREE86_LIBS_BUILDLINK3_MK + +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/XFree86-libs/distinfo b/x11/XFree86-libs/distinfo index 81456592a53..7aae6f29f9d 100644 --- a/x11/XFree86-libs/distinfo +++ b/x11/XFree86-libs/distinfo @@ -1,35 +1,16 @@ -$NetBSD: distinfo,v 1.2 2004/01/31 15:06:24 xtraeme Exp $ +$NetBSD: distinfo,v 1.3 2004/03/28 22:06:15 xtraeme Exp $ -SHA1 (X430src-1.tgz) = 3aaf219e8c2d3eb299f150bd4a2554a84a19354b -Size (X430src-1.tgz) = 10993622 bytes -SHA1 (X430src-2.tgz) = 0fd76324484d793498900655c15117f15c539000 -Size (X430src-2.tgz) = 7962239 bytes -SHA1 (X430src-3.tgz) = a11e619ba0b628d9e2e39e838379658b3b347f66 -Size (X430src-3.tgz) = 12366363 bytes -SHA1 (X430src-4.tgz) = b462d0bf7d1a947e9dbb18b5a9c08602969905e0 -Size (X430src-4.tgz) = 12906091 bytes +SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79 +Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes +SHA1 (XFree86-4.4.0-src-2.tgz) = ee2dd36c0b3f29bd2df776ad23c850374001f1a6 +Size (XFree86-4.4.0-src-2.tgz) = 5745538 bytes +SHA1 (XFree86-4.4.0-src-3.tgz) = a012694d5a5aa3df1d9a3a52363d73cf8f03326b +Size (XFree86-4.4.0-src-3.tgz) = 11239253 bytes SHA1 (patch-aa) = cf384e765cc7c8ab5b22e6befea5df0316a12a4d -SHA1 (patch-ab) = d17449a05df23d7db143f90f5c9d8e3a9f1c530c -SHA1 (patch-ac) = edfd8daf9c60208b91df265e247078264b627d42 -SHA1 (patch-ad) = 30ced438fe85260baea1b2bb71856b31cf2678b7 -SHA1 (patch-ae) = fe41b7e4550cc027542ca415acb2a1b5687f6a43 -SHA1 (patch-af) = 39c580202284f5fc8271bfa6f01e15cd019bad96 -SHA1 (patch-ag) = c12a13b07e5f0636da195266c743fc8095b486b3 -SHA1 (patch-ah) = bec3d071020c9354c7f1203d0467343b32298518 -SHA1 (patch-ai) = c0596d43675869c4cb7be56a7cd644f4d14817d7 -SHA1 (patch-aj) = 3583c2e81da8511ce1d514fd5609968a9d12c980 -SHA1 (patch-ak) = 5dda86383ad52b506df6ae743773b81773be49d5 -SHA1 (patch-al) = 115d87ba50515ddd13b1bf865c8ab551b34c035c -SHA1 (patch-am) = 9df8fb1882fd1ef0fd4b5d0d299cddaa17b65cc0 -SHA1 (patch-an) = 711d234122d6c128cb2786cd32582e39e74af11d -SHA1 (patch-ao) = 17ede6e7c6c232f9fe2804d7ab4addd85b5cd25c -SHA1 (patch-ap) = d684198cb6b6822b91612f1f283fe6af316753a2 -SHA1 (patch-aq) = c229aac69ac0e503c4cac3c7f532cd6b4cbdef39 -SHA1 (patch-ar) = 129171c7ce2bfb08a6fef06e8ed77e7031a29eb0 -SHA1 (patch-as) = 5bfc792b879c859745b5dd1e71ac3e57ea9a7a37 -SHA1 (patch-at) = 89a4bcd4351d7b2967da744619e3912b2efa7138 -SHA1 (patch-au) = 77568c9cddca68e910e6db8d6d7baa5e495a0fb5 -SHA1 (patch-av) = 4c124eaf876e48b9deea2f7a63fd052f4fb11baa -SHA1 (patch-aw) = b9e4c6f04b0f55abd8c589889ba5d3721deaf670 -SHA1 (patch-ax) = 65c6a325c5378b18b55915c002be2827c8acab24 -SHA1 (patch-ay) = 42f380dce37126616095e4423dc0a163bfecb28d +SHA1 (patch-ab) = c12a13b07e5f0636da195266c743fc8095b486b3 +SHA1 (patch-ac) = 89a4bcd4351d7b2967da744619e3912b2efa7138 +SHA1 (patch-ad) = 17ede6e7c6c232f9fe2804d7ab4addd85b5cd25c +SHA1 (patch-ae) = 90584e5732fb882f431afd69f6fd1c26c9d22bee +SHA1 (patch-af) = b34f46d715e90159df3897cf20023b58b9deff67 +SHA1 (patch-ag) = a06752ee9f55e64a407fac6fbde3547fd096c71d +SHA1 (patch-ah) = 30618658577dd37b31191197cd2c156ff72e0d90 diff --git a/x11/XFree86-libs/files/host.def b/x11/XFree86-libs/files/host.def index c1f0300d88d..7fc7d69f538 100644 --- a/x11/XFree86-libs/files/host.def +++ b/x11/XFree86-libs/files/host.def @@ -1,8 +1,4 @@ -/* - * $NetBSD: host.def,v 1.1.1.1 2004/01/24 08:47:34 xtraeme Exp $ - * - * XFree86 packages for pkgsrc system - */ +/* $NetBSD: host.def,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ @@ -33,50 +29,33 @@ #define BuildLatin2Fonts NO #define BuildPlugin NO #define DebuggableLibraries NO -#define StandardIncludes \ - -I@BLNK@/include \ - -I@PREFIX@/include \ - -I@LOCALBASE@/include - -/* Common build of libs */ - -#define NormalLibFSa YES -#define NormalLibICE YES -#define NormalLibPex YES -#define NormalLibPhigs YES -#define NormalLibSM YES -#define NormalLibX11i YES -#define NormalLibXau YES -#define NormalLibXaw YES -#define NormalLibXdmcp YES -#define NormalLibXext YES -#define NormalLibXi YES -#define NormalLibXie YES -#define NormalLibXmu YES -#define NormalLibXt YES -#define NormalLibXtst YES -#define NormalLibXag YES -#define NormalOldX YES - -/* We need to build Xinerama shared library at least for metacity */ +#define StandardIncludes -I@BLNK@/include #undef SharedLibXinerama #define SharedLibXinerama YES +#define LibInstallBuild YES + #ifndef DriDrivers -#define DriDrivers /* Don't build the drivers here */ +# define DriDrivers /* Don't build the drivers here */ #endif #define HasXdmAuth YES #define UseInstalledPrograms YES #ifndef FreeBSDArchitecture -#ifndef BuildThreadStubLibrary +# ifndef BuildThreadStubLibrary # define BuildThreadStubLibrary YES -#endif +# endif #endif -#define HasZlib YES +#define BuildRenderLibrary NO +#define BuildExpatLibrary NO +#define BuildFreetype2Library NO +#define BuildFontconfigLibrary NO +#define BuildXftLibrary NO +#define BuildXft1Library NO +#define BuildRandRLibrary NO #define HasFreetype2 YES #define Freetype2Dir @BLNK@ diff --git a/x11/XFree86-libs/patches/patch-ab b/x11/XFree86-libs/patches/patch-ab index 5d85bde1f30..fc63926a56e 100644 --- a/x11/XFree86-libs/patches/patch-ab +++ b/x11/XFree86-libs/patches/patch-ab @@ -1,21 +1,23 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ +$NetBSD: patch-ab,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ ---- config/cf/X11.tmpl.orig 2003-02-25 21:57:52.000000000 +0000 -+++ config/cf/X11.tmpl 2003-07-21 15:11:05.000000000 +0000 -@@ -1498,6 +1498,7 @@ +--- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 ++++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 +@@ -300,6 +300,10 @@ + */ - #ifndef PsWrap - #define PsWrap $(PSWRAPSRC)/pswrap -+#define PsWrapDependency /* empty */ - #endif - - #ifndef ResourceConfigurationManagement -@@ -3029,7 +3030,7 @@ - #endif /* else BuildFreetype2Library */ - - #if BuildFreetype2Library || HasFreetype2 --FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -+FREETYPE2INCLUDES = -I$(FREETYPE2DIR)/include -I$(FREETYPE2INCDIR) - FREETYPE2DEFINES = -DFREETYPE2 + #ifndef MakeStringsDependency ++#if defined(UseInstalled) || defined(UseInstalledPrograms) ++#define MakeStringsDependency @@\ ++MAKESTRS = @MAKESTRS@ ++#else + # define MakeStringsDependency @@\ + MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ + NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ +@@ -308,6 +312,7 @@ + cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ + @@\ + includes:: HostProgramTargetName($(MAKESTRS)) ++#endif #endif + #ifndef ToolkitMakeStrings diff --git a/x11/XFree86-libs/patches/patch-ac b/x11/XFree86-libs/patches/patch-ac index 14b79af0657..75d85d91cae 100644 --- a/x11/XFree86-libs/patches/patch-ac +++ b/x11/XFree86-libs/patches/patch-ac @@ -1,50 +1,22 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ +$NetBSD: patch-ac,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ ---- config/cf/Imake.rules.orig Thu Jan 2 14:43:27 2003 -+++ config/cf/Imake.rules Thu Jan 2 14:49:12 2003 -@@ -1406,7 +1406,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef RmanDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanDependency() /**/ - #else - #define RmanDependency() @@\ -@@ -1421,7 +1421,7 @@ - #endif /* RmanDependency */ +--- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig 2003-07-09 13:48:58.000000000 +0000 ++++ programs/Xserver/hw/xfree86/xf86config/xf86config.c 2003-07-09 13:49:42.000000000 +0000 +@@ -176,6 +176,9 @@ + #endif + #define CONFIGNAME XCONFIGFILE - #ifndef RmanCmdDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanCmdDependency /**/ - #else - #define RmanCmdDependency ProgramTargetName($(RMAN)) -@@ -1874,7 +1874,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef DependDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define DependDependency() /**/ - #else - #define DependDependency() @@\ -@@ -1969,7 +1969,7 @@ - * within the source tree. - */ - #ifndef ImakeDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define ImakeDependency(target) /**/ - #else - #define ImakeDependency(target) @@\ -@@ -3126,6 +3126,9 @@ ++/* Comment this out for now ... */ ++ ++#if 0 + #ifndef XF86_VERSION_MAJOR + #ifdef XVERSION + #if XVERSION > 40000000 +@@ -187,6 +190,7 @@ + #define XF86_VERSION_MAJOR 4 + #endif + #endif ++#endif - #ifdef UseInstalled - #define ImakeSubCmdHelper $(IMAKE_CMD) -+#elif defined(UseInstalledPrograms) -+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) + + int config_mousetype; /* Mouse. */ diff --git a/x11/XFree86-libs/patches/patch-ad b/x11/XFree86-libs/patches/patch-ad index 8d5c447fc2a..610edcd0624 100644 --- a/x11/XFree86-libs/patches/patch-ad +++ b/x11/XFree86-libs/patches/patch-ad @@ -1,77 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-ad,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ ---- config/cf/Imake.tmpl.orig Mon Dec 9 19:20:41 2002 -+++ config/cf/Imake.tmpl Thu Jan 2 14:34:20 2003 -@@ -237,7 +237,8 @@ +--- programs/Xserver/dix/main.c.orig 2003-07-07 01:39:11.000000000 +0000 ++++ programs/Xserver/dix/main.c 2003-07-07 01:43:07.000000000 +0000 +@@ -505,7 +505,7 @@ + /* Leave off the ridBase and ridMask, these must be sent with + connection */ - #ifndef RmanCmd - #if BuildRman --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RmanCmd rman - #else - #define RmanCmd $(TOP)/config/util/rman -@@ -1348,7 +1349,8 @@ - #define LoaderLibPrefix /**/ - #endif - #ifndef ImakeCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define ImakeCmd imake - #else - #define ImakeCmd $(IMAKESRC)/imake -@@ -1359,19 +1361,22 @@ - #endif - #ifndef DependCmd - #if UseGccMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd gccmakedep - #else - #define DependCmd $(DEPENDSRC)/gccmakedep - #endif - #elif UseCCMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd ccmakedep - #else - #define DependCmd $(DEPENDSRC)/ccmakedep - #endif - #else --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd makedepend - #else - #define DependCmd $(DEPENDSRC)/makedepend -@@ -1398,21 +1403,23 @@ - #ifndef ExportListCmd - # ifndef ExportListGenSource - # define ExportListCmd /**/ --# elif !defined(UseInstalled) -+# elif !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define ExportListCmd $(CONFIGSRC)/util/exportlistgen - # else - # define ExportListCmd exportlistgen - # endif - #endif - #ifndef MkdirHierCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define MkdirHierCmd mkdirhier - #else - #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh - #endif - #endif - #ifndef RevPathCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RevPathCmd revpath - #else - #define RevPathCmd $(CONFIGSRC)/util/revpath +- setup.release = VENDOR_RELEASE; ++ setup.release = NULL; + /* + * per-server image and bitmap parameters are defined in Xmd.h + */ diff --git a/x11/XFree86-libs/patches/patch-ae b/x11/XFree86-libs/patches/patch-ae index c32fd8b0cbd..4401ca0a98b 100644 --- a/x11/XFree86-libs/patches/patch-ae +++ b/x11/XFree86-libs/patches/patch-ae @@ -1,12 +1,46 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-ae,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ ---- lib/Xcursor/Imakefile.orig Tue May 13 14:34:23 2003 -+++ lib/Xcursor/Imakefile Tue May 13 14:34:34 2003 -@@ -69,8 +69,6 @@ - RemoveFile($@) - sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@ +--- config/cf/NetBSD.cf.in.orig 2004-03-03 07:53:38.000000000 +0000 ++++ config/cf/NetBSD.cf.in 2004-03-03 07:54:59.000000000 +0000 +@@ -143,7 +143,7 @@ + #define MkdirHierCmd mkdir -p --InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig) -- - clean:: - RemoveFile(xcursor.pc) + #undef CcCmd +-#define CcCmd gcc ++#define CcCmd @@PKGSRC_CC@@ + #ifndef DefaultCCOptions + #if defined(UseInstalled) + #define DefaultCCOptions /**/ +@@ -159,7 +159,7 @@ + #endif + #endif + +-#define CppCmd cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ + #define PreProcessCmd CcCmd -E +@@ -208,13 +208,7 @@ + #define HasWeakSymbols UseElfFormat + + #ifdef i386Architecture +-# ifndef DefaultGcc2i386Opt +-# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) +- /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ +-# define DefaultGcc2i386Opt -O2 GccAliasingArgs +-# endif +-# endif +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # if OSMajorVersion < 1 + # define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF + # else +@@ -224,7 +218,7 @@ + # define ServerExtraSysLibs -li386 + # endif + #else +-# define OptimizedCDebugFlags -O2 ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # if defined(SparcArchitecture) + # define ServerOSDefines -DDDXOSINIT + # elif defined(AlphaArchitecture) diff --git a/x11/XFree86-libs/patches/patch-af b/x11/XFree86-libs/patches/patch-af index c8e0edcb27c..644dc2a8d46 100644 --- a/x11/XFree86-libs/patches/patch-af +++ b/x11/XFree86-libs/patches/patch-af @@ -1,110 +1,58 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-af,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ -Index: lib/X11/XlcDL.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/X11/XlcDL.c,v -retrieving revision 1.9 -retrieving revision 1.9.2.1 -diff -u -u -r1.9 -r1.9.2.1 ---- lib/X11/XlcDL.c 25 Nov 2002 14:04:53 -0000 1.9 -+++ lib/X11/XlcDL.c 11 Mar 2003 23:18:49 -0000 1.9.2.1 -@@ -406,7 +406,7 @@ - - if (lc_name == NULL) return (XLCd)NULL; - -- if (_XlcLocaleDirName(lc_dir, (char *)lc_name) == (char*)NULL) -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, (char *)lc_name) == (char*)NULL) - return (XLCd)NULL; - - resolve_object(lc_dir, lc_name); -@@ -452,7 +452,7 @@ - - lc_name = lcd->core->name; - -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XIM)0; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XIM)0; - - count = lc_count; - for (; count-- > 0; objects_list++) { -@@ -498,7 +498,7 @@ - - lc_name = lcd->core->name; - -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; - - count = lc_count; - for (; count-- > 0; objects_list++) { -@@ -543,7 +543,7 @@ +--- config/cf/FreeBSD.cf.in.orig 2004-03-03 07:40:43.000000000 +0000 ++++ config/cf/FreeBSD.cf.in 2004-03-03 07:44:05.000000000 +0000 +@@ -190,11 +190,11 @@ + # define CcCmd $(CLIENTENVSETUP) cc + # define CplusplusCmd $(CLIENTENVSETUP) c++ + #else +-# define CcCmd cc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ #endif - lc_name = lcd->core->name; -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; - - count = lc_count; - for (; count-- > 0; objects_list++) { -@@ -610,7 +610,7 @@ - - lc_name = lcd->core->name; - -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XOM)0; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XOM)0; +-#define CppCmd /usr/bin/cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -207,7 +207,7 @@ + #else + #define NoSystemWarn + #endif +-#define DefaultCCOptions -ansi -pedantic NoSystemWarn -Dasm=__asm \ ++#define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm \ + GccWarningOptions + #endif + #endif +@@ -439,18 +439,8 @@ + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC + #endif - count = lc_count; - for (; count-- > 0; objects_list++) { -Index: lib/X11/XlcPubI.h -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/X11/XlcPubI.h,v -retrieving revision 3.9 -retrieving revision 3.9.6.1 -diff -u -u -r3.9 -r3.9.6.1 ---- lib/X11/XlcPubI.h 16 Nov 2001 00:52:27 -0000 3.9 -+++ lib/X11/XlcPubI.h 11 Mar 2003 23:18:49 -0000 3.9.6.1 -@@ -217,6 +217,7 @@ - extern char *_XlcLocaleDirName( - #if NeedFunctionPrototypes - char* /* dir_name */, -+ size_t, /* dir_len */ - char* /* lc_name */ +-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ +-#ifndef DefaultGcc2i386Opt +-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) +-#define DefaultGcc2i386Opt -O2 GccAliasingArgs +-#endif +-#endif +- +-#ifdef i386Architecture +-# define OptimizedCDebugFlags DefaultGcc2i386Opt +-#else +-# define OptimizedCDebugFlags -O +-#endif ++#define DefaultGcc2i386Opt ++#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + + #ifndef PreIncDir + # define PreIncDir /usr/include +@@ -476,7 +466,7 @@ + * Compress manual pages + */ + #ifndef CompressManPages +-# define CompressManPages YES ++# define CompressManPages NO #endif - ); -Index: lib/X11/lcFile.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/X11/lcFile.c,v -retrieving revision 3.30 -retrieving revision 3.30.2.1 -diff -u -u -r3.30 -r3.30.2.1 ---- lib/X11/lcFile.c 25 Nov 2002 14:04:53 -0000 3.30 -+++ lib/X11/lcFile.c 11 Mar 2003 23:18:49 -0000 3.30.2.1 -@@ -429,8 +429,9 @@ - } - char * --_XlcLocaleDirName(dir_name, lc_name) -+_XlcLocaleDirName(dir_name, dir_len, lc_name) - char *dir_name; -+ size_t dir_len; - char *lc_name; - { - char dir[PATH_MAX], buf[PATH_MAX], *name = NULL; -@@ -486,9 +487,16 @@ - target_dir = args[0]; - target_name = lc_name; - } -- strcpy(dir_name, target_dir); -- strcat(dir_name, "/"); -- strcat(dir_name, target_name); -+ /* snprintf(dir_name, dir_len, "%s/%", target_dir, target_name); */ -+ strncpy(dir_name, target_dir, dir_len - 1); -+ if (strlen(target_dir) >= dir_len - 1) { -+ dir_name[dir_len - 1] = '\0'; -+ } else { -+ strcat(dir_name, "/"); -+ strncat(dir_name, target_name, dir_len - strlen(dir_name) - 1); -+ if (strlen(target_name) >= dir_len - strlen(dir_name) - 1) -+ dir_name[dir_len - 1] = '\0'; -+ } - if (target_name != lc_name) - Xfree(target_name); - return dir_name; + #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/XFree86-libs/patches/patch-ag b/x11/XFree86-libs/patches/patch-ag index 3805d6f58da..ca43c336d0d 100644 --- a/x11/XFree86-libs/patches/patch-ag +++ b/x11/XFree86-libs/patches/patch-ag @@ -1,23 +1,41 @@ -$NetBSD: patch-ag,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-ag,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ ---- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 -+++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 -@@ -300,6 +300,10 @@ - */ +--- config/cf/linux.cf.in.orig 2004-03-03 07:44:42.000000000 +0000 ++++ config/cf/linux.cf.in 2004-03-03 07:46:51.000000000 +0000 +@@ -549,15 +549,15 @@ + # if defined (i386Architecture) && ((GccMajorVersion >3) \ + || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) + # ifndef CcCmd +-# define CcCmd gcc -m32 ++# define CcCmd @@PKGSRC_CC@@ + # endif + # ifndef CplusplusCmd +-# define CplusplusCmd c++ -m32 ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # endif + # ifndef CcCmd +-# define CcCmd gcc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # ifndef AsCmd + # define AsCmd CcCmd -c -x assembler +@@ -721,7 +721,6 @@ + #define YaccCmd bison -y + #define LexCmd flex -l + #define HasFlex YES +-#define LexLib -lfl + #define PreProcessCmd CcCmd -E + #define PostIncDir DefaultGccIncludeDir + #define LdCombineFlags -r +@@ -791,7 +790,7 @@ - #ifndef MakeStringsDependency -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define MakeStringsDependency @@\ -+MAKESTRS = @MAKESTRS@ -+#else - # define MakeStringsDependency @@\ - MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ - NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -308,6 +312,7 @@ - cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ - @@\ - includes:: HostProgramTargetName($(MAKESTRS)) -+#endif - #endif - - #ifndef ToolkitMakeStrings + #ifdef i386Architecture + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # endif + # define LinuxMachineDefines -D__i386__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME diff --git a/x11/XFree86-libs/patches/patch-ah b/x11/XFree86-libs/patches/patch-ah index 78dcf69e410..d2a2dd6bd89 100644 --- a/x11/XFree86-libs/patches/patch-ah +++ b/x11/XFree86-libs/patches/patch-ah @@ -1,41 +1,15 @@ -$NetBSD: patch-ah,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-ah,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ ---- config/cf/linux.cf.in.orig 2003-07-24 05:18:24.000000000 +0200 -+++ config/cf/linux.cf.in 2003-07-24 05:20:54.000000000 +0200 -@@ -555,15 +555,15 @@ - # if defined (i386Architecture) && ((GccMajorVersion >3) \ - || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) - # ifndef CcCmd --# define CcCmd gcc -m32 -+# define CcCmd @@PKGSRC_CC@@ - # endif - # ifndef CplusplusCmd --# define CplusplusCmd c++ -m32 -+# define CplusplusCmd @@PKGSRC_CXX@@ - # endif - # endif - # ifndef CcCmd --# define CcCmd gcc --# define CplusplusCmd c++ -+# define CcCmd @@PKGSRC_CC@@ -+# define CplusplusCmd @@PKGSRC_CXX@@ - # endif - # ifndef AsCmd - # define AsCmd CcCmd -c -x assembler -@@ -715,7 +715,6 @@ - #define YaccCmd bison -y - #define LexCmd flex -l - #define HasFlex YES --#define LexLib -lfl - #define PreProcessCmd CcCmd -E - #define PostIncDir DefaultGccIncludeDir - #define LdCombineFlags -r -@@ -775,7 +774,7 @@ - - #ifdef i386Architecture - # ifndef OptimizedCDebugFlags --# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - # endif - # define LinuxMachineDefines -D__i386__ - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +http://www.mail-archive.com/devel@xfree86.org/msg04688.html + +--- ./lib/XvMC/hw/i810/Imakefile.orig 2002-10-30 10:42:57.000000000 -0800 ++++ ./lib/XvMC/hw/i810/Imakefile +@@ -20,7 +20,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL + DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0 + INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \ + -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/linux/drm/kernel \ +- -I$(XF86DRIVERSRC)/i810 ++ -I$(XF86DRIVERSRC)/i810 -I$(XF86OSSRC)/shared/drm/kernel + SRCS = I810XvMC.c + OBJS = I810XvMC.o xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o + LINTLIBS = $(LINTXLIB) diff --git a/x11/XFree86-libs/patches/patch-ai b/x11/XFree86-libs/patches/patch-ai deleted file mode 100644 index e8353273c2d..00000000000 --- a/x11/XFree86-libs/patches/patch-ai +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ - ---- fonts/util/Imakefile.orig 2003-07-25 21:20:40.000000000 +0200 -+++ fonts/util/Imakefile 2003-07-25 21:21:08.000000000 +0200 -@@ -7,8 +7,7 @@ - map-ISO8859-16 map-JISX0201.1976-0 map-KOI8-R - - InstallMultipleFlags($(MAPFILES),$(FONTDIR)/util,$(INSTDATFLAGS)) --InstallNamedProg(ucs2any.pl,ucs2any,$(BINDIR)) --InstallManPage(ucs2any,$(MANDIR)) -+SimpleProgramTarget(ucs2any) - InstallNamedProg(bdftruncate.pl,bdftruncate,$(BINDIR)) - InstallManPage(bdftruncate,$(MANDIR)) - diff --git a/x11/XFree86-libs/patches/patch-aj b/x11/XFree86-libs/patches/patch-aj deleted file mode 100644 index c47a33ac1d7..00000000000 --- a/x11/XFree86-libs/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ - ---- programs/Xserver/GL/dri/Imakefile.orig Mon Mar 3 20:21:30 2003 -+++ programs/Xserver/GL/dri/Imakefile Mon Mar 3 20:21:31 2003 -@@ -13,7 +13,7 @@ - - INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) \ -- -I$(XF86OSSRC) -I$(XF86COMSRC) \ -+ -I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I$(XF86COMSRC) \ - -I../include -I../glx -I$(LIBSRC)/GL/include \ - -I$(SERVERSRC)/mi -I$(FONTINCSRC) - DEFINES = $(GLX_DEFINES) diff --git a/x11/XFree86-libs/patches/patch-ak b/x11/XFree86-libs/patches/patch-ak deleted file mode 100644 index 5bd3269a543..00000000000 --- a/x11/XFree86-libs/patches/patch-ak +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ - ---- lib/X11/lcPrTxt.c.orig Mon Jun 3 15:36:00 2002 -+++ lib/X11/lcPrTxt.c Mon Apr 21 23:38:30 2003 -@@ -154,7 +154,6 @@ - buf_len = text_prop->nitems * 6 + 1; - else - buf_len = text_prop->nitems * XLC_PUBLIC(lcd, mb_cur_max) + 1; -- buf = (XPointer) Xmalloc(buf_len); - } - buf = (XPointer) Xmalloc(buf_len); - if (buf == NULL) diff --git a/x11/XFree86-libs/patches/patch-al b/x11/XFree86-libs/patches/patch-al deleted file mode 100644 index 842d23367e4..00000000000 --- a/x11/XFree86-libs/patches/patch-al +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ - ---- programs/Xserver/hw/xfree86/os-support/shared/sigio.c.orig 2003-09-06 10:52:49.000000000 -0700 -+++ programs/Xserver/hw/xfree86/os-support/shared/sigio.c 2003-09-06 10:54:17.000000000 -0700 -@@ -151,6 +151,7 @@ - fprintf(stderr,"fcntl(%d, F_SETOWN): %s\n", - fd, strerror(errno)); - #endif -+ xf86UnblockSIGIO(blocked); - return 0; - } - sigemptyset(&sa.sa_mask); diff --git a/x11/XFree86-libs/patches/patch-am b/x11/XFree86-libs/patches/patch-am deleted file mode 100644 index f73283dc692..00000000000 --- a/x11/XFree86-libs/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ - ---- lib/Imakefile.orig Sun Mar 2 19:44:29 2003 -+++ lib/Imakefile Sun Mar 2 19:44:31 2003 -@@ -211,7 +211,7 @@ - $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \ - $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \ - $(LIBXML2BUILDDIR) $(EXPATBUILDDIR) $(FONTCONFIGBUILDDIR) \ -- $(XFT1LIBDIR) $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \ -+ $(XVMCLIBDIR) $(RANDRLIBDIR) \ - $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR) - - SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \ diff --git a/x11/XFree86-libs/patches/patch-an b/x11/XFree86-libs/patches/patch-an deleted file mode 100644 index 25fed104992..00000000000 --- a/x11/XFree86-libs/patches/patch-an +++ /dev/null @@ -1,352 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ -Index: lib/FS/FSFontInfo.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSFontInfo.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSFontInfo.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSFontInfo.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -65,7 +65,7 @@ - long nbytes; - int i, - j; -- int size = 0; -+ size_t size = 0; - FSXFontInfoHeader **fhdr = (FSXFontInfoHeader **) 0; - FSPropInfo **pi = (FSPropInfo **) 0; - FSPropOffset **po = (FSPropOffset **) 0; -@@ -123,8 +123,14 @@ - if (reply.nameLength == 0) /* got last reply in version 1 */ - break; - if ((i + reply.nReplies) >= size) { -+ -+ if (reply.nReplies > SIZE_T_MAX - i - 1) -+ goto badmem; - size = i + reply.nReplies + 1; - -+ if (size > SIZE_T_MAX / sizeof(char *)) -+ goto badmem; -+ - if (fhdr) { - FSXFontInfoHeader **tmp_fhdr = (FSXFontInfoHeader **) - FSrealloc((char *) fhdr, -@@ -237,6 +243,9 @@ - pi[i]->num_offsets = local_pi.num_offsets; - pi[i]->data_len = local_pi.data_len; - -+ if (pi[i]->num_offsets > SIZE_T_MAX / sizeof(FSPropOffset)) -+ goto badmem; -+ - po[i] = (FSPropOffset *) - FSmalloc(pi[i]->num_offsets * sizeof(FSPropOffset)); - if (!po[i]) { -@@ -281,6 +290,10 @@ - - nbytes = pi[i]->data_len + reply.nameLength; - _FSEatData(svr, (unsigned long) (((nbytes+3)&~3) - nbytes)); -+ } -+ /* avoid integer overflow */ -+ if (i > INT_MAX - 1) { -+ goto badmem; - } - } - *info = fhdr; -Index: lib/FS/FSFtNames.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSFtNames.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSFtNames.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSFtNames.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -78,7 +78,8 @@ - (SIZEOF(fsListFontsReply) - SIZEOF(fsGenericReply)) >> 2, fsFalse)) - return (char **) 0; - -- if (rep.nFonts) { -+ if (rep.nFonts && rep.nFonts <= SIZE_T_MAX / sizeof(char *) -+ && rep.length <= ((SIZE_T_MAX + SIZEOF(fsListFontsReply) - 1) >> 2)) { - flist = (char **) FSmalloc((unsigned) rep.nFonts * sizeof(char *)); - rlen = (rep.length << 2) - SIZEOF(fsListFontsReply); - c = (char *) FSmalloc((unsigned) (rlen + 1)); -Index: lib/FS/FSGetCats.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSGetCats.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSGetCats.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSGetCats.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -72,9 +72,10 @@ - SyncHandle(); - return (char **) NULL; - } -- if (rep.num_catalogues) { -+ if (rep.num_catalogues && rep.num_catalogues <= SIZE_T_MAX/sizeof(char *) -+ && rep.length <= ((SIZE_T_MAX + SIZEOF(fsGetCataloguesReply) - 1)>>2)) { - list = (char **) -- FSmalloc((unsigned) (rep.num_catalogues * sizeof(char *))); -+ FSmalloc((unsigned) (rep.num_catalogues * sizeof(char *))); - rlen = (rep.length << 2) - SIZEOF(fsGetCataloguesReply); - c = (char *) FSmalloc((unsigned) rlen + 1); - if ((!list) || (!c)) { -Index: lib/FS/FSListCats.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSListCats.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSListCats.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSListCats.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -78,7 +78,8 @@ - (SIZEOF(fsListCataloguesReply) - SIZEOF(fsGenericReply)) >> 2, fsFalse)) - return (char **) 0; - -- if (rep.num_catalogues) { -+ if (rep.num_catalogues && rep.num_catalogues <= SIZE_T_MAX/sizeof(char *) -+ && rep.length <= ((SIZE_T_MAX+SIZEOF(fsListCataloguesReply)+1)>>2)) { - clist = (char **) - FSmalloc((unsigned) rep.num_catalogues * sizeof(char *)); - rlen = (rep.length << 2) - SIZEOF(fsListCataloguesReply); -Index: lib/FS/FSListExt.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSListExt.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSListExt.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSListExt.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -72,7 +72,8 @@ - SyncHandle(); - return (char **) NULL; - } -- if (rep.nExtensions) { -+ if (rep.nExtensions && rep.nExtensions <= SIZE_T_MAX / sizeof(char *) -+ && rep.length <= ((SIZE_T_MAX+SIZEOF(fsListExtensionsReply)+1)>>2)) { - list = (char **) FSmalloc((unsigned)(rep.nExtensions * sizeof(char *))); - rlen = (rep.length << 2) - SIZEOF(fsListExtensionsReply); - c = (char *) FSmalloc((unsigned) rlen + 1); -Index: lib/FS/FSOpenServ.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSOpenServ.c,v -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -u -r1.6 -r1.7 ---- lib/FS/FSOpenServ.c 14 Dec 2001 19:53:33 -0000 1.6 -+++ lib/FS/FSOpenServ.c 29 Aug 2003 18:01:11 -0000 1.7 -@@ -118,7 +118,7 @@ - AlternateServer *alts; - int altlen; - char *vendor_string; -- long setuplength; -+ unsigned long setuplength; - - if (server == NULL || *server == '\0') { - if ((server = getenv("FONTSERVER")) == NULL) { -@@ -153,7 +153,8 @@ - _FSRead(svr, (char *) &prefix, (long) SIZEOF(fsConnSetup)); - - setuplength = prefix.alternate_len << 2; -- if ((alt_data = (char *) -+ if (setuplength > (SIZE_T_MAX>>2) -+ || (alt_data = (char *) - (setup = FSmalloc((unsigned) setuplength))) == NULL) { - errno = ENOMEM; - FSfree((char *) svr); -@@ -162,6 +163,10 @@ - _FSRead(svr, (char *) alt_data, setuplength); - ad = alt_data; - -+ if (prefix.num_alternates > SIZE_T_MAX / sizeof(AlternateServer)) { -+ errno = ENOMEM; -+ return (FSServer *) 0; -+ } - alts = (AlternateServer *) - FSmalloc(sizeof(AlternateServer) * prefix.num_alternates); - if (!alts) { -@@ -193,7 +198,8 @@ - svr->num_alternates = prefix.num_alternates; - - setuplength = prefix.auth_len << 2; -- if ((auth_data = (char *) -+ if (prefix.auth_len > (SIZE_T_MAX>>2) -+ || (auth_data = (char *) - (setup = FSmalloc((unsigned) setuplength))) == NULL) { - errno = ENOMEM; - FSfree((char *) svr); -Index: lib/FS/FSQGlyphs.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSQGlyphs.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSQGlyphs.c 14 Dec 2001 19:53:33 -0000 1.2 -+++ lib/FS/FSQGlyphs.c 29 Aug 2003 18:01:11 -0000 1.3 -@@ -85,12 +85,20 @@ - (SIZEOF(fsQueryXBitmaps8Reply) - SIZEOF(fsGenericReply)) >> 2, fsFalse)) - return FSBadAlloc; - -+ if (reply.num_chars > SIZE_T_MAX / sizeof(FSOffset)) -+ return FSBadAlloc; -+ - offs = (FSOffset *) FSmalloc(sizeof(FSOffset) * reply.num_chars); - *offsets = offs; - if (!offs) - return FSBadAlloc; - left = (reply.length << 2) - SIZEOF(fsQueryXBitmaps8Reply) - - (SIZEOF(fsOffset32) * reply.num_chars); -+ /* XXX This thest is incomplete */ -+ if (reply.length > (SIZE_T_MAX >> 2)) { -+ FSfree((char *) offs); -+ return FSBadAlloc; -+ } - gd = (unsigned char *) FSmalloc(left); - *glyphdata = gd; - if (!gd) { -@@ -141,6 +149,8 @@ - int i; - fsChar2b_version1 *swapped_str; - -+ if (str_len > SIZE_T_MAX/SIZEOF(fsChar2b_version1)) -+ return FSBadAlloc; - swapped_str = (fsChar2b_version1 *) - FSmalloc(SIZEOF(fsChar2b_version1) * str_len); - if (!swapped_str) -@@ -160,12 +170,19 @@ - fsFalse)) - return FSBadAlloc; - -+ if(reply.num_chars > SIZE_T_MAX/sizeof(FSOffset)) -+ return FSBadAlloc; - offs = (FSOffset *) FSmalloc(sizeof(FSOffset) * reply.num_chars); - *offsets = offs; - if (!offs) - return FSBadAlloc; - left = (reply.length << 2) - SIZEOF(fsQueryXBitmaps16Reply) - - (SIZEOF(fsOffset32) * reply.num_chars); -+ /* XXX - this test is incomplete */ -+ if (reply.length > (SIZE_T_MAX>>2)) { -+ FSfree((char *) offs); -+ return FSBadAlloc; -+ } - gd = (unsigned char *) FSmalloc(left); - *glyphdata = gd; - if (!gd) { -Index: lib/FS/FSQXExt.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSQXExt.c,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -u -r1.5 -r1.6 ---- lib/FS/FSQXExt.c 14 Dec 2001 19:53:33 -0000 1.5 -+++ lib/FS/FSQXExt.c 29 Aug 2003 18:01:12 -0000 1.6 -@@ -92,6 +92,9 @@ - (SIZEOF(fsQueryXExtents8Reply) - SIZEOF(fsGenericReply)) >> 2, - fsFalse)) - return FSBadAlloc; -+ -+ if (reply.num_extents > SIZE_T_MAX / sizeof(FSXCharInfo)) -+ return FSBadAlloc; - - ext = (FSXCharInfo *) FSmalloc(sizeof(FSXCharInfo) * reply.num_extents); - *extents = ext; -@@ -147,6 +150,9 @@ - if (!_FSReply(svr, (fsReply *) & reply, - (SIZEOF(fsQueryXExtents16Reply) - SIZEOF(fsGenericReply)) >> 2, - fsFalse)) -+ return FSBadAlloc; -+ -+ if (reply.num_extents > SIZE_T_MAX/sizeof(FSXCharInfo)) - return FSBadAlloc; - - ext = (FSXCharInfo *) FSmalloc(sizeof(FSXCharInfo) * reply.num_extents); -Index: lib/FS/FSQXInfo.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSQXInfo.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSQXInfo.c 14 Dec 2001 19:53:33 -0000 1.2 -+++ lib/FS/FSQXInfo.c 29 Aug 2003 18:01:12 -0000 1.3 -@@ -91,6 +91,9 @@ - props->num_offsets = local_pi.num_offsets; - props->data_len = local_pi.data_len; - -+ if (props->num_offsets > SIZE_T_MAX / sizeof(FSPropOffset)) -+ return FSBadAlloc; -+ - /* prepare for prop data */ - offset_data = (FSPropOffset *) - FSmalloc(props->num_offsets * sizeof(FSPropOffset)); -Index: lib/FS/FSlibint.h -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSlibint.h,v -retrieving revision 3.7 -retrieving revision 3.8 -diff -u -u -r3.7 -r3.8 ---- lib/FS/FSlibint.h 14 Dec 2001 19:53:33 -0000 3.7 -+++ lib/FS/FSlibint.h 29 Aug 2003 18:01:12 -0000 3.8 -@@ -76,6 +76,11 @@ - #include "FSlibos.h" - #include <errno.h> - #include <stddef.h> -+ -+#include <limits.h> -+#ifndef SIZE_T_MAX -+#define SIZE_T_MAX UINT_MAX -+#endif - - typedef int (* FSIOErrorHandler)(FSServer *); - typedef int (* FSErrorHandler)(FSServer *, FSErrorEvent *); -Index: lib/font/fc/fserve.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/font/fc/fserve.c,v -retrieving revision 3.23 -retrieving revision 3.24 -diff -u -u -r3.23 -r3.24 ---- lib/font/fc/fserve.c 27 May 2003 22:26:48 -0000 3.23 -+++ lib/font/fc/fserve.c 29 Aug 2003 18:01:13 -0000 3.24 -@@ -1505,8 +1505,8 @@ - - if (conn->blockState & FS_GIVE_UP) - return BadFontName; -- -- if (namelen > sizeof (buf) - 1) -+ -+ if (namelen <= 0 || namelen > sizeof (buf) - 1) - return BadFontName; - - /* -Index: lib/font/fc/fslibos.h -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/font/fc/fslibos.h,v -retrieving revision 3.7 -retrieving revision 3.8 -diff -u -u -r3.7 -r3.8 ---- lib/font/fc/fslibos.h 31 May 2002 18:45:49 -0000 3.7 -+++ lib/font/fc/fslibos.h 29 Aug 2003 18:01:14 -0000 3.8 -@@ -48,13 +48,16 @@ - #ifndef FONT_OPEN_MAX - - #ifndef X_NOT_POSIX --#ifdef _POSIX_SOURCE --#include <limits.h> --#else --#define _POSIX_SOURCE --#include <limits.h> --#undef _POSIX_SOURCE -+# ifdef _POSIX_SOURCE -+# include <limits.h> -+# else -+# define _POSIX_SOURCE -+# include <limits.h> -+# undef _POSIX_SOURCE -+# endif - #endif -+#ifndef SIZE_T_MAX -+# define SIZE_T_MAX UINT_MAX - #endif - #ifndef OPEN_MAX - #if defined(SVR4) || defined(__UNIXOS2__) - diff --git a/x11/XFree86-libs/patches/patch-ao b/x11/XFree86-libs/patches/patch-ao deleted file mode 100644 index a82af8f268b..00000000000 --- a/x11/XFree86-libs/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ - ---- programs/Xserver/dix/main.c.orig 2003-07-07 01:39:11.000000000 +0000 -+++ programs/Xserver/dix/main.c 2003-07-07 01:43:07.000000000 +0000 -@@ -505,7 +505,7 @@ - /* Leave off the ridBase and ridMask, these must be sent with - connection */ - -- setup.release = VENDOR_RELEASE; -+ setup.release = NULL; - /* - * per-server image and bitmap parameters are defined in Xmd.h - */ diff --git a/x11/XFree86-libs/patches/patch-ap b/x11/XFree86-libs/patches/patch-ap deleted file mode 100644 index da265fd1b84..00000000000 --- a/x11/XFree86-libs/patches/patch-ap +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ - ---- config/cf/xf86.tmpl.orig Tue Dec 17 04:21:38 2002 -+++ config/cf/xf86.tmpl Thu Jan 2 14:10:44 2003 -@@ -19,6 +19,9 @@ - #ifdef UseInstalled - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -+#elif UseInstalledPrograms -+ IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) diff --git a/x11/XFree86-libs/patches/patch-aq b/x11/XFree86-libs/patches/patch-aq deleted file mode 100644 index 0cf3e6627a1..00000000000 --- a/x11/XFree86-libs/patches/patch-aq +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aq,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ - ---- programs/mkfontscale/mkfontscale.c.orig 2003-09-12 21:15:41.000000000 -0700 -+++ programs/mkfontscale/mkfontscale.c 2003-09-12 21:16:34.000000000 -0700 -@@ -549,6 +549,7 @@ - encoding->value); - } - free(filename); -+ FT_Done_Face(face); - } - entries = reverseList(entries); - fprintf(fontscale, "%d\n", listLength(entries)); diff --git a/x11/XFree86-libs/patches/patch-ar b/x11/XFree86-libs/patches/patch-ar deleted file mode 100644 index 8338dac5855..00000000000 --- a/x11/XFree86-libs/patches/patch-ar +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-ar,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ - ---- config/cf/NetBSD.cf.in.orig 2003-09-01 22:15:38.000000000 +0200 -+++ config/cf/NetBSD.cf.in 2003-09-01 22:17:27.000000000 +0200 -@@ -92,21 +92,6 @@ - - #define InstallXloadSetGID NO - --/* Defines for using the GNU pth thread library -- experimental */ -- --#ifdef NetBSDPth --#define PthreadHLocation -I/usr/local/include /* where is pthread.h? */ --#define LibPthreadLocation -L/usr/local/lib /* where is libpthread? */ --#define HasThreadSafeAPI NO --#define HasPosixThreads YES --#define SystemMTDefines -D_REENTRANT PthreadHLocation --#define ThreadsLibraries LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread --#define SharedX11Reqs ThreadsLibraries --#else --#define HasPosixThreads NO --#define ThreadedX NO --#endif -- - /* - * Compiler Features - */ -@@ -123,7 +108,7 @@ - #define MkdirHierCmd mkdir -p - - #undef CcCmd --#define CcCmd gcc -+#define CcCmd @@PKGSRC_CC@@ - #ifndef DefaultCCOptions - #if defined(UseInstalled) - #define DefaultCCOptions /**/ -@@ -143,7 +128,7 @@ - #define UseGccMakeDepend YES - #endif - --#define CppCmd cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ - #define PreProcessCmd CcCmd -E -@@ -194,7 +179,7 @@ - # define DefaultGcc2i386Opt -O2 - # endif - # endif --# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - # if OSMajorVersion < 1 - # define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF - # else -@@ -648,3 +633,7 @@ - #ifndef UseSeparateConfDir - #define UseSeparateConfDir NO /* We don't want appdefs in "/etc/X11". */ - #endif -+ -+/* TheadedX */ -+ -+ diff --git a/x11/XFree86-libs/patches/patch-as b/x11/XFree86-libs/patches/patch-as deleted file mode 100644 index 037ae4a56df..00000000000 --- a/x11/XFree86-libs/patches/patch-as +++ /dev/null @@ -1,141 +0,0 @@ -$NetBSD: patch-as,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ - ---- include/Xthreads.h.orig 2003-07-06 17:59:42.000000000 +0000 -+++ include/Xthreads.h 2003-07-06 18:00:03.000000000 +0000 -@@ -1,14 +1,16 @@ - /* -- * $Xorg: Xthreads.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $ -+ * $XConsortium: Xthreads.h /main/35 1996/12/04 10:23:02 lehors $ -+ * $XFree86: xc/include/Xthreads.h,v 3.3 1996/12/23 05:58:11 dawes Exp $ - * - * --Copyright 1993, 1998 The Open Group -+Copyright (c) 1993 X Consortium - --Permission to use, copy, modify, distribute, and sell this software and its --documentation for any purpose is hereby granted without fee, provided that --the above copyright notice appear in all copies and that both that --copyright notice and this permission notice appear in supporting --documentation. -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. -@@ -16,16 +18,15 @@ - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --Except as contained in this notice, the name of The Open Group shall not be -+Except as contained in this notice, the name of the X Consortium shall not be - used in advertising or otherwise to promote the sale, use or other dealings --in this Software without prior written authorization from The Open Group. -+in this Software without prior written authorization from the X Consortium. - * * - */ --/* $XFree86: xc/include/Xthreads.h,v 3.10 2001/12/14 19:53:26 dawes Exp $ */ - - #ifndef _XTHREADS_H_ - #define _XTHREADS_H_ -@@ -63,9 +64,12 @@ - #define xcondition_broadcast(cv) condition_broadcast(cv) - #define xcondition_set_name(cv,str) condition_set_name(cv,str) - #else /* !CTHREADS */ --#if defined(SVR4) && !defined(__sgi) && !defined(_SEQUENT_) -+#if defined(SVR4) && !defined(__sgi) - #include <thread.h> - #include <synch.h> -+#ifndef LINE_MAX -+#define LINE_MAX 2048 -+#endif - typedef thread_t xthread_t; - typedef thread_key_t xthread_key_t; - typedef cond_t xcondition_rec; -@@ -82,6 +86,7 @@ - #endif - #define xthread_set_specific(k,v) thr_setspecific(k,v) - #define xthread_get_specific(k,vp) thr_getspecific(k,vp) -+#define XMUTEX_INITIALIZER {0} - #define xmutex_init(m) mutex_init(m,USYNC_THREAD,0) - #define xmutex_clear(m) mutex_destroy(m) - #define xmutex_lock(m) mutex_lock(m) -@@ -196,7 +201,41 @@ - #define xcondition_signal(c) tis_cond_signal(c) - #define xcondition_broadcast(c) tis_cond_broadcast(c) - #else -+#ifdef USE_NBSD_THREADLIB -+/* -+ * NetBSD threadlib support is intended for thread safe libraries. -+ * This should not be used for general client programming. -+ */ -+#include <threadlib.h> -+typedef thr_t xthread_t; -+typedef thread_key_t xthread_key_t; -+typedef cond_t xcondition_rec; -+typedef mutex_t xmutex_rec; -+#define xthread_self thr_self -+#define xthread_fork(func,closure) { thr_t _tmpxthr; \ -+ /* XXX Create it detached? --thorpej */ \ -+ thr_create(&_tmpxthr,NULL,func,closure); } -+#define xthread_yield() thr_yield() -+#define xthread_exit(v) thr_exit(v) -+#define xthread_key_create(kp,d) thr_keycreate(kp,d) -+#define xthread_key_delete(k) thr_keydelete(k) -+#define xthread_set_specific(k,v) thr_setspecific(k,v) -+#define xthread_get_specific(k,vp) *(vp) = thr_getspecific(k) -+#define XMUTEX_INITIALIZER MUTEX_INITIALIZER -+#define xmutex_init(m) mutex_init(m, 0) -+#define xmutex_clear(m) mutex_destroy(m) -+#define xmutex_lock(m) mutex_lock(m) -+#define xmutex_unlock(m) mutex_unlock(m) -+#define xcondition_init(c) cond_init(c, 0, 0) -+#define xcondition_clear(c) cond_destroy(c) -+#define xcondition_wait(c,m) cond_wait(c,m) -+#define xcondition_signal(c) cond_signal(c) -+#define xcondition_broadcast(c) cond_broadcast(c) -+#else - #include <pthread.h> -+#ifndef LINE_MAX -+#define LINE_MAX 2048 -+#endif - typedef pthread_t xthread_t; - typedef pthread_key_t xthread_key_t; - typedef pthread_cond_t xcondition_rec; -@@ -230,24 +269,20 @@ - #define xcondition_wait(c,m) pthread_cond_wait(c,m) - #define xcondition_signal(c) pthread_cond_signal(c) - #define xcondition_broadcast(c) pthread_cond_broadcast(c) --#if defined(_DECTHREADS_) -+#if defined(_DECTHREADS_) || defined(linux) - static xthread_t _X_no_thread_id; - #define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id) - #define xthread_clear_id(id) id = _X_no_thread_id - #define xthread_equal(id1,id2) pthread_equal(id1, id2) --#endif /* _DECTHREADS_ */ --#if defined(linux) --#define xthread_have_id(id) !pthread_equal(id, 0) --#define xthread_clear_id(id) id = 0 --#define xthread_equal(id1,id2) pthread_equal(id1, id2) --#endif /* linux */ --#if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM) -+#endif /* _DECTHREADS_ || linux */ -+#if _CMA_VENDOR_ == _CMA__IBM - #ifdef DEBUG /* too much of a hack to enable normally */ - /* see also cma__obj_set_name() */ - #define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str) - #define xcondition_set_name(cv,str) ((char**)(cv)->field1)[5] = (str) - #endif /* DEBUG */ - #endif /* _CMA_VENDOR_ == _CMA__IBM */ -+#endif /* USE_NBSD_THREADLIB */ - #endif /* USE_TIS_SUPPORT */ - #endif /* WIN32 */ - #endif /* SVR4 */ diff --git a/x11/XFree86-libs/patches/patch-at b/x11/XFree86-libs/patches/patch-at deleted file mode 100644 index 21153e75014..00000000000 --- a/x11/XFree86-libs/patches/patch-at +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-at,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ - ---- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig 2003-07-09 13:48:58.000000000 +0000 -+++ programs/Xserver/hw/xfree86/xf86config/xf86config.c 2003-07-09 13:49:42.000000000 +0000 -@@ -176,6 +176,9 @@ - #endif - #define CONFIGNAME XCONFIGFILE - -+/* Comment this out for now ... */ -+ -+#if 0 - #ifndef XF86_VERSION_MAJOR - #ifdef XVERSION - #if XVERSION > 40000000 -@@ -187,6 +190,7 @@ - #define XF86_VERSION_MAJOR 4 - #endif - #endif -+#endif - - - int config_mousetype; /* Mouse. */ diff --git a/x11/XFree86-libs/patches/patch-au b/x11/XFree86-libs/patches/patch-au deleted file mode 100644 index a3827467ed7..00000000000 --- a/x11/XFree86-libs/patches/patch-au +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-au,v 1.2 2004/01/31 15:06:24 xtraeme Exp $ - ---- config/cf/FreeBSD.cf.in.orig Sat Jan 31 15:05:04 2004 -+++ config/cf/FreeBSD.cf.in Sat Jan 31 15:07:28 2004 -@@ -161,15 +161,10 @@ - * - * ld: warning: libXThrStub.so.6, needed by libX11.so, not found - */ --#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ --#else --# define CcCmd cc --# define CplusplusCmd c++ --#endif -+#define CcCmd @@PKGSRC_CC@@ -+#define CplusplusCmd @@PKGSRC_CXX@@ - --#define CppCmd /usr/bin/cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ -@@ -177,7 +172,7 @@ - #if defined(UseInstalled) - #define DefaultCCOptions /**/ - #else --#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions -+#define DefaultCCOptions -ansi -Dasm=__asm - #endif - #endif - #ifndef ExtraLibraries -@@ -482,18 +477,9 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 --#endif --#endif - --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - - #ifndef PreIncDir - # define PreIncDir /usr/include -@@ -519,7 +505,7 @@ - * Compress manual pages - */ - #ifndef CompressManPages --# define CompressManPages YES -+# define CompressManPages NO - #endif - - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/XFree86-libs/patches/patch-av b/x11/XFree86-libs/patches/patch-av deleted file mode 100644 index a9b30465a42..00000000000 --- a/x11/XFree86-libs/patches/patch-av +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-av,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ - ---- lib/font/fc/fsconvert.c.orig 2002-09-10 16:14:35.000000000 +0000 -+++ lib/font/fc/fsconvert.c 2003-09-24 08:32:26.000000000 +0000 -@@ -36,6 +36,7 @@ - #include "fontstruct.h" - #include "fservestr.h" - #include "fontutil.h" -+#include "fslibos.h" - - extern char _fs_glyph_undefined; - extern char _fs_glyph_requested; -@@ -102,6 +103,10 @@ - - nprops = pfi->nprops = pi->num_offsets; - -+ if (nprops < 0 -+ || nprops > SIZE_T_MAX/(sizeof(FontPropRec) + sizeof(char))) -+ return -1; -+ - dprop = (FontPropPtr) xalloc(sizeof(FontPropRec) * nprops + - sizeof (char) * nprops); - if (!dprop) diff --git a/x11/XFree86-libs/patches/patch-aw b/x11/XFree86-libs/patches/patch-aw deleted file mode 100644 index 22a61267e4a..00000000000 --- a/x11/XFree86-libs/patches/patch-aw +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-aw,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ - ---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Tue Mar 4 16:42:16 2003 -+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Tue Mar 4 16:42:21 2003 -@@ -230,6 +230,10 @@ - # define ARCH_PCI_INIT linuxPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN -+# elif defined(FreeBSD) -+# define ARCH_PCI_INIT freebsdPciInit -+# define INCLUDE_XF86_MAP_PCI_MEM -+# define INCLUDE_XF86_NO_DOMAIN - # endif - # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper - #elif defined(__i386__) -@@ -298,7 +302,11 @@ - # endif - # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge - #elif defined(__x86_64__) --# define ARCH_PCI_INIT ix86PciInit -+# if defined(__FreeBSD__) -+# define ARCH_PCI_INIT freebsdPciInit -+# else -+# define ARCH_PCI_INIT ix86PciInit -+# endif - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN - # if defined(linux) diff --git a/x11/XFree86-libs/patches/patch-ax b/x11/XFree86-libs/patches/patch-ax deleted file mode 100644 index 5ce317535d1..00000000000 --- a/x11/XFree86-libs/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ - ---- lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S.orig Wed Jul 16 13:47:09 2003 -+++ lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S Wed Jul 16 13:47:10 2003 -@@ -28,7 +28,7 @@ - - #define GLOBL( x ) \ - .globl x; \ --x##: -+x: - - .data - .align 4 diff --git a/x11/XFree86-libs/patches/patch-ay b/x11/XFree86-libs/patches/patch-ay deleted file mode 100644 index b99f2ada38d..00000000000 --- a/x11/XFree86-libs/patches/patch-ay +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ay,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ - ---- lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S.orig Wed Jul 16 13:48:41 2003 -+++ lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S Wed Jul 16 13:48:56 2003 -@@ -28,7 +28,7 @@ - - #define GLOBL( x ) \ - .globl x; \ --x##: -+x: - - .data - .align 4 - diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile index 88a8a0af42c..090309a30d0 100644 --- a/x11/XFree86-server/Makefile +++ b/x11/XFree86-server/Makefile @@ -1,75 +1,56 @@ -# $NetBSD: Makefile,v 1.5 2004/02/04 23:56:29 xtraeme Exp $ +# $NetBSD: Makefile,v 1.6 2004/03/28 22:06:16 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 \ - X430src-3.tgz X430src-4.tgz +DISTFILES= XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz MAINTAINER= xfree86@blef.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 X server and related programs -USE_IMAKE= yes -USE_BUILDLINK2= yes -DISTINFO_FILE= ${.CURDIR}/../XFree86-libs/distinfo -PATCHDIR= ${.CURDIR}/../XFree86-libs/patches +USE_X11= yes +USE_BUILDLINK3= yes +DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo +PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau \ programs/Xserver -XINCLUDE_DIRS= lib/xkbfile lib/xtrans -XINSTALL_DIRS= lib/font programs/Xserver +XINCLUDE_DIRS= lib/xkbfile lib/xtrans +XINSTALL_DIRS= lib/font/FreeType lib/font/X-TrueType \ + lib/font/Speedo lib/font/Type1 \ + lib/font/bitmap programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver -.include "../../mk/bsd.prefs.mk" +REPLACE_PERL= exports/lib/modules/getconfig* -.if ${OPSYS} == "NetBSD" -PLIST_SUBST+= MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX} -PLIST_SUBST+= MANPAGE_LIB_SUFFIX=${IMAKE_MANNEWSUFFIX} -.else -PLIST_SUBST+= MANPAGE_LIB_SUFFIX=${IMAKE_FILEMAN_SUFFIX} -PLIST_SUBST+= MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX} -.endif +SUBST_CLASSES= parser +SUBST_STAGE.parser= pre-install +SUBST_FILES.parser= programs/Xserver/hw/xfree86/parser/Makefile +SUBST_SED.parser= -e '/$$(INSTALL).*lib$$(LIBNAME).a/ d' +SUBST_SED.parser+= -e '/$$(RANLIB).*lib$$(LIBNAME).a/ d' +SUBST_SED.parser+= -e 's|$$(INSTALL) $$(INSTALLFLAGS) $$(INSTINCFLAGS)|echo|' +SUBST_MESSAGE.parser= "Fixing parser Makefile." -.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" -PLIST_SUBST+= DRIMODULES= -USE_PERL5= yes # Still we need perl (at least for now) -. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" -XBUILD_DIRS+= lib/XThrStub lib/X11 lib/Xext lib/GL -XINSTALL_DIRS+= lib/GL/mesa/src/drv -. endif -.else -PLIST_SUBST+= LIBDRI="@comment " -PLIST_SUBST+= DRIMODULES="@comment " -.endif +SUBST_CLASSES+= stubs +SUBST_STAGE.stubs= pre-install +SUBST_FILES.stubs= lib/font/stubs/Makefile +SUBST_SED.stubs= -e '/$$(INSTALL).*libfntstubs.a/ d' +SUBST_SED.stubs+= -e '/$$(RANLIB).*libfntstubs.a/ d' +SUBST_MESSAGE.stubs= "Fixing stubs Makefile." -.if ${OPSYS} == "Linux" -PLIST_SUBST+= KBDMODE="@comment " -.else -PLIST_SUBST+= KBDMODE= -.endif +.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "FreeBSD" -PLIST_SUBST+= LIBDRI= +.if ${OPSYS} != "NetBSD" +USE_PERL5= build # Yeah, we need this :-) .endif -pre-install: - @cd ${WRKSRC}/programs/Xserver/hw/xfree86/parser && \ - ${CP} Makefile Makefile.orig && \ - ${SED} -e '/$$(INSTALL).*lib$$(LIBNAME).a/ d' \ - -e '/$$(RANLIB).*lib$$(LIBNAME).a/ d' \ - -e 's|$$(INSTALL) $$(INSTALLFLAGS) $$(INSTINCFLAGS)|echo|' \ - Makefile.orig > Makefile - @cd ${WRKSRC}/lib/font/stubs && \ - ${CP} Makefile Makefile.orig && \ - ${SED} -e '/$$(INSTALL).*libfntstubs.a/ d' \ - -e '/$$(RANLIB).*libfntstubs.a/ d' Makefile.orig \ - > Makefile +post-install: + ${CHMOD} a+r ${X11ROOT}/bin/XFree86 -.include "../../devel/zlib/buildlink2.mk" +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../meta-pkgs/XFree86/Makefile.common" -.include "../../x11/XFree86-libs/buildlink2.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/XFree86-server/PLIST b/x11/XFree86-server/PLIST deleted file mode 100644 index f2e0338ee95..00000000000 --- a/x11/XFree86-server/PLIST +++ /dev/null @@ -1,290 +0,0 @@ -@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/PLIST.FreeBSD b/x11/XFree86-server/PLIST.FreeBSD new file mode 100644 index 00000000000..04ef69bd055 --- /dev/null +++ b/x11/XFree86-server/PLIST.FreeBSD @@ -0,0 +1,74 @@ +@comment $NetBSD: PLIST.FreeBSD,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ +${X11ROOT_PREFIX}/bin/kbd_mode +${X11ROOT_PREFIX}/lib/modules/freebsd/libdrm.a +${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX} +${X11ROOT_PREFIX}/src/bsd/drm/kernel/Makefile +${X11ROOT_PREFIX}/src/bsd/drm/kernel/ati_pcigart.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drmP.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_agpsupport.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_auth.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_bufs.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_context.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_dma.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_drawable.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_drv.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_fops.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_ioctl.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_irq.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_lock.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_memory.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_memory_debug.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_os_freebsd.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_os_netbsd.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_pci.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_sarea.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_scatter.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_sysctl.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_vm.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga/Makefile +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_dma.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_drm.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_drv.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_drv.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_irq.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_state.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_ucode.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_warp.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128/Makefile +${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_cce.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_drm.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_drv.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_drv.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_irq.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_state.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon/Makefile +${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_cp.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_drm.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_drv.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_drv.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_irq.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_mem.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_state.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis/Makefile +${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_drm.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_drv.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_drv.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_ds.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_ds.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_mm.c +${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx.h +${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx/Makefile +${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx_drv.c +@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx +@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis +@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon +@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128 +@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga +@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel +@dirrm ${X11ROOT_PREFIX}/src/bsd/drm +@dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd diff --git a/x11/XFree86-server/PLIST.Linux b/x11/XFree86-server/PLIST.Linux new file mode 100644 index 00000000000..1cc13d525e6 --- /dev/null +++ b/x11/XFree86-server/PLIST.Linux @@ -0,0 +1,96 @@ +@comment $NetBSD: PLIST.Linux,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ +${X11ROOT_PREFIX}/lib/modules/drivers/linux/v4l_drv.o +${X11ROOT_PREFIX}/lib/modules/input/aiptek_drv.o +${X11ROOT_PREFIX}/lib/modules/input/linux/ur98_drv.o +${X11ROOT_PREFIX}/lib/modules/linux/libdrm.a +${X11ROOT_PREFIX}/lib/modules/linux/libfbdevhw.a +${X11ROOT_PREFIX}/lib/modules/linux/libint10.a +${X11ROOT_PREFIX}/man/man4/aiptek.4 +${X11ROOT_PREFIX}/man/man4/ur98.4 +${X11ROOT_PREFIX}/man/man4/v4l.4 +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drmP.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_agpsupport.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_auth.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_bufs.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_context.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_dma.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_drawable.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_drv.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_fops.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_init.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_ioctl.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_irq.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_lock.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_memory.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_memory_debug.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_os_linux.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_proc.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_sarea.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_scatter.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_stub.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_vm.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_context.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_drm.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_drv.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_lists.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_lock.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_old_dma.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_dma.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_drv.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/i810.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_drm.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_drv.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_dma.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_drv.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/i830.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_drm.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_drv.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_dma.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_drv.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_irq.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/ati_pcigart.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/r128.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_drm.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_drv.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_cce.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_drv.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_irq.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_state.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_drm.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_drv.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_cp.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_drv.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_irq.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_mem.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_state.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/sis.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_drm.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_drv.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_ds.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_drv.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_ds.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_mm.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/mga.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_drm.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_drv.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_ucode.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_dma.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_drv.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_irq.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_state.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_warp.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/tdfx.h +${X11ROOT_PREFIX}/src/linux/drm/kernel/tdfx_drv.c +${X11ROOT_PREFIX}/src/linux/drm/kernel/Config.in +${X11ROOT_PREFIX}/src/linux/drm/kernel/Kconfig +${X11ROOT_PREFIX}/src/linux/drm/kernel/Makefile.linux +${X11ROOT_PREFIX}/src/linux/drm/kernel/Makefile.kernel +${X11ROOT_PREFIX}/src/linux/drm/kernel/Makefile +@dirrm ${X11ROOT_PREFIX}/src/linux/drm/kernel +@dirrm ${X11ROOT_PREFIX}/src/linux/drm +@dirrm ${X11ROOT_PREFIX}/src/linux +@dirrm ${X11ROOT_PREFIX}/src +@dirrm ${X11ROOT_PREFIX}/lib/modules/linux diff --git a/x11/XFree86-server/PLIST.NetBSD b/x11/XFree86-server/PLIST.NetBSD new file mode 100644 index 00000000000..0a6f36fd71a --- /dev/null +++ b/x11/XFree86-server/PLIST.NetBSD @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST.NetBSD,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ +${X11ROOT_PREFIX}/bin/kbd_mode +${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX} diff --git a/x11/XFree86-server/PLIST.common b/x11/XFree86-server/PLIST.common new file mode 100644 index 00000000000..74d9bb5ce85 --- /dev/null +++ b/x11/XFree86-server/PLIST.common @@ -0,0 +1,295 @@ +@comment $NetBSD: PLIST.common,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ +${X11ROOT_PREFIX}/bin/X +${X11ROOT_PREFIX}/bin/XFree86 +${X11ROOT_PREFIX}/bin/Xnest +${X11ROOT_PREFIX}/bin/Xprt +${X11ROOT_PREFIX}/bin/Xvfb +${X11ROOT_PREFIX}/bin/getconfig +${X11ROOT_PREFIX}/bin/getconfig.pl +${X11ROOT_PREFIX}/bin/gtf +${X11ROOT_PREFIX}/bin/inb +${X11ROOT_PREFIX}/bin/inl +${X11ROOT_PREFIX}/bin/inw +${X11ROOT_PREFIX}/bin/ioport +${X11ROOT_PREFIX}/bin/mmapr +${X11ROOT_PREFIX}/bin/mmapw +${X11ROOT_PREFIX}/bin/outb +${X11ROOT_PREFIX}/bin/outl +${X11ROOT_PREFIX}/bin/outw +${X11ROOT_PREFIX}/bin/pcitweak +${X11ROOT_PREFIX}/bin/scanpci +${X11ROOT_PREFIX}/bin/xf86cfg +${X11ROOT_PREFIX}/bin/xf86config +${X11ROOT_PREFIX}/include/X11/bitmaps/card.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/down.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/keyboard.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/left.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/monitor.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/mouse.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/narrower.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/right.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/shorter.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/taller.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/up.xbm +${X11ROOT_PREFIX}/include/X11/bitmaps/wider.xbm +${X11ROOT_PREFIX}/include/X11/pixmaps/card.xpm +${X11ROOT_PREFIX}/include/X11/pixmaps/computer.xpm +${X11ROOT_PREFIX}/include/X11/pixmaps/keyboard.xpm +${X11ROOT_PREFIX}/include/X11/pixmaps/monitor.xpm +${X11ROOT_PREFIX}/include/X11/pixmaps/mouse.xpm +${X11ROOT_PREFIX}/lib/X11/Cards +${X11ROOT_PREFIX}/lib/X11/Options +${X11ROOT_PREFIX}/lib/X11/XF86Config.98 +${X11ROOT_PREFIX}/lib/X11/XF86Config.eg +${X11ROOT_PREFIX}/lib/X11/app-defaults/XF86Cfg +${X11ROOT_PREFIX}/lib/X11/doc/BUILD +${X11ROOT_PREFIX}/lib/X11/doc/BugReport +${X11ROOT_PREFIX}/lib/X11/doc/DESIGN +${X11ROOT_PREFIX}/lib/X11/doc/Install +${X11ROOT_PREFIX}/lib/X11/doc/LICENSE +${X11ROOT_PREFIX}/lib/X11/doc/README +${X11ROOT_PREFIX}/lib/X11/doc/README.DECtga +${X11ROOT_PREFIX}/lib/X11/doc/README.DRI +${X11ROOT_PREFIX}/lib/X11/doc/README.DRIcomp +${X11ROOT_PREFIX}/lib/X11/doc/README.I128 +${X11ROOT_PREFIX}/lib/X11/doc/README.SiS +${X11ROOT_PREFIX}/lib/X11/doc/README.XKB-Config +${X11ROOT_PREFIX}/lib/X11/doc/README.XKB-Enhancing +${X11ROOT_PREFIX}/lib/X11/doc/README.apm +${X11ROOT_PREFIX}/lib/X11/doc/README.ati +${X11ROOT_PREFIX}/lib/X11/doc/README.chips +${X11ROOT_PREFIX}/lib/X11/doc/README.cyrix +${X11ROOT_PREFIX}/lib/X11/doc/README.dps +${X11ROOT_PREFIX}/lib/X11/doc/README.fonts +${X11ROOT_PREFIX}/lib/X11/doc/README.i740 +${X11ROOT_PREFIX}/lib/X11/doc/README.i810 +${X11ROOT_PREFIX}/lib/X11/doc/README.mouse +${X11ROOT_PREFIX}/lib/X11/doc/README.newport +${X11ROOT_PREFIX}/lib/X11/doc/README.r128 +${X11ROOT_PREFIX}/lib/X11/doc/README.rapidaccess +${X11ROOT_PREFIX}/lib/X11/doc/README.rendition +${X11ROOT_PREFIX}/lib/X11/doc/README.s3virge +${X11ROOT_PREFIX}/lib/X11/doc/RELNOTES +${X11ROOT_PREFIX}/lib/X11/doc/Versions +${X11ROOT_PREFIX}/lib/X11/doc/VideoBoard98 +${X11ROOT_PREFIX}/lib/X11/etc/Xinstall.sh +${X11ROOT_PREFIX}/lib/X11/etc/xmodmap.std +${X11ROOT_PREFIX}/lib/X11/getconfig/cfg.sample +${X11ROOT_PREFIX}/lib/X11/getconfig/xfree86.cfg +${X11ROOT_PREFIX}/lib/X11/xserver/SecurityPolicy +${X11ROOT_PREFIX}/lib/modules/codeconv/libARABIC.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libARMSCII8.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libBIG5.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libBIG5HKSCS.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libDOSENCODING.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libGB18030.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libGB2312.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libGBK.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libGEORGIAN.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_1.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_10.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_11.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_13.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_14.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_15.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_2.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_3.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_4.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_5.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_6.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_7.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_8.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_9.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libJISX0201.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libJISX0208.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libJISX0212.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libKOI8.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libKSC5601.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libKSCJOHAB.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libMULEENCODING.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libTCVN.a +${X11ROOT_PREFIX}/lib/modules/codeconv/libVISCII.a +${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.o +${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o +${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o +${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o +${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o +${X11ROOT_PREFIX}/lib/modules/extensions/libGLcore.a +${X11ROOT_PREFIX}/lib/modules/extensions/libdbe.a +${LIBDRI}${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a +${X11ROOT_PREFIX}/lib/modules/extensions/libextmod.a +${X11ROOT_PREFIX}/lib/modules/extensions/libglx.a +${X11ROOT_PREFIX}/lib/modules/extensions/librecord.a +${X11ROOT_PREFIX}/lib/modules/extensions/libxtrap.a +${X11ROOT_PREFIX}/lib/modules/fonts/libbitmap.a +${X11ROOT_PREFIX}/lib/modules/fonts/libspeedo.a +${X11ROOT_PREFIX}/lib/modules/fonts/libfreetype.a +${X11ROOT_PREFIX}/lib/modules/fonts/libtype1.a +${X11ROOT_PREFIX}/lib/modules/fonts/libxtt.a +${X11ROOT_PREFIX}/lib/modules/input/acecad_drv.o +${X11ROOT_PREFIX}/lib/modules/input/calcomp_drv.o +${X11ROOT_PREFIX}/lib/modules/input/citron_drv.o +${X11ROOT_PREFIX}/lib/modules/input/digitaledge_drv.o +${X11ROOT_PREFIX}/lib/modules/input/dmc_drv.o +${X11ROOT_PREFIX}/lib/modules/input/dynapro_drv.o +${X11ROOT_PREFIX}/lib/modules/input/elographics_drv.o +${X11ROOT_PREFIX}/lib/modules/input/fpit_drv.o +${X11ROOT_PREFIX}/lib/modules/input/hyperpen_drv.o +${X11ROOT_PREFIX}/lib/modules/input/js_x_drv.o +${X11ROOT_PREFIX}/lib/modules/input/kbd_drv.o +${X11ROOT_PREFIX}/lib/modules/input/magellan_drv.o +${X11ROOT_PREFIX}/lib/modules/input/microtouch_drv.o +${X11ROOT_PREFIX}/lib/modules/input/mouse_drv.o +${X11ROOT_PREFIX}/lib/modules/input/mutouch_drv.o +${X11ROOT_PREFIX}/lib/modules/input/palmax_drv.o +${X11ROOT_PREFIX}/lib/modules/input/penmount_drv.o +${X11ROOT_PREFIX}/lib/modules/input/spaceorb_drv.o +${X11ROOT_PREFIX}/lib/modules/input/summa_drv.o +${X11ROOT_PREFIX}/lib/modules/input/tek4957_drv.o +${X11ROOT_PREFIX}/lib/modules/input/void_drv.o +${X11ROOT_PREFIX}/lib/modules/input/wacom_drv.o +${X11ROOT_PREFIX}/lib/modules/libafb.a +${X11ROOT_PREFIX}/lib/modules/libcfb.a +${X11ROOT_PREFIX}/lib/modules/libcfb16.a +${X11ROOT_PREFIX}/lib/modules/libcfb24.a +${X11ROOT_PREFIX}/lib/modules/libcfb32.a +${X11ROOT_PREFIX}/lib/modules/libddc.a +${X11ROOT_PREFIX}/lib/modules/libfb.a +${X11ROOT_PREFIX}/lib/modules/libi2c.a +${X11ROOT_PREFIX}/lib/modules/libint10.a +${X11ROOT_PREFIX}/lib/modules/liblayer.a +${X11ROOT_PREFIX}/lib/modules/libmfb.a +${X11ROOT_PREFIX}/lib/modules/libpcidata.a +${X11ROOT_PREFIX}/lib/modules/librac.a +${X11ROOT_PREFIX}/lib/modules/libramdac.a +${X11ROOT_PREFIX}/lib/modules/libscanpci.a +${X11ROOT_PREFIX}/lib/modules/libshadow.a +${X11ROOT_PREFIX}/lib/modules/libshadowfb.a +${X11ROOT_PREFIX}/lib/modules/libvbe.a +${X11ROOT_PREFIX}/lib/modules/libvgahw.a +${X11ROOT_PREFIX}/lib/modules/libxaa.a +${X11ROOT_PREFIX}/lib/modules/libxf1bpp.a +${X11ROOT_PREFIX}/lib/modules/libxf24_32bpp.a +${X11ROOT_PREFIX}/lib/modules/libxf4bpp.a +${X11ROOT_PREFIX}/lib/modules/libxf8_16bpp.a +${X11ROOT_PREFIX}/lib/modules/libxf8_32bpp.a +${X11ROOT_PREFIX}/lib/modules/v10002d.uc +${X11ROOT_PREFIX}/lib/modules/v20002d.uc +${X11ROOT_PREFIX}/${MAN_DIR}/XFree86.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/Xnest.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/Xserver.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/Xvfb.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/getconfig.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/gtf.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/pcitweak.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/scanpci.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xf86cfg.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/xf86config.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidMode.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeDeleteModeLine.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetAllModeLines.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetDotClocks.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGamma.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGammaRamp.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetModeLine.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetMonitor.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetPermissions.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetViewPort.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeLockModeSwitch.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeModModeLine.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeQueryExtension.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeQueryVersion.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetClientVersion.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetGamma.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetGammaRamp.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetViewPort.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchMode.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchToMode.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeValidateModeLine.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/citron.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/dmc.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/dynapro.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/elographics.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdev.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdevhw.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/fpit.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/js_x.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/kbd.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/keyboard.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/mga.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/microtouch.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/mouse.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/mutouch.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/palmax.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/penmount.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/tek4957.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/vmware.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/void.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${KERNMAN_DIR}/wacom.${KERNMAN_SUFFIX} +${X11ROOT_PREFIX}/${FILEMAN_DIR}/XF86Config.${FILEMAN_SUFFIX} +${X11ROOT_PREFIX}/${FILEMAN_DIR}/getconfig.${FILEMAN_SUFFIX} +@dirrm ${X11ROOT_PREFIX}/lib/modules/input +@dirrm ${X11ROOT_PREFIX}/lib/modules/fonts +@dirrm ${X11ROOT_PREFIX}/lib/modules/extensions +@dirrm ${X11ROOT_PREFIX}/lib/modules/drivers +@dirrm ${X11ROOT_PREFIX}/lib/modules/codeconv +@dirrm ${X11ROOT_PREFIX}/lib/modules +@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver +@dirrm ${X11ROOT_PREFIX}/lib/X11/getconfig +@dirrm ${X11ROOT_PREFIX}/include/X11/pixmaps diff --git a/x11/XFree86-server/files/host.def b/x11/XFree86-server/files/host.def index 8e186d7e25c..a6a46c31d3f 100644 --- a/x11/XFree86-server/files/host.def +++ b/x11/XFree86-server/files/host.def @@ -1,8 +1,4 @@ -/* - * $NetBSD: host.def,v 1.2 2004/02/02 14:16:44 xtraeme Exp $ - * - * XFree86 packages for pkgsrc system - */ +/* $NetBSD: host.def,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO @@ -18,7 +14,6 @@ #define NothingOutsideProjectRoot YES #define InstallXserverSetUID YES -#define HasGlide3 YES #define BuildServer YES #define LibInstallBuild YES @@ -28,43 +23,19 @@ #define BuildGLXLibrary YES #define BuildXFree86ConfigTools YES #define UseInstalledPrograms YES -#define StandardIncludes -I@BLNK@/include -I@PREFIX@/include -#ifdef LinuxArchitecture -#define InstallAppDefFiles YES -#define LdPostLib @LDFLAGS@ -#endif +#define BuildFontCache NO +#define BuiltFontLib NO -#define XTrueTypeInstallCConvHeaders NO - -/* Don't build with SecureRPC, we need to fix this ... */ +#define StandardIncludes -I@BLNK@/include +#define ExtraLoadFlags @LDFLAGS@ -#if defined(NetBSDArchitecture) -# define HasSecureRPC NO -#endif +#define XTrueTypeInstallCConvHeaders NO -/* DRI/DRM Support only in FreeBSD/Linux at this moment */ +#define HasFreetype2 YES +#define Freetype2Dir @BLNK@ -#if defined(FreeBSDArchitecture) -# define BuildXF86DRI YES -# define BuildXF86DRM NO -# define HasSecureRPC YES -#elif defined(LinuxArchitecture) -# define BuildXF86DRI YES -# define BuildXF86DRM YES -#endif +#define HasFontconfig YES +#define FontconfigDir @BLNK@ -#if defined(i386Architecture) -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - i128 nsc ati i810 ark cyrix siliconmotion \ - vesa vga -#elif defined(ia64Architecture) -# define XF86CardDrivers mga nv tdfx glint ati vga -#elif defined(AlphaArchitecture) -# define XF86CardDrivers mga glint nv tga s3 s3virge rendition \ - tdfx savage cirrus ati siliconmotion vga -#elif defined(Sparc64Architecture) -# define XF86CardDrivers nv ati sunffb -#endif +#define BuildHtmlManPages NO diff --git a/x11/imake/Makefile b/x11/imake/Makefile index 7ef18c6d233..daf78570bed 100644 --- a/x11/imake/Makefile +++ b/x11/imake/Makefile @@ -1,39 +1,29 @@ -# $NetBSD: Makefile,v 1.6 2004/02/02 19:10:05 xtraeme Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/28 22:06:16 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= imake-${XF_VER} -PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} -DISTFILES= X430src-1.tgz X430src-3.tgz +DISTFILES= XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-3.tgz MAINTAINER= xfree86@blef.org HOMEPAGE= http://www.xfree86.org/ COMMENT= Imake and other utilities from XFree86 -INSTALL_TARGET= install install.man +DEPENDS+= XFree86-dirs>=1.0:../../misc/XFree86-dirs -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes +INSTALL_TARGET= install install.man NO_XFREE86_TARGETS= # defined .include "../../mk/bsd.prefs.mk" -PLIST_SUBST+= IMAKE_MAN_DIR=${IMAKE_MAN_DIR} -PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX} - -.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" -PLIST_SUBST+= AVAILABLE= -.else -PLIST_SUBST+= AVAILABLE="@comment " -.endif - .if ${OPSYS} == "Linux" DEPENDS+= bison-[0-9]*:../../devel/bison DEPENDS+= flex-[0-9]*:../../devel/flex -USE_GNU_TOOLS+= make .endif -.include "../../meta-pkgs/XFree86/Makefile.common" +.include "../../XFree86/XFree86/Makefile.common" post-extract: .for F in ${SYSTEMS} @@ -58,10 +48,9 @@ do-build: @${TOUCH} ${WRKSRC}/config/cf/date.def @${CP} ${FILESDIR}/xf86site.def ${WRKSRC}/config/cf @${SED} \ - -e "s|@PREFIX@|${PREFIX}|g" \ + -e "s|@PREFIX@|${X11ROOT}|g" \ -e "s|@BLNK@|${BUILDLINK_DIR}|g" \ -e "s|@LOCALBASE@|${LOCALBASE}|g " \ - -e "s|@LDFLAGS@|${LDFLAGS}|g" \ -e "s|@MAKE@|${MAKE_PROGRAM}|" \ ${FILESDIR}/host.def > \ ${WRKSRC}/config/cf/host.def diff --git a/x11/imake/PLIST b/x11/imake/PLIST index 49dab425300..b65fcd5b52b 100644 --- a/x11/imake/PLIST +++ b/x11/imake/PLIST @@ -1,143 +1,136 @@ -@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 +@comment $NetBSD: PLIST,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ +${X11ROOT_PREFIX}/bin/ccmakedep +${X11ROOT_PREFIX}/bin/cleanlinks +${X11ROOT_PREFIX}/bin/gccmakedep +${X11ROOT_PREFIX}/bin/imake +${X11ROOT_PREFIX}/bin/lndir +${X11ROOT_PREFIX}/bin/makedepend +${X11ROOT_PREFIX}/bin/makeg +${X11ROOT_PREFIX}/bin/makestrs +${X11ROOT_PREFIX}/bin/mergelib +${X11ROOT_PREFIX}/bin/mkdirhier +${X11ROOT_PREFIX}/bin/mkhtmlindex +${X11ROOT_PREFIX}/bin/pswrap +${X11ROOT_PREFIX}/bin/revpath +${X11ROOT_PREFIX}/bin/rman +${X11ROOT_PREFIX}/bin/xmkmf +${X11ROOT_PREFIX}/lib/X11/config/Amoeba.cf +${X11ROOT_PREFIX}/lib/X11/config/DGUX.cf +${X11ROOT_PREFIX}/lib/X11/config/FreeBSD.cf +${X11ROOT_PREFIX}/lib/X11/config/Imake.cf +${X11ROOT_PREFIX}/lib/X11/config/Imake.rules +${X11ROOT_PREFIX}/lib/X11/config/Imake.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Library.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Mips.cf +${X11ROOT_PREFIX}/lib/X11/config/Motif.rules +${X11ROOT_PREFIX}/lib/X11/config/Motif.tmpl +${X11ROOT_PREFIX}/lib/X11/config/NetBSD.cf +${X11ROOT_PREFIX}/lib/X11/config/Oki.cf +${X11ROOT_PREFIX}/lib/X11/config/OpenBSD.cf +${X11ROOT_PREFIX}/lib/X11/config/QNX4.cf +${X11ROOT_PREFIX}/lib/X11/config/QNX4.rules +${X11ROOT_PREFIX}/lib/X11/config/Server.tmpl +${X11ROOT_PREFIX}/lib/X11/config/ServerLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Threads.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Win32.cf +${X11ROOT_PREFIX}/lib/X11/config/Win32.rules +${X11ROOT_PREFIX}/lib/X11/config/WinLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/X11.rules +${X11ROOT_PREFIX}/lib/X11/config/X11.tmpl +${X11ROOT_PREFIX}/lib/X11/config/apollo.cf +${X11ROOT_PREFIX}/lib/X11/config/bsd.cf +${X11ROOT_PREFIX}/lib/X11/config/bsdLib.rules +${X11ROOT_PREFIX}/lib/X11/config/bsdLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/bsdi.cf +${X11ROOT_PREFIX}/lib/X11/config/cde.rules +${X11ROOT_PREFIX}/lib/X11/config/cde.tmpl +${X11ROOT_PREFIX}/lib/X11/config/convex.cf +${X11ROOT_PREFIX}/lib/X11/config/cray.cf +${X11ROOT_PREFIX}/lib/X11/config/cygwin.cf +${X11ROOT_PREFIX}/lib/X11/config/cygwin.rules +${X11ROOT_PREFIX}/lib/X11/config/cygwin.tmpl +${X11ROOT_PREFIX}/lib/X11/config/darwin.cf +${X11ROOT_PREFIX}/lib/X11/config/darwinLib.rules +${X11ROOT_PREFIX}/lib/X11/config/darwinLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/date.def +${X11ROOT_PREFIX}/lib/X11/config/fujitsu.cf +${X11ROOT_PREFIX}/lib/X11/config/generic.cf +${X11ROOT_PREFIX}/lib/X11/config/gnu.cf +${X11ROOT_PREFIX}/lib/X11/config/gnuLib.rules +${X11ROOT_PREFIX}/lib/X11/config/gnuLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/host.def +${X11ROOT_PREFIX}/lib/X11/config/hp.cf +${X11ROOT_PREFIX}/lib/X11/config/hpLib.rules +${X11ROOT_PREFIX}/lib/X11/config/hpLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/ibm.cf +${X11ROOT_PREFIX}/lib/X11/config/ibmLib.rules +${X11ROOT_PREFIX}/lib/X11/config/ibmLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/isc.cf +${X11ROOT_PREFIX}/lib/X11/config/linux.cf +${X11ROOT_PREFIX}/lib/X11/config/lnxLib.rules +${X11ROOT_PREFIX}/lib/X11/config/lnxLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/lnxdoc.rules +${X11ROOT_PREFIX}/lib/X11/config/lnxdoc.tmpl +${X11ROOT_PREFIX}/lib/X11/config/luna.cf +${X11ROOT_PREFIX}/lib/X11/config/lynx.cf +${X11ROOT_PREFIX}/lib/X11/config/macII.cf +${X11ROOT_PREFIX}/lib/X11/config/mach.cf +${X11ROOT_PREFIX}/lib/X11/config/minix.cf +${X11ROOT_PREFIX}/lib/X11/config/moto.cf +${X11ROOT_PREFIX}/lib/X11/config/ncr.cf +${X11ROOT_PREFIX}/lib/X11/config/nec.cf +${X11ROOT_PREFIX}/lib/X11/config/necLib.rules +${X11ROOT_PREFIX}/lib/X11/config/necLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/noop.rules +${X11ROOT_PREFIX}/lib/X11/config/nto.cf +${X11ROOT_PREFIX}/lib/X11/config/nto.rules +${X11ROOT_PREFIX}/lib/X11/config/oldlib.rules +${X11ROOT_PREFIX}/lib/X11/config/os2.cf +${X11ROOT_PREFIX}/lib/X11/config/os2.rules +${X11ROOT_PREFIX}/lib/X11/config/os2Lib.rules +${X11ROOT_PREFIX}/lib/X11/config/os2Lib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/osf1.cf +${X11ROOT_PREFIX}/lib/X11/config/osfLib.rules +${X11ROOT_PREFIX}/lib/X11/config/osfLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/pegasus.cf +${X11ROOT_PREFIX}/lib/X11/config/sco.cf +${X11ROOT_PREFIX}/lib/X11/config/sco5.cf +${X11ROOT_PREFIX}/lib/X11/config/scoLib.rules +${X11ROOT_PREFIX}/lib/X11/config/sequent.cf +${X11ROOT_PREFIX}/lib/X11/config/sgi.cf +${X11ROOT_PREFIX}/lib/X11/config/sgiLib.rules +${X11ROOT_PREFIX}/lib/X11/config/sgiLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/site.def +${X11ROOT_PREFIX}/lib/X11/config/sony.cf +${X11ROOT_PREFIX}/lib/X11/config/sun.cf +${X11ROOT_PREFIX}/lib/X11/config/sunLib.rules +${X11ROOT_PREFIX}/lib/X11/config/sunLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/sv3Lib.rules +${X11ROOT_PREFIX}/lib/X11/config/sv3Lib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/sv4Lib.rules +${X11ROOT_PREFIX}/lib/X11/config/sv4Lib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/svr3.cf +${X11ROOT_PREFIX}/lib/X11/config/svr4.cf +${X11ROOT_PREFIX}/lib/X11/config/ultrix.cf +${X11ROOT_PREFIX}/lib/X11/config/usl.cf +${X11ROOT_PREFIX}/lib/X11/config/version.def +${X11ROOT_PREFIX}/lib/X11/config/x386.cf +${X11ROOT_PREFIX}/lib/X11/config/xf86.rules +${X11ROOT_PREFIX}/lib/X11/config/xf86.tmpl +${X11ROOT_PREFIX}/lib/X11/config/xf86site.def +${X11ROOT_PREFIX}/lib/X11/config/xfree86.cf +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/ccmakedep.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/cleanlinks.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/gccmakedep.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/imake.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/lndir.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/makedepend.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/makeg.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/makestrs.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/mergelib.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/mkdirhier.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/mkhtmlindex.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/pswrap.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/revpath.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/rman.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/xmkmf.${MAN_SUFFIX} diff --git a/x11/imake/distinfo b/x11/imake/distinfo index 9520c76135e..8cd94d12f80 100644 --- a/x11/imake/distinfo +++ b/x11/imake/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.2 2004/01/31 14:38:15 xtraeme Exp $ +$NetBSD: distinfo,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ -SHA1 (X430src-1.tgz) = 3aaf219e8c2d3eb299f150bd4a2554a84a19354b -Size (X430src-1.tgz) = 10993622 bytes -SHA1 (X430src-3.tgz) = a11e619ba0b628d9e2e39e838379658b3b347f66 -Size (X430src-3.tgz) = 12366363 bytes +SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79 +Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes +SHA1 (XFree86-4.4.0-src-3.tgz) = a012694d5a5aa3df1d9a3a52363d73cf8f03326b +Size (XFree86-4.4.0-src-3.tgz) = 11239253 bytes SHA1 (patch-aa) = 554472267b9a5bc6614b11c6688325c1fd7ffc0e SHA1 (patch-ab) = f9da29ae63b2adc563df4230ce8daa9fc75ad8ca -SHA1 (patch-ac) = 77568c9cddca68e910e6db8d6d7baa5e495a0fb5 -SHA1 (patch-ad) = dc2cd430ed18f950e32e55a262de845e905199ad -SHA1 (patch-ae) = 8a2032645c204d07ed9a7d501fc929ebe022d741 -SHA1 (patch-af) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa -SHA1 (patch-ag) = 32e12b0470daa93964ba489ce650f5ffb1317b0c -SHA1 (patch-ah) = bec3d071020c9354c7f1203d0467343b32298518 +SHA1 (patch-ac) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa +SHA1 (patch-ad) = 90584e5732fb882f431afd69f6fd1c26c9d22bee +SHA1 (patch-ae) = b34f46d715e90159df3897cf20023b58b9deff67 +SHA1 (patch-af) = a06752ee9f55e64a407fac6fbde3547fd096c71d diff --git a/x11/imake/files/host.def b/x11/imake/files/host.def index 7039cb0c511..ddd18436ce4 100644 --- a/x11/imake/files/host.def +++ b/x11/imake/files/host.def @@ -1,10 +1,5 @@ -/* - * $NetBSD: host.def,v 1.2 2004/02/02 14:14:45 xtraeme Exp $ - * - * XFree86 packages for pkgsrc system - * - */ +/* $NetBSD: host.def,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ */ -#define ProjectRoot @PREFIX@/X11R6 +#define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO #define MakeCmd @MAKE@ diff --git a/x11/imake/patches/patch-ac b/x11/imake/patches/patch-ac index 2a50ba5c0bf..7693a131306 100644 --- a/x11/imake/patches/patch-ac +++ b/x11/imake/patches/patch-ac @@ -1,62 +1,12 @@ -$NetBSD: patch-ac,v 1.2 2004/01/31 14:38:15 xtraeme Exp $ +$NetBSD: patch-ac,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ ---- config/cf/FreeBSD.cf.in.orig Sat Jan 31 15:05:04 2004 -+++ config/cf/FreeBSD.cf.in Sat Jan 31 15:07:28 2004 -@@ -161,15 +161,10 @@ - * - * ld: warning: libXThrStub.so.6, needed by libX11.so, not found - */ --#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ --#else --# define CcCmd cc --# define CplusplusCmd c++ --#endif -+#define CcCmd @@PKGSRC_CC@@ -+#define CplusplusCmd @@PKGSRC_CXX@@ - --#define CppCmd /usr/bin/cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ -@@ -177,7 +172,7 @@ - #if defined(UseInstalled) - #define DefaultCCOptions /**/ - #else --#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions -+#define DefaultCCOptions -ansi -Dasm=__asm - #endif - #endif - #ifndef ExtraLibraries -@@ -482,18 +477,9 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 --#endif --#endif - --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - - #ifndef PreIncDir - # define PreIncDir /usr/include -@@ -519,7 +505,7 @@ - * Compress manual pages - */ - #ifndef CompressManPages --# define CompressManPages YES -+# define CompressManPages NO - #endif - - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) +--- config/pswrap/Imakefile.orig 2003-07-24 01:45:49.000000000 +0200 ++++ config/pswrap/Imakefile 2003-07-24 01:46:00.000000000 +0200 +@@ -4,7 +4,6 @@ + DEFINES = -DXENVIRONMENT + DEPLIBS = + YFLAGS = -d +-EXTRA_LIBRARIES = LexLib + + SRCS = main.c pswdict.c pswfile.c \ + systemnames.c psw.c pswstring.c pswsemantics.c diff --git a/x11/imake/patches/patch-ad b/x11/imake/patches/patch-ad index ea5cc81c2ff..59880c05ad9 100644 --- a/x11/imake/patches/patch-ad +++ b/x11/imake/patches/patch-ad @@ -1,59 +1,18 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ +$NetBSD: patch-ad,v 1.2 2004/03/28 22:06:16 xtraeme Exp $ ---- config/cf/NetBSD.cf.in.orig 2003-07-21 09:42:40.000000000 +0000 -+++ config/cf/NetBSD.cf.in 2003-07-21 09:47:58.000000000 +0000 -@@ -89,22 +89,28 @@ - - #define HasVarRun YES - #define HasVarDb YES -+#define HasShadowPasswd NO - - #define InstallXloadSetGID NO - --/* Defines for using the GNU pth thread library -- experimental */ -+#ifndef NetBSDThreads -+# define NetBSDThreads YES -+#endif - --#ifdef NetBSDPth --#define PthreadHLocation -I/usr/local/include /* where is pthread.h? */ --#define LibPthreadLocation -L/usr/local/lib /* where is libpthread? */ --#define HasThreadSafeAPI NO --#define HasPosixThreads YES --#define SystemMTDefines -D_REENTRANT PthreadHLocation --#define ThreadsLibraries LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread --#define SharedX11Reqs ThreadsLibraries -+#if NetBSDThreads && \ -+ ((OSMajorVersion > 1) || \ -+ (OSMajorVersion == 1 && OSMinorVersion > 6) || \ -+ (OSMajorVersion == 1 && OSMinorVersion == 6 && OSTeenyVersion >= 13)) -+ -+# define HasPosixThreads YES -+# define ThreadedX YES -+# define HasThreadSafeAPI YES -+# define ThreadsLibraries -lpthread -+# define LibraryMTDefines -DUSE_NBSD_THREADLIB -+# define SystemMTDefines -D_REENTRANT -+# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI - #else --#define HasPosixThreads NO --#define ThreadedX NO -+# define ThreadedX NO - #endif - - /* -@@ -122,8 +128,7 @@ - +--- config/cf/NetBSD.cf.in.orig 2004-03-03 07:53:38.000000000 +0000 ++++ config/cf/NetBSD.cf.in 2004-03-03 07:54:59.000000000 +0000 +@@ -143,7 +143,7 @@ #define MkdirHierCmd mkdir -p --#undef CcCmd + #undef CcCmd -#define CcCmd gcc +#define CcCmd @@PKGSRC_CC@@ #ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ -@@ -143,7 +148,7 @@ - #define UseGccMakeDepend YES +@@ -159,7 +159,7 @@ + #endif #endif -#define CppCmd cpp @@ -61,20 +20,22 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ #define StandardCppOptions -traditional #define StandardCppDefines /**/ #define PreProcessCmd CcCmd -E -@@ -191,10 +196,10 @@ - # ifndef DefaultGcc2i386Opt - # if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) - /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ --# define DefaultGcc2i386Opt -O2 -+# define DefaultGcc2i386OpT - # endif - # endif +@@ -208,13 +208,7 @@ + #define HasWeakSymbols UseElfFormat + + #ifdef i386Architecture +-# ifndef DefaultGcc2i386Opt +-# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) +- /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ +-# define DefaultGcc2i386Opt -O2 GccAliasingArgs +-# endif +-# endif -# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ # if OSMajorVersion < 1 # define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF # else -@@ -204,7 +209,7 @@ +@@ -224,7 +218,7 @@ # define ServerExtraSysLibs -li386 # endif #else diff --git a/x11/imake/patches/patch-ae b/x11/imake/patches/patch-ae index 09dbede361d..5e237eeb666 100644 --- a/x11/imake/patches/patch-ae +++ b/x11/imake/patches/patch-ae @@ -1,15 +1,58 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ - ---- extras/rman/rman.c.orig Tue Jul 15 23:53:53 2003 -+++ extras/rman/rman.c Tue Jul 15 23:44:21 2003 -@@ -4104,6 +4104,9 @@ - } - } - break; -+ case 0: -+ /* ignore */ -+ break; - default: /* unknown escaped character */ - sputchar(*p++); - } +$NetBSD: patch-ae,v 1.2 2004/03/28 22:06:16 xtraeme Exp $ +--- config/cf/FreeBSD.cf.in.orig 2004-03-03 07:40:43.000000000 +0000 ++++ config/cf/FreeBSD.cf.in 2004-03-03 07:44:05.000000000 +0000 +@@ -190,11 +190,11 @@ + # define CcCmd $(CLIENTENVSETUP) cc + # define CplusplusCmd $(CLIENTENVSETUP) c++ + #else +-# define CcCmd cc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + #endif + +-#define CppCmd /usr/bin/cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -207,7 +207,7 @@ + #else + #define NoSystemWarn + #endif +-#define DefaultCCOptions -ansi -pedantic NoSystemWarn -Dasm=__asm \ ++#define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm \ + GccWarningOptions + #endif + #endif +@@ -439,18 +439,8 @@ + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC + #endif + +-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ +-#ifndef DefaultGcc2i386Opt +-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) +-#define DefaultGcc2i386Opt -O2 GccAliasingArgs +-#endif +-#endif +- +-#ifdef i386Architecture +-# define OptimizedCDebugFlags DefaultGcc2i386Opt +-#else +-# define OptimizedCDebugFlags -O +-#endif ++#define DefaultGcc2i386Opt ++#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + + #ifndef PreIncDir + # define PreIncDir /usr/include +@@ -476,7 +466,7 @@ + * Compress manual pages + */ + #ifndef CompressManPages +-# define CompressManPages YES ++# define CompressManPages NO + #endif + + #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/imake/patches/patch-af b/x11/imake/patches/patch-af index 76c7ecb47cf..292960d3202 100644 --- a/x11/imake/patches/patch-af +++ b/x11/imake/patches/patch-af @@ -1,12 +1,41 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ +$NetBSD: patch-af,v 1.2 2004/03/28 22:06:16 xtraeme Exp $ ---- config/pswrap/Imakefile.orig 2003-07-24 01:45:49.000000000 +0200 -+++ config/pswrap/Imakefile 2003-07-24 01:46:00.000000000 +0200 -@@ -4,7 +4,6 @@ - DEFINES = -DXENVIRONMENT - DEPLIBS = - YFLAGS = -d --EXTRA_LIBRARIES = LexLib +--- config/cf/linux.cf.in.orig 2004-03-03 07:44:42.000000000 +0000 ++++ config/cf/linux.cf.in 2004-03-03 07:46:51.000000000 +0000 +@@ -549,15 +549,15 @@ + # if defined (i386Architecture) && ((GccMajorVersion >3) \ + || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) + # ifndef CcCmd +-# define CcCmd gcc -m32 ++# define CcCmd @@PKGSRC_CC@@ + # endif + # ifndef CplusplusCmd +-# define CplusplusCmd c++ -m32 ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # endif + # ifndef CcCmd +-# define CcCmd gcc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # ifndef AsCmd + # define AsCmd CcCmd -c -x assembler +@@ -721,7 +721,6 @@ + #define YaccCmd bison -y + #define LexCmd flex -l + #define HasFlex YES +-#define LexLib -lfl + #define PreProcessCmd CcCmd -E + #define PostIncDir DefaultGccIncludeDir + #define LdCombineFlags -r +@@ -791,7 +790,7 @@ - SRCS = main.c pswdict.c pswfile.c \ - systemnames.c psw.c pswstring.c pswsemantics.c + #ifdef i386Architecture + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # endif + # define LinuxMachineDefines -D__i386__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME diff --git a/x11/imake/patches/patch-ag b/x11/imake/patches/patch-ag deleted file mode 100644 index 5e9bcf9ff25..00000000000 --- a/x11/imake/patches/patch-ag +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2004/01/24 08:43:29 xtraeme Exp $ - ---- config/cf/X11.tmpl.orig 2003-07-25 21:13:11.000000000 +0200 -+++ config/cf/X11.tmpl 2003-07-25 21:14:34.000000000 +0200 -@@ -167,7 +167,7 @@ - #define MaxUCSChar 0x3200 - #endif - #ifndef DerivedUCSFonts --#define DerivedUCSFonts HasPerl5 -+#define DerivedUCSFonts YES - #endif - /* These primarily control generation of derived 8-bit fonts. */ - #ifndef BuildUCSFonts -@@ -1591,7 +1591,7 @@ - # else - MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh - # endif -- UCS2ANY = $(FONTSRC)/util/ucs2any.pl -+ UCS2ANY = $(FONTSRC)/util/ucs2any - BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl - UCSMAPPREFIX = $(FONTSRC)/util/map- - #endif -@@ -3797,18 +3797,16 @@ - - - #ifndef MakeBdfFontFromUCSMaster --#if HasPerl5 - #define MakeBdfFontFromUCSMaster(font,enc) @@\ - includes:: font-enc.bdf @@\ - @@\ - font-enc.bdf: font.bdf $(UCS2ANY) @@\ - RemoveFile($@) @@\ -- RunPerlScript($(UCS2ANY),font.bdf $(UCSMAPPREFIX)enc enc) @@\ -+ $(UCS2ANY) font.bdf $(UCSMAPPREFIX)enc enc @@\ - @@\ - clean:: @@\ - RemoveFile(font-enc.bdf) - #endif --#endif - - #ifndef MakeTruncatedUCSBdfFont - #if HasPerl5 diff --git a/x11/imake/patches/patch-ah b/x11/imake/patches/patch-ah deleted file mode 100644 index 9b0942c448e..00000000000 --- a/x11/imake/patches/patch-ah +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $ - ---- config/cf/linux.cf.in.orig 2003-07-24 05:18:24.000000000 +0200 -+++ config/cf/linux.cf.in 2003-07-24 05:20:54.000000000 +0200 -@@ -555,15 +555,15 @@ - # if defined (i386Architecture) && ((GccMajorVersion >3) \ - || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) - # ifndef CcCmd --# define CcCmd gcc -m32 -+# define CcCmd @@PKGSRC_CC@@ - # endif - # ifndef CplusplusCmd --# define CplusplusCmd c++ -m32 -+# define CplusplusCmd @@PKGSRC_CXX@@ - # endif - # endif - # ifndef CcCmd --# define CcCmd gcc --# define CplusplusCmd c++ -+# define CcCmd @@PKGSRC_CC@@ -+# define CplusplusCmd @@PKGSRC_CXX@@ - # endif - # ifndef AsCmd - # define AsCmd CcCmd -c -x assembler -@@ -715,7 +715,6 @@ - #define YaccCmd bison -y - #define LexCmd flex -l - #define HasFlex YES --#define LexLib -lfl - #define PreProcessCmd CcCmd -E - #define PostIncDir DefaultGccIncludeDir - #define LdCombineFlags -r -@@ -775,7 +774,7 @@ - - #ifdef i386Architecture - # ifndef OptimizedCDebugFlags --# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - # endif - # define LinuxMachineDefines -D__i386__ - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET |