merge of 8691e90bbf4e4ab0587f1abc3e0a4bb9bcdf53df

     and c579a3af7687e512137c2653f94a4b14ce3b4d4f

93 files changed, 3391 insertions, 678 deletions

diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index f6d03fe69f..988265d72c 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r29"
+PR = "r30"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
@@ -54,6 +54,7 @@ INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
 INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
 INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
 INITSCRIPT_NAME_${PN} = "syslog"
+CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
 
 # This disables the syslog startup links in openslug (see openslug-init)
 INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
diff --git a/packages/busybox/files/syslog.conf b/packages/busybox/files/syslog.conf
index e2a2d58412..d4a0e02f5b 100644
--- a/packages/busybox/files/syslog.conf
+++ b/packages/busybox/files/syslog.conf
@@ -3,7 +3,7 @@ MARKINT=20			# intervall between --mark-- entries
 LOGFILE=/var/log/messages	# where to log (file)
 REMOTE=loghost:514		# where to log (syslog remote)
 REDUCE=no			# reduce-size logging
-ROTATESIZE=0			# rotate log if grown beyond X [kByte]
-ROTATEGENS=3			# keep X generations of rotated logs
+#ROTATESIZE=0			# rotate log if grown beyond X [kByte] (incompatible with busybox)
+#ROTATEGENS=3			# keep X generations of rotated logs (incompatible with busybox)
 BUFFERSIZE=64			# size of circular buffer [kByte]
 FOREGROUND=no			# run in foreground (don't use!)
diff --git a/packages/libsdl/libsdl-x11-1.2.7/.mtn2git_empty b/packages/crimsonfields/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libsdl/libsdl-x11-1.2.7/.mtn2git_empty
+++ b/packages/crimsonfields/.mtn2git_empty
diff --git a/packages/crimsonfields/crimsonfields-native_0.4.8.bb b/packages/crimsonfields/crimsonfields-native_0.4.8.bb
new file mode 100644
index 0000000000..212590b754
--- /dev/null
+++ b/packages/crimsonfields/crimsonfields-native_0.4.8.bb
@@ -0,0 +1,26 @@
+include crimsonfields_${PV}.bb
+inherit native
+
+DEPENDS = "libsdl-native libsdl-ttf-native"
+export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config-native"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_compile() {
+	cd tools && oe_runmake
+}
+
+do_stage() {
+	for binary in ${HOST_TOOLS}
+	do
+		install -m 0755 tools/$binary ${STAGING_BINDIR}
+	done
+	install -m 0644 tools/default.* ${STAGING_DATADIR}
+}
+
+do_install() {
+	:
+}
diff --git a/packages/crimsonfields/crimsonfields_0.4.8.bb b/packages/crimsonfields/crimsonfields_0.4.8.bb
new file mode 100644
index 0000000000..1a6f52b8f4
--- /dev/null
+++ b/packages/crimsonfields/crimsonfields_0.4.8.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Crimson Fields is a tactical war game in the tradition of Battle Isle."
+SECTION = "games"
+DEPENDS = "crimsonfields-native virtual/libsdl libsdl-mixer libsdl-ttf"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://crimson.seul.org/files/crimson-${PV}.tar.bz2 \
+           file://native-tools.patch;patch=1"
+S = "${WORKDIR}/crimson-${PV}"
+
+inherit autotools 
+
+HOST_TOOLS = "cfed mkdatafile mklocale mktileset mkunitset"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+	for binary in ${HOST_TOOLS}
+	do
+		install -m 0755 ${STAGING_DIR}/${BUILD_SYS}/bin/$binary	tools/
+	done
+	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/default.* tools/
+}
+
+do_install() {
+	autotools_do_install
+	install -d ${D}${palmtopdir}/apps/Games/
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0644 ${D}${datadir}/applications/crimson.desktop ${D}${palmtopdir}/apps/Games/
+	install -m 0644 ${D}${datadir}/pixmaps/*.png ${D}${palmtopdir}/pics/
+}
+
+FILES_${PN} = "${bindir} ${datadir} ${palmtopdir}"
diff --git a/packages/nonworking/crimsonfields/.mtn2git_empty b/packages/crimsonfields/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/crimsonfields/.mtn2git_empty
+++ b/packages/crimsonfields/files/.mtn2git_empty
diff --git a/packages/crimsonfields/files/native-tools.patch b/packages/crimsonfields/files/native-tools.patch
new file mode 100644
index 0000000000..aa5ecc4be0
--- /dev/null
+++ b/packages/crimsonfields/files/native-tools.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- crimson-0.4.8/Makefile.in~native-tools
++++ crimson-0.4.8/Makefile.in
+@@ -170,7 +170,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ EXTRA_DIST = crimson.desktop crimson.spec.in README.bi2cf README.CoMET
+-SUBDIRS = doc src tools gfx levels locale music sfx
++SUBDIRS = doc src gfx levels locale music sfx
+ DISTCHECK_CONFIGURE_FLAGS = --enable-bi2cf --enable-cf2bmp --enable-cfed --enable-comet
+ desktopdir = $(datadir)/applications
+ desktop_DATA = crimson.desktop
diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb
index cb4d4f18f2..36bfe5d89d 100644
--- a/packages/cron/cron_3.0pl1.bb
+++ b/packages/cron/cron_3.0pl1.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "Vixie cron."
 LICENSE = "cron"
-PR="r6"
+PR="r7"
 DEPENDS += "install-native"
 
 SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \
@@ -12,7 +12,7 @@ S = "${WORKDIR}/cron${PV}"
 
 INITSCRIPT_NAME = "cron"
 INITSCRIPT_PARAMS = "defaults"
-
+inherit update-rc.d
 
 CFLAGS_append = " -I${S} -DSYS_TIME_H=0"
 do_install () {
diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb
index 3a2b54072f..80373e3a1b 100644
--- a/packages/dropbear/dropbear_0.46.bb
+++ b/packages/dropbear/dropbear_0.46.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
 SECTION = "console/network"
 LICENSE = "MIT"
 DEPENDS = "zlib"
-PR = "r1"
+PR = "r3"
 PROVIDES = "ssh sshd"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
@@ -41,10 +41,8 @@ do_install() {
 		   ${D}${localstatedir}
 
 	install -m 0755 dropbearmulti ${D}${sbindir}/
-	for i in ${BINCOMMANDS}
-	do
-		ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
-	done
+	ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
+	
 	for i in ${SBINCOMMANDS}
 	do
 		ln -s ./dropbearmulti ${D}${sbindir}/$i
@@ -57,6 +55,11 @@ do_install() {
 	chmod 755 ${D}${sysconfdir}/init.d/dropbear
 }
 
+pkg_postinst () {
+	update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20
+	update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20
+}
+
 pkg_postrm_append () {
   if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
         rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
@@ -64,4 +67,6 @@ pkg_postrm_append () {
   if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
         rm ${sysconfdir}/dropbear/dropbear_dss_host_key
   fi
+  update-alternatives --remove ssh ${bindir}/dropbearmulti
+  update-alternatives --remove scp ${bindir}/dropbearmulti
 }
diff --git a/packages/espgs/espgs-native_7.07.1rc1.bb b/packages/espgs/espgs-native_7.07.1rc1.bb
deleted file mode 100644
index 04581f6bab..0000000000
--- a/packages/espgs/espgs-native_7.07.1rc1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "unknown"
-include espgs_${PV}.bb
-inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/espgs-${PV}"
-DEPENDS = "jpeg-native zlib-native libpng-native"
-
-PARALLEL_MAKE=""
-
-do_stage_append () {
-	install -m 0755 obj/echogs obj/genarch obj/genconf ${STAGING_BINDIR}/
-}
diff --git a/packages/espgs/espgs_7.07.1rc1.bb b/packages/espgs/espgs_7.07.1.bb
index 9d7d9c2fd1..b6f422fb03 100644
--- a/packages/espgs/espgs_7.07.1rc1.bb
+++ b/packages/espgs/espgs_7.07.1.bb
@@ -1,11 +1,14 @@
-SECTION = "unknown"
-DEPENDS = "jpeg zlib libpng espgs-native"
+DESCRIPTION = "ESP Ghostscript is an up-to-date GNU Ghostscript distribution \
+including bug fixes, new drivers, and additional support for CUPS."
+HOMEPAGE = "http://espgs.sf.net"
+SECTION = "libs"
+DEPENDS = "jpeg zlib libpng"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/espgs/espgs-${PV}-source.tar.bz2"
 S = "${WORKDIR}/espgs-${PV}"
 
-PARALLEL_MAKE=""
+PARALLEL_MAKE = ""
 
 inherit autotools
 
@@ -15,10 +18,10 @@ EXTRA_OECONF = "--with-drivers= \
 		--without-omni \
 		--without-x \
 		--disable-cups"
-EXTRA_OEMAKE = "'BUILD_TIME_GS=${STAGING_BINDIR}/gs' \
-		'ECHOGS_XE=${STAGING_BINDIR}/echogs' \
-		'GENARCH_XE=${STAGING_BINDIR}/genarch' \
-		'GENCONF_XE=${STAGING_BINDIR}/genconf'"
+
+do_compile() {
+	oe_runmake CCAUX="${BUILD_CC}"
+}
 
 do_install () {
 	oe_runmake 'prefix=${D}${prefix}' \
diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evinc