explicit_merge of f4993582a6bc13487c991548a98342ea6d084c2a

              and 7dcc40f11838a5d4253110fb45d10c0cd109a0ff
   using ancestor 6c249e86f20cab16da75a620e43f22520d6b1f7b
        to branch 'org.openembedded.nslu2-linux'

23 files changed, 575 insertions, 80 deletions

diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf
index de8d7f92a1..3ab2c056ae 100644
--- a/conf/distro/openslug-native-packages.conf
+++ b/conf/distro/openslug-native-packages.conf
@@ -2,7 +2,9 @@
 BBFILES := "\
 ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/ipkg-utils/*.bb \
-${PKGDIR}/packages/meta/*.bb \
+${PKGDIR}/packages/meta/package-index.bb \
+${PKGDIR}/packages/meta/openslug-native-packages.bb \
+${PKGDIR}/packages/freeze/*.bb \
 ${PKGDIR}/packages/vlan/*.bb \
 ${OPENSLUG_EXTRA_BBFILES}"
 # I don't know of any packages we currently need to compile nativly, so this is something to test with
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 25ea543f29..7255ec5528 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -1,4 +1,3 @@
-# automatically generated by bitbake freeze
 BBFILES := "\
 ${PKGDIR}/packages/atftp/*.bb \
 ${PKGDIR}/packages/audiofile/*.bb \
@@ -47,7 +46,6 @@ ${PKGDIR}/packages/glibc/*.bb \
 ${PKGDIR}/packages/gnu-config/*.bb \
 ${PKGDIR}/packages/gphoto2/*.bb \
 ${PKGDIR}/packages/grep/*.bb \
-${PKGDIR}/packages/groff/*.bb \
 ${PKGDIR}/packages/gtk-doc/*.bb \
 ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/hotplug-ng/*.bb \
@@ -70,6 +68,8 @@ ${PKGDIR}/packages/libmad/*.bb \
 ${PKGDIR}/packages/libmikmod/*.bb \
 ${PKGDIR}/packages/libogg/*.bb \
 ${PKGDIR}/packages/libpcap/*.bb \
+${PKGDIR}/packages/libpng/*.bb \
+${PKGDIR}/packages/libtiff/*.bb \
 ${PKGDIR}/packages/libtool/*.bb \
 ${PKGDIR}/packages/libusb/*.bb \
 ${PKGDIR}/packages/libvorbis/*.bb \
@@ -101,6 +101,7 @@ ${PKGDIR}/packages/nano/*.bb \
 ${PKGDIR}/packages/ncftp/*.bb \
 ${PKGDIR}/packages/ncurses/*.bb \
 ${PKGDIR}/packages/netbase/*.bb \
+${PKGDIR}/packages/netpbm/*.bb \
 ${PKGDIR}/packages/nfs-utils/*.bb \
 ${PKGDIR}/packages/nis/*.bb \
 ${PKGDIR}/packages/nslu2-binary-only/*.bb \
@@ -152,7 +153,6 @@ ${PKGDIR}/packages/tar/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
 ${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
-${PKGDIR}/packages/udev/*.bb \
 ${PKGDIR}/packages/unionfs/*.bb \
 ${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index 66c1c19079..ce7be61d21 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "cyrus-sasl db3"
 LICENSE = "BSD"
-PR = "r3"
+PR = "r5"
 DEPENDS += "install-native"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
@@ -13,7 +13,10 @@ SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
 	   file://volatiles \
 	   "
 
-inherit autotools
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "cyrus"
+INITSCRIPT_PARAMS = "start 56 3 4 5 . stop 15 0 1 6 ."
 
 EXTRA_OECONF = "--with-auth=unix \
 		--without-perl \
@@ -38,8 +41,6 @@ do_install_append () {
 
 pkg_postinst () {
 	/etc/init.d/populate-volatile.sh
-	update-rc.d cyrus start 56 3 4 5 . stop 15 0 1 6 .
-	/etc/init.d/cyrus start
 }
 
 pkg_postrm () {
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index 7d87661861..ebf892ab3e 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DEPENDS = "db3 openssl"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 LICENSE = "BSD"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
 	   file://berkdb.m4.patch;patch=1"
@@ -49,8 +49,3 @@ pkg_postinst () {
 	echo "cyrus" | saslpasswd2 -p -c cyrus
 	chgrp mail /etc/sasldb2
 }
-
-pkg_postrm () {
-        grep cyrus /etc/passwd && deluser cyrus
-}
-
diff --git a/packages/nonworking/iperf/.mtn2git_empty b/packages/iperf/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/iperf/.mtn2git_empty
+++ b/packages/iperf/.mtn2git_empty
diff --git a/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty b/packages/iperf/iperf-1.7.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty
+++ b/packages/iperf/iperf-1.7.0/.mtn2git_empty
diff --git a/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
index 15b1bc2928..4f32e7498f 100644
--- a/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
+++ b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
@@ -1,5 +1,5 @@
---- lib/SocketAddr.cpp.orig	2004-10-05 12:10:06.763746800 +0200
-+++ lib/SocketAddr.cpp	2004-10-05 12:10:21.079570464 +0200
+--- ./../lib/SocketAddr.cpp.orig	2004-10-05 12:10:06.763746800 +0200
++++ ./../lib/SocketAddr.cpp	2004-10-05 12:10:21.079570464 +0200
 @@ -65,7 +65,7 @@
  
  
diff --git a/packages/nonworking/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb
index ef075e8c8a..cca0d78fec 100644
--- a/packages/nonworking/iperf/iperf_1.7.0.bb
+++ b/packages/iperf/iperf_1.7.0.bb
@@ -3,14 +3,14 @@ DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tu
 HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/"
 LICENSE = "BSD"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+PR = "r1"
 
 SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \
-	file://socketaddr-h-errno.diff;patch=1;pnum=0"
+	file://socketaddr-h-errno.diff;patch=1"
 
 inherit autotools
 
 S="${WORKDIR}/iperf-${PV}/cfg"
-PATCHES_DIR="${WORKDIR}/iperf-${PV}"
 
 do_configure() {
 	oe_runconf
diff --git a/packages/meta/openslug-native-packages.bb b/packages/meta/openslug-native-packages.bb
index d856bbfe87..8a32b9cb70 100644
--- a/packages/meta/openslug-native-packages.bb
+++ b/packages/meta/openslug-native-packages.bb
@@ -1,12 +1,15 @@
 DESCRIPTION = "Packages that are to be compiled nativly for the OpenSlug firmware"
 LICENSE = MIT
-PR = "r1"
+PR = "r2"
 
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
 
+# Just something the test with
 OPENSLUG_NATIVE_PACKAGES = "\
+	gzip \
+	vlan \
 	"
 
 BROKEN_PACKAGES = "\
diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb
index 8530111b0f..b52d2ef6eb 100644
--- a/packages/meta/openslug-native.bb
+++ b/packages/meta/openslug-native.bb
@@ -1,12 +1,13 @@
 DESCRIPTION = "Packages that are required for the OpenSlug native build environment"
 LICENSE = MIT
-PR = "r9"
+PR = "r10"
 
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
 
 OPENSLUG_NATIVE = "\
+	autoconf \
 	automake \
 	bash \
 	binutils binutils-dev binutils-symlinks \
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 1e53d342d2..a78f71002c 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -63,8 +63,11 @@ OPENSLUG_PACKAGES = "\
 	glib-2.0 \
 	gphoto2 \
 	gtk-doc \
+	iperf \
+	jpeg \
 	less \
 	libpam \
+	libpng \
 	libusb \
 	libxml2 \
 	man man-pages \
@@ -78,6 +81,7 @@ OPENSLUG_PACKAGES = "\
 	nail \
 	nano \
 	ncftp \
+	netpbm \
 	nfs-utils \
 	ntp \
 	obexftp openobex openobex-apps ircp \
@@ -106,12 +110,14 @@ OPENSLUG_PACKAGES = "\
 	sysfsutils \
 	thttpd \
 	thttpd \
+	tiff \
 	timezones \
 	unionfs-modules unionfs-utils \
 	vlan \
 	wget \
 	xinetd \
 	yp-tools ypbind ypserv \
+	zlib \
 	"
 
 BROKEN_PACKAGES = "\
diff --git a/packages/netpbm/.mtn2git_empty b/packages/netpbm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netpbm/.mtn2git_empty
diff --git a/packages/netpbm/files/.mtn2git_empty b/packages/netpbm/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netpbm/files/.mtn2git_empty
diff --git a/packages/netpbm/files/oeendiangen b/packages/netpbm/files/oeendiangen
new file mode 100644
index 0000000000..b01e5e855b
--- /dev/null
+++ b/packages/netpbm/files/oeendiangen
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# This replaces 'endiangen' for OpenEmbedded.  OE builds can rely on
+# the GNU endian.h, however this generates __ names, (unless __USE_BSD
+# is set) so we need to deal with this.  Match the output of endiangen.
+cat <<EOF
+#ifndef OE_ENDIAN_H
+#define OE_ENDIAN_H 1
+#include <ctype.h>
+#include <endian.h>
+
+#ifndef LITTLE_ENDIAN
+# define LITTLE_ENDIAN  __LITTLE_ENDIAN
+#endif
+#ifndef BIG_ENDIAN
+# define BIG_ENDIAN     __BIG_ENDIAN
+#endif
+#ifndef PDP_ENDIAN
+# define PDP_ENDIAN     __PDP_ENDIAN
+#endif
+#ifndef BYTE_ORDER
+# define BYTE_ORDER     __BYTE_ORDER
+#endif
+
+#ifndef BITS_PER_WORD
+# include <bits/wordsize.h>
+# define BITS_PER_WORD __WORDSIZE
+#endif
+#endif
+EOF
diff --git a/packages/netpbm/netpbm-10.28/.mtn2git_empty b/packages/netpbm/netpbm-10.28/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netpbm/netpbm-10.28/.mtn2git_empty
diff --git a/packages/netpbm/netpbm-10.28/Makefile.config b/packages/netpbm/netpbm-10.28/Makefile.config
new file mode 100644
index 0000000000..3407fcfd18
--- /dev/null
+++ b/packages/netpbm/netpbm-10.28/Makefile.config
@@ -0,0 +1,380 @@
+# This is the configuration file for OpenEmbedded
+# It is a generic file for *all* architectures supported by
+# OpenEmbedded.
+#
+# This is a make file inclusion, to be included in all the Netpbm make
+# files.
+
+# This file is meant to contain variable settings that customize the
+# build for a particular target system configuration.
+
+# The distribution contains the file Makefile.config.in.  You edit
+# Makefile.config.in in ways relevant to your particular environment 
+# to create Makefile.config.  The "configure" program will do this
+# for you in simple cases.
+
+# Some of the variables that the including make file must set for this
+# file to work:
+#
+#  SRCDIR: The directory at the top of the Netpbm source tree.  Note that
+#  this is typically a relative directory, and it must be relative to the
+#  make file that includes this file.
+
+DEFAULT_TARGET = merge
+
+# Fiasco has some special requirements that make it fail to compile on
+# some systems, and since it isn't very important, just set this to "N"
+# and skip it on those systems unless you want to debug it and fix it.
+# OpenBSD:
+#BUILD_FIASCO = N
+BUILD_FIASCO = Y
+
+# The following are commands for the build process to use.  These values
+# do not get built into anything.
+
+# The C compiler (including macro preprocessor)
+#CC = gcc
+
+# The linker.
+LD = $(CC)
+
+#If the linker identified above is a compiler that invokes a linker
+#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER.  The main difference is
+#that we expect a compiler to take linker options in the '-Wl,-opt1,val1'
+#syntax whereas the actual linker would take '-opt1 val1'.
+LINKERISCOMPILER=Y
+
+#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can
+#take a library as just another link object argument, as in 'ld
+#pnmtojpeg.o /usr/local/lib/libjpeg.so ...'  as opposed to requiring a
+#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'.
+#This variable controls how 'libopt' gets built.  Note that with some
+#linkers, you can specify a shared library explicitly, but then it has
+#to live in that exact place at run time.  That's not good enough for us.
+LINKER_CAN_DO_EXPLICIT_LIBRARY=Y
+
+# This is the name of the header file that declares the types
+# uint32_t, etc.  This name is used as #include $(INTTYPES_H)  .
+# Set to null if the types come automatically without including anything.
+INTTYPES_H = <inttypes.h>
+
+# HAVE_INT64 tells whether, assuming you include the header indicated by
+# INTTYPES_H, you have the int64_t type and related stuff.  (If you don't
+# the build will omit certain code that does 64 bit computations).
+HAVE_INT64 = Y
+
+# CC and LD are for building the Netpbm programs, which are not necessarily
+# intended to run on the same system on which Make is running.  But when we 
+# build a build tool such as Libopt, it is meant to run only on the same 
+# system on which the Make is running.  The variables below define programs
+# to use to compile and link build tools.
+CC_FOR_BUILD = $(BUILD_CC)
+LD_FOR_BUILD = $(BUILD_CC)
+
+# MAKE is set automatically by Make to what was used to invoke Make.
+
+INSTALL = install
+
+# STRIPFLAG is the option you pass to the above install program to make it
+# strip unnecessary information out of binaries.
+STRIPFLAG = -s
+
+SYMLINK = ln -s
+
+#MANPAGE_FORMAT is "nroff" or "cat".  It determines in what format the
+#pointer man pages are installed (ready to nroff, or ready to cat).  
+#A pointer man pages is just a single-paragraph pages that tells you there is
+#no man page for the program, to look at the HTML documentation instead.
+MANPAGE_FORMAT = nroff
+
+LEX = flex
+
+# EXE is a suffix that the linker puts on any executable it generates.
+# In cygwin, this is .exe and most programs deal with its existence without
+# us having to know about it.  Some don't though, so set this:
+EXE =
+
+# linker options.  
+
+# Linker options for created Netpbm shared libraries.
+
+# Here, $(SONAME) resolves to the soname for the shared library being created.
+# The following are gcc options.  This works on GNU libc systems.
+LDSHLIB = -shared -fpic -Wl,-soname,$(SONAME)
+
+# LDRELOC is the command to combine two .o files (relocateable object files)
+# into a single .o file that can later be linked into something else.  NONE
+# means no such command is available.
+LDRELOC = $(TARGET_LD) --reloc
+
+# On older systems, you have to make shared libraries out of position
+# independent code, so you need -fpic or fPIC here.  (The rule is: if
+# -fpic works, use it.  If it bombs, go to fPIC).  On newer systems,
+# it isn't necessary, but can save real memory at the expense of
+# execution speed.  Without position independent code, the library
+# loader may have to patch addresses into the executable text.  On an
+# older system, this would cause a program crash because the loader
+# would be writing into read-only shared memory.  But on newer
+# systems, the system silently creates a private mapping of the page
+# or segment being modified (the "copy on write" phenomenon).  So it
+# needs its own private real page frame.  In one experiment, A second
+# copy of Pbmtext used 16K less real memory when built with -fpic than
+# when built without.  2001.06.02.
+
+# We have seen -fPIC required on IA64 and AMD64 machines (GNU
+# compiler/linker).  Build-time linking fails without it.  I don't
+# know why -- history seems to be repeating itself.  2005.02.23.
+
+CFLAGS_SHLIB = -fpic
+
+# SHLIB_CLIB is the link option to include the C library in a shared library,
+# normally "-lc".  On typical systems, this serves no purpose.  On some,
+# though, it causes information about which C library to use to be recorded
+# in the shared library and thus choose the correct library among several or
+# avoid using an incompatible one.  But on some systems, the link fails.
+# On 2002.09.30, "John H. DuBois III" <spcecdt@armory.com> reports that on 
+# SCO OpenServer, he gets the following error message with -lc:
+#
+#  -lc; relocations referenced  ;  from file(s) /usr/ccs/lib/libc.so(random.o);
+#   fatal error: relocations remain against allocatable but non-writable 
+#   section: ; .text
+
+SHLIB_CLIB =
+
+# On some systems you have to build into an executable the list of
+# directories where its dynamically linked libraries can be found at
+# run time.  This is typically done with a -R or -rpath linker
+# option.  Even on systems that don't require it, you might prefer to do
+# that rather than set up environment variables or configuration files
+# to tell the system where the libraries are.  A "Y" here means to put
+# the directory information in the executable at link time.
+NEED_RUNTIME_PATH = Y
+
+# RPATHOPTNAME is the option you use on the link command to specify
+# a runtime search path for a shared library.  It is meaningless unless
+# NEED_RUNTIME_PATH is Y.
+RPATHOPTNAME = -rpath
+
+# The following variables tell where your various libraries on which
+# Netpbm depends live.  The LIBxxx variable is a full file
+# specification of the link library (not necessarily the library used
+# at run time).  e.g. "/usr/local/lib/graphics/libpng.so".  It usually
+# doesn't matter if the library prefix and suffix are right -- you can
+# use "lib" and ".so" or ".a" regardless of what your system actually
+# uses because these just turn into "-L" and "-l" linker options
+# anyway.  ".a" implies a static library for some purposes, though.
+# If you don't have the library in question, use a value of NONE for
+# LIBxxx and the build will simply skip the programs that require that
+# library.  If the library is in your linker's (or the Netpbm build's)
+# default search path, leave off the directory part, e.g. "libpng.so".
+
+# The xxxHDR_DIR variable is the directory in which the interface
+# headers for the library live (e.g. /usr/include).  If they are in your
+# compiler's default search path, set this variable to null.
+
+# This is where the Netpbm shared libraries will reside when Netpbm is
+# fully installed.  In some configurations, the Netpbm builder builds
+# this information into the Netpbm executables.  This does NOT affect
+# where the Netpbm installer installs the libraries.  A null value
+# means the libraries are in a default search path used by the runtime
+# library loader.
+NETPBMLIB_RUNTIME_PATH = $(libdir)
+#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm
+
+# The TIFF library.  See above.  If you want to build the tiff
+# converters, you must have the tiff library already installed.
+
+TIFFLIB = libtiff.so
+TIFFHDR_DIR =
+
+# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any
+# program linked with the TIFF library needs a Jpeg and/or Z library.
+# Some TIFF libraries have such library statically linked in, but others
+# need it to be dynamically linked at program load time.
+# Make this 'N' if youf TIFF library doesn't need such dynamic linking.
+# As of 2005.01, the most usual build of the TIFF library appears to require
+# both.
+TIFFLIB_NEEDS_JPEG = Y
+TIFFLIB_NEEDS_Z = Y
+
+# The JPEG library.  See above.  If you want to build the jpeg
+# converters you must have the jpeg library already installed.
+
+# Tiff files can use JPEG compression, so the Tiff library can reference
+# the JPEG library.  If your Tiff library references a dynamic JPEG 
+# library, you must specify at least JPEGLIB here, or the Tiff
+# converters will not build.  Note that your Tiff library may have the
+# JPEG stuff statically linked in, in which case you won't need 
+# JPEGLIB in order to build the Tiff converters.
+
+JPEGLIB = libjpeg.so
+JPEGHDR_DIR =
+
+# The PNG library.  See above.  If you want to build the PNG
+# converters you must have the PNG library already installed.
+
+# The PNG library, by convention starting around April 2002, gets installed
+# with names that include a version number, such as libpng10.a and header
+# files in /usr/include/libpng10.
+# option.
+PNGLIB = libpng.so
+PNGHDR_DIR =
+PNGVER = 
+
+# The zlib compression library.  See above.  You need it to build
+# anything that needs the PNG library (see above).  If you selected
+# NONE for the PNG library, it doesn't matter what you specify here --
+# it won't get used.
+ZLIB = libz.so
+ZHDR_DIR = 
+
+# The JBIG lossless image compression library (aka JBIG-KIT):
+JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a
+JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
+
+# The Jasper JPEG-2000 image compression library (aka JasPer):
+JASPERLIB = $(INTERNAL_JASPERLIB)
+JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
+# JASPERDEPLIBS is the libraries (-l options or file names) on which
+# The Jasper library depends -- i.e. what you have to link into any
+# executable that links in the Jasper library.
+JASPERDEPLIBS =
+#JASPERDEPLIBS = -ljpeg
+
+# And the Utah Raster Toolkit (aka URT aka RLE) library:
+URTLIB = $(BUILDDIR)/urt/librle.a
+URTHDR_DIR = $(SRCDIR)/urt
+
+# The Linux SVGA library (Svgalib) is a facility for displaying graphics
+# on the Linux console.  It is required by Ppmsvgalib.
+LINUXSVGALIB = NONE
+LINUXSVGAHDR_DIR = 
+
+# If you don't want any network functions, set OMIT_NETWORK to "y".
+# The only thing that requires network functions is the option in
+# ppmtompeg to run it on multiple computers simultaneously.  On some
+# systems network functions don't work or we haven't figured out how to 
+# make them work, or they just aren't worth the effort.  
+OMIT_NETWORK =
+
+# These are -l options to link in the network libraries.  Often, these are
+# built into the standard C library, so this can be null.  This is irrelevant
+# if OMIT_NETWORK is "y".
+NETWORKLD = 
+
+VMS = 
+#VMS:
+#VMS = yes
+
+# The following variables are used only by 'make install' (and the
+# variants of it).  Paths here don't, for example, get built into any
+# programs.
+
+# This is where everything goes when you do 'make package', unless you
+# override it by setting 'pkgdir' on the Make command line.
+PKGDIR_DEFAULT = /tmp/netpbm
+
+# File permissions for installed files.
+# Note that on some systems (e.g. Solaris), 'install' can't use the 
+# mnemonic permissions - you have to use octal.
+
+# binaries (pbmmake, etc)
+INSTALL_PERM_BIN =  755       # u=rwx,go=rx
+# shared libraries (libpbm.so, etc)
+INSTALL_PERM_LIBD = 755       # u=rwx,go=rx
+# static libraries (libpbm.a, etc)
+INSTALL_PERM_LIBS = 644       # u=rw,go=r
+# header files (pbm.h, etc)
+INSTALL_PERM_HDR =  644       # u=rw,go=r
+# man pages (pbmmake.1, etc)
+INSTALL_PERM_MAN =  644       # u=rw,go=r
+# data files (pnmtopalm color maps, etc)
+INSTALL_PERM_DATA = 644       # u=rw,go=r
+
+# Specify the suffix that want the man pages to have.
+
+SUFFIXMANUALS1 = 1
+SUFFIXMANUALS3 = 3
+SUFFIXMANUALS5 = 5
+
+#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the
+#Netpbm library functions.  The value is used only in make file tests.
+# "unixshared" means a unix-style shared library, typically named like 
+# libxyz.so.2.3
+NETPBMLIBTYPE = unixshared
+# "unixstatic" means a unix-style static library, (like libxyz.a)
+#NETPBMLIBTYPE = unixstatic
+# "dll" means a Windows DLL shared library
+#NETPBMLIBTYPE = dll
+# "dylib" means a Darwin/Mac OS shared library
+#NETPBMLIBTYPE = dylib
+
+#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is 
+#selected above.  All this is used for is to construct library names.
+#The make files never examine the actual value.
+NETPBMLIBSUFFIX = so
+
+# "a" is the suffix for unix-style static libraries.  It is also
+# traditionally used for shared libraries on AIX.  The Visual Age C
+# manual says sometimes .so works on AIX, and GNU software for AIX
+# 5.1.0 does indeed use it.  In our experiments, it works fine if you
+# name the library file explicitly on the link, but isn't in the -l
+# search order.  If you name the library explicitly on the link, the
+# library must live in exactly the same position at run time, so we
+# can't use that.  Therefore, you cannot build both static and shared
+# libraries with AIX.  You have to choose.
+#NETPBMLIBSUFFIX = a
+# For HP-UX shared libraries:
+#NETPBMLIBSUFFIX = sl
+# Darwin/Mac OS shared library:
+#NETPBMLIBSUFFIX = dylib
+# Windows shared library:
+#NETPBMLIBSUFFIX = dll
+
+#STATICLIB_TOO is "y" to signify that you want a static library built
+#and installed in addition to whatever library type you specified by
+#NETPBMLIBTYPE.  If NETPBMLIBTYPE specified a static library,
+#STATICLIB_TOO simply has no effect.
+STATICLIB_TOO = y
+#STATICLIB_TOO = n
+
+#STATICLIBSUFFIX is the suffix that static libraries have.  It's
+#meaningless if you aren't building static libraries.
+STATICLIBSUFFIX = a
+
+#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename
+#of a shared library may have on this system.  Traditionally, it's
+#just "lib", as in libc or libnetpbm.  On Windows, though, varying
+#prefixes are used when multiple alternative forms of a library are
+#available.  The first prefix in this list is what we use to name the
+#Netpbm shared libraries.
+#
+# This variable controls how 'libopt' gets built.
+#
+SHLIBPREFIXLIST = lib
+
+NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
+
+#DLLVER is used to version the DLLs built on cygwin or other
+#windowsish platforms.  We can't add this to LIBROOT, or we'd
+#version the static libs (which is bad).  We can't add this
+#at the end of the name (like unix does with so numbers) because
+#windows will only load dlls whose name ends in "dll".  So,
+#we have this variable, which becomes the end of the library "root" name
+#for DLLs only.
+#
+# This variable controls how 'libopt' gets built.
+#
+DLLVER =
+#Cygwin
+#DLLVER = $(NETPBM_MAJOR_RELEASE)
+
+#NETPBM_DOCURL is the URL of the main documentation page for Netpbm.
+#This is a directory which contains a file for each Netpbm program,
+#library, and file type.  E.g. The documentation for jpegtopnm might be in
+#http://netpbm.sourceforge.net/doc/jpegtopnm.html .  This value gets
+#installed in the man pages (which say no more than to read the webpage)
+#and in the Webman netpbm.url file.
+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
+#For a system with no web access, but a local copy of the doc:
+#NETPBM_DOCURL = file:/usr/doc/netpbm/
diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb
new file mode 100644
index 0000000000..b4f78a57a1
--- /dev/null
+++ b/packages/netpbm/netpbm_10.28.bb
@@ -0,0 +1,78 @@
+# bitbake configuration file for NetPBM, a command line image (sampled
+# data) processing package derived from PBMPlus
+#
+# For documentation see: http://netpbm.sourceforge.net/doc/
+LICENSE = "GPL MIT Artistic" 
+# NOTE: individual command line utilities are covered by different
+# licenses.  The compiled and linked command line utilties are
+# subject to the licenses of the libraries they use too - including
+# libpng libz, IJG, and libtiff licenses
+
+SECTION = "console/utils" 
+DEPENDS = "jpeg zlib libpng tiff install-native flex-native" 
+RDEPENDS = "perl"
+HOMEPAGE = "http://netpbm.sourceforge.net" 
+DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\
+conversion of images between a variety of different formats.  There\
+are over 220 separate tools in the package including converters for\
+about 100 graphics formats."
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \
+	   file://Makefile.config \
+	   file://oeendiangen" 
+
+EXTRA_OEMAKE = "ENDIANGEN=${S}/buildtools/oeendiangen TARGET_LD=${LD}"
+
+do_configure() { 
+	install -c -m 644 ../Makefile.config .
+	# The following stops the host endiangen program being run and uses
+	# the target endian.h header instead.
+	install -c -m 755 ../oeendiangen buildtools
+}
+
+do_compile() {
+	# need all to get the static library too
+	oe_runmake all default
+}
+	    
+do_install() { 
+	# netpbm makes its own installation package, which must then be
+	# installed to form the dummy installation for ipkg
+	rm -rf ${WORKDIR}/netpbm-package
+	oe_runmake package pkgdir=${WORKDIR}/netpbm-package
+	# now install the stuff from the package into ${D}
+	for d in ${WORKDIR}/netpbm-package/*
+	do
+		# following will cause an error if used
+		case "$d" in
+		*/README)	;;
+		*/VERSION)	;;
+		*/pkginfo)	;;
+		*/bin)		install -d ${D}${bindir}
+				cp -a "$d"/* ${D}${bindir}
+				rm ${D}${bindir}/doc.url;;
+		*/include)	install -d ${D}${includedir}
+				cp -a "$d"/* ${D}${includedir};;
+		*/link|*/lib)	install -d ${D}${libdir}
+				cp -a "$d"/* ${D}${libdir};;
+		*/man)		install -d ${D}${mandir}
+				cp -a "$d"/* ${D}${mandir};;
+		*/misc)		install -d ${D}${datadir}/netpbm
+				cp -a "$d"/* ${D}${datadir}/netpbm;;
+		*/config_template)
+				install -d ${D}${bindir}
+				sed "/^@/d
+					s!@VERSION@!$(<'${WORKDIR}/netpbm-package/VERSION')!
+					s!@DATADIR@!${datadir}/netpbm!
+					s!@LIBDIR@!${libdir}!
+					s!@LINKDIR@!${libdir}!
+					s!@INCLUDEDIR@!${includedir}!
+					s!@BINDIR@!${bindir}!
+					" "$d" >${D}${bindir}/netpbm-config
+				chmod 755 ${D}${bindir}/netpbm-config;;
+		*)		echo "netpbm-package/$d: unknown item" >&2
+				exit 1;;
+		esac
+	done
+} 
diff --git a/packages/perl/files/config.sh-mipsel-linux b/packages/perl/files/config.sh-mipsel-linux
index 299b0441ed..eedf443f04 100644
--- a/packages/perl/files/config.sh-mipsel-linux
+++ b/packages/perl/files/config.sh-mipsel-linux
@@ -36,8 +36,8 @@ api_subversion='0'
 api_version='8'
 api_versionstring='5.8.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.8.3/mipsel-linux'
-archlibexp='/usr/lib/perl5/5.8.3/mipsel-linux'
+archlib='/usr/lib/perl5/5.8.4/mipsel-linux'
+archlibexp='/usr/lib/perl5/5.8.4/mipsel-linux'
 archname64=''
 archname='mips-linux'
 archobjs=''
@@ -668,7 +668,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.8.3/mipsel-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.8.4/mipsel-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -676,13 +676,13 @@ installman1dir='./install_me_here/usr/share/man/man1'
 installman3dir='./install_me_here/usr/share/man/man3'
 installprefix='./install_me_here/usr'
 installprefixexp='./install_me_here/usr'
-installprivlib='./install_me_here/usr/lib/perl5/5.8.3'
+installprivlib='./install_me_here/usr/lib/perl5/5.8.4'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.3/mipsel-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/mipsel-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.3'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -809,8 +809,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.8.3'
-privlibexp='/usr/lib/perl5/5.8.3'
+privlib='/usr/lib/perl5/5.8.4'
+privlibexp='/usr/lib/perl5/5.8.4'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -871,8 +871,8 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
 sig_size='131'
 signal_t='void'
-sitearch='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux'
+sitearch='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.8.4/mipsel-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
@@ -962,6 +962,7 @@ uselongdouble='undef'
 usemorebits='undef'
 usemultiplicity='undef'
 usemymalloc='n'
+usemallocwrap='define'
 usenm='false'
 useopcode='true'
 useperlio='define'
@@ -1000,13 +1001,13 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.8.3'
+version='5.8.4'
 version_patchlevel_string='version 8 subversion 3'
 versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.8.3'
+xs_apiversion='5.8.4'
 yacc='yacc'
 yaccflags=''
 zcat=''
@@ -1022,5 +1023,4 @@ PERL_SUBVERSION=3
 PERL_API_REVISION=5
 PERL_API_VERSION=8
 PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=
-PERL_CONFIG_SH=true
+PERL_PATCHLEVELPERL_CONFIG_SH=true
diff --git a/packages/perl/perl-5.8.7/config.sh-i386-linux b/packages/perl/perl-5.8.7/config.sh-i386-linux
index 3996011a2b..ee989f66bb 100644
--- a/packages/perl/perl-5.8.7/config.sh-i386-linux
+++ b/packages/perl/perl-5.8.7/config.sh-i386-linux
@@ -36,8 +36,8 @@ api_subversion='0'
 api_version='8'
 api_versionstring='5.8.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.8.4/i386-linux'
-archlibexp='/usr/lib/perl5/5.8.4/i386-linux'
+archlib='/usr/lib/perl5/5.8.7/i386-linux'
+archlibexp='/usr/lib/perl5/5.8.7/i386-linux'
 archname64=''
 archname='i386-linux'
 archobjs=''
@@ -55,7 +55,7 @@ castflags='0'
 cat='cat'
 cc='cc'
 cccdlflags='-fpic'
-ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.4/i386-linux/CORE'
+ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.7/i386-linux/CORE'
 ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='gcc'
@@ -671,7 +671,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.8.4/i386-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.8.7/i386-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -679,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1'
 installman3dir='./install_me_here/usr/share/man/man3'
 installprefix='./install_me_here/usr'
 installprefixexp='./install_me_here/usr'
-installprivlib='./install_me_here/usr/lib/perl5/5.8.4'
+installprivlib='./install_me_here/usr/lib/perl5/5.8.7'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/i386-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/i386-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -811,8 +811,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.8.4'
-privlibexp='/usr/lib/perl5/5.8.4'
+privlib='/usr/lib/perl5/5.8.7'
+privlibexp='/usr/lib/perl5/5.8.7'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -873,17 +873,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
 sig_size='69'
 signal_t='void'
-sitearch='/usr/lib/perl5/site_perl/5.8.4/i386-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.8.4/i386-linux'
+sitearch='/usr/lib/perl5/site_perl/5.8.7/i386-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.8.7/i386-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.8.4'
+sitelib='/usr/lib/perl5/site_perl/5.8.7'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.8.4'
+sitelibexp='/usr/lib/perl5/site_perl/5.8.7'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -1004,7 +1004,7 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.8.4'
+version='5.8.7'
 version_patchlevel_string='version 8 subversion 4'
 versiononly='undef'
 vi=''
diff --git a/packages/perl/perl-5.8.7/config.sh-i686-linux b/packages/perl/perl-5.8.7/config.sh-i686-linux
index 0ea1826f3a..7d5a531266 100644
--- a/packages/perl/perl-5.8.7/config.sh-i686-linux
+++ b/packages/perl/perl-5.8.7/config.sh-i686-linux
@@ -36,8 +36,8 @@ api_subversion='0'
 api_version='8'
 api_versionstring='5.8.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.8.4/i686-linux'
-archlibexp='/usr/lib/perl5/5.8.4/i686-linux'
+archlib='/usr/lib/perl5/5.8.7/i686-linux'
+archlibexp='/usr/lib/perl5/5.8.7/i686-linux'
 archname64=''
 archname='i686-linux'
 archobjs=''
@@ -55,7 +55,7 @@ castflags='0'
 cat='cat'
 cc='cc'
 cccdlflags='-fpic'
-ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.4/i686-linux/CORE'
+ccdlflags='-Wl,-E -Wl,-rpath,./install_me_here/usr/lib/perl5/5.8.7/i686-linux/CORE'
 ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='gcc'
@@ -671,7 +671,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.8.4/i686-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.8.7/i686-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -679,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1'
 installman3dir='./install_me_here/usr/share/man/man3'
 installprefix='./install_me_here/usr'
 installprefixexp='./install_me_here/usr'
-installprivlib='./install_me_here/usr/lib/perl5/5.8.4'
+installprivlib='./install_me_here/usr/lib/perl5/5.8.7'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.4/i686-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/i686-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.4'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -811,8 +811,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.8.4'
-privlibexp='/usr/lib/perl5/5.8.4'
+privlib='/usr/lib/perl5/5.8.7'
+privlibexp='/usr/lib/perl5/5.8.7'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -873,17 +873,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
 sig_size='69'
 signal_t='void'
-sitearch='/usr/lib/perl5/site_perl/5.8.4/i686-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.8.4/i686-linux'
+sitearch='/usr/lib/perl5/site_perl/5.8.7/i686-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.8.7/i686-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.8.4'
+sitelib='/usr/lib/perl5/site_perl/5.8.7'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.8.4'
+sitelibexp='/usr/lib/perl5/site_perl/5.8.7'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -1004,7 +1004,7 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.8.4'
+version='5.8.7'
 version_patchlevel_string='version 8 subversion 4'
 versiononly='undef'
 vi=''
diff --git a/packages/perl/perl-5.8.7/config.sh-mipsel-linux b/packages/perl/perl-5.8.7/config.sh-mipsel-linux
index fa5f0a5b47..7696a3dff0 100644
--- a/packages/perl/perl-5.8.7/config.sh-mipsel-linux
+++ b/packages/perl/perl-5.8.7/config.sh-mipsel-linux
@@ -36,8 +36,8 @@ api_subversion='0'
 api_version='8'
 api_versionstring='5.8.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.8.3/mipsel-linux'
-archlibexp='/usr/lib/perl5/5.8.3/mipsel-linux'
+archlib='/usr/lib/perl5/5.8.7/mipsel-linux'
+archlibexp='/usr/lib/perl5/5.8.7/mipsel-linux'
 archname64=''
 archname='mips-linux'
 archobjs=''
@@ -435,6 +435,8 @@ d_strerrm='strerror(e)'
 d_strerror='define'
 d_strerror_r='undef'
 d_strftime='define'
+d_strlcat='undef'
+d_strlcpy='undef'
 d_strtod='define'
 d_strtol='define'
 d_strtold='define'
@@ -669,7 +671,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.8.3/mipsel-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.8.7/mipsel-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -677,13 +679,13 @@ installman1dir='./install_me_here/usr/share/man/man1'
 installman3dir='./install_me_here/usr/share/man/man3'
 installprefix='./install_me_here/usr'
 installprefixexp='./install_me_here/usr'
-installprivlib='./install_me_here/usr/lib/perl5/5.8.3'
+installprivlib='./install_me_here/usr/lib/perl5/5.8.7'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.3/mipsel-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.8.7/mipsel-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.3'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -810,8 +812,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.8.3'
-privlibexp='/usr/lib/perl5/5.8.3'
+privlib='/usr/lib/perl5/5.8.7'
+privlibexp='/usr/lib/perl5/5.8.7'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -872,8 +874,8 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0'
 sig_size='131'
 signal_t='void'
-sitearch='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.8.3/mipsel-linux'
+sitearch='/usr/lib/perl5/site_perl/5.8.7/mipsel-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.8.7/mipsel-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
@@ -963,6 +965,7 @@ uselongdouble='undef'
 usemorebits='undef'
 usemultiplicity='undef'
 usemymalloc='n'
+usemallocwrap='define'
 usenm='false'
 useopcode='true'
 useperlio='define'
@@ -1002,13 +1005,13 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.8.3'
-version_patchlevel_string='version 8 subversion 3'
+version='5.8.7'
+version_patchlevel_string='version 8 subversion 7'
 versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.8.3'
+xs_apiversion='5.8.7'
 yacc='yacc'
 yaccflags=''
 zcat=''
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 630c126bc2..b5d25257bb 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -5,7 +5,7 @@ include perl.inc
 SRC_URI += "file://config.sh-armeb-linux \
 	    file://config.sh-i386-linux"
 
-PR = "r11"
+PR = "r12"
 
 do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index c826dc5469..b9ef1fc2a5 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -26,7 +26,3 @@ pkg_postinst () {
         grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/mail --ingroup nogroup postfix
 }
 
-pkg_postrm () {
-        grep postfix /etc/passwd && deluser postfix
-}
-