Merge a bunch of stuff over from the tuxscreen buildroot, with

many updates to make things be more consistant.
 -Erik

3 files changed, 344 insertions, 0 deletions

diff --git a/sources/netkittelnet.patch b/sources/netkittelnet.patch
new file mode 100644
index 000000000..00fe03fd4
--- /dev/null
+++ b/sources/netkittelnet.patch
@@ -0,0 +1,117 @@
+--- netkit-telnet-0.17/configure	Thu Apr 11 10:40:58 2002
++++ FIXEDnetkittelnet/configure	Thu Apr 11 10:39:59 2002
+@@ -78,7 +78,6 @@
+     for TRY in egcs gcc g++ CC c++ cc; do
+        (
+            $TRY __conftest.c -o __conftest || exit 1;
+-           ./__conftest || exit 1;
+        ) >/dev/null 2>&1 || continue;
+        CC=$TRY
+        break;
+@@ -94,7 +93,6 @@
+     echo -n 'Checking if C compiler works... '
+     if (
+           $CC __conftest.c -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+          echo 'yes'
+      else
+@@ -125,7 +123,6 @@
+     for TRY in egcs gcc g++ CC c++ cc; do
+        (
+            $TRY __conftest.cc -o __conftest || exit 1;
+-           ./__conftest || exit 1;
+        ) >/dev/null 2>&1 || continue;
+        CXX=$TRY
+        break;
+@@ -141,7 +138,6 @@
+     echo -n 'Checking if C++ compiler works... '
+     if (
+           $CXX __conftest.cc -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+          echo 'yes'
+      else
+@@ -278,13 +274,11 @@
+ EOF
+ if (
+       $CXX $CXXFLAGS  __conftest.cc  -o __conftest || exit 1
+-      ./__conftest || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'yes'
+ else
+     if (
+           $CXX $CXXFLAGS -D__USE_BSD_SIGNAL __conftest.cc  -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-D__USE_BSD_SIGNAL'
+         CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL"
+@@ -292,6 +286,7 @@
+     else
+         echo 'no'
+         echo 'This package needs BSD signal semantics to run.'
++		echo "$CXX $CXXFLAGS  -D__USE_BSD_SIGNAL __conftest.cc  -o __conftest failed"
+         rm -f __conftest*
+         exit
+     fi
+@@ -330,31 +325,6 @@
+         echo 'no'
+     fi
+ fi
+-
+-if [ x$NCURSES != x ]; then
+-    LIBTERMCAP=-lncurses
+-else
+-    echo -n 'Checking for traditional termcap... '
+-cat <<EOF >__conftest.cc
+-#include <stdio.h>
+-#include <termcap.h>
+-int main(void) {
+-    tgetent(NULL, NULL); return 0;
+-}
+-
+-EOF
+-    if (
+-          $CXX $CXXFLAGS  __conftest.cc -ltermcap -o __conftest || exit 1
+-       ) >/dev/null 2>&1; then
+-        echo '-ltermcap'
+-        LIBTERMCAP=-ltermcap
+-    else
+-        echo 'not found'
+-        echo 'This package needs termcap to run.'
+-        rm -f __conftest*
+-        exit
+-    fi
+-fi
+ rm -f __conftest*
+ 
+ ##################################################
+@@ -468,7 +438,6 @@
+ else
+     if (
+           $CXX $CXXFLAGS -D_GNU_SOURCE __conftest.cc  -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-D_GNU_SOURCE'
+         CFLAGS="$CFLAGS -D_GNU_SOURCE"
+@@ -501,20 +470,17 @@
+ EOF
+ if (
+       $CXX $CXXFLAGS  __conftest.cc $LIBBSD -o __conftest || exit 1
+-      ./__conftest || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'ok'
+ else
+     if (
+           $CXX $CXXFLAGS  __conftest.cc -lsnprintf $LIBBSD -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-lsnprintf'
+         LIBS="$LIBS -lsnprintf"
+     else
+         if (
+               $CXX $CXXFLAGS  __conftest.cc -ldb $LIBBSD -o __conftest || exit 1
+-              ./__conftest || exit 1
+            ) >/dev/null 2>&1; then
+             echo '-ldb'
+             LIBS="$LIBS -ldb"
diff --git a/sources/pcmcia.patch b/sources/pcmcia.patch
new file mode 100644
index 000000000..42a16175d
--- /dev/null
+++ b/sources/pcmcia.patch
@@ -0,0 +1,54 @@
+diff -urN pcmcia-cs-3.1.33.orig/etc/shared pcmcia-cs-3.1.33/etc/shared
+--- pcmcia-cs-3.1.33.orig/etc/shared	Thu Nov 22 11:25:24 2001
++++ pcmcia-cs-3.1.33/etc/shared	Mon Apr 15 00:39:47 2002
+@@ -2,6 +2,8 @@
+ # shared 1.28 2001/08/23 00:43:17 (David Hinds)
+ #
+ 
++umask 022
++
+ usage ()
+ {
+     echo "usage: $0 [action] [device name]"
+--- pcmcia-cs-3.1.34/etc/config.opts.orig	Tue Jul  9 09:36:23 2002
++++ pcmcia-cs-3.1.34/etc/config.opts	Tue Jul  9 09:37:47 2002
+@@ -5,7 +5,7 @@
+ 
+ # System resources available for PCMCIA devices
+ 
+-include port 0x100-0x4ff, port 0x800-0x8ff, port 0xc00-0xcff
++include port 0x100-0x4ff, port 0xc00-0xcff
+ include memory 0xc0000-0xfffff
+ include memory 0xa0000000-0xa0ffffff, memory 0x60000000-0x60ffffff
+ 
+@@ -22,7 +22,7 @@
+ # Second built-in serial port
+ #exclude irq 3
+ # First built-in parallel port
+-exclude irq 7
++#exclude irq 7
+ 
+ #----------------------------------------------------------------------
+ 
+@@ -36,7 +36,7 @@
+ 
+ # Options for Raylink/WebGear driver: uncomment only one line...
+ # Generic ad-hoc network
+-module "ray_cs" opts "essid=ADHOC_ESSID hop_dwell=128 beacon_period=256 translate=1"
++#module "ray_cs" opts "essid=ADHOC_ESSID hop_dwell=128 beacon_period=256 translate=1"
+ # Infrastructure network for older cards
+ #module "ray_cs" opts "net_type=1 essid=ESSID1"
+ # Infrastructure network for WebGear
+--- pcmcia-cs-3.2.1/Configure.orig	Thu Aug  8 00:38:15 2002
++++ pcmcia-cs-3.2.1/Configure	Tue Sep 10 05:41:24 2002
+@@ -669,6 +669,10 @@
+      >/dev/null 2>&1 ; then
+     CONFIG_IEEE1394=n
+ fi
++
++# Hack to disable network stuff for the time being...
++CONFIG_INET=n
++
+ printconfig
+ echo ""
+ 
diff --git a/sources/tinyx-011010.patch b/sources/tinyx-011010.patch
new file mode 100644
index 000000000..3040b3dd4
--- /dev/null
+++ b/sources/tinyx-011010.patch
@@ -0,0 +1,173 @@
+diff -Nur --exclude=CVS xc-011010.src/include/extensions/lbxstr.h xc-011010/include/extensions/lbxstr.h
+--- xc-011010.src/include/extensions/lbxstr.h	Tue Jul 31 20:44:35 2001
++++ xc-011010/include/extensions/lbxstr.h	Sun Apr 21 12:35:05 2002
+@@ -25,7 +25,7 @@
+ #ifndef _LBXSTR_H_
+ #define _LBXSTR_H_
+ 
+-#include <X11/extensions/XLbx.h>
++#include "XLbx.h"
+ 
+ #define LBXNAME "LBX"
+ 
+diff -Nur --exclude=CVS xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h
+--- xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h	Sun Jun  3 17:52:45 2001
++++ xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h	Sun Apr 21 12:36:25 2002
+@@ -29,6 +29,7 @@
+ #include <linux/fb.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
++#include <sys/types.h>
+ #include "kdrive.h"
+ #include "layer.h"
+
+diff -Nur xc-011010.src2/lib/X11/Xlib.h xc-011010/lib/X11/Xlib.h
+--- xc-011010.src/programs/Xserver/hw/kdrive/linux/ts.c	Tue Jul 10 22:58:19 2001
++++ xc-011010/programs/Xserver/hw/kdrive/linux/ts.c	Tue Apr 23 20:16:23 2002
+@@ -33,65 +33,48 @@
+ #include "kdrive.h"
+ #include "Xpoll.h"
+ #include <sys/ioctl.h>
+-#include <linux/h3600_ts.h>	/* touch screen events */
++
++typedef struct {
++  unsigned short          pressure;
++  unsigned short          x;
++  unsigned short          y;
++  unsigned short          pad;
++  struct timeval  stamp;
++} TS_EVENT;
+ 
+ static long lastx = 0, lasty = 0;
+ int TsScreen;
+ extern int TsFbdev;
+ 
+-void
+-TsRead (int tsPort, void *closure)
+-{
+-    TS_EVENT	    event;
+-    long	    buf[3];
+-    int		    n;
+-    long	    pressure;
+-    long	    x, y;
+-    unsigned long   flags;
+-    unsigned long   buttons;
+-
+-    n = Ps2ReadBytes (tsPort, (char *) &event, 
+-			 sizeof (event), sizeof (event));
+-    if (n == sizeof (event))  
+-    {
+-	if (event.pressure) 
+-	{
+-	    /* 
+-	     * HACK ATTACK.  (static global variables used !)
+-	     * Here we test for the touch screen driver actually being on the
+-	     * touch screen, if it is we send absolute coordinates. If not,
+-	     * then we send delta's so that we can track the entire vga screen.
+-	     */
+-	    if (TsScreen == TsFbdev) {
+-	    	flags = KD_BUTTON_1;
+-	    	x = event.x;
+-	    	y = event.y;
+-	    } else {
+-	    	flags = /* KD_BUTTON_1 |*/ KD_MOUSE_DELTA;
+-	    	if ((lastx == 0) || (lasty == 0)) {
+-	    	    x = 0;
+-	    	    y = 0;
+-	    	} else {
+-	    	    x = event.x - lastx;
+-	    	    y = event.y - lasty;
+-	    	}
+-	    	lastx = event.x;
+-	    	lasty = event.y;
+-	    }
+-	} else {
+-	    flags = KD_MOUSE_DELTA;
+-	    x = 0;
+-	    y = 0;
+-	    lastx = 0;
+-	    lasty = 0;
+-	}
+-	KdEnqueueMouseEvent (flags, x, y);
++void TsRead (int tsPort, void *closure) {
++  TS_EVENT        event;
++  long            buf[3];
++  int             n;
++  long            pressure;
++  long            x, y;
++  unsigned long   flags;
++  unsigned long   buttons;
++
++  n = Ps2ReadBytes(tsPort, (char *) &event, sizeof (event), sizeof (event));
++  if (n >= sizeof (event)) {
++    if (event.pressure >= 100) {
++      flags = KD_BUTTON_1;
++      x = (960 - event.x) * 640 / (920);
++      y = (960 - event.y) * 480 / (920);
++      //ErrorF("flags %d x %d y %dn",flags,event.x,event.y);
++    }
++    else {
++      flags = KD_MOUSE_DELTA;
++      x = lastx;
++      y = lasty;
+     }
++    KdEnqueueMouseEvent(flags, x, y);
++  }
+ }
+ 
+ char	*TsNames[] = {
+-  "/dev/ts",	
+-  "/dev/h3600_ts" /* temporary name; note this code can try
++  "/dev/ucb1x00-ts",
++  "/dev/ts" /* temporary name; note this code can try
+ 			   to open more than one device */
+ };
+ 
+@@ -99,9 +82,7 @@
+ 
+ int TsInputType;
+ 
+-int
+-TsInit (void)
+-{
++int TsInit (void) {
+     int	    i;
+     int	    TsPort;
+ 
+diff -Nur xc-011010.src/startx xc-011010/startx
+--- ../../buildroot-tux.Apr25-1/build/xc-011010.src/startx	Thu Apr 25 05:20:35 2002
++++ xc-011010/startx	Sun Apr 28 05:35:35 2002
+@@ -0,0 +1,11 @@
++#!/bin/sh
++killall Xfbdev
++sleep 1
++export DISPLAY=":0"
++/usr/X11R6/bin/Xfbdev -ac &
++sleep 4
++/usr/X11R6/bin/matchbox &
++sleep 1
++/usr/X11R6/bin/minisys &
++/usr/X11R6/bin/minitime &
++/usr/X11R6/bin/rxvt &
+diff -Nur xc-011010.src/lib/Xft/xftgram.y xc-011010/lib/Xft/xftgram.y
+--- ../../buildroot-tux.Apr25-1/build/xc-011010/lib/Xft/xftgram.y	Thu Apr 25 05:20:35 2002
++++ xc-011010/lib/Xft/xftgram.y	Sun Apr 28 05:35:35 2002
+@@ -165,6 +165,7 @@
+ 		    matrix.yx = $4;
+ 		    matrix.__REALLY_YY__ = $5;
+ 		}
++	;
+ number	:   INTEGER
+ 		{ $$ = (double) $1; }
+ 	|   DOUBLE
+diff -Nur xc-011010.src/programs/twm/gram.y xc-011010/programs/twm/gram.y
+--- ../../buildroot-tux.Apr25-1/build/xc-011010/programs/twm/gram.y	Thu Apr 25 05:20:35 2002
++++ xc-011010/programs/twm/gram.y	Sun Apr 28 05:35:35 2002
+@@ -650,6 +650,7 @@
+ 					  RemoveDQuote(ptr);
+ 					  $$ = ptr;
+ 					}
++		;
+ number		: NUMBER		{ $$ = $1; }
+ 		;
+