Merge branch 'master' of git+ssh://openadk.org/git/openadk

36 files changed, 728 insertions, 155 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 4cc7e970a..27ecdaa7c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		46
+PKG_RELEASE:=		47
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/init b/package/base-files/src/init
index a3232cb9c..a9564011d 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -1,7 +1,7 @@
 #!/bin/sh
 echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-mount -t devtmpfs devtmpfs /dev > /dev/null 2>&1
+mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
 mount -nt proc proc /proc
 mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 [ ! -f /etc/notmpfs ] && {
@@ -18,6 +18,7 @@ echo >/dev/mdev.seq
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
 mdev -s
 cat /etc/.rnd >/dev/urandom 2>&1
+[ -x /kexecinit ] && { /kexecinit; }
 [ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";}
 [ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
 [ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a;}
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 762f1832a..6a36d424a 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -17,9 +17,13 @@ PKG_NEED_CXX:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
 
+PKG_SUBPKGS:=		CUPS CUPS_DEV
+PKGSC_CUPS_DEV:=	devel
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CUPS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CUPS_DEV}))
 
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
 			OPTIM='-fPIC'
@@ -80,4 +84,8 @@ post-install:
 	${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
 	${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
 
+cups-dev-install:
+	${INSTALL_DIR} ${IDIR_CUPS_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_CUPS_DEV}/usr/include
+	
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 81d8751c5..de7c1ba29 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dillo
-PKG_VERSION:=		2.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		f8bcd62093f178bed81e46cc54e73f42
+PKG_VERSION:=		3.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		448f44a923222270cb0c84e55adc1be1
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libfltk libxi libiconv libpng zlib libjpeg
@@ -17,7 +17,7 @@ PKG_SITES:=		http://www.dillo.org/download/
 PKG_NEED_CXX:=		1
 
 PKG_HOST_DEPENDS:=	!cygwin
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/dillo/patches/patch-Makefile_in b/package/dillo/patches/patch-Makefile_in
index 6b18010d3..ff0c0c32f 100644
--- a/package/dillo/patches/patch-Makefile_in
+++ b/package/dillo/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
---- dillo-2.2.orig/Makefile.in	2010-02-11 11:20:01.000000000 +0100
-+++ dillo-2.2/Makefile.in	2011-01-07 21:37:49.000000000 +0100
+--- dillo-3.0.orig/Makefile.in	2011-09-06 22:55:42.000000000 +0200
++++ dillo-3.0/Makefile.in	2011-09-12 20:25:51.000482366 +0200
 @@ -242,7 +242,7 @@ target_vendor = @target_vendor@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -SUBDIRS = lout dw dlib dpip src doc dpid dpi test
 +SUBDIRS = lout dw dlib dpip src doc dpid dpi
- EXTRA_DIST = Doxyfile dillorc install-dpi-local
+ EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h
  sysconf_DATA = dillorc
  all: config.h
diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure
deleted file mode 100644
index 222be7882..000000000
--- a/package/dillo/patches/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- dillo-2.2.orig/configure	2010-02-11 11:19:59.000000000 +0100
-+++ dillo-2.2/configure	2011-03-28 02:30:04.373370428 +0200
-@@ -5830,11 +5830,6 @@ typedef unsigned char   bool_t;
- _______EOF
- 
- 
--if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then
--  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--  LDFLAGS="$LDFLAGS -L/usr/local/lib"
--fi
--
- for ac_func in gethostbyname
- do :
-   ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-@@ -6215,9 +6210,9 @@ if test "x$enable_png" = "xyes"; then
- $as_echo_n "checking for libpng-config... " >&6; }
- 
-   if test -z "$PNG_CONFIG"; then
--    PNG_CONFIG=`which libpng12-config`
-+    PNG_CONFIG=`which libpng-config`
-     if test -z "$PNG_CONFIG"; then
--      PNG_CONFIG=`which libpng-config`
-+      PNG_CONFIG=`which libpng15-config`
-     fi
-     if test -z "$PNG_CONFIG"; then
-       PNG_CONFIG=`which libpng10-config`
diff --git a/package/dillo/patches/patch-src_IO_Makefile_in b/package/dillo/patches/patch-src_IO_Makefile_in
index 242d86f5a..7c59b6168 100644
--- a/package/dillo/patches/patch-src_IO_Makefile_in
+++ b/package/dillo/patches/patch-src_IO_Makefile_in
@@ -1,9 +1,9 @@
---- dillo-2.2.orig/src/IO/Makefile.in	2010-02-11 11:20:01.000000000 +0100
-+++ dillo-2.2/src/IO/Makefile.in	2011-01-07 21:38:15.000000000 +0100
-@@ -188,7 +188,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -DDILLO_BINDIR='"$(bindir)/"'
+--- dillo-3.0.orig/src/IO/Makefile.in	2011-09-06 22:55:42.000000000 +0200
++++ dillo-3.0/src/IO/Makefile.in	2011-09-12 20:24:41.527983361 +0200
+@@ -191,7 +191,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-DDILLO_BINDIR='"$(bindir)/"'
+ 
 -AM_CFLAGS = @LIBFLTK_CFLAGS@
 +AM_CFLAGS = 
  AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index cd2c3caeb..7b76c5629 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -15,8 +15,11 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 
 PKG_CFLINE_E2FSPROGS:=	default y if ADK_TARGET_ROOTFS_CF
 
-PKG_SUBPKGS:=		E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC
+PKG_SUBPKGS:=		LIBE2FS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC
 PKG_SUBPKGS+=		LIBCOM_ERR_DEV LIBSS_DEV LIBUUID_DEV LIBBLKID_DEV
+PKG_SUBPKGS+=		RESIZE2FS TUNE2FS E2FSCK MKE2FS
+PKGSD_LIBE2FS:=		e2fsprogs library
+PKGSC_LIBE2FS:=		libs
 PKGSD_LIBUUID:=		UUID library
 PKGSC_LIBUUID:=		libs
 PKGSD_LIBUUID_DEV:=	UUID headers
@@ -35,10 +38,22 @@ PKGSD_LIBBLKID_DEV:=	blkid headers
 PKGSC_LIBBLKID_DEV:=	devel
 PKGSD_E2FSCK_STATIC:=	Static build of e2fsck
 PKGSC_E2FSCK_STATIC:=	fs
+PKGSD_RESIZE2FS:=	Resize FS utility
+PKGSC_RESIZE2FS:=	fs
+PKGSS_RESIZE2FS:=	libe2fs
+PKGSD_TUNE2FS:=		Tune2FS utility
+PKGSC_TUNE2FS:=		fs
+PKGSS_TUNE2FS:=		libe2fs
+PKGSD_E2FSCK:=		E2fsck utility
+PKGSC_E2FSCK:=		fs
+PKGSS_E2FSCK:=		libe2fs
+PKGSD_MKE2FS:=		Mke2fs utility
+PKGSC_MKE2FS:=		fs
+PKGSS_MKE2FS:=		libe2fs
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
 $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID},${PKGSC_LIBUUID}))
 $(eval $(call PKG_template,LIBUUID_DEV,libuuid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID_DEV},${PKGSC_LIBUUID_DEV}))
 $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
@@ -48,6 +63,10 @@ $(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
 $(eval $(call PKG_template,LIBBLKID_DEV,libblkid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID_DEV},${PKGSC_LIBBLKID_DEV}))
 $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
+$(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))
+$(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS}))
+$(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_MKE2FS),${PKGSD_MKE2FS},${PKGSC_MKE2FS}))
+$(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK}))
 
 CONFIGURE_ARGS+=	--enable-elf-shlibs --disable-rpath
 INSTALL_TARGET+=	install-libs
@@ -67,16 +86,29 @@ ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
 	${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin
 endif
 
-e2fsprogs-install:
-	${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc
-	${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_E2FSPROGS}/etc
-	${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin
-	cd $(IDIR_E2FSPROGS)/usr/sbin && ln -sf e2fsck fsck.ext2
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin
+libe2fs-install:
+	${INSTALL_DIR} ${IDIR_LIBE2FS}/etc
+	${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_LIBE2FS}/etc
+	${INSTALL_DIR} ${IDIR_LIBE2FS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \
-		${IDIR_E2FSPROGS}/usr/lib
+		${IDIR_LIBE2FS}/usr/lib
+
+e2fsck-install:
+	${INSTALL_DIR} ${IDIR_E2FSCK}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSCK}/usr/sbin
+	cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext2
+
+mke2fs-install:
+	${INSTALL_DIR} ${IDIR_MKE2FS}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_MKE2FS}/usr/sbin
+
+tune2fs-install:
+	${INSTALL_DIR} ${IDIR_TUNE2FS}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_TUNE2FS}/usr/sbin
+
+resize2fs-install:
+	${INSTALL_DIR} ${IDIR_RESIZE2FS}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/resize2fs ${IDIR_RESIZE2FS}/usr/sbin
 
 libblkid-install:
 	${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 59c6cdcff..d727bb7f6 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -4,22 +4,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		fltk
-PKG_VERSION:=		2.0
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		557544badbacca4ee1ebb2448f6e1f8a
+PKG_VERSION:=		1.3.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		92f6e29921227eec3426a07425c71232
 PKG_DESCR:=		fast light toolkit
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		libX11 libXi MesaLib freeglut freetype
 PKG_URL:=		http://www.fltk.org/
-PKG_SITES:=		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
+PKG_SITES:=		http://openadk.org/distfiles/
 PKG_NEED_CXX:=		1
 PKG_CXX:=		LIBFLTK
 
 PKG_SUBPKGS:=		LIBFLTK
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2
-WRKDIST=		${WRKDIR}/${PKG_NAME}-2.0.x-r7513
+DISTFILES:=		${PKG_NAME}-$(PKG_VERSION)-source.tar.gz
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile
index 466aef887..568110189 100644
--- a/package/fltk/patches/patch-Makefile
+++ b/package/fltk/patches/patch-Makefile
@@ -1,11 +1,11 @@
---- fltk-2.0.x-r7513.orig/Makefile	2010-04-15 18:29:49.000000000 +0200
-+++ fltk-2.0.x-r7513/Makefile	2011-01-14 22:01:49.000000000 +0100
-@@ -25,7 +25,7 @@
+--- fltk-1.3.0.orig/Makefile	2011-02-15 16:29:03.000000000 +0100
++++ fltk-1.3.0/Makefile	2011-09-12 20:20:27.137980830 +0200
+@@ -27,7 +27,7 @@
  
  include makeinclude
  
--DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test
-+DIRS = src $(LOCALIMAGES) images OpenGL fluid
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
  
- all: makeinclude
+ all: makeinclude fltk-config
  	for dir in $(DIRS); do\
diff --git a/package/fltk/patches/patch-OpenGL_Makefile b/package/fltk/patches/patch-OpenGL_Makefile
deleted file mode 100644
index 71ac77285..000000000
--- a/package/fltk/patches/patch-OpenGL_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- fltk-2.0.x-r7513.orig/OpenGL/Makefile	2008-08-05 01:03:58.000000000 +0200
-+++ fltk-2.0.x-r7513/OpenGL/Makefile	2011-03-25 13:56:09.304620874 +0100
-@@ -102,7 +102,7 @@ include makedepend
- 
- ../lib/$(DSONAME): $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) ../lib/$(DSOLINK)
- 	$(LN) $(DSONAME) ../lib/$(DSOLINK)
- 
diff --git a/package/fltk/patches/patch-configure b/package/fltk/patches/patch-configure
deleted file mode 100644
index 613c7b595..000000000
--- a/package/fltk/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- fltk-2.0.x-r7513.orig/configure	2010-04-16 10:02:53.000000000 +0200
-+++ fltk-2.0.x-r7513/configure	2011-03-25 13:52:41.555870814 +0100
-@@ -1770,7 +1770,7 @@ FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_
- 
- 
- 
--uname=`uname`
-+uname=Linux
- uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
- case $uname in
-   IRIX*)
-@@ -1922,7 +1922,7 @@ if test x$enable_shared = xyes; then
- 	    ;;
- 	Linux* | *BSD*)
- #           DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
--            DSOCOMMAND="\$(CXX) \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+            DSOCOMMAND="\$(CXX) -shared -fPIC $DEBUGFLAG -o"
- 	    if test "$libdir" != "/usr/lib"; then
- 		    DSOLINK="-Wl,-rpath,$libdir"
-             fi
diff --git a/package/fltk/patches/patch-fltk2-config_in b/package/fltk/patches/patch-fltk2-config_in
deleted file mode 100644
index c4784688a..000000000
--- a/package/fltk/patches/patch-fltk2-config_in
+++ /dev/null
@@ -1,27 +0,0 @@
---- fltk-2.0.x-r7513.orig/fltk2-config.in	2006-04-15 19:43:12.000000000 +0200
-+++ fltk-2.0.x-r7513/fltk2-config.in	2011-01-08 23:34:40.000000000 +0100
-@@ -77,7 +77,6 @@ LDLIBS="@LDFLAGS@ @LIBS@"
- # libraries to link with:
- LIBNAME="@LIBNAME@"
- DSONAME="@DSONAME@"
--DSOLINK="@DSOLINK@"
- IMAGELIBS="@IMAGELIBS@"
- SHAREDSUFFIX="@SHAREDSUFFIX@"
- 
-@@ -168,7 +167,6 @@ do
-       bindir=${exec_prefix}
-       includedir=${prefix}/include
-       libdir=${prefix}/lib
--      DSOLINK="-Wl,-rpath,${prefix}/lib"
- 	    ;;
- 	--prefix)
- 	    echo_prefix=yes
-@@ -283,7 +281,7 @@ if test x$use_images = xyes; then
-     LDSTATIC="$libdir/libfltk2_images.a $LDSTATIC $IMAGELIBS"
- fi
- 
--LDLIBS="$DSOLINK $LDLIBS"
-+LDLIBS="$LDLIBS"
- LDSTATIC="$LDSTATIC_PATHS $LDSTATIC"
- 
- # Answer to user requests
diff --git a/package/fltk/patches/patch-images_Makefile b/package/fltk/patches/patch-images_Makefile
deleted file mode 100644
index ddd993d18..000000000
--- a/package/fltk/patches/patch-images_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- fltk-2.0.x-r7513.orig/images/Makefile	2008-08-05 01:03:58.000000000 +0200
-+++ fltk-2.0.x-r7513/images/Makefile	2011-03-25 13:53:36.614620804 +0100
-@@ -109,7 +109,7 @@ include makedepend
- 
- ../lib/$(DSONAME): $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) ../lib/$(DSOLINK)
- 	$(LN) $(DSONAME) ../lib/$(DSOLINK)
- 
diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in
deleted file mode 100644
index 46a7d397f..000000000
--- a/package/fltk/patches/patch-makeinclude_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- fltk-2.0.x-r7513.orig/makeinclude.in	2006-04-11 00:06:06.000000000 +0200
-+++ fltk-2.0.x-r7513/makeinclude.in	2011-03-25 12:03:06.633370885 +0100
-@@ -45,7 +45,7 @@ NROFF		= @NROFF@
- RM		= rm -f
- RMDIR		= rm -rf
- SHELL		= /bin/sh
--STRIP		= strip
-+STRIP		= echo
- 
- # compiler names:
- CC		= @CC@
-@@ -115,7 +115,7 @@ CAT1EXT		= @CAT1EXT@
- CAT3EXT		= @CAT3EXT@
- 
- # Be quiet when building...
--.SILENT:
-+#.SILENT:
- 
- # Build commands and filename extensions...
- .SUFFIXES:	.0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
diff --git a/package/giflib/Makefile b/package/giflib/Makefile
index 1259c92f9..2187e05ae 100644
--- a/package/giflib/Makefile
+++ b/package/giflib/Makefile
@@ -12,13 +12,21 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://sourceforge.net/projects/giflib/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
 
+PKG_SUBPKGS:=		GIFLIB GIFLIB_DEV
+PKGSC_GIFLIB_DEV:=	devel
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GIFLIB_DEV,giflib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GIFLIB_DEV}))
 
 giflib-install:
 	$(INSTALL_DIR) $(IDIR_GIFLIB)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libgif.so* \
 		$(IDIR_GIFLIB)/usr/lib
 
+giflib-dev-install:
+	${INSTALL_DIR} ${IDIR_GIFLIB_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/*.h ${IDIR_GIFLIB_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kbd/Makefile b/package/kbd/Makefile
new file mode 100644
index 000000000..0293849de
--- /dev/null
+++ b/package/kbd/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		kbd
+PKG_VERSION:=		1.15.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8143e179a0f3c25646ce5085e8777200
+PKG_DESCR:=		keyboard utility
+PKG_SECTION:=		utils
+PKG_SITES:=		ftp://ftp.altlinux.org/pub/people/legion/kbd/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,KBD,kbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+kbd-install:
+	$(INSTALL_DIR) $(IDIR_KBD)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/loadkeys \
+		$(IDIR_KBD)/usr/bin
+ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
+	$(INSTALL_DIR) $(IDIR_KBD)/etc
+	$(CP) ./files/zaurus.map $(IDIR_KBD)/etc
+endif
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kbd/files/kbd.init b/package/kbd/files/kbd.init
new file mode 100644
index 000000000..3745e67d0
--- /dev/null
+++ b/package/kbd/files/kbd.init
@@ -0,0 +1,26 @@
+#!/bin/sh
+#PKG kbd
+#INIT 10
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${kbd:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	loadkeys /etc/${kbd_map}.map
+	;;
+stop)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/kbd/files/kbd.postinst b/package/kbd/files/kbd.postinst
new file mode 100644
index 000000000..b2d973ee1
--- /dev/null
+++ b/package/kbd/files/kbd.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf kbd_map kbd_map "zaurus"
+add_rcconf kbd kbd NO
diff --git a/package/kbd/files/zaurus.map b/package/kbd/files/zaurus.map
new file mode 100644
index 000000000..11a0e8b4d
--- /dev/null
+++ b/package/kbd/files/zaurus.map
@@ -0,0 +1,228 @@
+# Default kernel keymap. This uses 7 modifier combinations.
+keymaps 0-2,4-5,8,12
+# Change the above line into
+#	keymaps 0-2,4-6,8,12
+# in case you want the entries
+#	altgr   control keycode  83 = Boot            
+#	altgr   control keycode 111 = Boot            
+# below.
+#
+keycode   1 =        
+keycode   2 = one              exclam    
+	control alt     keycode  2 = Console_1
+keycode   3 = two              quotedbl			
+	control alt     keycode  3 = Console_2
+keycode   4 = three            numbersign      
+	control alt     keycode  4 = Console_3
+keycode   5 = four             dollar           
+	control alt     keycode  5 = Console_4
+keycode   6 = five             percent         
+	control alt     keycode  6 = Console_5
+keycode   7 = six              ampersand     
+	control alt     keycode  7 = Console_6
+keycode   8 = seven            apostrophe
+keycode   9 = eight            parenleft
+keycode  10 = nine             parenright
+keycode  11 = zero             asciitilde
+keycode  12 = minus            at
+	altgr keycode 12 = at
+keycode  13 = 
+keycode  14 = BackSpace
+	altgr keycode 14 = Delete
+keycode  15 = Tab
+	altgr keycode 15 = Caps_Lock
+keycode  16 = q               
+keycode  17 = w               
+	altgr keycode 17 = asciicircum
+keycode  18 = e
+	altgr keycode 18 = equal
+keycode  19 = r          
+	altgr keycode 19 = plus     
+keycode  20 = t               
+	altgr keycode 20 = bracketleft
+keycode  21 = y               
+	altgr keycode 21 = bracketright
+keycode  22 = u      
+	altgr keycode 22 = braceleft         
+keycode  23 = i           
+	altgr keycode 23 = braceright    
+keycode  24 = o               
+keycode  25 = p               
+keycode  26 = 
+keycode  27 =
+keycode  28 = Return          
+keycode  29 = Control         
+keycode  30 = a
+keycode  31 = s               
+keycode  32 = d
+keycode  33 = f
+	altgr keycode 33 = backslash             
+keycode  34 = g               
+	altgr keycode 34 = semicolon
+keycode  35 = h         
+	altgr keycode 35 = colon      
+keycode  36 = j        
+	altgr keycode 36 = asterisk       
+keycode  37 = k   
+    altgr keycode 37 = backslash
+keycode  38 = l         
+	altgr keycode 38 = bar      
+keycode  39 =  
+keycode  40 = 
+keycode  41 =     
+keycode  42 = Shift           
+keycode  43 =  
+keycode  44 = z               
+keycode  45 = x               
+keycode  46 = c
+keycode  47 = v               
+keycode  48 = b
+	altgr keycode 48 = underscore
+keycode  49 = n               
+keycode  50 = m               
+keycode  51 = comma		slash
+	altgr keycode 51 = less
+keycode  52 = period           question         
+	altgr     keycode  52 = greater     
+keycode  53 =      
+keycode  54 = Shift           
+keycode  55 = 
+keycode  56 = Alt             
+keycode  57 = space            space           
+	control keycode  57 = nul   
+keycode 59 = F9
+keycode 60 = F10
+keycode 61 = AltGr
+keycode 62 = Escape
+keycode 63 = Return
+keycode 64 = Escape
+keycode 65 = Down
+keycode 66 = Up
+keycode 67 = Control
+keycode 68 = F13
+keycode 79 = F15
+keycode 80 = F16
+keycode 82 = F17
+keycode 87 = Return
+keycode 88 = F11	          
+keycode 97 = Control  
+keycode 99 = F12       
+keycode 103 = Up              
+	altgr     keycode 103 = PageUp
+keycode 105 = Left            
+	altgr     keycode 105 = Decr_Console
+keycode 106 = Right           
+	altgr     keycode 106 = Incr_Console
+keycode 108 = Down  
+	altgr     keycode 108 = PageDown
+	
+
+# LCD Softkeys as represented by zaurusd	
+keycode 82 = F5	
+keycode 79 = F15		# Home
+keycode 80 = F6
+keycode 81 = F16		# Email
+keycode 75 = F7
+keycode 76 = F17		# Addresses
+keycode 77 = F8
+keycode 71 = F18		# Calendar
+keycode 72 = F9
+keycode 73 = F19		# Book
+keycode 78 = F10
+
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+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 'ÿ'
diff --git a/package/kexecinit/Makefile b/package/kexecinit/Makefile
new file mode 100644
index 000000000..ef042592b
--- /dev/null
+++ b/package/kexecinit/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		kexecinit
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		1
+PKG_DESCR:=		init for kexec rootfilesystem
+PKG_SECTION:=		base
+
+WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
+NO_DISTFILES:=		1
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,KEXECINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-install:
+	$(INSTALL_BIN) ./src/kexecinit $(IDIR_KEXECINIT)/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kexecinit/src/kexecinit b/package/kexecinit/src/kexecinit
new file mode 100755
index 000000000..3aee9ce18
--- /dev/null
+++ b/package/kexecinit/src/kexecinit
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+load_system() {
+	echo "Loading OpenADK from microdrive (${micro}1)"
+	mount ${micro}1 /mnt
+	if [ $? -ne 0 ];then echo "Mounting ${micro}1 failed"; exit 1;fi
+	kexec -l /mnt/boot/kernel
+	umount /mnt
+	kexec -e -x
+}
+
+cf_install() {
+	mkdir /mnt/root
+	mkdir /mnt/cf
+	mount -t ext2 ${micro}1 /mnt/root
+	if [ $? -ne 0 ];then echo "Mounting ${micro}1 failed"; exit 1;fi
+	mount ${cfd}1 /mnt/cf
+	if [ $? -ne 0 ];then echo "Mounting ${cfd}1 failed"; exit 1;fi
+	if [ -f /mnt/cf/sharp.tgz ];then
+		echo "Installing OpenADK from CF (${cfd}1) to microdrive (${micro}1)"
+		umount /mnt/root
+		mke2fs -q ${micro}1
+		mount -t ext2 ${micro}1 /mnt/root
+		if [ $? -ne 0 ];then echo "Mounting ${micro}1 failed"; exit 1;fi
+		tar -xzpf /mnt/cf/sharp.tgz -C /mnt/root
+	fi
+	umount /mnt/root
+	umount /mnt/cf
+}
+
+check_cf() {
+	cf=0
+	if [ $(lsscsi|wc -l) -eq 1 ];then
+		cf=0
+	else
+		cf=1
+	fi
+	micro=$(lsscsi |awk '$4 ~ "HMS360" { print $6 }')
+	if [ "$micro" = "/dev/sda" ];then
+		cfd=/dev/sdb
+	else
+		cfd=/dev/sda
+	fi
+}
+
+echo "  ___                      _    ____  _  __ "
+echo " / _ \ _ __   ___ _ __    / \  |  _ \| |/ / "
+echo "| | | | '_ \ / _ \ '_ \  / _ \ | | | | ' /  "
+echo "| |_| | |_) |  __/ | | |/ ___ \| |_| | . \  "
+echo " \___/| .__/ \___|_| |_/_/   \_\____/|_|\_\ "
+echo "      |_|                                   "
+echo ""
+
+sleep 2
+check_cf
+if [ $cf -eq 0 ];then
+	load_system
+else
+	echo "Should I install OpenADK to microdrive (y/n)"
+	read answer
+	if [ "$answer" = "y" ];then
+		cf_install
+	fi
+	load_system
+fi
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index e3b12fc2d..34c64d534 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:=		3.5.9
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d6d4b0f76248a6b346eb42dfcdaa72a6
 PKG_DESCR:=		common operation for the XPM pixmap format
+PKG_BUILDDEP:=		libX11
 PKG_SECTION:=		x11/libs
 PKG_SITES:=		${MASTER_SITE_XORG}
 
diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile
new file mode 100644
index 000000000..1c9733e3e
--- /dev/null
+++ b/package/lm_sensors/Makefile
@@ -0,0 +1,64 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		lm_sensors
+PKG_VERSION:=		3.3.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8c0eebda8524fc87da1393b4564d279b
+PKG_DESCR:=		linux hw sensor toolset
+PKG_DEPENDS:=		sysfsutils
+PKG_SECTION:=		misc
+PKG_URL:=		http://www.lm-sensors.org
+PKG_SITES:=		http://dl.lm-sensors.org/lm-sensors/releases/
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+TARGET_CFLAGS:=		${TARGET_CFLAGS_ARCH} -fwrapv -fno-ident
+
+PKG_SUBPKGS:=	LM_SENSORS LM_SENSORS_DEV LM_SENSORS_DETECT
+PKGSD_LM_SENSORS_DEV:=		lm_sensors header files
+PKGSC_LM_SENSORS_DEV:=		devel
+PKGSD_LM_SENSORS_DETECT:=	lm_sensors perl scripts (e.g. sensors-detect)
+PKGSC_LM_SENSORS_DETECT:=	misc
+PKGSS_LM_SENSORS_DETECT:=	perl
+PKGSB_LM_SENSORS_DETECT:=	perl
+
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LM_SENSORS,lm-sensors,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LM_SENSORS_DEV,lm-sensors-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LM_SENSORS_DEV},${PKGSC_LM_SENSORS_DEV}))
+$(eval $(call PKG_template,LM_SENSORS_DETECT,lm-sensors-detect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LM_SENSORS_DETECT},${PKGSC_LM_SENSORS_DETECT}))
+
+CONFIG_STYLE:=		manual
+
+do-build:
+	${MAKE} -C ${WRKBUILD} \
+		${TARGET_CONFIGURE_OPTS} \
+		MACHINE="${CPU_ARCH}" \
+		LINUX="${LINUX_DIR}" \
+		STAGING_DIR="${STAGING_DIR}" \
+		PREFIX="/usr" \
+		user
+		
+lm-sensors-install:
+	${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/local/bin/sensors ${IDIR_LM_SENSORS}/usr/bin/sensors
+	${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/lib
+	${CP} ${WRKINST}/usr/local/lib/libsensors.so* ${IDIR_LM_SENSORS}/usr/lib
+	${INSTALL_DIR} ${IDIR_LM_SENSORS}/etc
+	${CP} ${WRKINST}/etc/sensors3.conf ${IDIR_LM_SENSORS}/etc
+
+lm-sensors-dev-install:
+	${INSTALL_DIR} ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
+	${CP} ${WRKINST}/usr/local/include/sensors/*.h ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
+
+lm-sensors-detect-install:
+	${INSTALL_DIR} ${IDIR_LM_SENSORS_DETECT}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/fancontrol ${IDIR_LM_SENSORS_DETECT}/usr/sbin/fancontrol
+	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isadump ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isadump
+	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isaset ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isaset
+	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/pwmconfig ${IDIR_LM_SENSORS_DETECT}/usr/sbin/pwmconfig
+	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/sensors-detect ${IDIR_LM_SENSORS_DETECT}/usr/sbin/sensors-detect
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
new file mode 100644
index 000000000..c65fe0b84
--- /dev/null
+++ b/package/log4cxx/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		log4cxx
+PKG_VERSION:=		0.10.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b30ffb8da3665178e68940ff7a61084c
+PKG_DESCR:=		Apache logging framework for C++
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		apr apr-util
+PKG_BUILDDEP:=		apr apr-util
+PKG_URL:=		http://logging.apache.org/log4cxx/
+PKG_SITES:=		http://www.apache.org/dist/logging/log4cxx/0.10.0/
+DISTFILES:=		apache-${PKG_NAME}-${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/apache-${PKG_NAME}-${PKG_VERSION}
+
+PKG_SUBPKGS:=		LOG4CXX LOG4CXX_DEV
+PKGSD_LOG4CXX_DEV:=	log4cxx development headers
+PKGSC_LOG4CXX_DEV:=	devel
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LOG4CXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LOG4CXX_DEV,${PKG_NAME}_dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOG4CXX_DEV},${PKGSC_LOG4CXX_DEV}))
+
+log4cxx-install:
+	${INSTALL_DIR} ${IDIR_LOG4CXX}/usr/lib
+	${CP} ${WRKINST}/usr/lib/*.a ${IDIR_LOG4CXX}/usr/lib
+	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LOG4CXX}/usr/lib
+
+log4cxx_dev-install:
+	${INSTALL_DIR} ${IDIR_LOG4CXX_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LOG4CXX_DEV}/usr/include
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/log4cxx/patches/patch-src_Makefile_am b/package/log4cxx/patches/patch-src_Makefile_am
new file mode 100644
index 000000000..339a18eeb
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_Makefile_am
@@ -0,0 +1,8 @@
+--- apache-log4cxx-0.10.0.orig/src/Makefile.am	2008-04-01 00:34:52.000000000 +0200
++++ apache-log4cxx-0.10.0/src/Makefile.am	2011-09-08 09:41:19.679507959 +0200
+@@ -13,4 +13,4 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+-SUBDIRS = main examples site test
++SUBDIRS = main
diff --git a/package/log4cxx/patches/patch-src_Makefile_in b/package/log4cxx/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..da14caed3
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- apache-log4cxx-0.10.0.orig/src/Makefile.in	2008-04-01 00:44:12.000000000 +0200
++++ apache-log4cxx-0.10.0/src/Makefile.in	2011-09-08 10:16:06.139506556 +0200
+@@ -209,7 +209,7 @@ target_vendor = @target_vendor@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+-SUBDIRS = main examples site test
++SUBDIRS = main
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/package/log4cxx/patches/patch-src_examples_cpp_console_cpp b/package/log4cxx/patches/patch-src_examples_cpp_console_cpp
new file mode 100644
index 000000000..da948e211
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_examples_cpp_console_cpp
@@ -0,0 +1,11 @@
+--- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp	2008-04-01 00:34:52.000000000 +0200
++++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp	2011-09-08 09:33:04.799508250 +0200
+@@ -16,6 +16,8 @@
+  */
+ 
+ #include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
+ #include <log4cxx/logger.h>
+ #include <log4cxx/consoleappender.h>
+ #include <log4cxx/simplelayout.h>
diff --git a/package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp b/package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp
new file mode 100644
index 000000000..3768a2f6b
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp
@@ -0,0 +1,10 @@
+--- apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp	2008-04-01 00:34:09.000000000 +0200
++++ apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp	2011-09-08 09:33:04.799508250 +0200
+@@ -20,6 +20,7 @@
+ #include <log4cxx/helpers/exception.h>
+ #include <log4cxx/helpers/pool.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp b/package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp
new file mode 100644
index 000000000..bc19643b2
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp
@@ -0,0 +1,10 @@
+--- apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp	2008-04-01 00:34:09.000000000 +0200
++++ apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp	2011-09-08 09:33:04.799508250 +0200
+@@ -19,6 +19,7 @@
+ #include <log4cxx/helpers/socketoutputstream.h>
+ #include <log4cxx/helpers/socket.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/package/lsscsi/Makefile b/package/lsscsi/Makefile
new file mode 100644
index 000000000..3a8cd740d
--- /dev/null
+++ b/package/lsscsi/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		lsscsi
+PKG_VERSION:=		0.25
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c4e36b106624aff78527c54cf08ecbfe
+PKG_DESCR:=		list SCSI devices
+PKG_SECTION:=		utils
+PKG_URL:=		http://sg.danny.cz/scsi/lsscsi.html
+PKG_SITES:=		http://sg.danny.cz/scsi/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tgz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LSSCSI,lsscsi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+lsscsi-install:
+	$(INSTALL_DIR) $(IDIR_LSSCSI)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/lsscsi \
+		$(IDIR_LSSCSI)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
new file mode 100644
index 000000000..215f11a87
--- /dev/null
+++ b/package/xf86-input-evdev/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xf86-input-evdev
+PKG_VERSION:=		2.6.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		95d35eea1dad1c4828d0027f3be5325c
+PKG_DESCR:=		X11 driver for Event driver
+PKG_SECTION:=		x11/drivers
+PKG_DEPENDS:=		xorg-server
+PKG_BUILDDEP:=		xorg-server
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_INPUT_EVDEV,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_XF86_INPUT_EVDEV}/usr/lib/xorg/modules/input
+	${CP} ${WRKINST}/usr/lib/xorg/modules/input/evdev_drv.so \
+		${IDIR_XF86_INPUT_EVDEV}/usr/lib/xorg/modules/input/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-input-evdev/patches/patch-ltmain_sh b/package/xf86-input-evdev/patches/patch-ltmain_sh
new file mode 100644
index 000000000..f679ecee5
--- /dev/null
+++ b/package/xf86-input-evdev/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- xf86-input-keyboard-1.5.0.orig/ltmain.sh	2010-10-30 18:15:40.000000000 +0200
++++ xf86-input-keyboard-1.5.0/ltmain.sh	2011-01-24 19:31:12.000000000 +0100
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
diff --git a/package/xinput/Makefile b/package/xinput/Makefile
new file mode 100644
index 000000000..d527229d4
--- /dev/null
+++ b/package/xinput/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xinput
+PKG_VERSION:=		1.5.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		87ad4db2fad4ff9a68e57759a63abc4b
+PKG_DESCR:=		X input utility
+PKG_SECTION:=		x11/apps
+PKG_URL:=		http://xorg.freedesktop.org/
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XINPUT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_XINPUT)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xinput \
+		$(IDIR_XINPUT)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xinput_calibrator/Makefile b/package/xinput_calibrator/Makefile
new file mode 100644
index 000000000..cc16db10f
--- /dev/null
+++ b/package/xinput_calibrator/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xinput_calibrator
+PKG_VERSION:=		0.7.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		20da0a2055a5a75962add8c6b44f60fa
+PKG_DESCR:=		X11 input calibration utility
+PKG_SECTION:=		x11/apps
+PKG_URL:=		https://github.com/tias/xinput_calibrator
+PKG_SITES:=		https://github.com/downloads/tias/xinput_calibrator/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XINPUT_CALIBRATOR,xinput_calibrator,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+xinput_calibrator-install:
+	$(INSTALL_DIR) $(IDIR_XINPUT_CALIBRATOR)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xinput_calibrator \
+		$(IDIR_XINPUT_CALIBRATOR)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index f953d434f..04e6471d5 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -22,6 +22,8 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
 PKG_SUBPKGS:=		XORG_SERVER XORG_SERVER_DEV
+PKGSD_XORG_SERVER_DEV:=	Xorg server development files
+PKGSC_XORG_SERVER_DEV:=	x11/devel
 
 PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA
 PKG_ARCH_DEPENDS:=	!cris
@@ -42,7 +44,7 @@ PKGCB_WITH_CRYPTO:=		openssl
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XORG_SERVER_DEV},${PKGSC_XORG_SERVER_DEV}))
 
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y)
 CONFIGURE_ARGS+=	 --with-sha1=libgcrypt