merge of 2653a4b40327fa4b9850b64660c0b840a53b9e4d

     and 7d7a212e875a69547a4ab175f18225661a30c5ce

98 files changed, 2491 insertions, 2472 deletions

diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 3c88b2ac63..168b7dec4e 100644
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -1,5 +1,5 @@
 def tinder_tz_offset(off):
-    # get the offset. Either it is a number like
+    # get the offset.n minutes Either it is a number like
     # +200 or -300
     try:
         return int(off)
@@ -42,9 +42,16 @@ def tinder_send_http(da, header, log):
     import httplib, urllib
     cont = "\n%s\n%s" % ( header, log)
     headers = {"Content-type": "multipart/form-data" }
+    print cont
 
     conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True))
     conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers)
+
+    resp = conn.getresponse()
+    print resp.status, resp.reason
+    data = resp.read()
+    print data
+
     conn.close() 
 
 
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 6457d89226..8719894e6a 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -15,7 +15,9 @@ ${PKGDIR}/packages/bluez-utils/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
+${PKGDIR}/packages/ccxstream/*.bb \
 ${PKGDIR}/packages/coreutils/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/cron/*.bb \
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index b76d352b8a..c6575241ba 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -14,7 +14,9 @@ ${PKGDIR}/packages/bluez-utils/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
+${PKGDIR}/packages/ccxstream/*.bb \
 ${PKGDIR}/packages/coreutils/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/cron/*.bb \
@@ -129,6 +131,7 @@ ${PKGDIR}/packages/sudo/*.bb \
 ${PKGDIR}/packages/sysfsutils/*.bb \
 ${PKGDIR}/packages/sysvinit/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
+${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
 ${PKGDIR}/packages/uclibc/*.bb \
 ${PKGDIR}/packages/unionfs/*.bb \
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index 24a1e202f1..791abd2103 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,7 +1,9 @@
 IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
 
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6 atmelwlandriver"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 567cee8ba1..fc61ba4f6a 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the IBM Netvista thin client
 
 TARGET_ARCH = "i386"
-IPKG_ARCHS = "all i386 ${MACHINE}"
+IPKG_ARCHS = "all i386"
 PREFERRED_PROVIDER_xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace"
@@ -17,6 +17,8 @@ TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
 IMAGE_FSTYPE = "ext2"
 GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
 
 #BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
 #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 7a39104c63..c928093855 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -11,10 +11,8 @@ XSERVER = "xserver-kdrive-omap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
-
-include conf/machine/handheld-common.conf
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/tune-arm926ejs.conf
@@ -32,10 +30,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
 #build omap1 till nokia releases the patches
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils  nokia770-init \
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils  nokia770-init \
 pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils  nokia770-init \
+BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
 pcmcia-cs apm  ppp wireless-tools console-tools"
 
 # NFS Modules
@@ -56,3 +54,7 @@ pcmcia-cs apm  ppp wireless-tools console-tools"
 #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
 #							 kernel-module-g-ether"
 
+include conf/machine/handheld-common.conf
+
+
+
diff --git a/packages/hdparm/hdparm-5.4/.mtn2git_empty b/packages/bwmon/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.4/.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..26c620e013
--- /dev/null
+++ b/packages/bwmon/bwmon_1.3.bb
@@ -0,0 +1,17 @@
+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 -d ${D}${bindir}
+	install ${S}/bwmon ${D}${bindir}/bwmon
+}
diff --git a/packages/hdparm/hdparm-5.8/.mtn2git_empty b/packages/bwmon/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.8/.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/ccxstream/ccxstream_1.0.15.bb b/packages/ccxstream/ccxstream_1.0.15.bb
index 751e0412c5..cc42d895ca 100644
--- a/packages/ccxstream/ccxstream_1.0.15.bb
+++ b/packages/ccxstream/ccxstream_1.0.15.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "XStream Server"
-
+DEPENDS = "readline"
 LICENSE = "GPL-2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \
 	file://ccxstream-termcap.patch;patch=1 \
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/nonworking/tetex/.mtn2git_empty b/packages/flex/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/tetex/.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/nonworking/tetex/tetex-2.0.2/.mtn2git_empty b/packages/gcc/gcc-cross-kernel-3.4.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/tetex/tetex-2.0.2/.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/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/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-dm/files/Xserver-spitz.patch b/packages/gpe-dm/files/Xserver-spitz.patch
new file mode 100644
index 0000000000..f30b705d13
--- /dev/null
+++ b/packages/gpe-dm/files/Xserver-spitz.patch
@@ -0,0 +1,11 @@
+--- gpe-dm-0.47/Xserver~	2005-07-29 11:58:59.000000000 -0700
++++ gpe-dm-0.47/Xserver	2005-08-01 11:20:42.000000000 -0700
+@@ -62,6 +62,8 @@
+ 		;;
+ 	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ 		ARGS="$ARGS -rgba rgb" ;;
++	"SHARP Spitz")
++		ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
+ 	"Simpad")
+ 		ARGS="$ARGS -rgba rgb" ;;
+ 	"Generic OMAP1510/1610/1710")
diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb
index a98220547e..5f87b3ce6a 100644
--- a/packages/gpe-dm/gpe-dm_0.47.bb
+++ b/packages/gpe-dm/gpe-dm_0.47.bb
@@ -6,9 +6,10 @@ SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0"
-PR = "r1"
+PR = "r2"
 
 INITSCRIPT_NAME = "gpe-dm"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
-SRC_URI += "file://collie-suspend-hack.patch;patch=1"
+SRC_URI += "file://collie-suspend-hack.patch;patch=1 \
+            file://Xserver-spitz.patch;patch=1"
diff --git a/packages/gpe-life/gpe-life_0.1.bb b/packages/gpe-life/gpe-life_0.2.bb
index c9efc27f64..c9efc27f64 100644
--- a/packages/gpe-life/gpe-life_0.1.bb
+++ b/packages/gpe-life/gpe-life_0.2.bb
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
index 5dcf78cb0d..2745e5f8a9 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb
@@ -1,9 +1,9 @@
-PR = "r0"
+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"
+DEPENDS = "osb-nrcit libgpewidget"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
 
diff --git a/packages/gqview/.mtn2git_empty b/packages/gqview/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gqview/.mtn2git_empty
diff --git a/packages/gqview/gqview-2.1.1/.mtn2git_empty b/packages/gqview/gqview-2.1.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gqview/gqview-2.1.1/.mtn2git_empty
diff --git a/packages/gqview/gqview-2.1.1/include-path-fix.patch b/packages/gqview/gqview-2.1.1/include-path-fix.patch
new file mode 100644
index 0000000000..614c69a2c3
--- /dev/null
+++ b/packages/gqview/gqview-2.1.1/include-path-fix.patch
@@ -0,0 +1,11 @@
+--- gqview-2.1.1/src/Makefile.am.orig	2005-08-02 10:27:57.883396232 +0000
++++ gqview-2.1.1/src/Makefile.am	2005-08-02 10:28:19.032181128 +0000
+@@ -3,7 +3,7 @@
+ 
+ INCLUDES = -I$(srcdir) -I$(builddir)    \
+ 	-I$(top_srcdir) -I$(top_builddir)       \
+-	-I$(includedir) $(GTK_CFLAGS)
++	$(GTK_CFLAGS)
+ 
+ module_SLIK = \
+ 	intl.h		\
diff --git a/packages/gqview/gqview_2.1.1.bb b/packages/gqview/gqview_2.1.1.bb
new file mode 100644
index 0000000000..83f9de44e2
--- /dev/null
+++ b/packages/gqview/gqview_2.1.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A gtk based image viewer"
+SECTION = "x11/graphics"
+DEPENDS = "gtk+"
+LICENSE = "GPL"
+HOMEPAGE = "http://gqview.sourceforge.net/"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gqview/gqview-2.1.1.tar.gz \
+	   file://include-path-fix.patch;patch=1"
+
+inherit autotools
+
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/gtk-webcore/osb-jscore_20050430.bb b/packages/gtk-webcore/osb-jscore_20050430.bb
index 963f603ca3..d7bf8cb7a1 100644
--- a/packages/gtk-webcore/osb-jscore_20050430.bb
+++ b/packages/gtk-webcore/osb-jscore_20050430.bb
@@ -7,6 +7,7 @@ SECTION = "gpe"
 
 FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDCVSDATE}"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDCVSDATE} \
            file://libm.patch;patch=1"
@@ -14,6 +15,9 @@ S = "${WORKDIR}/JavaScriptCore"
 
 inherit autotools pkgconfig
 
+# zap CPPFLAGS to avoid trouble with internal vs. pcre from staging
+CPPFLAGS = ""
+
 do_configure () {
 	autotools_do_configure
 	cd ${S}
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/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.bb b/packages/initscripts/initscripts_1.0.bb
index 5e7d6fe44c..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 = "r52"
+PR = "r53"
 
 SRC_URI = "file://halt \
            file://ramdisk \
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/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/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-packages.bb b/packages/meta/openslug-packages.bb
index 802fc64b6c..7e248bc60e 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -54,6 +54,8 @@ OPENSLUG_PACKAGES = "\
 	bash \
 	bluez-utils-nodbus \
 	bridge-utils \
+	bwmon \
+	ccxstream \
 	coreutils \
 	cron \
 	cvs\
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/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/openntpd/files/init b/packages/openntpd/files/init
index 768f8f1b8f..caf010c8ca 100644
--- a/packages/openntpd/files/init
+++ b/packages/openntpd/files/init
@@ -11,7 +11,7 @@ test -x "$ntpd" || exit 0
 case "$1" in
   start)
     echo "Starting openntpd"
-    start-stop-daemon --start --quiet --exec $ntpd
+    start-stop-daemon --start --quiet --exec $ntpd -- -s
     ;;
   stop)
     echo "Stopping openntpd"
@@ -26,7 +26,7 @@ case "$1" in
     start-stop-daemon --stop --quiet --exec $ntpd
     sleep 1
     echo "Starting openntpd"
-    start-stop-daemon --start --quiet --exec $ntpd
+    start-stop-daemon --start --quiet --exec $ntpd -- -s
     ;;
   *)
     echo "Usage: /etc/init.d/openntpd {start|stop|reload|restart|force-reload}"
diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb
index 0c2091160f..1f571833aa 100644
--- a/packages/openntpd/openntpd_3.7p1.bb
+++ b/packages/openntpd/openntpd_3.7p1.bb
@@ -5,7 +5,8 @@ HOMEPAGE = "http://www.openntpd.org/"
 LICENSE = "BSD"
 SECTION = "console/network"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-PR="r2"
+DEPENDS = "timezones"
+PR="r4"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \
 	   file://autofoo.patch;patch=1 \
@@ -26,7 +27,6 @@ do_install_prepend() {
 
 do_install_append() {
 	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openntpd
-	install -d ${D}${localstatedir}/shared/empty
 }
 
 pkg_postrm () {
@@ -35,5 +35,6 @@ pkg_postrm () {
 
 pkg_postinst () {
 	grep ntpd /etc/passwd || adduser --disabled-password --home=/var/shared/empty --ingroup nogroup ntpd
+	chown root:root /var/shared/empty
 }
 	
diff --git a/packages/perl/perl-5.8.7/config.sh-i386-linux b/packages/perl/perl-5.8.7/config.sh-i386-linux
new file mode 100644
index 0000000000..fda13d0d9b
--- /dev/null
+++ b/packages/perl/perl-5.8.7/config.sh-i386-linux
@@ -0,0 +1,1026 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Wed Mar  9 04:09:49 CST 2005
+# Configured by     : kergoth
+# Target system     : linux hyperion 2.6.11-ck1 #1 wed mar 2 23:48:21 cst 2005 i386 gnulinux 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='4'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+api_version='8'
+api_versionstring='5.8.0'
+ar='ar'
+archlib='/usr/lib/perl5/5.8.4/i386-linux'
+archlibexp='/usr/lib/perl5/5.8.4/i386-linux'
+archname64=''
+archname='i386-linux'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison='bison'
+byacc='byacc'
+byteorder='1234'
+c=''
+castflags='0'
+cat='cat'
+cc='cc'
+cccdlflags='-fpic'
+ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.4/i386-linux/CORE'
+ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols='__GNUC_PATCHLEVEL__=5'
+ccversion=''
+cf_by='kergoth'
+cf_email='kergoth@hyperion.kergoth.com'
+cf_time='Wed Mar  9 04:09:49 CST 2005'
+charsize='1'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols='__GNUC__=3 __GNUC_MINOR__=3'
+cppflags='-fno-strict-aliasing -I/usr/local/include'
+cpplast='-'
+cppminus='-'
+cpprun='cc -E'
+cppstdin='cc -E'
+cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=3 __GNU_LIBRARY__=6 i386=1 __i386=1 __i386__=1 __i486=1 __i486__=1 _LARGEFILE_SOURCE=1 linux=1 __linux=1 __linux__=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 __STDC__=1 unix=1 __unix=1 __unix__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='gcvt((x),(n),(b))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='define'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribut='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_bzero='define'
+d_casti32='undef'
+d_castneg='define'
+d_charvspr='define'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='define'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime='define'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='define'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='define'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime_r='undef'
+d_gnulibc='define'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='define'
+d_index='undef'
+d_inetaton='define'
+d_int64_t='define'
+d_isascii='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='define'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime_r='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='define'
+d_modfl_pow32_bug='undef'
+d_modflproto='undef'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_procselfexe='define'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='define'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='define'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sockatmark='define'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sqrtl='define'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='define'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+dynamic_ext='attrs B ByteLoader Cwd Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog threads Time/HiRes Unicode/Normalize XS/APItest XS/Typemap threads/shared'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='attrs B ByteLoader Cwd Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog threads Time/HiRes Unicode/Normalize XS/APItest XS/Typemap threads/shared Errno'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='16'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='/usr/bin/ar'
+full_csh='csh'
+full_sed='/bin/sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='3.3.5 (Debian 1:3.3.5-6)'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version='2.3.2'
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='char'
+i_arpainet='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='undef'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='undef'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+installarchlib='./install_me_here/usr/lib/perl5/5.8.4/i386-linux'
+installbin='./install_me_here/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir='./install_me_here/usr/share/man/man1'
+installman3dir='./install_me_here/usr/share/man/man3'
+installprefix='./install_me_here/usr'
+installprefixexp='./install_me_here/usr'
+installprivlib='./install_me_here/usr/lib/perl5/5.8.4'
+installscript='./install_me_here/usr/bin'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/i386-linux'
+installsitebin='./install_me_here/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4'
+installsiteman1dir='./install_me_here/usr/share/man/man1'
+installsiteman3dir='./install_me_here/usr/share/man/man3'
+installsitescript='./install_me_here/usr/bin'
+installstyle='./install_me_herelib/perl5'
+installusrbinperl='undef'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='/usr/bin/test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='attrs B ByteLoader Cwd Data/Dumper DB_File Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread threads Time/HiRes Unicode/Normalize XS/APItest XS/Typemap threads/shared'
+ksh=''
+ld='cc'
+lddlflags='-shared -L/usr/local/lib'
+ldflags=' -L/usr/local/lib'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc='/lib/libc-2.3.2.so'
+libperl='libperl.so'
+libpth='/usr/local/lib /lib /usr/lib'
+libs='-ldl -lm -lc -lcrypt'
+libsdirs=' /usr/lib'
+libsfiles=' libdl.so libm.so libc.so libcrypt.so'
+libsfound=' /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libc.so /usr/lib/libcrypt.so'
+libspath=' /usr/local/lib /lib /usr/lib'
+libswanted='gdbm gdbm_compat db dl m c crypt'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+longdblsize='12'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir='/usr/share/man/man1'
+man1direxp='/usr/share/man/man1'
+man1ext='1'
+man3dir='/usr/share/man/man3'
+man3direxp='/usr/share/man/man3'
+man3ext='3'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='i386-linux'
+mydomain='.kergoth.com'
+myhostname='hyperion'
+myuname='linux hyperion 2.6.11-ck1 #1 wed mar 2 23:48:21 cst 2005 i386 gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nonxs_ext='Errno'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='2.6.11-ck1'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+patchlevel='8'
+path_sep=':'
+perl5='hostperl'
+perl=''
+perl_patchlevel=''
+perladmin=''
+perllibs='-ldl -lm -lc -lcrypt'
+perlpath='hostperl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+privlib='/usr/lib/perl5/5.8.4'
+privlibexp='/usr/lib/perl5/5.8.4'
+procselfexe='"/proc/self/exe"'
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rmail=''
+run=''
+runnm='false'
+sPRIEUldbl='"LE"'
+sPRIFUldbl='"LF"'
+sPRIGUldbl='"LG"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"Le"'
+sPRIfldbl='"Lf"'
+sPRIgldbl='"Lg"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"Lf"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='65'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 RTMIN NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "RTMIN", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
+sig_size='69'
+signal_t='void'
+sitearch='/usr/lib/perl5/site_perl/5.8.4/i386-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.8.4/i386-linux'
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib='/usr/lib/perl5/site_perl/5.8.4'
+sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp='/usr/lib/perl5/site_perl/5.8.4'
+siteman1dir='/usr/share/man/man1'
+siteman1direxp='/usr/share/man/man1'
+siteman3dir='/usr/share/man/man3'
+siteman3direxp='/usr/share/man/man3'
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_IO_read_base)'
+stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)'
+stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_IO_read_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+strings='/usr/include/string.h'
+submit=''
+subversion='4'
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+targetarch=''
+tbl=''
+tee=''
+test='test'
+timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='undef'
+usedl='define'
+usefaststdio='define'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='false'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+usesfio='false'
+useshrplib='true'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+usevfork='false'
+usrinc='/usr/include'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+version='5.8.4'
+version_patchlevel_string='version 8 subversion 4'
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='./Configure'
+config_args=''
+config_argc=0
+PERL_REVISION=5
+PERL_VERSION=8
+PERL_SUBVERSION=4
+PERL_API_REVISION=5
+PERL_API_VERSION=8
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=
+PERL_CONFIG_SH=true
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index babeea3e9a..3500ca57bd 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -2,9 +2,10 @@ MAINTAINER="David Karlstrom <daka@thg.se>"
 
 include perl.inc
 
-SRC_URI += "file://config.sh-armeb-linux"
+SRC_URI += "file://config.sh-armeb-linux \
+	    file://config.sh-i386-linux"
 
-PR = "r9"
+PR = "r10"
 
 do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
@@ -14,6 +15,7 @@ do_configure() {
 	cp ${WORKDIR}/Makefile.SH.patch .
 	cp ${WORKDIR}/config.sh-mipsel-linux .
 	cp ${WORKDIR}/config.sh-i686-linux .
+	cp ${WORKDIR}/config.sh-i386-linux .
 	cp ${WORKDIR}/config.sh-armeb-linux .
 	for i in config.sh-*-linux; do
 		a="`echo $i|sed -e 's,^config.sh-,,; s,-linux$,,'`"
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..b4b68bed5c
--- /dev/null
+++ b/packages/tetex/tetex-native_3.0.bb
@@ -0,0 +1,23 @@
+include tetex_${PV}.bb
+inherit native
+DEPENDS = ""
+PR = "r1"
+
+do_configure() {
+	oe_runconf
+}
+
+BINARIES = "texk/web2c/tangle \
+            texk/web2c/ctangle \
+            texk/web2c/otangle \
+            texk/web2c/tie \
+            utils/texinfo/info/makedoc \
+            utils/texinfo/makeinfo/makeinfo"
+
+do_stage() {
+	for binary in ${BINARIES}
+	do
+		install -m 0755 $binary ${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/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"