--- devboard-R2_01.18/configure-files/devboard/devboard-tag--devboard-R2_01	2008-01-03 10:22:16.000000000 +0100
+++ devboard-R2_01/configure-files/devboard/devboard-tag--devboard-R2_01	2009-07-09 11:49:40.000000000 +0200
@@ -339,6 +339,39 @@
 	sub_no_fetch apps/libusb
 fi
 
+if [ "$AXIS_CONFIG_NTPCLIENT" = "y" ]; then
+  sub apps/ntpclient rev=IR2000_339-1
+  sub packages/initscripts/ntpclient rev=R1_0_0
+fi
+
+if [ "$AXIS_CONFIG_TEMPLOGGERD" = "y" ]; then
+  sub apps/temploggerd rev=IR1_3_8-1
+fi
+
+if [ "$AXIS_CONFIG_RRDTOOL" = "y" ]; then
+  sub packages/apps/rrdtool rev=R1_0_0
+fi
+
+if [ "$AXIS_CONFIG_KMODFUSE" = "y" ]; then
+  sub apps/kmod-fuse rev=IR2_5_3-1
+fi
+
+if [ "$AXIS_CONFIG_FUSE" = "y" ]; then
+  sub apps/fuse rev=IR2_5_3-1
+fi
+
+if [ "$AXIS_CONFIG_OWLIB" = "y" -o "$AXIS_CONFIG_OWNETLIB" = "y" -o "$AXIS_CONFIG_OWSHELL" = "y" ]; then
+  sub apps/owfs rev=IR2_7_23-5
+fi
+
+if [ "$AXIS_CONFIG_OWCAPIEXAMPLE" = "y" ]; then
+  sub apps/owcapi-example rev=IR2_7_23-5
+fi
+
+if [ "$AXIS_CONFIG_OWCPPAPIEXAMPLE" = "y" ]; then
+  sub apps/owcppapi-example rev=IR2_7_23-5
+fi
+
 if [ "$AXIS_CONFIG_ACME_SANE" = "y" ]; then
 	sub_no_fetch apps/sane
 fi
--- devboard-R2_01.18/configure-files/common/AC_common-tag--devboard-R2_01	2008-01-03 10:22:16.000000000 +0100
+++ devboard-R2_01/configure-files/common/AC_common-tag--devboard-R2_01	2008-02-24 08:44:53.000000000 +0100
@@ -440,6 +440,147 @@
 	bool "Enable GNU Screen"
 	default n
 
+config NTPCLIENT
+	bool "Enable ntpclient"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for ntpclient
+
+config RRDTOOL
+	bool "Enable rrdtool library and binaries"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for rrdtool
+
+config TEMPLOGGERD
+	bool "Enable temploggerd"
+	depends on PRODUCT_TYPE_developer
+	select RRDTOOL
+	default n
+	help
+	  Select this to include support for temploggerd. It's some utilities
+	  to automatically create temperature graphs read from 1-wire devices
+	  for example.
+	  This package should be used in combination with rrdtool and owfs.
+
+config KMODFUSE
+	bool "Enable FUSE kernel-module"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for FUSE kernel-module
+
+config FUSE
+	bool "Enable FUSE"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for FUSE library and utility
+
+config OWLIB
+	bool "Enable OWLIB"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for OWLIB.
+	  This library is used by all other OW-packages (except owshell).
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+config OWCAPI
+	bool "Enable OWCAPI"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include support for OWCAPI.
+	  This library is optional and delivers a full C-API to owlib.
+	  You can then create a simple C-application to open and control an
+	    USB-adapter with all detected 1-wire devices.
+
+config OWNETLIB
+	bool "Enable OWNETLIB"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for OWNETLIB.
+	  This library is optional and delivers a C-API for remote owserver
+	  functionality. This library doesn't control a 1-wire adapter directly.
+	  It can only read/write messages to a remote owserver.
+
+config OWSHELL
+	bool "Enable OWSHELL"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for OWSHELL.
+
+config OWFS
+	bool "Enable OWFS"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	select FUSE
+	select KMODFUSE
+	default n
+	help
+	  Select this to include support for OWFS.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+config OWSERVER
+	bool "Enable OWSERVER"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include support for OWSERVER.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+config OWHTTPD
+	bool "Enable OWHTTPD"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include support for OWHTTPD.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+config OWFTPD
+	bool "Enable OWFTPD"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include support for OWFTPD.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+config OWPHP
+	bool "Enable OWPHP"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	select ACME_PHP
+	default n
+	help
+	  Select this to include support for OWPHP.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+	  ACME_PHP is required to build and use the OWPHP-module.
+
+config OWCAPIEXAMPLE
+	bool "Enable OWCAPIEXAMPLE"
+	depends on PRODUCT_TYPE_developer
+	select OWCAPI
+	default n
+	help
+	  Select this to include example program for OWCAPI.
+
+config OWCPPAPIEXAMPLE
+	bool "Enable OWCPPAPIEXAMPLE"
+	depends on PRODUCT_TYPE_developer
+	select OWCAPI
+	default n
+	help
+	  Select this to include C++ example program for OWCAPI.
+
 config ACME_NTP
 	bool "Enable ntpclient"
 	default n
--- devboard-R2_01.18/configure-files/devboard/AC_general-tag--devboard-R2_01	2008-01-03 10:22:16.000000000 +0100
+++ devboard-R2_01/configure-files/devboard/AC_general-tag--devboard-R2_01	2008-02-24 08:44:09.000000000 +0100
@@ -95,6 +95,179 @@
 
 #-----------------------------------------------------------------------------
 
+config NTPCLIENT
+	bool "Enable ntpclient"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for ntpclient
+
+#-----------------------------------------------------------------------------
+
+config RRDTOOL
+	bool "Enable rrdtool library and binaries"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for rrdtool
+
+#-----------------------------------------------------------------------------
+
+config TEMPLOGGERD
+	bool "Enable temploggerd"
+	depends on PRODUCT_TYPE_developer
+	select RRDTOOL
+	default n
+	help
+	  Select this to include support for temploggerd. It's some utilities
+	  to automatically create temperature graphs read from 1-wire devices
+	  for example.
+	  This package should be used in combination with rrdtool and owfs.
+
+#-----------------------------------------------------------------------------
+
+config KMODFUSE
+	bool "Enable FUSE kernel-module"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for FUSE kernel-module
+
+#-----------------------------------------------------------------------------
+
+config FUSE
+	bool "Enable FUSE"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for FUSE library and utility
+
+#-----------------------------------------------------------------------------
+
+config OWLIB
+	bool "Enable OWLIB"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for OWLIB.
+	  This library is used by all other OW-packages (except owshell).
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+#-----------------------------------------------------------------------------
+
+config OWCAPI
+	bool "Enable OWCAPI"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include support for OWCAPI.
+	  This library is optional and delivers a full C-API to owlib.
+	  You can then create a simple C-application to open and control an
+	    USB-adapter with all detected 1-wire devices.
+
+#-----------------------------------------------------------------------------
+
+config OWNETLIB
+	bool "Enable OWNETLIB"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for OWNETLIB.
+	  This library is optional and delivers a C-API for remote owserver
+	  functionality. This library doesn't control a 1-wire adapter directly.
+	  It can only read/write messages to a remote owserver.
+
+#-----------------------------------------------------------------------------
+
+config OWSHELL
+	bool "Enable OWSHELL"
+	depends on PRODUCT_TYPE_developer
+	default n
+	help
+	  Select this to include support for OWSHELL.
+
+#-----------------------------------------------------------------------------
+
+config OWFS
+	bool "Enable OWFS"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	select FUSE
+	select KMODFUSE
+	default n
+	help
+	  Select this to include support for OWFS.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+#-----------------------------------------------------------------------------
+
+config OWSERVER
+	bool "Enable OWSERVER"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include support for OWSERVER.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+#-----------------------------------------------------------------------------
+
+config OWHTTPD
+	bool "Enable OWHTTPD"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include support for OWHTTPD.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+#-----------------------------------------------------------------------------
+
+config OWFTPD
+	bool "Enable OWFTPD"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include support for OWFTPD.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+
+#-----------------------------------------------------------------------------
+
+config OWPHP
+	bool "Enable OWPHP"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	select ACME_PHP
+	default n
+	help
+	  Select this to include support for OWPHP.
+	  LIBUSB should be selected to add support for 1-wire USB-adapters.
+	  ACME_PHP is required to build and use the OWPHP-module.
+
+#-----------------------------------------------------------------------------
+
+config OWCAPIEXAMPLE
+	bool "Enable OWCAPIEXAMPLE"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include example program to OWCAPI.
+
+#-----------------------------------------------------------------------------
+
+config OWCPPAPIEXAMPLE
+	bool "Enable OWCPPAPIEXAMPLE"
+	depends on PRODUCT_TYPE_developer
+	select OWLIB
+	default n
+	help
+	  Select this to include example program to OWCPPAPI.
+
+#-----------------------------------------------------------------------------
+
 config SCSI_DEV_NODE
 	bool "Create SCSI device nodes"
 	depends on PRODUCT_TYPE_developer
--- devboard-R2_01.18/apps/php/get_php	2008-01-03 10:21:56.000000000 +0100
+++ devboard-R2_01/apps/php/get_php	2008-01-03 10:38:59.000000000 +0100
@@ -1,16 +1,21 @@
 #!/bin/sh
-if [ -f php-5.0.5.tar.bz2 ] 
+if [ -f php-5.0.5.tar.gz ] 
 then 
-	echo "php-5.0.5.tar.bz2 already present" 
+	echo "php-5.0.5.tar.gz already present" 
 else 
 	wget http://museum.php.net/php5/php-5.0.5.tar.gz 
 fi
+
+# Instead of installing modules in /lib/php/extensions/no-debug-non-zts-20041030
+# set it to a nicer path ( EXTENSION_DIR="/lib/php" )
+
 	rm -fr php-5.0.5 php
 	tar xvfz php-5.0.5.tar.gz
 	ln -s php-5.0.5 php
 	cp patch_php ./php
 	cp .target-makefrag ./php
 	cd php
+	EXTENSION_DIR="/lib/php" \
 	./configure  \
    	--prefix=$ROOTFS \
    	--disable-all \
--- devboard-R2_01.18/apps/php/Makefile	2008-01-03 10:21:56.000000000 +0100
+++ devboard-R2_01/apps/php/Makefile	2008-01-03 10:38:59.000000000 +0100
@@ -5,13 +5,16 @@
 PROGS = php/sapi/cgi/php
 
 INSTDIR = $(prefix)/usr/bin
-
+PHP_INSTALL_DIR = $(AXIS_TOP_DIR)/apps/php/php/install-dir
 all:$(PROGS) 
 $(PROGS):
 	chmod +x get_php
 	chmod +x patch_php
 	./get_php
-	make -C php/ 
+	make -C php/ \
+		INSTALL_ROOT="$(PHP_INSTALL_DIR)" \
+		all install
+	sed -i 's,includedir=".*,includedir="'${PHP_INSTALL_DIR}'/include/php",g' $(PHP_INSTALL_DIR)/bin/php-config
 	cris-strip php/sapi/cli/php php/sapi/cgi/php	
 	sed -i -e \
 	's/^\(DocumentRoot\)/\1\ \/mnt\/flash\/root\nAddType\ application\/x\-httpd\-cgi\ php\n#\1/' \