- update to Xorg X11R7.4 and reorganization of the xorg-section
authorMirko Vogt <mirko@openwrt.org>
Sun, 16 Nov 2008 19:31:42 +0000 (19:31 +0000)
committerMirko Vogt <mirko@openwrt.org>
Sun, 16 Nov 2008 19:31:42 +0000 (19:31 +0000)
 - added tslib
 - added e17 and related efl-libs

SVN-Revision: 13238

450 files changed:
XOrg/app/eterm/Makefile [deleted file]
XOrg/app/fluxbox/Makefile [deleted file]
XOrg/app/fluxbox/files/init [deleted file]
XOrg/app/fluxbox/files/menu [deleted file]
XOrg/app/fluxbox/patches/100-fbrun-compile.patch [deleted file]
XOrg/app/fluxbox/patches/120-fbsetroot-compile.patch [deleted file]
XOrg/app/fontconfig/Makefile [deleted file]
XOrg/app/iceauth/Makefile [deleted file]
XOrg/app/matchbox/Makefile [deleted file]
XOrg/app/packages [deleted file]
XOrg/app/patches/xlogo/100-link.patch [deleted file]
XOrg/app/template.mk [deleted file]
XOrg/app/xcalc/Makefile [deleted file]
XOrg/app/xclipboard/Makefile [deleted file]
XOrg/app/xdm/Makefile [deleted file]
XOrg/app/xeyes/Makefile [deleted file]
XOrg/app/xine-ui/Makefile [deleted file]
XOrg/app/xine-ui/patches/100-cflags.patch [deleted file]
XOrg/app/xine-ui/patches/110-xitk.patch [deleted file]
XOrg/app/xinit/Makefile [deleted file]
XOrg/app/xlogo/Makefile [deleted file]
XOrg/app/xlogo/patches/100-link.patch [deleted file]
XOrg/app/xmessage/Makefile [deleted file]
XOrg/app/xmms/Makefile [deleted file]
XOrg/app/xmms/patches/xmms-1.2.10-gcc4-1.patch [deleted file]
XOrg/app/xmms/pathes [deleted file]
XOrg/app/xset/Makefile [deleted file]
XOrg/app/xsetroot/Makefile [deleted file]
XOrg/app/xterm-233/Makefile [deleted file]
XOrg/app/xterm-233/patches/100-install.patch [deleted file]
XOrg/data/xbitmaps/Makefile [deleted file]
XOrg/driver/packages [deleted file]
XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch [deleted file]
XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch [deleted file]
XOrg/driver/patches/xf86-video-vesa/100-include-fix.patch [deleted file]
XOrg/driver/template.mk [deleted file]
XOrg/driver/xf86-input-evdev/Makefile [deleted file]
XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch [deleted file]
XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch [deleted file]
XOrg/driver/xf86-input-keyboard/Makefile [deleted file]
XOrg/driver/xf86-input-mouse/Makefile [deleted file]
XOrg/driver/xf86-video-ati/Makefile [deleted file]
XOrg/driver/xf86-video-fbdev/Makefile [deleted file]
XOrg/driver/xf86-video-geode/Makefile [deleted file]
XOrg/driver/xf86-video-intel/Makefile [deleted file]
XOrg/driver/xf86-video-intel/patches/100-sdkdir.patch [deleted file]
XOrg/driver/xf86-video-nv/Makefile [deleted file]
XOrg/driver/xf86-video-vesa/Makefile [deleted file]
XOrg/driver/xf86-video-vesa/patches/100-include-fix.patch [deleted file]
XOrg/driver/xf86-video-vga/Makefile [deleted file]
XOrg/font-native/font-util/Makefile [deleted file]
XOrg/font/dejavu-fonts-ttf/Makefile [deleted file]
XOrg/font/encodings/Makefile [deleted file]
XOrg/font/font-alias/Makefile [deleted file]
XOrg/font/font-bh-75dpi/Makefile [deleted file]
XOrg/font/font-cursor-misc/Makefile [deleted file]
XOrg/font/font-daewoo-misc/Makefile [deleted file]
XOrg/font/font-dec-misc/Makefile [deleted file]
XOrg/font/font-ibm-type1/Makefile [deleted file]
XOrg/font/font-isas-misc/Makefile [deleted file]
XOrg/font/font-jis-misc/Makefile [deleted file]
XOrg/font/font-micro-misc/Makefile [deleted file]
XOrg/font/font-misc-cyrillic/Makefile [deleted file]
XOrg/font/font-misc-misc/Makefile [deleted file]
XOrg/font/font-misc-misc/files/fonts.dir.font-base [deleted file]
XOrg/font/font-misc-misc/files/fonts.dir.font-misc-misc [deleted file]
XOrg/font/font-xfree86-type1/Makefile [deleted file]
XOrg/font/packages [deleted file]
XOrg/font/template.mk [deleted file]
XOrg/generate.sh [deleted file]
XOrg/headers/native/Makefile [deleted file]
XOrg/headers/native/src/X11/CallbackI.h [deleted file]
XOrg/headers/native/src/X11/Composite.h [deleted file]
XOrg/headers/native/src/X11/CompositeP.h [deleted file]
XOrg/headers/native/src/X11/ConstrainP.h [deleted file]
XOrg/headers/native/src/X11/Constraint.h [deleted file]
XOrg/headers/native/src/X11/ConvertI.h [deleted file]
XOrg/headers/native/src/X11/Core.h [deleted file]
XOrg/headers/native/src/X11/CoreP.h [deleted file]
XOrg/headers/native/src/X11/CreateI.h [deleted file]
XOrg/headers/native/src/X11/DECkeysym.h [deleted file]
XOrg/headers/native/src/X11/EventI.h [deleted file]
XOrg/headers/native/src/X11/HPkeysym.h [deleted file]
XOrg/headers/native/src/X11/HookObjI.h [deleted file]
XOrg/headers/native/src/X11/ImUtil.h [deleted file]
XOrg/headers/native/src/X11/InitialI.h [deleted file]
XOrg/headers/native/src/X11/Intrinsic.h [deleted file]
XOrg/headers/native/src/X11/IntrinsicI.h [deleted file]
XOrg/headers/native/src/X11/IntrinsicP.h [deleted file]
XOrg/headers/native/src/X11/Object.h [deleted file]
XOrg/headers/native/src/X11/ObjectP.h [deleted file]
XOrg/headers/native/src/X11/PassivGraI.h [deleted file]
XOrg/headers/native/src/X11/RectObj.h [deleted file]
XOrg/headers/native/src/X11/RectObjP.h [deleted file]
XOrg/headers/native/src/X11/ResConfigP.h [deleted file]
XOrg/headers/native/src/X11/ResourceI.h [deleted file]
XOrg/headers/native/src/X11/SelectionI.h [deleted file]
XOrg/headers/native/src/X11/Shell.h [deleted file]
XOrg/headers/native/src/X11/ShellI.h [deleted file]
XOrg/headers/native/src/X11/ShellP.h [deleted file]
XOrg/headers/native/src/X11/StringDefs.h [deleted file]
XOrg/headers/native/src/X11/Sunkeysym.h [deleted file]
XOrg/headers/native/src/X11/ThreadsI.h [deleted file]
XOrg/headers/native/src/X11/TranslateI.h [deleted file]
XOrg/headers/native/src/X11/VarargsI.h [deleted file]
XOrg/headers/native/src/X11/Vendor.h [deleted file]
XOrg/headers/native/src/X11/VendorP.h [deleted file]
XOrg/headers/native/src/X11/X.h [deleted file]
XOrg/headers/native/src/X11/X10.h [deleted file]
XOrg/headers/native/src/X11/XF86keysym.h [deleted file]
XOrg/headers/native/src/X11/XKBlib.h [deleted file]
XOrg/headers/native/src/X11/XWDFile.h [deleted file]
XOrg/headers/native/src/X11/Xalloca.h [deleted file]
XOrg/headers/native/src/X11/Xarch.h [deleted file]
XOrg/headers/native/src/X11/Xatom.h [deleted file]
XOrg/headers/native/src/X11/Xauth.h [deleted file]
XOrg/headers/native/src/X11/Xcms.h [deleted file]
XOrg/headers/native/src/X11/Xdefs.h [deleted file]
XOrg/headers/native/src/X11/Xdmcp.h [deleted file]
XOrg/headers/native/src/X11/Xfuncproto.h [deleted file]
XOrg/headers/native/src/X11/Xfuncs.h [deleted file]
XOrg/headers/native/src/X11/Xlib.h [deleted file]
XOrg/headers/native/src/X11/XlibConf.h [deleted file]
XOrg/headers/native/src/X11/Xlibint.h [deleted file]
XOrg/headers/native/src/X11/Xlocale.h [deleted file]
XOrg/headers/native/src/X11/Xmd.h [deleted file]
XOrg/headers/native/src/X11/Xos.h [deleted file]
XOrg/headers/native/src/X11/Xos_r.h [deleted file]
XOrg/headers/native/src/X11/Xosdefs.h [deleted file]
XOrg/headers/native/src/X11/Xpoll.h [deleted file]
XOrg/headers/native/src/X11/Xproto.h [deleted file]
XOrg/headers/native/src/X11/Xprotostr.h [deleted file]
XOrg/headers/native/src/X11/Xregion.h [deleted file]
XOrg/headers/native/src/X11/Xresource.h [deleted file]
XOrg/headers/native/src/X11/Xthreads.h [deleted file]
XOrg/headers/native/src/X11/Xtos.h [deleted file]
XOrg/headers/native/src/X11/Xutil.h [deleted file]
XOrg/headers/native/src/X11/Xw32defs.h [deleted file]
XOrg/headers/native/src/X11/Xwindows.h [deleted file]
XOrg/headers/native/src/X11/Xwinsock.h [deleted file]
XOrg/headers/native/src/X11/ap_keysym.h [deleted file]
XOrg/headers/native/src/X11/cursorfont.h [deleted file]
XOrg/headers/native/src/X11/keysym.h [deleted file]
XOrg/headers/native/src/X11/keysymdef.h [deleted file]
XOrg/headers/native/src/X11/xpm.h [deleted file]
XOrg/lib/atk/Makefile [deleted file]
XOrg/lib/cairo/Makefile [deleted file]
XOrg/lib/gtk1/Makefile [deleted file]
XOrg/lib/gtk2/Makefile [deleted file]
XOrg/lib/gtk2/files/gdk-pixbuf-query-loaders.init [deleted file]
XOrg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch [deleted file]
XOrg/lib/gtk2/patches/100-compile_fix.patch [deleted file]
XOrg/lib/hippo-canvas/Makefile [deleted file]
XOrg/lib/hippo-canvas/patches/010-use-python-config [deleted file]
XOrg/lib/imlib2/Makefile [deleted file]
XOrg/lib/libICE/Makefile [deleted file]
XOrg/lib/libSM/Makefile [deleted file]
XOrg/lib/libX11/Makefile [deleted file]
XOrg/lib/libXau/Makefile [deleted file]
XOrg/lib/libXaw/Makefile [deleted file]
XOrg/lib/libXcursor/Makefile [deleted file]
XOrg/lib/libXdmcp/Makefile [deleted file]
XOrg/lib/libXext/Makefile [deleted file]
XOrg/lib/libXfixes/Makefile [deleted file]
XOrg/lib/libXfont/Makefile [deleted file]
XOrg/lib/libXft/Makefile [deleted file]
XOrg/lib/libXmu/Makefile [deleted file]
XOrg/lib/libXpm/Makefile [deleted file]
XOrg/lib/libXpm/patches/100-ld.patch [deleted file]
XOrg/lib/libXrandr/Makefile [deleted file]
XOrg/lib/libXrender/Makefile [deleted file]
XOrg/lib/libXt/Makefile [deleted file]
XOrg/lib/libXtst/Makefile [deleted file]
XOrg/lib/libXv/Makefile [deleted file]
XOrg/lib/libXvMC/Makefile [deleted file]
XOrg/lib/libXxf86misc/Makefile [deleted file]
XOrg/lib/libXxf86vm/Makefile [deleted file]
XOrg/lib/libast/Makefile [deleted file]
XOrg/lib/libast/patches/100-configure.patch [deleted file]
XOrg/lib/libfontenc/Makefile [deleted file]
XOrg/lib/libmatchbox/Makefile [deleted file]
XOrg/lib/librsvg/Makefile [deleted file]
XOrg/lib/librsvg/patches/010-dont-segfault-gdk-query-pixbuf-loaders.patch [deleted file]
XOrg/lib/libxkbfile/Makefile [deleted file]
XOrg/lib/libxkbui/Makefile [deleted file]
XOrg/lib/packages [deleted file]
XOrg/lib/pango/Makefile [deleted file]
XOrg/lib/pango/files/pango-querymodules.init [deleted file]
XOrg/lib/patches/libXpm/100-ld.patch [deleted file]
XOrg/lib/patches/xtrans/fix-missing-includepath.patch [deleted file]
XOrg/lib/pixman/Makefile [deleted file]
XOrg/lib/template.mk [deleted file]
XOrg/lib/vte/Makefile [deleted file]
XOrg/lib/xine-lib/Makefile [deleted file]
XOrg/lib/xine-lib/patches/100-compile_fix.patch [deleted file]
XOrg/lib/xtrans/Makefile [deleted file]
XOrg/lib/xtrans/patches/fix-missing-includepath.patch [deleted file]
XOrg/meta/xorg-server-essentials/Makefile [deleted file]
XOrg/meta/xorg-server-essentials/files/xinitrc [deleted file]
XOrg/meta/xorg-server-essentials/files/xorg.init [deleted file]
XOrg/misc/Mesa/Makefile [deleted file]
XOrg/misc/libdrm/Makefile [deleted file]
XOrg/misc/libdrm/patches/001-fix_avr32_compile [deleted file]
XOrg/misc/x-bkgd-images/Makefile [deleted file]
XOrg/misc/x-bkgd-images/files/usr/share/X11/bkgd-images/default.png [deleted symlink]
XOrg/misc/x-bkgd-images/files/usr/share/X11/bkgd-images/openwrt-1.png [deleted file]
XOrg/proto/applewmproto/Makefile [deleted file]
XOrg/proto/bigreqsproto/Makefile [deleted file]
XOrg/proto/calibrateproto/Makefile [deleted file]
XOrg/proto/calibrateproto/src/ChangeLog [deleted file]
XOrg/proto/calibrateproto/src/Makefile [deleted file]
XOrg/proto/calibrateproto/src/Makefile.am [deleted file]
XOrg/proto/calibrateproto/src/Makefile.in [deleted file]
XOrg/proto/calibrateproto/src/aclocal.m4 [deleted file]
XOrg/proto/calibrateproto/src/autogen.sh [deleted file]
XOrg/proto/calibrateproto/src/config.log [deleted file]
XOrg/proto/calibrateproto/src/config.status [deleted file]
XOrg/proto/calibrateproto/src/configure [deleted file]
XOrg/proto/calibrateproto/src/configure.ac [deleted file]
XOrg/proto/calibrateproto/src/install-sh [deleted file]
XOrg/proto/calibrateproto/src/missing [deleted file]
XOrg/proto/calibrateproto/src/xcalibrateproto.h [deleted file]
XOrg/proto/calibrateproto/src/xcalibrateproto.pc [deleted file]
XOrg/proto/calibrateproto/src/xcalibrateproto.pc.in [deleted file]
XOrg/proto/calibrateproto/src/xcalibratewire.h [deleted file]
XOrg/proto/compositeproto/Makefile [deleted file]
XOrg/proto/damageproto/Makefile [deleted file]
XOrg/proto/dmxproto/Makefile [deleted file]
XOrg/proto/evieext/Makefile [deleted file]
XOrg/proto/fixesproto/Makefile [deleted file]
XOrg/proto/fontcacheproto/Makefile [deleted file]
XOrg/proto/fontsproto/Makefile [deleted file]
XOrg/proto/glproto/Makefile [deleted file]
XOrg/proto/inputproto/Makefile [deleted file]
XOrg/proto/kbproto/Makefile [deleted file]
XOrg/proto/packages [deleted file]
XOrg/proto/printproto/Makefile [deleted file]
XOrg/proto/randrproto/Makefile [deleted file]
XOrg/proto/recordproto/Makefile [deleted file]
XOrg/proto/renderproto/Makefile [deleted file]
XOrg/proto/resourceproto/Makefile [deleted file]
XOrg/proto/scrnsaverproto/Makefile [deleted file]
XOrg/proto/template.mk [deleted file]
XOrg/proto/trapproto/Makefile [deleted file]
XOrg/proto/videoproto/Makefile [deleted file]
XOrg/proto/windowswmproto/Makefile [deleted file]
XOrg/proto/xcmiscproto/Makefile [deleted file]
XOrg/proto/xextproto/Makefile [deleted file]
XOrg/proto/xf86bigfontproto/Makefile [deleted file]
XOrg/proto/xf86dgaproto/Makefile [deleted file]
XOrg/proto/xf86driproto/Makefile [deleted file]
XOrg/proto/xf86miscproto/Makefile [deleted file]
XOrg/proto/xf86rushproto/Makefile [deleted file]
XOrg/proto/xf86vidmodeproto/Makefile [deleted file]
XOrg/proto/xineramaproto/Makefile [deleted file]
XOrg/proto/xproto/Makefile [deleted file]
XOrg/proto/xproxymanagementprotocol/Makefile [deleted file]
XOrg/server/xorg-server-X11R7.3/Makefile [deleted file]
XOrg/server/xorg-server-X11R7.3/files/xorg-olpc.conf [deleted file]
XOrg/server/xorg-server-X11R7.3/files/xorg.conf [deleted file]
XOrg/server/xorg-server-X11R7.3/patches/001-fix_avr32_compile [deleted file]
XOrg/server/xorg-server-X11R7.3/patches/100-uclibc-lm.patch [deleted file]
XOrg/utils/packages [deleted file]
XOrg/utils/template.mk [deleted file]
XOrg/utils/util-macros/Makefile [deleted file]
Xorg/app/enlightenment/Config.in [new file with mode: 0644]
Xorg/app/enlightenment/Makefile [new file with mode: 0644]
Xorg/app/eterm/Makefile [new file with mode: 0644]
Xorg/app/fluxbox/Makefile [new file with mode: 0644]
Xorg/app/fluxbox/files/init [new file with mode: 0644]
Xorg/app/fluxbox/files/menu [new file with mode: 0644]
Xorg/app/fluxbox/patches/100-fbrun-compile.patch [new file with mode: 0644]
Xorg/app/fluxbox/patches/120-fbsetroot-compile.patch [new file with mode: 0644]
Xorg/app/font-util/Makefile [new file with mode: 0644]
Xorg/app/fontconfig/Makefile [new file with mode: 0644]
Xorg/app/iceauth/Makefile [new file with mode: 0644]
Xorg/app/matchbox/Makefile [new file with mode: 0644]
Xorg/app/packages [new file with mode: 0644]
Xorg/app/template.mk [new file with mode: 0644]
Xorg/app/xcalc/Makefile [new file with mode: 0644]
Xorg/app/xclipboard/Makefile [new file with mode: 0644]
Xorg/app/xdm/Makefile [new file with mode: 0644]
Xorg/app/xeyes/Makefile [new file with mode: 0644]
Xorg/app/xine-ui/Makefile [new file with mode: 0644]
Xorg/app/xine-ui/patches/100-cflags.patch [new file with mode: 0644]
Xorg/app/xine-ui/patches/110-xitk.patch [new file with mode: 0644]
Xorg/app/xmessage/Makefile [new file with mode: 0644]
Xorg/app/xset/Makefile [new file with mode: 0644]
Xorg/app/xsetroot/Makefile [new file with mode: 0644]
Xorg/app/xterm-233/Makefile [new file with mode: 0644]
Xorg/app/xterm-233/patches/100-install.patch [new file with mode: 0644]
Xorg/data/xbitmaps/Makefile [new file with mode: 0644]
Xorg/driver/packages [new file with mode: 0644]
Xorg/driver/template.mk [new file with mode: 0644]
Xorg/driver/xf86-input-evdev/Makefile [new file with mode: 0644]
Xorg/driver/xf86-input-keyboard/Makefile [new file with mode: 0644]
Xorg/driver/xf86-input-mouse/Makefile [new file with mode: 0644]
Xorg/driver/xf86-video-ati/Makefile [new file with mode: 0644]
Xorg/driver/xf86-video-fbdev/Makefile [new file with mode: 0644]
Xorg/driver/xf86-video-intel/Makefile [new file with mode: 0644]
Xorg/driver/xf86-video-nv/Makefile [new file with mode: 0644]
Xorg/driver/xf86-video-vesa/Makefile [new file with mode: 0644]
Xorg/font/dejavu-fonts-ttf/Makefile [new file with mode: 0644]
Xorg/font/encodings/Makefile [new file with mode: 0644]
Xorg/font/font-alias/Makefile [new file with mode: 0644]
Xorg/font/font-bh-75dpi/Makefile [new file with mode: 0644]
Xorg/font/font-cursor-misc/Makefile [new file with mode: 0644]
Xorg/font/font-daewoo-misc/Makefile [new file with mode: 0644]
Xorg/font/font-dec-misc/Makefile [new file with mode: 0644]
Xorg/font/font-ibm-type1/Makefile [new file with mode: 0644]
Xorg/font/font-isas-misc/Makefile [new file with mode: 0644]
Xorg/font/font-jis-misc/Makefile [new file with mode: 0644]
Xorg/font/font-micro-misc/Makefile [new file with mode: 0644]
Xorg/font/font-misc-cyrillic/Makefile [new file with mode: 0644]
Xorg/font/font-misc-misc/Makefile [new file with mode: 0644]
Xorg/font/font-misc-misc/files/fonts.dir.font-base [new file with mode: 0644]
Xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc [new file with mode: 0644]
Xorg/font/font-xfree86-type1/Makefile [new file with mode: 0644]
Xorg/font/packages [new file with mode: 0644]
Xorg/font/template.mk [new file with mode: 0644]
Xorg/generate.sh [new file with mode: 0755]
Xorg/lib/atk/Makefile [new file with mode: 0644]
Xorg/lib/cairo/Makefile [new file with mode: 0644]
Xorg/lib/ecore/Makefile [new file with mode: 0644]
Xorg/lib/ecore/Makefile.native [new file with mode: 0644]
Xorg/lib/edbus/Makefile [new file with mode: 0644]
Xorg/lib/edje/Makefile [new file with mode: 0644]
Xorg/lib/edje/Makefile.native [new file with mode: 0644]
Xorg/lib/edje/patches/001-edje_cc-native.patch [new file with mode: 0644]
Xorg/lib/eet/Makefile [new file with mode: 0644]
Xorg/lib/eet/Makefile.native [new file with mode: 0644]
Xorg/lib/efreet/Makefile [new file with mode: 0644]
Xorg/lib/eina/Makefile [new file with mode: 0644]
Xorg/lib/embryo/Makefile [new file with mode: 0644]
Xorg/lib/evas/Makefile [new file with mode: 0644]
Xorg/lib/gtk1/Makefile [new file with mode: 0644]
Xorg/lib/gtk2/Makefile [new file with mode: 0644]
Xorg/lib/gtk2/files/gdk-pixbuf-query-loaders.init [new file with mode: 0755]
Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch [new file with mode: 0644]
Xorg/lib/gtk2/patches/100-compile_fix.patch [new file with mode: 0644]
Xorg/lib/hippo-canvas/Makefile [new file with mode: 0644]
Xorg/lib/hippo-canvas/patches/010-use-python-config [new file with mode: 0644]
Xorg/lib/imlib2/Makefile [new file with mode: 0644]
Xorg/lib/libICE/Makefile [new file with mode: 0644]
Xorg/lib/libSM/Makefile [new file with mode: 0644]
Xorg/lib/libX11/Makefile [new file with mode: 0644]
Xorg/lib/libX11/patches/003-cross-compile.patch [new file with mode: 0644]
Xorg/lib/libXau/Makefile [new file with mode: 0644]
Xorg/lib/libXaw/Makefile [new file with mode: 0644]
Xorg/lib/libXcursor/Makefile [new file with mode: 0644]
Xorg/lib/libXdmcp/Makefile [new file with mode: 0644]
Xorg/lib/libXext/Makefile [new file with mode: 0644]
Xorg/lib/libXfixes/Makefile [new file with mode: 0644]
Xorg/lib/libXfont/Makefile [new file with mode: 0644]
Xorg/lib/libXft/Makefile [new file with mode: 0644]
Xorg/lib/libXmu/Makefile [new file with mode: 0644]
Xorg/lib/libXpm/Makefile [new file with mode: 0644]
Xorg/lib/libXrandr/Makefile [new file with mode: 0644]
Xorg/lib/libXrender/Makefile [new file with mode: 0644]
Xorg/lib/libXt/Makefile [new file with mode: 0644]
Xorg/lib/libXt/patches/001-cross-compiling.patch [new file with mode: 0644]
Xorg/lib/libXtst/Makefile [new file with mode: 0644]
Xorg/lib/libXv/Makefile [new file with mode: 0644]
Xorg/lib/libXvMC/Makefile [new file with mode: 0644]
Xorg/lib/libXxf86misc/Makefile [new file with mode: 0644]
Xorg/lib/libXxf86vm/Makefile [new file with mode: 0644]
Xorg/lib/libast/Makefile [new file with mode: 0644]
Xorg/lib/libast/patches/100-configure.patch [new file with mode: 0644]
Xorg/lib/libdrm/Makefile [new file with mode: 0644]
Xorg/lib/libfontenc/Makefile [new file with mode: 0644]
Xorg/lib/libmatchbox/Makefile [new file with mode: 0644]
Xorg/lib/librsvg/Makefile [new file with mode: 0644]
Xorg/lib/librsvg/patches/010-dont-segfault-gdk-query-pixbuf-loaders.patch [new file with mode: 0644]
Xorg/lib/libxkbfile/Makefile [new file with mode: 0644]
Xorg/lib/packages [new file with mode: 0644]
Xorg/lib/pango/Makefile [new file with mode: 0644]
Xorg/lib/pango/files/pango-querymodules.init [new file with mode: 0755]
Xorg/lib/pixman/Makefile [new file with mode: 0644]
Xorg/lib/template.mk [new file with mode: 0644]
Xorg/lib/tslib/Makefile [new file with mode: 0644]
Xorg/lib/tslib/files/pointercal_om_gta02 [new file with mode: 0644]
Xorg/lib/tslib/files/ts.conf [new file with mode: 0644]
Xorg/lib/tslib/patches/devfs.patch [new file with mode: 0644]
Xorg/lib/tslib/patches/event1.patch [new file with mode: 0644]
Xorg/lib/tslib/patches/fix_version.patch [new file with mode: 0644]
Xorg/lib/tslib/patches/tslib-input_raw-grab_events.patch [new file with mode: 0644]
Xorg/lib/vte/Makefile [new file with mode: 0644]
Xorg/lib/xine-lib/Makefile [new file with mode: 0644]
Xorg/lib/xine-lib/patches/100-compile_fix.patch [new file with mode: 0644]
Xorg/lib/xtrans/Makefile [new file with mode: 0644]
Xorg/proto/applewmproto/Makefile [new file with mode: 0644]
Xorg/proto/bigreqsproto/Makefile [new file with mode: 0644]
Xorg/proto/calibrateproto/Makefile [new file with mode: 0644]
Xorg/proto/calibrateproto/src/ChangeLog [new file with mode: 0644]
Xorg/proto/calibrateproto/src/Makefile [new file with mode: 0644]
Xorg/proto/calibrateproto/src/Makefile.am [new file with mode: 0644]
Xorg/proto/calibrateproto/src/Makefile.in [new file with mode: 0644]
Xorg/proto/calibrateproto/src/aclocal.m4 [new file with mode: 0644]
Xorg/proto/calibrateproto/src/autogen.sh [new file with mode: 0755]
Xorg/proto/calibrateproto/src/config.log [new file with mode: 0644]
Xorg/proto/calibrateproto/src/config.status [new file with mode: 0755]
Xorg/proto/calibrateproto/src/configure [new file with mode: 0755]
Xorg/proto/calibrateproto/src/configure.ac [new file with mode: 0644]
Xorg/proto/calibrateproto/src/install-sh [new file with mode: 0755]
Xorg/proto/calibrateproto/src/missing [new file with mode: 0755]
Xorg/proto/calibrateproto/src/xcalibrateproto.h [new file with mode: 0644]
Xorg/proto/calibrateproto/src/xcalibrateproto.pc [new file with mode: 0644]
Xorg/proto/calibrateproto/src/xcalibrateproto.pc.in [new file with mode: 0644]
Xorg/proto/calibrateproto/src/xcalibratewire.h [new file with mode: 0644]
Xorg/proto/compositeproto/Makefile [new file with mode: 0644]
Xorg/proto/damageproto/Makefile [new file with mode: 0644]
Xorg/proto/dmxproto/Makefile [new file with mode: 0644]
Xorg/proto/evieext/Makefile [new file with mode: 0644]
Xorg/proto/fixesproto/Makefile [new file with mode: 0644]
Xorg/proto/fontcacheproto/Makefile [new file with mode: 0644]
Xorg/proto/fontsproto/Makefile [new file with mode: 0644]
Xorg/proto/glproto/Makefile [new file with mode: 0644]
Xorg/proto/inputproto/Makefile [new file with mode: 0644]
Xorg/proto/kbproto/Makefile [new file with mode: 0644]
Xorg/proto/packages [new file with mode: 0644]
Xorg/proto/printproto/Makefile [new file with mode: 0644]
Xorg/proto/randrproto/Makefile [new file with mode: 0644]
Xorg/proto/recordproto/Makefile [new file with mode: 0644]
Xorg/proto/renderproto/Makefile [new file with mode: 0644]
Xorg/proto/resourceproto/Makefile [new file with mode: 0644]
Xorg/proto/scrnsaverproto/Makefile [new file with mode: 0644]
Xorg/proto/template.mk [new file with mode: 0644]
Xorg/proto/trapproto/Makefile [new file with mode: 0644]
Xorg/proto/videoproto/Makefile [new file with mode: 0644]
Xorg/proto/windowswmproto/Makefile [new file with mode: 0644]
Xorg/proto/xcmiscproto/Makefile [new file with mode: 0644]
Xorg/proto/xextproto/Makefile [new file with mode: 0644]
Xorg/proto/xf86bigfontproto/Makefile [new file with mode: 0644]
Xorg/proto/xf86dgaproto/Makefile [new file with mode: 0644]
Xorg/proto/xf86driproto/Makefile [new file with mode: 0644]
Xorg/proto/xf86miscproto/Makefile [new file with mode: 0644]
Xorg/proto/xf86rushproto/Makefile [new file with mode: 0644]
Xorg/proto/xf86vidmodeproto/Makefile [new file with mode: 0644]
Xorg/proto/xineramaproto/Makefile [new file with mode: 0644]
Xorg/proto/xproto/Makefile [new file with mode: 0644]
Xorg/xserver/xorg-xserver/Config.in [new file with mode: 0644]
Xorg/xserver/xorg-xserver/Makefile [new file with mode: 0644]
Xorg/xserver/xorg-xserver/files/config/olpc [new file with mode: 0644]
Xorg/xserver/xorg-xserver/files/config/om_gta02 [new file with mode: 0644]
Xorg/xserver/xorg-xserver/files/tmp/xorg-olpc.conf [new file with mode: 0644]
Xorg/xserver/xorg-xserver/files/tmp/xorg-om_gta02.conf [new file with mode: 0644]
Xorg/xserver/xorg-xserver/files/tmp/xorg.conf [new file with mode: 0644]
Xorg/xserver/xorg-xserver/files/x.init [new file with mode: 0755]
Xorg/xserver/xorg-xserver/patches/001-tslib.patch [new file with mode: 0644]
Xorg/xserver/xorg-xserver/patches/002-480x640-support.patch [new file with mode: 0644]

diff --git a/XOrg/app/eterm/Makefile b/XOrg/app/eterm/Makefile
deleted file mode 100644 (file)
index 30ccc2d..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=eterm
-PKG_VERSION:=0.9.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=Eterm-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.eterm.org/download/
-PKG_BUILD_DIR:=$(BUILD_DIR)/Eterm-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/eterm/Default
-  SECTION:=xorg-extra
-  CATEGORY:=Xorg
-  SUBMENU:=terminals
-
-endef
-
-define Package/eterm
-$(call Package/eterm/Default)  
-  TITLE:=eterm
-  DEPENDS:=+xorg-server-essentials +libXcursor +imlib2 +libast +libiconv @DISPLAY_SUPPORT
-endef
-
-define Package/esetroot
-$(call Package/eterm/Default)  
-  TITLE:=esetroot
-  DEPENDS:=eterm
-endef
-
-CONFIGURE_ARGS+=--with-imlib=$(STAGING_DIR)/usr/
-
-define Build/Configure
-       cd  $(PKG_BUILD_DIR)/; $(TARGET_CONFIGURE_OPTS) $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)\
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include/" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -lImlib2"
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-
-define Package/eterm/install
-       $(INSTALL_DIR) $(1)/usr/{bin,lib}
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Eterm $(1)/usr/bin
-endef
-
-define Package/esetroot/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Esetroot $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,esetroot))
-$(eval $(call BuildPackage,eterm))
diff --git a/XOrg/app/fluxbox/Makefile b/XOrg/app/fluxbox/Makefile
deleted file mode 100644 (file)
index b5d296e..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fluxbox
-PKG_VERSION:=1.0rc3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/fluxbox/
-
-EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
-               CXXLD="$(TARGET_CC)" 
-
-CONFIGURE_ARGS+=--disable-xmb
-
-define Package/fluxbox/Default
-  SECTION:=xorg-wm
-  CATEGORY:=Xorg
-endef
-
-define Package/fluxbox
-$(call Package/fluxbox/Default)
-  DEPENDS:=+xorg-server-essentials +uclibcxx +xterm @DISPLAY_SUPPORT
-  TITLE:=fluxbox window manager
-  MENU:=1
-endef
-
-define Package/fbrun
-$(call Package/fluxbox/Default)
-  DEPENDS:=fluxbox
-  TITLE:=fluxbox tool to run applications
-endef
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) 
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install 
-endef
-
-define Package/fluxbox/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/keys $(1)/usr/share/fluxbox/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/
-       $(CP) files/init $(1)/usr/share/fluxbox/
-       $(CP) files/menu $(1)/usr/share/fluxbox/
-endef
-
-define Package/fbsetbg/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/
-endef
-
-define Package/fbsetroot/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/
-endef
-
-define Package/fbrun/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,fbrun))
-$(eval $(call BuildPackage,fluxbox))
diff --git a/XOrg/app/fluxbox/files/init b/XOrg/app/fluxbox/files/init
deleted file mode 100644 (file)
index 74926d5..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-session.screen0.titlebar.left: Stick 
-session.screen0.titlebar.right:        Minimize Maximize Close 
-session.screen0.tab.width:     64
-session.screen0.tab.alignment: Left
-session.screen0.tab.rotatevertical:    True
-session.screen0.tab.placement: TopLeft
-session.screen0.tab.height:    16
-session.screen0.menu.alpha:    158
-session.screen0.tabs.intitlebar:       false
-session.screen0.toolbar.onTop: False
-session.screen0.toolbar.visible:       true
-session.screen0.toolbar.layer: Desktop
-session.screen0.toolbar.height:        0
-session.screen0.toolbar.autoHide:      false
-session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, systemtray, prevwindow, nextwindow, clock
-session.screen0.toolbar.maxOver:       false
-session.screen0.toolbar.placement:     TopCenter
-session.screen0.toolbar.alpha: 255
-session.screen0.toolbar.widthPercent:  100
-session.screen0.toolbar.onhead:        0
-session.screen0.window.focus.alpha:    255
-session.screen0.window.unfocus.alpha:  34
-session.screen0.iconbar.iconTextPadding:       10l
-session.screen0.iconbar.wheelMode:     Screen
-session.screen0.iconbar.alignment:     Relative
-session.screen0.iconbar.usePixmap:     true
-session.screen0.iconbar.deiconifyMode: Follow
-session.screen0.iconbar.mode:  Workspace
-session.screen0.iconbar.iconWidth:     70
-session.screen0.slit.direction:        Vertical
-session.screen0.slit.autoHide: false
-session.screen0.slit.onTop:    False
-session.screen0.slit.layer:    Dock
-session.screen0.slit.alpha:    255
-session.screen0.slit.maxOver:  false
-session.screen0.slit.placement:        BottomRight
-session.screen0.slit.onhead:   0
-session.screen0.overlay.lineWidth:     1
-session.screen0.overlay.lineStyle:     LineSolid
-session.screen0.overlay.joinStyle:     JoinMiter
-session.screen0.overlay.capStyle:      CapNotLast
-session.screen0.edgeSnapThreshold:     0
-session.screen0.workspaceNames:        one,two,three,
-session.screen0.windowPlacement:       RowSmartPlacement
-session.screen0.windowScrollAction:    
-session.screen0.focusModel:    ClickFocus
-session.screen0.focusLastWindow:       true
-session.screen0.clickRaises:   true
-session.screen0.menuMode:      Delay
-session.screen0.desktopwheeling:       true
-session.screen0.imageDither:   false
-session.screen0.colPlacementDirection: TopToBottom
-session.screen0.rowPlacementDirection: LeftToRight
-session.screen0.resizeMode:    Bottom
-session.screen0.windowMenu:    
-session.screen0.followModel:   Ignore
-session.screen0.decorateTransient:     false
-session.screen0.strftimeFormat:        %a %d %H:%M
-session.screen0.workspacewarping:      true
-session.screen0.menuDelay:     0
-session.screen0.windowScrollReverse:   false
-session.screen0.workspaces:    3
-session.screen0.autoRaise:     false
-session.screen0.sloppywindowgrouping:  true
-session.screen0.reversewheeling:       false
-session.screen0.rootCommand:   ~/.xsession     
-session.screen0.menuDelayClose:        0
-session.screen0.fullMaximization:      false
-session.screen0.tabFocusModel: ClickToTabFocus
-session.screen0.focusNewWindows:       true
-session.screen0.antialias:     true
-session.screen0.showwindowposition:    true
-session.screen0.opaqueMove:    false
-session.titlebar.left: Stick 
-session.titlebar.right:        Minimize Maximize Close 
-session.cacheLife:     5l
-session.ignoreBorder:  false
-session.tabs:  true
-session.doubleClickInterval:   250
-session.tabsAttachArea:        Window
-session.iconbar:       true
-session.imageDither:   True
-session.focusTabMinWidth:      0
-session.modKey:        Mod1
-session.forcePseudoTransparency:       false
-session.autoRaiseDelay:        250
-session.styleFile:     /usr/share/fluxbox/styles/BlueNight
-session.cacheMax:      200l
-session.useMod1:       true
-session.keyFile:       ~/.fluxbox/keys
-session.menuFile:      ~/.fluxbox/menu
-session.tabPadding:    0
-session.groupFile:     ~/.fluxbox/groups
-session.colorsPerChannel:      4
-session.appsFile:      ~/.fluxbox/apps
-session.slitlistFile:  ~/.fluxbox/slitlist
-session.numLayers:     13
-session.opaqueMove:    False
-session.styleOverlay:  ~/.fluxbox/overlay
diff --git a/XOrg/app/fluxbox/files/menu b/XOrg/app/fluxbox/files/menu
deleted file mode 100644 (file)
index 3357552..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[begin] (Fluxbox-OpenWrt)
-      [exec] (xterm) {xterm}
-      [exec]   (vi) {xterm -e vi}
-      [exec]   (xmms) {xmms}
-      [exec]   (alsamixer) {xterm -e alsamixer}
-      [exec]   (vlc) {vlc}
-      [exec]   (xclock) {xclock}
-      [exec]   (xmag) {xmag}
-      [exec]   (xclock) {xclock}
-      [exec]   (xcalc) {xcalc}
-      [exec]   (xpdf) {xpdf}
-      [exec]   (top) {xterm -e top}
-[submenu] (fluxbox menu)
-      [config] (Configure)
-[submenu] (System Styles) {Choose a style...}
-      [stylesdir] (/usr/share/fluxbox/styles)
-[end]
-      [workspaces] (Workspace List)
-[submenu] (Tools)
-      [exec]   (fluxconf) {fluxconf}
-      [exec]   (fluxkeys) {fluxkeys}
-      [exec]   (fluxmenu) {fluxmenu}
-[end]
-      [commanddialog] (Fluxbox Command)
-      [reconfig] (Reload config)
-      [restart] (Restart)
-      [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) 2> /dev/null | xmessage -file - -center}
-      [separator]
-      [exit] (Exit)
-[end]
-[end]
diff --git a/XOrg/app/fluxbox/patches/100-fbrun-compile.patch b/XOrg/app/fluxbox/patches/100-fbrun-compile.patch
deleted file mode 100644 (file)
index 4033423..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- fluxbox-1.0rc3/util/fbrun/Makefile.in.orig 2007-09-17 19:52:52.000000000 +0200
-+++ fluxbox-1.0rc3/util/fbrun/Makefile.in      2007-09-17 19:53:09.000000000 +0200
-@@ -268,7 +268,7 @@
-       done
- fbrun$(EXEEXT): $(fbrun_OBJECTS) $(fbrun_DEPENDENCIES) 
-       @rm -f fbrun$(EXEEXT)
--      $(CXXLINK) $(fbrun_OBJECTS) $(fbrun_LDADD) $(LIBS)
-+      $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbrun_OBJECTS) $(fbrun_LDADD) $(LDFLAGS) $(LIBS)
- mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
diff --git a/XOrg/app/fluxbox/patches/120-fbsetroot-compile.patch b/XOrg/app/fluxbox/patches/120-fbsetroot-compile.patch
deleted file mode 100644 (file)
index e56ac84..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN fluxbox-1.0rc3.orig/util/Makefile.in fluxbox-1.0rc3/util/Makefile.in
---- fluxbox-1.0rc3.orig/util/Makefile.in       2007-09-17 19:56:45.000000000 +0200
-+++ fluxbox-1.0rc3/util/Makefile.in    2007-09-17 19:58:11.000000000 +0200
-@@ -301,7 +301,7 @@
-       done
- fbsetroot$(EXEEXT): $(fbsetroot_OBJECTS) $(fbsetroot_DEPENDENCIES) 
-       @rm -f fbsetroot$(EXEEXT)
--      $(CXXLINK) $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LIBS)
-+      $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LDFLAGS) $(LIBS)
- fluxbox-update_configs$(EXEEXT): $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_DEPENDENCIES) 
-       @rm -f fluxbox-update_configs$(EXEEXT)
-       $(CXXLINK) $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_LDADD) $(LIBS)
diff --git a/XOrg/app/fontconfig/Makefile b/XOrg/app/fontconfig/Makefile
deleted file mode 100644 (file)
index b72a056..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-# 
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fontconfig
-PKG_VERSION:=2.3.95
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://fontconfig.org/release/
-PKG_FIXUP=libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fontconfig
-  SECTION:=xorg-util
-  CATEGORY:=Xorg
-  SUBMENU:=font-utils
-  TITLE:=fontconfig
-  DEPENDS:=+xorg-server-essentials +libexpat 
-endef
-
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --disable-docs, \
-               ac_cv_prog_HASDOCBOOK=no \
-       )
-endef
-
-define Build/Compile
-       $(foreach dir,fc-case fc-lang fc-glyphname src fc-cache fc-list, $(MAKE) -C $(PKG_BUILD_DIR)/$(dir) CFLAGS="-I$(STAGING_DIR)/usr/include"  \
-                       CPPFLAGS="" LDFLAGS="-L$(STAGING_DIR)/usr/lib";)
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" DOCSRC="" install
-endef
-
-define Package/fontconfig/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-       $(INSTALL_DIR) $(1)/etc/fonts/conf.d
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/fonts/fonts.* $(1)/etc/fonts
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/fonts/conf.d/* $(1)/etc/fonts/conf.d
-endef
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/{lib,include}
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-endef
-
-$(eval $(call BuildPackage,fontconfig))
diff --git a/XOrg/app/iceauth/Makefile b/XOrg/app/iceauth/Makefile
deleted file mode 100644 (file)
index 284f640..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=iceauth
-PKG_NAME:=iceauth
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-_DEPEND:=
-ifneq (iceauth,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-PKG_INSTALL=1
-
-define Package/iceauth
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:= @DISPLAY_SUPPORT
-  TITLE:=iceauth
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-define Package/iceauth/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
-$(eval $(call BuildPackage,iceauth))
diff --git a/XOrg/app/matchbox/Makefile b/XOrg/app/matchbox/Makefile
deleted file mode 100644 (file)
index 282bde4..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=matchbox-window-manager
-PKG_VERSION:=1.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://matchbox-project.org/sources/matchbox-window-manager/$(PKG_VERSION)
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/matchbox
-  TITLE:=matchbox window manager
-  SECTION:=xorg-wm
-  CATEGORY:=Xorg
-  DEPENDS:=+xorg-server-essentials +zlib +libfreetype +fontconfig +libmatchbox @DISPLAY_SUPPORT
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               LIBMB_LIBS="-L$(STAGING_DIR)/usr/lib -lfontconfig -lXrender -lz -lexpat -lfreetype -lXft -lmb -lX11 -lXext -lXau -lXdmcp -lpng12" \
-               all install 
-endef
-
-define Package/matchbox/install
-       $(INSTALL_DIR) $(1)/
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-$(eval $(call BuildPackage,matchbox))
diff --git a/XOrg/app/packages b/XOrg/app/packages
deleted file mode 100644 (file)
index 8237c16..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-xcalc-1.0.2|+libX11+font-misc-misc
-xclipboard-1.0.1|+libX11
-xdm-1.1.6|+libX11
-xeyes-1.0.1|+libX11
-xinit-1.0.5|+libX11
-xlogo-1.0.1|+libX11
-xmessage-1.0.2|+libX11
-xset-1.0.3|+libX11
-xsetroot-1.0.2|+libX11
diff --git a/XOrg/app/patches/xlogo/100-link.patch b/XOrg/app/patches/xlogo/100-link.patch
deleted file mode 100644 (file)
index 7883785..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xlogo-X11R7.0-1.0.1.orig/Makefile.in xlogo-X11R7.0-1.0.1/Makefile.in
---- xlogo-X11R7.0-1.0.1.orig/Makefile.in       2007-09-17 23:28:25.000000000 +0200
-+++ xlogo-X11R7.0-1.0.1/Makefile.in    2007-09-17 23:29:17.000000000 +0200
-@@ -177,7 +177,7 @@
- bin_PROGRAMS = xlogo
- xlogo_CFLAGS = $(XLOGO_CFLAGS)
--xlogo_LDADD = $(XLOGO_LIBS)
-+xlogo_LDADD = $(XLOGO_LIBS) -lXrender
- xlogo_SOURCES = \
-         Logo.c \
diff --git a/XOrg/app/template.mk b/XOrg/app/template.mk
deleted file mode 100644 (file)
index d650558..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org 
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=@BASE_NAME@
-PKG_NAME:=@NAME@
-PKG_RELEASE:=2
-PKG_VERSION:=@VER@
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-_DEPEND:=@DEP@
-ifneq (@NAME@,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/@NAME@
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
-  TITLE:=@NAME@
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-ifeq (@NAME@,xdm)
-CONFIGURE_ARGS+=--with-random-device=/dev/urandom
-endif
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
-endef
-
-define Package/@NAME@/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
-$(eval $(call BuildPackage,@NAME@))
diff --git a/XOrg/app/xcalc/Makefile b/XOrg/app/xcalc/Makefile
deleted file mode 100644 (file)
index d2abb1b..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org 
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xcalc
-PKG_NAME:=xcalc
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-_DEPEND:= +libX11 +font-misc-misc
-ifneq (xcalc,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xcalc
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
-  TITLE:=xcalc
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-ifeq (xcalc,xdm)
-CONFIGURE_ARGS+=--with-random-device=/dev/urandom
-endif
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
-endef
-
-define Package/xcalc/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
-$(eval $(call BuildPackage,xcalc))
diff --git a/XOrg/app/xclipboard/Makefile b/XOrg/app/xclipboard/Makefile
deleted file mode 100644 (file)
index 7eab191..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org 
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xclipboard
-PKG_NAME:=xclipboard
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-_DEPEND:= +libX11
-ifneq (xclipboard,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xclipboard
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
-  TITLE:=xclipboard
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-ifeq (xclipboard,xdm)
-CONFIGURE_ARGS+=--with-random-device=/dev/urandom
-endif
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
-endef
-
-define Package/xclipboard/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
-$(eval $(call BuildPackage,xclipboard))
diff --git a/XOrg/app/xdm/Makefile b/XOrg/app/xdm/Makefile
deleted file mode 100644 (file)
index 169a3c1..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org 
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xdm
-PKG_NAME:=xdm
-PKG_RELEASE:=2
-PKG_VERSION:=1.1.6
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-_DEPEND:= +libX11
-ifneq (xdm,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xdm
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
-  TITLE:=xdm
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-ifeq (xdm,xdm)
-CONFIGURE_ARGS+=--with-random-device=/dev/urandom
-endif
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
-endef
-
-define Package/xdm/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
-$(eval $(call BuildPackage,xdm))
diff --git a/XOrg/app/xeyes/Makefile b/XOrg/app/xeyes/Makefile
deleted file mode 100644 (file)
index d0c6b7e..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org 
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xeyes
-PKG_NAME:=xeyes
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-_DEPEND:= +libX11
-ifneq (xeyes,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xeyes
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
-  TITLE:=xeyes
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-ifeq (xeyes,xdm)
-CONFIGURE_ARGS+=--with-random-device=/dev/urandom
-endif
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
-endef
-
-define Package/xeyes/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
-$(eval $(call BuildPackage,xeyes))
diff --git a/XOrg/app/xine-ui/Makefile b/XOrg/app/xine-ui/Makefile
deleted file mode 100644 (file)
index c61a5d1..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xine-ui
-PKG_VERSION:=0.99.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/xine/
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-EXTRA_LDLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lnotimpl
-
-define Package/xine-ui
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  TITLE:=xine user interface
-  DEPENDS:=+xine-lib +libpng +curl +libiconv +libXv +libICE +libXxf86vm
-endef
-
-CONFIGURE_VARS+= \
-       PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
-
-EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-CONFIGURE_ARGS+=--without-aalib \
-                       --without-libcaca \
-                       --disable-lirc \
-                       --without-readline
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) X_LIBS="-L$(STAGING_DIR)/usr/lib -lnotimpl -lfreetype"
-       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
-endef
-
-define Package/xine-ui/install
-       $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/share/xine \
-               $(PKG_INSTALL_DIR)/usr/share/pixmaps \
-               $(1)/usr/share/
-endef
-
-$(eval $(call BuildPackage,xine-ui))
diff --git a/XOrg/app/xine-ui/patches/100-cflags.patch b/XOrg/app/xine-ui/patches/100-cflags.patch
deleted file mode 100644 (file)
index 797f8b3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xine-ui-0.99.4/configure
-===================================================================
---- xine-ui-0.99.4.orig/configure      2007-12-23 01:23:31.650316801 +0100
-+++ xine-ui-0.99.4/configure   2007-12-23 01:23:42.194917702 +0100
-@@ -31351,7 +31351,7 @@
- SYSCONF_DIR=`eval echo "$sysconfdir"`
--INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit -I$(prefix)/include $(INTLDIR)'
-+INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit $(INTLDIR)'
diff --git a/XOrg/app/xine-ui/patches/110-xitk.patch b/XOrg/app/xine-ui/patches/110-xitk.patch
deleted file mode 100644 (file)
index aa2ba4a..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: xine-ui-0.99.4/src/xitk/xine-toolkit/xitk.c
-===================================================================
---- xine-ui-0.99.4.orig/src/xitk/xine-toolkit/xitk.c   2007-12-23 01:26:05.991112183 +0100
-+++ xine-ui-0.99.4/src/xitk/xine-toolkit/xitk.c        2007-12-23 01:26:10.819387329 +0100
-@@ -45,11 +45,6 @@
- #include <sys/time.h>
- #include <locale.h>
--
--#ifdef __linux__
--#include <execinfo.h>
--#endif
--
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
- #include <X11/keysym.h>
diff --git a/XOrg/app/xinit/Makefile b/XOrg/app/xinit/Makefile
deleted file mode 100644 (file)
index 8419df4..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xinit
-PKG_NAME:=xinit
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.5
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_INSTALL=1
-
-define Package/xinit
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=+libX11 @DISPLAY_SUPPORT
-  TITLE:=xinit
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -sf xinit startx
-endef
-
-$(eval $(call BuildPackage,xinit))
diff --git a/XOrg/app/xlogo/Makefile b/XOrg/app/xlogo/Makefile
deleted file mode 100644 (file)
index f0a2618..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org 
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xlogo
-PKG_NAME:=xlogo
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-_DEPEND:= +libX11
-ifneq (xlogo,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xlogo
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
-  TITLE:=xlogo
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-ifeq (xlogo,xdm)
-CONFIGURE_ARGS+=--with-random-device=/dev/urandom
-endif
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
-endef
-
-define Package/xlogo/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
-$(eval $(call BuildPackage,xlogo))
diff --git a/XOrg/app/xlogo/patches/100-link.patch b/XOrg/app/xlogo/patches/100-link.patch
deleted file mode 100644 (file)
index 7883785..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xlogo-X11R7.0-1.0.1.orig/Makefile.in xlogo-X11R7.0-1.0.1/Makefile.in
---- xlogo-X11R7.0-1.0.1.orig/Makefile.in       2007-09-17 23:28:25.000000000 +0200
-+++ xlogo-X11R7.0-1.0.1/Makefile.in    2007-09-17 23:29:17.000000000 +0200
-@@ -177,7 +177,7 @@
- bin_PROGRAMS = xlogo
- xlogo_CFLAGS = $(XLOGO_CFLAGS)
--xlogo_LDADD = $(XLOGO_LIBS)
-+xlogo_LDADD = $(XLOGO_LIBS) -lXrender
- xlogo_SOURCES = \
-         Logo.c \
diff --git a/XOrg/app/xmessage/Makefile b/XOrg/app/xmessage/Makefile
deleted file mode 100644 (file)
index 5e4db1c..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org 
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xmessage
-PKG_NAME:=xmessage
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-_DEPEND:= +libX11
-ifneq (xmessage,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xmessage
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
-  TITLE:=xmessage
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-ifeq (xmessage,xdm)
-CONFIGURE_ARGS+=--with-random-device=/dev/urandom
-endif
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
-endef
-
-define Package/xmessage/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
-$(eval $(call BuildPackage,xmessage))
diff --git a/XOrg/app/xmms/Makefile b/XOrg/app/xmms/Makefile
deleted file mode 100644 (file)
index b4b338d..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xmms
-PKG_VERSION:=1.2.10
-PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.xmms.org/files/1.2.x/
-#PKG_INSTALL_MAN:=$(PKG_INSTALL_DIR)/usr/man
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xmms
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=+xorg-server-essentials +alsa-lib +gtk1 +libnotimpl
-  TITLE:=XMMS audio player
-endef
-
-define Package/xmms/description
-       Popular music player for X
-endef
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lnotimpl" \
-       sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
-       sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
-       --disable-mikmod \
-       --disable-vorbis \
-       --disable-esd
-
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/gtk-1.2 -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include
-TARGET_LDFLAGS += -lgthread
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(TARGET_CONFIGURE_OPTS) \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR=$(PKG_INSTALL_DIR) \
-               LIBTOOL="libtool --tag=CC" \
-               all install
-endef
-
-define Package/xmms/install
-       $(call pkg_install_files,/usr/lib/libxmms.so /usr/lib/libxmms.so.1 /usr/lib/libxmms.so.1.3.1 /usr/share/xmms/wmxmms.xpm,$(PKG_INSTALL_DIR),$(1))
-       $(call pkg_install_bin,/usr/bin/xmms,$(PKG_INSTALL_DIR),$(1))
-endef
-
-$(eval $(call BuildPackage,xmms))
diff --git a/XOrg/app/xmms/patches/xmms-1.2.10-gcc4-1.patch b/XOrg/app/xmms/patches/xmms-1.2.10-gcc4-1.patch
deleted file mode 100644 (file)
index d268cac..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2005-08-21
-Initial Package Version: 1.2.10
-Upstream Status:         Submitted to XMMS Bugzilla
-Origin:                  Con Kolivas (submitted to XMMS Bugzilla)
-                         http://bugs.xmms.org/show_bug.cgi?id=2225
-Description:             Fixes build issue when using GCC-4
-
-
-Index: xmms-1.2.10/General/ir/ir.h
-===================================================================
---- xmms-1.2.10.orig/General/ir/ir.h   2001-03-06 00:17:44.000000000 +1100
-+++ xmms-1.2.10/General/ir/ir.h        2005-08-07 18:07:23.000000000 +1000
-@@ -49,8 +49,6 @@ typedef struct
- }
- irConfig;
--extern pthread_t irapp_thread;
--extern gboolean keepGoing;
- extern irConfig ircfg;
- extern gboolean irconf_is_going;
-
-Index: xmms-1.2.10/Output/esd/esdout.h
-===================================================================
---- xmms-1.2.10.orig/Output/esd/esdout.h       2001-12-03 13:38:42.000000000 +1100
-+++ xmms-1.2.10/Output/esd/esdout.h    2005-08-07 17:59:45.000000000 +1000
-@@ -58,6 +58,7 @@ typedef struct
- ESDConfig;
- extern ESDConfig esd_cfg;
-+extern void esdout_reset_playerid(void);
- void esdout_init(void);
- void esdout_about(void);
-
diff --git a/XOrg/app/xmms/pathes b/XOrg/app/xmms/pathes
deleted file mode 100644 (file)
index aca7970..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- xmms-1.2.10.orig/libxmms/Makefile  2007-10-06 03:35:15.000000000 +0200
-+++ xmms-1.2.10/libxmms/Makefile       2007-10-06 04:05:21.000000000 +0200
-@@ -255,6 +255,9 @@
-       done
- libxmms.la: $(libxmms_la_OBJECTS) $(libxmms_la_DEPENDENCIES) 
-       $(LINK) -rpath $(libdir) $(libxmms_la_LDFLAGS) $(libxmms_la_OBJECTS) $(libxmms_la_LIBADD) $(LIBS)
-+      $(CCLD) -shared  configfile.lo xmmsctrl.lo dirbrowser.lo util.lo formatter.lo titlestring.lo xentry.lo xconvert.lo \
-+              -Wl,--whole-archive -Wl,--no-whole-archive ${libxmms_la_LIBADD} \
-+              -lm  -Wl,-rpath-link=/usr/src/owrt-X2/staging_dir/i686/usr/lib -Wl,-soname -Wl,libxmms.so.1 -o .libs/libxmms.so.1.3.1
- mostlyclean-compile:
-       -rm -f *.$(OBJEXT) core *.core
---- xmms-1.2.10.orig/xmms/Makefile     2007-10-06 03:35:14.000000000 +0200
-+++ xmms-1.2.10/xmms/Makefile  2007-10-06 03:42:14.000000000 +0200
-@@ -225,8 +225,7 @@
- bin_PROGRAMS = xmms
- xmms_LDFLAGS = -export-dynamic
--xmms_LDADD = -L/usr/src/owrt-X2/staging_dir/i686/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lgthread -lglib -lpthread -ldl -lXext -lX11 -lm -lpthread -lSM -lICE -lXxf86vm \
-- $(top_builddir)/libxmms/libxmms.la 
-+xmms_LDADD = -L../libxmms/.libs/ -L/usr/src/owrt-X2/staging_dir/i686/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lgthread -lglib -lpthread -ldl -lXext -lX11 -lm -lpthread -lSM -lICE -lXxf86vm -lxmms 
- INCLUDES = -I/usr/include/gtk-1.2 -I/usr/src/owrt-X2/staging_dir/i686/usr/include/glib-1.2 -I/usr/src/owrt-X2/staging_dir/i686/usr/lib/glib/include -D_REENTRANT -I/usr/src/owrt-X2/staging_dir/i686/usr/include/ -Os -pipe -funit-at-a-time -fhonour-copts  -Wall -Wpointer-arith -finline-functions -fomit-frame-pointer -ffast-math -funroll-all-loops -DDATA_DIR=\"/usr/share/xmms\" -DPLUGIN_DIR=\"${exec_prefix}/lib/xmms\" -DPLUGINSUBS=\"Output\",\"Input\",\"Effect\",\"General\",\"Visualization\" -DLOCALEDIR=\"/usr/share/locale\" -DI386_ASSEM \
-@@ -341,7 +340,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-       $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(xmms_SOURCES)
- HEADERS = $(xmmsinclude_HEADERS)
diff --git a/XOrg/app/xset/Makefile b/XOrg/app/xset/Makefile
deleted file mode 100644 (file)
index dbab0be..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org 
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xset
-PKG_NAME:=xset
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-_DEPEND:= +libX11
-ifneq (xset,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xset
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT
-  TITLE:=xset
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-ifeq (xset,xdm)
-CONFIGURE_ARGS+=--with-random-device=/dev/urandom
-endif
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
-endef
-
-define Package/xset/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
-$(eval $(call BuildPackage,xset))
diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile
deleted file mode 100644 (file)
index 6a39b4f..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xsetroot
-PKG_NAME:=xsetroot
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-_DEPEND:= +libX11 +xbitmaps
-ifneq (xsetroot,xinit)
-_DEPEND+=xorg-server-essentials
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-PKG_INSTALL=1
-
-define Package/xsetroot
-  SECTION:=xorg-app
-  CATEGORY:=Xorg
-  SUBMENU:=app
-  DEPENDS:=+libX11 +xbitmaps @DISPLAY_SUPPORT
-  TITLE:=xsetroot
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-define Package/xsetroot/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
-       rm -rf $(1)/usr/man/
-endef
-
-$(eval $(call BuildPackage,xsetroot))
diff --git a/XOrg/app/xterm-233/Makefile b/XOrg/app/xterm-233/Makefile
deleted file mode 100644 (file)
index 356e3e2..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xterm
-PKG_VERSION:=223
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/extras/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xterm
-  SECTION:=xorg-extra
-  CATEGORY:=Xorg
-  SUBMENU:=terminals
-  TITLE:=xterm
-  DEPENDS:=+xorg-server-essentials +libncurses @DISPLAY_SUPPORT
-endef
-
-define Build/Configure
-       sed -e "s%/usr/contrib/X11R6%${STAGING_DIR}/usr/lib%g" -i $(PKG_BUILD_DIR)/configure
-       cd  $(PKG_BUILD_DIR)/; $(TARGET_CONFIGURE_OPTS) $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               --host=$(GNU_TARGET_NAME) \
-               --x-includes=$(STAGING_DIR)/usr/include/  \
-               --x-libraries=$(STAGING_DIR)/usr/lib/ \
-               LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) 
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
-endef
-
-define Package/xterm/install
-       $(INSTALL_DIR) $(1)/usr/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin $(1)/usr/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/
-endef
-
-$(eval $(call BuildPackage,xterm))
diff --git a/XOrg/app/xterm-233/patches/100-install.patch b/XOrg/app/xterm-233/patches/100-install.patch
deleted file mode 100644 (file)
index 1d783e3..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xterm-223.orig/Makefile.in xterm-223/Makefile.in
---- xterm-223.orig/Makefile.in 2007-09-17 11:56:45.000000000 +0200
-+++ xterm-223/Makefile.in      2007-09-17 11:57:33.000000000 +0200
-@@ -150,7 +150,7 @@
- @MAY_SETUID@  $(SHELL) $(srcdir)/sinstall.sh @SINSTALL_OPTS@ "$(INSTALL_PROGRAM)" xterm$x  @XTERM_PATH@ $(BINDIR)/$(binary_xterm)
- @NOT_SETUID@  $(INSTALL_PROGRAM) xterm$x $(BINDIR)/$(binary_xterm)
-       $(INSTALL_PROGRAM) -m  755 resize$x $(BINDIR)/$(binary_resize)
--      @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_uxterm)"; \
-+#     @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_uxterm)"; \
-               if test "$(binary_xterm)" != "xterm"; then \
-                       name="$(binary_xterm)"; \
-                       sed -e "s,=xterm,=$$name," $(srcdir)/uxterm >uxterm.tmp; \
diff --git a/XOrg/data/xbitmaps/Makefile b/XOrg/data/xbitmaps/Makefile
deleted file mode 100644 (file)
index 7c7ccb1..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xbitmaps
-PKG_NAME:=xbitmaps
-PKG_RELEASE:=1
-PKG_VERSION:=1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/data/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-#PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xbitmaps
-  SECTION:=xorg-data
-  CATEGORY:=Xorg
-  SUBMENU:=data
-  DEPENDS:=@DISPLAY_SUPPORT
-  TITLE:=xbitmaps
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-#ifeq (libXext,libX11)
-# CONFIGURE_ARGS_XTRA=--without-xcb
-#endif
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) ; \
-       fi \
-       )
-endef
-
-define Package/xbitmaps/install/Default
-       $(INSTALL_DIR) $(1)/usr/include/X11/bitmaps
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* $(1)/usr/include/X11/bitmaps
-endef
-
-$(eval $(call BuildPackage,xbitmaps))
diff --git a/XOrg/driver/packages b/XOrg/driver/packages
deleted file mode 100644 (file)
index 8c4f393..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-xf86-input-evdev-1.1.2|
-xf86-input-keyboard-1.2.2|
-xf86-input-mouse-1.2.2|
-xf86-video-fbdev-0.3.1|
-xf86-video-vesa-1.3.0|
-xf86-video-vga-4.1.0|
-xf86-video-intel-2.1.1|
-xf86-video-nv-2.1.3|
-xf86-video-ati-6.6.3|@BROKEN
diff --git a/XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch b/XOrg/driver/patches/xf86-input-evdev/001-fix-compile.patch
deleted file mode 100644 (file)
index adf20d1..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
---- xf86-input-evdev-1.1.2.orig/src/evdev.c.orig       2008-08-17 19:24:37.000000000 +0200
-+++ xf86-input-evdev-1.1.2/src/evdev.c 2008-08-17 19:33:40.000000000 +0200
-@@ -234,10 +234,6 @@
-           else
-               return !Success;
-           break;
--      case SendCoreEvents:
--      case DontSendCoreEvents:
--          xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
--          break;
-       default:
-           return !Success;
-     }
-@@ -264,7 +260,9 @@
-     pInfo->device_control = EvdevProc;
-     pInfo->read_input = EvdevReadInput;
-     pInfo->switch_mode = EvdevSwitchMode;
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-     pInfo->motion_history_proc = xf86GetMotionEvents;
-+#endif
-     pInfo->conf_idev = driver->dev;
-     pInfo->private = device;
-@@ -451,8 +449,6 @@
-     0
- };
--#ifdef XFree86LOADER
--
- static void
- EvdevUnplug(pointer   p)
- {
-@@ -474,7 +470,7 @@
-     MODULEVENDORSTRING,
-     MODINFOSTRING1,
-     MODINFOSTRING2,
--    0, /* Missing from SDK: XORG_VERSION_CURRENT, */
-+    XORG_VERSION_CURRENT,
-     1, 1, 0,
-     ABI_CLASS_XINPUT,
-     ABI_XINPUT_VERSION,
-@@ -488,4 +484,3 @@
-     EvdevPlug,
-     EvdevUnplug
- };
--#endif /* XFree86LOADER */
diff --git a/XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch b/XOrg/driver/patches/xf86-input-evdev/002-mipointer-fix.patch
deleted file mode 100644 (file)
index 5397577..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN xf86-input-evdev-1.1.2.orig/src/evdev_axes.c xf86-input-evdev-1.1.2/src/evdev_axes.c
---- xf86-input-evdev-1.1.2.orig/src/evdev_axes.c       2008-08-28 10:59:09.000000000 +0200
-+++ xf86-input-evdev-1.1.2/src/evdev_axes.c    2008-08-28 10:55:52.000000000 +0200
-@@ -532,8 +532,14 @@
-       return Success;
-     if (!InitValuatorClassDeviceStruct(device, axes,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1
-+                                       GetMotionHistroy(),
-+                                       GetMotionHistorSize(),
-+#else
-                                        miPointerGetMotionEvents,
-+                                       miPointerGetMotionBufferSize(),
-+#endif
-+                                       0))
--                                       miPointerGetMotionBufferSize(), 0))
-         return !Success;
-     for (i = 0; i < axes; i++) {
-@@ -543,8 +549,9 @@
-     if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
-         return !Success;
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
--
-     xf86MotionHistoryAllocate (pInfo);
-+#endif
-     return Success;
- }
diff --git a/XOrg/driver/patches/xf86-video-vesa/100-include-fix.patch b/XOrg/driver/patches/xf86-video-vesa/100-include-fix.patch
deleted file mode 100644 (file)
index ba8c084..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xf86-video-vesa-X11R7.2-1.3.0.orig/src/Makefile.in xf86-video-vesa-X11R7.2-1.3.0/src/Makefile.in
---- xf86-video-vesa-X11R7.2-1.3.0.orig/src/Makefile.in 2007-09-15 22:48:37.000000000 +0200
-+++ xf86-video-vesa-X11R7.2-1.3.0/src/Makefile.in      2007-09-15 22:50:43.000000000 +0200
-@@ -131,7 +131,7 @@
- FFLAGS = @FFLAGS@
- FILE_MAN_DIR = @FILE_MAN_DIR@
- FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
--INCLUDES = @INCLUDES@
-+INCLUDES = 
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/XOrg/driver/template.mk b/XOrg/driver/template.mk
deleted file mode 100644 (file)
index 3b9db20..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=@BASE_NAME@
-PKG_NAME:=@NAME@
-PKG_RELEASE:=2
-PKG_VERSION:=@VER@
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/@NAME@
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server @DEP@ @DISPLAY_SUPPORT
-  TITLE:=@NAME@
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/@NAME@/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,@NAME@))
diff --git a/XOrg/driver/xf86-input-evdev/Makefile b/XOrg/driver/xf86-input-evdev/Makefile
deleted file mode 100644 (file)
index 7d558f8..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xf86
-PKG_NAME:=xf86-input-evdev
-PKG_RELEASE:=2
-PKG_VERSION:=1.1.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xf86-input-evdev
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
-  TITLE:=xf86-input-evdev
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-input-evdev/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-input-evdev))
diff --git a/XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch b/XOrg/driver/xf86-input-evdev/patches/001-fix-compile.patch
deleted file mode 100644 (file)
index adf20d1..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
---- xf86-input-evdev-1.1.2.orig/src/evdev.c.orig       2008-08-17 19:24:37.000000000 +0200
-+++ xf86-input-evdev-1.1.2/src/evdev.c 2008-08-17 19:33:40.000000000 +0200
-@@ -234,10 +234,6 @@
-           else
-               return !Success;
-           break;
--      case SendCoreEvents:
--      case DontSendCoreEvents:
--          xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
--          break;
-       default:
-           return !Success;
-     }
-@@ -264,7 +260,9 @@
-     pInfo->device_control = EvdevProc;
-     pInfo->read_input = EvdevReadInput;
-     pInfo->switch_mode = EvdevSwitchMode;
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-     pInfo->motion_history_proc = xf86GetMotionEvents;
-+#endif
-     pInfo->conf_idev = driver->dev;
-     pInfo->private = device;
-@@ -451,8 +449,6 @@
-     0
- };
--#ifdef XFree86LOADER
--
- static void
- EvdevUnplug(pointer   p)
- {
-@@ -474,7 +470,7 @@
-     MODULEVENDORSTRING,
-     MODINFOSTRING1,
-     MODINFOSTRING2,
--    0, /* Missing from SDK: XORG_VERSION_CURRENT, */
-+    XORG_VERSION_CURRENT,
-     1, 1, 0,
-     ABI_CLASS_XINPUT,
-     ABI_XINPUT_VERSION,
-@@ -488,4 +484,3 @@
-     EvdevPlug,
-     EvdevUnplug
- };
--#endif /* XFree86LOADER */
diff --git a/XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch b/XOrg/driver/xf86-input-evdev/patches/002-mipointer-fix.patch
deleted file mode 100644 (file)
index 5397577..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN xf86-input-evdev-1.1.2.orig/src/evdev_axes.c xf86-input-evdev-1.1.2/src/evdev_axes.c
---- xf86-input-evdev-1.1.2.orig/src/evdev_axes.c       2008-08-28 10:59:09.000000000 +0200
-+++ xf86-input-evdev-1.1.2/src/evdev_axes.c    2008-08-28 10:55:52.000000000 +0200
-@@ -532,8 +532,14 @@
-       return Success;
-     if (!InitValuatorClassDeviceStruct(device, axes,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1
-+                                       GetMotionHistroy(),
-+                                       GetMotionHistorSize(),
-+#else
-                                        miPointerGetMotionEvents,
-+                                       miPointerGetMotionBufferSize(),
-+#endif
-+                                       0))
--                                       miPointerGetMotionBufferSize(), 0))
-         return !Success;
-     for (i = 0; i < axes; i++) {
-@@ -543,8 +549,9 @@
-     if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
-         return !Success;
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
--
-     xf86MotionHistoryAllocate (pInfo);
-+#endif
-     return Success;
- }
diff --git a/XOrg/driver/xf86-input-keyboard/Makefile b/XOrg/driver/xf86-input-keyboard/Makefile
deleted file mode 100644 (file)
index 0605373..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xf86
-PKG_NAME:=xf86-input-keyboard
-PKG_RELEASE:=2
-PKG_VERSION:=1.2.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xf86-input-keyboard
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
-  TITLE:=xf86-input-keyboard
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-input-keyboard/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-input-keyboard))
diff --git a/XOrg/driver/xf86-input-mouse/Makefile b/XOrg/driver/xf86-input-mouse/Makefile
deleted file mode 100644 (file)
index e3d18f6..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xf86
-PKG_NAME:=xf86-input-mouse
-PKG_RELEASE:=2
-PKG_VERSION:=1.2.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xf86-input-mouse
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
-  TITLE:=xf86-input-mouse
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-input-mouse/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-input-mouse))
diff --git a/XOrg/driver/xf86-video-ati/Makefile b/XOrg/driver/xf86-video-ati/Makefile
deleted file mode 100644 (file)
index f746556..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xf86
-PKG_NAME:=xf86-video-ati
-PKG_RELEASE:=2
-PKG_VERSION:=6.6.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xf86-video-ati
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server @BROKEN @DISPLAY_SUPPORT
-  TITLE:=xf86-video-ati
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-video-ati/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-video-ati))
diff --git a/XOrg/driver/xf86-video-fbdev/Makefile b/XOrg/driver/xf86-video-fbdev/Makefile
deleted file mode 100644 (file)
index 45d195d..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xf86
-PKG_NAME:=xf86-video-fbdev
-PKG_RELEASE:=2
-PKG_VERSION:=0.3.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xf86-video-fbdev
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
-  TITLE:=xf86-video-fbdev
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-video-fbdev/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-video-fbdev))
diff --git a/XOrg/driver/xf86-video-geode/Makefile b/XOrg/driver/xf86-video-geode/Makefile
deleted file mode 100644 (file)
index ecab08c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xf86-video-geode
-PKG_RELEASE:=1
-PKG_VERSION:=2.10.1
-
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=e307ab55a2a81d7868506df789f76dfb
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_INSTALL=1
-
-define Package/xf86-video-geode
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server @DISPLAY_SUPPORT
-  TITLE:=xf86-video-geode
-  URL:=http://xorg.freedesktop.org/
-endef
-
-EXTRA_CFLAGS:= \
-       -I$(STAGING_DIR)/usr/include/xorg \
-       -I$(STAGING_DIR)/usr/include/X11 \
-
-define Package/xf86-video-geode/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-video-geode))
diff --git a/XOrg/driver/xf86-video-intel/Makefile b/XOrg/driver/xf86-video-intel/Makefile
deleted file mode 100644 (file)
index 31f3744..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xf86
-PKG_NAME:=xf86-video-intel
-PKG_RELEASE:=2
-PKG_VERSION:=2.1.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xf86-video-intel
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
-  TITLE:=xf86-video-intel
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-video-intel/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-video-intel))
diff --git a/XOrg/driver/xf86-video-intel/patches/100-sdkdir.patch b/XOrg/driver/xf86-video-intel/patches/100-sdkdir.patch
deleted file mode 100644 (file)
index 1300a6a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac xf86-video-i810-X11R7.2-1.6.5/configure.ac
---- xf86-video-i810-X11R7.2-1.6.5.orig/configure.ac    2007-09-21 03:54:25.000000000 +0200
-+++ xf86-video-i810-X11R7.2-1.6.5/configure.ac 2007-09-21 03:55:08.000000000 +0200
-@@ -72,7 +72,8 @@
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+sdkdir=${SDKDIR}
-+#$(pkg-config --variable=sdkdir xorg-server)
- # Checks for libraries.
diff --git a/XOrg/driver/xf86-video-nv/Makefile b/XOrg/driver/xf86-video-nv/Makefile
deleted file mode 100644 (file)
index b8dccc9..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xf86
-PKG_NAME:=xf86-video-nv
-PKG_RELEASE:=2
-PKG_VERSION:=2.1.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xf86-video-nv
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
-  TITLE:=xf86-video-nv
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-video-nv/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-video-nv))
diff --git a/XOrg/driver/xf86-video-vesa/Makefile b/XOrg/driver/xf86-video-vesa/Makefile
deleted file mode 100644 (file)
index 61f834e..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xf86
-PKG_NAME:=xf86-video-vesa
-PKG_RELEASE:=2
-PKG_VERSION:=1.3.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xf86-video-vesa
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
-  TITLE:=xf86-video-vesa
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-video-vesa/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-video-vesa))
diff --git a/XOrg/driver/xf86-video-vesa/patches/100-include-fix.patch b/XOrg/driver/xf86-video-vesa/patches/100-include-fix.patch
deleted file mode 100644 (file)
index ba8c084..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xf86-video-vesa-X11R7.2-1.3.0.orig/src/Makefile.in xf86-video-vesa-X11R7.2-1.3.0/src/Makefile.in
---- xf86-video-vesa-X11R7.2-1.3.0.orig/src/Makefile.in 2007-09-15 22:48:37.000000000 +0200
-+++ xf86-video-vesa-X11R7.2-1.3.0/src/Makefile.in      2007-09-15 22:50:43.000000000 +0200
-@@ -131,7 +131,7 @@
- FFLAGS = @FFLAGS@
- FILE_MAN_DIR = @FILE_MAN_DIR@
- FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
--INCLUDES = @INCLUDES@
-+INCLUDES = 
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/XOrg/driver/xf86-video-vga/Makefile b/XOrg/driver/xf86-video-vga/Makefile
deleted file mode 100644 (file)
index 2013a06..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=xf86
-PKG_NAME:=xf86-video-vga
-PKG_RELEASE:=2
-PKG_VERSION:=4.1.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/driver
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xf86-video-vga
-  SECTION:=xorg-driver
-  CATEGORY:=Xorg
-  SUBMENU:=driver
-  DEPENDS:=+xorg-server  @DISPLAY_SUPPORT
-  TITLE:=xf86-video-vga
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
-endef
-
-EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
-               -I$(STAGING_DIR)/usr/include/X11/ \
-               -I$(STAGING_DIR)/usr/include/ \
-               -I$(STAGING_DIR)/include/
-
-EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
-
-acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
-
-CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
-       sdkdir=$(STAGING_DIR) 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
-               sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) \
-               CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
-       fi \
-       )
-endef
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf
-endef
-
-define Package/xf86-video-vga/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xf86-video-vga))
diff --git a/XOrg/font-native/font-util/Makefile b/XOrg/font-native/font-util/Makefile
deleted file mode 100644 (file)
index 1416be6..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 8299 2007-08-01 12:32:53Z nico $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=font-util
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-util
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font-utils
-  TITLE:=misc tool to generate x fonts
-  DEPENDS:=+xorg-server @DISPLAY_SUPPORT
-endef
-
-define Build/Configure
-       cd  $(PKG_BUILD_DIR)/; ./configure  
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) install DESTDIR="$(PKG_INSTALL_DIR)"
-endef
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(1)/usr/lib/X11 $(2)/bin
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/pkgconfig/fontutil.pc $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/X11/* $(1)/usr/lib/X11/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/* $(2)/bin/
-endef
-
-$(eval $(call BuildPackage,font-util))
diff --git a/XOrg/font/dejavu-fonts-ttf/Makefile b/XOrg/font/dejavu-fonts-ttf/Makefile
deleted file mode 100644 (file)
index d0f9c4c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# 
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=dejavu-fonts-ttf
-PKG_RELEASE:=1
-PKG_VERSION:=2.23
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=@SF/dejavu
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dejavu-fonts-ttf
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= @DISPLAY_SUPPORT
-  TITLE:=dejavu-fonts-ttf
-  URL:=http://dejavu.sourceforge.net/
-endef
-
-define Build/Compile
-       echo
-endef
-
-define Build/Configure
-       echo
-endef
-
-define Package/dejavu-fonts-ttf/install
-       $(INSTALL_DIR) $(1)/usr/share/fonts/ttf-dejavu
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/ttf/*.ttf $(1)/usr/share/fonts/ttf-dejavu
-endef
-
-$(eval $(call BuildPackage,dejavu-fonts-ttf))
-
diff --git a/XOrg/font/encodings/Makefile b/XOrg/font/encodings/Makefile
deleted file mode 100644 (file)
index 00af6a4..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=encodings
-PKG_NAME:=encodings
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.2
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/encodings
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=encodings
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.encodings
-endef
-
-define Package/encodings/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/encodings/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.encodings`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (encodings,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,encodings))
-
diff --git a/XOrg/font/font-alias/Makefile b/XOrg/font/font-alias/Makefile
deleted file mode 100644 (file)
index 7644640..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-alias
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-alias
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-alias
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-alias
-endef
-
-define Package/font-alias/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-alias/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-alias`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-alias,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-alias))
-
diff --git a/XOrg/font/font-bh-75dpi/Makefile b/XOrg/font/font-bh-75dpi/Makefile
deleted file mode 100644 (file)
index 26d3980..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-bh-75dpi
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-bh-75dpi
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-bh-75dpi
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-bh-75dpi
-endef
-
-define Package/font-bh-75dpi/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-bh-75dpi/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-bh-75dpi`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-bh-75dpi,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-bh-75dpi))
-
diff --git a/XOrg/font/font-cursor-misc/Makefile b/XOrg/font/font-cursor-misc/Makefile
deleted file mode 100644 (file)
index 7dcf9bb..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-cursor-misc
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-cursor-misc
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-cursor-misc
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-cursor-misc
-endef
-
-define Package/font-cursor-misc/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-cursor-misc/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-cursor-misc`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-cursor-misc,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-cursor-misc))
-
diff --git a/XOrg/font/font-daewoo-misc/Makefile b/XOrg/font/font-daewoo-misc/Makefile
deleted file mode 100644 (file)
index 55e7549..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-daewoo-misc
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-daewoo-misc
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-daewoo-misc
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-daewoo-misc
-endef
-
-define Package/font-daewoo-misc/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-daewoo-misc/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-daewoo-misc`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-daewoo-misc,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-daewoo-misc))
-
diff --git a/XOrg/font/font-dec-misc/Makefile b/XOrg/font/font-dec-misc/Makefile
deleted file mode 100644 (file)
index 030813f..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-dec-misc
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-dec-misc
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-dec-misc
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-dec-misc
-endef
-
-define Package/font-dec-misc/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-dec-misc/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-dec-misc`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-dec-misc,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-dec-misc))
-
diff --git a/XOrg/font/font-ibm-type1/Makefile b/XOrg/font/font-ibm-type1/Makefile
deleted file mode 100644 (file)
index 052b3ce..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-ibm-type1
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-ibm-type1
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-ibm-type1
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-ibm-type1
-endef
-
-define Package/font-ibm-type1/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-ibm-type1/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-ibm-type1`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-ibm-type1,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-ibm-type1))
-
diff --git a/XOrg/font/font-isas-misc/Makefile b/XOrg/font/font-isas-misc/Makefile
deleted file mode 100644 (file)
index b0ff8cb..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-isas-misc
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-isas-misc
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-isas-misc
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-isas-misc
-endef
-
-define Package/font-isas-misc/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-isas-misc/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-isas-misc`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-isas-misc,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-isas-misc))
-
diff --git a/XOrg/font/font-jis-misc/Makefile b/XOrg/font/font-jis-misc/Makefile
deleted file mode 100644 (file)
index ffe2bc1..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-jis-misc
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-jis-misc
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-jis-misc
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-jis-misc
-endef
-
-define Package/font-jis-misc/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-jis-misc/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-jis-misc`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-jis-misc,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-jis-misc))
-
diff --git a/XOrg/font/font-micro-misc/Makefile b/XOrg/font/font-micro-misc/Makefile
deleted file mode 100644 (file)
index 6415fa6..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-micro-misc
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-micro-misc
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-micro-misc
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-micro-misc
-endef
-
-define Package/font-micro-misc/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-micro-misc/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-micro-misc`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-micro-misc,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-micro-misc))
-
diff --git a/XOrg/font/font-misc-cyrillic/Makefile b/XOrg/font/font-misc-cyrillic/Makefile
deleted file mode 100644 (file)
index 9c2b4ee..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-misc-cyrillic
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-misc-cyrillic
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-misc-cyrillic
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-misc-cyrillic
-endef
-
-define Package/font-misc-cyrillic/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-misc-cyrillic/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-misc-cyrillic`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-misc-cyrillic,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-misc-cyrillic))
-
diff --git a/XOrg/font/font-misc-misc/Makefile b/XOrg/font/font-misc-misc/Makefile
deleted file mode 100644 (file)
index a481ef4..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font-base
-PKG_NAME:=font-misc-misc
-PKG_RELEASE:=1
-PKG_VERSION:=1.0.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-misc-misc/Default
-  SECTION:=xorg-fonts
-  CATEGORY:=Xorg
-  SUBMENU:=font
-endef
-
-define Package/font-base
-  $(call Package/font-misc-misc/Default)
-  DEPENDS:=+xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-base 
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Package/font-misc-misc
-  $(call Package/font-misc-misc/Default)
-  DEPENDS:=font-base
-  TITLE:=font-misc-misc 
-  URL:=http://xorg.freedesktop.org/
-endef
-
-
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs rm  
-endef
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-       fi \
-       )
-endef
-
-define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/  $(MAKE_FLAGS) install
-endef
-
-define Package/font-base/install
-       $(INSTALL_DIR) $(1)/usr/lib/X11/fonts/misc/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/X11/fonts/misc/6x13* $(1)/usr/lib/X11/fonts/misc/
-       $(CP) files/fonts.dir.font-base $(1)/usr/lib/X11/fonts/misc/
-endef
-
-define Package/font-misc-misc/install
-       $(INSTALL_DIR) $(1)/usr/lib/X11/fonts/misc/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/X11/fonts/misc/* $(1)/usr/lib/X11/fonts/misc/
-       rm $(1)/usr/lib/X11/fonts/misc/6x13*
-       $(CP) files/fonts.dir.font-misc-misc $(1)/usr/lib/X11/fonts/misc/
-endef
-
-define Package/font-base/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-base`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-define Package/font-misc-misc/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-misc-misc`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-$(eval $(call BuildPackage,font-misc-misc))
-$(eval $(call BuildPackage,font-base))
-
-# FIXME: replace with native versions
-$(eval $(call RequireCommand,mkfontscale, \
-       Please install mkfontscale (usually in xfonts-utils) \
-))
-$(eval $(call RequireCommand,mkfontdir, \
-       Please install mkfontdir (usually in xfonts-utils) \
-))
-
diff --git a/XOrg/font/font-misc-misc/files/fonts.dir.font-base b/XOrg/font/font-misc-misc/files/fonts.dir.font-base
deleted file mode 100644 (file)
index 0158265..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
-6x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15
-6x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
-6x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
-6x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15
-6x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1
-6x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1
-6x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15
-6x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1
diff --git a/XOrg/font/font-misc-misc/files/fonts.dir.font-misc-misc b/XOrg/font/font-misc-misc/files/fonts.dir.font-misc-misc
deleted file mode 100644 (file)
index 1adf284..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-10x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
-10x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15
-10x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
-12x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1
-18x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1
-18x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1
-4x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1
-4x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15
-4x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1
-5x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
-5x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15
-5x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1
-5x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
-5x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15
-5x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
-6x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
-6x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15
-6x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1
-6x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
-6x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15
-6x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1
-6x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
-6x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15
-6x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1
-7x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
-7x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15
-7x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1
-7x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
-7x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15
-7x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1
-7x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1
-7x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15
-7x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1
-7x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
-7x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15
-7x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
-7x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
-7x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15
-7x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1
-8x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
-8x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15
-8x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
-8x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
-8x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15
-8x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1
-8x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1
-8x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15
-8x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1
-9x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
-9x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15
-9x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
-9x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
-9x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15
-9x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1
-9x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1
-9x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15
-9x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
-9x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1
-9x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15
-9x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1
-k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0
-nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
diff --git a/XOrg/font/font-xfree86-type1/Makefile b/XOrg/font/font-xfree86-type1/Makefile
deleted file mode 100644 (file)
index 11e599d..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=font
-PKG_NAME:=font-xfree86-type1
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.0
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/font-xfree86-type1
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:= +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=font-xfree86-type1
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.font-xfree86-type1
-endef
-
-define Package/font-xfree86-type1/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/font-xfree86-type1/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-xfree86-type1`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (font-xfree86-type1,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,font-xfree86-type1))
-
diff --git a/XOrg/font/packages b/XOrg/font/packages
deleted file mode 100644 (file)
index 1766b9b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-encodings-1.0.2|
-font-xfree86-type1-1.0.0|
-font-cursor-misc-1.0.0|
-font-daewoo-misc-1.0.0|
-font-dec-misc-1.0.0|
-font-ibm-type1-1.0.0|
-font-isas-misc-1.0.0|
-font-jis-misc-1.0.0|
-font-micro-misc-1.0.0|
-font-misc-cyrillic-1.0.0|
-font-bh-75dpi-1.0.0|
-font-alias-1.0.1|
diff --git a/XOrg/font/template.mk b/XOrg/font/template.mk
deleted file mode 100644 (file)
index 149f894..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-include $(TOPDIR)/rules.mk
-
-PKG_BASE_NAME:=@BASE_NAME@
-PKG_NAME:=@NAME@
-PKG_RELEASE:=2
-PKG_VERSION:=@VER@
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/@NAME@
-  SECTION:=xorg-font
-  CATEGORY:=Xorg
-  SUBMENU:=font
-  DEPENDS:=@DEP@ +xorg-server +font-util @DISPLAY_SUPPORT
-  TITLE:=@NAME@
-  URL:=http://xorg.freedesktop.org/
-endef
-
-define Build/InstallDev
-       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-endef
-
-CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
-
-define Build/Compile
-       UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       sed -i '1d' {} 
-       find $(PKG_INSTALL_DIR) -name fonts.dir | \
-               xargs -i -t \
-                       mv {} {}.@NAME@
-endef
-
-define Package/@NAME@/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Package/@NAME@/postinst
-#!/bin/sh
-
-FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.@NAME@`
-FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir
-
-echo found $${FILE}
-
-if [ ! -z $${FILE_NEW} ]; then
-       if [ -f $${FILE_OLD} ]; then
-               sed -i "1d" $${FILE_OLD}
-               cat $${FILE_NEW} >> $${FILE_OLD}
-               rm -rf $${FILE_NEW}
-               mv $${FILE_OLD} $${FILE_OLD}.tmp
-       else
-               mv $${FILE_NEW} $${FILE_OLD}.tmp
-       fi
-       (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD}
-       rm $${FILE_OLD}.tmp
-fi
-endef
-
-ifeq (@NAME@,font-util)
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/ 
-endef
-endif
-
-$(eval $(call BuildPackage,@NAME@))
-
diff --git a/XOrg/generate.sh b/XOrg/generate.sh
deleted file mode 100755 (executable)
index 21e5157..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-for d in `find . -name packages`; do
-       cd `dirname $d`
-       echo "Entering "`dirname $d`
-       for p in `cat packages`; do
-               _NAME=${p%%|*}
-               NAME=${_NAME%-*}
-               BASE_NAME=${NAME%%-*}
-               VER=${_NAME##*-}
-               DEP=`echo ${p##*|} | sed "s/+/ +/g"`
-               echo generating Makefile for ${NAME}-${VER} with deps : ${DEP}
-               rm -f ${NAME}/Makefile
-        if [ -e ${NAME}/patches ]; then
-            rm -f ${NAME}/patches/*
-        fi
-               if [ "$1" = "gen" ]; then
-                       if [ ! -e ${NAME} ]; then
-                mkdir ${NAME}
-            fi
-                       sed "s/@VER@/${VER}/g" template.mk | sed "s/@DEP@/${DEP}/g" | sed "s/@NAME@/${NAME}/g" | sed "s/@BASE_NAME@/${BASE_NAME}/g" > ${NAME}/Makefile
-                       if [ -d `pwd`/patches/${NAME} ]; then
-                               if [ ! -d ${NAME}/patches ]; then
-                    mkdir ${NAME}/patches
-                fi
-                               cp -r `pwd`/patches/${NAME}/* ${NAME}/patches/
-                       fi
-               fi
-       done
-       cd - > /dev/null
-done
diff --git a/XOrg/headers/native/Makefile b/XOrg/headers/native/Makefile
deleted file mode 100644 (file)
index 425ce59..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_RELEASE:=2
-PKG_VERSION:=7.3
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/headers/xorg-headers-native-$(PKG_VERSION)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xorg-headers-native
-  SECTION:=xorg-headers
-  CATEGORY:=Xorg
-  SUBMENU:=headers
-  TITLE:=xorg-headers-native
-  URL:=http://xorg.freedesktop.org/
-  DEPENDS:=@DISPLAY_SUPPORT
-endef
-
-define Build/Prepare
-       mkdir -p $(PKG_BUILD_DIR)
-       $(CP) ./src/* $(PKG_BUILD_DIR)/
-       find $(PKG_BUILD_DIR)/ -name .svn | xargs rm -rf
-endef
-
-define Build/Compile
-  true
-endef
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/include
-       $(CP) $(PKG_BUILD_DIR)/* $(1)/include/
-endef
-
-$(eval $(call BuildPackage,xorg-headers-native))
-
diff --git a/XOrg/headers/native/src/X11/CallbackI.h b/XOrg/headers/native/src/X11/CallbackI.h
deleted file mode 100644 (file)
index 4ae08ab..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-/* $Xorg: CallbackI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86$ */
-
-/****************************************************************
- *
- * Callbacks
- *
- ****************************************************************/
-
-typedef XrmResource **CallbackTable;
-
-#define _XtCBCalling 1
-#define _XtCBFreeAfterCalling 2
-
-typedef struct internalCallbackRec {
-    unsigned short count;
-    char          is_padded;   /* contains NULL padding for external form */
-    char          call_state;  /* combination of _XtCB{FreeAfter}Calling */
-#ifdef LONG64
-    unsigned int   align_pad;  /* padding to align callback list */
-#endif
-    /* XtCallbackList */
-} InternalCallbackRec, *InternalCallbackList;
-
-typedef Boolean (*_XtConditionProc)(
-    XtPointer  /* data */
-);
-
-extern void _XtAddCallback(
-    InternalCallbackList*      /* callbacks */,
-    XtCallbackProc             /* callback */,
-    XtPointer                  /* closure */
-);
-
-extern void _XtAddCallbackOnce(
-    InternalCallbackList*      /* callbacks */,
-    XtCallbackProc             /* callback */,
-    XtPointer                  /* closure */
-);
-
-extern InternalCallbackList _XtCompileCallbackList(
-    XtCallbackList             /* xtcallbacks */
-);
-
-extern XtCallbackList _XtGetCallbackList(
-    InternalCallbackList*      /* callbacks */
-);
-
-extern void _XtRemoveAllCallbacks(
-    InternalCallbackList*      /* callbacks */
-);
-
-extern void _XtRemoveCallback(
-    InternalCallbackList*      /* callbacks */,
-    XtCallbackProc             /* callback */,
-    XtPointer                  /* closure */
-);
-
-extern void _XtPeekCallback(
-    Widget                     /* widget */,
-    XtCallbackList             /* callbacks */,
-    XtCallbackProc *           /* callback */,
-    XtPointer *                        /* closure */
-);
-
-extern void _XtCallConditionalCallbackList(
-    Widget                     /* widget */,
-    XtCallbackList             /* callbacks */,
-    XtPointer                  /* call_data */,
-    _XtConditionProc           /* cond_proc */
-);
diff --git a/XOrg/headers/native/src/X11/Composite.h b/XOrg/headers/native/src/X11/Composite.h
deleted file mode 100644 (file)
index 0a58332..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/* $Xorg: Composite.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86$ */
-
-#ifndef _XtComposite_h
-#define _XtComposite_h
-
-typedef struct _CompositeClassRec *CompositeWidgetClass;
-
-typedef Cardinal (*XtOrderProc)(
-    Widget     /* child */
-);
-
-_XFUNCPROTOBEGIN
-
-extern void XtManageChildren(
-    WidgetList                 /* children */,
-    Cardinal           /* num_children */
-);
-
-extern void XtManageChild(
-    Widget             /* child */
-);
-
-extern void XtUnmanageChildren(
-    WidgetList                 /* children */,
-    Cardinal           /* num_children */
-);
-
-extern void XtUnmanageChild(
-    Widget             /* child */
-);
-
-typedef void (*XtDoChangeProc)(
-    Widget             /* composite_parent */,
-    WidgetList         /* unmanage_children */,
-    Cardinal *         /* num_unmanage_children */,
-    WidgetList         /* manage_children */,
-    Cardinal *         /* num_manage_children */,
-    XtPointer          /* client_data */
-);
-
-extern void XtChangeManagedSet(
-    WidgetList         /* unmanage_children */,
-    Cardinal           /* num_unmanage_children */,
-    XtDoChangeProc     /* do_change_proc */,
-    XtPointer          /* client_data */,
-    WidgetList         /* manage_children */,
-    Cardinal           /* num_manage_children */
-);
-
-_XFUNCPROTOEND
-
-#ifndef XT_COMPOSITE
-externalref WidgetClass compositeWidgetClass;
-#endif
-
-#endif /* _XtComposite_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/XOrg/headers/native/src/X11/CompositeP.h b/XOrg/headers/native/src/X11/CompositeP.h
deleted file mode 100644 (file)
index ed055b2..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/* $Xorg: CompositeP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtCompositeP_h
-#define _XtCompositeP_h
-
-#include <X11/Composite.h>
-
-/************************************************************************
- *
- * Additional instance fields for widgets of (sub)class 'Composite' 
- *
- ************************************************************************/
-
-typedef struct _CompositePart {
-    WidgetList  children;           /* array of ALL widget children         */
-    Cardinal    num_children;       /* total number of widget children      */
-    Cardinal    num_slots;           /* number of slots in children array    */
-    XtOrderProc insert_position;     /* compute position of new child       */
-} CompositePart,*CompositePtr;
-
-typedef struct _CompositeRec {
-    CorePart      core;
-    CompositePart composite;
-} CompositeRec;
-
-/*********************************************************************
- *
- *  Additional class fields for widgets of (sub)class 'Composite'
- *
- ********************************************************************/
-
-typedef struct _CompositeClassPart {
-    XtGeometryHandler geometry_manager;          /* geometry manager for children   */
-    XtWidgetProc      change_managed;    /* change managed state of child   */
-    XtWidgetProc      insert_child;      /* physically add child to parent  */
-    XtWidgetProc      delete_child;      /* physically remove child         */
-    XtPointer        extension;          /* pointer to extension record     */
-} CompositeClassPart,*CompositePartPtr;
-
-typedef struct {
-    XtPointer next_extension;  /* 1st 4 mandated for all extension records */
-    XrmQuark record_type;      /* NULLQUARK; on CompositeClassPart */
-    long version;              /* must be XtCompositeExtensionVersion */
-    Cardinal record_size;      /* sizeof(CompositeClassExtensionRec) */
-    Boolean accepts_objects;
-    Boolean allows_change_managed_set;
-} CompositeClassExtensionRec, *CompositeClassExtension;
-
-
-typedef struct _CompositeClassRec {
-     CoreClassPart      core_class;
-     CompositeClassPart composite_class;
-} CompositeClassRec;
-
-externalref CompositeClassRec compositeClassRec;
-
-#define XtCompositeExtensionVersion 2L
-#define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
-#define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
-#define XtInheritInsertChild ((XtWidgetProc) _XtInherit)
-#define XtInheritDeleteChild ((XtWidgetProc) _XtInherit)
-
-#endif /* _XtCompositeP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/XOrg/headers/native/src/X11/ConstrainP.h b/XOrg/headers/native/src/X11/ConstrainP.h
deleted file mode 100644 (file)
index a90d19a..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $Xorg: ConstrainP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-/* $oHeader: ConstrainP.h,v 1.2 88/08/18 15:54:15 asente Exp $ */
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtConstraintP_h
-#define _XtConstraintP_h
-
-#include <X11/Constraint.h>
-
-typedef struct _ConstraintPart {
-    XtPointer   mumble;                /* No new fields, keep C compiler happy */
-} ConstraintPart;
-
-typedef struct _ConstraintRec {
-    CorePart       core;
-    CompositePart   composite;
-    ConstraintPart  constraint;
-} ConstraintRec, *ConstraintWidget;
-
-typedef struct _ConstraintClassPart {
-    XtResourceList resources;        /* constraint resource list            */
-    Cardinal   num_resources;         /* number of constraints in list       */
-    Cardinal   constraint_size;       /* size of constraint record           */
-    XtInitProc initialize;            /* constraint initialization           */
-    XtWidgetProc destroy;             /* constraint destroy proc             */
-    XtSetValuesFunc set_values;       /* constraint set_values proc          */
-    XtPointer      extension;          /* pointer to extension record      */
-} ConstraintClassPart;
-
-typedef struct {
-    XtPointer next_extension;  /* 1st 4 mandated for all extension records */
-    XrmQuark record_type;      /* NULLQUARK; on ConstraintClassPart */
-    long version;              /* must be XtConstraintExtensionVersion */
-    Cardinal record_size;      /* sizeof(ConstraintClassExtensionRec) */
-    XtArgsProc get_values_hook;
-} ConstraintClassExtensionRec, *ConstraintClassExtension;
-
-typedef struct _ConstraintClassRec {
-    CoreClassPart       core_class;
-    CompositeClassPart  composite_class;
-    ConstraintClassPart constraint_class;
-} ConstraintClassRec;
-
-externalref ConstraintClassRec constraintClassRec;
-
-#define XtConstraintExtensionVersion 1L
-
-#endif /* _XtConstraintP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/XOrg/headers/native/src/X11/Constraint.h b/XOrg/headers/native/src/X11/Constraint.h
deleted file mode 100644 (file)
index 9bb962e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $Xorg: Constraint.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-/* $oHeader: Constraint.h,v 1.2 88/08/18 15:54:18 asente Exp $ */
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtConstraint_h
-#define _XtConstraint_h
-
-typedef struct _ConstraintClassRec *ConstraintWidgetClass;
-
-#ifndef CONSTRAINT
-externalref WidgetClass constraintWidgetClass;
-#endif
-
-#endif /* _XtConstraint_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/XOrg/headers/native/src/X11/ConvertI.h b/XOrg/headers/native/src/X11/ConvertI.h
deleted file mode 100644 (file)
index 02c0e5c..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-/* $Xorg: ConvertI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
-
-/* Representation types */
-
-extern XrmQuark  _XtQString;
-
-/*
- * Resource conversions
- */
-
-typedef struct _ConverterRec **ConverterTable;
-
-extern void _XtAddDefaultConverters(
-    ConverterTable     /* table */
-);
-
-extern void _XtSetDefaultConverterTable(
-    ConverterTable*            /* table */
-);
-
-extern void _XtFreeConverterTable(
-    ConverterTable             /* table */
-);
-
-extern void _XtTableAddConverter(
-    ConverterTable             /* table */,
-    XrmRepresentation          /* from_type */,
-    XrmRepresentation          /* to_type */,
-    XtTypeConverter            /* converter */,
-    XtConvertArgList           /* convert_args */,
-    Cardinal                   /* num_args */,
-    _XtBoolean                 /* new_style */,
-    XtCacheType                        /* cache_type */,
-    XtDestructor               /* destructor */,
-    _XtBoolean                 /* global */
-);
-
-extern Boolean _XtConvert(
-    Widget                     /* widget */,
-    XrmRepresentation          /* from_type */,
-    XrmValuePtr                        /* from */,
-    XrmRepresentation          /* to_type */,
-    XrmValuePtr                        /* to */,
-    XtCacheRef*                        /* cache_ref_return */
-);
-
-void _XtConvertInitialize(void);
-
diff --git a/XOrg/headers/native/src/X11/Core.h b/XOrg/headers/native/src/X11/Core.h
deleted file mode 100644 (file)
index ff6cb75..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* $Xorg: Core.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $
-* $oHeader: Core.h,v 1.2 88/08/18 15:54:32 asente Exp $
-*/
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef _XtCore_h
-#define _XtCore_h
-
-typedef struct _WidgetClassRec *CoreWidgetClass;
-typedef struct _WidgetRec *CoreWidget;
-externalref WidgetClass coreWidgetClass;
-
-#ifndef _XT_CORE_C
-externalref WidgetClass widgetClass;
-
-#endif
-
-#endif /* _XtCore_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/XOrg/headers/native/src/X11/CoreP.h b/XOrg/headers/native/src/X11/CoreP.h
deleted file mode 100644 (file)
index e07f085..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-* $Xorg: CoreP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $
-* $oHeader: CoreP.h,v 1.2 88/08/18 15:54:37 asente Exp $
-*/
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifndef XtCoreP_h
-#define XtCoreP_h
-
-#include <X11/Core.h>
-
-externalref int _XtInheritTranslations;
-
-#define XtInheritTranslations  ((String) &_XtInheritTranslations)
-#define XtInheritRealize ((XtRealizeProc) _XtInherit)
-#define XtInheritResize ((XtWidgetProc) _XtInherit)
-#define XtInheritExpose ((XtExposeProc) _XtInherit)
-#define XtInheritSetValuesAlmost ((XtAlmostProc) _XtInherit)
-#define XtInheritAcceptFocus ((XtAcceptFocusProc) _XtInherit)
-#define XtInheritQueryGeometry ((XtGeometryHandler) _XtInherit)
-#define XtInheritDisplayAccelerator ((XtStringProc) _XtInherit)
-
-/***************************************************************
- * Widget Core Data Structures
- *
- *
- **************************************************************/
-
-typedef struct _CorePart {
-    Widget         self;               /* pointer to widget itself          */
-    WidgetClass            widget_class;       /* pointer to Widget's ClassRec      */
-    Widget         parent;             /* parent widget                     */
-    XrmName         xrm_name;          /* widget resource name quarkified   */
-    Boolean         being_destroyed;   /* marked for destroy                */
-    XtCallbackList  destroy_callbacks; /* who to call when widget destroyed */
-    XtPointer       constraints;        /* constraint record                 */
-    Position        x, y;              /* window position                   */
-    Dimension       width, height;     /* window dimensions                 */
-    Dimension       border_width;      /* window border width               */
-    Boolean         managed;            /* is widget geometry managed?       */
-    Boolean        sensitive;          /* is widget sensitive to user events*/
-    Boolean         ancestor_sensitive;        /* are all ancestors sensitive?      */
-    XtEventTable    event_table;       /* private to event dispatcher       */
-    XtTMRec        tm;                 /* translation management            */
-    XtTranslations  accelerators;       /* accelerator translations          */
-    Pixel          border_pixel;       /* window border pixel               */
-    Pixmap          border_pixmap;     /* window border pixmap or NULL      */
-    WidgetList      popup_list;         /* list of popups                    */
-    Cardinal        num_popups;         /* how many popups                   */
-    String          name;              /* widget resource name              */
-    Screen         *screen;            /* window's screen                   */
-    Colormap        colormap;           /* colormap                          */
-    Window         window;             /* window ID                         */
-    Cardinal        depth;             /* number of planes in window        */
-    Pixel          background_pixel;   /* window background pixel           */
-    Pixmap          background_pixmap; /* window background pixmap or NULL  */
-    Boolean         visible;           /* is window mapped and not occluded?*/
-    Boolean        mapped_when_managed;/* map window if it's managed?       */
-} CorePart;
-
-typedef struct _WidgetRec {
-    CorePart    core;
- } WidgetRec, CoreRec;
-
-
-
-/******************************************************************
- *
- * Core Class Structure. Widgets, regardless of their class, will have
- * these fields.  All widgets of a given class will have the same values
- * for these fields.  Widgets of a given class may also have additional
- * common fields.  These additional fields are included in incremental
- * class structures, such as CommandClass.
- *
- * The fields that are specific to this subclass, as opposed to fields that
- * are part of the superclass, are called "subclass fields" below.  Many
- * procedures are responsible only for the subclass fields, and not for
- * any superclass fields.
- *
- ********************************************************************/
-
-typedef struct _CoreClassPart {
-    WidgetClass     superclass;                /* pointer to superclass ClassRec   */
-    String          class_name;                /* widget resource class name       */
-    Cardinal        widget_size;       /* size in bytes of widget record   */
-    XtProc         class_initialize;   /* class initialization proc        */
-    XtWidgetClassProc class_part_initialize; /* dynamic initialization     */
-    XtEnum          class_inited;       /* has class been initialized?      */
-    XtInitProc      initialize;                /* initialize subclass fields       */
-    XtArgsProc      initialize_hook;    /* notify that initialize called    */
-    XtRealizeProc   realize;           /* XCreateWindow for widget         */
-    XtActionList    actions;           /* widget semantics name to proc map */
-    Cardinal       num_actions;        /* number of entries in actions     */
-    XtResourceList  resources;         /* resources for subclass fields    */
-    Cardinal        num_resources;      /* number of entries in resources   */
-    XrmClass        xrm_class;         /* resource class quarkified        */
-    Boolean         compress_motion;    /* compress MotionNotify for widget */
-    XtEnum          compress_exposure;  /* compress Expose events for widget*/
-    Boolean         compress_enterleave;/* compress enter and leave events  */
-    Boolean         visible_interest;   /* select for VisibilityNotify      */
-    XtWidgetProc    destroy;           /* free data for subclass pointers  */
-    XtWidgetProc    resize;            /* geom manager changed widget size */
-    XtExposeProc    expose;            /* rediplay window                  */
-    XtSetValuesFunc set_values;                /* set subclass resource values     */
-    XtArgsFunc      set_values_hook;    /* notify that set_values called    */
-    XtAlmostProc    set_values_almost;  /* set_values got "Almost" geo reply */
-    XtArgsProc      get_values_hook;    /* notify that get_values called    */
-    XtAcceptFocusProc accept_focus;     /* assign input focus to widget     */
-    XtVersionType   version;           /* version of intrinsics used       */
-    XtPointer       callback_private;   /* list of callback offsets       */
-    String          tm_table;           /* state machine                    */
-    XtGeometryHandler query_geometry;  /* return preferred geometry        */
-    XtStringProc    display_accelerator;/* display your accelerator        */
-    XtPointer      extension;          /* pointer to extension record      */
- } CoreClassPart;
-
-typedef struct _WidgetClassRec {
-    CoreClassPart core_class;
-} WidgetClassRec, CoreClassRec;
-
-externalref WidgetClassRec widgetClassRec;
-#define coreClassRec widgetClassRec
-
-#endif /* _XtCoreP_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/XOrg/headers/native/src/X11/CreateI.h b/XOrg/headers/native/src/X11/CreateI.h
deleted file mode 100644 (file)
index 87abb1d..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $XFree86$ */
-
-#ifndef _XtcreateI_h
-#define _XtcreateI_h
-
-extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
-                             Widget parent, ArgList args, Cardinal num_args,
-                             XtTypedArgList typed_args,
-                             Cardinal num_typed_args);
-extern Widget _XtCreatePopupShell(String name, WidgetClass widget_class,
-                                 Widget parent, ArgList args,
-                                 Cardinal num_args, XtTypedArgList typed_args,
-                                 Cardinal num_typed_args);
-extern Widget _XtAppCreateShell(String name, String class,
-                               WidgetClass widget_class, Display *display,
-                               ArgList args, Cardinal num_args,
-                               XtTypedArgList typed_args,
-                               Cardinal num_typed_args);
-extern Widget _XtCreateHookObj(Screen *screen);
-
-
-#include <stdarg.h>
-
-/* VarCreate.c */
-extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
-                       _Xconst char* application_class,
-                       XrmOptionDescList options, Cardinal num_options,
-                       int *argc_in_out, String *argv_in_out,
-                       String *fallback_resources, WidgetClass widget_class,
-                       va_list var_args);
-extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
-                       _Xconst char* application_class,
-                       XrmOptionDescList options, Cardinal num_options,
-                       int *argc_in_out, String *argv_in_out,
-                       String *fallback_resources, va_list var_args);
-
-#endif /* _XtcreateI_h */
diff --git a/XOrg/headers/native/src/X11/DECkeysym.h b/XOrg/headers/native/src/X11/DECkeysym.h
deleted file mode 100644 (file)
index 6ab103e..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Xorg: DECkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
- * DEC private keysyms
- * (29th bit set)
- */
-
-/* two-key compose sequence initiators, chosen to map to Latin1 characters */
-
-#define DXK_ring_accent         0x1000FEB0
-#define DXK_circumflex_accent   0x1000FE5E
-#define DXK_cedilla_accent      0x1000FE2C
-#define DXK_acute_accent        0x1000FE27
-#define DXK_grave_accent        0x1000FE60
-#define DXK_tilde               0x1000FE7E
-#define DXK_diaeresis           0x1000FE22
-
-/* special keysym for LK2** "Remove" key on editing keypad */
-
-#define DXK_Remove     0x1000FF00   /* Remove */
diff --git a/XOrg/headers/native/src/X11/EventI.h b/XOrg/headers/native/src/X11/EventI.h
deleted file mode 100644 (file)
index 00858e7..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/* $Xorg: EventI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-/* $oHeader: EventI.h,v 1.3 88/08/24 09:21:11 asente Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/EventI.h,v 1.3 2001/12/14 19:56:12 dawes Exp $ */
-
-/* 
- * Event.h - exported types and functions for toolkit event handler
- * 
- * Author:     Charles Haynes
- *             Digital Equipment Corporation
- *             Western Software Laboratory
- * Date:       Sun Dec  6 1987
- */
-
-#ifndef _Event_h_
-#define _Event_h_
-
-typedef struct _XtGrabRec  *XtGrabList;
-
-#include "PassivGraI.h"
-
-extern void _XtEventInitialize(
-    void
-);
-
-typedef struct _XtEventRec {
-     XtEventTable      next;
-     EventMask         mask;   /*  also select_data count for RecExt */
-     XtEventHandler    proc;
-     XtPointer         closure;
-     unsigned int      select:1;
-     unsigned int      has_type_specifier:1;
-     unsigned int      async:1; /* not used, here for Digital extension? */
-} XtEventRec;
-
-typedef struct _XtGrabRec {
-    XtGrabList next;
-    Widget   widget;
-    unsigned int exclusive:1;
-    unsigned int spring_loaded:1;
-}XtGrabRec;
-
-typedef struct _BlockHookRec {
-    struct _BlockHookRec* next;
-    XtAppContext app;
-    XtBlockHookProc proc;
-    XtPointer closure;
-} BlockHookRec, *BlockHook;
-
-extern void _XtFreeEventTable(
-    XtEventTable*      /* event_table */
-);
-
-extern Boolean _XtOnGrabList(
-    Widget     /* widget */,
-    XtGrabRec* /* grabList */
-);
-
-extern void _XtRemoveAllInputs(
-    XtAppContext /* app */
-);
-
-extern void _XtRefreshMapping(
-    XEvent*    /* event */,
-    _XtBoolean /* dispatch */
-);
-
-extern void _XtSendFocusEvent(
-    Widget     /* child */,
-    int                /* type */);
-
-extern EventMask _XtConvertTypeToMask(
-    int                /* eventType */
-);
-
-/* EventUtil.c */
-extern Widget _XtFindRemapWidget(XEvent *event, Widget widget,
-                                EventMask mask, XtPerDisplayInput pdi);
-extern void _XtUngrabBadGrabs(XEvent *event, Widget widget,
-                                EventMask mask, XtPerDisplayInput pdi);
-extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
-                               int *numElemsPtr, Widget start,
-                               Widget breakWidget);
-
-/* NextEvent.c */
-extern Boolean XtAppPeekEvent_SkipTimer;
-
-#endif /* _Event_h_ */
diff --git a/XOrg/headers/native/src/X11/HPkeysym.h b/XOrg/headers/native/src/X11/HPkeysym.h
deleted file mode 100644 (file)
index 2d09277..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-/* $Xorg: HPkeysym.h,v 1.5 2001/02/09 02:03:22 xorgcvs Exp $ */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-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 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 used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Hewlett Packard
-or Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  Hewlett-Packard shall not be liable for errors
-contained herein or direct, indirect, special, incidental or
-consequential damages in connection with the furnishing,
-performance, or use of this material.
-
-*/
-
-#ifndef _HPKEYSYM_H
-
-#define _HPKEYSYM
-
-#define hpXK_ClearLine         0x1000FF6F
-#define hpXK_InsertLine                0x1000FF70
-#define hpXK_DeleteLine                0x1000FF71
-#define hpXK_InsertChar                0x1000FF72
-#define hpXK_DeleteChar                0x1000FF73
-#define hpXK_BackTab           0x1000FF74
-#define hpXK_KP_BackTab                0x1000FF75
-#define hpXK_Modelock1         0x1000FF48
-#define hpXK_Modelock2         0x1000FF49
-#define hpXK_Reset             0x1000FF6C
-#define hpXK_System            0x1000FF6D
-#define hpXK_User              0x1000FF6E
-#define hpXK_mute_acute                0x100000A8
-#define hpXK_mute_grave                0x100000A9
-#define hpXK_mute_asciicircum  0x100000AA
-#define hpXK_mute_diaeresis    0x100000AB
-#define hpXK_mute_asciitilde   0x100000AC
-#define hpXK_lira              0x100000AF
-#define hpXK_guilder           0x100000BE
-#define hpXK_Ydiaeresis                0x100000EE
-#define hpXK_IO                        0x100000EE
-#define hpXK_longminus         0x100000F6
-#define hpXK_block             0x100000FC
-
-
-#ifndef _OSF_Keysyms
-#define _OSF_Keysyms
-
-#define osfXK_Copy             0x1004FF02
-#define osfXK_Cut              0x1004FF03
-#define osfXK_Paste            0x1004FF04
-#define osfXK_BackTab          0x1004FF07
-#define osfXK_BackSpace                0x1004FF08
-#define osfXK_Clear            0x1004FF0B
-#define osfXK_Escape           0x1004FF1B
-#define osfXK_AddMode          0x1004FF31
-#define osfXK_PrimaryPaste     0x1004FF32
-#define osfXK_QuickPaste       0x1004FF33
-#define osfXK_PageLeft         0x1004FF40
-#define osfXK_PageUp           0x1004FF41
-#define osfXK_PageDown         0x1004FF42
-#define osfXK_PageRight                0x1004FF43
-#define osfXK_Activate         0x1004FF44
-#define osfXK_MenuBar          0x1004FF45
-#define osfXK_Left             0x1004FF51
-#define osfXK_Up               0x1004FF52
-#define osfXK_Right            0x1004FF53
-#define osfXK_Down             0x1004FF54
-#define osfXK_EndLine          0x1004FF57
-#define osfXK_BeginLine                0x1004FF58
-#define osfXK_EndData          0x1004FF59
-#define osfXK_BeginData                0x1004FF5A
-#define osfXK_PrevMenu         0x1004FF5B
-#define osfXK_NextMenu         0x1004FF5C
-#define osfXK_PrevField                0x1004FF5D
-#define osfXK_NextField                0x1004FF5E
-#define osfXK_Select           0x1004FF60
-#define osfXK_Insert           0x1004FF63
-#define osfXK_Undo             0x1004FF65
-#define osfXK_Menu             0x1004FF67
-#define osfXK_Cancel           0x1004FF69
-#define osfXK_Help             0x1004FF6A
-#define osfXK_SelectAll                0x1004FF71
-#define osfXK_DeselectAll      0x1004FF72
-#define osfXK_Reselect         0x1004FF73
-#define osfXK_Extend           0x1004FF74
-#define osfXK_Restore          0x1004FF78
-#define osfXK_Delete           0x1004FFFF
-
-#endif /* _OSF_Keysyms */
-
-
-/**************************************************************
- * The use of the following macros is deprecated.
- * They are listed below only for backwards compatibility.
- */
-#define XK_Reset                0x1000FF6C
-#define XK_System               0x1000FF6D
-#define XK_User                 0x1000FF6E
-#define XK_ClearLine            0x1000FF6F
-#define XK_InsertLine           0x1000FF70
-#define XK_DeleteLine           0x1000FF71
-#define XK_InsertChar           0x1000FF72
-#define XK_DeleteChar           0x1000FF73
-#define XK_BackTab              0x1000FF74
-#define XK_KP_BackTab           0x1000FF75
-#define XK_Ext16bit_L           0x1000FF76
-#define XK_Ext16bit_R           0x1000FF77
-#define XK_mute_acute           0x100000a8
-#define XK_mute_grave           0x100000a9
-#define XK_mute_asciicircum     0x100000aa
-#define XK_mute_diaeresis       0x100000ab
-#define XK_mute_asciitilde      0x100000ac
-#define XK_lira                 0x100000af
-#define XK_guilder              0x100000be
-#ifndef XK_Ydiaeresis
-#define XK_Ydiaeresis           0x100000ee
-#endif
-#define XK_IO                   0x100000ee
-#define XK_longminus            0x100000f6
-#define XK_block                0x100000fc
-
-#endif /* _HPKEYSYM_H */
diff --git a/XOrg/headers/native/src/X11/HookObjI.h b/XOrg/headers/native/src/X11/HookObjI.h
deleted file mode 100644 (file)
index c9a22a2..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $Xorg: HookObjI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
-/*
-
-Copyright 1994, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#ifndef _XtHookObjI_h
-#define _XtHookObjI_h
-
-/* This object is implementation-dependent and private to the library. */
-
-typedef struct _HookObjRec *HookObject;
-typedef struct _HookObjClassRec *HookObjectClass;
-
-externalref WidgetClass hookObjectClass;
-
-typedef struct _HookObjPart {
-    /* resources */
-    XtCallbackList createhook_callbacks;
-    XtCallbackList changehook_callbacks;
-    XtCallbackList confighook_callbacks;
-    XtCallbackList geometryhook_callbacks;
-    XtCallbackList destroyhook_callbacks;
-    WidgetList shells;
-    Cardinal num_shells;
-    /* private data */
-    Cardinal max_shells;
-    Screen* screen;
-}HookObjPart;
-
-typedef struct _HookObjRec {
-    ObjectPart object;
-    HookObjPart hooks;
-} HookObjRec;
-
-typedef struct _HookObjClassPart {
-    int unused;
-} HookObjClassPart;
-
-typedef struct _HookObjClassRec {
-    ObjectClassPart object_class;
-    HookObjClassPart hook_class;
-} HookObjClassRec;
-
-externalref HookObjClassRec hookObjClassRec;
-
-#endif /* ifndef _Xt_HookObjI_h */
-
-
diff --git a/XOrg/headers/native/src/X11/ImUtil.h b/XOrg/headers/native/src/X11/ImUtil.h
deleted file mode 100644 (file)
index 89f0381..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/* $XFree86: xc/lib/X11/ImUtil.h,v 1.2 2003/04/15 22:10:07 herrb Exp $ */
-
-#ifndef _IMUTIL_H_
-#define _IMUTIL_H_
-
-extern int
-_XGetScanlinePad(
-    Display *dpy,
-    int depth);
-
-extern int
-_XGetBitsPerPixel(
- Display *dpy,
- int depth);
-
-extern int
-_XSetImage(
-    XImage *srcimg,
-    register XImage *dstimg,
-    register int x,
-    register int y);
-
-extern int
-_XReverse_Bytes(
-    register unsigned char *bpt,
-    register int nb);
-extern void
-_XInitImageFuncPtrs(
-    register XImage *image);
-
-#endif /* _IMUTIL_H_ */
diff --git a/XOrg/headers/native/src/X11/InitialI.h b/XOrg/headers/native/src/X11/InitialI.h
deleted file mode 100644 (file)
index c2fe47c..0000000
+++ /dev/null
@@ -1,429 +0,0 @@
-/* $Xorg: InitialI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
-/***********************************************************
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xt/InitialI.h,v 3.10 2001/12/14 19:56:18 dawes Exp $ */
-
-#ifndef _XtinitialI_h
-#define _XtinitialI_h
-
-/****************************************************************
- *
- * Displays
- *
- ****************************************************************/
-
-#ifndef X_NOT_POSIX
-#ifdef _POSIX_SOURCE
-#include <limits.h>
-#else
-#define _POSIX_SOURCE
-#include <limits.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
-#ifndef PATH_MAX
-#ifdef WIN32
-#define PATH_MAX 512
-#else
-#include <sys/param.h>
-#endif
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-#endif
-
-#include <X11/Xos.h>
-#include <X11/Xpoll.h>
-
-typedef struct _TimerEventRec {
-        struct timeval        te_timer_value;
-       struct _TimerEventRec *te_next;
-       XtTimerCallbackProc   te_proc;
-       XtAppContext          app;
-       XtPointer             te_closure;
-} TimerEventRec;
-
-typedef struct _InputEvent {
-       XtInputCallbackProc   ie_proc;
-       XtPointer             ie_closure;
-       struct _InputEvent    *ie_next;
-       struct _InputEvent    *ie_oq;
-       XtAppContext          app;
-       int                   ie_source;
-       XtInputMask           ie_condition;
-} InputEvent;
-
-typedef struct _SignalEventRec {
-       XtSignalCallbackProc  se_proc;
-       XtPointer             se_closure;
-       struct _SignalEventRec *se_next;
-       XtAppContext          app;
-       Boolean               se_notice;
-} SignalEventRec;
-
-typedef struct _WorkProcRec {
-       XtWorkProc proc;
-       XtPointer closure;
-       struct _WorkProcRec *next;
-       XtAppContext app;
-} WorkProcRec;
-
-
-typedef struct 
-{
-#ifndef USE_POLL
-       fd_set rmask;
-       fd_set wmask;
-       fd_set emask;
-#endif
-       int     nfds;
-} FdStruct;
-
-typedef struct _LangProcRec {
-    XtLanguageProc     proc;
-    XtPointer          closure;
-} LangProcRec;
-
-typedef struct _ProcessContextRec {
-    XtAppContext       defaultAppContext;
-    XtAppContext       appContextList;
-    ConverterTable     globalConverterTable;
-    LangProcRec                globalLangProcRec;
-} ProcessContextRec, *ProcessContext;
-
-typedef struct {
-    char*      start;
-    char*      current;
-    int                bytes_remaining;
-} Heap;
-
-typedef struct _DestroyRec DestroyRec;
-
-
-typedef struct _XtAppStruct {
-    XtAppContext next;         /* link to next app in process context */
-    ProcessContext process;    /* back pointer to our process context */
-    InternalCallbackList destroy_callbacks;
-    Display **list;
-    TimerEventRec *timerQueue;
-    WorkProcRec *workQueue;
-    InputEvent **input_list;
-    InputEvent *outstandingQueue;
-    SignalEventRec *signalQueue;
-    XrmDatabase errorDB;
-    XtErrorMsgHandler errorMsgHandler, warningMsgHandler;
-    XtErrorHandler errorHandler, warningHandler;
-    struct _ActionListRec *action_table;
-    ConverterTable converterTable;
-    unsigned long selectionTimeout;
-    FdStruct fds;
-    short count;                       /* num of assigned entries in list */
-    short max;                         /* allocate size of list */
-    short last;
-    short input_count;
-    short input_max;                   /* elts input_list init'd with */
-    Boolean sync, being_destroyed, error_inited;
-#ifndef NO_IDENTIFY_WINDOWS
-    Boolean identify_windows;          /* debugging hack */
-#endif
-    Heap heap;
-    String * fallback_resources;       /* Set by XtAppSetFallbackResources. */
-    struct _ActionHookRec* action_hook_list;
-    struct _BlockHookRec* block_hook_list;
-    int destroy_list_size;             /* state data for 2-phase destroy */
-    int destroy_count;
-    int dispatch_level;
-    DestroyRec* destroy_list;
-    Widget in_phase2_destroy;
-    LangProcRec langProcRec;
-    struct _TMBindCacheRec * free_bindings;
-    String display_name_tried;
-    Display **dpy_destroy_list;
-    int dpy_destroy_count;
-    Boolean exit_flag;
-    Boolean rebuild_fdlist;
-#ifdef XTHREADS
-    LockPtr lock_info;
-    ThreadAppProc lock;
-    ThreadAppProc unlock;
-    ThreadAppYieldLockProc yield_lock;
-    ThreadAppRestoreLockProc restore_lock;
-    ThreadAppProc free_lock;
-#endif
-} XtAppStruct;
-
-extern void _XtHeapInit(Heap* heap);
-extern void _XtHeapFree(Heap* heap);
-
-#ifdef XTTRACEMEMORY
-
-
-extern char *_XtHeapMalloc(
-    Heap*      /* heap */,
-    Cardinal   /* size */,
-    char *     /* file */,
-    int                /* line */
-);
-
-#define _XtHeapAlloc(heap,bytes) _XtHeapMalloc(heap, bytes, __FILE__, __LINE__)
-
-#else /* XTTRACEMEMORY */
-
-extern char* _XtHeapAlloc(
-    Heap*      /* heap */,
-    Cardinal   /* size */
-);
-
-#endif /* XTTRACEMEMORY */
-
-extern void _XtSetDefaultErrorHandlers(
-    XtErrorMsgHandler* /* errMsg */,
-    XtErrorMsgHandler* /* warnMsg */,
-    XtErrorHandler*    /* err */,
-    XtErrorHandler*    /* warn */
-);
-
-extern void _XtSetDefaultSelectionTimeout(
-    unsigned long* /* timeout */
-);
-
-extern XtAppContext _XtDefaultAppContext(
-    void
-);
-
-extern ProcessContext _XtGetProcessContext(
-    void
-);
-
-Display *
-_XtAppInit(
-    XtAppContext*      /* app_context_return */,
-    String             /* application_class */,
-    XrmOptionDescRec*  /* options */,
-    Cardinal           /* num_options */,
-    int*               /* argc_in_out */,
-    String**           /* argv_in_out */,
-    String*            /* fallback_resources */
-);
-
-extern void _XtDestroyAppContexts(
-    void
-);
-
-extern void _XtCloseDisplays(
-    XtAppContext       /* app */
-);
-
-extern int _XtAppDestroyCount;
-
-extern int _XtWaitForSomething(
-    XtAppContext       /* app */,
-    _XtBoolean                 /* ignoreEvents */,
-    _XtBoolean                 /* ignoreTimers */,
-    _XtBoolean                 /* ignoreInputs */,
-    _XtBoolean         /* ignoreSignals */,
-    _XtBoolean                 /* block */,
-#ifdef XTHREADS
-    _XtBoolean         /* drop_lock */,
-#endif
-    unsigned long*     /* howlong */
-);
-
-typedef struct _CaseConverterRec *CaseConverterPtr;
-typedef struct _CaseConverterRec {
-    KeySym             start;          /* first KeySym valid in converter */
-    KeySym             stop;           /* last KeySym valid in converter */
-    XtCaseProc         proc;           /* case converter function */
-    CaseConverterPtr   next;           /* next converter record */
-} CaseConverterRec;
-
-typedef struct _ExtensionSelectorRec {
-    XtExtensionSelectProc proc;
-    int min, max;
-    XtPointer client_data;
-} ExtSelectRec;
-
-typedef struct _XtPerDisplayStruct {
-    InternalCallbackList destroy_callbacks;
-    Region region;
-    CaseConverterPtr case_cvt;         /* user-registered case converters */
-    XtKeyProc defaultKeycodeTranslator;
-    XtAppContext appContext;
-    unsigned long keysyms_serial;      /* for tracking MappingNotify events */
-    KeySym *keysyms;                   /* keycode to keysym table */
-    int keysyms_per_keycode;           /* number of keysyms for each keycode*/
-    int min_keycode, max_keycode;      /* range of keycodes */
-    KeySym *modKeysyms;                /* keysym values for modToKeysysm */
-    ModToKeysymTable *modsToKeysyms;   /* modifiers to Keysysms index table*/
-    unsigned char isModifier[32];      /* key-is-modifier-p bit table */
-    KeySym lock_meaning;              /* Lock modifier meaning */
-    Modifiers mode_switch;            /* keyboard group modifiers */
-    Modifiers num_lock;                       /* keyboard numlock modifiers */
-    Boolean being_destroyed;
-    Boolean rv;                               /* reverse_video resource */
-    XrmName name;                     /* resolved app name */
-    XrmClass class;                   /* application class */
-    Heap heap;
-    struct _GCrec *GClist;            /* support for XtGetGC */
-    Drawable **pixmap_tab;             /* ditto for XtGetGC */
-    String language;                  /* XPG language string */
-    XEvent last_event;                /* last event dispatched */
-    Time last_timestamp;              /* from last event dispatched */
-    int multi_click_time;             /* for XtSetMultiClickTime */
-    struct _TMKeyContextRec* tm_context;     /* for XtGetActionKeysym */
-    InternalCallbackList mapping_callbacks;  /* special case for TM */
-    XtPerDisplayInputRec pdi;         /* state for modal grabs & kbd focus */
-    struct _WWTable *WWtable;         /* window to widget table */
-    XrmDatabase *per_screen_db;        /* per screen resource databases */
-    XrmDatabase cmd_db;                       /* db from command line, if needed */
-    XrmDatabase server_db;            /* resource property else .Xdefaults */
-    XtEventDispatchProc* dispatcher_list;
-    ExtSelectRec* ext_select_list;
-    int ext_select_count;
-    Widget hook_object;
-#ifndef X_NO_RESOURCE_CONFIGURATION_MANAGEMENT
-    Atom rcm_init;                     /* ResConfig - initialize */
-    Atom rcm_data;                     /* ResConfig - data atom */
-#endif
-} XtPerDisplayStruct, *XtPerDisplay;
-
-typedef struct _PerDisplayTable {
-       Display *dpy;
-       XtPerDisplayStruct perDpy;
-       struct _PerDisplayTable *next;
-} PerDisplayTable, *PerDisplayTablePtr;
-
-extern PerDisplayTablePtr _XtperDisplayList;
-
-extern XtPerDisplay _XtSortPerDisplayList(
-    Display* /* dpy */
-);
-
-extern XtPerDisplay _XtGetPerDisplay(
-    Display*           /* dpy */
-);
-
-extern XtPerDisplayInputRec* _XtGetPerDisplayInput(
-    Display*           /* dpy */
-);
-
-#if 0
-#ifdef DEBUG
-#define _XtGetPerDisplay(display) \
-    ((_XtperDisplayList != NULL && (_XtperDisplayList->dpy == (display))) \
-     ? &_XtperDisplayList->perDpy \
-     : _XtSortPerDisplayList(display))
-#define _XtGetPerDisplayInput(display) \
-    ((_XtperDisplayList != NULL && (_XtperDisplayList->dpy == (display))) \
-     ? &_XtperDisplayList->perDpy.pdi \
-     : &_XtSortPerDisplayList(display)->pdi)
-#else
-#define _XtGetPerDisplay(display) \
-    ((_XtperDisplayList->dpy == (display)) \
-     ? &_XtperDisplayList->perDpy \
-     : _XtSortPerDisplayList(display))
-#define _XtGetPerDisplayInput(display) \
-    ((_XtperDisplayList->dpy == (display)) \
-     ? &_XtperDisplayList->perDpy.pdi \
-     : &_XtSortPerDisplayList(display)->pdi)
-#endif /*DEBUG*/
-#endif
-
-extern void _XtDisplayInitialize(
-    Display*           /* dpy */,
-    XtPerDisplay       /* pd */,
-    _Xconst char*      /* name */,
-    XrmOptionDescRec*  /* urlist */,
-    Cardinal           /* num_urs */,
-    int*               /* argc */,
-    char**             /* argv */
-);
-
-extern void _XtCacheFlushTag(
-    XtAppContext /* app */,
-    XtPointer   /* tag */
-);
-
-extern void _XtFreeActions(
-    struct _ActionListRec* /* action_table */
-);
-
-extern void _XtDoPhase2Destroy(
-    XtAppContext /* app */,
-    int                 /* dispatch_level */
-);
-
-extern void _XtDoFreeBindings(
-    XtAppContext /* app */
-);
-
-extern void _XtExtensionSelect(
-    Widget /* widget */
-);
-
-#define _XtSafeToDestroy(app) ((app)->dispatch_level == 0)
-
-extern void _XtAllocWWTable(
-    XtPerDisplay pd
-);
-
-extern void _XtFreeWWTable(
-    XtPerDisplay pd
-);
-
-extern String _XtGetUserName(String dest, int len);
-extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
-                       Cardinal num_urs, int argc, String *argv,
-                       String *applName, String *displayName,
-                       String *language);
-
-#endif /* _XtinitialI_h */
diff --git a/XOrg/headers/native/src/X11/Intrinsic.h b/XOrg/headers/native/src/X11/Intrinsic.h
deleted file mode 100644 (file)
index 0461b84..0000000
+++ /dev/null
@@ -1,2589 +0,0 @@
-/* $Xorg: Intrinsic.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
-/***********************************************************
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-                       All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-/*
-
-Copyright 1987, 1988, 1994, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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
-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
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.8 2001/12/14 19:56:22 dawes Exp $ */
-
-#ifndef _XtIntrinsic_h
-#define _XtIntrinsic_h
-
-#include       <X11/Xlib.h>
-#include       <X11/Xutil.h>
-#include       <X11/Xresource.h>
-#include       <X11/Xfuncproto.h>
-#ifdef XT_BC
-#include <X11/Xos.h>           /* for R4 compatibility */
-#else
-#include <X11/Xosdefs.h>
-#include <string.h>            /* for XtNewString */
-#endif /* XT_BC else */
-
-#define XtSpecificationRelease 6
-
-typedef char *String;
-
-/* We do this in order to get "const" declarations to work right.  We
- * use _XtString instead of String so that C++ applications can
- * #define String to something else if they choose, to avoid conflicts
- * with other C++ libraries.
- */
-#define _XtString char*
-
-/* _Xt names are private to Xt implementation, do not use in client code */
-#if NeedWidePrototypes
-#define _XtBoolean     int
-#define _XtDimension   unsigned int
-#define _XtKeyCode     unsigned int
-#define _XtPosition    int
-#define _XtXtEnum      unsigned int
-#else
-#define _XtBoolean     Boolean
-#define _XtDimension   Dimension
-#define _XtKeyCode     KeyCode
-#define _XtPosition    Position
-#define _XtXtEnum      XtEnum
-#endif /* NeedWidePrototypes */
-
-#include <stddef.h>
-
-#ifdef VMS
-#define externalref globalref
-#define externaldef(psect) globaldef {"psect"} noshare
-#else
-#define externalref extern
-#define externaldef(psect)
-#endif /* VMS */
-
-#ifndef FALSE
-#define FALSE 0
-#define TRUE 1
-#endif
-
-#define XtNumber(arr)          ((Cardinal) (sizeof(arr) / sizeof(arr[0])))
-
-typedef struct _WidgetRec *Widget;
-typedef Widget *WidgetList;
-typedef struct _WidgetClassRec *WidgetClass;
-typedef struct _CompositeRec *CompositeWidget;
-typedef struct _XtActionsRec *XtActionList;
-typedef struct _XtEventRec *XtEventTable;
-
-typedef struct _XtAppStruct *XtAppContext;
-typedef unsigned long  XtValueMask;
-typedef unsigned long  XtIntervalId;
-typedef unsigned long  XtInputId;
-typedef unsigned long  XtWorkProcId;
-typedef unsigned long  XtSignalId;
-typedef unsigned int   XtGeometryMask;
-typedef unsigned long  XtGCMask;   /* Mask of values that are used by widget*/
-typedef unsigned long  Pixel;      /* Index into colormap              */
-typedef int            XtCacheType;
-#define                        XtCacheNone       0x001
-#define                        XtCacheAll        0x002
-#define                        XtCacheByDisplay  0x003
-#define                        XtCacheRefCount   0x100
-
-/****************************************************************
- *
- * System Dependent Definitions; see spec for specific range
- * requirements.  Do not assume every implementation uses the
- * same base types!
- *
- *
- * XtArgVal ought to be a union of XtPointer, char *, long, int *, and proc *
- * but casting to union types is not really supported.
- *
- * So the typedef for XtArgVal should be chosen such that
- *
- *     sizeof (XtArgVal) >=    sizeof(XtPointer)
- *                             sizeof(char *)
- *                             sizeof(long)
- *                             sizeof(int *)
- *                             sizeof(proc *)
- *
- * ArgLists rely heavily on the above typedef.
- *
- ****************************************************************/
-#ifdef CRAY
-typedef long           Boolean;
-typedef char*          XtArgVal;
-typedef long           XtEnum;
-#else
-typedef char           Boolean;
-typedef long           XtArgVal;
-typedef unsigned char  XtEnum;
-#endif
-
-typedef unsigned int   Cardinal;
-typedef unsigned short Dimension;  /* Size in pixels                   */
-typedef short          Position;   /* Offset from 0 coordinate         */
-
-typedef void*          XtPointer;
-
-/* The type Opaque is NOT part of the Xt standard, do NOT use it. */
-/* (It remains here only for backward compatibility.) */
-typedef XtPointer      Opaque;
-
-#include <X11/Core.h>
-#include <X11/Composite.h>
-#include <X11/Constraint.h>
-#include <X11/Object.h>
-#include <X11/RectObj.h>
-
-typedef struct _TranslationData *XtTranslations;
-typedef struct _TranslationData *XtAccelerators;
-typedef unsigned int Modifiers;
-
-typedef void (*XtActionProc)(
-    Widget             /* widget */,
-    XEvent*            /* event */,
-    String*            /* params */,
-    Cardinal*          /* num_params */
-);
-
-typedef XtActionProc* XtBoundActions;
-
-typedef struct _XtActionsRec{
-    String      string;
-    XtActionProc proc;
-} XtActionsRec;
-
-typedef enum {
-/* address mode                parameter representation    */
-/* ------------                ------------------------    */
-    XtAddress,         /* address                  */
-    XtBaseOffset,      /* offset                   */
-    XtImmediate,       /* constant                 */
-    XtResourceString,  /* resource name string     */
-    XtResourceQuark,   /* resource name quark      */
-    XtWidgetBaseOffset,        /* offset from ancestor     */
-    XtProcedureArg     /* procedure to invoke      */
-} XtAddressMode;
-
-typedef struct {
-    XtAddressMode   address_mode;
-    XtPointer      address_id;
-    Cardinal       size;
-} XtConvertArgRec, *XtConvertArgList;
-
-typedef void (*XtConvertArgProc)(
-    Widget             /* widget */,
-    Cardinal*          /* size */,
-    XrmValue*          /* value */
-);
-
-typedef struct {
-    XtGeometryMask request_mode;
-    Position x, y;
-    Dimension width, height, border_width;
-    Widget sibling;
-    int stack_mode;   /* Above, Below, TopIf, BottomIf, Opposite, DontChange */
-} XtWidgetGeometry;
-
-/* Additions to Xlib geometry requests: ask what would happen, don't do it */
-#define XtCWQueryOnly  (1 << 7)
-
-/* Additions to Xlib stack modes: don't change stack order */
-#define XtSMDontChange 5
-
-typedef void (*XtConverter)( /* obsolete */
-    XrmValue*          /* args */,
-    Cardinal*          /* num_args */,
-    XrmValue*          /* from */,
-    XrmValue*          /* to */
-);
-
-typedef Boolean (*XtTypeConverter)(
-    Display*           /* dpy */,
-    XrmValue*          /* args */,
-    Cardinal*          /* num_args */,
-    XrmValue*          /* from */,
-    XrmValue*          /* to */,
-    XtPointer*         /* converter_data */
-);
-
-typedef void (*XtDestructor)(
-    XtAppContext       /* app */,
-    XrmValue*          /* to */,
-    XtPointer          /* converter_data */,
-    XrmValue*          /* args */,
-    Cardinal*          /* num_args */
-);
-
-typedef Opaque XtCacheRef;
-
-typedef Opaque XtActionHookId;
-
-typedef void (*XtActionHookProc)(
-    Widget             /* w */,
-    XtPointer          /* client_data */,
-    String             /* action_name */,
-    XEvent*            /* event */,
-    String*            /* params */,
-    Cardinal*          /* num_params */
-);
-
-typedef unsigned long XtBlockHookId;
-
-typedef void (*XtBlockHookProc)(
-    XtPointer          /* client_data */
-);
-
-typedef void (*XtKeyProc)(
-    Display*           /* dpy */,
-    _XtKeyCode                 /* keycode */,
-    Modifiers          /* modifiers */,
-    Modifiers*         /* modifiers_return */,
-    KeySym*            /* keysym_return */
-);
-
-typedef void (*XtCaseProc)(
-    Display*           /* display */,
-    KeySym             /* keysym */,
-    KeySym*            /* lower_return */,
-    KeySym*            /* upper_return */
-);
-
-typedef void (*XtEventHandler)(
-    Widget             /* widget */,
-    XtPointer          /* closure */,
-    XEvent*            /* event */,
-    Boolean*           /* continue_to_dispatch */
-);
-typedef unsigned long EventMask;
-
-typedef enum {XtListHead, XtListTail } XtListPosition;
-
-typedef unsigned long  XtInputMask;
-#define XtInputNoneMask                0L
-#define XtInputReadMask                (1L<<0)
-#define XtInputWriteMask       (1L<<1)
-#define XtInputExceptMask      (1L<<2)
-
-typedef void (*XtTimerCallbackProc)(
-    XtPointer          /* closure */,
-    XtIntervalId*      /* id */
-);
-
-typedef void (*XtInputCallbackProc)(
-    XtPointer          /* closure */,
-    int*               /* source */,
-    XtInputId*         /* id */
-);
-
-typedef void (*XtSignalCallbackProc)(
-    XtPointer          /* closure */,
-    XtSignalId*                /* id */
-);
-
-typedef struct {
-    String     name;
-    XtArgVal   value;
-} Arg, *ArgList;
-
-typedef XtPointer      XtVarArgsList;
-
-typedef void (*XtCallbackProc)(
-    Widget             /* widget */,
-    XtPointer          /* closure */,  /* data the application registered */
-    XtPointer          /* call_data */ /* callback specific data */
-);
-
-typedef struct _XtCallbackRec {
-    XtCallbackProc  callback;
-    XtPointer      closure;
-} XtCallbackRec, *XtCallbackList;
-
-typedef enum {
-       XtCallbackNoList,
-       XtCallbackHasNone,
-       XtCallbackHasSome
-} XtCallbackStatus;
-
-typedef enum  {
-    XtGeometryYes,       /* Request accepted. */
-    XtGeometryNo,        /* Request denied. */
-    XtGeometryAlmost,    /* Request denied, but willing to take replyBox. */
-    XtGeometryDone       /* Request accepted and done. */
-} XtGeometryResult;
-
-typedef enum {XtGrabNone, XtGrabNonexclusive, XtGrabExclusive} XtGrabKind;
-
-typedef struct {
-    Widget  shell_widget;
-    Widget  enable_widget;
-} XtPopdownIDRec, *XtPopdownID;
-
-typedef struct _XtResource {
-    String     resource_name;  /* Resource name                            */
-    String     resource_class; /* Resource class                           */
-    String     resource_type;  /* Representation type desired              */
-    Cardinal   resource_size;  /* Size in bytes of representation          */
-    Cardinal   resource_offset;/* Offset from base to put resource value   */
-    String     default_type;   /* representation type of specified default */
-    XtPointer  default_addr;   /* Address of default resource              */
-} XtResource, *XtResourceList;
-
-typedef void (*XtResourceDefaultProc)(
-    Widget     /* widget */,
-    int                /* offset */,
-    XrmValue*  /* value */
-);
-
-typedef String (*XtLanguageProc)(
-    Display*   /* dpy */,
-    String     /* xnl */,
-    XtPointer  /* client_data */
-);
-
-typedef void (*XtErrorMsgHandler)(
-    String             /* name */,
-    String             /* type */,
-    String             /* class */,
-    String             /* default */,
-    String*            /* params */,
-    Cardinal*          /* num_params */
-);
-
-typedef void (*XtErrorHandler)(
-  String               /* msg */
-);
-
-typedef void (*XtCreatePopupChildProc)(
-    Widget     /* shell */
-);
-
-typedef Boolean (*XtWorkProc)(
-    XtPointer          /* closure */   /* data the application registered */
-);
-
-typedef struct {
-    char match;
-    String substitution;
-} SubstitutionRec, *Substitution;
-
-typedef Boolean (*XtFilePredicate)(
-   String /* filename */
-);
-
-typedef XtPointer XtRequestId;
-
-typedef Boolean (*XtConvertSelectionProc)(
-    Widget             /* widget */,
-    Atom*              /* selection */,
-    Atom*              /* target */,
-    Atom*              /* type_return */,
-    XtPointer*         /* value_return */,
-    unsigned long*     /* length_return */,
-    int*               /* format_return */
-);
-
-typedef void (*XtLoseSelectionProc)(
-    Widget             /* widget */,
-    Atom*              /* selection */
-);
-
-typedef void (*XtSelectionDoneProc)(
-    Widget             /* widget */,
-    Atom*              /* selection */,
-    Atom*              /* target */
-);
-
-typedef void (*XtSelectionCallbackProc)(
-    Widget             /* widget */,
-    XtPointer          /* closure */,
-    Atom*              /* selection */,
-    Atom*              /* type */,
-    XtPointer          /* value */,
-    unsigned long*     /* length */,
-    int*               /* format */
-);
-
-typedef void (*XtLoseSelectionIncrProc)(
-    Widget             /* widget */,
-    Atom*              /* selection */,
-    XtPointer          /* client_data */
-);
-
-typedef void (*XtSelectionDoneIncrProc)(
-    Widget             /* widget */,
-    Atom*              /* selection */,
-    Atom*              /* target */,
-    XtRequestId*       /* receiver_id */,
-    XtPointer          /* client_data */
-);
-
-typedef Boolean (*XtConvertSelectionIncrProc)(
-    Widget             /* widget */,
-    Atom*              /* selection */,
-    Atom*              /* target */,
-    Atom*              /* type */,
-    XtPointer*         /* value */,
-    unsigned long*     /* length */,
-    int*               /* format */,
-    unsigned long*     /* max_length */,
-    XtPointer          /* client_data */,
-    XtRequestId*       /* receiver_id */
-);
-
-typedef void (*XtCancelConvertSelectionProc)(
-    Widget             /* widget */,
-    Atom*              /* selection */,
-    Atom*              /* target */,
-    XtRequestId*       /* receiver_id */,
-    XtPointer          /* client_data */
-);
-
-typedef Boolean (*XtEventDispatchProc)(
-    XEvent*            /* event */
-);
-
-typedef void (*XtExtensionSelectProc)(
-    Widget             /* widget */,
-    int*               /* event_types */,
-    XtPointer*         /* select_data */,
-    int                        /* count */,
-    XtPointer          /* client_data */
-);
-
-/***************************************************************
- *
- * Exported Interfaces
- *
- ****************************************************************/
-
-_XFUNCPROTOBEGIN
-
-extern Boolean XtConvertAndStore(
-    Widget             /* widget */,
-    _Xconst _XtString  /* from_type */,
-    XrmValue*          /* from */,
-    _Xconst _XtString  /* to_type */,
-    XrmValue*          /* to_in_out */
-);
-
-extern Boolean XtCallConverter(
-    Display*           /* dpy */,
-    XtTypeConverter    /* converter */,
-    XrmValuePtr        /* args */,
-    Cardinal           /* num_args */,
-    XrmValuePtr        /* from */,
-    XrmValue*          /* to_in_out */,
-    XtCacheRef*                /* cache_ref_return */
-);
-
-extern Boolean XtDispatchEvent(
-    XEvent*            /* event */
-);
-
-extern Boolean XtCallAcceptFocus(
-    Widget             /* widget */,
-    Time*              /* time */
-);
-
-extern Boolean XtPeekEvent( /* obsolete */
-    XEvent*            /* event_return */
-);
-
-extern Boolean XtAppPeekEvent(
-    XtAppContext       /* app_context */,
-    XEvent*            /* event_return */
-);
-
-extern Boolean XtIsSubclass(
-    Widget             /* widget */,
-    WidgetClass        /* widgetClass */
-);
-
-extern Boolean XtIsObject(
-    Widget             /* object */
-);
-
-extern Boolean _XtCheckSubclassFlag( /* implementation-private */
-    Widget             /* object */,
-    _XtXtEnum          /* type_flag */
-);
-
-extern Boolean _XtIsSubclassOf( /* implementation-private */
-    Widget             /* object */,
-    WidgetClass                /* widget_class */,
-    WidgetClass                /* flag_class */,
-    _XtXtEnum          /* type_flag */
-);
-
-extern Boolean XtIsManaged(
-    Widget             /* rectobj */
-);
-
-extern Boolean XtIsRealized(
-    Widget             /* widget */
-);
-
-extern Boolean XtIsSensitive(
-    Widget             /* widget */
-);
-
-extern Boolean XtOwnSelection(
-    Widget             /* widget */,
-    Atom               /* selection */,
-    Time               /* time */,
-    XtConvertSelectionProc /* convert */,
-    XtLoseSelectionProc        /* lose */,
-    XtSelectionDoneProc /* done */
-);
-
-extern Boolean XtOwnSelectionIncremental(
-    Widget             /* widget */,
-    Atom               /* selection */,
-    Time               /* time */,
-    XtConvertSelectionIncrProc /* convert_callback */,
-    XtLoseSelectionIncrProc    /* lose_callback */,
-    XtSelectionDoneIncrProc    /* done_callback */,
-    XtCancelConvertSelectionProc /* cancel_callback */,
-    XtPointer          /* client_data */
-);
-
-extern XtGeometryResult XtMakeResizeRequest(
-    Widget             /* widget */,
-    _XtDimension       /* width */,
-    _XtDimension       /* height */,
-    Dimension*         /* width_return */,
-    Dimension*         /* height_return */
-);
-
-extern void XtTranslateCoords(
-    Widget             /* widget */,
-    _XtPosition                /* x */,
-    _XtPosition                /* y */,
-    Position*          /* rootx_return */,
-    Position*          /* rooty_return */
-);
-
-extern KeySym* XtGetKeysymTable(
-    Display*           /* dpy */,
-    KeyCode*           /* min_keycode_return */,
-    int*               /* keysyms_per_keycode_return */
-);
-
-extern void XtKeysymToKeycodeList(
-    Display*           /* dpy */,
-    KeySym             /* keysym */,
-    KeyCode**          /* keycodes_return */,
-    Cardinal*          /* keycount_return */
-);
-
-extern void XtStringConversionWarning( /* obsolete */
-    _Xconst _XtString  /* from_value */,
-    _Xconst _XtString  /* to_type */
-);
-
-extern void XtDisplayStringConversionWarning(
-    Display*           /* dpy */,
-    _Xconst _XtString  /* from_value */,
-    _Xconst _XtString  /* to_type */
-);
-
-externalref XtConvertArgRec const colorConvertArgs[];
-externalref XtConvertArgRec const screenConvertArg[];
-
-extern void XtAppAddConverter( /* obsolete */
-    XtAppContext       /* app_context */,
-    _Xconst _XtString  /* from_type */,
-    _Xconst _XtString  /* to_type */,
-    XtConverter        /* converter */,
-    XtConvertArgList   /* convert_args */,
-    Cardinal           /* num_args */
-);
-
-extern void XtAddConverter( /* obsolete */
-    _Xconst _XtString  /* from_type */,
-    _Xconst _XtString  /* to_type */,
-    XtConverter        /* converter */,
-    XtConvertArgList   /* convert_args */,
-    Cardinal           /* num_args */
-);
-
-extern void XtSetTypeConverter(
-    _Xconst _XtString  /* from_type */,
-    _Xconst _XtString  /* to_type */,
-    XtTypeConverter    /* converter */,
-    XtConvertArgList   /* convert_args */,
-    Cardinal           /* num_args */,
-    XtCacheType        /* cache_type */,
-    XtDestructor       /* destructor */
-);
-
-extern void XtAppSetTypeConverter(
-    XtAppContext       /* app_context */,
-    _Xconst _XtString  /* from_type */,
-    _Xconst _XtString  /* to_type */,
-    XtTypeConverter    /* converter */,
-    XtConvertArgList   /* convert_args */,
-    Cardinal           /* num_args */,
-    XtCacheType        /* cache_type */,
-    XtDestructor       /* destructor */
-);
-
-extern void XtConvert( /* obsolete */
-    Widget             /* widget */,
-    _Xconst _XtString  /* from_type */,
-    XrmValue*          /* from */,
-    _Xconst _XtString  /* to_type */,
-    XrmValue*          /* to_return */
-);
-
-extern void XtDirectConvert( /* obsolete */
-    XtConverter        /* converter */,
-    XrmValuePtr        /* args */,
-    Cardinal           /* num_args */,
-    XrmValuePtr        /* from */,
-    XrmValue*          /* to_return */
-);
-
-/****************************************************************
- *
- * Translation Management
- *
- ****************************************************************/
-
-extern XtTranslations XtParseTranslationTable(
-    _Xconst _XtString  /* table */
-);
-
-extern XtAccelerators XtParseAcceleratorTable(
-    _Xconst _XtString  /* source */
-);
-
-extern void XtOverrideTranslations(
-    Widget             /* widget */,
-    XtTranslations     /* translations */
-);
-
-extern void XtAugmentTranslations(
-    Widget             /* widget */,
-    XtTranslations     /* translations */
-);
-
-extern void XtInstallAccelerators(
-    Widget             /* destination */,
-    Widget             /* source */
-);
-
-extern void XtInstallAllAccelerators(
-    Widget             /* destination */,
-    Widget             /* source */
-);
-
-extern void XtUninstallTranslations(
-    Widget             /* widget */
-);
-
-extern void XtAppAddActions(
-    XtAppContext       /* app_context */,
-    XtActionList       /* actions */,
-    Cardinal           /* num_actions */
-);
-
-extern void XtAddActions( /* obsolete */
-    XtActionList       /* actions */,
-    Cardinal           /* num_actions */
-);
-
-extern XtActionHookId XtAppAddActionHook(
-    XtAppContext       /* app_context */,
-    XtActionHookProc   /* proc */,
-    XtPointer          /* client_data */
-);
-
-extern void XtRemoveActionHook(
-    XtActionHookId     /* id */
-);
-
-extern void XtGetActionList(
-    WidgetClass                /* widget_class */,
-    XtActionList*      /* actions_return */,
-    Cardinal*          /* num_actions_return */
-);
-
-extern void XtCallActionProc(
-    Widget             /* widget */,
-    _Xconst _XtString  /* action */,
-    XEvent*            /* event */,
-    String*            /* params */,
-    Cardinal           /* num_params */
-);
-
-extern void XtRegisterGrabAction(
-    XtActionProc       /* action_proc */,
-    _XtBoolean                 /* owner_events */,
-    unsigned int       /* event_mask */,
-    int                        /* pointer_mode */,
-    int                        /* keyboard_mode */
-);
-
-extern void XtSetMultiClickTime(
-    Display*           /* dpy */,
-    int                /* milliseconds */
-);
-
-extern int XtGetMultiClickTime(
-    Display*           /* dpy */
-);
-
-extern KeySym XtGetActionKeysym(
-    XEvent*            /* event */,
-    Modifiers*         /* modifiers_return */
-);
-
-/***************************************************************
- *
- * Keycode and Keysym procedures for translation management
- *
- ****************************************************************/
-
-extern void XtTranslateKeycode(
-    Display*           /* dpy */,
-    _XtKeyCode                 /* keycode */,
-    Modifiers          /* modifiers */,
-    Modifiers*         /* modifiers_return */,
-    KeySym*            /* keysym_return */
-);
-
-extern void XtTranslateKey(
-    Display*           /* dpy */,
-    _XtKeyCode         /* keycode */,
-    Modifiers          /* modifiers */,
-    Modifiers*         /* modifiers_return */,
-    KeySym*            /* keysym_return */
-);
-
-extern void XtSetKeyTranslator(
-    Display*           /* dpy */,
-    XtKeyProc          /* proc */
-);
-
-extern void XtRegisterCaseConverter(
-    Display*           /* dpy */,
-    XtCaseProc                 /* proc */,
-    KeySym             /* start */,
-    KeySym             /* stop */
-);
-
-extern void XtConvertCase(
-    Display*           /* dpy */,
-    KeySym             /* keysym */,
-    KeySym*            /* lower_return */,
-    KeySym*            /* upper_return */
-);
-
-/****************************************************************
- *
- * Event Management
- *
- ****************************************************************/
-
-/* XtAllEvents is valid only for XtRemoveEventHandler and
- * XtRemoveRawEventHandler; don't use it to select events!
- */
-#define XtAllEvents ((EventMask) -1L)
-
-extern void XtAddEventHandler(
-    Widget             /* widget */,
-    EventMask          /* event_mask */,
-    _XtBoolean                 /* nonmaskable */,
-    XtEventHandler     /* proc */,
-    XtPointer          /* closure */
-);
-
-extern void XtRemoveEventHandler(
-    Widget             /* widget */,
-    EventMask          /* event_mask */,
-    _XtBoolean                 /* nonmaskable */,
-    XtEventHandler     /* proc */,
-    XtPointer          /* closure */
-);
-
-extern void XtAddRawEventHandler(
-    Widget             /* widget */,
-    EventMask          /* event_mask */,
-    _XtBoolean                 /* nonmaskable */,
-    XtEventHandler     /* proc */,
-    XtPointer          /* closure */
-);
-
-extern void XtRemoveRawEventHandler(
-    Widget             /* widget */,
-    EventMask          /* event_mask */,
-    _XtBoolean                 /* nonmaskable */,
-    XtEventHandler     /* proc */,
-    XtPointer          /* closure */
-);
-
-extern void XtInsertEventHandler(
-    Widget             /* widget */,
-    EventMask          /* event_mask */,
-    _XtBoolean                 /* nonmaskable */,
-    XtEventHandler     /* proc */,
-    XtPointer          /* closure */,
-    XtListPosition     /* position */
-);
-
-extern void XtInsertRawEventHandler(
-    Widget             /* widget */,
-    EventMask          /* event_mask */,
-    _XtBoolean                 /* nonmaskable */,
-    XtEventHandler     /* proc */,
-    XtPointer          /* closure */,
-    XtListPosition     /* position */
-);
-
-extern XtEventDispatchProc XtSetEventDispatcher(
-    Display*           /* dpy */,
-    int                        /* event_type */,
-    XtEventDispatchProc        /* proc */
-);
-
-extern Boolean XtDispatchEventToWidget(
-    Widget             /* widget */,
-    XEvent*            /* event */
-);
-
-extern void XtInsertEventTypeHandler(
-    Widget             /* widget */,
-    int                        /* type */,
-    XtPointer          /* select_data */,
-    XtEventHandler     /* proc */,
-    XtPointer          /* closure */,
-    XtListPosition     /* position */
-);
-
-extern void XtRemoveEventTypeHandler(
-    Widget             /* widget */,
-    int                        /* type */,
-    XtPointer          /* select_data */,
-    XtEventHandler     /* proc */,
-    XtPointer          /* closure */
-);
-
-extern EventMask XtBuildEventMask(
-    Widget             /* widget */
-);
-
-extern void XtRegisterExtensionSelector(
-    Display*           /* dpy */,
-    int                        /* min_event_type */,
-    int                        /* max_event_type */,
-    XtExtensionSelectProc /* proc */,
-    XtPointer          /* client_data */
-);
-
-extern void XtAddGrab(
-    Widget             /* widget */,
-    _XtBoolean                 /* exclusive */,
-    _XtBoolean                 /* spring_loaded */
-);
-
-extern void XtRemoveGrab(
-    Widget             /* widget */
-);
-
-extern void XtProcessEvent( /* obsolete */
-    XtInputMask                /* mask */
-);
-
-extern void XtAppProcessEvent(
-    XtAppContext               /* app_context */,
-    XtInputMask                /* mask */
-);
-
-extern void XtMainLoop( /* obsolete */
-    void
-);
-
-extern void XtAppMainLoop(
-    XtAppContext               /* app_context */
-);
-
-extern void XtAddExposureToRegion(
-    XEvent*            /* event */,
-    Region             /* region */
-);
-
-extern void XtSetKeyboardFocus(
-    Widget             /* subtree */,
-    Widget             /* descendent */
-);
-
-extern Widget XtGetKeyboardFocusWidget(
-    Widget             /* widget */
-);
-
-extern XEvent* XtLastEventProcessed(
-    Display*           /* dpy */
-);
-
-extern Time XtLastTimestampProcessed(
-    Display*           /* dpy */
-);
-
-/****************************************************************
- *
- * Event Gathering Routines
- *
- ****************************************************************/
-
-extern XtIntervalId XtAddTimeOut( /* obsolete */
-    unsigned long      /* interval */,
-    XtTimerCallbackProc /* proc */,
-    XtPointer          /* closure */
-);
-
-extern XtIntervalId XtAppAddTimeOut(
-    XtAppContext       /* app_context */,
-    unsigned long      /* interval */,
-    XtTimerCallbackProc /* proc */,
-    XtPointer          /* closure */
-);
-
-extern void XtRemoveTimeOut(
-    XtIntervalId       /* timer */
-);
-
-extern XtInputId XtAddInput( /* obsolete */
-    int                /* source */,
-    XtPointer          /* condition */,
-    XtInputCallbackProc /* proc */,
-    XtPointer          /* closure */
-);
-
-extern XtInputId XtAppAddInput(
-    XtAppContext               /* app_context */,
-    int                /* source */,
-    XtPointer          /* condition */,
-    XtInputCallbackProc /* proc */,
-    XtPointer          /* closure */
-);
-
-extern void XtRemoveInput(
-    XtInputId          /* id */
-);
-
-extern XtSignalId XtAddSignal(
-    XtSignalCallbackProc /* proc */,
-    XtPointer          /* closure */);
-
-extern XtSignalId XtAppAddSignal(
-    XtAppContext               /* app_context */,
-    XtSignalCallbackProc /* proc */,
-    XtPointer          /* closure */
-);
-
-extern void XtRemoveSignal(
-    XtSignalId                 /* id */
-);
-
-extern void XtNoticeSignal(
-    XtSignalId         /* id */
-);
-
-extern void XtNextEvent( /* obsolete */
-    XEvent*            /* event */
-);
-
-extern void XtAppNextEvent(
-    XtAppContext       /* app_context */,
-    XEvent*            /* event_return */
-);
-
-#define XtIMXEvent             1
-#define XtIMTimer              2
-#define XtIMAlternateInput     4
-#define XtIMSignal             8
-#define XtIMAll (XtIMXEvent | XtIMTimer | XtIMAlternateInput | XtIMSignal)
-
-extern Boolean XtPending( /* obsolete */
-    void
-);
-
-extern XtInputMask XtAppPending(
-    XtAppContext       /* app_context */
-);
-
-extern XtBlockHookId XtAppAddBlockHook(
-    XtAppContext       /* app_context */,
-    XtBlockHookProc    /* proc */,
-    XtPointer          /* client_data */
-);
-
-extern void XtRemoveBlockHook(
-    XtBlockHookId      /* id */
-);
-
-/****************************************************************
- *
- * Random utility routines
- *
- ****************************************************************/
-
-#define XtIsRectObj(object)    (_XtCheckSubclassFlag(object, (XtEnum)0x02))
-#define XtIsWidget(object)     (_XtCheckSubclassFlag(object, (XtEnum)0x04))
-#define XtIsComposite(widget)  (_XtCheckSubclassFlag(widget, (XtEnum)0x08))
-#define XtIsConstraint(widget) (_XtCheckSubclassFlag(widget, (XtEnum)0x10))
-#define XtIsShell(widget)      (_XtCheckSubclassFlag(widget, (XtEnum)0x20))
-
-#undef XtIsOverrideShell
-extern Boolean XtIsOverrideShell(Widget /* object */);
-#define XtIsOverrideShell(widget) \
-    (_XtIsSubclassOf(widg