merge of 8893b7644179a244e95e78cea49c28cecbedc8b2

and 9ef371d5ab888cd926919c7bf505d283e4f19f54
author: Rene Wagner <rw@handhelds.org> 2005-08-02 11:43:25 +0000
committer: OpenEmbedded Project <openembedded-devel@lists.openembedded.org> 2005-08-02 11:43:25 +0000
commit: fec6d9b12d01c5a1c450108ffb838335862a4051 (patch)
tree: 1304c6e8f62cb2989e781ea73bdc848c5f00d125 /packages
parent: a4dc9b83d233a7b07e920e0eeceffdcf2053ab02 (diff)
parent: 0bef08582a7aa3378ba6cb4d1899dd9ae7267483 (diff)
163 files changed, 2747 insertions, 2954 deletions
diff --git a/packages/hdparm/hdparm-5.4/.mtn2git_empty b/packages/at76c503a/at76c503a-modules/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.4/.mtn2git_empty
+++ b/packages/at76c503a/at76c503a-modules/.mtn2git_empty
diff --git a/packages/at76c503a/at76c503a-modules/makefile.cc.patch b/packages/at76c503a/at76c503a-modules/makefile.cc.patch
new file mode 100644
index 0000000000..c7a41990d3
--- /dev/null
+++ b/packages/at76c503a/at76c503a-modules/makefile.cc.patch
@@ -0,0 +1,11 @@
+--- at76c503a/Makefile.old	2005-07-29 21:57:34.000000000 +0200
++++ at76c503a/Makefile	2005-07-29 21:57:43.000000000 +0200
+@@ -9,7 +9,7 @@
+ #	the License, or (at your option) any later version.
+ #
+ 
+-CC=gcc
++#CC=gcc
+ 
+ ifneq (,$(KVERS))
+  KERNEL_VERSION=$(KVERS)
diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb
index 9673e5fb1b..5e56c4787a 100644
--- a/packages/at76c503a/at76c503a-modules_cvs.bb
+++ b/packages/at76c503a/at76c503a-modules_cvs.bb
@@ -1,14 +1,17 @@
 SECTION = "base"
 LICENSE = "GPL"
-SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a"
+SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \
+	   file://makefile.cc.patch;patch=1"
 S = "${WORKDIR}/at76c503a"
-PR = "r1"
+PR = "r2"
 PV = "0.0cvs${CVSDATE}"
 
 inherit module
 
-MODULES = "at76c503.o at76_usbdfu.o at76c503-i3861.o at76c503-rfmd.o at76c503-rfmd-acc.o \
-           at76c505-rfmd.o at76c503-i3863.o at76c505-rfmd2958.o"
+MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \
+	at76c505-rfmd at76c503-i3863 at76c505-rfmd2958"
+MODULES_EXTENSION = "o"
+MODULES_EXTENSION_kernel26 = "ko"
 
 pkg_postinst() {
 #!/bin/sh
@@ -25,8 +28,9 @@ update-modules || true
 
 do_install() {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
-	for i in ${MODULES}; do install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/$i; done
-
+	for i in ${MODULES}; do
+		install -m 0644 $i.${MODULES_EXTENSION} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
+	done
 	if [ "${MACHINE}" = "h3900" ]; then
 		install -d ${D}${sysconfdir}/modutils
 		echo "at76c503-rfmd" > ${D}${sysconfdir}/modutils/at76c503-rfmd
diff --git a/packages/base-files/base-files/profile b/packages/base-files/base-files/profile
index f24fec92ca..a4c16944b9 100644
--- a/packages/base-files/base-files/profile
+++ b/packages/base-files/base-files/profile
@@ -5,6 +5,12 @@ PATH="/usr/local/bin:/usr/bin:/bin"
 EDITOR="/bin/vi"	# needed for packages like cron
 TERM="vt100"		# Basic terminal capab. For screen etc.
 
+if [ ! -e /etc/localtime ]; then
+	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+				# for an explanation of how to set this to your local timezone.
+	export TZ
+fi
+
 if [ "`id -u`" -eq 0 ]; then
    PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
 fi
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index ec58e08bef..144bf2e135 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r38"
+PR = "r39"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/hdparm/hdparm-5.8/.mtn2git_empty b/packages/bwmon/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.8/.mtn2git_empty
+++ b/packages/bwmon/.mtn2git_empty
diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb
new file mode 100644
index 0000000000..25271641e7
--- /dev/null
+++ b/packages/bwmon/bwmon_1.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "The Linux bandwidth monitor"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+DEPENDS = "ncurses"
+
+LICENSE = "Unspecified"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \
+	   file://makefile.patch;patch=1"
+EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}"
+
+inherit autotools
+
+do_install () {
+	install ${S}/bwmon ${D}/usr/bin/bwmon
+}
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty b/packages/bwmon/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty
+++ b/packages/bwmon/files/.mtn2git_empty
diff --git a/packages/bwmon/files/makefile.patch b/packages/bwmon/files/makefile.patch
new file mode 100644
index 0000000000..b8e2b7abdc
--- /dev/null
+++ b/packages/bwmon/files/makefile.patch
@@ -0,0 +1,18 @@
+--- bwmon-1.3/src/Makefile	2002-05-03 12:11:52.000000000 +0200
++++ /home/repvik/Makefile	2005-08-02 04:17:43.021622816 +0200
+@@ -6,12 +6,12 @@
+ # I used to provide a version for non-curses
+ # but I do not anymore
+ 
+-CC = gcc
++#CC = gcc
+ RM = /bin/rm
+-INSTALL = install
++#INSTALL = install
+ 
+ CFLAGS = -I../include -Wall -D__THREADS
+-LDFLAGS = -lpthread -lncurses 
++LDFLAGS += -lpthread -lncurses
+ 
+ SRC = bwmon.c
+ OBJS = $(SRC:.c=.o)
diff --git a/packages/nonworking/tetex/.mtn2git_empty b/packages/ccxstream/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/tetex/.mtn2git_empty
+++ b/packages/ccxstream/.mtn2git_empty
diff --git a/packages/nonworking/tetex/tetex-2.0.2/.mtn2git_empty b/packages/ccxstream/ccxstream-1.0.15/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/tetex/tetex-2.0.2/.mtn2git_empty
+++ b/packages/ccxstream/ccxstream-1.0.15/.mtn2git_empty
diff --git a/packages/ccxstream/ccxstream-1.0.15/ccxstream-termcap.patch b/packages/ccxstream/ccxstream-1.0.15/ccxstream-termcap.patch
new file mode 100644
index 0000000000..c392a6a0b8
--- /dev/null
+++ b/packages/ccxstream/ccxstream-1.0.15/ccxstream-termcap.patch
@@ -0,0 +1,11 @@
+--- ccxstream-1.0.15/Makefile.orig	2003-12-27 04:57:23.733355080 +0000
++++ ccxstream-1.0.15/Makefile	2003-12-27 04:57:34.506717280 +0000
+@@ -22,7 +22,7 @@
+ #
+ 
+ CFLAGS+=-I. -g
+-LDFLAGS+=-lreadline -ltermcap
++LDFLAGS+=-lreadline -lncurses
+ 
+ all: ccxstream ccxtest
+ 
diff --git a/packages/ccxstream/ccxstream-1.0.15/ccxstream.conf b/packages/ccxstream/ccxstream-1.0.15/ccxstream.conf
new file mode 100644
index 0000000000..29928e69d2
--- /dev/null
+++ b/packages/ccxstream/ccxstream-1.0.15/ccxstream.conf
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+#Uncomment the line below to begin (mandatory)
+#CHECK=YES
+
+#Below the user to run the service as (mandatory)
+RUNASUSER="root"
+
+#Below the password on the XBOX (optional)
+#REMOTEPASS="xboxpassword" 
+
+#Below the interface to listen on (mandatory)
+LISTENINTERFACE="192.168.1.1"
+
+FOLLOWSYMLINKS=YES
+
+#Comment (optional)
+#SERVERCOMMENT="Video and MP3 server powered by Gentoo. Watch and listen and ENJOY."
+
+#Shares to make available (mandatory)
+SHARES="movies=/data/videos audio=/data/mp3"
+
+#Location of binary file. Leave default unless you know what you're doing (mandatory)
+BIN="/usr/sbin/ccxstream"
+
+#-----------------------------------------------------------------------------#
+#-----------------------------------------------------------------------------#
+
+DIR="-"
+
+PIDFILE=/var/run/ccxstream.pid
+
+PARAMS="-f -F $PIDFILE -r $DIR -u $RUNASUSER"
+
+if test "$FOLLOWSYMLINKS" = "YES" ; then
+    PARAMS="$PARAMS -L"
+fi
+
+if test "x$REMOTEPASS" != "x" ; then
+    PARAMS="$PARAMS -P $REMOTEPASS"
+fi
+
+if test "x$LISTENINTERFACE" != "x" ; then
+    PARAMS="$PARAMS -l $LISTENINTERFACE"
+fi
+
+for i in $SHARES ; do
+    PARAMS="$PARAMS -S $i"
+done
+
+if test "x$SERVERCOMMENT" = "x" ; then
+    SERVERCOMMENT="$(hostname -f)"
+fi
+			    
diff --git a/packages/ccxstream/ccxstream-1.0.15/ccxstream.init b/packages/ccxstream/ccxstream-1.0.15/ccxstream.init
new file mode 100644
index 0000000000..f57752825d
--- /dev/null
+++ b/packages/ccxstream/ccxstream-1.0.15/ccxstream.init
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+start() {
+        . /etc/ccxstream.conf
+        if [ "${CHECK}" = "YES" ] ; then
+
+            echo -n "Starting ccXstream : "
+            start-stop-daemon --start --quiet --exec ${BIN} \
+            -- ${PARAMS} -C ${SERVERCOMMENT}
+            status="$?"
+            test ${status} = "0" && echo OK || echo FAILED
+            return ${status}
+        else
+            echo "Please setup /etc/ccxstream.conf before starting ccXstream"
+            return 1
+        fi
+}
+
+stop() {
+        echo -n "Stopping ccXstream : "
+        start-stop-daemon --stop --quiet --pidfile /var/run/ccxstream.pid
+        return $?
+}
+
+case $1 in
+        start)
+                start
+        ;;
+        stop)
+                stop
+        ;;
+        restart)
+                stop
+                start
+        ;;
+esac
+
diff --git a/packages/ccxstream/ccxstream_1.0.15.bb b/packages/ccxstream/ccxstream_1.0.15.bb
new file mode 100644
index 0000000000..751e0412c5
--- /dev/null
+++ b/packages/ccxstream/ccxstream_1.0.15.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "XStream Server"
+
+LICENSE = "GPL-2"
+PR = "r1"
+
+SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \
+	file://ccxstream-termcap.patch;patch=1 \
+	file://ccxstream.init \
+	file://ccxstream.conf"
+
+inherit autotools
+
+do_install() {
+	# add startup and sample config
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sbindir}
+	install -m 0755 ${WORKDIR}/ccxstream.init ${D}${sysconfdir}/init.d/ccxstream
+	install -m 0644 ${WORKDIR}/ccxstream.conf ${D}${sysconfdir}/ccxstream.conf
+	install -m 0755 ccxstream ${D}${sbindir}/ccxstream || exit 1
+}
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index 09d267a9c8..66c1c19079 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,12 +1,17 @@
 SECTION = "console/network"
-DEPENDS = "cyrus-sasl db"
+DEPENDS = "cyrus-sasl db3"
 LICENSE = "BSD"
-PR = "r2"
+PR = "r3"
 DEPENDS += "install-native"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
-           file://tail.patch;patch=1"
+           file://tail.patch;patch=1 \
+	   file://cyrus \
+	   file://cyrus.conf_2.2 \
+	   file://imapd.conf_2.2 \
+	   file://volatiles \
+	   "
 
 inherit autotools
 
@@ -23,3 +28,20 @@ TARGET_CPPFLAGS =+ "-I${STAGING_DIR}/${TARGET_SYS}/include/db4"
 # All, lib/foo.c includes <config.h> from the top level directory and
 # is natively compiled
 BUILD_CPPFLAGS += " -I${S} -I${S}/et"
+
+do_install_append () {
+	install -m 755 ${WORKDIR}/cyrus ${D}${sysconfdir}/init.d/cyrus
+	install -m 644 ${WORKDIR}/cyrus.conf_2.2 ${D}${sysconfdir}/cyrus.conf
+	install -m 644 ${WORKDIR}/imapd.conf_2.2 ${D}${sysconfdir}/imapd.conf
+	install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_cyrus-imapd
+}
+
+pkg_postinst () {
+	/etc/init.d/populate-volatile.sh
+	update-rc.d cyrus start 56 3 4 5 . stop 15 0 1 6 .
+	/etc/init.d/cyrus start
+}
+
+pkg_postrm () {
+}
+
diff --git a/packages/unionfs/unionfs-1.0.7/.mtn2git_empty b/packages/cyrus-imapd/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/unionfs/unionfs-1.0.7/.mtn2git_empty
+++ b/packages/cyrus-imapd/files/.mtn2git_empty
diff --git a/packages/cyrus-imapd/files/cyrus b/packages/cyrus-imapd/files/cyrus
new file mode 100755
index 0000000000..03ba55aa9c
--- /dev/null
+++ b/packages/cyrus-imapd/files/cyrus
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/cyrus/bin
+DAEMON=/usr/cyrus/bin/master
+NAME=master
+DESC="Cyrus IMAP Master Daemon"
+
+case "$1" in
+  start)
+        echo -n "Starting $DESC: $NAME"
+        start-stop-daemon --start --quiet --background --pidfile /var/run/$NAME.pid  --exec $DAEMON
+        echo "."
+        ;;
+  stop)
+        echo -n "Stopping $DESC: $NAME "
+        start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON
+        sleep 1
+        killall imapd pop3d timsieved master lmtpd notifyd 2>/dev/null
+        echo "."
+        ;;
+  reload|force-reload)
+        echo "Reloading $DESC configuration..."
+        start-stop-daemon --stop --signal 1 --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON
+        echo "done."
+        ;;
+  restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+  *)
+        N=/etc/init.d/$NAME
+        echo "Usage: $N {start|stop|reload|restart|force-reload}" >&2
+        exit 1
+        ;;
+esac
+exit 0
+
diff --git a/packages/cyrus-imapd/files/cyrus.conf_2.2 b/packages/cyrus-imapd/files/cyrus.conf_2.2
new file mode 100644
index 0000000000..13e635a1ba
--- /dev/null
+++ b/packages/cyrus-imapd/files/cyrus.conf_2.2
@@ -0,0 +1,42 @@
+# Standard standalone server configuration.
+
+START {
+  # Do not delete this entry!
+  recover       cmd="ctl_cyrusdb -r"
+
+  # This is only necessary if using idled for IMAP IDLE.
+  #idled                cmd="idled"
+}
+
+# UNIX sockets start with a slash and are put into /var/imap/socket.
+SERVICES {
+  # Add or remove based on preferences.
+  imap          cmd="imapd" listen="imap2" prefork=0
+  #pop3          cmd="pop3d" listen="pop-3" prefork=0
+
+  # Don't forget to generate the needed keys for SSL or TLS
+  # (see doc/html/install-configure.html).
+  #imaps                cmd="imapd -s" listen="imaps" prefork=0
+  #pop3s                cmd="pop3d -s" listen="pop3s" prefork=0
+
+  #sieve         cmd="timsieved" listen="sieve" prefork=0
+
+  # at least one LMTP is required for delivery
+  #lmtp         cmd="lmtpd" listen="lmtp" prefork=0
+  lmtpunix      cmd="lmtpd" listen="/cyrus/tmp/socket/lmtp" prefork=0
+
+  # this is only necessary if using notifications
+  #notify       cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
+}
+
+EVENTS {
+  # This is required.
+  checkpoint    cmd="ctl_cyrusdb -c" period=30
+
+  # This is only necessary if using duplicate delivery suppression.
+  delprune      cmd="ctl_deliver -E 3" period=1440
+
+  # This is only necessary if caching TLS sessions.
+  #tlsprune      cmd="tls_prune" period=1440
+}
+
diff --git a/packages/cyrus-imapd/files/imapd.conf_2.2 b/packages/cyrus-imapd/files/imapd.conf_2.2
new file mode 100644
index 0000000000..5cf4ca9135
--- /dev/null
+++ b/packages/cyrus-imapd/files/imapd.conf_2.2
@@ -0,0 +1,50 @@
+# Don't forget to use chattr +S (if you are using ext[23])
+# when you change these directories (read the docs).
+
+# Configuration directory
+configdirectory:        /var/lib/cyrus
+
+# Which partition to use for default mailboxes
+defaultpartition: default
+partition-default:      /var/spool/cyrus/mail
+
+sievedir:               /var/lib/cyrus/sieve
+
+## News setup
+#partition-news:	/var/spool/cyrus/news
+#newsspool:		/var/spool/news
+
+
+tls_ca_path:            /etc/ssl/certs
+tls_cert_file:          /etc/ssl/cyrus/server.crt
+tls_key_file:           /etc/ssl/cyrus/server.key
+
+# Who has the right to create Mailboxes
+admins:                 cyrus root
+
+hashimapspool:          yes
+allowanonymouslogin:    no
+allowplaintext:         yes
+
+# Minimum time between POP mail fetches in minutes
+popminpoll: 1
+
+# umask used by Cyrus programs
+umask: 077
+
+# Allow renaming of top-level mailboxes.
+#allowusermoves:         yes
+
+# Use this if sieve-scripts could be in ~user/.sieve.
+#sieveusehomedir:       yes
+
+#sasl_pwcheck_method:   saslauthd
+
+## all possible values.
+#sasl_mech_list: LOGIN PLAIN CRAM-MD5 DIGEST-MD5 NTLM
+## or limit to CRAM-MD5 only
+#sasl_mech_list: CRAM-MD5
+
+# This program will be used to send out Mails
+sendmail: /usr/sbin/sendmail
+
diff --git a/packages/cyrus-imapd/files/volatiles b/packages/cyrus-imapd/files/volatiles
new file mode 100644
index 0000000000..f707ff5519
--- /dev/null
+++ b/packages/cyrus-imapd/files/volatiles
@@ -0,0 +1,63 @@
+d cyrus mail 0750 /var/lib/cyrus
+d cyrus root 0755 /var/lib/cyrus/db
+d cyrus mail 0755 /var/lib/cyrus/proc
+d cyrus mail 0755 /var/lib/cyrus/sieve
+# if only i could: d cyrus mail 0755 /var/lib/cyrus/sieve/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
+d cyrus mail 0755 /var/lib/cyrus/sieve/a
+d cyrus mail 0755 /var/lib/cyrus/sieve/b
+d cyrus mail 0755 /var/lib/cyrus/sieve/c
+d cyrus mail 0755 /var/lib/cyrus/sieve/d
+d cyrus mail 0755 /var/lib/cyrus/sieve/e
+d cyrus mail 0755 /var/lib/cyrus/sieve/f
+d cyrus mail 0755 /var/lib/cyrus/sieve/g
+d cyrus mail 0755 /var/lib/cyrus/sieve/h
+d cyrus mail 0755 /var/lib/cyrus/sieve/i
+d cyrus mail 0755 /var/lib/cyrus/sieve/j
+d cyrus mail 0755 /var/lib/cyrus/sieve/k
+d cyrus mail 0755 /var/lib/cyrus/sieve/l
+d cyrus mail 0755 /var/lib/cyrus/sieve/m
+d cyrus mail 0755 /var/lib/cyrus/sieve/n
+d cyrus mail 0755 /var/lib/cyrus/sieve/o
+d cyrus mail 0755 /var/lib/cyrus/sieve/p
+d cyrus mail 0755 /var/lib/cyrus/sieve/q
+d cyrus mail 0755 /var/lib/cyrus/sieve/r
+d cyrus mail 0755 /var/lib/cyrus/sieve/s
+d cyrus mail 0755 /var/lib/cyrus/sieve/t
+d cyrus mail 0755 /var/lib/cyrus/sieve/u
+d cyrus mail 0755 /var/lib/cyrus/sieve/v
+d cyrus mail 0755 /var/lib/cyrus/sieve/w
+d cyrus mail 0755 /var/lib/cyrus/sieve/x
+d cyrus mail 0755 /var/lib/cyrus/sieve/y
+d cyrus mail 0755 /var/lib/cyrus/sieve/z
+d cyrus root 0755 /var/lib/cyrus/socket
+d cyrus mail 0755 /var/lib/cyrus/user
+# if only i could: d cyrus mail 0755 /var/lib/cyrus/user/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
+d cyrus mail 0755 /var/lib/cyrus/user/a
+d cyrus mail 0755 /var/lib/cyrus/user/b
+d cyrus mail 0755 /var/lib/cyrus/user/c
+d cyrus mail 0755 /var/lib/cyrus/user/d
+d cyrus mail 0755 /var/lib/cyrus/user/e
+d cyrus mail 0755 /var/lib/cyrus/user/f
+d cyrus mail 0755 /var/lib/cyrus/user/g
+d cyrus mail 0755 /var/lib/cyrus/user/h
+d cyrus mail 0755 /var/lib/cyrus/user/i
+d cyrus mail 0755 /var/lib/cyrus/user/j
+d cyrus mail 0755 /var/lib/cyrus/user/k
+d cyrus mail 0755 /var/lib/cyrus/user/l
+d cyrus mail 0755 /var/lib/cyrus/user/m
+d cyrus mail 0755 /var/lib/cyrus/user/n
+d cyrus mail 0755 /var/lib/cyrus/user/o
+d cyrus mail 0755 /var/lib/cyrus/user/p
+d cyrus mail 0755 /var/lib/cyrus/user/q
+d cyrus mail 0755 /var/lib/cyrus/user/r
+d cyrus mail 0755 /var/lib/cyrus/user/s
+d cyrus mail 0755 /var/lib/cyrus/user/t
+d cyrus mail 0755 /var/lib/cyrus/user/u
+d cyrus mail 0755 /var/lib/cyrus/user/v
+d cyrus mail 0755 /var/lib/cyrus/user/w
+d cyrus mail 0755 /var/lib/cyrus/user/x
+d cyrus mail 0755 /var/lib/cyrus/user/y
+d cyrus mail 0755 /var/lib/cyrus/user/z
+d root root 0755 /var/spool/cyrus
+d cyrus mail 0750 /var/spool/cyrus/mail
+d cyrus mail 0750 /var/spool/cyrus/news
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index 19f1206f18..7d87661861 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -1,8 +1,8 @@
 SECTION = "console/network"
-DEPENDS = "db openssl"
+DEPENDS = "db3 openssl"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 LICENSE = "BSD"
-PR = "r2"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
 	   file://berkdb.m4.patch;patch=1"
@@ -43,3 +43,14 @@ do_stage () {
 	install -m 0644 ${S}/include/saslutil.h ${STAGING_INCDIR}/sasl/
 	install -m 0644 ${S}/include/prop.h ${STAGING_INCDIR}/sasl/
 }
+
+pkg_postinst () {
+        grep cyrus /etc/passwd || adduser --disabled-password --home=/var/spool/mail --ingroup mail cyrus
+	echo "cyrus" | saslpasswd2 -p -c cyrus
+	chgrp mail /etc/sasldb2
+}
+
+pkg_postrm () {
+        grep cyrus /etc/passwd && deluser cyrus
+}
+
diff --git a/packages/dbus/dbus/dbus-1.init b/packages/dbus/dbus/dbus-1.init
index 118b801da7..bd31b6208c 100644
--- a/packages/dbus/dbus/dbus-1.init
+++ b/packages/dbus/dbus/dbus-1.init
@@ -1,15 +1,17 @@
 #! /bin/sh
-# -*- coding: iso8859-1 -*-
+# -*- coding: utf-8 -*-
 # Debian init.d script for D-BUS
-# Copyright (c) 2003 Colin Walters <walters@debian.org>
+# Copyright © 2003 Colin Walters <walters@debian.org>
 
 set -e
 
 DAEMON=/usr/bin/dbus-daemon-1
 NAME=dbus-1
 DAEMONUSER=messagebus
-PIDFILE=/var/run/dbus/pid
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
 DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
 
 test -x $DAEMON || exit 0
 
@@ -17,41 +19,68 @@ test -x $DAEMON || exit 0
 ENABLED=1
 PARAMS=""
 if [ -e /etc/default/dbus-1 ]; then
-	. /etc/default/dbus-1
+  . /etc/default/dbus-1
 fi
 
 test "$ENABLED" != "0" || exit 0
 
+start_it_up()
+{
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER $PIDDIR
+    chgrp $DAEMONUSER $PIDDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      run-parts --reverse --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop --retry 60 --quiet --oknodo --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
 case "$1" in
   start)
-	echo -n "Starting $DESC: "
-	if [ ! -d /var/run/dbus ]; then
-		mkdir /var/run/dbus
-		chown $DAEMONUSER:$DAEMONUSER /var/run/dbus
-	fi
-	start-stop-daemon -S \
-		-u $DAEMONUSER -x $DAEMON -- --system $PARAMS
-	echo "$NAME."
-	;;
+    start_it_up
+  ;;
   stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon -K \
-		-u $DAEMONUSER -x $DAEMON -- --system $PARAMS
-	echo "$NAME."
-	;;
+    shut_it_down
+  ;;
   restart|force-reload)
-	echo -n "Restarting $DESC: "
-	start-stop-daemon -K \
-		 -u $DAEMONUSER -x $DAEMON -- --system $PARAMS
-	sleep 1
-	start-stop-daemon -S \
-		 -u $DAEMONUSER -x $DAEMON -- --system $PARAMS
-	echo "$NAME."
-	;;
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
   *)
-	echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+    exit 1
+  ;;
 esac
 
 exit 0
diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb
index 30e694f08e..dc3f6f2e72 100644
--- a/packages/dbus/dbus_0.23.4.bb
+++ b/packages/dbus/dbus_0.23.4.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-PR = "r0"
+PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/dhclient/dhclient_2.0pl5.bb b/packages/dhclient/dhclient_2.0pl5.bb
index cee9cdece2..20b0dfc440 100644
--- a/packages/dhclient/dhclient_2.0pl5.bb
+++ b/packages/dhclient/dhclient_2.0pl5.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "ISC DHCP Distribution (client and server)."
 LICENSE = "BSD"
 
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-2.0-history/dhcp-${PV}.tar.gz \
 	   file://make.patch;patch=1"
 S = "${WORKDIR}/dhcp-${PV}"
 
diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb
index 3dbf803106..c734af1534 100644
--- a/packages/dhcp/dhcp_3.0.2.bb
+++ b/packages/dhcp/dhcp_3.0.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.isc.org/"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "BSD"
 PR = "r1"
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
diff --git a/packages/dpkg/dpkg_1.10.23.bb b/packages/dpkg/dpkg_1.10.23.bb
deleted file mode 100644
index 21d2a9b2b3..0000000000
--- a/packages/dpkg/dpkg_1.10.23.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-include dpkg.inc
-
-SRC_URI += "file://autofoo.patch;patch=1"
-
-inherit autotools gettext
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--without-sgml-doc"
diff --git a/packages/dpkg/dpkg_1.10.27.bb b/packages/dpkg/dpkg_1.10.28.bb
index ec8a887300..ec8a887300 100644
--- a/packages/dpkg/dpkg_1.10.27.bb
+++ b/packages/dpkg/dpkg_1.10.28.bb
diff --git a/packages/fbvncserver/fbvncserver_0.9.4.bb b/packages/fbvncserver/fbvncserver_0.9.4.bb
index bc66c5c8ac..fd2a1e6138 100644
--- a/packages/fbvncserver/fbvncserver_0.9.4.bb
+++ b/packages/fbvncserver/fbvncserver_0.9.4.bb
@@ -9,6 +9,7 @@ SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
            file://libvncs0.6.patch;patch=1 \
            file://paths.patch;patch=1 \
            file://kernelinclude.patch;patch=1 \
+	   file://buildfix.patch;patch=1 \
            file://zaurus_panel.jpg \
            file://init"
 	  
diff --git a/packages/fbvncserver/files/buildfix.patch b/packages/fbvncserver/files/buildfix.patch
new file mode 100644
index 0000000000..302dbd9e8e
--- /dev/null
+++ b/packages/fbvncserver/files/buildfix.patch
@@ -0,0 +1,31 @@
+--- fbvncserver-0.9.4/fbvncserver.c.orig	2005-07-31 15:01:32.552177176 +0200
++++ fbvncserver-0.9.4/fbvncserver.c	2005-07-31 15:02:47.287366483 +0200
+@@ -574,7 +574,6 @@
+   rfbScreen                  = rfbGetScreen(&argc,argv,rfb_width,rfb_height,5,2,2);
+   rfbScreen->desktopName     = DESKTOP_NAME;
+   rfbScreen->frameBuffer     = (char *)rfbbuf;
+-  rfbScreen->rfbAlwaysShared = TRUE;
+   rfbScreen->ptrAddEvent     = ptrevent;
+   rfbScreen->kbdAddEvent     = keyevent;
+   rfbScreen->newClientHook   = newclient;
+@@ -595,18 +594,12 @@
+   varblock.b_offset = vscrinfo.blue.offset+vscrinfo.blue.length-5;
+   varblock.rfb_xres = vscrinfo.yres;
+   varblock.rfb_maxy = vscrinfo.xres-1;
+-  while(1)
++  while(1) 
+   {
+-      /* If no clients are connected, just wait for events and don't bother
+-         updating the rfb, to save CPU */
+-      while(rfbScreen->rfbClientHead==NULL) {
+-          rfbProcessEvents(rfbScreen,100000);       /* We still run a tight loop
+-                                                       so http clients don't wait */
+-      }
+       /* Process events for a while */
+       do
+       {
+-          got_event=0;
++          got_event=0; 
+           rfbProcessEvents(rfbScreen,30000);
+       }
+       while(got_event);
diff --git a/packages/unionfs/unionfs-1.0.8/.mtn2git_empty b/packages/flex/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/unionfs/unionfs-1.0.8/.mtn2git_empty
+++ b/packages/flex/files/.mtn2git_empty
diff --git a/packages/flex/files/fix-gen.patch b/packages/flex/files/fix-gen.patch
new file mode 100644
index 0000000000..55f4f6fdf5
--- /dev/null
+++ b/packages/flex/files/fix-gen.patch
@@ -0,0 +1,17 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- flex-2.5.31/gen.c~fix-gen
++++ flex-2.5.31/gen.c
+@@ -1812,8 +1812,7 @@
+ 			if (yytext_is_array) {
+ 				if (!reentrant){
+     				indent_puts ("static int yy_more_offset = 0;");
+-                }else{
+-                    indent_puts ("static int yy_prev_more_offset = 0;");
++                                indent_puts ("static int yy_prev_more_offset = 0;");
+                 }
+ 			}
+ 			else if (!reentrant) {
diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb
index fa125d6be7..ff8a42772b 100644
--- a/packages/flex/flex-native_2.5.31.bb
+++ b/packages/flex/flex-native_2.5.31.bb
@@ -1,7 +1,6 @@
 include flex.inc
 inherit native
-
-PR = "r1"
+PR = "r2"
 
 do_stage () {
 	install -m 0755 flex ${STAGING_BINDIR}
diff --git a/packages/flex/flex.inc b/packages/flex/flex.inc
index b28ad9e055..6e605ac9be 100644
--- a/packages/flex/flex.inc
+++ b/packages/flex/flex.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Flex is a tool for generating programs that recognize lexical pat
 SECTION = "devel"
 LICENSE = "BSD"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2 \
+           file://fix-gen.patch;patch=1"
 S = "${WORKDIR}/flex-${PV}"
 
 inherit autotools
diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index 2263d8f7c1..b96c645136 100644
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -1,5 +1,5 @@
 include flex.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://include.patch;patch=1"
 
diff --git a/packages/unionfs/unionfs-1.0.9/.mtn2git_empty b/packages/gcc/gcc-cross-kernel-3.4.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/unionfs/unionfs-1.0.9/.mtn2git_empty
+++ b/packages/gcc/gcc-cross-kernel-3.4.4/.mtn2git_empty
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch b/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch
new file mode 100644
index 0000000000..74c1f26833
--- /dev/null
+++ b/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch
@@ -0,0 +1,29 @@
+--- gcc-3.4.4/gcc/Makefile.in.orig	2005-07-25 21:00:37 +0200
++++ gcc-3.4.4/gcc/Makefile.in	2005-07-25 21:01:19 +0200
+@@ -304,7 +304,7 @@
+     if [ "$(host)" = "$(target)" ] ; then \
+       echo ar; \
+     else \
+-       t='$(program_transform_name)'; echo ar | sed -e $$t ; \
++       t='$(program_transform_name)'; echo ar | sed -e "$$t" ; \
+     fi; \
+   fi`
+ AR_FLAGS_FOR_TARGET =
+@@ -317,7 +317,7 @@
+     if [ "$(host)" = "$(target)" ] ; then \
+       echo $(RANLIB); \
+     else \
+-       t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
++       t='$(program_transform_name)'; echo ranlib | sed -e "$$t" ; \
+     fi; \
+   fi`
+ NM_FOR_TARGET = ` \
+@@ -329,7 +329,7 @@
+     if [ "$(host)" = "$(target)" ] ; then \
+       echo nm; \
+     else \
+-       t='$(program_transform_name)'; echo nm | sed -e $$t ; \
++       t='$(program_transform_name)'; echo nm | sed -e "$$t" ; \
+     fi; \
+   fi`
+ 
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
new file mode 100644
index 0000000000..368cbb1e47
--- /dev/null
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
@@ -0,0 +1,19 @@
+SECTION = "devel"
+# cut-down gcc for kernel builds
+# only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
+
+include gcc-cross-initial_${PV}.bb
+
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
+
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
+
+do_install () {
+	:
+}
+
+do_stage () {
+	cd gcc
+	oe_runmake install-common install-headers install-libgcc
+	install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
+}
diff --git a/packages/gchub/gchub-module_svn.bb b/packages/gchub/gchub-module_svn.bb
index 0da37b0eb7..be8bd7a88c 100644
--- a/packages/gchub/gchub-module_svn.bb
+++ b/packages/gchub/gchub-module_svn.bb
@@ -5,7 +5,8 @@ DEPENDS = "virtual/kernel"
 MAINTAINER = "Micah Dowty <micah@navi.cx>"
 LICENSE = "GPL"
 PV = "svn-${CVSDATE}"
-SRC_URI = "svn://navi.cx/svn/misc/trunk/wasabi/devices;module=gchub"
+
+SRC_URI = "svn://svn.navi.cx/misc/trunk/wasabi/devices;module=gchub;proto=http"
 
 S = "${WORKDIR}/gchub/kernel"
 
diff --git a/packages/gimp/gimp_2.3.2.bb b/packages/gimp/gimp_2.3.2.bb
new file mode 100644
index 0000000000..98237579d0
--- /dev/null
+++ b/packages/gimp/gimp_2.3.2.bb
@@ -0,0 +1,19 @@
+DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
+HOMEPAGE = 	"http://www.gimp.org"
+LICENSE =	"GPL"
+MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+
+SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2"
+
+DEPENDS =	"sed-native gtk+ jpeg libpng libexif tiff"
+
+inherit autotools pkgconfig
+#Don't laugh, this just builds a threaded gimp
+EXTRA_OECONF = 	" --disable-gtktest \
+		--disable-print \
+		--disable-python \
+		--enable-mp"
+
+do_configure_append() {
+	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
diff --git a/packages/gmp/gmp-4.1.2/gcc-compile.patch b/packages/gmp/gmp-4.1.2/gcc-compile.patch
new file mode 100644
index 0000000000..4d880123e9
--- /dev/null
+++ b/packages/gmp/gmp-4.1.2/gcc-compile.patch
@@ -0,0 +1,72 @@
+ diff -Naur gmp-4.1.2.orig/mpf/ceilfloor.c gmp-4.1.2/mpf/ceilfloor.c
+  --- gmp-4.1.2.orig/mpf/ceilfloor.c	2001-05-10 22:31:13.000000000 +0000
+  +++ gmp-4.1.2/mpf/ceilfloor.c	2004-04-25 03:48:20.823016075 +0000
+  @@ -31,7 +31,7 @@
+   static void __gmpf_ceil_or_floor _PROTO ((REGPARM_2_1 (mpf_ptr r, mpf_srcptr u, int dir))) REGPARM_ATTR (1);
+   #define mpf_ceil_or_floor(r,u,dir)  __gmpf_ceil_or_floor (REGPARM_2_1 (r, u, dir))
+   
+  -static void
+  +REGPARM_ATTR (1) static void
+   mpf_ceil_or_floor (mpf_ptr r, mpf_srcptr u, int dir)
+   {
+     mp_ptr     rp, up, p;
+  diff -Naur gmp-4.1.2.orig/mpq/aors.c gmp-4.1.2/mpq/aors.c
+  --- gmp-4.1.2.orig/mpq/aors.c	2001-09-01 22:41:02.000000000 +0000
+  +++ gmp-4.1.2/mpq/aors.c	2004-04-25 03:48:20.826015531 +0000
+  @@ -27,7 +27,7 @@
+   static void __gmpq_aors _PROTO ((REGPARM_3_1 (mpq_ptr w, mpq_srcptr x, mpq_srcptr y, void (*fun) _PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr))))) REGPARM_ATTR (1);
+   #define mpq_aors(w,x,y,fun)  __gmpq_aors (REGPARM_3_1 (w, x, y, fun))
+   
+  -static void
+  +REGPARM_ATTR (1) static void
+   mpq_aors (mpq_ptr rop, mpq_srcptr op1, mpq_srcptr op2,
+             void (*fun) _PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr)))
+   {
+  diff -Naur gmp-4.1.2.orig/mpz/aorsmul.c gmp-4.1.2/mpz/aorsmul.c
+  --- gmp-4.1.2.orig/mpz/aorsmul.c	2001-05-02 22:30:07.000000000 +0000
+  +++ gmp-4.1.2/mpz/aorsmul.c	2004-04-25 03:48:20.828015169 +0000
+  @@ -39,7 +39,7 @@
+   static void __gmpz_aorsmul _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub))) REGPARM_ATTR (1);
+   #define mpz_aorsmul(w,x,y,sub)  __gmpz_aorsmul (REGPARM_3_1 (w, x, y, sub))
+   
+  -static void
+  +REGPARM_ATTR (1) static void
+   mpz_aorsmul (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub)
+   {
+     mp_size_t  xsize, ysize, tsize, wsize, wsize_signed;
+  diff -Naur gmp-4.1.2.orig/mpz/aorsmul_i.c gmp-4.1.2/mpz/aorsmul_i.c
+  --- gmp-4.1.2.orig/mpz/aorsmul_i.c	2002-05-14 16:59:49.000000000 +0000
+  +++ gmp-4.1.2/mpz/aorsmul_i.c	2004-04-25 03:49:07.962471904 +0000
+  @@ -57,7 +57,7 @@
+      twos-complement negative y doesn't work, because it effectively adds an
+      extra x * 2^BITS_PER_MP_LIMB.  */
+   
+  -void
+  +REGPARM_ATTR (1) void
+   mpz_aorsmul_1 (mpz_ptr w, mpz_srcptr x, mp_limb_t y, mp_size_t sub)
+   {
+     mp_size_t  xsize, wsize, wsize_signed, new_wsize, min_size, dsize;
+  diff -Naur gmp-4.1.2.orig/mpz/cfdiv_q_2exp.c gmp-4.1.2/mpz/cfdiv_q_2exp.c
+  --- gmp-4.1.2.orig/mpz/cfdiv_q_2exp.c	2002-02-08 21:55:17.000000000 +0000
+  +++ gmp-4.1.2/mpz/cfdiv_q_2exp.c	2004-04-25 03:48:20.830014806 +0000
+  @@ -29,7 +29,7 @@
+   static void __gmpz_cfdiv_q_2exp _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1);
+   #define cfdiv_q_2exp(w,u,cnt,dir)  __gmpz_cfdiv_q_2exp (REGPARM_3_1 (w,u,cnt,dir))
+   
+  -static void
+  +REGPARM_ATTR (1) static void
+   cfdiv_q_2exp (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir)
+   {
+     mp_size_t  wsize, usize, abs_usize, limb_cnt, i;
+  diff -Naur gmp-4.1.2.orig/mpz/cfdiv_r_2exp.c gmp-4.1.2/mpz/cfdiv_r_2exp.c
+  --- gmp-4.1.2.orig/mpz/cfdiv_r_2exp.c	2002-04-18 16:48:25.000000000 +0000
+  +++ gmp-4.1.2/mpz/cfdiv_r_2exp.c	2004-04-25 03:48:20.832014444 +0000
+  @@ -32,7 +32,7 @@
+   static void __gmpz_cfdiv_r_2exp _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1);
+   #define cfdiv_r_2exp(w,u,cnt,dir)  __gmpz_cfdiv_r_2exp (REGPARM_3_1 (w, u, cnt, dir))
+   
+  -static void
+  +REGPARM_ATTR (1) static void
+   cfdiv_r_2exp (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir)
+   {
+     mp_size_t  usize, abs_usize, limb_cnt, i;
diff --git a/packages/gmp/gmp_4.1.2.bb b/packages/gmp/gmp_4.1.2.bb
index b19d122ddf..d7456175a1 100644
--- a/packages/gmp/gmp_4.1.2.bb
+++ b/packages/gmp/gmp_4.1.2.bb
@@ -5,7 +5,8 @@ LICENSE = "GPL LGPL"
 
 SRC_URI = "ftp://mirrors.kernel.org/gnu/gmp/gmp-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
-	   file://amd64.patch;patch=1"
+	   file://amd64.patch;patch=1 \
+           file://gcc-compile.patch;patch=1 "
 
 inherit autotools 
 
diff --git a/packages/gnome/gnome-mime-data_2.4.2.bb b/packages/gnome/gnome-mime-data_2.4.2.bb
new file mode 100644
index 0000000000..1a49ed8e72
--- /dev/null
+++ b/packages/gnome/gnome-mime-data_2.4.2.bb
@@ -0,0 +1,5 @@
+LICENSE = "GPL"
+inherit gnome
+
+DEPENDS += "intltool-native"
+PR = "r1"
diff --git a/packages/gnome/goffice_0.0.2.bb b/packages/gnome/goffice_0.0.2.bb
new file mode 100644
index 0000000000..db26a617a5
--- /dev/null
+++ b/packages/gnome/goffice_0.0.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION="Gnome Office Library"
+LICENSE="GPLv2"
+PR="r0"
+
+DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
+
+inherit gnome pkgconfig
+
+
+
+do_stage() {
+        gnome_stage_includes
+	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
+
+        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
+}
+
diff --git a/packages/gnome/libbonobo/.mtn2git_empty b/packages/gnome/libbonobo/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/libbonobo/.mtn2git_empty
diff --git a/packages/gnome/libbonobo/gtk-doc.m4 b/packages/gnome/libbonobo/gtk-doc.m4
new file mode 100644
index 0000000000..3ec41666b2
--- /dev/null
+++ b/packages/gnome/libbonobo/gtk-doc.m4
@@ -0,0 +1,53 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH(html-dir,
+    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST(HTML_DIR)
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE(gtk-doc,
+    AC_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [default=no]]),,
+    enable_gtk_doc=no)
+
+  have_gtk_doc=no
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+    have_gtk_doc=yes
+  fi
+
+  dnl do we want to do a version check?
+ifelse([$1],[],,
+  [gtk_doc_min_version=$1
+  if test "$have_gtk_doc" = yes; then
+    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
+    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+      have_gtk_doc=no
+    fi
+  fi
+])
+  if test x$enable_gtk_doc = xyes; then
+    if test "$have_gtk_doc" != yes; then
+      enable_gtk_doc=no
+    fi
+  fi
+
+  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
+])
diff --git a/packages/gnome/libbonobo/gtk-doc.make b/packages/gnome/libbonobo/gtk-doc.make
new file mode 100644
index 0000000000..c319e7ad7c
--- /dev/null
+++ b/packages/gnome/libbonobo/gtk-doc.make
@@ -0,0 +1,148 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST = 				\
+	$(content_files)		\
+	$(HTML_IMAGES)			\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE).types		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB)
+	@echo '*** Scanning header files ***'
+	@-chmod -R u+w $(srcdir)
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo '*** Rebuilding template files ***'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+	@echo '*** Building XML ***'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo '*** Building HTML ***'
+	@-chmod -R u+w $(srcdir)
+	rm -rf $(srcdir)/html 
+	mkdir $(srcdir)/html
+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo '-- Fixing Crossreferences' 
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
+endif
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+	(installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+	fi)
+
+uninstall-local:
+	rm -f $(DESTDIR)$(TARGET_DIR)/*
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	-cp $(srcdir)/html/* $(distdir)/html
+
+.PHONY : dist-hook-local
diff --git a/packages/gnome/libbonobo_2.10.0.bb b/packages/gnome/libbonobo_2.10.0.bb
new file mode 100644
index 0000000000..bd51d4e45a
--- /dev/null
+++ b/packages/gnome/libbonobo_2.10.0.bb
@@ -0,0 +1,59 @@
+LICENSE = "GPL"
+PR = "r1"
+SECTION = "x11/gnome/libs"
+DESCRIPTION = "Bonobo CORBA interfaces library"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-${PV}.tar.bz2 \
+           file://gtk-doc.m4 \
+           file://gtk-doc.make"
+DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+
+FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
+FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
+	${libdir}/bonobo-2.0/samples"
+
+inherit autotools pkgconfig
+
+PARALLEL_MAKE = ""
+
+do_configure_prepend() {
+	install -d m4
+	install ${WORKDIR}/gtk-doc.m4 m4/
+	install ${WORKDIR}/gtk-doc.make ./
+}
+
+ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
+	              bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
+ 		      bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
+ 		      bonobo-activation-server-info.h bonobo-activation-version.h"
+
+BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
+	          bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
+	          bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
+		  bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
+		  bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
+		  bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
+	          bonobo-property-bag-client.h bonobo-shlib-factory.h  bonobo-storage.h \
+		  bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
+	          bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
+		  bonobo-app-client.h bonobo-application.h"
+
+do_compile() {
+	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
+}
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
+	for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
+	install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
+	for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
+	install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
+	install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
+	install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
+	oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
+}
+
+do_install() {
+	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
+}
diff --git a/packages/gnome/libbonoboui_2.10.0.bb b/packages/gnome/libbonoboui_2.10.0.bb
new file mode 100644
index 0000000000..719fe2395a
--- /dev/null
+++ b/packages/gnome/libbonoboui_2.10.0.bb
@@ -0,0 +1,57 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+PR = "r1"
+
+inherit gnome pkgconfig
+
+FILES_${PN} += "${libdir}/libglade/2.0/*.so"
+FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \
+	${libdir}/bonobo-2.0/samples"
+
+DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+HEADERS = " \
+bonobo/bonobo-zoomable.h \
+bonobo/bonobo-ui-component.h \
+bonobo/bonobo-dock-layout.h \
+bonobo/bonobo-ui-type-builtins.h \
+bonobo/bonobo-canvas-component.h \
+bonobo/bonobo-widget.h \
+bonobo/bonobo-ui-engine.h \
+bonobo/bonobo-window.h \
+bonobo/bonobo-ui-toolbar.h \
+bonobo/bonobo-dock-band.h \
+bonobo/bonobo-ui-toolbar-item.h \
+bonobo/bonobo-control.h \
+bonobo/bonobo-dock-item.h \
+bonobo/bonobo-ui-config-widget.h \
+bonobo/bonobo-zoomable-frame.h \
+bonobo/bonobo-control-frame.h \
+bonobo/bonobo-dock.h \
+bonobo/bonobo-ui-main.h \
+bonobo/bonobo-canvas-item.h \
+bonobo/bonobo-ui-node.h \
+bonobo/bonobo-socket.h \
+bonobo/bonobo-selector.h \
+bonobo/bonobo-ui-sync.h \
+bonobo/bonobo-ui-util.h \
+bonobo/bonobo-plug.h \
+bonobo/bonobo-ui-toolbar-button-item.h \
+bonobo/bonobo-ui-toolbar-toggle-button-item.h \
+bonobo/bonobo-ui-container.h \
+bonobo/bonobo-file-selector-util.h \
+bonobo/bonobo-property-control.h \
+bonobo/bonobo-selector-widget.h \
+libbonoboui.h \
+bonobo.h \
+"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/libbonoboui-2.0/bonobo
+	for i in ${HEADERS}; do
+		install -m 0644 $i ${STAGING_INCDIR}/libbonoboui-2.0/$i
+	done
+	oe_libinstall -C bonobo -a -so libbonoboui-2 ${STAGING_LIBDIR}
+}
diff --git a/packages/gnome/libgnome_2.10.1.bb b/packages/gnome/libgnome_2.10.1.bb
new file mode 100644
index 0000000000..531fdd4240
--- /dev/null
+++ b/packages/gnome/libgnome_2.10.1.bb
@@ -0,0 +1,14 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+PR = "r1"
+
+inherit gnome
+
+DEPENDS = "gnome-vfs libbonobo"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	oe_libinstall -C libgnome -a -so libgnome-2 ${STAGING_LIBDIR}
+	gnome_stage_includes
+}
diff --git a/packages/gnome/libgnomecanvas_2.10.2.bb b/packages/gnome/libgnomecanvas_2.10.2.bb
new file mode 100644
index 0000000000..36ee1aa67f
--- /dev/null
+++ b/packages/gnome/libgnomecanvas_2.10.2.bb
@@ -0,0 +1,16 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+PR = "r1"
+DESCRIPTION = "A powerful object-oriented display"
+inherit gnome
+
+DEPENDS = "gnome-vfs libbonobo libglade libart-lgpl"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+
+do_stage() {
+	gnome_stage_includes
+	oe_libinstall -C libgnomecanvas -a -so libgnomecanvas-2 ${STAGING_LIBDIR}
+}
diff --git a/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty
diff --git a/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch
new file mode 100644
index 0000000000..4a9108bd4e
--- /dev/null
+++ b/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch
@@ -0,0 +1,8 @@
+--- gnumeric-1.5.2/Makefile.am.orig	2005-08-01 11:32:36.119921544 +0000
++++ gnumeric-1.5.2/Makefile.am	2005-08-01 11:32:44.689618752 +0000
+@@ -1,4 +1,4 @@
+-SUBDIRS = . po po-functions src plugins icons templates doc schemas
++SUBDIRS = . po po-functions src plugins icons templates schemas
+ if WITH_WIN32
+   SUBDIRS += tools
+ endif
diff --git a/packages/gnumeric/gnumeric_1.5.2.bb b/packages/gnumeric/gnumeric_1.5.2.bb
new file mode 100644
index 0000000000..03b42fc86a
--- /dev/null
+++ b/packages/gnumeric/gnumeric_1.5.2.bb
@@ -0,0 +1,18 @@
+LICENSE = "GPL"
+SECTION = "x11/utils"
+PR = "r0"
+S = "${WORKDIR}/gnumeric-${PV}"
+DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui"
+DESCRIPTION = "Gnumeric spreadsheet for GNOME"
+
+inherit gnome flow-lossage
+
+SRC_URI += "file://remove-docs.patch;patch=1"
+
+EXTRA_OECONF=" --without-perl "
+
+python populate_packages_prepend () {
+	gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
+
+	do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
+}
diff --git a/packages/gpe-beam/gpe-beam-0.2.7/.mtn2git_empty b/packages/gpe-beam/gpe-beam-0.2.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-beam/gpe-beam-0.2.7/.mtn2git_empty
diff --git a/packages/gpe-beam/gpe-beam-0.2.7/decl.patch b/packages/gpe-beam/gpe-beam-0.2.7/decl.patch
new file mode 100644
index 0000000000..0d0e889b42
--- /dev/null
+++ b/packages/gpe-beam/gpe-beam-0.2.7/decl.patch
@@ -0,0 +1,12 @@
+diff -u -r1.6 main.h
+--- main.h      16 Oct 2004 12:17:51 -0000      1.6
++++ main.h      29 Jul 2005 21:17:02 -0000
+@@ -21,8 +21,6 @@
+ #define HINT_HTTP        0x10
+ #define HINT_OBEX        0x20
+
+-extern gboolean radio_is_on;
+-
+ extern GdkWindow *dock_window;
+ extern void schedule_message_delete (guint id, guint time);
+ extern void send_data (char *filename, char *data, size_t len);
diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb
index d55cd6db60..48fdf116f1 100644
--- a/packages/gpe-beam/gpe-beam_0.2.7.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.7.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 inherit gpe
 
@@ -10,3 +10,4 @@ PRIORITY = "optional"
 MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 LICENSE = "GPL"
 
+SRC_URI += "file://decl.patch;patch=1;pnum=0"
+\ No newline at end of file
diff --git a/packages/gpe-login/gpe-login_0.79.bb b/packages/gpe-login/gpe-login_0.79.bb
new file mode 100644
index 0000000000..594bde73c3
--- /dev/null
+++ b/packages/gpe-login/gpe-login_0.79.bb
@@ -0,0 +1,11 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "GPE user login screen"
+SECTION     = "gpe"
+PRIORITY    = "optional"
+MAINTAINER  = "Philip Blundell <pb@handhelds.org>"
+DEPENDS     = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS    = "xkbd"
+RPROVIDES   = "gpe-session-starter"
+PR = "r0"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
new file mode 100644
index 0000000000..14f5313bcc
--- /dev/null
+++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb
@@ -0,0 +1,51 @@
+PR = "r0"
+
+SRC_URI      = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz"
+DESCRIPTION  = "A lightweight webbrowser for the GPE platform (Hildon UI)"
+LICENSE      = "GPL"
+DEPENDS      = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget"
+EXTRA_OECONF = "--enable-hildon"
+
+S = "${WORKDIR}/gpe-mini-browser-${PV}"
+
+inherit autotools
+
+do_install() {
+		install -d ${D}/usr/share/applications/hildon
+		install -m 0644 ${S}/hildon/gpe-mini-browser.desktop ${D}/usr/share/applications/hildon/gpe-mini-browser.desktop
+		install -d ${D}/usr/share/pixmaps
+		install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png
+		autotools_do_install
+}
+
+pkg_postinst_${PN}-doc () {
+        #!/bin/sh
+	if [ "x$D" != "x" ]; then
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+        else
+                 echo [Help] >> /etc/gpe/gpe-help.conf
+                 echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-mini-browser
+        fi
+	fi
+}
+
+pkg_postrm_${PN}-doc () {
+        #!/bin/sh
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf
+                mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-mini-browser
+        fi
+}
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
new file mode 100644
index 0000000000..2745e5f8a9
--- /dev/null
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
@@ -0,0 +1,52 @@
+PR = "r1"
+
+SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz"
+DESCRIPTION = "A lightweight webbrowser for the GPE platform"
+LICENSE = "GPL"
+DEPENDS = "osb-nrcit libgpewidget"
+
+S = "${WORKDIR}/gpe-mini-browser-${PV}"
+
+inherit autotools
+
+do_install() {
+	#	install -d ${D}${docdir}/gpe
+	#	install -m 0644 ${S}/gpe-mini-browser.html  ${D}${docdir}/gpe/
+		install -d ${D}/usr/share/applications
+		install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/gpe-mini-browser.desktop
+		install -d ${D}/usr/share/pixmaps
+		install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png
+		autotools_do_install
+}
+
+pkg_postinst_${PN}-doc () {
+        #!/bin/sh
+	if [ "x$D" != "x" ]; then
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+        else
+                 echo [Help] >> /etc/gpe/gpe-help.conf
+                 echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-mini-browser
+        fi
+	fi
+}
+
+pkg_postrm_${PN}-doc () {
+        #!/bin/sh
+        if [ -e /etc/gpe/gpe-help.conf ]; then
+                sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf
+                mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf
+        fi
+        if [ -x /usr/bin/gpe-helpindex ]; then
+                echo generating help-index
+                gpe-helpindex
+        else
+                echo not generating index for gpe-mini-browser
+        fi
+}
diff --git a/packages/gpe-package/gpe-package_0.2.bb b/packages/gpe-package/gpe-package_0.2.bb
index c58ba4d4d3..ff85a33ec0 100644
--- a/packages/gpe-package/gpe-package_0.2.bb
+++ b/packages/gpe-package/gpe-package_0.2.bb
@@ -1,9 +1,9 @@
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 inherit gpe pkgconfig
 
 DESCRIPTION = "A package manager GUI for GPE"
-DEPENDS = "libipkg libgpewidget"
+DEPENDS = "ipkg libgpewidget"
 RDEPENDS = "gpe-icons"
 SECTION = "gpe"
 PRIORITY = "optional"
diff --git a/packages/gstreamer/gst-plugins_0.8.7.bb b/packages/gstreamer/gst-plugins_0.8.7.bb
index 517f28359f..430830e392 100644
--- a/packages/gstreamer/gst-plugins_0.8.7.bb
+++ b/packages/gstreamer/gst-plugins_0.8.7.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Plugins for GStreamer"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
 
@@ -14,7 +14,8 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.ta
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \
                 --disable-artsc --disable-jack  --disable-libfame --disable-sdl --disable-shout2 \
-		--disable-gnome_vfs --disable-gconf --disable-libcaca  --disable-directfb "
+		--disable-gnome_vfs --disable-gconf --disable-libcaca  --disable-directfb \
+		--disable-cairo"
 
 inherit autotools pkgconfig gconf
 
diff --git a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
new file mode 100644
index 0000000000..34e1212694
--- /dev/null
+++ b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
@@ -0,0 +1,23 @@
+SECTION = "x11/base"
+DESCRIPTION = "Clearlooks theme engine for GTK"
+MAINTAINER = "Koen Kooi <koenhandhelds.org>"
+LICENSE = "GPL2"
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/clearlooks/clearlooks-0.6.2.tar.bz2"
+
+S = "${WORKDIR}/clearlooks-${PV}"
+
+PACKAGES += "gtk-theme-clearlooks"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so"
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_gtk-theme-clearlooks = "${datadir}/icons ${datadir}/themes"
+
+inherit autotools
+
+do_configure_prepend() {
+	for i in `ls gtk-common`; do
+		ln -sf ../gtk-common/$i gtk2-engine/$i
+	done
+}
+
diff --git a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
index 43b64aa005..8c5efa8622 100644
--- a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
+++ b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.cgabriel.org/sw/gtk2-ssh-askpass/"
 LICENSE = "GPL"
 SECTION = "net-misc"
 
-SRC_URI="http://www.cgabriel.org/sw/gtk2-ssh-askpass/gtk2-ssh-askpass-${PV}.tar.gz \
+SRC_URI="http://src.gentoo.pl/distfiles/gtk2-ssh-askpass-${PV}.tar.gz \
 	file://makefile.patch;patch=1"
 
 DEPENDS="gtk+"
diff --git a/packages/gzip/gzip_1.3.5.bb b/packages/gzip/gzip_1.3.5.bb
index e99c76dcb4..a138221367 100644
--- a/packages/gzip/gzip_1.3.5.bb
+++ b/packages/gzip/gzip_1.3.5.bb
@@ -5,6 +5,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DESCRIPTION = "gzip (GNU zip) is a compression utility designed \
 to be a replacement for 'compress'. The GNU Project uses it as \
 the standard compression program for its system."
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \
 	   file://configure.patch;patch=1"
@@ -12,3 +13,25 @@ SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \
 S = "${WORKDIR}/gzip-${PV}"
 
 inherit autotools
+
+do_install () {
+	autotools_do_install
+	# Rename and move files into /bin (FHS)
+	install -d ${D}${base_bindir}
+	mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN}
+	mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN}
+	mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN}
+}
+
+pkg_postinst_${PN} () {
+	update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100
+	update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100
+	update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+	update-alternatives --remove gunzip gunzip.${PN}
+	update-alternatives --remove gzip gzip.${PN}
+	update-alternatives --remove zcat zcat.${PN}
+}
+
diff --git a/packages/hdparm/hdparm-5.4/bswap.patch b/packages/hdparm/hdparm-5.4/bswap.patch
deleted file mode 100644
index 13670073a4..0000000000
--- a/packages/hdparm/hdparm-5.4/bswap.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c
---- hdparm-5.4/hdparm.c	2004-07-14 01:29:30.000000000 +0200
-+++ hdparm-5.4-fix/hdparm.c	2004-07-14 01:28:31.000000000 +0200
-@@ -20,7 +20,9 @@
- #include <linux/types.h>
- #include <linux/hdreg.h>
- #include <linux/major.h>
--#include <asm/byteorder.h>
-+#include <byteswap.h>
-+
-+#define le16_to_cpus(x) bswap_16(htons(x))
- 
- #include "hdparm.h"
- 
-@@ -1299,7 +1301,7 @@
- 			}
- 		}
- 		for(i=0; i<(sizeof args)/2; i+=2) {
--		    __le16_to_cpus((__u16 *)(&args[i]));
-+		    le16_to_cpus(*(__u16 *)(&args[i]));
- 		}    
- 		identify((void *)&args[4], NULL);
- identify_abort:	;
-@@ -1499,7 +1501,7 @@
- 	}
- 	for (i = 0; count >= 4; ++i) {
- 		sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]);
--		__le16_to_cpus((__u16 *)(&sbuf[i]));
-+		le16_to_cpus((__u16 *)(&sbuf[i]));
- 		b += 5;
- 		count -= 5;
- 	}
diff --git a/packages/hdparm/hdparm-5.4/readahead.patch b/packages/hdparm/hdparm-5.4/readahead.patch
deleted file mode 100644
index 2868d940d0..0000000000
--- a/packages/hdparm/hdparm-5.4/readahead.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c
---- hdparm-5.4/hdparm.c	2004-07-14 00:36:03.000000000 +0200
-+++ hdparm-5.4-fix/hdparm.c	2003-04-18 22:29:38.000000000 +0200
-@@ -52,7 +52,7 @@
- static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
- static int do_ctimings, do_timings = 0;
- 
--static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;     
-+static unsigned long set_readahead= 0, get_readahead= 0, readahead_state= 0;
- static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
- static unsigned long set_unmask   = 0, get_unmask   = 0, unmask   = 0;     
- static unsigned long set_mult     = 0, get_mult     = 0, mult     = 0;     
-@@ -785,8 +785,8 @@
- 
- 	if (set_readahead) {
- 		if (get_readahead)
--			printf(" setting fs readahead to %ld\n", readahead);
--		if (ioctl(fd, BLKRASET, readahead)) 
-+			printf(" setting fs readahead to %ld\n", readahead_state);
-+		if (ioctl(fd, BLKRASET, readahead_state)) 
- 			perror(" BLKRASET failed");
- 	}
- #ifdef HDIO_UNREGISTER_HWIF
-@@ -1830,7 +1830,7 @@
- 					case 'a':
- 						get_readahead = noisy;
- 						noisy = 1;
--						GET_NUMBER(set_readahead,readahead);
-+						GET_NUMBER(set_readahead,readahead_state);
- 						break;
- 					case 'B':
- 						get_apmmode = noisy;
diff --git a/packages/hdparm/hdparm-5.8/readahead.patch b/packages/hdparm/hdparm-5.8/readahead.patch
deleted file mode 100644
index 2868d940d0..0000000000
--- a/packages/hdparm/hdparm-5.8/readahead.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur hdparm-5.4/hdparm.c hdparm-5.4-fix/hdparm.c
---- hdparm-5.4/hdparm.c	2004-07-14 00:36:03.000000000 +0200
-+++ hdparm-5.4-fix/hdparm.c	2003-04-18 22:29:38.000000000 +0200
-@@ -52,7 +52,7 @@
- static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
- static int do_ctimings, do_timings = 0;
- 
--static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;     
-+static unsigned long set_readahead= 0, get_readahead= 0, readahead_state= 0;
- static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
- static unsigned long set_unmask   = 0, get_unmask   = 0, unmask   = 0;     
- static unsigned long set_mult     = 0, get_mult     = 0, mult     = 0;     
-@@ -785,8 +785,8 @@
- 
- 	if (set_readahead) {
- 		if (get_readahead)
--			printf(" setting fs readahead to %ld\n", readahead);
--		if (ioctl(fd, BLKRASET, readahead)) 
-+			printf(" setting fs readahead to %ld\n", readahead_state);
-+		if (ioctl(fd, BLKRASET, readahead_state)) 
- 			perror(" BLKRASET failed");
- 	}
- #ifdef HDIO_UNREGISTER_HWIF
-@@ -1830,7 +1830,7 @@
- 					case 'a':
- 						get_readahead = noisy;
- 						noisy = 1;
--						GET_NUMBER(set_readahead,readahead);
-+						GET_NUMBER(set_readahead,readahead_state);
- 						break;
- 					case 'B':
- 						get_apmmode = noisy;
diff --git a/packages/hdparm/hdparm-6.1/.mtn2git_empty b/packages/hdparm/hdparm-6.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hdparm/hdparm-6.1/.mtn2git_empty
diff --git a/packages/hdparm/hdparm-5.8/bswap.patch b/packages/hdparm/hdparm-6.1/bswap.patch
index 37fbcb7b38..37fbcb7b38 100644
--- a/packages/hdparm/hdparm-5.8/bswap.patch
+++ b/packages/hdparm/hdparm-6.1/bswap.patch
diff --git a/packages/hdparm/hdparm-5.8/uclibc.patch b/packages/hdparm/hdparm-6.1/uclibc.patch
index 495d7491bb..495d7491bb 100644
--- a/packages/hdparm/hdparm-5.8/uclibc.patch
+++ b/packages/hdparm/hdparm-6.1/uclibc.patch
diff --git a/packages/hdparm/hdparm_5.4.bb b/packages/hdparm/hdparm_5.4.bb
deleted file mode 100644
index 21b5bd5d4d..0000000000
--- a/packages/hdparm/hdparm_5.4.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "hdparm is a Linux shell utility for viewing \
-and manipulating various IDE drive and driver parameters."
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "BSD"
-PR = "r1"
-
-SRC_URI = "http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-${PV}.tar.gz \
-	   file://bswap.patch;patch=1 \
-	   file://readahead.patch;patch=1"
-
-do_install () {
-	install -d ${D}${sbindir} ${D}${mandir}/man8
-	oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/packages/hdparm/hdparm_5.8.bb b/packages/hdparm/hdparm_6.1.bb
index a917289513..a917289513 100644
--- a/packages/hdparm/hdparm_5.8.bb
+++ b/packages/hdparm/hdparm_6.1.bb
diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.4.bb
index 81490eda01..0d37223eaf 100644
--- a/packages/ifupdown/ifupdown_0.6.4.bb
+++ b/packages/ifupdown/ifupdown_0.6.4.bb
@@ -1,3 +1,6 @@
+BROKEN = "1" 
+# Debian moved to 0.6.7
+
 DESCRIPTION = "High level tools to configure network interfaces \
 This package provides the tools ifup and ifdown which may be used to \
 configure (or, respectively, deconfigure) network interfaces, based on \
diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
index 85a194b850..dbfde00053 100755
--- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
+++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
@@ -30,7 +30,7 @@ keycode  13 =
 keycode  14 = BackSpace
 	altgr keycode 14 = Delete
 keycode  15 = Tab
-	shift keycode 65 = Caps_Lock
+	altgr keycode 15 = Caps_Lock
 keycode  16 = q               
 keycode  17 = w               
 	altgr keycode 17 = asciicircum
@@ -143,71 +143,71 @@ string Prior = "\033[5~"
 string Next = "\033[6~"
 string Macro = "\033[M"
 string Pause = "\033[P"
-compose '`' 'A' to '�
-compose '`' 'a' to '�
-compose '\'' 'A' to '�
-compose '\'' 'a' to '�
-compose '^' 'A' to '�
-compose '^' 'a' to '�
-compose '~' 'A' to '�
-compose '~' 'a' to '�
-compose '"' 'A' to '�
-compose '"' 'a' to '�
-compose 'O' 'A' to '�
-compose 'o' 'a' to '�
-compose '0' 'A' to '�
-compose '0' 'a' to '�
-compose 'A' 'A' to '�
-compose 'a' 'a' to '�
-compose 'A' 'E' to '�
-compose 'a' 'e' to '�
-compose ',' 'C' to '�
-compose ',' 'c' to '�
-compose '`' 'E' to '�
-compose '`' 'e' to '�
-compose '\'' 'E' to '�
-compose '\'' 'e' to '�
-compose '^' 'E' to '�
-compose '^' 'e' to '�
-compose '"' 'E' to '�
-compose '"' 'e' to '�
-compose '`' 'I' to '�
-compose '`' 'i' to '�
-compose '\'' 'I' to '�
-compose '\'' 'i' to '�
-compose '^' 'I' to '�
-compose '^' 'i' to '�
-compose '"' 'I' to '�
-compose '"' 'i' to '�
-compose '-' 'D' to '�
-compose '-' 'd' to '�
-compose '~' 'N' to '�
-compose '~' 'n' to '�
-compose '`' 'O' to '�
-compose '`' 'o' to '�
-compose '\'' 'O' to '�
-compose '\'' 'o' to '�
-compose '^' 'O' to '�
-compose '^' 'o' to '�
-compose '~' 'O' to '�
-compose '~' 'o' to '�
-compose '"' 'O' to '�
-compose '"' 'o' to '�
-compose '/' 'O' to '�
-compose '/' 'o' to ''
-compose '`' 'U' to '�
-compose '`' 'u' to ''
-compose '\'' 'U' to '�
-compose '\'' 'u' to ''
-compose '^' 'U' to '�
-compose '^' 'u' to ''
-compose '"' 'U' to '�
-compose '"' 'u' to ''
-compose '\'' 'Y' to '�
-compose '\'' 'y' to ''
-compose 'T' 'H' to '�
-compose 't' 'h' to ''
-compose 's' 's' to '�
-compose '"' 'y' to ''
-compose 's' 'z' to '�
-compose 'i' 'j' to ''
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh
index 311a2764da..99a469d576 100755
--- a/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -1,64 +1,138 @@
 #!/bin/sh
 
 . /etc/default/rcS
-CFGFILE="/etc/default/volatiles"
+
+CFGDIR="/etc/default/volatiles"
+TMPROOT="/var/tmp"
+COREDEF="00_core"
 
 [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems."
 
-cat ${CFGFILE} | grep -v "^#" |   \
-while read LINE; do
-  TTYPE=`echo ${LINE} | cut -d " " -f 1`
-  TUSER=`echo ${LINE} | cut -d " " -f 2`
-  TGROUP=`echo ${LINE} | cut -d " " -f 3`
-  TMODE=`echo ${LINE} | cut -d " " -f 4`
-  TNAME=`echo ${LINE} | cut -d " " -f 5`
 
-  [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
+check_requirements() {
 
-  [ "${TTYPE}" = "l" ] && {
-    [ -e "${TNAME}" ] && {
-      echo "Cannot create link over existing -${TNAME}-." >&2
-      } || {
-      TSOURCE=`echo ${LINE} | cut -d " " -f 6`
-      [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
-      ln -s "${TSOURCE}" "${TNAME}"
-      }
-    continue
+  cleanup() {
+    rm "${TMP_INTERMED}"
+    rm "${TMP_DEFINED}"
+    rm "${TMP_COMBINED}"
     }
+    
+  CFGFILE="$1"
 
-  [ -L "${TNAME}" ] && {
-    [ "${VERBOSE}" != "no" ] && echo "Found link."
-    NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'`
-    echo ${NEWNAME} | grep -v "^/" >/dev/null && {
-      TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}"
-      [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
-      } || {
-      TNAME="${NEWNAME}"
-      [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-."
-      }
+  [ `basename "${CFGFILE}"` = "${COREDEF}" ] && return 0
+
+  TMP_INTERMED="${TMPROOT}/tmp.$$"
+  TMP_DEFINED="${TMPROOT}/tmpdefined.$$"
+  TMP_COMBINED="${TMPROOT}/tmpcombined.$$"
+
+
+  cat /etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
+  cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 2 > "${TMP_INTERMED}"
+  cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
+
+  NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`"
+  NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`"
+
+  [ "${NR_DEFINED_USERS}" -ne "${NR_COMBINED_USERS}" ] && {
+    echo "Undefined users:"
+    diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
+    cleanup
+    return 1
+    }
+
+
+  cat /etc/group | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
+  cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 3 > "${TMP_INTERMED}"
+  cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
+
+  NR_DEFINED_GROUPS="`cat "${TMP_DEFINED}" | wc -l`"
+  NR_COMBINED_GROUPS="`cat "${TMP_COMBINED}" | wc -l`"
+
+  [ "${NR_DEFINED_GROUPS}" -ne "${NR_COMBINED_GROUPS}" ] && {
+    echo "Undefined groups:"
+    diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
+    cleanup
+    return 1
     }
 
-  [ -e "${TNAME}" ] && {
-    [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
-    continue
+  # Add checks for required directories here
+
+  cleanup
+  return 0
+  }
+
+apply_cfgfile() {
+
+  CFGFILE="$1"
+
+  check_requirements "${CFGFILE}" || {
+    echo "Skipping ${CFGFILE}"
+    return 1
     }
 
-  case "${TTYPE}" in
-    "f")  [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
-          touch "${TNAME}"
-	  ;;
-    "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
-          mkdir -p "${TNAME}"
-	  # Add check to see if there's an entry in fstab to mount.
-	  ;;
-    *)    [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."
-          continue
-	  ;;
-  esac
-
-  chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2
-  chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2
-  chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2
+  cat ${CFGFILE} | grep -v "^#" | \
+  while read LINE; do
+    TTYPE=`echo ${LINE} | cut -d " " -f 1`
+    TUSER=`echo ${LINE} | cut -d " " -f 2`
+    TGROUP=`echo ${LINE} | cut -d " " -f 3`
+    TMODE=`echo ${LINE} | cut -d " " -f 4`
+    TNAME=`echo ${LINE} | cut -d " " -f 5`
+
+    [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
+
+    [ "${TTYPE}" = "l" ] && {
+      [ -e "${TNAME}" ] && {
+        echo "Cannot create link over existing -${TNAME}-." >&2
+        } || {
+        TSOURCE=`echo ${LINE} | cut -d " " -f 6`
+        [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
+        ln -s "${TSOURCE}" "${TNAME}"
+        }
+      continue
+      }
+
+    [ -L "${TNAME}" ] && {
+      [ "${VERBOSE}" != "no" ] && echo "Found link."
+      NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'`
+      echo ${NEWNAME} | grep -v "^/" >/dev/null && {
+        TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}"
+        [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
+        } || {
+        TNAME="${NEWNAME}"
+        [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-."
+        }
+      }
+
+    [ -e "${TNAME}" ] && {
+      [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
+      continue
+      }
+
+    case "${TTYPE}" in
+      "f")  [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
+            touch "${TNAME}"
+	    ;;
+      "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
+            mkdir -p "${TNAME}"
+	    # Add check to see if there's an entry in fstab to mount.
+	    ;;
+      *)    [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."
+            continue
+	    ;;
+    esac
+
+    chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2
+    chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2
+    chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2
+
+    done
+
+  return 0
+
+  }
+
 
+for file in `ls -1 "${CFGDIR}" | sort`; do
+  apply_cfgfile "${CFGDIR}/${file}"
   done
 
diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles
index 45d373cedc..37ce8b529a 100644
--- a/packages/initscripts/initscripts-1.0/volatiles
+++ b/packages/initscripts/initscripts-1.0/volatiles
@@ -12,10 +12,20 @@
 # l root root 0777 /var/test /tmp/testfile
 # f root root 0644 /var/test
 #
+# Understanding links:
+# When populate-volatile is to verify/create a directory or file, it will first
+# check it's existence. If a link is found to exist in the place of the target,
+# the path of the target is replaced with the target the link points to.
+# Thus, if a link is in the place to be verified, the object will be created
+# in the place the link points to instead.
+# This explains the order of "link before object" as in the example above, where
+# a link will be created at /var/test pointing to /tmp/testfile and due to this
+# link the file defined as /var/test will actually be created as /tmp/testfile.
 d root root 0775 /var
 d root root 0755 /var/backups
 d root root 0755 /var/cache
 d root root 0755 /var/lib
+d root root 0755 /var/lib/ipkg
 d root root 0755 /var/lib/misc
 d root root 2775 /var/local
 d root root 1777 /var/lock
diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-openslug_1.0.bb
index b5252bfdeb..4e82022876 100644
--- a/packages/initscripts/initscripts-openslug_1.0.bb
+++ b/packages/initscripts/initscripts-openslug_1.0.bb
@@ -11,7 +11,7 @@ RCONFLICTS = "initscripts"
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
 # a suffix
-PR := "${PR}.2"
+PR := "${PR}.3"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
@@ -96,7 +96,7 @@ do_install_append() {
 	# checkfs.sh is currently disabled from S 30 (and won't work on OpenSlug)
 	# ramdisk is not used on OpenSlug, would run at S 30
 	update-rc.d -r ${D} mountall.sh		start 35 S .
-	# base-files populate-var.sh runs at S37
+	# base-files populate-volatile.sh runs at S37
 	update-rc.d -r ${D} devpts.sh		start 38 S .
 	# openslug file syslog starts here (39)
 
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 76755e1744..bf60cec12f 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r51"
+PR = "r53"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -66,7 +66,8 @@ do_install () {
 		   ${D}${sysconfdir}/rc4.d \
 		   ${D}${sysconfdir}/rc5.d \
 		   ${D}${sysconfdir}/rc6.d \
-		   ${D}${sysconfdir}/default
+		   ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/default/volatiles
 
 	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/checkroot.sh	${D}${sysconfdir}/init.d
@@ -86,7 +87,7 @@ do_install () {
 	install -m 0755    ${WORKDIR}/devpts		${D}${sysconfdir}/default
 	install -m 0755    ${WORKDIR}/sysfs.sh		${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d
-	install -m 0644    ${WORKDIR}/volatiles		${D}${sysconfdir}/default
+	install -m 0644    ${WORKDIR}/volatiles		${D}${sysconfdir}/default/volatiles/00_core
 	if [ "${TARGET_ARCH}" = "arm" ]; then
 		install -m 0755 ${WORKDIR}/alignment.sh	${D}${sysconfdir}/init.d
 	fi
diff --git a/packages/ion/ion3_0.0+ds20041104.bb b/packages/ion/ion3_0.0+ds20041104.bb
index cef2d2acd7..81af3169fd 100644
--- a/packages/ion/ion3_0.0+ds20041104.bb
+++ b/packages/ion/ion3_0.0+ds20041104.bb
@@ -1,3 +1,6 @@
+BROKEN = "1"
+# is unfetchable now - upstream updated to 20050728
+
 DEPENDS += "lua-native lua x11 xext"
 DESCRIPTION = "Ion is a tiling tabbed window manager designed with keyboard \
 users in mind."
diff --git a/packages/ipkg/ipkg-native.inc b/packages/ipkg/ipkg-native.inc
new file mode 100644
index 0000000000..b52b7b5e20
--- /dev/null
+++ b/packages/ipkg/ipkg-native.inc
@@ -0,0 +1,12 @@
+# NOTE: ipkg now obeys ${libdir}, so ipkg-native now installs
+# things into the wrong location inside of offline_root.  Backup
+# the target libdir and use that.
+target_libdir := "${libdir}"
+
+inherit native
+
+EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg"
+
+DEPENDS = "libtool-native automake-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
+PROVIDES = ""
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
new file mode 100644
index 0000000000..f535cfbef0
--- /dev/null
+++ b/packages/ipkg/ipkg.inc
@@ -0,0 +1,51 @@
+DESCRIPTION = "Itsy Package Manager"
+DESCRIPTION_libipkg = "Itsy Package Manager Library"
+SECTION = "base"
+LICENSE = "GPL"
+PROVIDES = "virtual/ipkg libipkg"
+
+PACKAGES =+ "libipkg-dev libipkg"
+FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libipkg = "${libdir}"
+AUTO_LIBNAME_PKGS = "libipkg"
+
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+	file://terse.patch;patch=1"
+
+S = "${WORKDIR}/ipkg/C"
+
+inherit autotools pkgconfig
+
+pkg_postinst_ipkg () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+	# this happens at S98 where our good 'ole packages script used to run
+	echo -e "#!/bin/sh
+ipkg-cl configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+fi
+
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
+}
+
+pkg_postrm_ipkg () {
+#!/bin/sh
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
+}
+
+do_stage() {
+	oe_libinstall -so libipkg ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/replace/
+	install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
+	install -d ${STAGING_INCDIR}/libipkg/
+	for f in *.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+	done
+}
+
+#
+# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf
+#
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index 9225cb3df7..84d037d330 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -2,12 +2,13 @@ DEPENDS = "ixp4xx-csr patcher-native"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPatch-1_1.zip \
+	   http://nslu.sourceforge.net/downloads/ixp425_eth.c.patch \
 	   file://makefile.patch;patch=1 \
 	   file://ethhdr.patch;patch=1 \
 	   file://intdriven.patch;patch=1 \
 	   file://pollcontroller.patch;patch=1 \
 	   file://mm4.patch;patch=1"
-PR = "r5"
+PR = "r7"
 
 S = "${WORKDIR}"
 
@@ -21,21 +22,21 @@ inherit module
 KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork"
 # KERNEL_LD +=
 
-do_ixp425_c_patch_fetch () {
-	if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then
-		cd ${DL_DIR}
-		wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193
-		md5sum > ixp425_eth.c.patch.md5
-	fi
-}
-
-addtask ixp425_c_patch_fetch after do_fetch before do_unpack
-
-do_ixp425_c_patch_unpack () {
-	install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/
-}
-
-addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch
+#do_ixp425_c_patch_fetch () {
+#	if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then
+#		cd ${DL_DIR}
+#		wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193
+#		md5sum > ixp425_eth.c.patch.md5
+#	fi
+#}
+#
+#addtask ixp425_c_patch_fetch after do_fetch before do_unpack
+
+#do_ixp425_c_patch_unpack () {
+#	install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/
+#}
+
+#addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch
 
 do_pre_patch () {
 	patcher -p 0 -i ixp425_eth_1_1_update_nf_bridge.patch
diff --git a/packages/libgsf/libgsf_1.12.1.bb b/packages/libgsf/libgsf_1.12.1.bb
new file mode 100644
index 0000000000..310d922d6e
--- /dev/null
+++ b/packages/libgsf/libgsf_1.12.1.bb
@@ -0,0 +1,47 @@
+LICENSE = "GPL"
+SECTION = "libs"
+PR = "r0"
+
+DEPENDS= "libxml2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs"
+
+PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
+
+FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*"
+FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome"
+
+inherit autotools pkgconfig gnome
+
+libgsf_includes = "gsf-doc-meta-data.h gsf-infile.h gsf-input-textline.h \
+		   gsf-outfile-zip.h gsf-output-stdio.h gsf-impl-utils.h \
+		   gsf-input-bzip.h gsf-input.h gsf-outfile.h gsf-output.h \
+		   gsf-infile-impl.h gsf-input-gzip.h gsf-libxml.h \
+		   gsf-output-bzip.h gsf-structured-blob.h gsf-infile-msole.h \
+		   gsf-input-impl.h gsf-msole-utils.h gsf-output-gzip.h \
+		   gsf-timestamp.h gsf-infile-msvba.h gsf-input-iochannel.h \
+		   gsf-outfile-impl.h gsf-output-impl.h gsf-utils.h \
+		   gsf-infile-stdio.h gsf-input-memory.h gsf-outfile-msole.h \
+		   gsf-output-iochannel.h gsf.h gsf-infile-zip.h gsf-input-stdio.h \
+		   gsf-outfile-stdio.h gsf-output-memory.h gsf-output-csv.h \
+		   gsf-output-iconv.h "
+
+libgsf_gnome_includes = "gsf-input-gnomevfs.h \
+			 gsf-output-gnomevfs.h \
+			 gsf-input-bonobo.h \
+			 gsf-output-bonobo.h \
+			 gsf-shared-bonobo-stream.h"
+
+do_stage() {
+	oe_libinstall -so -C gsf libgsf-1 ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf/
+	for i in ${libgsf_includes}; do
+		install -m 0644 gsf/$i ${STAGING_INCDIR}/libgsf-1/gsf/$i
+	done
+
+	oe_libinstall -so -C gsf-gnome libgsf-gnome-1 ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/libgsf-1/gsf-gnome/
+	for i in ${libgsf_gnome_includes}; do
+		install -m 0644 gsf-gnome/$i ${STAGING_INCDIR}/libgsf-1/gsf-gnome/$i
+	done
+}
diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
index 9bf400a9f7..c0b3bf2742 100644
--- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
+++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
@@ -1,3 +1,6 @@
+BROKEN = "1"
+#linux-2.6.5-gnalm1-gum0.patch is not fetchable 
+
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for OMAP processors"
 LICENSE = "GPL"
diff --git a/packages/linux/linux-netvista_2.4.27.bb b/packages/linux/linux-netvista_2.4.27.bb
index 576cfb891c..10c9bfc203 100644
--- a/packages/linux/linux-netvista_2.4.27.bb
+++ b/packages/linux/linux-netvista_2.4.27.bb
@@ -1,21 +1,26 @@
 DESCRIPTION = "Linux kernel x86 for IBM Netvista"
-LICENSE = "GPL"
-
-
-PR = "r2"
+LICENSE     = "GPL"
+MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>
+PR          = "r4"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
            file://netvista_defconfig"
 S = "${WORKDIR}/linux-${PV}"
 
-COMPATIBLE_HOST = 'i.86.*-linux'
+COMPATIBLE_HOST='i.86.*-linux'
 
 inherit kernel
 
-KERNEL_CCSUFFIX="-3.3.4"
+KERNEL_CCSUFFIX = "-3.3.4"
 ARCH = "i386"
 KERNEL_IMAGETYPE = "bzImage"
 
+# Avoid getting the kernel in the rootfs
+FILES_kernel = ""
+ALLOW_EMPTY_kernel = "1"
+PACKAGES += "kernel-image"
+FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
+
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/netvista_defconfig ${S}/.config
 }
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch
index 85d07191b9..85d07191b9 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0
index b993f2ac26..b993f2ac26 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie
index 9f51b61169..9f51b61169 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6
index 8b41380784..8b41380784 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle
index 42a851dd5f..42a851dd5f 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz
index ed5010d5c8..ed5010d5c8 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa
index c7eba4a337..c7eba4a337 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch
index a2dbce3325..a2dbce3325 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch
index ee761b75ad..ee761b75ad 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index d93006ffa7..ef1a97d2e4 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -21,31 +21,31 @@ JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files/"
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
            http://www.kernel.org/pub/linux/kernel/people/rml/inotify/v2.6/0.22/inotify-0.22-rml-2.6.11-1.patch;patch=1 \
            ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \
-           ${RPSRC}/rndis_fix-r0.patch;patch=1 \
-           ${RPSRC}/w100_malloc-r2.patch;patch=1 \
-           ${RPSRC}/pxairq_printk-r0.patch;patch=1 \
-           ${RPSRC}/corgi_kbd-r14.patch;patch=1 \
-           ${RPSRC}/corgi_ts-r10.patch;patch=1 \
-           ${RPSRC}/sharp_multi_scoop-r1.patch;patch=1 \
-           ${RPSRC}/corgi_kbd1-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_param-r5.patch;patch=1 \
+           ${RPSRC}/archive/rndis_fix-r0.patch;patch=1 \
+           ${RPSRC}/archive/w100_malloc-r2.patch;patch=1 \
+           ${RPSRC}/archive/pxairq_printk-r0.patch;patch=1 \
+           ${RPSRC}/archive/corgi_kbd-r14.patch;patch=1 \
+           ${RPSRC}/archive/corgi_ts-r10.patch;patch=1 \
+           ${RPSRC}/archive/sharp_multi_scoop-r1.patch;patch=1 \
+           ${RPSRC}/archive/corgi_kbd1-r0.patch;patch=1 \
+           ${RPSRC}/archive/sharpsl_param-r5.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
-           ${RPSRC}/pxa_irda-r1.patch;patch=1 \
-           ${RPSRC}/pxaudc_susres-r1.patch;patch=1 \
+           ${RPSRC}/archive/pxa_irda-r1.patch;patch=1 \
+           ${RPSRC}/archive/pxaudc_susres-r1.patch;patch=1 \
            ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \
-           ${RPSRC}/pxa_turbo-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_mapprom-r1.patch;patch=1 \
-           ${RPSRC}/input_power-r1.patch;patch=1 \
+           ${RPSRC}/archive/pxa_turbo-r0.patch;patch=1 \
+           ${RPSRC}/archive/sharpsl_mapprom-r1.patch;patch=1 \
+           ${RPSRC}/archive/input_power-r1.patch;patch=1 \
            ${RPSRC}/corgi_irda-r2.patch;patch=1 \
            ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
-           ${RPSRC}/corgi_power-r22.patch;patch=1 \
+           ${RPSRC}/archive/corgi_power-r22.patch;patch=1 \
            ${RPSRC}/corgi_power1-r1.patch;patch=1 \
-           ${RPSRC}/ide_fixes-r1.patch;patch=1 \
-           ${RPSRC}/mmc_sd-r4.patch;patch=1 \
+           ${RPSRC}/archive/ide_fixes-r1.patch;patch=1 \
+           ${RPSRC}/archive/mmc_sd-r4.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
            ${RPSRC}/corgi_snd-r6.patch;patch=1 \
-           ${RPSRC}/w100_split-r5-r1.patch;patch=1 \
+           ${RPSRC}/archive/w100_split-r5-r1.patch;patch=1 \
            ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
            ${DOSRC}/tc6393-device-r2.patch;patch=1 \
            ${DOSRC}/tc6393_nand-r2.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb
index 4f764c7803..2c7042c7ca 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r2"
+PR = "r0"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -23,10 +23,9 @@ BASRC = "http://www.orca.cx/zaurus/patches"
 # Patches submitted upstream are towards top of this list 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \
-           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm1/2.6.13-rc3-mm1.bz2;patch=1 \
-           ${RPSRC}/nand_softlockup-r0.patch;patch=1 \
-           ${RPSRC}/oprofile_irqfix-r0.patch;patch=1 \
-           ${RPSRC}/preempt_nwfpe-r1.patch;patch=1 \
+           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/2.6.13-rc3-mm3.bz2;patch=1 \
+           ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \
+           ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \
            ${RPSRC}/oprofile_typo-r0.patch;patch=1 \
            ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \
            ${RPSRC}/w100_core-r1.patch;patch=1 \
@@ -52,7 +51,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \
            ${RPSRC}/spitz_mtd-r0.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_bl-r0.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
            ${RPSRC}/ipaq/pxa_keys-r1.patch;patch=1 \
            ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \
@@ -70,7 +69,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/tosa-udc-r3.patch;patch=1 \
            ${DOSRC}/tosa-irda-r2.patch;patch=1 \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
-           ${DOSRC}/tosa-bl-r4.patch;patch=1 \
+           ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
            ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://add-elpp-stuff.patch;patch=1 \
diff --git a/packages/linux/nslu2-kernel/2.6.12/missing-exports.patch b/packages/linux/nslu2-kernel/2.6.12/missing-exports.patch
new file mode 100644
index 0000000000..935dd29115
--- /dev/null
+++ b/packages/linux/nslu2-kernel/2.6.12/missing-exports.patch
@@ -0,0 +1,19 @@
+--- linux-2.6.12/drivers/char/random.c~	2005-05-14 16:42:24.000000000 -0400
++++ linux-2.6.12/drivers/char/random.c	2005-05-14 16:42:46.000000000 -0400
+@@ -646,6 +646,7 @@ extern void add_input_randomness(unsigne
+ 	add_timer_randomness(&input_timer_state,
+ 			     (type << 4) ^ code ^ (code >> 4) ^ value);
+ }
++EXPORT_SYMBOL_GPL(add_input_randomness);
+ 
+ void add_interrupt_randomness(int irq)
+ {
+--- linux-2.6.12/lib/kobject_uevent.c~	2005-05-14 16:45:13.000000000 -0400
++++ linux-2.6.12/lib/kobject_uevent.c	2005-05-14 16:45:27.000000000 -0400
+@@ -178,6 +178,7 @@ static inline int send_uevent(const char
+ 
+ #ifdef CONFIG_HOTPLUG
+ char hotplug_path[HOTPLUG_PATH_LEN] = "/sbin/hotplug";
++EXPORT_SYMBOL_GPL(hotplug_path);
+ u64 hotplug_seqnum;
+ static DEFINE_SPINLOCK(sequence_lock);
diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb
index d72015c29a..8b54cdc703 100644
--- a/packages/linux/nslu2-kernel_2.6.12.2.bb
+++ b/packages/linux/nslu2-kernel_2.6.12.2.bb
@@ -1,5 +1,5 @@
 # Kernel for NSLU2
-PR = "r4"
+PR = "r6"
 include nslu2-kernel.inc
 
 # N2K_EXTRA_PATCHES - list of patches to apply (can include
@@ -21,4 +21,5 @@ N2K_PATCHES = "\
 	file://xscale-reset.patch;patch=1 \
 	file://x1205-rtc.c-id.patch;patch=1 \
 	file://mtd-shutdown.patch;patch=1 \
+	file://missing-exports.patch;patch=1 \
 "
diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig
index ba3744e2f5..fef846fe33 100644
--- a/packages/linux/openslug-kernel-2.6.12.2/defconfig
+++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig
@@ -626,7 +626,7 @@ CONFIG_INPUT=m
 CONFIG_INPUT_MOUSEDEV=n
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
 
 #
@@ -929,7 +929,7 @@ CONFIG_USB_HIDDEV=y
 #
 # USB HID Boot Protocol drivers
 #
-# CONFIG_USB_KBD is not set
+CONFIG_USB_KBD=m
 # CONFIG_USB_MOUSE is not set
 # CONFIG_USB_AIPTEK is not set
 # CONFIG_USB_WACOM is not set
diff --git a/packages/mailx/mailx_8.1.2-0.20040524cvs.bb b/packages/mailx/mailx_8.1.2-0.20040524cvs.bb
index bf2a3d4640..18ef830a08 100644
--- a/packages/mailx/mailx_8.1.2-0.20040524cvs.bb
+++ b/packages/mailx/mailx_8.1.2-0.20040524cvs.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "mailx is the traditional command-line-mode \
 mail user agent."
 LICENSE = "GPL"
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}.orig.tar.gz \
-	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;patch=1 \
+	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-4.diff.gz;patch=1 \
 	   file://install.patch;patch=1"
 S = "${WORKDIR}/mailx-${PV}.orig"
 
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 17b9c66653..fc0e9854ed 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,5 +1,5 @@
 
-PR          = "r6"
+PR          = "r7"
 PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme
 DESCRIPTION = "Meta-package for maemo environment"
 MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
@@ -84,7 +84,8 @@ maemo-task-apps = "\
     osso-app-killer \
     osso-screenshot-tool \
     gpe-todo-hildon \
-    gpe-contacts-hildon"
+    gpe-contacts-hildon \
+    gpe-mini-browser-hildon"
 
 RDEPENDS_maemo-task-apps := "${maemo-task-apps}"
 DEPENDS += " ${maemo-task-apps}"
diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb
index 6ab8bc73b5..c8c231d302 100644
--- a/packages/meta/openslug-image.bb
+++ b/packages/meta/openslug-image.bb
@@ -36,8 +36,7 @@ inherit image_ipk
 python () {
 	# Don't build openslug images unless we're targeting an nslu2
 	mach = bb.data.getVar("MACHINE", d, 1)
-	dist = bb.data.getVar("DISTRO", d, 1)
-	if mach != 'nslu2' or dist != 'openslug':
+	if mach != 'nslu2':
 		raise bb.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2")
 }
 LICENSE = MIT
diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb
index a3bd0a830a..bb5a68d01e 100644
--- a/packages/meta/openslug-native.bb
+++ b/packages/meta/openslug-native.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Packages that are required for the OpenSlug native build environment"
 LICENSE = MIT
-PR = "r5"
+PR = "r7"
 
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = 1
@@ -21,6 +21,7 @@ OPENSLUG_NATIVE = "\
 	gcc gcc-symlinks \
 	glibc-extra-nss glibc-utils \
 	gnu-config \
+	gzip \
 	libc6 libc6-dev \
 	libg2c-dev \
 	libgdbm3 \
@@ -34,6 +35,7 @@ OPENSLUG_NATIVE = "\
 	monotone-5 \
 	ncurses ncurses-dev ncurses-terminfo \
 	patch \
+	perl perl-modules \
 	python-core python-io python-lang python-pickle python-shell python-textutils \
 	sed \
 	tar \
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 96d81e1d31..7e248bc60e 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -24,6 +24,8 @@ OPENSLUG_DEVELOPMENT = "\
 	gnu-config \
 	grep \
 	gzip \
+	ipkg-utils \
+	libtool \
 	lsof \
 	m4 \
 	make \
@@ -32,8 +34,10 @@ OPENSLUG_DEVELOPMENT = "\
 	openssh \
 	patch \
 	pciutils \
+	pkgconfig \
 	quilt \
 	sed \
+	strace \
 	util-linux \
 	"
 
@@ -50,9 +54,12 @@ OPENSLUG_PACKAGES = "\
 	bash \
 	bluez-utils-nodbus \
 	bridge-utils \
+	bwmon \
+	ccxstream \
 	coreutils \
 	cron \
 	cvs\
+	cyrus-imapd \
 	dnsmasq \
 	expat \
 	ftpd-topfield \
@@ -62,14 +69,13 @@ OPENSLUG_PACKAGES = "\
 	less \
 	libusb \
 	libxml2 \
-	man \
-	man-pages \
 	miau \ 
 	microcom \
 	mt-daapd \
 	mutt \
 	mysql \
 	nail \
+	nano \
 	ncftp \
 	obexftp openobex openobex-apps ircp \
 	openssh \
@@ -77,13 +83,10 @@ OPENSLUG_PACKAGES = "\
 	pcre \
 	ppp \
 	procps \
-	psmisc \
 	puppy \
 	pwc \
 	rsync \
-	screen \
 	setpwc \
-	streamripper \
 	sudo \
 	sysfsutils \
 	thttpd \
@@ -95,6 +98,7 @@ OPENSLUG_PACKAGES = "\
 	python \
 	samba \
 	sane-backends \
+	strace \
 	thttpd \
 	vlan \
 	wget \
@@ -107,18 +111,22 @@ OPENSLUG_PACKAGES = "\
 # such as sinf.)
 OPENSLUG_PACKAGES_append_linux = "\
 	bind \
+	man man-pages \
 	mgetty \
 	mpd \
 	nfs-utils \
 	libpam \
 	php \
 	postfix \
+	psmisc \
+	screen \
+	streamripper \
+	timezones \
 	xinetd \
 	yp-tools ypbind ypserv \
 	"
 
 BROKEN_PACKAGES = "\
-	strace \
 	"
 
 DEPENDS = 'openslug-image \
diff --git a/packages/minilite/minilite_0.49.bb b/packages/minilite/minilite_0.49.bb
new file mode 100644
index 0000000000..0f5b126043
--- /dev/null
+++ b/packages/minilite/minilite_0.49.bb
@@ -0,0 +1,10 @@
+inherit gpe
+LICENSE = "GPL"
+DEPENDS = "libgpewidget"
+SECTION = "gpe"
+
+DESCRIPTION = "GPE Screen light control dockapp"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
+
+export CVSBUILD="no"
diff --git a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
index 8042a9789c..8a4fd421e7 100644
--- a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
+++ b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "unknown"
 
-SRC_URI = "http://www.red-bean.com/~proski/firmware/1.7.4.tar.gz"
+SRC_URI = "http://www.red-bean.com/~proski/firmware/${PV}.tar.bz2"
 
 INHIBIT_PACKAGE_STRIP = "1"
 
diff --git a/packages/nis/pwdutils_2.6.bb b/packages/nis/pwdutils_2.6.bb
index 4ba89ffb23..4db798c151 100644
--- a/packages/nis/pwdutils_2.6.bb
+++ b/packages/nis/pwdutils_2.6.bb
@@ -12,6 +12,8 @@ HOMEPAGE="http://lists.suse.com/archive/pwdutils/"
 
 include nis.inc
 
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
+
 # an selinux API is used even if no selinux is detected by
 # configure.
 SRC_URI += " file://no-selinux.patch;patch=1"
diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb
index e58daa6670..fb6b0b3621 100644
--- a/packages/nis/ypbind-mt_1.18.bb
+++ b/packages/nis/ypbind-mt_1.18.bb
@@ -16,6 +16,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html"
 
 include nis.inc
 
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
+
 # ypbind-mt now provides all the functionality of ypbind
 # and is used in place of it.
 PROVIDES += "ypbind"
diff --git a/packages/nis/ypserv_2.17.bb b/packages/nis/ypserv_2.17.bb
index 6edb534e8f..c6c564bd50 100644
--- a/packages/nis/ypserv_2.17.bb
+++ b/packages/nis/ypserv_2.17.bb
@@ -7,6 +7,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html"
 
 include nis.inc
 
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
+
 # ypserv needs a database package, gdbm is currently the
 # only candidate
 DEPENDS += " gdbm"
diff --git a/packages/nonworking/lftp/lftp_3.2.1.bb b/packages/nonworking/lftp/lftp_3.2.1.bb
index 70fca7c361..0acc1e328d 100644
--- a/packages/nonworking/lftp/lftp_3.2.1.bb
+++ b/packages/nonworking/lftp/lftp_3.2.1.bb
@@ -8,6 +8,7 @@ PR = "r0"
 
 SRC_URI = "http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-${PV}.tar.bz2 \
 	   file://pty.patch;patch=1"
+S = "${WORKDIR}/lftp-${PV}"
 
 EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no"
 
diff --git a/packages/nonworking/tetex/tetex-2.0.2/configure.patch b/packages/nonworking/tetex/tetex-2.0.2/configure.patch
deleted file mode 100644
index 66b1967742..0000000000
--- a/packages/nonworking/tetex/tetex-2.0.2/configure.patch
+++ /dev/null
@@ -1,2222 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- tetex-src-2.0.2/libs/xpdf/configure.in~configure	2002-12-05 18:44:31.000000000 -0500
-+++ tetex-src-2.0.2/libs/xpdf/configure.in	2004-01-26 20:17:53.000000000 -0500
-@@ -1,25 +1,35 @@
- dnl Process this file with autoconf to produce a configure script.
- dnl Copyright 1998-2002 Glyph & Cog, LLC
- 
--AC_INIT(xpdf/xpdf.cc)
-+AC_INIT
-+AC_CONFIG_SRCDIR([xpdf/xpdf.cc])
- AC_CONFIG_HEADER(aconf.h)
- 
- dnl ##### Optional features.
- AC_ARG_ENABLE(a4-paper,
- [  --enable-a4-paper       use A4 paper size instead of Letter for
-                           PostScript output],
-+AH_TEMPLATE([A4_PAPER], [Define if using A4 paper size instead of Letter for PS output])
- AC_DEFINE(A4_PAPER))
-+
- AC_ARG_ENABLE(no-text-select,
- [  --enable-no-text-select do not allow text selection],
-+AH_TEMPLATE([NO_TEXT_SELECT], [Define if not allowing text selection])
- AC_DEFINE(NO_TEXT_SELECT))
-+
- AC_ARG_ENABLE(opi,
- [  --enable-opi            include support for OPI comments],
-+AH_TEMPLATE([OPI_SUPPORT], [Define if including support for OPI comments])
- AC_DEFINE(OPI_SUPPORT))
-+
- AC_ARG_ENABLE(multithreaded,
- [  --enable-multithreaded  include support for multithreading],
-+AH_TEMPLATE([MULTITHREADED], [Define if including support for multithreading])
- AC_DEFINE(MULTITHREADED))
-+
- AC_ARG_WITH(appdef-dir,
- [  --with-appdef-dir       set app-defaults directory],
-+AH_TEMPLATE([APPDEFDIR], [Set to app-defaults directory])
- AC_DEFINE_UNQUOTED(APPDEFDIR, "$with_appdef_dir"))
- 
- dnl ##### Path to xpdfrc.
-@@ -34,12 +44,13 @@
- else
-   system_xpdfrc="$sysconfdir/xpdfrc"
- fi
-+AH_TEMPLATE([SYSTEM_XPDFRC], [Set to path to the xpdfrc])
- AC_DEFINE_UNQUOTED(SYSTEM_XPDFRC, "$system_xpdfrc")
- 
- dnl ##### Checks for programs.
- AC_PROG_CC
- AC_ISC_POSIX
--AC_PROG_CC_STDC
-+
- #if test -z "$CXX" -a "$CC" = "gcc"; then
- #  CXX="gcc"
- #fi
-@@ -56,9 +67,7 @@
- dnl ##### Check for OS/2.
- AC_CACHE_CHECK([for OS/2 (with EMX)],
- xpdf_cv_sys_os2,
--[AC_TRY_COMPILE([],
--[__EMX__],
--xpdf_cv_sys_os2=yes, xpdf_cv_sys_os2=no)])
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[__EMX__]])],[xpdf_cv_sys_os2=yes],[xpdf_cv_sys_os2=no])])
- if test "$xpdf_cv_sys_os2" = yes; then
-   EXE=".exe"
-   LIBPREFIX=""
-@@ -68,9 +77,7 @@
- dnl ##### Check for DOS (with DJGPP).
- AC_CACHE_CHECK([for DOS (with DJGPP)],
- xpdf_cv_sys_dos,
--[AC_TRY_COMPILE([],
--[__DJGPP__],
--xpdf_cv_sys_dos=yes, xpdf_cv_sys_dos=no)])
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[__DJGPP__]])],[xpdf_cv_sys_dos=yes],[xpdf_cv_sys_dos=no])])
- if test "$xpdf_cv_sys_dos" = yes; then
-   EXE=".exe"
-   LIBPREFIX="lib"
-@@ -91,7 +98,7 @@
- dnl ##### Switch over to C++.  This will make the checks below a little
- dnl ##### bit stricter (requiring function prototypes in include files).
- dnl ##### (99% of xpdf is written in C++.)
--AC_LANG_CPLUSPLUS
-+AC_LANG([C++])
- 
- dnl ##### Check for extra libraries needed by X.  (LynxOS needs this.)
- AC_CHECK_FUNC(gethostbyname)
-@@ -100,34 +107,33 @@
- fi
- 
- dnl ##### Look for header that defines select() and fd_set.
-+AH_TEMPLATE([HAVE_SYS_SELECT_H], [Define if you have sys/select.h])
-+AH_TEMPLATE([HAVE_SYS_BSDTYPES_H], [Define if you have sys/bsdtypes.h])
- AC_MSG_CHECKING([select() and fd_set in sys/select.h and sys/bsdtypes.h])
--AC_TRY_COMPILE([#include <stdlib.h>
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
- #include <stddef.h>
- #include <unistd.h>
--#include <sys/types.h>],
--  [fd_set fds;
--select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
-+#include <sys/types.h>]], [[fd_set fds;
-+select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no])
- if test $xpdf_ok = yes; then
-   AC_MSG_RESULT([not needed])
- else
--  AC_TRY_COMPILE([#include <stdlib.h>
-+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
- #include <stddef.h>
- #include <unistd.h>
- #include <sys/types.h>
--#include <sys/select.h>],
--    [fd_set fds;
--select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
-+#include <sys/select.h>]], [[fd_set fds;
-+select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no])
-   if test $xpdf_ok = yes; then
-     AC_DEFINE(HAVE_SYS_SELECT_H)
-     AC_MSG_RESULT([need sys/select.h])
-   else
--    AC_TRY_COMPILE([#include <stdlib.h>
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
- #include <stddef.h>
- #include <unistd.h>
- #include <sys/types.h>
--#include <sys/bsdtypes.h>],
--      [fd_set fds;
--select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
-+#include <sys/bsdtypes.h>]], [[fd_set fds;
-+select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no])
-     if test $xpdf_ok = yes; then
-       AC_DEFINE(HAVE_SYS_BSDTYPES_H)
-       AC_MSG_RESULT([need sys/bsdtypes.h])
-@@ -138,34 +144,33 @@
- fi
- 
- dnl ##### Look for header that defines FD_ZERO.
-+AH_TEMPLATE([HAVE_STRINGS_H], [Define if you need to include strings.h.])
-+AH_TEMPLATE([HAVE_BSTRING_H], [Define if you need to include bstring.h.])
- AC_MSG_CHECKING([FD_ZERO and strings.h or bstring.h])
--AC_TRY_COMPILE([#include <stdlib.h>
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
- #include <sys/types.h>
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>
--#endif],
--[fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
-+#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no])
- if test $xpdf_ok = yes; then
-   AC_MSG_RESULT([not needed])
- else
--  AC_TRY_COMPILE([#include <stdlib.h>
-+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
- #include <sys/types.h>
- #include <strings.h>
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>
--#endif],
--    [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
-+#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no])
-   if test $xpdf_ok = yes; then
-     AC_DEFINE(HAVE_STRINGS_H)
-     AC_MSG_RESULT([need strings.h])
-   else
--    AC_TRY_COMPILE([#include <stdlib.h>
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
- #include <sys/types.h>
- #include <bstring.h>
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>
--#endif],
--      [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
-+#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no])
-     if test $xpdf_ok = yes; then
-       AC_DEFINE(HAVE_BSTRING_H)
-       AC_MSG_RESULT([need bstring.h])
-@@ -186,46 +191,44 @@
- dnl # This should use 'AC_CHECK_FUNCS(mkstemp)' but that fails if
- dnl # the mkstemp exists in the library but isn't declared in the
- dnl # include file (e.g., in cygwin 1.1.2).
-+AH_TEMPLATE([HAVE_MKSTEMP], [Define if we have mkstemp])
- AC_CACHE_CHECK([for mkstemp],
- xpdf_cv_func_mkstemp,
--[AC_TRY_LINK([#include <stdlib.h>
--#include <unistd.h>],
--[mkstemp("foo");],
--xpdf_cv_func_mkstemp=yes, xpdf_cv_func_mkstemp=no)])
-+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
-+#include <unistd.h>]], [[mkstemp("foo");]])],[xpdf_cv_func_mkstemp=yes],[xpdf_cv_func_mkstemp=no])])
- if test "$xpdf_cv_func_mkstemp" = yes; then
-   AC_DEFINE(HAVE_MKSTEMP)
- fi
-+AH_TEMPLATE([HAVE_MKSTEMPS], [Define if we have mkstemps])
- dnl # Check for mkstemps, just like mkstemp.
- AC_CACHE_CHECK([for mkstemps],
- xpdf_cv_func_mkstemps,
--[AC_TRY_LINK([#include <stdlib.h>
--#include <unistd.h>],
--[mkstemps("foo", 0);],
--xpdf_cv_func_mkstemps=yes, xpdf_cv_func_mkstemps=no)])
-+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
-+#include <unistd.h>]], [[mkstemps("foo", 0);]])],[xpdf_cv_func_mkstemps=yes],[xpdf_cv_func_mkstemps=no])])
- if test "$xpdf_cv_func_mkstemps" = yes; then
-   AC_DEFINE(HAVE_MKSTEMPS)
- fi
- 
-+AH_TEMPLATE([SELECT_TAKES_INT], [Define if select takes an int * argument instead of fd_set *])
- dnl ##### Check select argument type: on HP-UX before version 10, select
- dnl ##### takes (int *) instead of (fd_set *).
- AC_CACHE_CHECK([whether select takes fd_set arguments],
- xpdf_cv_func_select_arg,
--[AC_TRY_COMPILE([#include <sys/types.h>
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
- #include <sys/time.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>
--#endif],
--[fd_set fds;
--select(1, &fds, &fds, &fds, 0);],
--xpdf_cv_func_select_arg=yes, xpdf_cv_func_select_arg=no)])
-+#endif]], [[fd_set fds;
-+select(1, &fds, &fds, &fds, 0);]])],[xpdf_cv_func_select_arg=yes],[xpdf_cv_func_select_arg=no])])
- if test "$xpdf_cv_func_select_arg" != yes; then
-   AC_DEFINE(SELECT_TAKES_INT)
- fi
- 
- dnl ##### Back to C for the library tests.
--AC_LANG_C
-+AC_LANG([C])
- 
-+AH_TEMPLATE([HAVE_FSEEK64], [Define if we have fseek64/ftell64])
- dnl ##### Check for fseeko/ftello or fseek64/ftell64
- dnl The LARGEFILE and FSEEKO macros have to be called in C, not C++, mode.
- AC_SYS_LARGEFILE
-@@ -289,6 +292,7 @@
- dnl ##### Look for FreeType 2.0.5+ first, and then FreeType 1.x.
- dnl ##### (Note: FT_Get_Name_Index was added in FT 2.0.5, and is
- dnl ##### the reason that Xpdf requires 2.0.5+.)
-+AH_TEMPLATE([FREETYPE2], [Define if using freetype2])
- if test -z "$no_x"; then
-   smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
-                 FT_Get_Name_Index, freetype/freetype.h,
-@@ -334,7 +338,8 @@
- AC_SUBST(XPDF_TARGET)
- 
- dnl ##### Write the makefiles.
--AC_OUTPUT(Makefile xpdf/Makefile goo/Makefile)
-+AC_CONFIG_FILES([Makefile xpdf/Makefile goo/Makefile])
-+AC_OUTPUT
- 
- dnl ##### Warn user if X is missing.
- if test -n "$no_x"; then
---- tetex-src-2.0.2/./texk/etc/autoconf/acspecific.m4~configure	2003-02-18 01:46:57.000000000 -0500
-+++ tetex-src-2.0.2/./texk/etc/autoconf/acspecific.m4	2004-01-26 20:17:53.000000000 -0500
-@@ -56,7 +56,7 @@
- dnl checking messages from result messages.
- dnl Idea borrowed from dist 3.0.
- dnl Internal use only.
--AC_DEFUN(AC_PROG_ECHO_N,
-+AC_DEFUN([AC_PROG_ECHO_N],
- [if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -70,7 +70,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_PROG_CC,
-+AC_DEFUN([AC_PROG_CC],
- [AC_BEFORE([$0], [AC_PROG_CPP])dnl
- AC_CHECK_PROG(CC, gcc, gcc)
- if test -z "$CC"; then
-@@ -117,7 +117,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_PROG_CXX,
-+AC_DEFUN([AC_PROG_CXX],
- [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
- AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, gcc)
- 
-@@ -166,7 +166,7 @@
- dnl 77 compilers.
- dnl 
- dnl AC_PROG_F77()
--AC_DEFUN(AC_PROG_F77,
-+AC_DEFUN([AC_PROG_F77],
- [AC_BEFORE([$0], [AC_PROG_CPP])dnl
- if test -z "$F77"; then
-   AC_CHECK_PROGS(F77, g77 f77 f2c)
-@@ -198,7 +198,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_PROG_CC_WORKS,
-+AC_DEFUN([AC_PROG_CC_WORKS],
- [AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works])
- AC_LANG_SAVE
- AC_LANG_C
-@@ -213,7 +213,7 @@
- cross_compiling=$ac_cv_prog_cc_cross
- ])
- 
--AC_DEFUN(AC_PROG_CXX_WORKS,
-+AC_DEFUN([AC_PROG_CXX_WORKS],
- [AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-@@ -234,7 +234,7 @@
- dnl compiler is `g77').
- dnl 
- dnl AC_PROG_F77_WORKS()
--AC_DEFUN(AC_PROG_F77_WORKS,
-+AC_DEFUN([AC_PROG_F77_WORKS],
- [AC_MSG_CHECKING([whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works])
- AC_LANG_SAVE
- AC_LANG_FORTRAN77
-@@ -252,7 +252,7 @@
- cross_compiling=$ac_cv_prog_f77_cross
- ])
- 
--AC_DEFUN(AC_PROG_CC_GNU,
-+AC_DEFUN([AC_PROG_CC_GNU],
- [AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc,
- [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
- cat > conftest.c <<EOF
-@@ -266,7 +266,7 @@
-   ac_cv_prog_gcc=no
- fi])])
- 
--AC_DEFUN(AC_PROG_CXX_GNU,
-+AC_DEFUN([AC_PROG_CXX_GNU],
- [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx,
- [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
- cat > conftest.C <<EOF
-@@ -285,7 +285,7 @@
- dnl do CPP pre-processing.
- dnl 
- dnl AC_PROG_F77_GNU()
--AC_DEFUN(AC_PROG_F77_GNU,
-+AC_DEFUN([AC_PROG_F77_GNU],
- [AC_CACHE_CHECK(whether we are using GNU Fortran 77, ac_cv_prog_g77,
- [cat > conftest.fpp <<EOF
- #ifdef __GNUC__
-@@ -298,7 +298,7 @@
-   ac_cv_prog_g77=no
- fi])])
- 
--AC_DEFUN(AC_PROG_CC_G,
-+AC_DEFUN([AC_PROG_CC_G],
- [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
- [echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-@@ -309,7 +309,7 @@
- rm -f conftest*
- ])])
- 
--AC_DEFUN(AC_PROG_CXX_G,
-+AC_DEFUN([AC_PROG_CXX_G],
- [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
- [echo 'void f(){}' > conftest.cc
- if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-@@ -324,7 +324,7 @@
- dnl enable debugging.
- dnl 
- dnl AC_PROG_F77_G()
--AC_DEFUN(AC_PROG_F77_G,
-+AC_DEFUN([AC_PROG_F77_G],
- [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g,
- [cat > conftest.f << EOF
-        program conftest
-@@ -338,7 +338,7 @@
- rm -f conftest*
- ])])
- 
--AC_DEFUN(AC_PROG_GCC_TRADITIONAL,
-+AC_DEFUN([AC_PROG_GCC_TRADITIONAL],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_PROG_CPP])dnl
- if test $ac_cv_prog_gcc = yes; then
-@@ -360,7 +360,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_PROG_CC_C_O,
-+AC_DEFUN([AC_PROG_CC_C_O],
- [if test "x$CC" != xcc; then
-   AC_MSG_CHECKING(whether $CC and cc understand -c and -o together)
- else
-@@ -416,7 +416,7 @@
- dnl completeness, since a similar test exists for the C compiler.
- dnl 
- dnl AC_PROG_F77_C_O
--AC_DEFUN(AC_PROG_F77_C_O,
-+AC_DEFUN([AC_PROG_F77_C_O],
- [AC_BEFORE([$0], [AC_PROG_F77])dnl
- AC_MSG_CHECKING(whether $F77 understand -c and -o together)
- set dummy $F77; ac_f77="`echo [$]2 |
-@@ -448,7 +448,7 @@
- ])
- 
- dnl Define SET_MAKE to set ${MAKE} if make doesn't.
--AC_DEFUN(AC_PROG_MAKE_SET,
-+AC_DEFUN([AC_PROG_MAKE_SET],
- [AC_MSG_CHECKING(whether ${MAKE-make} sets \${MAKE})
- set dummy ${MAKE-make}; ac_make=`echo "[$]2" | sed 'y%./+-%__p_%'`
- AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
-@@ -476,17 +476,17 @@
- AC_SUBST([SET_MAKE])dnl
- ])
- 
--AC_DEFUN(AC_PROG_RANLIB,
-+AC_DEFUN([AC_PROG_RANLIB],
- [AC_CHECK_PROG(RANLIB, ranlib, ranlib, :)])
- 
- dnl Check for mawk first since it's generally faster.
--AC_DEFUN(AC_PROG_AWK,
-+AC_DEFUN([AC_PROG_AWK],
- [AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )])
- 
--AC_DEFUN(AC_PROG_YACC,
-+AC_DEFUN([AC_PROG_YACC],
- [AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)])
- 
--AC_DEFUN(AC_PROG_CPP,
-+AC_DEFUN([AC_PROG_CPP],
- [AC_MSG_CHECKING(how to run the C preprocessor)
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-@@ -518,7 +518,7 @@
- AC_SUBST(CPP)dnl
- ])
- 
--AC_DEFUN(AC_PROG_CXXCPP,
-+AC_DEFUN([AC_PROG_CXXCPP],
- [AC_MSG_CHECKING(how to run the C++ preprocessor)
- if test -z "$CXXCPP"; then
- AC_CACHE_VAL(ac_cv_prog_CXXCPP,
-@@ -537,10 +537,10 @@
- 
- dnl Require finding the C or C++ preprocessor, whichever is the
- dnl current language.
--AC_DEFUN(AC_REQUIRE_CPP,
-+AC_DEFUN([AC_REQUIRE_CPP],
- [ifelse(AC_LANG, C, [AC_REQUIRE([AC_PROG_CPP])], [AC_REQUIRE([AC_PROG_CXXCPP])])])
- 
--AC_DEFUN(AC_PROG_LEX,
-+AC_DEFUN([AC_PROG_LEX],
- [AC_CHECK_PROG(LEX, flex, flex, lex)
- if test -z "$LEXLIB"
- then
-@@ -554,7 +554,7 @@
- 
- dnl Check if lex declares yytext as a char * by default, not a char[].
- undefine([AC_DECL_YYTEXT])
--AC_DEFUN(AC_DECL_YYTEXT,
-+AC_DEFUN([AC_DECL_YYTEXT],
- [AC_REQUIRE_CPP()dnl
- AC_REQUIRE([AC_PROG_LEX])dnl
- AC_CACHE_CHECK(lex output file root, ac_cv_prog_lex_root,
-@@ -660,7 +660,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_PROG_INSTALL,
-+AC_DEFUN([AC_PROG_INSTALL],
- [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
-@@ -730,7 +730,7 @@
- AC_SUBST(INSTALL_DATA)dnl
- ])
- 
--AC_DEFUN(AC_PROG_LN_S,
-+AC_DEFUN([AC_PROG_LN_S],
- [AC_MSG_CHECKING(whether ln -s works)
- AC_CACHE_VAL(ac_cv_prog_LN_S,
- [rm -f conftestdata
-@@ -752,7 +752,7 @@
- AC_SUBST(LN_S)dnl
- ])
- 
--define(AC_RSH,
-+define([AC_RSH],
- [errprint(__file__:__line__: [$0] has been removed; replace it with equivalent code
- )m4exit(4)])
- 
-@@ -760,7 +760,7 @@
- dnl ### Checks for header files
- 
- 
--AC_DEFUN(AC_HEADER_STDC,
-+AC_DEFUN([AC_HEADER_STDC],
- [AC_REQUIRE_CPP()dnl
- AC_CACHE_CHECK(for ANSI C header files, ac_cv_header_stdc,
- [AC_TRY_CPP([#include <stdlib.h>
-@@ -794,11 +794,11 @@
- fi
- ])
- 
--AC_DEFUN(AC_UNISTD_H,
-+AC_DEFUN([AC_UNISTD_H],
- [AC_OBSOLETE([$0], [; instead use AC_CHECK_HEADERS(unistd.h)])dnl
- AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H))])
- 
--AC_DEFUN(AC_USG,
-+AC_DEFUN([AC_USG],
- [AC_OBSOLETE([$0],
-   [; instead use AC_CHECK_HEADERS(string.h) and HAVE_STRING_H])dnl
- AC_MSG_CHECKING([for BSD string and memory functions])
-@@ -808,7 +808,7 @@
- 
- dnl If memchr and the like aren't declared in <string.h>, include <memory.h>.
- dnl To avoid problems, don't check for gcc2 built-ins.
--AC_DEFUN(AC_MEMORY_H,
-+AC_DEFUN([AC_MEMORY_H],
- [AC_OBSOLETE([$0], [; instead use AC_CHECK_HEADERS(memory.h) and HAVE_MEMORY_H])dnl
- AC_MSG_CHECKING(whether string.h declares mem functions)
- AC_EGREP_HEADER(memchr, string.h, ac_found=yes, ac_found=no)
-@@ -818,7 +818,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_HEADER_MAJOR,
-+AC_DEFUN([AC_HEADER_MAJOR],
- [AC_CACHE_CHECK(whether sys/types.h defines makedev,
-   ac_cv_header_sys_types_h_makedev,
- [AC_TRY_LINK([#include <sys/types.h>], [return makedev(0, 0);],
-@@ -834,7 +834,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_HEADER_DIRENT,
-+AC_DEFUN([AC_HEADER_DIRENT],
- [ac_header_dirent=no
- AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h,
-   [ac_header_dirent=$ac_hdr; break])
-@@ -849,7 +849,7 @@
- dnl Like AC_CHECK_HEADER, except also make sure that HEADER-FILE
- dnl defines the type `DIR'.  dirent.h on NextStep 3.2 doesn't.
- dnl AC_CHECK_HEADER_DIRENT(HEADER-FILE, ACTION-IF-FOUND)
--AC_DEFUN(AC_CHECK_HEADER_DIRENT,
-+AC_DEFUN([AC_CHECK_HEADER_DIRENT],
- [ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
- AC_MSG_CHECKING([for $1 that defines DIR])
- AC_CACHE_VAL(ac_cv_header_dirent_$ac_safe,
-@@ -868,7 +868,7 @@
- dnl Like AC_CHECK_HEADERS, except succeed only for a HEADER-FILE that
- dnl defines `DIR'.
- dnl AC_CHECK_HEADERS_DIRENT(HEADER-FILE... [, ACTION])
--define(AC_CHECK_HEADERS_DIRENT,
-+define([AC_CHECK_HEADERS_DIRENT],
- [for ac_hdr in $1
- do
- AC_CHECK_HEADER_DIRENT($ac_hdr,
-@@ -878,7 +878,7 @@
-   AC_DEFINE_UNQUOTED($ac_tr_hdr) $2])dnl
- done])
- 
--AC_DEFUN(AC_DIR_HEADER,
-+AC_DEFUN([AC_DIR_HEADER],
- [AC_OBSOLETE([$0], [; instead use AC_HEADER_DIRENT])dnl
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-@@ -902,7 +902,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_HEADER_STAT,
-+AC_DEFUN([AC_HEADER_STAT],
- [AC_CACHE_CHECK(whether stat file-mode macros are broken,
-   ac_cv_header_stat_broken,
- [AC_EGREP_CPP([You lose], [#include <sys/types.h>
-@@ -937,7 +937,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_DECL_SYS_SIGLIST,
-+AC_DEFUN([AC_DECL_SYS_SIGLIST],
- [AC_CACHE_CHECK([for sys_siglist declaration in signal.h or unistd.h],
-   ac_cv_decl_sys_siglist,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -952,7 +952,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_HEADER_SYS_WAIT,
-+AC_DEFUN([AC_HEADER_SYS_WAIT],
- [AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible],
-   ac_cv_header_sys_wait_h,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -975,7 +975,7 @@
- dnl ### Checks for typedefs
- 
- 
--AC_DEFUN(AC_TYPE_GETGROUPS,
-+AC_DEFUN([AC_TYPE_GETGROUPS],
- [AC_REQUIRE([AC_TYPE_UID_T])dnl
- AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups,
- [AC_TRY_RUN(
-@@ -1015,7 +1015,7 @@
- AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups)
- ])
- 
--AC_DEFUN(AC_TYPE_UID_T,
-+AC_DEFUN([AC_TYPE_UID_T],
- [AC_CACHE_CHECK(for uid_t in sys/types.h, ac_cv_type_uid_t,
- [AC_EGREP_HEADER(uid_t, sys/types.h,
-   ac_cv_type_uid_t=yes, ac_cv_type_uid_t=no)])
-@@ -1025,20 +1025,20 @@
- fi
- ])
- 
--AC_DEFUN(AC_TYPE_SIZE_T,
-+AC_DEFUN([AC_TYPE_SIZE_T],
- [AC_CHECK_TYPE(size_t, unsigned)])
- 
--AC_DEFUN(AC_TYPE_PID_T,
-+AC_DEFUN([AC_TYPE_PID_T],
- [AC_CHECK_TYPE(pid_t, int)])
- 
--AC_DEFUN(AC_TYPE_OFF_T,
-+AC_DEFUN([AC_TYPE_OFF_T],
- [AC_CHECK_TYPE(off_t, long)])
- 
--AC_DEFUN(AC_TYPE_MODE_T,
-+AC_DEFUN([AC_TYPE_MODE_T],
- [AC_CHECK_TYPE(mode_t, int)])
- 
- dnl Note that identifiers starting with SIG are reserved by ANSI C.
--AC_DEFUN(AC_TYPE_SIGNAL,
-+AC_DEFUN([AC_TYPE_SIGNAL],
- [AC_CACHE_CHECK([return type of signal handlers], ac_cv_type_signal,
- [AC_TRY_COMPILE([#include <sys/types.h>
- #include <signal.h>
-@@ -1059,7 +1059,7 @@
- dnl ### Checks for functions
- 
- 
--AC_DEFUN(AC_FUNC_CLOSEDIR_VOID,
-+AC_DEFUN([AC_FUNC_CLOSEDIR_VOID],
- [AC_REQUIRE([AC_HEADER_DIRENT])dnl
- AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
- [AC_TRY_RUN([#include <sys/types.h>
-@@ -1071,7 +1071,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_FNMATCH,
-+AC_DEFUN([AC_FUNC_FNMATCH],
- [AC_CACHE_CHECK(for working fnmatch, ac_cv_func_fnmatch_works,
- # Some versions of Solaris or SCO have a broken fnmatch function.
- # So we run a test program.  If we are cross-compiling, take no chance.
-@@ -1084,7 +1084,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_MMAP,
-+AC_DEFUN([AC_FUNC_MMAP],
- [AC_CHECK_HEADERS(unistd.h)
- AC_CHECK_FUNCS(getpagesize)
- AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
-@@ -1231,7 +1231,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_GETPGRP,
-+AC_DEFUN([AC_FUNC_GETPGRP],
- [AC_CACHE_CHECK(whether getpgrp takes no argument, ac_cv_func_getpgrp_void,
- [AC_TRY_RUN([
- /*
-@@ -1292,7 +1292,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_SETPGRP,
-+AC_DEFUN([AC_FUNC_SETPGRP],
- [AC_CACHE_CHECK(whether setpgrp takes no argument, ac_cv_func_setpgrp_void,
- AC_TRY_RUN([
- #ifdef HAVE_UNISTD_H
-@@ -1318,14 +1318,14 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_VPRINTF,
-+AC_DEFUN([AC_FUNC_VPRINTF],
- [AC_CHECK_FUNC(vprintf, AC_DEFINE(HAVE_VPRINTF))
- if test "$ac_cv_func_vprintf" != yes; then
- AC_CHECK_FUNC(_doprnt, AC_DEFINE(HAVE_DOPRNT))
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_VFORK,
-+AC_DEFUN([AC_FUNC_VFORK],
- [AC_REQUIRE([AC_TYPE_PID_T])dnl
- AC_CHECK_HEADER(vfork.h, AC_DEFINE(HAVE_VFORK_H))
- AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
-@@ -1428,7 +1428,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_WAIT3,
-+AC_DEFUN([AC_FUNC_WAIT3],
- [AC_CACHE_CHECK(for wait3 that fills in rusage, ac_cv_func_wait3_rusage,
- [AC_TRY_RUN([#include <sys/types.h>
- #include <sys/time.h>
-@@ -1464,7 +1464,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_ALLOCA,
-+AC_DEFUN([AC_FUNC_ALLOCA],
- [AC_REQUIRE_CPP()dnl Set CPP; we run AC_EGREP_CPP conditionally.
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
-@@ -1549,7 +1549,7 @@
- AC_SUBST(ALLOCA)dnl
- ])
- 
--AC_DEFUN(AC_FUNC_GETLOADAVG,
-+AC_DEFUN([AC_FUNC_GETLOADAVG],
- [ac_have_func=no # yes means we've found a way to get the load average.
- 
- # Some systems with -lutil have (and need) -lkvm as well, some do not.
-@@ -1651,7 +1651,7 @@
- AC_SUBST(KMEM_GROUP)dnl
- ])
- 
--AC_DEFUN(AC_FUNC_UTIME_NULL,
-+AC_DEFUN([AC_FUNC_UTIME_NULL],
- [AC_CACHE_CHECK(whether utime accepts a null argument, ac_cv_func_utime_null,
- [rm -f conftestdata; > conftestdata
- # Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
-@@ -1670,7 +1670,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_STRCOLL,
-+AC_DEFUN([AC_FUNC_STRCOLL],
- [AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
- [AC_TRY_RUN([#include <string.h>
- main ()
-@@ -1685,7 +1685,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_SETVBUF_REVERSED,
-+AC_DEFUN([AC_FUNC_SETVBUF_REVERSED],
- [AC_CACHE_CHECK(whether setvbuf arguments are reversed,
-   ac_cv_func_setvbuf_reversed,
- [AC_TRY_RUN([#include <stdio.h>
-@@ -1705,21 +1705,21 @@
- fi
- ])
- 
--AC_DEFUN(AC_FUNC_GETMNTENT,
-+AC_DEFUN([AC_FUNC_GETMNTENT],
- [# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
- AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS",
-   [AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS",
-     [AC_CHECK_LIB(gen, getmntent, LIBS="-lgen $LIBS")])])
- AC_CHECK_FUNC(getmntent, [AC_DEFINE(HAVE_GETMNTENT)])])
- 
--AC_DEFUN(AC_FUNC_STRFTIME,
-+AC_DEFUN([AC_FUNC_STRFTIME],
- [AC_CHECK_FUNC(strftime, [AC_DEFINE(HAVE_STRFTIME)],
- [# strftime is in -lintl on SCO UNIX.
- AC_CHECK_LIB(intl, strftime, 
- [AC_DEFINE(HAVE_STRFTIME)
- LIBS="-lintl $LIBS"])])])
- 
--AC_DEFUN(AC_FUNC_MEMCMP,
-+AC_DEFUN([AC_FUNC_MEMCMP],
- [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean,
- [AC_TRY_RUN([
- main()
-@@ -1733,7 +1733,7 @@
- AC_SUBST(LIBOBJS)dnl
- ])
- 
--AC_DEFUN(AC_FUNC_SELECT_ARGTYPES,
-+AC_DEFUN([AC_FUNC_SELECT_ARGTYPES],
- [AC_MSG_CHECKING([types of arguments for select()])
-  AC_CACHE_VAL(ac_cv_func_select_arg234,dnl
-  [AC_CACHE_VAL(ac_cv_func_select_arg1,dnl
-@@ -1777,7 +1777,7 @@
- dnl ### Checks for structure members
- 
- 
--AC_DEFUN(AC_HEADER_TIME,
-+AC_DEFUN([AC_HEADER_TIME],
- [AC_CACHE_CHECK([whether time.h and sys/time.h may both be included],
-   ac_cv_header_time,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -1789,7 +1789,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_STRUCT_TM,
-+AC_DEFUN([AC_STRUCT_TM],
- [AC_CACHE_CHECK([whether struct tm is in sys/time.h or time.h],
-   ac_cv_struct_tm,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -1801,7 +1801,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_STRUCT_TIMEZONE,
-+AC_DEFUN([AC_STRUCT_TIMEZONE],
- [AC_REQUIRE([AC_STRUCT_TM])dnl
- AC_CACHE_CHECK([for tm_zone in struct tm], ac_cv_struct_tm_zone,
- [AC_TRY_COMPILE([#include <sys/types.h>
-@@ -1825,7 +1825,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_STRUCT_ST_BLOCKS,
-+AC_DEFUN([AC_STRUCT_ST_BLOCKS],
- [AC_CACHE_CHECK([for st_blocks in struct stat], ac_cv_struct_st_blocks,
- [AC_TRY_COMPILE([#include <sys/types.h>
- #include <sys/stat.h>], [struct stat s; s.st_blocks;],
-@@ -1838,7 +1838,7 @@
- AC_SUBST(LIBOBJS)dnl
- ])
- 
--AC_DEFUN(AC_STRUCT_ST_BLKSIZE,
-+AC_DEFUN([AC_STRUCT_ST_BLKSIZE],
- [AC_CACHE_CHECK([for st_blksize in struct stat], ac_cv_struct_st_blksize,
- [AC_TRY_COMPILE([#include <sys/types.h>
- #include <sys/stat.h>], [struct stat s; s.st_blksize;],
-@@ -1848,7 +1848,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_STRUCT_ST_RDEV,
-+AC_DEFUN([AC_STRUCT_ST_RDEV],
- [AC_CACHE_CHECK([for st_rdev in struct stat], ac_cv_struct_st_rdev,
- [AC_TRY_COMPILE([#include <sys/types.h>
- #include <sys/stat.h>], [struct stat s; s.st_rdev;],
-@@ -1862,10 +1862,10 @@
- dnl ### Checks for compiler characteristics
- 
- 
--AC_DEFUN(AC_C_CROSS,
-+AC_DEFUN([AC_C_CROSS],
- [AC_OBSOLETE([$0], [; it has been merged into AC_PROG_CC])])
- 
--AC_DEFUN(AC_C_CHAR_UNSIGNED,
-+AC_DEFUN([AC_C_CHAR_UNSIGNED],
- [AC_CACHE_CHECK(whether char is unsigned, ac_cv_c_char_unsigned,
- [if test "$GCC" = yes; then
-   # GCC predefines this symbol on systems where it applies.
-@@ -1889,7 +1889,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_C_LONG_DOUBLE,
-+AC_DEFUN([AC_C_LONG_DOUBLE],
- [AC_CACHE_CHECK(for long double, ac_cv_c_long_double,
- [if test "$GCC" = yes; then
-   ac_cv_c_long_double=yes
-@@ -1906,7 +1906,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_INT_16_BITS,
-+AC_DEFUN([AC_INT_16_BITS],
- [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl
- AC_MSG_CHECKING(whether int is 16 bits)
- AC_TRY_RUN([main() { exit(sizeof(int) != 2); }],
-@@ -1914,7 +1914,7 @@
-  AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
- ])
- 
--AC_DEFUN(AC_LONG_64_BITS,
-+AC_DEFUN([AC_LONG_64_BITS],
- [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])dnl
- AC_MSG_CHECKING(whether long int is 64 bits)
- AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }],
-@@ -1922,7 +1922,7 @@
-  AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
- ])
- 
--AC_DEFUN(AC_C_BIGENDIAN,
-+AC_DEFUN([AC_C_BIGENDIAN],
- [AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
- [ac_cv_c_bigendian=unknown
- # See if sys/param.h defines the BYTE_ORDER macro.
-@@ -1956,7 +1956,7 @@
- dnl Do nothing if the compiler accepts the inline keyword.
- dnl Otherwise define inline to __inline__ or __inline if one of those work,
- dnl otherwise define inline to be empty.
--AC_DEFUN(AC_C_INLINE,
-+AC_DEFUN([AC_C_INLINE],
- [AC_CACHE_CHECK([for inline], ac_cv_c_inline,
- [ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-@@ -1970,7 +1970,7 @@
- esac
- ])
- 
--AC_DEFUN(AC_C_CONST,
-+AC_DEFUN([AC_C_CONST],
- [dnl This message is consistent in form with the other checking messages,
- dnl and with the result message.
- AC_CACHE_CHECK([for working const], ac_cv_c_const,
-@@ -2026,7 +2026,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_C_STRINGIZE, [
-+AC_DEFUN([AC_C_STRINGIZE], [
- AC_REQUIRE([AC_PROG_CPP])
- AC_MSG_CHECKING([for preprocessor stringizing operator])
- AC_CACHE_VAL(ac_cv_c_stringize,
-@@ -2042,14 +2042,14 @@
- AC_MSG_RESULT([${ac_cv_c_stringize}])
- ])dnl
- 
--define(AC_ARG_ARRAY,
-+define([AC_ARG_ARRAY],
- [errprint(__file__:__line__: [$0] has been removed; don't do unportable things with arguments
- )m4exit(4)])
- 
- dnl Check the object extension used by the compiler: typically .o or
- dnl .obj.  If this is called, some other behaviour will change,
- dnl determined by ac_objext.
--AC_DEFUN(AC_OBJEXT,
-+AC_DEFUN([AC_OBJEXT],
- [AC_MSG_CHECKING([for object suffix])
- AC_CACHE_VAL(ac_cv_objext,
- [rm -f conftest*
-@@ -2098,7 +2098,7 @@
- dnl extremely useful macro.  Thank you John.
- dnl
- dnl AC_F77_LIBRARY_LDFLAGS()
--AC_DEFUN(AC_F77_LIBRARY_LDFLAGS,
-+AC_DEFUN([AC_F77_LIBRARY_LDFLAGS],
- [AC_MSG_CHECKING([for Fortran 77 libraries])
- AC_REQUIRE([AC_PROG_F77])
- AC_REQUIRE([AC_CANONICAL_HOST])
-@@ -2285,7 +2285,7 @@
- dnl ### Checks for operating system services
- 
- 
--AC_DEFUN(AC_SYS_INTERPRETER,
-+AC_DEFUN([AC_SYS_INTERPRETER],
- [# Pull the hash mark out of the macro call to avoid m4 problems.
- ac_msg="whether #! works in shell scripts"
- AC_CACHE_CHECK($ac_msg, ac_cv_sys_interpreter,
-@@ -2303,11 +2303,11 @@
- interpval="$ac_cv_sys_interpreter"
- ])
- 
--define(AC_HAVE_POUNDBANG,
-+define([AC_HAVE_POUNDBANG],
- [errprint(__file__:__line__: [$0 has been replaced by AC_SYS_INTERPRETER, taking no arguments
- ])m4exit(4)])
- 
--AC_DEFUN(AC_SYS_LONG_FILE_NAMES,
-+AC_DEFUN([AC_SYS_LONG_FILE_NAMES],
- [AC_CACHE_CHECK(for long file names, ac_cv_sys_long_file_names,
- [ac_cv_sys_long_file_names=yes
- # Test for long file names in all the places we know might matter:
-@@ -2343,7 +2343,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_SYS_RESTARTABLE_SYSCALLS,
-+AC_DEFUN([AC_SYS_RESTARTABLE_SYSCALLS],
- [AC_CACHE_CHECK(for restartable system calls, ac_cv_sys_restartable_syscalls,
- [AC_TRY_RUN(
- [/* Exit 0 (true) if wait returns something other than -1,
-@@ -2366,7 +2366,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_PATH_X,
-+AC_DEFUN([AC_PATH_X],
- [AC_REQUIRE_CPP()dnl Set CPP; we run AC_PATH_X_DIRECT conditionally.
- # If we find X, set shell vars x_includes and x_libraries to the
- # paths, otherwise set no_x=yes.
-@@ -2417,7 +2417,7 @@
- 
- dnl Internal subroutine of AC_PATH_X.
- dnl Set ac_x_includes and/or ac_x_libraries.
--AC_DEFUN(AC_PATH_X_XMKMF,
-+AC_DEFUN([AC_PATH_X_XMKMF],
- [rm -fr conftestdir
- if mkdir conftestdir; then
-   cd conftestdir
-@@ -2455,7 +2455,7 @@
- 
- dnl Internal subroutine of AC_PATH_X.
- dnl Set ac_x_includes and/or ac_x_libraries.
--AC_DEFUN(AC_PATH_X_DIRECT,
-+AC_DEFUN([AC_PATH_X_DIRECT],
- [if test "$ac_x_includes" = NO; then
-   # Guess where to find include files, by looking for this one X11 .h file.
-   test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-@@ -2577,7 +2577,7 @@
- ])
- 
- dnl Find additional X libraries, magic flags, etc.
--AC_DEFUN(AC_PATH_XTRA,
-+AC_DEFUN([AC_PATH_XTRA],
- [AC_REQUIRE([AC_PATH_X])dnl
- if test "$no_x" = yes; then
-   # Not all programs may use this symbol, but it does not hurt to define it.
-@@ -2690,13 +2690,13 @@
- ])
- 
- dnl The old Cygwin32 macro is deprecated.
--AC_DEFUN(AC_CYGWIN32,
-+AC_DEFUN([AC_CYGWIN32],
- [AC_OBSOLETE([$0], [; instead use AC_CYGWIN])dnl
- AC_CYGWIN])
- 
- dnl Check for Cygwin.  This is a way to set the right value for
- dnl EXEEXT.
--AC_DEFUN(AC_CYGWIN,
-+AC_DEFUN([AC_CYGWIN],
- [AC_CACHE_CHECK(for Cygwin environment, ac_cv_cygwin,
- [AC_TRY_COMPILE(,[
- #ifndef __CYGWIN__
-@@ -2710,7 +2710,7 @@
- 
- dnl Check for mingw32.  This is another way to set the right value for
- dnl EXEEXT.
--AC_DEFUN(AC_MINGW32,
-+AC_DEFUN([AC_MINGW32],
- [AC_CACHE_CHECK(for mingw32 environment, ac_cv_mingw32,
- [AC_TRY_COMPILE(,[return __MINGW32__;],
- ac_cv_mingw32=yes, ac_cv_mingw32=no)
-@@ -2719,7 +2719,7 @@
- test "$ac_cv_mingw32" = yes && MINGW32=yes])
- 
- dnl Check for djgpp.
--AC_DEFUN(AC_DJGPP,
-+AC_DEFUN([AC_DJGPP],
- [AC_CACHE_CHECK(for djgpp environment, ac_cv_djgpp,
- [AC_TRY_COMPILE(,[
- #if defined (DJGPP) || defined (__DJGPP__)
-@@ -2732,7 +2732,7 @@
- test "$ac_cv_djgpp" = yes && HAVE_DJGPP=yes])
- 
- dnl Check for win32.
--AC_DEFUN(AC_WIN32,
-+AC_DEFUN([AC_WIN32],
- [AC_CACHE_CHECK(for win32 environment, ac_cv_win32,
- [AC_TRY_COMPILE(,[
- #if defined(WIN32) || defined(__WIN32__) || defined(_WIN32)
-@@ -2748,7 +2748,7 @@
- dnl add .exe for Cygwin or mingw32.  Otherwise, it compiles a test
- dnl executable.  If this is called, the executable extensions will be
- dnl automatically used by link commands run by the configure script.
--AC_DEFUN(AC_EXEEXT,
-+AC_DEFUN([AC_EXEEXT],
- [AC_REQUIRE([AC_CYGWIN])
- AC_REQUIRE([AC_MINGW32])
- AC_MSG_CHECKING([for executable suffix])
-@@ -2780,7 +2780,7 @@
- AC_SUBST(EXEEXT)])
- 
- dnl Unset CC to run configure with cross compiler.
--AC_DEFUN(AC_UNSET_CC, [
-+AC_DEFUN([AC_UNSET_CC], [
- ZZ=
- if test "$cross_compiling" = yes &&
-    (test "x$CC" = "xdos-gcc" || test "x$CC" = "xi386-mingw32-gcc" || test "x$CC" = "xgnuwin32gcc") ; then
-@@ -2791,7 +2791,7 @@
- ])
- 
- dnl Restore CC that has been unset by AC_UNSET_CC
--AC_DEFUN(AC_RESET_CC, [
-+AC_DEFUN([AC_RESET_CC], [
- if test "x$ZZ" = "xdos-gcc" || test "x$ZZ" = "xi386-mingw32-gcc" || test "x$ZZ" = "xgnuwin32gcc" ; then
- CC=$ZZ
- cross_compiling=yes
-@@ -2804,7 +2804,7 @@
- dnl They aren't cached, to discourage their use.
- 
- 
--AC_DEFUN(AC_AIX,
-+AC_DEFUN([AC_AIX],
- [AC_BEFORE([$0], [AC_TRY_COMPILE])dnl
- AC_BEFORE([$0], [AC_TRY_RUN])dnl
- AC_MSG_CHECKING(for AIX)
-@@ -2815,7 +2815,7 @@
- ], [AC_MSG_RESULT(yes); AC_DEFINE(_ALL_SOURCE)], AC_MSG_RESULT(no))
- ])
- 
--AC_DEFUN(AC_MINIX,
-+AC_DEFUN([AC_MINIX],
- [AC_BEFORE([$0], [AC_TRY_COMPILE])dnl
- AC_BEFORE([$0], [AC_TRY_RUN])dnl
- AC_CHECK_HEADER(minix/config.h, MINIX=yes, MINIX=)
-@@ -2826,7 +2826,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_ISC_POSIX,
-+AC_DEFUN([AC_ISC_POSIX],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_BEFORE([$0], [AC_TRY_COMPILE])dnl
- AC_BEFORE([$0], [AC_TRY_RUN])dnl
-@@ -2848,7 +2848,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_XENIX_DIR,
-+AC_DEFUN([AC_XENIX_DIR],
- [AC_OBSOLETE([$0], [; instead use AC_HEADER_DIRENT])dnl
- AC_REQUIRE([AC_DIR_HEADER])dnl
- AC_MSG_CHECKING(for Xenix)
-@@ -2864,17 +2864,17 @@
- fi
- ])
- 
--AC_DEFUN(AC_DYNIX_SEQ,
-+AC_DEFUN([AC_DYNIX_SEQ],
- [AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT])dnl
- AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS")
- ])
- 
--AC_DEFUN(AC_IRIX_SUN,
-+AC_DEFUN([AC_IRIX_SUN],
- [AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT or AC_CHECK_LIB(sun, getpwnam)])dnl
- AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS")
- ])
- 
--AC_DEFUN(AC_SCO_INTL,
-+AC_DEFUN([AC_SCO_INTL],
- [AC_OBSOLETE([$0], [; instead use AC_FUNC_STRFTIME])dnl
- AC_CHECK_LIB(intl, strftime, LIBS="-lintl $LIBS")
- ])
---- tetex-src-2.0.2/./texk/etc/autoconf/acoldnames.m4~configure	1999-01-05 08:27:38.000000000 -0500
-+++ tetex-src-2.0.2/./texk/etc/autoconf/acoldnames.m4	2004-01-26 20:17:53.000000000 -0500
-@@ -19,62 +19,62 @@
- dnl
- dnl General macros.
- dnl
--define(AC_WARN, [indir([AC_MSG_WARN], $@)])dnl
--define(AC_ERROR, [indir([AC_MSG_ERROR], $@)])dnl
--AC_DEFUN(AC_PROGRAM_CHECK, [indir([AC_CHECK_PROG], $@)])dnl
--AC_DEFUN(AC_PROGRAM_PATH, [indir([AC_PATH_PROG], $@)])dnl
--AC_DEFUN(AC_PROGRAMS_CHECK, [indir([AC_CHECK_PROGS], $@)])dnl
--AC_DEFUN(AC_PROGRAMS_PATH, [indir([AC_PATH_PROGS], $@)])dnl
--AC_DEFUN(AC_PREFIX, [indir([AC_PREFIX_PROGRAM], $@)])dnl
--AC_DEFUN(AC_HEADER_EGREP, [indir([AC_EGREP_HEADER], $@)])dnl
--AC_DEFUN(AC_PROGRAM_EGREP, [indir([AC_EGREP_CPP], $@)])dnl
--AC_DEFUN(AC_TEST_PROGRAM, [indir([AC_TRY_RUN], $@)])dnl
--AC_DEFUN(AC_TEST_CPP, [indir([AC_TRY_CPP], $@)])dnl
--AC_DEFUN(AC_HEADER_CHECK, [indir([AC_CHECK_HEADER], $@)])dnl
--AC_DEFUN(AC_FUNC_CHECK, [indir([AC_CHECK_FUNC], $@)])dnl
--AC_DEFUN(AC_HAVE_FUNCS, [indir([AC_CHECK_FUNCS], $@)])dnl
--AC_DEFUN(AC_HAVE_HEADERS, [indir([AC_CHECK_HEADERS], $@)])dnl
--AC_DEFUN(AC_SIZEOF_TYPE, [indir([AC_CHECK_SIZEOF], $@)])dnl
-+define([AC_WARN], [indir([AC_MSG_WARN], $@)])dnl
-+define([AC_ERROR], [indir([AC_MSG_ERROR], $@)])dnl
-+AC_DEFUN([AC_PROGRAM_CHECK], [indir([AC_CHECK_PROG], $@)])dnl
-+AC_DEFUN([AC_PROGRAM_PATH], [indir([AC_PATH_PROG], $@)])dnl
-+AC_DEFUN([AC_PROGRAMS_CHECK], [indir([AC_CHECK_PROGS], $@)])dnl
-+AC_DEFUN([AC_PROGRAMS_PATH], [indir([AC_PATH_PROGS], $@)])dnl
-+AC_DEFUN([AC_PREFIX], [indir([AC_PREFIX_PROGRAM], $@)])dnl
-+AC_DEFUN([AC_HEADER_EGREP], [indir([AC_EGREP_HEADER], $@)])dnl
-+AC_DEFUN([AC_PROGRAM_EGREP], [indir([AC_EGREP_CPP], $@)])dnl
-+AC_DEFUN([AC_TEST_PROGRAM], [indir([AC_TRY_RUN], $@)])dnl
-+AC_DEFUN([AC_TEST_CPP], [indir([AC_TRY_CPP], $@)])dnl
-+AC_DEFUN([AC_HEADER_CHECK], [indir([AC_CHECK_HEADER], $@)])dnl
-+AC_DEFUN([AC_FUNC_CHECK], [indir([AC_CHECK_FUNC], $@)])dnl
-+AC_DEFUN([AC_HAVE_FUNCS], [indir([AC_CHECK_FUNCS], $@)])dnl
-+AC_DEFUN([AC_HAVE_HEADERS], [indir([AC_CHECK_HEADERS], $@)])dnl
-+AC_DEFUN([AC_SIZEOF_TYPE], [indir([AC_CHECK_SIZEOF], $@)])dnl
- dnl
- dnl Specific macros.
- dnl
--AC_DEFUN(AC_GCC_TRADITIONAL, [indir([AC_PROG_GCC_TRADITIONAL])])dnl
--AC_DEFUN(AC_MINUS_C_MINUS_O, [indir([AC_PROG_CC_C_O])])dnl
--AC_DEFUN(AC_SET_MAKE, [indir([AC_PROG_MAKE_SET])])dnl
--AC_DEFUN(AC_YYTEXT_POINTER, [indir([AC_DECL_YYTEXT])])dnl
--AC_DEFUN(AC_LN_S, [indir([AC_PROG_LN_S])])dnl
--AC_DEFUN(AC_STDC_HEADERS, [indir([AC_HEADER_STDC])])dnl
--AC_DEFUN(AC_MAJOR_HEADER, [indir([AC_HEADER_MAJOR])])dnl
--AC_DEFUN(AC_STAT_MACROS_BROKEN, [indir([AC_HEADER_STAT])])dnl
--AC_DEFUN(AC_SYS_SIGLIST_DECLARED, [indir([AC_DECL_SYS_SIGLIST])])dnl
--AC_DEFUN(AC_GETGROUPS_T, [indir([AC_TYPE_GETGROUPS])])dnl
--AC_DEFUN(AC_UID_T, [indir([AC_TYPE_UID_T])])dnl
--AC_DEFUN(AC_SIZE_T, [indir([AC_TYPE_SIZE_T])])dnl
--AC_DEFUN(AC_PID_T, [indir([AC_TYPE_PID_T])])dnl
--AC_DEFUN(AC_OFF_T, [indir([AC_TYPE_OFF_T])])dnl
--AC_DEFUN(AC_MODE_T, [indir([AC_TYPE_MODE_T])])dnl
--AC_DEFUN(AC_RETSIGTYPE, [indir([AC_TYPE_SIGNAL])])dnl
--AC_DEFUN(AC_MMAP, [indir([AC_FUNC_MMAP])])dnl
--AC_DEFUN(AC_VPRINTF, [indir([AC_FUNC_VPRINTF])])dnl
--AC_DEFUN(AC_VFORK, [indir([AC_FUNC_VFORK])])dnl
--AC_DEFUN(AC_WAIT3, [indir([AC_FUNC_WAIT3])])dnl
--AC_DEFUN(AC_ALLOCA, [indir([AC_FUNC_ALLOCA])])dnl
--AC_DEFUN(AC_GETLOADAVG, [indir([AC_FUNC_GETLOADAVG])])dnl
--AC_DEFUN(AC_UTIME_NULL, [indir([AC_FUNC_UTIME_NULL])])dnl
--AC_DEFUN(AC_STRCOLL, [indir([AC_FUNC_STRCOLL])])dnl
--AC_DEFUN(AC_SETVBUF_REVERSED, [indir([AC_FUNC_SETVBUF_REVERSED])])dnl
--AC_DEFUN(AC_TIME_WITH_SYS_TIME, [indir([AC_HEADER_TIME])])dnl
--AC_DEFUN(AC_TIMEZONE, [indir([AC_STRUCT_TIMEZONE])])dnl
--AC_DEFUN(AC_ST_BLOCKS, [indir([AC_STRUCT_ST_BLOCKS])])dnl
--AC_DEFUN(AC_ST_BLKSIZE, [indir([AC_STRUCT_ST_BLKSIZE])])dnl
--AC_DEFUN(AC_ST_RDEV, [indir([AC_STRUCT_ST_RDEV])])dnl
--AC_DEFUN(AC_CROSS_CHECK, [indir([AC_C_CROSS])])dnl
--AC_DEFUN(AC_CHAR_UNSIGNED, [indir([AC_C_CHAR_UNSIGNED])])dnl
--AC_DEFUN(AC_LONG_DOUBLE, [indir([AC_C_LONG_DOUBLE])])dnl
--AC_DEFUN(AC_WORDS_BIGENDIAN, [indir([AC_C_BIGENDIAN])])dnl
--AC_DEFUN(AC_INLINE, [indir([AC_C_INLINE])])dnl
--AC_DEFUN(AC_CONST, [indir([AC_C_CONST])])dnl
--AC_DEFUN(AC_LONG_FILE_NAMES, [indir([AC_SYS_LONG_FILE_NAMES])])dnl
--AC_DEFUN(AC_RESTARTABLE_SYSCALLS, [indir([AC_SYS_RESTARTABLE_SYSCALLS])])dnl
--AC_DEFUN(AC_FIND_X, [indir([AC_PATH_X])])dnl
--AC_DEFUN(AC_FIND_XTRA, [indir([AC_PATH_XTRA])])dnl
-+AC_DEFUN([AC_GCC_TRADITIONAL], [indir([AC_PROG_GCC_TRADITIONAL])])dnl
-+AC_DEFUN([AC_MINUS_C_MINUS_O], [indir([AC_PROG_CC_C_O])])dnl
-+AC_DEFUN([AC_SET_MAKE], [indir([AC_PROG_MAKE_SET])])dnl
-+AC_DEFUN([AC_YYTEXT_POINTER], [indir([AC_DECL_YYTEXT])])dnl
-+AC_DEFUN([AC_LN_S], [indir([AC_PROG_LN_S])])dnl
-+AC_DEFUN([AC_STDC_HEADERS], [indir([AC_HEADER_STDC])])dnl
-+AC_DEFUN([AC_MAJOR_HEADER], [indir([AC_HEADER_MAJOR])])dnl
-+AC_DEFUN([AC_STAT_MACROS_BROKEN], [indir([AC_HEADER_STAT])])dnl
-+AC_DEFUN([AC_SYS_SIGLIST_DECLARED], [indir([AC_DECL_SYS_SIGLIST])])dnl
-+AC_DEFUN([AC_GETGROUPS_T], [indir([AC_TYPE_GETGROUPS])])dnl
-+AC_DEFUN([AC_UID_T], [indir([AC_TYPE_UID_T])])dnl
-+AC_DEFUN([AC_SIZE_T], [indir([AC_TYPE_SIZE_T])])dnl
-+AC_DEFUN([AC_PID_T], [indir([AC_TYPE_PID_T])])dnl
-+AC_DEFUN([AC_OFF_T], [indir([AC_TYPE_OFF_T])])dnl
-+AC_DEFUN([AC_MODE_T], [indir([AC_TYPE_MODE_T])])dnl
-+AC_DEFUN([AC_RETSIGTYPE], [indir([AC_TYPE_SIGNAL])])dnl
-+AC_DEFUN([AC_MMAP], [indir([AC_FUNC_MMAP])])dnl
-+AC_DEFUN([AC_VPRINTF], [indir([AC_FUNC_VPRINTF])])dnl
-+AC_DEFUN([AC_VFORK], [indir([AC_FUNC_VFORK])])dnl
-+AC_DEFUN([AC_WAIT3], [indir([AC_FUNC_WAIT3])])dnl
-+AC_DEFUN([AC_ALLOCA], [indir([AC_FUNC_ALLOCA])])dnl
-+AC_DEFUN([AC_GETLOADAVG], [indir([AC_FUNC_GETLOADAVG])])dnl
-+AC_DEFUN([AC_UTIME_NULL], [indir([AC_FUNC_UTIME_NULL])])dnl
-+AC_DEFUN([AC_STRCOLL], [indir([AC_FUNC_STRCOLL])])dnl
-+AC_DEFUN([AC_SETVBUF_REVERSED], [indir([AC_FUNC_SETVBUF_REVERSED])])dnl
-+AC_DEFUN([AC_TIME_WITH_SYS_TIME], [indir([AC_HEADER_TIME])])dnl
-+AC_DEFUN([AC_TIMEZONE], [indir([AC_STRUCT_TIMEZONE])])dnl
-+AC_DEFUN([AC_ST_BLOCKS], [indir([AC_STRUCT_ST_BLOCKS])])dnl
-+AC_DEFUN([AC_ST_BLKSIZE], [indir([AC_STRUCT_ST_BLKSIZE])])dnl
-+AC_DEFUN([AC_ST_RDEV], [indir([AC_STRUCT_ST_RDEV])])dnl
-+AC_DEFUN([AC_CROSS_CHECK], [indir([AC_C_CROSS])])dnl
-+AC_DEFUN([AC_CHAR_UNSIGNED], [indir([AC_C_CHAR_UNSIGNED])])dnl
-+AC_DEFUN([AC_LONG_DOUBLE], [indir([AC_C_LONG_DOUBLE])])dnl
-+AC_DEFUN([AC_WORDS_BIGENDIAN], [indir([AC_C_BIGENDIAN])])dnl
-+AC_DEFUN([AC_INLINE], [indir([AC_C_INLINE])])dnl
-+AC_DEFUN([AC_CONST], [indir([AC_C_CONST])])dnl
-+AC_DEFUN([AC_LONG_FILE_NAMES], [indir([AC_SYS_LONG_FILE_NAMES])])dnl
-+AC_DEFUN([AC_RESTARTABLE_SYSCALLS], [indir([AC_SYS_RESTARTABLE_SYSCALLS])])dnl
-+AC_DEFUN([AC_FIND_X], [indir([AC_PATH_X])])dnl
-+AC_DEFUN([AC_FIND_XTRA], [indir([AC_PATH_XTRA])])dnl
---- tetex-src-2.0.2/./texk/etc/autoconf/acgeneral.m4~configure	1999-01-07 13:53:31.000000000 -0500
-+++ tetex-src-2.0.2/./texk/etc/autoconf/acgeneral.m4	2004-01-26 20:17:53.000000000 -0500
-@@ -52,7 +52,7 @@
- divert(-1)dnl Throw away output until AC_INIT is called.
- changequote([, ])
- 
--define(AC_ACVERSION, 2.13)
-+define([AC_ACVERSION], 2.13)
- 
- dnl Some old m4's don't support m4exit.  But they provide
- dnl equivalent functionality by core dumping because of the
-@@ -76,27 +76,27 @@
- dnl and AC_DIVERSION_ICMDS.
- 
- dnl AC_DIVERSION_NOTICE - 1 (= 0)	AC_REQUIRE'd #! /bin/sh line
--define(AC_DIVERSION_NOTICE, 1)dnl	copyright notice & option help strings
--define(AC_DIVERSION_INIT, 2)dnl		initialization code
--define(AC_DIVERSION_NORMAL_4, 3)dnl	AC_REQUIRE'd code, 4 level deep
--define(AC_DIVERSION_NORMAL_3, 4)dnl	AC_REQUIRE'd code, 3 level deep
--define(AC_DIVERSION_NORMAL_2, 5)dnl	AC_REQUIRE'd code, 2 level deep
--define(AC_DIVERSION_NORMAL_1, 6)dnl	AC_REQUIRE'd code, 1 level deep
--define(AC_DIVERSION_NORMAL, 7)dnl	the tests and output code
--define(AC_DIVERSION_SED, 8)dnl		variable substitutions in config.status
--define(AC_DIVERSION_CMDS, 9)dnl		extra shell commands in config.status
--define(AC_DIVERSION_ICMDS, 10)dnl	extra initialization in config.status
-+define([AC_DIVERSION_NOTICE], 1)dnl	copyright notice & option help strings
-+define([AC_DIVERSION_INIT], 2)dnl		initialization code
-+define([AC_DIVERSION_NORMAL_4], 3)dnl	AC_REQUIRE'd code, 4 level deep
-+define([AC_DIVERSION_NORMAL_3], 4)dnl	AC_REQUIRE'd code, 3 level deep
-+define([AC_DIVERSION_NORMAL_2], 5)dnl	AC_REQUIRE'd code, 2 level deep
-+define([AC_DIVERSION_NORMAL_1], 6)dnl	AC_REQUIRE'd code, 1 level deep
-+define([AC_DIVERSION_NORMAL], 7)dnl	the tests and output code
-+define([AC_DIVERSION_SED], 8)dnl		variable substitutions in config.status
-+define([AC_DIVERSION_CMDS], 9)dnl		extra shell commands in config.status
-+define([AC_DIVERSION_ICMDS], 10)dnl	extra initialization in config.status
- 
- dnl Change the diversion stream to STREAM, while stacking old values.
- dnl AC_DIVERT_PUSH(STREAM)
--define(AC_DIVERT_PUSH,
-+define([AC_DIVERT_PUSH],
- [pushdef([AC_DIVERSION_CURRENT], $1)dnl
- divert(AC_DIVERSION_CURRENT)dnl
- ])
- 
- dnl Change the diversion stream to its previous value, unstacking it.
- dnl AC_DIVERT_POP()
--define(AC_DIVERT_POP,
-+define([AC_DIVERT_POP],
- [popdef([AC_DIVERSION_CURRENT])dnl
- divert(AC_DIVERSION_CURRENT)dnl
- ])
-@@ -108,7 +108,7 @@
- 
- dnl The prologue for Autoconf macros.
- dnl AC_PRO(MACRO-NAME)
--define(AC_PRO,
-+define([AC_PRO],
- [define([AC_PROVIDE_$1], )dnl
- ifelse(AC_DIVERSION_CURRENT, AC_DIVERSION_NORMAL,
- [AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))],
-@@ -117,7 +117,7 @@
- 
- dnl The Epilogue for Autoconf macros.
- dnl AC_EPI()
--define(AC_EPI,
-+define([AC_EPI],
- [AC_DIVERT_POP()dnl
- ifelse(AC_DIVERSION_CURRENT, AC_DIVERSION_NORMAL,
- [undivert(AC_DIVERSION_NORMAL_4)dnl
-@@ -135,16 +135,16 @@
- dnl macros.  We don't use this macro to define some frequently called
- dnl macros that are not involved in ordering constraints, to save m4
- dnl processing.
--dnl AC_DEFUN(NAME, EXPANSION)
-+dnl AC_DEFUN([NAME], EXPANSION)
- define([AC_DEFUN],
--[define($1, [AC_PRO([$1])$2[]AC_EPI()])])
-+[define([$1], [AC_PRO([$1])$2[]AC_EPI()])])
- 
- 
- dnl ### Initialization
- 
- 
- dnl AC_INIT_NOTICE()
--AC_DEFUN(AC_INIT_NOTICE,
-+AC_DEFUN([AC_INIT_NOTICE],
- [# Guess values for system-dependent variables and create Makefiles.
- # Generated automatically using autoconf version] AC_ACVERSION [
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-@@ -158,13 +158,13 @@
- [#] Any additions from configure.in:])
- 
- dnl AC_PREFIX_DEFAULT(PREFIX)
--AC_DEFUN(AC_PREFIX_DEFAULT,
-+AC_DEFUN([AC_PREFIX_DEFAULT],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
- ac_default_prefix=$1
- AC_DIVERT_POP()])
- 
- dnl AC_INIT_PARSE_ARGS()
--AC_DEFUN(AC_INIT_PARSE_ARGS,
-+AC_DEFUN([AC_INIT_PARSE_ARGS],
- [
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -573,12 +573,12 @@
- dnl Try to have only one #! line, so the script doesn't look funny
- dnl for users of AC_REVISION.
- dnl AC_INIT_BINSH()
--AC_DEFUN(AC_INIT_BINSH,
-+AC_DEFUN([AC_INIT_BINSH],
- [#! /bin/sh
- ])
- 
- dnl AC_INIT(UNIQUE-FILE-IN-SOURCE-DIR)
--AC_DEFUN(AC_INIT,
-+AC_DEFUN([AC_INIT],
- [sinclude(acsite.m4)dnl
- sinclude(./aclocal.m4)dnl
- AC_REQUIRE([AC_INIT_BINSH])dnl
-@@ -591,7 +591,7 @@
- ])
- 
- dnl AC_INIT_PREPARE(UNIQUE-FILE-IN-SOURCE-DIR)
--AC_DEFUN(AC_INIT_PREPARE,
-+AC_DEFUN([AC_INIT_PREPARE],
- [trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
- 
- # File descriptor usage:
-@@ -600,9 +600,9 @@
- # 2 errors and warnings
- # 3 some systems may open it to /dev/tty
- # 4 used on the Kubota Titan
--define(AC_FD_MSG, 6)dnl
-+define([AC_FD_MSG], 6)dnl
- [#] AC_FD_MSG checking for... messages and results
--define(AC_FD_CC, 5)dnl
-+define([AC_FD_CC], 5)dnl
- [#] AC_FD_CC compiler messages saved in config.log
- if test "$silent" = yes; then
-   exec AC_FD_MSG>/dev/null
-@@ -727,7 +727,7 @@
- 
- 
- dnl AC_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
--AC_DEFUN(AC_ARG_ENABLE,
-+AC_DEFUN([AC_ARG_ENABLE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
- ac_help="$ac_help
- [$2]"
-@@ -742,7 +742,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_ENABLE,
-+AC_DEFUN([AC_ENABLE],
- [AC_OBSOLETE([$0], [; instead use AC_ARG_ENABLE])dnl
- AC_ARG_ENABLE([$1], [  --enable-$1], [$2], [$3])dnl
- ])
-@@ -752,7 +752,7 @@
- 
- 
- dnl AC_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
--AC_DEFUN(AC_ARG_WITH,
-+AC_DEFUN([AC_ARG_WITH],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
- ac_help="$ac_help
- [$2]"
-@@ -767,7 +767,7 @@
- fi
- ])
- 
--AC_DEFUN(AC_WITH,
-+AC_DEFUN([AC_WITH],
- [AC_OBSOLETE([$0], [; instead use AC_ARG_WITH])dnl
- AC_ARG_WITH([$1], [  --with-$1], [$2], [$3])dnl
- ])
-@@ -777,7 +777,7 @@
- 
- 
- dnl AC_ARG_PROGRAM()
--AC_DEFUN(AC_ARG_PROGRAM,
-+AC_DEFUN([AC_ARG_PROGRAM],
- [if test "$program_transform_name" = s,x,x,; then
-   program_transform_name=
- else
-@@ -803,7 +803,7 @@
- 
- 
- dnl AC_REVISION(REVISION-INFO)
--AC_DEFUN(AC_REVISION,
-+AC_DEFUN([AC_REVISION],
- [AC_REQUIRE([AC_INIT_BINSH])dnl
- [# From configure.in] translit([$1], $")])
- 
-@@ -811,19 +811,19 @@
- 
- dnl Change the dots in NUMBER into commas.
- dnl AC_PREREQ_SPLIT(NUMBER)
--define(AC_PREREQ_SPLIT,
-+define([AC_PREREQ_SPLIT],
- [translit($1, ., [, ])])
- 
- dnl Default the ternary version number to 0 (e.g., 1, 7 -> 1, 7, 0).
- dnl AC_PREREQ_CANON(MAJOR, MINOR [,TERNARY])
--define(AC_PREREQ_CANON,
-+define([AC_PREREQ_CANON],
- [$1, $2, ifelse([$3], , 0, [$3])])
- 
- dnl Complain and exit if version number 1 is less than version number 2.
- dnl PRINTABLE2 is the printable version of version number 2.
- dnl AC_PREREQ_COMPARE(MAJOR1, MINOR1, TERNARY1, MAJOR2, MINOR2, TERNARY2,
- dnl                   PRINTABLE2)
--define(AC_PREREQ_COMPARE,
-+define([AC_PREREQ_COMPARE],
- [ifelse(builtin([eval],
- [$3 + $2 * 1000 + $1 * 1000000 < $6 + $5 * 1000 + $4 * 1000000]), 1,
- [errprint(dnl
-@@ -832,7 +832,7 @@
- 
- dnl Complain and exit if the Autoconf version is less than VERSION.
- dnl AC_PREREQ(VERSION)
--define(AC_PREREQ,
-+define([AC_PREREQ],
- [AC_PREREQ_COMPARE(AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)),
- AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), [$1])])
- 
-@@ -844,12 +844,12 @@
- dnl in directory DIR.  These are auxiliary files used in configuration.
- dnl DIR can be either absolute or relative to $srcdir.
- dnl AC_CONFIG_AUX_DIR(DIR)
--AC_DEFUN(AC_CONFIG_AUX_DIR,
-+AC_DEFUN([AC_CONFIG_AUX_DIR],
- [AC_CONFIG_AUX_DIRS($1 $srcdir/$1)])
- 
- dnl The default is `$srcdir' or `$srcdir/..' or `$srcdir/../..'.
- dnl There's no need to call this macro explicitly; just AC_REQUIRE it.
--AC_DEFUN(AC_CONFIG_AUX_DIR_DEFAULT,
-+AC_DEFUN([AC_CONFIG_AUX_DIR_DEFAULT],
- [AC_CONFIG_AUX_DIRS($srcdir $srcdir/.. $srcdir/../..)])
- 
- dnl Internal subroutine.
-@@ -857,7 +857,7 @@
- dnl We look only for install-sh, so users of AC_PROG_INSTALL
- dnl do not automatically need to distribute the other auxiliary files.
- dnl AC_CONFIG_AUX_DIRS(DIR ...)
--AC_DEFUN(AC_CONFIG_AUX_DIRS,
-+AC_DEFUN([AC_CONFIG_AUX_DIRS],
- [ac_aux_dir=
- for ac_dir in $1; do
-   if test -f $ac_dir/install-sh; then
-@@ -890,7 +890,7 @@
- ])
- 
- dnl Canonicalize the host, target, and build system types.
--AC_DEFUN(AC_CANONICAL_SYSTEM,
-+AC_DEFUN([AC_CANONICAL_SYSTEM],
- [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
- AC_BEFORE([$0], [AC_ARG_PROGRAM])
- # Do some error checking and defaulting for the host and target type.
-@@ -924,7 +924,7 @@
- 
- dnl Subroutines of AC_CANONICAL_SYSTEM.
- 
--AC_DEFUN(AC_CANONICAL_HOST,
-+AC_DEFUN([AC_CANONICAL_HOST],
- [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
- 
- # Make sure we can run config.sub.
-@@ -963,7 +963,7 @@
- ])
- 
- dnl Internal use only.
--AC_DEFUN(AC_CANONICAL_TARGET,
-+AC_DEFUN([AC_CANONICAL_TARGET],
- [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
- AC_MSG_CHECKING(target system type)
- 
-@@ -993,7 +993,7 @@
- ])
- 
- dnl Internal use only.
--AC_DEFUN(AC_CANONICAL_BUILD,
-+AC_DEFUN([AC_CANONICAL_BUILD],
- [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
- AC_MSG_CHECKING(build system type)
- 
-@@ -1027,7 +1027,7 @@
- dnl if the cache file is inconsistent with the current host,
- dnl target and build system types, execute CMD or print a default
- dnl error message.
--AC_DEFUN(AC_VALIDATE_CACHED_SYSTEM_TUPLE, [
-+AC_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPLE], [
-   AC_REQUIRE([AC_CANONICAL_SYSTEM])
-   AC_MSG_CHECKING([cached system tuple])
-   if { test x"${ac_cv_host_system_type+set}" = x"set" &&
-@@ -1053,7 +1053,7 @@
- 
- dnl Look for site or system specific initialization scripts.
- dnl AC_SITE_LOAD()
--define(AC_SITE_LOAD,
-+define([AC_SITE_LOAD],
- [# Prefer explicitly selected file to automatically selected ones.
- if test -z "$CONFIG_SITE"; then
-   if test "x$prefix" != xNONE; then
-@@ -1071,7 +1071,7 @@
- ])
- 
- dnl AC_CACHE_LOAD()
--define(AC_CACHE_LOAD,
-+define([AC_CACHE_LOAD],
- [if test -r "$cache_file"; then
-   echo "loading cache $cache_file"
-   . $cache_file
-@@ -1082,7 +1082,7 @@
- ])
- 
- dnl AC_CACHE_SAVE()
--define(AC_CACHE_SAVE,
-+define([AC_CACHE_SAVE],
- [cat > confcache <<\EOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -1136,7 +1136,7 @@
- 
- dnl The name of shell var CACHE-ID must contain `_cv_' in order to get saved.
- dnl AC_CACHE_VAL(CACHE-ID, COMMANDS-TO-SET-IT)
--define(AC_CACHE_VAL,
-+define([AC_CACHE_VAL],
- [dnl We used to use the below line, but it fails if the 1st arg is a
- dnl shell variable, so we need the eval.
- dnl if test "${$1+set}" = set; then
-@@ -1149,7 +1149,7 @@
- ])
- 
- dnl AC_CACHE_CHECK(MESSAGE, CACHE-ID, COMMANDS)
--define(AC_CACHE_CHECK,
-+define([AC_CACHE_CHECK],
- [AC_MSG_CHECKING([$1])
- AC_CACHE_VAL([$2], [$3])
- AC_MSG_RESULT([$]$2)])
-@@ -1160,14 +1160,14 @@
- 
- dnl Set VARIABLE to VALUE, verbatim, or 1.
- dnl AC_DEFINE(VARIABLE [, VALUE])
--define(AC_DEFINE,
-+define([AC_DEFINE],
- [cat >> confdefs.h <<\EOF
- [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
- EOF
- ])
- 
- dnl Similar, but perform shell substitutions $ ` \ once on VALUE.
--define(AC_DEFINE_UNQUOTED,
-+define([AC_DEFINE_UNQUOTED],
- [cat >> confdefs.h <<EOF
- [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
- EOF
-@@ -1180,7 +1180,7 @@
- dnl This macro protects VARIABLE from being diverted twice
- dnl if this macro is called twice for it.
- dnl AC_SUBST(VARIABLE)
--define(AC_SUBST,
-+define([AC_SUBST],
- [ifdef([AC_SUBST_$1], ,
- [define([AC_SUBST_$1], )dnl
- AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
-@@ -1189,7 +1189,7 @@
- ])])
- 
- dnl AC_SUBST_FILE(VARIABLE)
--define(AC_SUBST_FILE,
-+define([AC_SUBST_FILE],
- [ifdef([AC_SUBST_$1], ,
- [define([AC_SUBST_$1], )dnl
- AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
-@@ -1203,30 +1203,30 @@
- 
- 
- dnl AC_MSG_CHECKING(FEATURE-DESCRIPTION)
--define(AC_MSG_CHECKING,
-+define([AC_MSG_CHECKING],
- [echo $ac_n "checking $1""... $ac_c" 1>&AC_FD_MSG
- echo "configure:__oline__: checking $1" >&AC_FD_CC])
- 
- dnl AC_CHECKING(FEATURE-DESCRIPTION)
--define(AC_CHECKING,
-+define([AC_CHECKING],
- [echo "checking $1" 1>&AC_FD_MSG
- echo "configure:__oline__: checking $1" >&AC_FD_CC])
- 
- dnl AC_MSG_RESULT(RESULT-DESCRIPTION)
--define(AC_MSG_RESULT,
-+define([AC_MSG_RESULT],
- [echo "$ac_t""$1" 1>&AC_FD_MSG])
- 
- dnl AC_VERBOSE(RESULT-DESCRIPTION)
--define(AC_VERBOSE,
-+define([AC_VERBOSE],
- [AC_OBSOLETE([$0], [; instead use AC_MSG_RESULT])dnl
- echo "	$1" 1>&AC_FD_MSG])
- 
- dnl AC_MSG_WARN(PROBLEM-DESCRIPTION)
--define(AC_MSG_WARN,
-+define([AC_MSG_WARN],
- [echo "configure: warning: $1" 1>&2])
- 
- dnl AC_MSG_ERROR(ERROR-DESCRIPTION)
--define(AC_MSG_ERROR,
-+define([AC_MSG_ERROR],
- [{ echo "configure: error: $1" 1>&2; exit 1; }])
- 
- 
-@@ -1234,7 +1234,7 @@
- 
- 
- dnl AC_LANG_C()
--AC_DEFUN(AC_LANG_C,
-+AC_DEFUN([AC_LANG_C],
- [define([AC_LANG], [C])dnl
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1245,7 +1245,7 @@
- ])
- 
- dnl AC_LANG_CPLUSPLUS()
--AC_DEFUN(AC_LANG_CPLUSPLUS,
-+AC_DEFUN([AC_LANG_CPLUSPLUS],
- [define([AC_LANG], [CPLUSPLUS])dnl
- ac_ext=C
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1256,7 +1256,7 @@
- ])
- 
- dnl AC_LANG_FORTRAN77()
--AC_DEFUN(AC_LANG_FORTRAN77,
-+AC_DEFUN([AC_LANG_FORTRAN77],
- [define([AC_LANG], [FORTRAN77])dnl
- ac_ext=f
- ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&AC_FD_CC'
-@@ -1266,7 +1266,7 @@
- 
- dnl Push the current language on a stack.
- dnl AC_LANG_SAVE()
--define(AC_LANG_SAVE,
-+define([AC_LANG_SAVE],
- [pushdef([AC_LANG_STACK], AC_LANG)])
- 
- dnl Restore the current language from the stack.
-@@ -1283,12 +1283,12 @@
- dnl The purpose of this macro is to "configure:123: command line"
- dnl written into config.log for every test run.
- dnl AC_TRY_EVAL(VARIABLE)
--AC_DEFUN(AC_TRY_EVAL,
-+AC_DEFUN([AC_TRY_EVAL],
- [{ (eval echo configure:__oline__: \"[$]$1\") 1>&AC_FD_CC; dnl
- (eval [$]$1) 2>&AC_FD_CC; }])
- 
- dnl AC_TRY_COMMAND(COMMAND)
--AC_DEFUN(AC_TRY_COMMAND,
-+AC_DEFUN([AC_TRY_COMMAND],
- [{ ac_try='$1'; AC_TRY_EVAL(ac_try); }])
- 
- 
-@@ -1296,12 +1296,12 @@
- 
- 
- dnl AC_BEFORE(THIS-MACRO-NAME, CALLED-MACRO-NAME)
--define(AC_BEFORE,
-+define([AC_BEFORE],
- [ifdef([AC_PROVIDE_$2], [errprint(__file__:__line__: [$2 was called before $1
- ])])])
- 
- dnl AC_REQUIRE(MACRO-NAME)
--define(AC_REQUIRE,
-+define([AC_REQUIRE],
- [ifdef([AC_PROVIDE_$1], ,
- [AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))dnl
- indir([$1])
-@@ -1309,11 +1309,11 @@
- ])])
- 
- dnl AC_PROVIDE(MACRO-NAME)
--define(AC_PROVIDE,
-+define([AC_PROVIDE],
- [define([AC_PROVIDE_$1], )])
- 
- dnl AC_OBSOLETE(THIS-MACRO-NAME [, SUGGESTION])
--define(AC_OBSOLETE,
-+define([AC_OBSOLETE],
- [errprint(__file__:__line__: warning: [$1] is obsolete[$2]
- )])
- 
-@@ -1323,7 +1323,7 @@
- 
- dnl AC_CHECK_PROG(VARIABLE, PROG-TO-CHECK-FOR, VALUE-IF-FOUND
- dnl               [, [VALUE-IF-NOT-FOUND] [, [PATH] [, [REJECT]]]])
--AC_DEFUN(AC_CHECK_PROG,
-+AC_DEFUN([AC_CHECK_PROG],
- [# Extract the first word of "$2", so it can be a program name with args.
- set dummy $2; ac_word=[$]2
- AC_MSG_CHECKING([for $ac_word])
-@@ -1391,7 +1391,7 @@
- ])
- 
- dnl AC_PATH_PROG(VARIABLE, PROG-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]])
--AC_DEFUN(AC_PATH_PROG,
-+AC_DEFUN([AC_PATH_PROG],
- [# Extract the first word of "$2", so it can be a program name with args.
- set dummy $2; ac_word=[$]2
- AC_MSG_CHECKING([for $ac_word])
-@@ -1439,7 +1439,7 @@
- 
- dnl AC_CHECK_PROGS(VARIABLE, PROGS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
- dnl                [, PATH]])
--AC_DEFUN(AC_CHECK_PROGS,
-+AC_DEFUN([AC_CHECK_PROGS],
- [for ac_prog in $2
- do
- AC_CHECK_PROG($1, [$]ac_prog, [$]ac_prog, , $4)
-@@ -1450,7 +1450,7 @@
- 
- dnl AC_PATH_PROGS(VARIABLE, PROGS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
- dnl               [, PATH]])
--AC_DEFUN(AC_PATH_PROGS,
-+AC_DEFUN([AC_PATH_PROGS],
- [for ac_prog in $2
- do
- AC_PATH_PROG($1, [$]ac_prog, , $4)
-@@ -1460,7 +1460,7 @@
- ])])
- 
- dnl Internal subroutine.
--AC_DEFUN(AC_CHECK_TOOL_PREFIX,
-+AC_DEFUN([AC_CHECK_TOOL_PREFIX],
- [AC_REQUIRE([AC_CANONICAL_HOST])AC_REQUIRE([AC_CANONICAL_BUILD])dnl
- if test $host != $build; then
-   ac_tool_prefix=${host_alias}-
-@@ -1470,7 +1470,7 @@
- ])
- 
- dnl AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
--AC_DEFUN(AC_CHECK_TOOL,
-+AC_DEFUN([AC_CHECK_TOOL],
- [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
- AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
- 	      ifelse([$3], , [$2], ), $4)
-@@ -1492,10 +1492,10 @@
- dnl and it might use a cached value for the path.
- dnl No big loss, I think, since most configures don't use this macro anyway.
- dnl AC_PREFIX_PROGRAM(PROGRAM)
--AC_DEFUN(AC_PREFIX_PROGRAM,
-+AC_DEFUN([AC_PREFIX_PROGRAM],
- [if test "x$prefix" = xNONE; then
- changequote(<<, >>)dnl
--define(<<AC_VAR_NAME>>, translit($1, [a-z], [A-Z]))dnl
-+define([<<AC_VAR_NAME>>], translit($1, [a-z], [A-Z]))dnl
- changequote([, ])dnl
- dnl We reimplement AC_MSG_CHECKING (mostly) to avoid the ... in the middle.
- echo $ac_n "checking for prefix by $ac_c" 1>&AC_FD_MSG
-@@ -1517,7 +1517,7 @@
- dnl language.
- dnl 
- dnl AC_TRY_COMPILER(TEST-PROGRAM, WORKING-VAR, CROSS-VAR)
--AC_DEFUN(AC_TRY_COMPILER,
-+AC_DEFUN([AC_TRY_COMPILER],
- [cat > conftest.$ac_ext << EOF
- ifelse(AC_LANG, [FORTRAN77], ,
- [
-@@ -1550,7 +1550,7 @@
- dnl the link succeeds, execute ACTION-IF-FOUND; otherwise, execute
- dnl ACTION-IF-NOT-FOUND.
- 
--AC_DEFUN(AC_TRY_LINK_FUNC,
-+AC_DEFUN([AC_TRY_LINK_FUNC],
- AC_TRY_LINK(dnl
- ifelse([$1], [main], , dnl Avoid conflicting decl of main.
- [/* Override any gcc2 internal prototype to avoid an error.  */
-@@ -1571,7 +1571,7 @@
- dnl            [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
- dnl Search for a library defining FUNC, if it's not already available.
- 
--AC_DEFUN(AC_SEARCH_LIBS,
-+AC_DEFUN([AC_SEARCH_LIBS],
- [AC_PREREQ([2.13])
- AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
- [ac_func_search_save_LIBS="$LIBS"
-@@ -1595,7 +1595,7 @@
- 
- dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
- dnl              [, OTHER-LIBRARIES]]])
--AC_DEFUN(AC_CHECK_LIB,
-+AC_DEFUN([AC_CHECK_LIB],
- [AC_MSG_CHECKING([for $2 in -l$1])
- dnl Use a cache variable name containing both the library and function name,
- dnl because the test really is for library $1 defining function $2, not
-@@ -1641,12 +1641,12 @@
- 
- dnl AC_HAVE_LIBRARY(LIBRARY, [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
- dnl                 [, OTHER-LIBRARIES]]])
--AC_DEFUN(AC_HAVE_LIBRARY,
-+AC_DEFUN([AC_HAVE_LIBRARY],
- [AC_OBSOLETE([$0], [; instead use AC_CHECK_LIB])dnl
- changequote(<<, >>)dnl
--define(<<AC_LIB_NAME>>, dnl
-+define([<<AC_LIB_NAME>>], dnl
- patsubst(patsubst($1, <<lib\([^\.]*\)\.a>>, <<\1>>), <<-l>>, <<>>))dnl
--define(<<AC_CV_NAME>>, ac_cv_lib_<<>>AC_LIB_NAME)dnl
-+define([<<AC_CV_NAME>>], ac_cv_lib_<<>>AC_LIB_NAME)dnl
- changequote([, ])dnl
- AC_MSG_CHECKING([for -l[]AC_LIB_NAME])
- AC_CACHE_VAL(AC_CV_NAME,
-@@ -1674,7 +1674,7 @@
- 
- 
- dnl AC_TRY_CPP(INCLUDES, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
--AC_DEFUN(AC_TRY_CPP,
-+AC_DEFUN([AC_TRY_CPP],
- [AC_REQUIRE_CPP()dnl
- cat > conftest.$ac_ext <<EOF
- [#]line __oline__ "configure"
-@@ -1703,14 +1703,14 @@
- 
- dnl AC_EGREP_HEADER(PATTERN, HEADER-FILE, ACTION-IF-FOUND [,
- dnl                 ACTION-IF-NOT-FOUND])
--AC_DEFUN(AC_EGREP_HEADER,
-+AC_DEFUN([AC_EGREP_HEADER],
- [AC_EGREP_CPP([$1], [#include <$2>], [$3], [$4])])
- 
- dnl Because this macro is used by AC_PROG_GCC_TRADITIONAL, which must
- dnl come early, it is not included in AC_BEFORE checks.
- dnl AC_EGREP_CPP(PATTERN, PROGRAM, [ACTION-IF-FOUND [,
- dnl              ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_EGREP_CPP,
-+AC_DEFUN([AC_EGREP_CPP],
- [AC_REQUIRE_CPP()dnl
- cat > conftest.$ac_ext <<EOF
- [#]line __oline__ "configure"
-@@ -1740,7 +1740,7 @@
- 
- dnl AC_TRY_COMPILE(INCLUDES, FUNCTION-BODY,
- dnl             [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_TRY_COMPILE,
-+AC_DEFUN([AC_TRY_COMPILE],
- [cat > conftest.$ac_ext <<EOF
- ifelse(AC_LANG, [FORTRAN77],
- [      program main
-@@ -1773,7 +1773,7 @@
- 
- dnl AC_COMPILE_CHECK(ECHO-TEXT, INCLUDES, FUNCTION-BODY,
- dnl                  ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
--AC_DEFUN(AC_COMPILE_CHECK,
-+AC_DEFUN([AC_COMPILE_CHECK],
- [AC_OBSOLETE([$0], [; instead use AC_TRY_COMPILE or AC_TRY_LINK, and AC_MSG_CHECKING and AC_MSG_RESULT])dnl
- ifelse([$1], , , [AC_CHECKING([for $1])
- ])dnl
-@@ -1782,7 +1782,7 @@
- 
- dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY,
- dnl             [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_TRY_LINK,
-+AC_DEFUN([AC_TRY_LINK],
- [cat > conftest.$ac_ext <<EOF
- ifelse(AC_LANG, [FORTRAN77],
- [
-@@ -1817,7 +1817,7 @@
- 
- dnl AC_TRY_RUN(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE
- dnl            [, ACTION-IF-CROSS-COMPILING]]])
--AC_DEFUN(AC_TRY_RUN,
-+AC_DEFUN([AC_TRY_RUN],
- [if test "$cross_compiling" = yes; then
-   ifelse([$4], ,
-     [errprint(__file__:__line__: warning: [AC_TRY_RUN] called without default to allow cross compiling
-@@ -1831,7 +1831,7 @@
- 
- dnl Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
- dnl AC_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
--AC_DEFUN(AC_TRY_RUN_NATIVE,
-+AC_DEFUN([AC_TRY_RUN_NATIVE],
- [cat > conftest.$ac_ext <<EOF
- [#]line __oline__ "configure"
- #include "confdefs.h"
-@@ -1859,7 +1859,7 @@
- 
- 
- dnl AC_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_CHECK_HEADER,
-+AC_DEFUN([AC_CHECK_HEADER],
- [dnl Do the transliteration at runtime so arg 1 can be a shell variable.
- ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
- AC_MSG_CHECKING([for $1])
-@@ -1877,7 +1877,7 @@
- ])
- 
- dnl AC_CHECK_HEADERS(HEADER-FILE... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_CHECK_HEADERS,
-+AC_DEFUN([AC_CHECK_HEADERS],
- [for ac_hdr in $1
- do
- AC_CHECK_HEADER($ac_hdr,
-@@ -1892,7 +1892,7 @@
- dnl ### Checking for the existence of files
- 
- dnl AC_CHECK_FILE(FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_CHECK_FILE,
-+AC_DEFUN([AC_CHECK_FILE],
- [AC_REQUIRE([AC_PROG_CC])
- dnl Do the transliteration at runtime so arg 1 can be a shell variable.
- ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
-@@ -1919,7 +1919,7 @@
- ])
- 
- dnl AC_CHECK_FILES(FILE... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_CHECK_FILES,
-+AC_DEFUN([AC_CHECK_FILES],
- [for ac_file in $1
- do
- AC_CHECK_FILE($ac_file,
-@@ -1935,7 +1935,7 @@
- 
- 
- dnl AC_CHECK_FUNC(FUNCTION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_CHECK_FUNC,
-+AC_DEFUN([AC_CHECK_FUNC],
- [AC_MSG_CHECKING([for $1])
- AC_CACHE_VAL(ac_cv_func_$1,
- [AC_TRY_LINK(
-@@ -1974,7 +1974,7 @@
- ])
- 
- dnl AC_CHECK_FUNCS(FUNCTION... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_CHECK_FUNCS,
-+AC_DEFUN([AC_CHECK_FUNCS],
- [for ac_func in $1
- do
- AC_CHECK_FUNC($ac_func,
-@@ -1986,7 +1986,7 @@
- ])
- 
- dnl AC_REPLACE_FUNCS(FUNCTION...)
--AC_DEFUN(AC_REPLACE_FUNCS,
-+AC_DEFUN([AC_REPLACE_FUNCS],
- [AC_CHECK_FUNCS([$1], , [LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"])
- AC_SUBST(LIBOBJS)dnl
- ])
-@@ -1996,12 +1996,12 @@
- 
- 
- dnl AC_CHECK_SIZEOF(TYPE [, CROSS-SIZE])
--AC_DEFUN(AC_CHECK_SIZEOF,
-+AC_DEFUN([AC_CHECK_SIZEOF],
- [changequote(<<, >>)dnl
- dnl The name to #define.
--define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
-+define([<<AC_TYPE_NAME>>], translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
- dnl The cache variable name.
--define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
-+define([<<AC_CV_NAME>>], translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
- changequote([, ])dnl
- AC_MSG_CHECKING(size of $1)
- AC_CACHE_VAL(AC_CV_NAME,
-@@ -2024,7 +2024,7 @@
- 
- 
- dnl AC_CHECK_TYPE(TYPE, DEFAULT)
--AC_DEFUN(AC_CHECK_TYPE,
-+AC_DEFUN([AC_CHECK_TYPE],
- [AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_MSG_CHECKING(for $1)
- AC_CACHE_VAL(ac_cv_type_$1,
-@@ -2047,13 +2047,13 @@
- 
- 
- dnl AC_CONFIG_HEADER(HEADER-TO-CREATE ...)
--AC_DEFUN(AC_CONFIG_HEADER,
-+AC_DEFUN([AC_CONFIG_HEADER],
- [define([AC_LIST_HEADER], $1)])
- 
- dnl Link each of the existing files SOURCE... to the corresponding
- dnl link name in DEST...
- dnl AC_LINK_FILES(SOURCE..., DEST...)
--AC_DEFUN(AC_LINK_FILES,
-+AC_DEFUN([AC_LINK_FILES],
- [dnl
- define([AC_LIST_FILES], ifdef([AC_LIST_FILES], [AC_LIST_FILES ],)[$1])dnl
- define([AC_LIST_LINKS], ifdef([AC_LIST_LINKS], [AC_LIST_LINKS ],)[$2])])
-@@ -2062,7 +2062,7 @@
- dnl Use diversions instead of macros so we can be robust in the
- dnl presence of commas in $1 and/or $2.
- dnl AC_OUTPUT_COMMANDS(EXTRA-CMDS, INIT-CMDS)
--AC_DEFUN(AC_OUTPUT_COMMANDS,
-+AC_DEFUN([AC_OUTPUT_COMMANDS],
- [AC_DIVERT_PUSH(AC_DIVERSION_CMDS)dnl
- [$1]
- AC_DIVERT_POP()dnl
-@@ -2071,7 +2071,7 @@
- AC_DIVERT_POP()])
- 
- dnl AC_CONFIG_SUBDIRS(DIR ...)
--AC_DEFUN(AC_CONFIG_SUBDIRS,
-+AC_DEFUN([AC_CONFIG_SUBDIRS],
- [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
- define([AC_LIST_SUBDIRS], ifdef([AC_LIST_SUBDIRS], [AC_LIST_SUBDIRS ],)[$1])dnl
- subdirs="AC_LIST_SUBDIRS"
-@@ -2081,7 +2081,7 @@
- dnl The big finish.
- dnl Produce config.status, config.h, and links; and configure subdirs.
- dnl AC_OUTPUT([FILE...] [, EXTRA-CMDS] [, INIT-CMDS])
--define(AC_OUTPUT,
-+define([AC_OUTPUT],
- [trap '' 1 2 15
- AC_CACHE_SAVE
- trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-@@ -2176,7 +2176,7 @@
- dnl This is a subroutine of AC_OUTPUT.
- dnl It is called inside configure, outside of config.status.
- dnl AC_OUTPUT_MAKE_DEFS()
--define(AC_OUTPUT_MAKE_DEFS,
-+define([AC_OUTPUT_MAKE_DEFS],
- [# Transform confdefs.h into DEFS.
- dnl Using a here document instead of a string reduces the quoting nightmare.
- # Protect against shell expansion while executing Makefile rules.
-@@ -2199,7 +2199,7 @@
- dnl here document whose contents are going into config.status, but
- dnl upon returning, the here document is being quoted.
- dnl AC_OUTPUT_FILES(FILE...)
--define(AC_OUTPUT_FILES,
-+define([AC_OUTPUT_FILES],
- [# Protect against being on the right side of a sed subst in config.status.
- changequote(, )dnl
- sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-@@ -2380,7 +2380,7 @@
- dnl This is a subroutine of AC_OUTPUT.  It is called inside a quoted
- dnl here document whose contents are going into config.status.
- dnl AC_OUTPUT_HEADER(HEADER-FILE...)
--define(AC_OUTPUT_HEADER,
-+define([AC_OUTPUT_HEADER],
- [changequote(<<, >>)dnl
- # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
- # NAME is the cpp macro being defined and VALUE is the value it is being given.
-@@ -2507,7 +2507,7 @@
- dnl This is a subroutine of AC_OUTPUT.  It is called inside a quoted
- dnl here document whose contents are going into config.status.
- dnl AC_OUTPUT_LINKS(SOURCE..., DEST...)
--define(AC_OUTPUT_LINKS,
-+define([AC_OUTPUT_LINKS],
- [EOF
- 
- cat >> $CONFIG_STATUS <<EOF
-@@ -2564,7 +2564,7 @@
- dnl This is a subroutine of AC_OUTPUT.
- dnl It is called after running config.status.
- dnl AC_OUTPUT_SUBDIRS(DIRECTORY...)
--define(AC_OUTPUT_SUBDIRS,
-+define([AC_OUTPUT_SUBDIRS],
- [
- if test "$no_recursion" != yes; then
- 
---- tetex-src-2.0.2/./texk/etc/autoconf/acsite.m4~configure	1998-03-04 08:19:45.000000000 -0500
-+++ tetex-src-2.0.2/./texk/etc/autoconf/acsite.m4	2004-01-26 20:17:53.000000000 -0500
-@@ -4,7 +4,7 @@
- 
- 
- dnl kb_AC_LIBTOOL_REPLACE_FUNCS(FUNCTION-NAME...)
--AC_DEFUN(kb_AC_LIBTOOL_REPLACE_FUNCS,
-+AC_DEFUN([kb_AC_LIBTOOL_REPLACE_FUNCS],
- [for ac_func in $1
- do
- AC_CHECK_FUNC($ac_func, , [LIBTOOL_LIBOBJS="$LIBTOOL_LIBOBJS ${ac_func}.lo"])
-@@ -16,7 +16,7 @@
- dnl Check if gcc asm for i386 needs external symbols with an underscore.
- dnl Peter Breitenlohner, April 15, 1996.
- undefine([pb_AC_ASM_UNDERSCORE])
--AC_DEFUN(pb_AC_ASM_UNDERSCORE,
-+AC_DEFUN([pb_AC_ASM_UNDERSCORE],
- [AC_REQUIRE_CPP()dnl
- AC_CACHE_CHECK(whether gcc asm needs underscore, pb_cv_asm_underscore,
- [
-@@ -58,7 +58,7 @@
- dnl From automake distribution, by Jim Meyering:
- dnl Add --enable-maintainer-mode option to configure.
- 
--AC_DEFUN(AM_MAINTAINER_MODE,
-+AC_DEFUN([AM_MAINTAINER_MODE],
- [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-   dnl maintainer-mode is disabled by default
-   AC_ARG_ENABLE(maintainer-mode,
---- tetex-src-2.0.2/./texk/etc/autoconf/autoheader.m4~configure	1999-01-05 08:28:37.000000000 -0500
-+++ tetex-src-2.0.2/./texk/etc/autoconf/autoheader.m4	2004-01-26 20:17:53.000000000 -0500
-@@ -67,7 +67,7 @@
- 
- define([AC_HAVE_LIBRARY], [#
- changequote(<<, >>)dnl
--define(<<AC_LIB_NAME>>, dnl
-+define([<<AC_LIB_NAME>>], dnl
- patsubst(patsubst($1, <<lib\([^\.]*\)\.a>>, <<\1>>), <<-l>>, <<>>))dnl
- changequote([, ])dnl
-   ifelse([$2], , [
---- tetex-src-2.0.2/./texk/acklibtool.m4~configure	1997-10-03 07:38:16.000000000 -0400
-+++ tetex-src-2.0.2/./texk/acklibtool.m4	2004-01-26 20:17:53.000000000 -0500
-@@ -3,7 +3,7 @@
- dnl
- dnl
- dnl Find the script, check for subprogs, etc.
--AC_DEFUN(kb_AC_PROG_LIBTOOL,
-+AC_DEFUN([kb_AC_PROG_LIBTOOL],
- [AC_REQUIRE([AC_PROG_RANLIB])
- AC_REQUIRE([AC_CANONICAL_HOST])
- #
-@@ -49,7 +49,7 @@
- dnl
- dnl
- dnl Like AC_REPLACE_FUNCS, but add to LTLIBOBJS instead of LIBOBJS.
--AC_DEFUN(kb_AC_KLIBTOOL_REPLACE_FUNCS,
-+AC_DEFUN([kb_AC_KLIBTOOL_REPLACE_FUNCS],
- [ dnl cannot require this function, since it doesn't have a provide call.
- AC_CHECK_FUNCS($1,, LTLIBOBJS="$LTLIBOBJS $ac_func.lo")
- AC_SUBST(LTLIBOBJS)dnl
---- tetex-src-2.0.2/./utils/texinfo/m4/gettext.m4~configure	2002-09-20 16:30:58.000000000 -0400
-+++ tetex-src-2.0.2/./utils/texinfo/m4/gettext.m4	2004-01-26 20:17:53.000000000 -0500
-@@ -65,8 +65,8 @@
-   ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
- ])])])])
--  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
--  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-+  define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
-+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
- 
-   AC_REQUIRE([AM_PO_SUBDIRS])dnl
-   ifelse(gt_included_intl, yes, [
---- tetex-src-2.0.2/./utils/texinfo/acinclude.m4~configure	2002-09-29 12:18:16.000000000 -0400
-+++ tetex-src-2.0.2/./utils/texinfo/acinclude.m4	2004-01-26 20:17:53.000000000 -0500
-@@ -2,7 +2,7 @@
- 
- #serial 3
- 
--AC_DEFUN(jm_CHECK_DECLARATION,
-+AC_DEFUN([jm_CHECK_DECLARATION],
- [
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   test -z "$ac_cv_header_memory_h" && AC_CHECK_HEADERS(memory.h)
-@@ -33,7 +33,7 @@
- 
- dnl jm_CHECK_DECLARATIONS(INCLUDES, FUNCTION... [, ACTION-IF-DECLARED
- dnl                       [, ACTION-IF-NOT-DECLARED]])
--AC_DEFUN(jm_CHECK_DECLARATIONS,
-+AC_DEFUN([jm_CHECK_DECLARATIONS],
- [
-   for jm_func in $2
-   do
-@@ -51,7 +51,7 @@
- dnl This is just a wrapper function to encapsulate this kludge.
- dnl Putting it in a separate file like this helps share it between
- dnl different packages.
--AC_DEFUN(txi_CHECK_DECLS,
-+AC_DEFUN([txi_CHECK_DECLS],
- [
-   headers='
- #include <stdio.h>
diff --git a/packages/nonworking/tetex/tetex_2.0.2.bb b/packages/nonworking/tetex/tetex_2.0.2.bb
deleted file mode 100644
index 98e9edb35c..0000000000
--- a/packages/nonworking/tetex/tetex_2.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SRC_URI = ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/2.0/distrib/tetex-src-${PV}.tar.gz \
-	  file://${FILESDIR}/configure.patch;patch=1
-S = ${WORKDIR}/tetex-src-${PV}
-
-inherit autotools
-
-do_configure () {
-	sh ./reautoconf
-	oe_runconf
-}
diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb
index 8907d9762a..b2fb9deb8f 100644
--- a/packages/pam/libpam_0.79.bb
+++ b/packages/pam/libpam_0.79.bb
@@ -19,6 +19,7 @@ MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
+PR = "r1"
 
 # The project is actually called Linux-PAM but that gives
 # a bad OE package name because of the upper case characters
@@ -37,6 +38,14 @@ SRC_URI += " file://libpam-make.patch;patch=1"
 inherit autotools
 
 # EXTRA_OECONF += " --enable-static-libpam"
+# Disable building of the documentation - it requires too many different
+# programs installed on the build system and is a waste of time.  This
+# leaves the man documentation in the build.
+EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2TXT=no"
+EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2HTML=no"
+EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2LATEX=no"
+EXTRA_OECONF += "ac_cv_prog_HAVE_PS2PDF=no"
+EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2PS=no"
 
 LEAD_SONAME = "libpam.so.*"
 
diff --git a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
index ae162fbdc6..0181e37c95 100644
--- a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
+++ b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
@@ -17,21 +17,13 @@
  perl=''
  perl_patchlevel=''
  perladmin='red@criticalintegration.com'
- perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
++perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc -lgcc_s'
 -perlpath='/usr/bin/perl'
 +perlpath='hostperl'
  pg='pg'
  phostname='hostname'
  pidtype='pid_t'
-@@ -906,7 +907,7 @@
- srandom_r_proto='0'
- src='.'
- ssizetype='ssize_t'
--startperl='#!/usr/bin/perl'
-+startperl='#!hostperl'
- startsh='#!/bin/sh'
- static_ext=' '
- stdchar='char'
 @@ -971,6 +972,7 @@
  usereentrant='undef'
  usesfio='false'
diff --git a/packages/perl/perl-5.8.7/config.sh-armeb-linux b/packages/perl/perl-5.8.7/config.sh-armeb-linux
index 3c5adaf70b..155b5237aa 100644
--- a/packages/perl/perl-5.8.7/config.sh-armeb-linux
+++ b/packages/perl/perl-5.8.7/config.sh-armeb-linux
@@ -907,7 +907,7 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
-startperl='#!hostperl'
+startperl='#!/usr/bin/perl'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
diff --git a/packages/perl/perl-5.8.7/config.sh-i686-linux b/packages/perl/perl-5.8.7/config.sh-i686-linux
index b09b7140e7..313ff2fbb1 100644
--- a/packages/perl/perl-5.8.7/config.sh-i686-linux
+++ b/packages/perl/perl-5.8.7/config.sh-i686-linux
@@ -905,7 +905,7 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
-startperl='#!hostperl'
+startperl='#!/usr/bin/perl'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index dc457b43ff..babeea3e9a 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -4,7 +4,7 @@ include perl.inc
 
 SRC_URI += "file://config.sh-armeb-linux"
 
-PR = "r4"
+PR = "r9"
 
 do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
@@ -30,5 +30,12 @@ do_configure() {
 
 do_install_append() {
 	ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5
+	sed -i -e "s,${D},,g" ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/Config_heavy.pl
 }
 
+# Create a perl-modules package recommending all the other perl
+# packages (actually the non modules packages and not created too)
+ALLOW_EMPTY_perl-modules = 1
+PACKAGES_append = " perl-modules"
+RRECOMMENDS_perl-modules = "${PACKAGES}"
+RPROVIDES_perl-lib = "perl-lib"
diff --git a/packages/pine/.mtn2git_empty b/packages/pine/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pine/.mtn2git_empty
diff --git a/packages/pine/pine_4.63.bb b/packages/pine/pine_4.63.bb
new file mode 100644
index 0000000000..b8a11639a6
--- /dev/null
+++ b/packages/pine/pine_4.63.bb
@@ -0,0 +1,59 @@
+DESCRIPTION = "Pine(R) - a Program for Internet News & Email"
+SECTION = "console/network"
+LICENSE = "Pine"
+DEPENDS = "ncurses"
+RDEPENDS_pine = "pico"
+HOMEPAGE = "http://www.washington.edu/pine/"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+
+SRC_URI = "ftp://ftp.cac.washington.edu/pine/pine${PV}.tar.bz2"
+S = "${WORKDIR}/pine${PV}"
+
+inherit autotools
+
+#
+# ~lart Pine's build structure... 
+#
+PARALLEL_MAKE = ""
+EXTRA_OEMAKE = "-e"
+export MAKE = 'MAKE="make -e" make -e'
+
+CFLAGS += "-I${S}/imap/c-client"
+LDFLAGS += "${S}/imap/c-client/c-client.a -lssl -lcrypt"
+
+export SSLDEFINES = "-DSSL_CERT_DIRECTORY=\\"/etc/ssl/certs\\" -DSSL_KEY_DIRECTORY=\\"/etc/ssl/private\\""
+export SSLCFLAGS = "${CFLAGS} -I${STAGING_INCDIR}/openssl ${SSLDEFINES}"
+export SSLLDFLAGS = "-lssl -lcrypt ${LDFLAGS} -L${STAGING_LIBDIR}/openssl"
+export EXTRALDFLAGS = "${LDFLAGS}"
+
+do_configure() {
+	ln -sf ${S}/imap/c-client ${S}/c-client
+	cd ${S}/pico/osdep && \
+	${BUILD_CC} -o includer includer.c
+	cd ${S}/pine/osdep && \
+	${BUILD_CC} -o includer includer.c
+}
+
+do_compile() {
+	unset CFLAGS && unset LDFLAGS
+	cd ${S}/imap && oe_runmake slx
+
+	for i in pico pine
+	do
+		cd ${S}/$i && oe_runmake -f makefile.lnx
+	done
+}
+
+BINARIES = "imap/mailutil/mailutil imap/mlock/mlock pico/pico pico/pilot pine/pine"
+
+do_install() {
+	install -d 0644 ${D}${bindir}
+	for binary in ${BINARIES}
+	do
+		install -m 0755 $binary ${D}${bindir}
+	done
+}
+
+PACKAGES = "pico pine"
+FILES_pico = "${bindir}/pico ${bindir}/pilot"
+
diff --git a/packages/portmap/portmap_5-9.bb b/packages/portmap/portmap_5-9.bb
index 3092b70539..76d66e9ad9 100644
--- a/packages/portmap/portmap_5-9.bb
+++ b/packages/portmap/portmap_5-9.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r5"
 
 SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
 	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
diff --git a/packages/prboom/files/prboom.sh b/packages/prboom/files/prboom.sh
index 7e41d87fcb..636b17879d 100755
--- a/packages/prboom/files/prboom.sh
+++ b/packages/prboom/files/prboom.sh
@@ -9,6 +9,8 @@ case $model in
 *)		par="";;
 esac
 
+test -e /usr/share/games/doom/prboom.cfg && par="$par -config /usr/share/games/doom/prboom.cfg"
+
 echo "Model: [$model]"
 echo "Launching prboom $par $*"
 
diff --git a/packages/prboom/prboom-devconfig.bb b/packages/prboom/prboom-devconfig.bb
new file mode 100644
index 0000000000..bcfcee14cd
--- /dev/null
+++ b/packages/prboom/prboom-devconfig.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Device specific configuration for prboom"
+SECTION = "games"
+PRIORITY = "optional"
+MAINTAINER = "coredump@handhelds.org"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "file://prboom.cfg"
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} = "/usr/share/games/doom/prboom.cfg"
+
+do_install() {
+	install -d ${D}/usr/share/games/doom/
+	
+	install -m 644 ${WORKDIR}/prboom.cfg ${D}/usr/share/games/doom/
+}
diff --git a/packages/prboom/prboom-devconfig/.mtn2git_empty b/packages/prboom/prboom-devconfig/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/.mtn2git_empty
diff --git a/packages/prboom/prboom-devconfig/akita/.mtn2git_empty b/packages/prboom/prboom-devconfig/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/akita/.mtn2git_empty
diff --git a/packages/prboom/prboom-devconfig/akita/prboom.cfg b/packages/prboom/prboom-devconfig/akita/prboom.cfg
new file mode 100644
index 0000000000..cd17d0baff
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/akita/prboom.cfg
@@ -0,0 +1,313 @@
+# Doom config file
+# Format:
+# variable   value
+
+# Misc settings
+default_compatibility_level    -1
+realtic_clock_rate          100
+max_player_corpse            32
+flashing_hom                  0
+demo_insurance                2
+endoom_mode               0x5
+level_precache                0
+
+# Files
+wadfile_1                 "prboom.wad"
+wadfile_2                 ""
+dehfile_1                 ""
+dehfile_2                 ""
+
+# Game settings
+default_skill                 2
+weapon_recoil                 0
+doom_weapon_toggles           1
+player_bobbing                1
+monsters_remember             1
+monster_infighting            1
+monster_backing               0
+monster_avoid_hazards         1
+monkeys                       0
+monster_friction              1
+help_friends                  1
+player_helpers                0
+friend_distance             128
+dog_jumping                   1
+sts_always_red                1
+sts_pct_always_gray           0
+sts_traditional_keys          0
+traditional_menu              1
+show_messages                 1
+autorun                       0
+
+# Compatibility settings
+comp_zombie                   0
+comp_infcheat                 0
+comp_stairs                   0
+comp_telefrag                 0
+comp_dropoff                  0
+comp_falloff                  0
+comp_staylift                 0
+comp_doorstuck                0
+comp_pursuit                  0
+comp_vile                     0
+comp_pain                     0
+comp_skull                    0
+comp_blazing                  0
+comp_doorlight                0
+comp_god                      0
+comp_skymap                   0
+comp_floors                   0
+comp_model                    0
+comp_zerotags                 0
+comp_moveblock                0
+comp_sound                    0
+
+# Sound settings
+sound_card                   -1
+music_card                   -1
+pitched_sounds                0
+samplerate                22050
+sfx_volume                    8
+music_volume                  8
+mus_pause_opt                 2
+sounddev                  "/dev/dsp"
+snd_channels                  8
+
+# Video settings
+screen_width                540
+screen_height               380
+fake_contrast                 1
+use_fullscreen                1
+use_doublebuffer              1
+translucency                  1
+tran_filter_pct              66
+screenblocks                 10
+usegamma                      3
+X_options                 0x0
+
+# Mouse settings
+use_mouse                     1
+mouse_sensitivity_horiz      10
+mouse_sensitivity_vert       10
+mouseb_fire                   0
+mouseb_strafe                 1
+mouseb_forward                2
+
+# Key bindings
+key_right                 0xae
+key_left                  0xac
+key_up                    0xad
+key_down                  0xaf
+key_menu_right            0xae
+key_menu_left             0xac
+key_menu_up               0xad
+key_menu_down             0xaf
+key_menu_backspace        0x7f
+key_menu_escape           0x1b
+key_menu_enter            0x10d
+key_strafeleft            0x2c
+key_straferight           0x2e
+key_fire                  0x10d
+key_use                   0x20
+key_strafe                0xb8
+key_speed                 0xb6
+key_savegame              0xbc
+key_loadgame              0xbd
+key_soundvolume           0xbe
+key_hud                   0xbf
+key_quicksave             0xc0
+key_endgame               0xc1
+key_messages              0xc2
+key_quickload             0xc3
+key_quit                  0xc4
+key_gamma                 0xd7
+key_spy                   0xd8
+key_pause                 0xff
+key_autorun               0xba
+key_chat                  0x74
+key_backspace             0x7f
+key_enter                 0xd
+key_map                   0x9
+key_map_right             0xae
+key_map_left              0xac
+key_map_up                0xad
+key_map_down              0xaf
+key_map_zoomin            0x3d
+key_map_zoomout           0x2d
+key_map_gobig             0x30
+key_map_follow            0x66
+key_map_mark              0x6d
+key_map_clear             0x63
+key_map_grid              0x67
+key_map_rotate            0x72
+key_map_overlay           0x6f
+key_reverse               0x2f
+key_zoomin                0x3d
+key_zoomout               0x2d
+key_chatplayer1           0x67
+key_chatplayer2           0x69
+key_chatplayer3           0x62
+key_chatplayer4           0x72
+key_weapontoggle          0x30
+key_weapon1               0x31
+key_weapon2               0x32
+key_weapon3               0x33
+key_weapon4               0x34
+key_weapon5               0x35
+key_weapon6               0x36
+key_weapon7               0x37
+key_weapon8               0x38
+key_weapon9               0x39
+key_screenshot            0x2a
+
+# Joystick settings
+use_joystick                  0
+joy_left                      0
+joy_right                     0
+joy_up                        0
+joy_down                      0
+joyb_fire                     0
+joyb_strafe                   1
+joyb_speed                    2
+joyb_use                      3
+
+# Chat macros
+chatmacro0                "No"
+chatmacro1                "I'm ready to kick butt!"
+chatmacro2                "I'm OK."
+chatmacro3                "I'm not looking too good!"
+chatmacro4                "Help!"
+chatmacro5                "You suck!"
+chatmacro6                "Next time, scumbag..."
+chatmacro7                "Come here!"
+chatmacro8                "I'll take care of it."
+chatmacro9                "Yes"
+
+# Automap settings
+mapcolor_back             0xf7
+mapcolor_grid             0x68
+mapcolor_wall             0x17
+mapcolor_fchg             0x37
+mapcolor_cchg             0xd7
+mapcolor_clsd             0xd0
+mapcolor_rkey             0xaf
+mapcolor_bkey             0xcc
+mapcolor_ykey             0xe7
+mapcolor_rdor             0xaf
+mapcolor_bdor             0xcc
+mapcolor_ydor             0xe7
+mapcolor_tele             0x77
+mapcolor_secr             0xfc
+mapcolor_exit             0x0
+mapcolor_unsn             0x68
+mapcolor_flat             0x58
+mapcolor_sprt             0x70
+mapcolor_item             0xe7
+mapcolor_hair             0xd0
+mapcolor_sngl             0xd0
+mapcolor_me               0x70
+mapcolor_frnd             0x70
+map_secret_after              0
+map_point_coord               0
+automapmode               0x0
+
+# Heads-up display settings
+hudcolor_titl                 5
+hudcolor_xyco                 3
+hudcolor_mesg                 6
+hudcolor_chat                 5
+hudcolor_list                 5
+hud_msg_lines                 1
+hud_list_bgon                 0
+hud_distributed               0
+health_red                   25
+health_yellow                50
+health_green                100
+armor_red                    25
+armor_yellow                 50
+armor_green                 100
+ammo_red                     25
+ammo_yellow                  50
+hud_active                    2
+hud_displayed                 0
+hud_nosecrets                 0
+
+# Weapon preferences
+weapon_choice_1               6
+weapon_choice_2               9
+weapon_choice_3               4
+weapon_choice_4               3
+weapon_choice_5               2
+weapon_choice_6               8
+weapon_choice_7               5
+weapon_choice_8               7
+weapon_choice_9               1
+
+# Music
+mus_e1m1                  "e1m1.mp3"
+mus_e1m2                  "e1m2.mp3"
+mus_e1m3                  "e1m3.mp3"
+mus_e1m4                  "e1m4.mp3"
+mus_e1m5                  "e1m5.mp3"
+mus_e1m6                  "e1m6.mp3"
+mus_e1m7                  "e1m7.mp3"
+mus_e1m8                  "e1m8.mp3"
+mus_e1m9                  "e1m9.mp3"
+mus_e2m1                  "e2m1.mp3"
+mus_e2m2                  "e2m2.mp3"
+mus_e2m3                  "e2m3.mp3"
+mus_e2m4                  "e2m4.mp3"
+mus_e2m5                  "e1m7.mp3"
+mus_e2m6                  "e2m6.mp3"
+mus_e2m7                  "e2m7.mp3"
+mus_e2m8                  "e2m8.mp3"
+mus_e2m9                  "e3m1.mp3"
+mus_e3m1                  "e3m1.mp3"
+mus_e3m2                  "e3m2.mp3"
+mus_e3m3                  "e3m3.mp3"
+mus_e3m4                  "e1m8.mp3"
+mus_e3m5                  "e1m7.mp3"
+mus_e3m6                  "e1m6.mp3"
+mus_e3m7                  "e2m7.mp3"
+mus_e3m8                  "e3m8.mp3"
+mus_e3m9                  "e1m9.mp3"
+mus_inter                 "e2m3.mp3"
+mus_intro                 "intro.mp3"
+mus_bunny                 "bunny.mp3"
+mus_victor                "victor.mp3"
+mus_introa                "intro.mp3"
+mus_runnin                "runnin.mp3"
+mus_stalks                "stalks.mp3"
+mus_countd                "countd.mp3"
+mus_betwee                "betwee.mp3"
+mus_doom                  "doom.mp3"
+mus_the_da                "the_da.mp3"
+mus_shawn                 "shawn.mp3"
+mus_ddtblu                "ddtblu.mp3"
+mus_in_cit                "in_cit.mp3"
+mus_dead                  "dead.mp3"
+mus_stlks2                "stalks.mp3"
+mus_theda2                "the_da.mp3"
+mus_doom2                 "doom.mp3"
+mus_ddtbl2                "ddtblu.mp3"
+mus_runni2                "runnin.mp3"
+mus_dead2                 "dead.mp3"
+mus_stlks3                "stalks.mp3"
+mus_romero                "romero.mp3"
+mus_shawn2                "shawn.mp3"
+mus_messag                "messag.mp3"
+mus_count2                "countd.mp3"
+mus_ddtbl3                "ddtblu.mp3"
+mus_ampie                 "ampie.mp3"
+mus_theda3                "the_da.mp3"
+mus_adrian                "adrian.mp3"
+mus_messg2                "messag.mp3"
+mus_romer2                "romero.mp3"
+mus_tense                 "tense.mp3"
+mus_shawn3                "shawn.mp3"
+mus_openin                "openin.mp3"
+mus_evil                  "evil.mp3"
+mus_ultima                "ultima.mp3"
+mus_read_m                "read_m.mp3"
+mus_dm2ttl                "dm2ttl.mp3"
+mus_dm2int                "dm2int.mp3"
diff --git a/packages/prboom/prboom-devconfig/collie/.mtn2git_empty b/packages/prboom/prboom-devconfig/collie/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/collie/.mtn2git_empty
diff --git a/packages/prboom/prboom-devconfig/collie/prboom.cfg b/packages/prboom/prboom-devconfig/collie/prboom.cfg
new file mode 100644
index 0000000000..67703acf8c
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/collie/prboom.cfg
@@ -0,0 +1,313 @@
+# Doom config file
+# Format:
+# variable   value
+
+# Misc settings
+default_compatibility_level    -1
+realtic_clock_rate          100
+max_player_corpse            32
+flashing_hom                  0
+demo_insurance                2
+endoom_mode               0x5
+level_precache                0
+
+# Files
+wadfile_1                 "prboom.wad"
+wadfile_2                 ""
+dehfile_1                 ""
+dehfile_2                 ""
+
+# Game settings
+default_skill                 3
+weapon_recoil                 1
+doom_weapon_toggles           1
+player_bobbing                1
+monsters_remember             1
+monster_infighting            1
+monster_backing               1
+monster_avoid_hazards         1
+monkeys                       1
+monster_friction              1
+help_friends                  1
+player_helpers                0
+friend_distance             128
+dog_jumping                   1
+sts_always_red                0
+sts_pct_always_gray           1
+sts_traditional_keys          0
+traditional_menu              0
+show_messages                 1
+autorun                       1
+
+# Compatibility settings
+comp_zombie                   0
+comp_infcheat                 0
+comp_stairs                   0
+comp_telefrag                 1
+comp_dropoff                  0
+comp_falloff                  0
+comp_staylift                 0
+comp_doorstuck                0
+comp_pursuit                  0
+comp_vile                     0
+comp_pain                     0
+comp_skull                    0
+comp_blazing                  0
+comp_doorlight                0
+comp_god                      0
+comp_skymap                   0
+comp_floors                   0
+comp_model                    0
+comp_zerotags                 0
+comp_moveblock                0
+comp_sound                    0
+
+# Sound settings
+sound_card                   -1
+music_card                   -1
+pitched_sounds                0
+samplerate                22050
+sfx_volume                    8
+music_volume                  8
+mus_pause_opt                 2
+sounddev                  "/dev/dsp"
+snd_channels                  8
+
+# Video settings
+screen_width                320
+screen_height               240
+fake_contrast                 1
+use_fullscreen                1
+use_doublebuffer              1
+translucency                  1
+tran_filter_pct              66
+screenblocks                 10
+usegamma                      4
+X_options                 0x0
+
+# Mouse settings
+use_mouse                     1
+mouse_sensitivity_horiz      10
+mouse_sensitivity_vert       10
+mouseb_fire                   0
+mouseb_strafe                 1
+mouseb_forward                2
+
+# Key bindings
+key_right                 0xae
+key_left                  0xac
+key_up                    0xad
+key_down                  0xaf
+key_menu_right            0xae
+key_menu_left             0xac
+key_menu_up               0xad
+key_menu_down             0xaf
+key_menu_backspace        0x7f
+key_menu_escape           0x1b
+key_menu_enter            0x20
+key_strafeleft            0x2c
+key_straferight           0x2e
+key_fire                  0x20
+key_use                   0xc3
+key_strafe                0xb8
+key_speed                 0xb6
+key_savegame              0xbc
+key_loadgame              0xbd
+key_soundvolume           0xbe
+key_hud                   0xbf
+key_quicksave             0xc0
+key_endgame               0xc1
+key_messages              0xc2
+key_quickload             0xd
+key_quit                  0xc4
+key_gamma                 0xd7
+key_spy                   0xd8
+key_pause                 0xff
+key_autorun               0xba
+key_chat                  0x74
+key_backspace             0x7f
+key_enter                 0xd
+key_map                   0x126
+key_map_right             0xad
+key_map_left              0xaf
+key_map_up                0xac
+key_map_down              0xae
+key_map_zoomin            0x3d
+key_map_zoomout           0x2d
+key_map_gobig             0x30
+key_map_follow            0x66
+key_map_mark              0x6d
+key_map_clear             0x63
+key_map_grid              0x67
+key_map_rotate            0x72
+key_map_overlay           0x6f
+key_reverse               0x2f
+key_zoomin                0x3d
+key_zoomout               0x2d
+key_chatplayer1           0x67
+key_chatplayer2           0x69
+key_chatplayer3           0x62
+key_chatplayer4           0x72
+key_weapontoggle          0x30
+key_weapon1               0x31
+key_weapon2               0x32
+key_weapon3               0x33
+key_weapon4               0x34
+key_weapon5               0x35
+key_weapon6               0x36
+key_weapon7               0x37
+key_weapon8               0x38
+key_weapon9               0x39
+key_screenshot            0x2a
+
+# Joystick settings
+use_joystick                  0
+joy_left                      0
+joy_right                     0
+joy_up                        0
+joy_down                      0
+joyb_fire                     0
+joyb_strafe                   1
+joyb_speed                    2
+joyb_use                      3
+
+# Chat macros
+chatmacro0                "No"
+chatmacro1                "I'm ready to kick butt!"
+chatmacro2                "I'm OK."
+chatmacro3                "I'm not looking too good!"
+chatmacro4                "Help!"
+chatmacro5                "You suck!"
+chatmacro6                "Next time, scumbag..."
+chatmacro7                "Come here!"
+chatmacro8                "I'll take care of it."
+chatmacro9                "Yes"
+
+# Automap settings
+mapcolor_back             0xf7
+mapcolor_grid             0x68
+mapcolor_wall             0x17
+mapcolor_fchg             0x37
+mapcolor_cchg             0xd7
+mapcolor_clsd             0xd0
+mapcolor_rkey             0xaf
+mapcolor_bkey             0xcc
+mapcolor_ykey             0xe7
+mapcolor_rdor             0xaf
+mapcolor_bdor             0xcc
+mapcolor_ydor             0xe7
+mapcolor_tele             0x77
+mapcolor_secr             0xfc
+mapcolor_exit             0x0
+mapcolor_unsn             0x68
+mapcolor_flat             0x58
+mapcolor_sprt             0x70
+mapcolor_item             0xe7
+mapcolor_hair             0xd0
+mapcolor_sngl             0xd0
+mapcolor_me               0x70
+mapcolor_frnd             0x70
+map_secret_after              0
+map_point_coord               0
+automapmode               0x0
+
+# Heads-up display settings
+hudcolor_titl                 5
+hudcolor_xyco                 3
+hudcolor_mesg                 6
+hudcolor_chat                 5
+hudcolor_list                 5
+hud_msg_lines                 1
+hud_list_bgon                 0
+hud_distributed               0
+health_red                   25
+health_yellow                50
+health_green                100
+armor_red                    25
+armor_yellow                 50
+armor_green                 100
+ammo_red                     25
+ammo_yellow                  50
+hud_active                    2
+hud_displayed                 0
+hud_nosecrets                 0
+
+# Weapon preferences
+weapon_choice_1               6
+weapon_choice_2               9
+weapon_choice_3               4
+weapon_choice_4               3
+weapon_choice_5               2
+weapon_choice_6               8
+weapon_choice_7               5
+weapon_choice_8               7
+weapon_choice_9               1
+
+# Music
+mus_e1m1                  "e1m1.mp3"
+mus_e1m2                  "e1m2.mp3"
+mus_e1m3                  "e1m3.mp3"
+mus_e1m4                  "e1m4.mp3"
+mus_e1m5                  "e1m5.mp3"
+mus_e1m6                  "e1m6.mp3"
+mus_e1m7                  "e1m7.mp3"
+mus_e1m8                  "e1m8.mp3"
+mus_e1m9                  "e1m9.mp3"
+mus_e2m1                  "e2m1.mp3"
+mus_e2m2                  "e2m2.mp3"
+mus_e2m3                  "e2m3.mp3"
+mus_e2m4                  "e2m4.mp3"
+mus_e2m5                  "e1m7.mp3"
+mus_e2m6                  "e2m6.mp3"
+mus_e2m7                  "e2m7.mp3"
+mus_e2m8                  "e2m8.mp3"
+mus_e2m9                  "e3m1.mp3"
+mus_e3m1                  "e3m1.mp3"
+mus_e3m2                  "e3m2.mp3"
+mus_e3m3                  "e3m3.mp3"
+mus_e3m4                  "e1m8.mp3"
+mus_e3m5                  "e1m7.mp3"
+mus_e3m6                  "e1m6.mp3"
+mus_e3m7                  "e2m7.mp3"
+mus_e3m8                  "e3m8.mp3"
+mus_e3m9                  "e1m9.mp3"
+mus_inter                 "e2m3.mp3"
+mus_intro                 "intro.mp3"
+mus_bunny                 "bunny.mp3"
+mus_victor                "victor.mp3"
+mus_introa                "intro.mp3"
+mus_runnin                "runnin.mp3"
+mus_stalks                "stalks.mp3"
+mus_countd                "countd.mp3"
+mus_betwee                "betwee.mp3"
+mus_doom                  "doom.mp3"
+mus_the_da                "the_da.mp3"
+mus_shawn                 "shawn.mp3"
+mus_ddtblu                "ddtblu.mp3"
+mus_in_cit                "in_cit.mp3"
+mus_dead                  "dead.mp3"
+mus_stlks2                "stalks.mp3"
+mus_theda2                "the_da.mp3"
+mus_doom2                 "doom.mp3"
+mus_ddtbl2                "ddtblu.mp3"
+mus_runni2                "runnin.mp3"
+mus_dead2                 "dead.mp3"
+mus_stlks3                "stalks.mp3"
+mus_romero                "romero.mp3"
+mus_shawn2                "shawn.mp3"
+mus_messag                "messag.mp3"
+mus_count2                "countd.mp3"
+mus_ddtbl3                "ddtblu.mp3"
+mus_ampie                 "ampie.mp3"
+mus_theda3                "the_da.mp3"
+mus_adrian                "adrian.mp3"
+mus_messg2                "messag.mp3"
+mus_romer2                "romero.mp3"
+mus_tense                 "tense.mp3"
+mus_shawn3                "shawn.mp3"
+mus_openin                "openin.mp3"
+mus_evil                  "evil.mp3"
+mus_ultima                "ultima.mp3"
+mus_read_m                "read_m.mp3"
+mus_dm2ttl                "dm2ttl.mp3"
+mus_dm2int                "dm2int.mp3"
diff --git a/packages/prboom/prboom-devconfig/prboom.cfg b/packages/prboom/prboom-devconfig/prboom.cfg
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/packages/prboom/prboom-devconfig/prboom.cfg
@@ -0,0 +1 @@
+
diff --git a/packages/prboom/prboom-opie_2.2.6.bb b/packages/prboom/prboom-opie_2.2.6.bb
index 1ab4227619..098bd028cb 100644
--- a/packages/prboom/prboom-opie_2.2.6.bb
+++ b/packages/prboom/prboom-opie_2.2.6.bb
@@ -1,6 +1,6 @@
 include prboom_${PV}.bb
 
-PR = "r5"
+PR = "r6"
 
 S = "${WORKDIR}/prboom-${PV}"
 
diff --git a/packages/python/python-inotify_0.0.6.bb b/packages/python/python-inotify_0.0.6.bb
index 6f74aa32b5..6b5f9fbd75 100644
--- a/packages/python/python-inotify_0.0.6.bb
+++ b/packages/python/python-inotify_0.0.6.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.amautacorp.com/staff/Rudd-O/projects/files/search-services/python-inotify-${PV}.tar.gz"
+SRC_URI = "http://www.vanille.de/mirror/python-inotify-${PV}.tar.gz"
 
 inherit distutils
 
diff --git a/packages/python/python-pymp3_0.3.4.bb b/packages/python/python-pymp3_0.3.4.bb
index a4b5bf4223..b9529b28b4 100644
--- a/packages/python/python-pymp3_0.3.4.bb
+++ b/packages/python/python-pymp3_0.3.4.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "A Curses-based mp3 player. See http://damien.degois.info/PyMP3/"
 SECTION = "console/multimedia"
 PRIORITY = "optional"
-MAINTAINER = "Jason Haslup <openembedded@haslup.com>"
 RDEPENDS = "python-core python-ncurses python-pyid3lib python-mad python-ao"
-PR = "r1"
 LICENSE = "GPL"
-SRC_URI = "http://damien.degois.info/PyMP3/PyMP3-0.3.4.tar.gz"
+PR = "r2"
+
+SRC_URI = "http://www.vanille.de/mirror/PyMP3-0.3.4.tar.gz"
 S = "${WORKDIR}/PyMP3-0.3.4"
 
 PY_FILES = "box_info.py layer.py sound_ctrl.py stack.py txt_tools.py"
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
index c170e4abdc..068d964726 100755
--- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
+++ b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
@@ -27,7 +27,7 @@ vecho() {
 
 # import FS mount options from fstab or use defaults
 # if detection fails
-SD_OPTS="`grep "$MOUNT_POINT" /etc/fstab | awk '{print $4}'`" 
+SD_OPTS="`grep "$MOUNT_POINT" /etc/fstab | head -1 | awk '{print $4}'`" 
 if test -z "$SD_OPTS"
 then
 	SD_OPTS="noatime,sync"
@@ -130,14 +130,14 @@ case "$ACTION" in
 	
 	vecho "Beginning SD auto-mount..:"
 	
-	ps ax > "$LOGFILE-ps"
+	test "$ENABLE_LOG" = yes && ps ax > "$LOGFILE-ps"
 	
 	# Read available partitions from /proc/partitions.
 	OK_PARTS=` head -20 /proc/partitions |grep mmcda | sort| uniq | awk '{print $4}'`
 	
 	decho "OK_PARTS [$OK_PARTS]"
 	
-	echo $OK_PARTS > "$LOGFILE-part"
+	test "$ENABLE_LOG" = yes && echo $OK_PARTS > "$LOGFILE-part"
 	
 	if test "`echo "$OK_PARTS" | wc -l | awk '{print $1}`" -gt 1
 	then
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
index 08dd26de23..d27f018daf 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "CLOSED"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
-PR = "r19"
+PR = "r20"
 
 SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r3.tar.bz2 \
 	   file://sd \
diff --git a/packages/tetex/.mtn2git_empty b/packages/tetex/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tetex/.mtn2git_empty
diff --git a/packages/tetex/files/.mtn2git_empty b/packages/tetex/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tetex/files/.mtn2git_empty
diff --git a/packages/tetex/files/configure.patch b/packages/tetex/files/configure.patch
new file mode 100644
index 0000000000..7a955917df
--- /dev/null
+++ b/packages/tetex/files/configure.patch
@@ -0,0 +1,137 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- tetex-src-3.0/configure~configure.patch
++++ tetex-src-3.0/configure
+@@ -3903,10 +3903,6 @@
+   if test "$with_system_t1lib" = yes; then
+       echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6
+ echo "configure:3906: checking whether installed T1 lib is >= v 5.0.0 " >&5
+-      if test "$cross_compiling" = yes; then
+-  ac_compile_t1lib=1
+-	]
+-else
+   cat > conftest.$ac_ext <<EOF
+ #line 3912 "configure"
+ #include "confdefs.h"
+@@ -3939,15 +3935,7 @@
+ }
+ 	
+ EOF
+-if { (eval echo configure:3943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+   ac_compile_t1lib=0
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  ac_compile_t1lib=1
+-fi
+ rm -fr conftest*
+ fi
+ 
+@@ -3975,7 +3963,6 @@
+     LIBT1DEP=
+     using_system_t1lib=yes
+   fi
+-fi
+ 
+ 
+ 
+--- tetex-src-3.0/libs/configure~configure.patch
++++ tetex-src-3.0/libs/configure
+@@ -1711,10 +1711,6 @@
+   if test "$with_system_t1lib" = yes; then
+       echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6
+ echo "configure:1714: checking whether installed T1 lib is >= v 5.0.0 " >&5
+-      if test "$cross_compiling" = yes; then
+-  ac_compile_t1lib=1
+-	]
+-else
+   cat > conftest.$ac_ext <<EOF
+ #line 1720 "configure"
+ #include "confdefs.h"
+@@ -1747,15 +1743,7 @@
+ }
+ 	
+ EOF
+-if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_compile_t1lib=0
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  ac_compile_t1lib=1
+-fi
++ac_compile_t1lib=0
+ rm -fr conftest*
+ fi
+ 
+@@ -1783,7 +1771,6 @@
+     LIBT1DEP=
+     using_system_t1lib=yes
+   fi
+-fi
+ 
+ 
+ 
+--- tetex-src-3.0/utils/texinfo/configure~configure.patch
++++ tetex-src-3.0/utils/texinfo/configure
+@@ -689,7 +689,7 @@
+ # FIXME: To remove some day.
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+-    cross_compiling=maybe
++    cross_compiling=no
+     echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+     If a cross compiler is detected then cross compile mode will be used." >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+--- tetex-src-3.0/texk/dvipng/configure~configure.patch
++++ tetex-src-3.0/texk/dvipng/configure
+@@ -2642,10 +2642,7 @@
+   if test "$with_system_t1lib" = yes; then
+       echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6
+ echo "configure:2645: checking whether installed T1 lib is >= v 5.0.0 " >&5
+-      if test "$cross_compiling" = yes; then
+-  ac_compile_t1lib=1
+-	]
+-else
++ac_compile_t1lib=0
+   cat > conftest.$ac_ext <<EOF
+ #line 2651 "configure"
+ #include "confdefs.h"
+@@ -2678,14 +2675,7 @@
+ }
+ 	
+ EOF
+-if { (eval echo configure:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_compile_t1lib=0
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  ac_compile_t1lib=1
++ac_compile_t1lib=0
+ fi
+ rm -fr conftest*
+ fi
+@@ -2696,7 +2686,6 @@
+           echo "$ac_t""no, will compile my own version" 1>&6
+ 	  with_system_t1lib=no
+       fi
+-  fi
+ 
+   LDFLAGS=$OLD_LDFLAGS
+   CPP=$OLD_CPP
+@@ -2714,7 +2703,6 @@
+     LIBT1DEP=
+     using_system_t1lib=yes
+   fi
+-fi
+ 
+ 
+ 
diff --git a/packages/tetex/tetex-native_3.0.bb b/packages/tetex/tetex-native_3.0.bb
new file mode 100644
index 0000000000..86f634c892
--- /dev/null
+++ b/packages/tetex/tetex-native_3.0.bb
@@ -0,0 +1,18 @@
+include tetex_${PV}.bb
+inherit native
+
+DEPENDS = ""
+
+do_configure() {
+	oe_runconf
+}
+
+BINARIES = "texk/web2c/tangle utils/texinfo/info/makedoc utils/texinfo/makeinfo/makeinfo"
+
+do_stage() {
+	for binary in ${BINARIES}
+	do
+		install -m 0755 texk/web2c/tangle ${STAGING_BINDIR}
+	done
+}
+
diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb
new file mode 100644
index 0000000000..75f39170b2
--- /dev/null
+++ b/packages/tetex/tetex_3.0.bb
@@ -0,0 +1,77 @@
+DESCRIPTION = "teTeX is a complete TeX distribution for UNIX compatible systems"
+LICENSE = "GPL"
+SECTION = "console/utils"
+DEPENDS = "tetex-native flex gd ncurses libpng t1lib x11 xau xext xt zlib"
+RDEPENDS_tetex = "tetex-data"
+TETEX_BUILDSYSTEM_TAMER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r0"
+
+SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \
+           file://configure.patch;patch=1"
+S = ${WORKDIR}/tetex-src-${PV}
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+export BUILDCC = "${BUILD_CC}"
+export BUILDCFLAGS = "${BUILD_CFLAGS}"
+export BUILDLDFLAGS = "${BUILD_LDFLAGS}"
+export BUILDCCLD = "${BUILD_CC}"
+
+EXTRA_OECONF = "--with-system-libgd \
+		--with-system-ncurses \
+		--with-ncurses-include=${STAGING_INCDIR} \
+		--with-system-pnglib \
+		--with-system-t1lib \
+		--with-system-zlib \
+		--without-dialog \
+		--without-xdvik"
+
+# NOTE:  In theory, teTeX has a good buildsystem, which automatically detects
+#        whether we are cross-compiling and compiles the necessary host tools.
+#        Unfortunately it doesn't work in our case and it looks easier to add
+#        tetex-native for the time being. Cheers, Mickey.
+do_configure () {
+	oe_runconf
+	ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/info
+	ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/makeinfo
+	cat >${S}/utils/texinfo/tools/Makefile <<EOF
+install:
+	echo "done"
+all:
+	echo "done"
+EOF
+}
+
+# NOTE: This is really ugly. Unfortunately the teTeX people seem not to know about PREFIX...
+do_install() {
+	install -d ${D}${bindir}
+	install -d ${D}${libdir}
+	install -d ${D}${datadir}/texmf
+
+	export bindir="${D}${bindir}" \
+	sbindir="${D}${sbindir}" \
+	libexecdir="${D}${libexecdir}" \
+	datadir="${D}${datadir}" \
+	sysconfdir="${D}${sysconfdir}" \
+	sharedstatedir="${D}${sharedstatedir}" \
+	localstatedir="${D}${localstatedir}" \
+	libdir="${D}${libdir}" \
+	includedir="${D}${includedir}" \
+	oldincludedir="${D}${oldincludedir}" \
+	infodir="${D}${infodir}" \
+	mandir="${D}${mandir}" \
+	texmf="${D}${datadir}/texmf" \
+	scriptdir="${D}${bindir}" \
+	web2cdir="${D}${datadir}" \
+	kpathsea="${D}${libdir}/libkpathsea.la" \
+	DESTDIR=""
+	MAKE="make -e" oe_runmake -e install
+}
+
+#
+# FIXME: Package more fine granular
+#
+PACKAGES += "tetex-data"
+FILES_tetex-data = "${datadir}"
diff --git a/packages/totem/totem-0.101/.mtn2git_empty b/packages/totem/totem-0.101/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/totem/totem-0.101/.mtn2git_empty
diff --git a/packages/totem/totem-0.101/include.patch b/packages/totem/totem-0.101/include.patch
new file mode 100644
index 0000000000..6e99c4e21e
--- /dev/null
+++ b/packages/totem/totem-0.101/include.patch
@@ -0,0 +1,11 @@
+--- totem-0.99.15/src/video-utils.c	2004-07-03 16:54:31.000000000 -0700
++++ totem-0.99.15.new/src/video-utils.c	2004-08-04 11:03:30.822669856 -0700
+@@ -4,7 +4,7 @@
+ #include "video-utils.h"
+ 
+ #include <glib/gi18n.h>
+-#include <libintl.h>
++/* #include <libintl.h> */
+ 
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
diff --git a/packages/totem/totem-0.101/omf.patch b/packages/totem/totem-0.101/omf.patch
new file mode 100644
index 0000000000..a889db10ba
--- /dev/null
+++ b/packages/totem/totem-0.101/omf.patch
@@ -0,0 +1,13 @@
+--- totem-0.99.12/omf.make	2003-11-08 18:04:41.000000000 -0700
++++ totem-0.99.12.new/omf.make	2004-06-30 09:39:58.765495480 -0700
+@@ -41,7 +41,9 @@
+ install-data-hook-omf:
+ 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ 	for file in $(omffile); do \
+-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		if [ -f $$file.out ]; then \
++			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		fi; \
+ 	done
+ 	-scrollkeeper-update -o $(DESTDIR)$(omf_dest_dir)
+ 
diff --git a/packages/totem/totem_0.101.bb b/packages/totem/totem_0.101.bb
new file mode 100644
index 0000000000..e78ce09043
--- /dev/null
+++ b/packages/totem/totem_0.101.bb
@@ -0,0 +1,34 @@
+BROKEN = "1"
+# do_configure() broken with:
+# No package 'libnautilus-burn' found
+
+SECTION = "x11/multimedia"
+# totem OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="A GTK2 based media player"
+HOMEPAGE="http://www.hadess.net/totem.php3"
+LICENSE="GPL"
+
+SRC_URI="http://www.hadess.net/files/software/totem/totem-${PV}.tar.gz \
+	file://include.patch;patch=1 \
+	file://omf.patch;patch=1"
+
+DEPENDS="gtk+ libglade gnome-vfs gconf libxine libgnomeui"
+RDEPENDS += " libgnomeui"
+
+inherit autotools
+
+EXTRA_OECONF="--disable-schemas-install --disable-nvtv --enable-gtk --disable-debug --disable-gstreamer --disable-mozilla"
+
+#SELECTED_OPTIMIZATION="-O0 -g"
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+pkg_postinst_totem() {
+#!/bin/sh
+if [ -n "$D"  ]; then exit 1; fi; 
+SOURCE=`gconftool-2 --get-default-source`
+GCONF_CONFIG_SOURCE=$SOURCE gconftool-2 --makefile-install-rule \
+/etc/gconf/schemas/totem.schemas > /dev/null
+}
diff --git a/packages/totem/totem_0.99.15.bb b/packages/totem/totem_0.99.15.bb
index aaf956917f..807eee4023 100644
--- a/packages/totem/totem_0.99.15.bb
+++ b/packages/totem/totem_0.99.15.bb
@@ -7,7 +7,7 @@ DESCRIPTION="A GTK2 based media player"
 HOMEPAGE="http://www.hadess.net/totem.php3"
 LICENSE="GPL"
 
-SRC_URI="http://www.hadess.net/files/software/totem/totem-${PV}.tar.gz \
+SRC_URI="http://ftp.acc.umu.se/pub/GNOME/sources/totem/0.99/totem-${PV}.tar.gz \
 	file://include.patch;patch=1 \
 	file://omf.patch;patch=1"
 
diff --git a/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty b/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/ipaq-pxa270/.mtn2git_empty
diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
new file mode 100644
index 0000000000..72ebcba7c2
--- /dev/null
+++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index b5d073c8e7..535ff89ee4 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -40,7 +40,7 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/profile.d/
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	case ${MACHINE} in
-	h3600 | h3900 | h1940)
+	h3600 | h3900 | h1940 | ipaq-pxa270)
 		install -d ${D}${datadir}/tslib
 		for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200; do
 			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
diff --git a/packages/unionfs/unionfs-1.0.13/.mtn2git_empty b/packages/unionfs/unionfs-1.0.13/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/unionfs/unionfs-1.0.13/.mtn2git_empty
diff --git a/packages/unionfs/unionfs-1.0.13/make.patch b/packages/unionfs/unionfs-1.0.13/make.patch
new file mode 100644
index 0000000000..e2ab28b429
--- /dev/null
+++ b/packages/unionfs/unionfs-1.0.13/make.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- unionfs-1.0.13/Makefile~make
++++ unionfs-1.0.13/Makefile
+@@ -59,7 +59,7 @@
+ unionfs2.4: ${obj-m}
+ 
+ ${obj-m}: ${unionfs-objs}
+-	ld -o ${obj-m} -r ${unionfs-objs}
++	${CC} -o ${obj-m} -r ${unionfs-objs}
+ 
+ unionctl: unionctl.c usercommon.c
+ 	${CC} -o $@ $^ ${UCFLAGS}
diff --git a/packages/unionfs/unionfs-1.0.7/make.patch b/packages/unionfs/unionfs-1.0.7/make.patch
deleted file mode 100644
index 583947e82f..0000000000
--- a/packages/unionfs/unionfs-1.0.7/make.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- unionfs-1.0.7/Makefile~make.patch
-+++ unionfs-1.0.7/Makefile
-@@ -3,10 +3,20 @@
- #
- 
- # this should point to where your kernel headers are
--LINUXSRC = /lib/modules/`uname -r`/build
-+KERNELVER := $(shell uname -r)
-+KERNELMAJVER := $(shell echo ${KERNELVER} | cut -d. -f1,2)
-+LINUXSRC = /lib/modules/${KERNELVER}/build
- TOPINC   = -I${LINUXSRC}/include
-+
- # This is where the make install target will put stuff
--PREFIX   = /usr/local
-+DESTDIR =
-+prefix = /usr/local
-+sbindir = ${prefix}/sbin
-+mandir = ${prefix}/man
-+man4dir = ${mandir}/man4
-+man8dir = ${mandir}/man8
-+moduledir = /lib/modules/${KERNELVER}
-+
- VERSION  = 1.0.7
- TAROPTS = czvf
- 
-@@ -22,8 +32,8 @@
- endif
- 
- CC	= gcc
--KERNELVERSION=$(shell uname -r | cut -d. -f1,2)
--ifeq ($(KERNELVERSION),2.4)
-+LD	= ld
-+ifeq (${KERNELMAJVER},2.4)
- CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror -g ${EXTRACFLAGS} -O2
- endif
- EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Werror -g ${EXTRACFLAGS} -O2
-@@ -35,7 +45,7 @@
- 
- BINS	:=	unionctl uniondbg
- 
--all:	readthereadme unionfs$(KERNELVERSION)
-+all:	readthereadme unionfs$(KERNELMAJVER)
- 
- readthereadme:
- 	@echo "******************************************************************************"
-@@ -43,13 +53,15 @@
- 	@echo "******************************************************************************"
- 	@echo ""
- 
--unionfs2.6: ${BINS}
-+unionfs2.6: unionfs.ko ${BINS}
-+
-+unionfs.ko:
- 	make -C ${LINUXSRC} SUBDIRS=$(PWD) FISTDEVMK=$(PWD)/fistdev.mk modules
- 
- unionfs2.4: ${obj-m} ${BINS}
- 
- ${obj-m}: ${unionfs-objs}
--	ld -o ${obj-m} -r ${unionfs-objs}
-+	${LD} -o ${obj-m} -r ${unionfs-objs}
- 
- unionctl: unionctl.c
- 	${CC} -o $@ $? ${UCFLAGS}
-@@ -74,15 +86,20 @@
- ${unionfs-objs}: unionfs.h fist.h
- 
- install: all
--	mkdir -p ${PREFIX}/sbin
--	cp unionctl ${PREFIX}/sbin
--	cp uniondbg ${PREFIX}/sbin
--	mkdir -p ${PREFIX}/man/man4
--	mkdir -p ${PREFIX}/man/man8
--	cp man/unionfs.4 ${PREFIX}/man/man4
--	cp man/unionctl.8 ${PREFIX}/man/man8
--	cp man/uniondbg.8 ${PREFIX}/man/man8
--	if [ -f unionfs.ko ] ; then cp unionfs.ko /lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o /lib/modules/`uname -r`/kernel/fs ; fi
-+	mkdir -p ${DESTDIR}${sbindir}
-+	cp unionctl ${DESTDIR}${sbindir}
-+	cp uniondbg ${DESTDIR}${sbindir}
-+	mkdir -p ${DESTDIR}${man4dir}
-+	mkdir -p ${DESTDIR}${man8dir}
-+	cp man/unionfs.4 ${DESTDIR}${man4dir}
-+	cp man/unionctl.8 ${DESTDIR}${man8dir}
-+	cp man/uniondbg.8 ${DESTDIR}${man8dir}
-+	mkdir -p ${DESTDIR}${moduledir}/kernel/fs
-+ifeq (${KERNELMAJVER},2.4)
-+	cp unionfs.o ${DESTDIR}${moduledir}/kernel/fs
-+else
-+	cp unionfs.ko ${DESTDIR}${moduledir}/kernel/fs
-+endif
- 
- 
- release: unionfs-${VERSION}.tar.gz
diff --git a/packages/unionfs/unionfs-1.0.8/make.patch b/packages/unionfs/unionfs-1.0.8/make.patch
deleted file mode 100644
index ab77b527d5..0000000000
--- a/packages/unionfs/unionfs-1.0.8/make.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: unionfs-1.0.8/Makefile
-===================================================================
---- unionfs-1.0.8.orig/Makefile	2005-01-19 10:03:24.000000000 -0500
-+++ unionfs-1.0.8/Makefile	2005-01-19 11:30:15.372348104 -0500
-@@ -3,10 +3,20 @@
- #
- 
- # this should point to where your kernel headers are
--LINUXSRC = /lib/modules/`uname -r`/build
-+KERNELVER := $(shell uname -r)
-+KERNELMAJVER := $(shell echo ${KERNELVER} | cut -d. -f1,2)
-+LINUXSRC = /lib/modules/${KERNELVER}/build
- TOPINC   = -I${LINUXSRC}/include
-+
- # This is where the make install target will put stuff
--PREFIX   = /usr/local
-+DESTDIR =
-+prefix = /usr/local
-+sbindir = ${prefix}/sbin
-+mandir = ${prefix}/man
-+man4dir = ${mandir}/man4
-+man8dir = ${mandir}/man8
-+moduledir = /lib/modules/${KERNELVER}
-+
- VERSION  = 1.0.8
- TAROPTS = czvf
- UNIONFS_DEBUG_CFLAG = -g
-@@ -24,8 +34,8 @@
- endif
- 
- CC	= gcc
--KERNELVERSION=$(shell uname -r | cut -d. -f1,2)
--ifeq ($(KERNELVERSION),2.4)
-+LD	= ld
-+ifeq (${KERNELMAJVER},2.4)
- CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG} 
- endif
- EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Werror ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG}
-@@ -37,7 +47,7 @@
- 
- BINS	:=	unionctl uniondbg
- 
--all:	readthereadme unionfs$(KERNELVERSION)
-+all:	readthereadme unionfs$(KERNELMAJVER)
- 
- readthereadme:
- 	@echo "******************************************************************************"
-@@ -45,13 +55,15 @@
- 	@echo "******************************************************************************"
- 	@echo ""
- 
--unionfs2.6: ${BINS}
-+unionfs2.6: unionfs.ko ${BINS}
-+
-+unionfs.ko:
- 	make -C ${LINUXSRC} SUBDIRS=$(PWD) FISTDEVMK=$(PWD)/fistdev.mk modules
- 
- unionfs2.4: ${obj-m} ${BINS}
- 
- ${obj-m}: ${unionfs-objs}
--	ld -o ${obj-m} -r ${unionfs-objs}
-+	${LD} -o ${obj-m} -r ${unionfs-objs}
- 
- unionctl: unionctl.c
- 	${CC} -o $@ $? ${UCFLAGS}
-@@ -76,15 +88,20 @@
- ${unionfs-objs}: unionfs.h fist.h
- 
- install: all
--	mkdir -p ${PREFIX}/sbin
--	cp unionctl ${PREFIX}/sbin
--	cp uniondbg ${PREFIX}/sbin
--	mkdir -p ${PREFIX}/man/man4
--	mkdir -p ${PREFIX}/man/man8
--	cp man/unionfs.4 ${PREFIX}/man/man4
--	cp man/unionctl.8 ${PREFIX}/man/man8
--	cp man/uniondbg.8 ${PREFIX}/man/man8
--	if [ -f unionfs.ko ] ; then cp unionfs.ko /lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o /lib/modules/`uname -r`/kernel/fs ; fi
-+	mkdir -p ${DESTDIR}${sbindir}
-+	cp unionctl ${DESTDIR}${sbindir}
-+	cp uniondbg ${DESTDIR}${sbindir}
-+	mkdir -p ${DESTDIR}${man4dir}
-+	mkdir -p ${DESTDIR}${man8dir}
-+	cp man/unionfs.4 ${DESTDIR}${man4dir}
-+	cp man/unionctl.8 ${DESTDIR}${man8dir}
-+	cp man/uniondbg.8 ${DESTDIR}${man8dir}
-+	mkdir -p ${DESTDIR}${moduledir}/kernel/fs
-+ifeq (${KERNELMAJVER},2.4)
-+	cp unionfs.o ${DESTDIR}${moduledir}/kernel/fs
-+else
-+	cp unionfs.ko ${DESTDIR}${moduledir}/kernel/fs
-+endif
- 
- 
- release: unionfs-${VERSION}.tar.gz
diff --git a/packages/unionfs/unionfs-1.0.9/make.patch b/packages/unionfs/unionfs-1.0.9/make.patch
deleted file mode 100644
index 573ae55a43..0000000000
--- a/packages/unionfs/unionfs-1.0.9/make.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: unionfs-1.0.9/Makefile
-===================================================================
---- unionfs-1.0.9.orig/Makefile	2005-02-20 16:27:43.000000000 -0600
-+++ unionfs-1.0.9/Makefile	2005-02-20 16:31:36.000000000 -0600
-@@ -3,11 +3,19 @@
- #
- 
- # this should point to where your kernel headers are
--LINUXSRC = /lib/modules/`uname -r`/build
-+KERNELVER := $(shell uname -r)
-+KERNELMAJVER := $(shell echo ${KERNELVER} | cut -d. -f1,2)
-+LINUXSRC = /lib/modules/${KERNELVER}/build
- TOPINC   = -I${LINUXSRC}/include
- # This is where the make install target will put stuff
--PREFIX   = /usr/local
--MODPREFIX=
-+DESTDIR =
-+prefix = /usr/local
-+sbindir = ${prefix}/sbin
-+mandir = ${prefix}/man
-+man4dir = ${mandir}/man4
-+man8dir = ${mandir}/man8
-+moduledir = /lib/modules/${KERNELVER}
-+
- VERSION  = 1.0.9
- TAROPTS = czvf
- UNIONFS_DEBUG_CFLAG = -g
-@@ -25,8 +33,8 @@
- endif
- 
- CC	= gcc
--KERNELVERSION=$(shell uname -r | cut -d. -f1,2)
--ifeq ($(KERNELVERSION),2.4)
-+LD	= ld
-+ifeq (${KERNELMAJVER},2.4)
- CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Wno-unused-label -Werror -fno-strict-aliasing ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG} 
- endif
- EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -Wall -Werror -fno-strict-aliasing ${EXTRACFLAGS} ${UNIONFS_DEBUG_CFLAG} ${UNIONFS_OPT_CFLAG}
-@@ -39,7 +47,7 @@
- 
- BINS	:=	unionctl uniondbg
- 
--all:	readthereadme unionfs$(KERNELVERSION)
-+all:	readthereadme unionfs$(KERNELMAJVER)
- 
- readthereadme:
- 	@echo "******************************************************************************"
-@@ -47,13 +55,15 @@
- 	@echo "******************************************************************************"
- 	@echo ""
- 
--unionfs2.6: ${BINS}
-+unionfs2.6: unionfs.ko ${BINS}
-+
-+unionfs.ko:
- 	make -C ${LINUXSRC} SUBDIRS=$(PWD) FISTDEVMK=$(PWD)/fistdev.mk modules
- 
- unionfs2.4: ${obj-m} ${BINS}
- 
- ${obj-m}: ${unionfs-objs}
--	ld -o ${obj-m} -r ${unionfs-objs}
-+	${LD} -o ${obj-m} -r ${unionfs-objs}
- 
- unionctl: unionctl.c
- 	${CC} -o $@ $? ${UCFLAGS}
-@@ -78,23 +88,32 @@
- ${unionfs-objs}: unionfs.h fist.h
- 
- install: all
--	mkdir -p ${PREFIX}/sbin
--	cp unionctl ${PREFIX}/sbin
--	cp uniondbg ${PREFIX}/sbin
--	mkdir -p ${PREFIX}/man/man4
--	mkdir -p ${PREFIX}/man/man8
--	cp man/unionfs.4 ${PREFIX}/man/man4
--	cp man/unionctl.8 ${PREFIX}/man/man8
--	cp man/uniondbg.8 ${PREFIX}/man/man8
--	if [ -f unionfs.ko ] ; then cp unionfs.ko ${MODPREFIX}/lib/modules/`uname -r`/kernel/fs ; else cp unionfs.o ${MODPREFIX}/lib/modules/`uname -r`/kernel/fs ; fi
-+	mkdir -p ${DESTDIR}${sbindir}
-+	cp unionctl ${DESTDIR}${sbindir}
-+	cp uniondbg ${DESTDIR}${sbindir}
-+	mkdir -p ${DESTDIR}${man4dir}
-+	mkdir -p ${DESTDIR}${man8dir}
-+	cp man/unionfs.4 ${DESTDIR}${man4dir}
-+	cp man/unionctl.8 ${DESTDIR}${man8dir}
-+	cp man/uniondbg.8 ${DESTDIR}${man8dir}
-+	mkdir -p ${DESTDIR}${moduledir}/kernel/fs
-+ifeq (${KERNELMAJVER},2.4)
-+	cp unionfs.o ${DESTDIR}${moduledir}/kernel/fs
-+else
-+	cp unionfs.ko ${DESTDIR}${moduledir}/kernel/fs
-+endif
- 
- uninstall:
--	if [ -f unionfs.ko ] ; then rm /lib/modules/`uname -r`/kernel/fs/unionfs.ko ; else rm /lib/modules/`uname -r`/kernel/fs/unionfs.o ; fi
--	rm ${PREFIX}/man/man8/unionctl.8
--	rm ${PREFIX}/man/man8/uniondbg.8
--	rm ${PREFIX}/man/man4/unionfs.4
--	rm ${PREFIX}/sbin/unionctl
--	rm ${PREFIX}/sbin/uniondbg
-+ifeq (${KERNELMAJVER},2.4)
-+	rm ${DESTDIR}${moduledir}/kernel/fs/unionfs.o
-+else
-+	rm ${DESTDIR}${moduledir}/kernel/fs/unionfs.ko
-+endif
-+	rm ${DESTDIR}${man8dir}/unionctl.8
-+	rm ${DESTDIR}${man8dir}/uniondbg.8
-+	rm ${DESTDIR}${man4dir}/unionfs.4
-+	rm ${DESTDIR}${sbindir}/unionctl
-+	rm ${DESTDIR}${sbindir}/uniondbg
- 
- release: unionfs-${VERSION}.tar.gz
- 
diff --git a/packages/unionfs/unionfs-modules_1.0.13.bb b/packages/unionfs/unionfs-modules_1.0.13.bb
index 2ff8ff588c..8083bddf67 100644
--- a/packages/unionfs/unionfs-modules_1.0.13.bb
+++ b/packages/unionfs/unionfs-modules_1.0.13.bb
@@ -5,5 +5,6 @@ include unionfs-modules.inc
 KERNEL_MAJMIN = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')[:3]}"
 
 do_compile() {
+	unset LDFLAGS
 	oe_runmake unionfs${KERNEL_MAJMIN}
 }
diff --git a/packages/unionfs/unionfs-modules_1.0.7.bb b/packages/unionfs/unionfs-modules_1.0.7.bb
deleted file mode 100644
index ff5e37819a..0000000000
--- a/packages/unionfs/unionfs-modules_1.0.7.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include unionfs-modules.inc
-include unionfs_${PV}.inc
-
-PR = "r3"
diff --git a/packages/unionfs/unionfs-modules_1.0.8.bb b/packages/unionfs/unionfs-modules_1.0.8.bb
deleted file mode 100644
index ff5e37819a..0000000000
--- a/packages/unionfs/unionfs-modules_1.0.8.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include unionfs-modules.inc
-include unionfs_${PV}.inc
-
-PR = "r3"
diff --git a/packages/unionfs/unionfs-modules_1.0.9.bb b/packages/unionfs/unionfs-modules_1.0.9.bb
deleted file mode 100644
index 5858b7994f..0000000000
--- a/packages/unionfs/unionfs-modules_1.0.9.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include unionfs-modules.inc
-include unionfs_${PV}.inc
diff --git a/packages/unionfs/unionfs-utils_1.0.7.bb b/packages/unionfs/unionfs-utils_1.0.7.bb
deleted file mode 100644
index 8d97fc7466..0000000000
--- a/packages/unionfs/unionfs-utils_1.0.7.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include unionfs-utils.inc
-include unionfs_${PV}.inc
-
-PR = "r3"
diff --git a/packages/unionfs/unionfs-utils_1.0.8.bb b/packages/unionfs/unionfs-utils_1.0.8.bb
deleted file mode 100644
index 8d97fc7466..0000000000
--- a/packages/unionfs/unionfs-utils_1.0.8.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include unionfs-utils.inc
-include unionfs_${PV}.inc
-
-PR = "r3"
diff --git a/packages/unionfs/unionfs-utils_1.0.9.bb b/packages/unionfs/unionfs-utils_1.0.9.bb
deleted file mode 100644
index bbca67a3b7..0000000000
--- a/packages/unionfs/unionfs-utils_1.0.9.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include unionfs-utils.inc
-include unionfs_${PV}.inc
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index efb80ae9be..3caa8cb70f 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -2,6 +2,9 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
+BROKEN = "1"
+# upstream is at 4.22 now - patches do not apply
+
 SRC_URI="http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
 	file://fixes.patch;patch=1 \
 	file://configure.patch;patch=1 \
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 534772e91f..53b704e362 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -42,9 +42,11 @@ SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1 \
                           file://disable-apm.patch;patch=1"
 SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
 SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1"
+SRC_URI_append_ipaq-pxa270 = " file://disable-apm.patch;patch=1"
 
 PACKAGE_ARCH_poodle = "poodle"
 PACKAGE_ARCH_c7x0 = "c7x0"
+PACKAGE_ARCH_ipaq-pxa270 = "ipaq-pxa270"
 
 S = "${WORKDIR}/xserver"
author	Rene Wagner <rw@handhelds.org>	2005-08-02 11:43:25 +0000
committer	OpenEmbedded Project <openembedded-devel@lists.openembedded.org>	2005-08-02 11:43:25 +0000
commit	fec6d9b12d01c5a1c450108ffb838335862a4051 (patch)
tree	1304c6e8f62cb2989e781ea73bdc848c5f00d125 /packages
parent	a4dc9b83d233a7b07e920e0eeceffdcf2053ab02 (diff)
parent	0bef08582a7aa3378ba6cb4d1899dd9ae7267483 (diff)