resolve merge conflicts

30 files changed, 313 insertions, 70 deletions

diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index 8c0522ff2..45dc3e13f 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -4,23 +4,35 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		DirectFB
-PKG_VERSION:=		1.4.3
+PKG_VERSION:=		1.4.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		223e036da906ceb4bd44708026839ff1
-PKG_DESCR:=		Thin library on top of the Linux framebuffer devices
+PKG_EXTRAVER:=		1.4-5
+PKG_MD5SUM:=		94735ccec21120794adcce93a61445d2
+PKG_DESCR:=		Thin graphic library for the Linux framebuffer devices
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libpng
-PKG_BUILDDEP:=		libpng libX11 libXext
+PKG_DEPENDS:=		libpng libjpeg
+PKG_BUILDDEP:=		libpng jpeg
 PKG_URL:=		http://www.directfb.org/
 PKG_SITES:=		http://directfb.org/downloads/Core/DirectFB-1.4/
 
+PKG_SUBPKGS:=		DIRECTFB DIRECTFB_DEV
+PKGSD_DIRECTFB_DEV:=	development files for DirectFB
+PKGSC_DIRECTFB_DEV:=	devel
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DIRECTFB_DEV},${PKGSC_DIRECTFB_DEV}))
 
 CONFIGURE_ARGS+=	--with-inputdrivers=linuxinput,keyboard,ps2mouse \
 			--with-gfxdrivers=none \
-			--disable-osx
+			--enable-fbdev \
+			--disable-sdl \
+			--disable-osx \
+			--disable-x11 \
+			--disable-gif \
+			--enable-png \
+			--enable-jpeg
 
 # This is to overcome libtool fuckup - when building without,
 # libtool calls (the correct) ld directly without parameters,
@@ -31,24 +43,32 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
 XAKE_FLAGS+=		LDEMULATION=elf64ltsmip
 endif
 
-post-install:
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_DIRECTFB_DEV}+=	directfb-dev-install
+
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_DIRECTFB}/etc
 	${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc/
-	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-1.4-0/{inputdrivers,systems,wm}
+	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm}
 	${CP} $(WRKINST)/usr/lib/lib{direct,fusion}*.so* \
 		$(IDIR_DIRECTFB)/usr/lib/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/inputdrivers/libdirectfb_linux_input.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/inputdrivers/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/systems/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/systems/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/wm/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/wm/
-	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-1.4-0/interfaces/IDirectFB{Font,ImageProvider,VideoProvider}
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/interfaces/IDirectFBFont/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/interfaces/IDirectFBImageProvider/
-	${CP} ${WRKINST}/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/*.so \
-		${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/inputdrivers/libdirectfb_linux_input.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/inputdrivers/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/systems/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/systems/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/wm/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/wm/
+	$(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFB{Font,ImageProvider,VideoProvider}
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBFont/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBFont/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBImageProvider/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBImageProvider/
+	${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/*.so \
+		${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/
+
+directfb-dev-install:
+	${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/include/
+	${CP} ${WRKINST}/usr/include/directfb ${IDIR_DIRECTFB_DEV}/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 64387c3d8..679efb111 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -12,17 +12,31 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/lib/
 
+PKG_SUBPKGS:=		ALSA_LIB ALSA_LIB_DEV
+PKGSD_ALSA_LIB_DEV:=	development files for ALSA
+PKGSC_ALSA_LIB_DEV:=	devel
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ALSA_LIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ALSA_LIB_DEV},${PKGSC_ALSA_LIB_DEV}))
 
 CONFIGURE_ARGS+=	--disable-python
 
-post-install:
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_ALSA_LIB_DEV}+=	alsa-lib-dev-install
+
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
 	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib/
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/
 
+alsa-lib-dev-install:
+	${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/include/{sys,alsa}
+	${CP} ${WRKINST}/usr/include/sys/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/sys
+	${CP} ${WRKINST}/usr/include/alsa/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/alsa
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7091c8541..1b8bf812a 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:=		38
+PKG_RELEASE:=		41
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -51,6 +51,7 @@ endif
 	mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin}
 	chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
 	chmod 600 $(IDIR_BASE_FILES)/etc/shadow
+	chmod 600 $(IDIR_BASE_FILES)/etc/network/interfaces
 	ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab
 	rm -rf $(IDIR_BASE_FILES)/var
 	ln -sf tmp $(IDIR_BASE_FILES)/var
diff --git a/package/base-files/src/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK
index 20c47f5db..9d0e06440 100755
--- a/package/base-files/src/etc/init.d/rcK
+++ b/package/base-files/src/etc/init.d/rcK
@@ -1,7 +1,6 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 {
-	test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -rnk2 | \
 	    while read line; do
@@ -15,4 +14,5 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 		esac
 		${shebang:-/bin/sh} ${line%%:*} autostop 2>&1
 	done
+	test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
 } | logger -s -p 6 -t ''
diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf
index 69d9c0079..173a851f3 100644
--- a/package/base-files/src/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
@@ -1,13 +1,15 @@
-rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
-device-mapper 0:0 660 @mkdir /dev/mapper
-tun 0:0 660 >net/tun
 null 0:0 777
 zero 0:0 666
 u?random 0:0 644
-console 0:0 0600
+console 0:0 600
 ptmx 0:0 666
 tty 0:0 666
+tty[0-9]* 0:0 666
 ttyS* 0:0 640
+rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
+device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper
+tun 0:0 660 >net/tun
+fb? root:video 660
 audio root:audio 660 >snd/audio
 dsp root:audio 660 >snd/dsp
 timer root:audio 660 >snd/timer
diff --git a/package/base-files/src/etc/rc.shutdown b/package/base-files/src/etc/rc.shutdown
new file mode 100644
index 000000000..85d9e0058
--- /dev/null
+++ b/package/base-files/src/etc/rc.shutdown
@@ -0,0 +1,5 @@
+#!/bin/sh
+for i in $(grep -v ^# /etc/fstab |awk '{ print $2 }');do
+	printf Unmounting $i
+	umount $i
+done
diff --git a/package/base-files/src/init b/package/base-files/src/init
index e290cee95..fc4ec8cb9 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -16,8 +16,7 @@ exec 0<>/dev/console >&0 2>&0
 echo >/dev/mdev.seq
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
 mdev -s
-mount -o remount,rw /
 cat /etc/.rnd >/dev/urandom 2>&1
-[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;}
-[ -f /etc/fstab ] && mount -a
+[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
+[ -f /etc/fstab ] && fsck -p >/dev/null ; mount -a
 exec /sbin/init
diff --git a/package/base-files/src/usr/share/udhcpc/default.script b/package/base-files/src/usr/share/udhcpc/default.script
index 68c603496..415bf92a4 100755
--- a/package/base-files/src/usr/share/udhcpc/default.script
+++ b/package/base-files/src/usr/share/udhcpc/default.script
@@ -23,6 +23,8 @@ case $1 in
 		done
 	fi
 
+	touch /tmp/resolv.conf
+	ln -sf /tmp/resolv.conf $RESOLV_CONF
 	echo -n >$RESOLV_CONF
 	${domain:+echo search $domain} >>$RESOLV_CONF
 	for i in $dns; do
diff --git a/package/bison/Makefile b/package/bison/Makefile
index bf058fc9a..fd31a0fe7 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bison
-PKG_VERSION:=		2.4.2
+PKG_VERSION:=		2.4.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6fc502f135738e98fecf1e5c8de38d62
+PKG_MD5SUM:=		ea45c778b36bdc7a720096819e292a73
 PKG_DESCR:=		GNU parser generator
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/bison/
diff --git a/package/busybox/config/e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/Config.in
index ac3850e63..ab5012e66 100644
--- a/package/busybox/config/e2fsprogs/Config.in
+++ b/package/busybox/config/e2fsprogs/Config.in
@@ -22,7 +22,7 @@ config BUSYBOX_CHATTR
 
 config BUSYBOX_FSCK
 	bool "fsck"
-	default n
+	default y
 	help
 	  fsck is used to check and optionally repair one or more filesystems.
 	  In actuality, fsck is simply a front-end for the various file system
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 783a197cf..1eb65d222 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -13,6 +13,8 @@ PKG_DEPENDS:=		libcom-err libuuid libblkid libpthread
 PKG_URL:=		http://e2fsprogs.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 
+PKG_CFLINE_E2FSPROGS:=	default y if ADK_TARGET_ROOTFS_CF
+
 PKG_SUBPKGS:=		E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID
 PKGSD_LIBUUID:=		UUID library
 PKGSC_LIBUUID:=		libs
@@ -45,6 +47,7 @@ pre-build:
 post-install:
 	${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/
 	${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \
diff --git a/package/gpm/Makefile b/package/gpm/Makefile
index 1233f7401..9d7df66f0 100644
--- a/package/gpm/Makefile
+++ b/package/gpm/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpm
-PKG_VERSION:=		1.20.5
+PKG_VERSION:=		1.20.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3915bdd6bf947ef867752a30b4be2387
+PKG_MD5SUM:=		b75e794bfb9fe8114d0b083932673b8f
 PKG_DESCR:=		console mouse support
 PKG_SECTION:=		misc
-PKG_URL:=		http://unix.schottelius.org/gpm
-PKG_SITES:=		http://unix.schottelius.org/gpm/archives/
+PKG_URL:=		http://launchpad.net/gpm
+PKG_SITES:=		http://launchpad.net/gpm/main/${PKG_VERSION}/+download/
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index e881756ef..05cd0a948 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -5,17 +5,21 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libmad
 PKG_VERSION:=		0.15.1b
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		1be543bc30c56fb6bea1d7bf6a64e66c
 PKG_DESCR:=		An high-quality MPEG audio decoding library
 PKG_SECTION:=		libs
 PKG_URL:=		http://sourceforge.net/projects/mad
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mad/} \
-			ftp://ftp.mars.org/pub/mpeg/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mad/}
+
+PKG_SUBPKGS:=		LIBMAD LIBMAD_DEV
+PKGSD_LIBMAD_DEV:=	development files for libmad
+PKGSC_LIBMAD_DEV:=	devel
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMAD_DEV,libmad-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMAD_DEV},${PKGSC_LIBMAD_DEV}))
 
 FPM:=default
 ifeq (${ARCH},i386)
@@ -26,6 +30,10 @@ endif
 #FPM:=mips
 #endif
 
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBMAD_DEV}+=	libmad-dev-install
+
 CONFIGURE_ARGS+=	--enable-fpm=${FPM} \
 			--disable-debugging \
 			--enable-speed
@@ -34,8 +42,12 @@ pre-install:
 	${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
 	${CP} ./files/mad.pc ${WRKINST}/usr/lib/pkgconfig
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBMAD}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libmad.so.* ${IDIR_LIBMAD}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libmad.so* ${IDIR_LIBMAD}/usr/lib/
+
+libmad-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBMAD_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBMAD_DEV}/usr/include/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libogg/Makefile b/package/libogg/Makefile
index baebf4e9a..a672bbe3a 100644
--- a/package/libogg/Makefile
+++ b/package/libogg/Makefile
@@ -12,12 +12,25 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://www.xiph.org/ogg
 PKG_SITES:=		http://downloads.xiph.org/releases/ogg/
 
+PKG_SUBPKGS:=		LIBOGG LIBOGG_DEV
+PKGSD_LIBOGG_DEV:=	development files for libogg
+PKGSC_LIBOGG_DEV:=	devel
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBOGG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBOGG_DEV,libogg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOGG_DEV},${PKGSC_LIBOGG_DEV}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBOGG_DEV}+=	libogg-dev-install
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib/
 
+libogg-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBOGG_DEV}/usr/include/ogg
+	${CP} ${WRKINST}/usr/include/ogg/*.h ${IDIR_LIBOGG_DEV}/usr/include/ogg
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libp11/Makefile b/package/libp11/Makefile
index 34ac1a204..9ba2fec39 100644
--- a/package/libp11/Makefile
+++ b/package/libp11/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libp11
-PKG_VERSION:=		0.2.4
+PKG_VERSION:=		0.2.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9e2c5cbececde245e2d2f535bd49ce35
+PKG_MD5SUM:=		564ab53ad7353903ddfdc15b153c44fb
 PKG_DESCR:=		library implementing a small layer on top of PKCS11 API
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libltdl
@@ -14,12 +14,25 @@ PKG_BUILDDEP:=		openssl libtool
 PKG_URL:=		http://www.opensc-project.org/libp11
 PKG_SITES:=		http://www.opensc-project.org/files/libp11/
 
+PKG_SUBPKGS:=		LIBP11 LIBP11_DEV
+PKGSD_LIBP11_DEV:=	development files for libp11
+PKGSC_LIBP11_DEV:=	devel
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBP11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBP11_DEV,libp11-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBP11_DEV},${PKGSC_LIBP11_DEV}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBP11_DEV}+=	libp11-dev-install
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBP11}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libp11.so* ${IDIR_LIBP11}/usr/lib
 
+libp11-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBP11_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBP11_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 62eac961e..83408d1d3 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libpng
 PKG_VERSION:=		1.2.44
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		89b62f8daaeeab1342e307d6d1411ff1
 PKG_DESCR:=		A library for reading/writing PNG images
 PKG_SECTION:=		libs
@@ -14,6 +14,10 @@ PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.libpng.org/pub/png/libpng.html
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libpng/}
 
+PKG_SUBPKGS:=		LIBPNG LIBPNG_DEV
+PKGSD_LIBPNG_DEV:=	development files for libpng
+PKGSC_LIBPNG_DEV:=	devel
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -21,9 +25,19 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPNG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBPNG_DEV}+=	libpng-dev-install
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib/
 
+libpng-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/include/libpng12
+	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBPNG_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/libpng12/*.h ${IDIR_LIBPNG_DEV}/usr/include/libpng12
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index b9ef7eeda..484ffa867 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -13,23 +13,34 @@ PKG_BUILDDEP:=		libogg
 PKG_URL:=		http://www.xiph.org/vorbis/
 PKG_SITES:=		http://downloads.xiph.org/releases/vorbis/
 
-PKG_SUBPKGS:=		LIBVORBIS LIBVORBISENC
+PKG_SUBPKGS:=		LIBVORBIS LIBVORBISENC LIBVORBIS_DEV
+PKGSD_LIBVORBIS_DEV:=	development files for libvorbis
+PKGSC_LIBVORBIS_DEV:=	devel
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBVORBIS_DEV,libvorbis-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBVORBIS_DEV},${PKGSC_LIBVORBIS_DEV}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBVORBIS_DEV}+=	libvorbis-dev-install
 
 CONFIGURE_ENV+=		LIBS="-lm -logg"
 CONFIGURE_ARGS+=	--with-ogg="${STAGING_TARGET_DIR}/usr" \
 			--with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \
 			--with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib"
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libvorbis.so.* ${IDIR_LIBVORBIS}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/libvorbisfile.so.* ${IDIR_LIBVORBIS}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/
 	${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libvorbisenc.so.* ${IDIR_LIBVORBISENC}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/
+
+libvorbis-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBVORBIS_DEV}/usr/include/vorbis
+	${CP} ${WRKINST}/usr/include/vorbis/*.h ${IDIR_LIBVORBIS_DEV}/usr/include/vorbis
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/links/Makefile b/package/links/Makefile
index dae75bd35..33be6b148 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -14,6 +14,11 @@ PKG_BUILDDEP:=		openssl libpng jpeg gpm
 PKG_URL:=		http://links.twibright.com/
 PKG_SITES:=		http://links.twibright.com/download/
 
+PKG_FLAVOURS:=		WITH_DIRECTFB
+PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
+PKGFS_WITH_DIRECTFB:=	directfb
+PKGFB_WITH_DIRECTFB:=	DirectFB
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -21,11 +26,17 @@ $(eval $(call PKG_template,LINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
 CONFIGURE_ARGS+=	--enable-graphics \
 			--with-ssl \
 			--without-svgalib \
+			--without-libtiff \
 			--without-x \
-			--without-directfb \
 			--without-pmshell \
 			--without-atheos
 
+ifeq (${ADK_PACKAGE_LINKS_WITH_DIRECTFB},y)
+CONFIGURE_ARGS+=	--with-directfb
+else
+CONFIGURE_ARGS+=	--without-directfb
+endif
+
 post-install:
 	${INSTALL_DIR} ${IDIR_LINKS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_LINKS}/usr/bin
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 6d6438fa9..0bef82316 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -29,9 +29,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-# gcc 4.5 produces internal compiler error with -Os
-#TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
-
 CONFIG_STYLE:=		minimal
 FAKE_FLAGS+=		INSTALLSTRIP=''
 
diff --git a/package/nasm/Makefile b/package/nasm/Makefile
new file mode 100644
index 000000000..5a92cdaec
--- /dev/null
+++ b/package/nasm/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:=		nasm
+PKG_VERSION:=		2.07
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		84d8e009b3d2565a810ab3ddad1f4f63
+PKG_DESCR:=		the netwide assembler
+PKG_SECTION:=		devel
+PKG_URL:=		http://sourceforge.net/projects/nasm/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nasm/nasm%20sources/2.07/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,NASM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+FAKE_FLAGS+=		INSTALLROOT=${WRKINST}
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_NASM)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/nasm \
+		$(IDIR_NASM)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openct/Makefile b/package/openct/Makefile
index 635f95d74..1164c4a13 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openct
 PKG_VERSION:=		0.6.20
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a1da3358ab798f1cb9232f1dbababc21
 PKG_DESCR:=		drivers for smart card readers
 PKG_SECTION:=		crypto
diff --git a/package/openct/files/openct.init b/package/openct/files/openct.init
new file mode 100644
index 000000000..5f4b93c16
--- /dev/null
+++ b/package/openct/files/openct.init
@@ -0,0 +1,28 @@
+#!/bin/sh
+#PKG openct
+#INIT 60
+
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${openct:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	test -d /var/run/openct || mkdir -p /var/run/openct
+	/usr/sbin/openct-control init
+	;;
+stop)
+	/usr/sbin/openct-control shutdown
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "usage: $0 {start | stop | restart}"
+	exit 1
+esac
+exit $?
diff --git a/package/openct/files/openct.postinst b/package/openct/files/openct.postinst
new file mode 100644
index 000000000..c02a18c6d
--- /dev/null
+++ b/package/openct/files/openct.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf openct openct NO
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index 60717c763..96c3e4138 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		opensc
 PKG_VERSION:=		0.11.13
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		98fa151e947941f9c3f27420fdf47c11
 PKG_DESCR:=		utilities to access smart cards
 PKG_SECTION:=		crypto
@@ -41,6 +41,9 @@ post-extract:
 
 post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_OPENSC}/usr/bin
+	${INSTALL_DIR} ${IDIR_OPENSC}/usr/share/opensc
+	${INSTALL_DATA} ${WRKINST}/usr/share/opensc/* \
+		${IDIR_OPENSC}/usr/share/opensc
 	${INSTALL_BIN} ${WRKINST}/usr/bin/opensc-explorer \
 		 ${IDIR_OPENSC}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/opensc-tool \
diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile
index a019fc844..393a2bfd2 100644
--- a/package/openssl-pkcs11/Makefile
+++ b/package/openssl-pkcs11/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl-pkcs11
-PKG_VERSION:=		0.1.5
+PKG_VERSION:=		0.1.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		840af6e54dc21445c54f74e15005ba4d
+PKG_MD5SUM:=		693b402eafba152666e66431ed4c1b9e
 PKG_DESCR:=		pkcs11 engine for openssl
 PKG_SECTION:=		crypto
 PKG_BUILDDEP:=		libp11
diff --git a/package/portmap/patches/patch-Makefile b/package/portmap/patches/patch-Makefile
new file mode 100644
index 000000000..63d559ac7
--- /dev/null
+++ b/package/portmap/patches/patch-Makefile
@@ -0,0 +1,12 @@
+--- portmap_6.0.orig/Makefile	2007-05-11 05:02:10.000000000 +0200
++++ portmap_6.0/Makefile	2010-12-19 22:23:02.000000000 +0100
+@@ -125,9 +125,7 @@ CFLAGS   += -Wall -Wstrict-prototypes
+ all:	portmap pmap_dump pmap_set portmap.man
+ 
+ CPPFLAGS += $(HOSTS_ACCESS)
+-portmap: CFLAGS   += -fpie
+ portmap: LDLIBS   += $(WRAP_LIB)
+-portmap: LDFLAGS  += -pie
+ portmap: portmap.o pmap_check.o from_local.o
+ 
+ from_local: CPPFLAGS += -DTEST
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
new file mode 100644
index 000000000..6d5de5bab
--- /dev/null
+++ b/package/qemu/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:=		qemu
+PKG_VERSION:=		0.13.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		397a0d665da8ba9d3b9583629f3d6421
+PKG_DESCR:=		cpu and system emulator
+PKG_SECTION:=		misc
+PKG_URL:=		http://wwww.qemu.org/
+PKG_SITES:=		http://wiki.qemu.org/download/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		minimal
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_QEMU)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/local/bin/qemu* \
+		$(IDIR_QEMU)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/qingy/Makefile b/package/qingy/Makefile
index ba6bd7a92..b34b47747 100644
--- a/package/qingy/Makefile
+++ b/package/qingy/Makefile
@@ -4,13 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		qingy
-PKG_VERSION:=		0.9.9
+PKG_VERSION:=		1.0.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		34f40172a71e9a6c2c77ddce11d2a63a
+PKG_MD5SUM:=		1e0912655e240adfd0ce5ced30bbc685
 PKG_DESCR:=		a DirectFB getty replacement
-PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		directfb libxscrnsaver
-PKG_BUILDDEP:=		DirectFB libXScrnSaver
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		directfb
+PKG_BUILDDEP:=		DirectFB
 PKG_URL:=		http://qingy.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=qingy/}
 
@@ -35,6 +35,6 @@ post-install:
 	$(INSTALL_DIR) $(IDIR_QINGY)/usr/sbin
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/qingy* ${IDIR_QINGY}/usr/sbin/
 	$(INSTALL_DIR) $(IDIR_QINGY)/usr/share/qingy
-	${CP} $(WRKINST)/usr/share/qingy/themes ${IDIR_QINGY}/usr/share/
+	${CP} $(WRKINST)/usr/share/qingy/themes ${IDIR_QINGY}/usr/share/qingy
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/syslinux/Makefile b/package/syslinux/Makefile
new file mode 100644
index 000000000..c5b8de89c
--- /dev/null
+++ b/package/syslinux/Makefile
@@ -0,0 +1,28 @@
+# 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:=		syslinux
+PKG_VERSION:=		4.03
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		086ac1c569d226a5e2ae3d605de09a1d
+PKG_DESCR:=		lightweight bootloaders
+PKG_SECTION:=		misc
+PKG_BUILDDEP:=		nasm
+PKG_URL:=		http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/boot/syslinux/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,SYSLINUX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+FAKE_FLAGS+=		INSTALLROOT=${WRKINST}
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_SYSLINUX)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/syslinux \
+		$(IDIR_SYSLINUX)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tar/Makefile b/package/tar/Makefile
index 1575c73a4..aaf25f6d8 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tar
-PKG_VERSION:=		1.23
+PKG_VERSION:=		1.25
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		fe81d950b61cb2f45619e1fcef97ce60
+PKG_MD5SUM:=		0e48e9e473a72f135d0ebbc8af2762cc
 PKG_DESCR:=		GNU tar
 PKG_SECTION:=		archive
 PKG_URL:=		http://mirrors.kernel.org/gnu/tar/