More section fixes

BKrev: 416aa11e6aH4cgLtXbfv7aBu9HJHoQ

69 files changed, 449 insertions, 14 deletions

diff --git a/aalib/aalib_1.4rc5.oe b/aalib/aalib_1.4rc5.oe
index d871ab0eed..2847005898 100644
--- a/aalib/aalib_1.4rc5.oe
+++ b/aalib/aalib_1.4rc5.oe
@@ -1,5 +1,6 @@
 DEPENDS = "ncurses"
 DESCRIPTION = "An ASCII art gfx library."
+SECTION = "libs"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
diff --git a/abuse/abuse_0.7.0.oe b/abuse/abuse_0.7.0.oe
index 69ef8b4475..02458259f9 100644
--- a/abuse/abuse_0.7.0.oe
+++ b/abuse/abuse_0.7.0.oe
@@ -1,6 +1,7 @@
 DESCRIPTION = "Abuse-SDL is a port of Abuse by Crack Dot Com to Linux using the Simple DirectMedia Layer library."
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+SECTION = "opie/games"
 LICENSE = "GPL"
 DEPENDS = "virtual/libsdl libsdl-mixer libsdl-image"
 
diff --git a/adns/adns_1.0.oe b/adns/adns_1.0.oe
index b7f46bb908..d692ffb68e 100644
--- a/adns/adns_1.0.oe
+++ b/adns/adns_1.0.oe
@@ -1,4 +1,5 @@
 DESCRIPTION = "An advanced alternative, asynchronous resolver."
+SECTION = "console/network"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/adns/adns-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
diff --git a/alsa-lib/alsa-lib_1.0.4.oe b/alsa-lib/alsa-lib_1.0.4.oe
index 0e6a717683..f446feb581 100644
--- a/alsa-lib/alsa-lib_1.0.4.oe
+++ b/alsa-lib/alsa-lib_1.0.4.oe
@@ -1,5 +1,6 @@
 DESCRIPTION = "Alsa sound library"
 MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+SECTION = "base"
 LICENSE = "GPL"
 FILES_alsa-lib_append = " ${datadir}/alsa"
 
diff --git a/alsa-lib/alsa-lib_1.0.5.oe b/alsa-lib/alsa-lib_1.0.5.oe
index e69de29bb2..d134298316 100644
--- a/alsa-lib/alsa-lib_1.0.5.oe
+++ b/alsa-lib/alsa-lib_1.0.5.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "Alsa sound library"
+MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+LICENSE = "GPL"
+SECTION = "base"
+FILES_alsa-lib_append = " ${datadir}/alsa"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
+
+inherit autotools  pkgconfig
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
+
+do_stage () {
+	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/alsa/sound
+	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
+	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/alsa-oss/alsa-oss_1.0.4.oe b/alsa-oss/alsa-oss_1.0.4.oe
index a026b4d97f..5aee0f40cb 100644
--- a/alsa-oss/alsa-oss_1.0.4.oe
+++ b/alsa-oss/alsa-oss_1.0.4.oe
@@ -1,5 +1,6 @@
 DESCRIPTION = "Alsa OSS Compatibility Package"
 MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
 
diff --git a/alsa-oss/alsa-oss_1.0.5.oe b/alsa-oss/alsa-oss_1.0.5.oe
index e69de29bb2..5aee0f40cb 100644
--- a/alsa-oss/alsa-oss_1.0.5.oe
+++ b/alsa-oss/alsa-oss_1.0.5.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "Alsa OSS Compatibility Package"
+MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
+
+inherit autotools 
+
+do_configure_prepend () {
+	touch NEWS README AUTHORS ChangeLog
+}
+
+do_stage () {
+	oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
+	oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
+}
diff --git a/alsa-utils/alsa-utils_1.0.4.oe b/alsa-utils/alsa-utils_1.0.4.oe
index 82bc0b8939..b33d9de4c2 100644
--- a/alsa-utils/alsa-utils_1.0.4.oe
+++ b/alsa-utils/alsa-utils_1.0.4.oe
@@ -1,5 +1,6 @@
 DESCRIPTION = "Alsa Utilities"
 MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
 
diff --git a/alsa-utils/alsa-utils_1.0.5.oe b/alsa-utils/alsa-utils_1.0.5.oe
index e69de29bb2..b33d9de4c2 100644
--- a/alsa-utils/alsa-utils_1.0.5.oe
+++ b/alsa-utils/alsa-utils_1.0.5.oe
@@ -0,0 +1,9 @@
+DESCRIPTION = "Alsa Utilities"
+MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
+
+inherit autotools
diff --git a/appweb/appweb_1.0.0.oe b/appweb/appweb_1.0.0.oe
index f5d86adceb..4b2f595e34 100644
--- a/appweb/appweb_1.0.0.oe
+++ b/appweb/appweb_1.0.0.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
-
+SECTION = "console/network"
 SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz" 
 SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-5.tar.gz \
 		 file://charsignedness.patch;patch=1 \
diff --git a/appweb/appweb_1.0.1.oe b/appweb/appweb_1.0.1.oe
index 7ac09790bb..96039b07fe 100644
--- a/appweb/appweb_1.0.1.oe
+++ b/appweb/appweb_1.0.1.oe
@@ -1,4 +1,5 @@
 DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
+SECTION = "console/network"
 SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz"
 SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-5.tar.gz \
 		 file://charsignedness.patch;patch=1 \
diff --git a/appweb/appweb_1.0.2.oe b/appweb/appweb_1.0.2.oe
index e657ab680c..eccf56c506 100644
--- a/appweb/appweb_1.0.2.oe
+++ b/appweb/appweb_1.0.2.oe
@@ -1,4 +1,6 @@
 DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
+SECTION = "console/network"
+
 SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz"
 SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-12.tar.gz \
 		 file://charsignedness.patch;patch=1 \
diff --git a/appweb/appweb_1.2.0.oe b/appweb/appweb_1.2.0.oe
index e69de29bb2..f1bb90f7f9 100644
--- a/appweb/appweb_1.2.0.oe
+++ b/appweb/appweb_1.2.0.oe
@@ -0,0 +1,109 @@
+DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
+SECTION = "console/network"
+SRC_URI = "http://www.mbedthis.com/software/appWeb-src-1.2.0-1.tar.gz \
+	   file://makerules.patch;patch=1 \
+	   file://nonrootinstall.patch;patch=1"
+S = "${WORKDIR}/appWeb-1.2.0"
+
+APPWEB_HOST = "${HOST_SYS}"
+APPWEB_BUILD = "${BUILD_SYS}"
+#  --buildNumber=NUMBER     Set the build number part of the version (1.0.0.X).
+#  --name=NAME              Set the full product name (BLD_NAME define).
+#  --port=PORT              Set the default HTTP port to use for the product.
+#  --product=NAME           Set the one word (no spaces) name of the product.
+#  --setLibVersion=X.X.X    Set the shared library version number.
+#  --setVersion=X.X.X       Set the product version number.
+#  --sslPort=PORT           Set the default SSL port to use for the product.
+#  --type=BUILD             Set the build type (DEBUG|RELEASE).
+#
+#  --enable-access-log      Enable logging of requests to the AppWeb access log.
+#  --enable-assert          Build with assert checking.
+#  --enable-config          Build with the ability to parse Apache-style config
+#  --enable-cookie          Build with cookie handling support.
+#  --enable-digest-auth     Build with digest authentication support.
+#  --enable-fast-malloc     Build with the Mbedthis fast malloc.
+#  --enable-if-modified     Build with HTTP If-Modified checking.
+#  --enable-keep-alive      Build with HTTP Keep-Alive support.
+#  --enable-log             Build with the AppWeb trace log facility.
+#  --enable-modules         Build with the dynamically loaded modules capability.
+#  --enable-multi-thread    Build AppWeb multi-threaded.
+#  --disable-multi-thread   Build AppWeb single threaded.
+#  --enable-rom-fs          Build with the ability to load web pages from ROM.
+#  --enable-run-as-service  Build with the ability to run as a service/daemon.
+#  --disable-run-as-service Do not include the ability to run as a service.
+#  --enable-safe-strings    Enforce safe string handling.
+#  --enable-session         Build with HTTP session support.
+#  --enable-shared          Build an appWeb shared library and program. [default]
+#  --enable-shared-libc     Link with the shared versions of libc.
+#  --disable-shared-libc    Link with the static versions of libc.
+#  --enable-squeeze         Build in squeeze mode for minimal memory footprint.
+#  --disable-squeeze        Build for speed.
+#  --enable-static          Build a static appWeb library and program. [default]
+#  --disable-static         Do not build a static appWeb library and program.
+#
+#  --with-admin             Include the admin handler.
+#  --with-auth              Include the authorization handler.
+#  --with-c_api             Include the C API.
+#  --with-cgi               Include the CGI handler.
+#  --with-gacompat          Include GoAhead WebServer API compatibility.
+#  --with-copy              Build support for the copy handler.
+#  --with-egi               Include the EGI handler.
+#  --with-esp               Include the ESP handler.
+#  --with-ssl               Build support for the SSL protocol.
+#  --with-upload            Build with the file upload handler
+#  --with-xdb               Build with XDB 
+#  Supported PACKAGE names: openssl, php4, php5
+#  --with-PACKAGE=[builtin|, module]       
+#                           Include support for the PACKAGE. Link into appWeb 
+#                           statically and/or build as a module
+#  --with-PACKAGE-dir=DIR   Set the source directory of the package
+#  --with-PACKAGE-libs=libs Set a list of libraries to use when linking with
+#                             the PACKAGE
+#  --without-PACKAGE        Do not include support for the PACKAGE
+EXTRA_OECONF = "--prefix=${prefix} \
+		--docDir=${datadir}/doc/${P} \
+		--incDir=${includedir} \
+		--libDir=${libdir} \
+		--sbinDir=${sbindir} \
+		--webDir=${localstatedir}/www \
+		--build=${APPWEB_BUILD} \
+		--host=${APPWEB_HOST} \
+		--enable-keep-alive \
+		--enable-multi-thread \
+		--with-cgi=builtin \
+		--enable-cookie \
+		--enable-config \
+		--enable-digest-auth \
+		--without-ssl"
+
+export IFLAGS = "${CPPFLAGS}"
+export CC_FOR_BUILD = "${BUILD_CC}"
+export LD_FOR_BUILD = "${BUILD_LD}"
+
+LD_LIBRARY_PATH_prepend = "${S}/lib:"
+LD_LIBRARY_PATH[export] = "1"
+do_configure () {
+	./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+	oe_runmake build
+	oe_runmake compile
+}
+
+do_stage () {
+	:
+}
+
+do_install () {
+	oe_runmake 'PKG_DIR=${D}' install-all
+}
+
+#do_install () {
+#	install -d ${D}/${sbindir} ${D}/${sysconfdir}/appWeb/lib \
+#		   ${D}/${libexecdir}/appWeb ${D}/${libdir}
+#	install -m 0755 appWeb/appWeb ${D}/${sbindir}/
+#	install -m 0644 appWeb/appWeb.conf ${D}/${sysconfdir}/appWeb/
+#	install -m 0755 bin/${APPWEB_OS}/* ${D}/${libexecdir}/appWeb/
+#	install -m 0755 lib/lib*.so* ${D}/${sysconfdir}/appWeb/lib/
+#}
diff --git a/aspell/aspell_0.50.5.oe b/aspell/aspell_0.50.5.oe
index 9ec98ca8cb..c71cc1c8d1 100644
--- a/aspell/aspell_0.50.5.oe
+++ b/aspell/aspell_0.50.5.oe
@@ -2,6 +2,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/aspell-${PV}.tar.gz \
 	file://mk-dirs_h.py \
 	file://makefile.patch;patch=1"
 DESCRIPTION = "GNU Aspell spell-checker"
+SECTION = "console/utils"
 
 PACKAGES =+ "libaspell libpspell libpspell-dev aspell-utils"
 
diff --git a/at/at_3.1.8.oe b/at/at_3.1.8.oe
index 170cd636e7..1197166698 100644
--- a/at/at_3.1.8.oe
+++ b/at/at_3.1.8.oe
@@ -1,5 +1,6 @@
 DEPENDS = "flex"
 DESCRIPTION = "Delayed job execution and batch processing."
+SECTION = "base"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}-11.tar.gz \
 	   file://configure.patch;patch=1 \
diff --git a/atd/atd_0.70.oe b/atd/atd_0.70.oe
index 53470e5202..05f2f6e97e 100644
--- a/atd/atd_0.70.oe
+++ b/atd/atd_0.70.oe
@@ -1,6 +1,6 @@
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/atd;tag=ATD-0_70"
 S = "${WORKDIR}/atd"
-
+SECTION = "base"
 inherit update-rc.d
 
 INITSCRIPT_NAME = "atd"
diff --git a/atk/atk_1.2.0.oe b/atk/atk_1.2.0.oe
index d0343213e6..7e3154c436 100644
--- a/atk/atk_1.2.0.oe
+++ b/atk/atk_1.2.0.oe
@@ -1,5 +1,6 @@
 DEPENDS = "glib-2.0"
 DESCRIPTION = "An accessibility toolkit for GNOME."
+SECTION = "x11/libs"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/atk/1.2/atk-${PV}.tar.bz2 \
 	   file://m4.patch;patch=1"
diff --git a/atk/atk_1.6.0.oe b/atk/atk_1.6.0.oe
index aa94a8b157..e2937967dd 100644
--- a/atk/atk_1.6.0.oe
+++ b/atk/atk_1.6.0.oe
@@ -1,6 +1,6 @@
 DEPENDS = "glib-2.0"
 DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "libs"
+SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 
diff --git a/atmelwlandriver/atmelwlandriver_3.3.5.6.oe b/atmelwlandriver/atmelwlandriver_3.3.5.6.oe
index e69de29bb2..62da93a3fd 100644
--- a/atmelwlandriver/atmelwlandriver_3.3.5.6.oe
+++ b/atmelwlandriver/atmelwlandriver_3.3.5.6.oe
@@ -0,0 +1,38 @@
+SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \
+	file://dotconfig \
+	file://pcmf502rd.conf \
+	file://makefile.patch;patch=1"
+S = "${WORKDIR}/atmelwlandriver"
+
+inherit module
+SECTION = "base"
+
+do_configure() {
+	install ${WORKDIR}/dotconfig .config
+}
+
+CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includes/pcmcia -I${STAGING_KERNEL_DIR}/include"
+
+do_compile() {
+	export INC="${S}/src/includes"
+	export OBJDIR="${D}/lib/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/"
+	export KERNEL_PATH="${STAGING_KERNEL_DIR}"
+	export KERNEL_SRC="${STAGING_KERNEL_DIR}"
+	export CC="${KERNEL_CC}" 
+	export LD="${KERNEL_LD}"
+	export KERNEL_VERSION="${KERNEL_VERSION}"
+	export TOPDIR="${S}"
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	install -d ${OBJDIR}
+	#oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM' MODULE:='pcmf502r' LIB:=-RFMD-
+	oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_D' MODULE:='pcmf502rd' LIB:=-REVD-
+	#oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_E' MODULE:='pcmf502re' LIB:=-REVE-
+}
+
+do_install() {
+	install -d ${D}/etc/pcmcia
+	install -m 0644 ${WORKDIR}/pcmf502rd.conf ${D}/etc/pcmcia/
+
+	# remove any maps that were installed
+	rm -f ${D}/lib/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/*.map
+}
diff --git a/aumix/aumix_2.8.oe b/aumix/aumix_2.8.oe
index fadd3c65d6..9dc6151788 100644
--- a/aumix/aumix_2.8.oe
+++ b/aumix/aumix_2.8.oe
@@ -1,5 +1,6 @@
 DEPENDS = "ncurses"
 DESCRIPTION = "A mixer for the terminal or X11, with mouse support."
+SECTION = "console/multimedia"
 
 SRC_URI = "http://jpj.net/~trevor/aumix/aumix-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
diff --git a/autoconf/autoconf_2.57.oe b/autoconf/autoconf_2.57.oe
index 093c52ac49..73c7711683 100644
--- a/autoconf/autoconf_2.57.oe
+++ b/autoconf/autoconf_2.57.oe
@@ -3,4 +3,5 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
 DESCRIPTION = "A package of M4 macros to produce scripts to \
 automatically configure sourcecode." 
 
+SECTION = "devel"
 inherit autotools
diff --git a/autofs/autofs_3.1.7.oe b/autofs/autofs_3.1.7.oe
index 865c0263c5..2f342fd7ab 100644
--- a/autofs/autofs_3.1.7.oe
+++ b/autofs/autofs_3.1.7.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Kernel based automounter for linux."
-
+SECTION = "base"
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2"
 
 inherit autotools
diff --git a/autofs/autofs_4.0.0.oe b/autofs/autofs_4.0.0.oe
index c068240111..ac1266c4c3 100644
--- a/autofs/autofs_4.0.0.oe
+++ b/autofs/autofs_4.0.0.oe
@@ -1,4 +1,5 @@
 DESCRIPTION = "Kernel based automounter for linux."
+SECTION = "base"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/old/autofs-${PV}-1.tar.bz2"
 
diff --git a/autofs/autofs_4.1.3.oe b/autofs/autofs_4.1.3.oe
index e69de29bb2..f326d04a0b 100644
--- a/autofs/autofs_4.1.3.oe
+++ b/autofs/autofs_4.1.3.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = "Kernel based automounter for linux."
+SECTION = "base"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \
+	   http://www.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.3-bad_chdir.patch;patch=1 \
+	   http://www.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.3-mtab_lock.patch;patch=1 \
+	   http://www.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.3-non_block_ping.patch;patch=1 \
+	   http://www.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.3-strict.patch;patch=1 \
+	   file://cross.patch;patch=1"
+
+inherit autotools
+
+do_configure_prepend () {
+	if [ ! -e acinclude.m4 ]; then
+		cp aclocal.m4 acinclude.m4
+	fi
+}
+
+do_install () {
+	oe_runmake 'INSTALLROOT=${D}' install
+}
diff --git a/automake/automake_1.7.7.oe b/automake/automake_1.7.7.oe
index 46b93fce5f..17b3c61ca3 100644
--- a/automake/automake_1.7.7.oe
+++ b/automake/automake_1.7.7.oe
@@ -1,6 +1,6 @@
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
 DESCRIPTION = "A tool for automatically generating Makefiles."
-
+SECTION = "devel"
 inherit autotools
 
 do_install () {
diff --git a/automake/automake_1.8.2.oe b/automake/automake_1.8.2.oe
index 814b061dda..5a6eed1b04 100644
--- a/automake/automake_1.8.2.oe
+++ b/automake/automake_1.8.2.oe
@@ -1,6 +1,7 @@
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
 	   file://automake182-update-configscripts.patch;patch=1;pnum=1"
 DESCRIPTION = "A tool for automatically generating Makefiles."
+SECTION = "devel"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/automake-${PV}"
 
diff --git a/avr-libc/avr-libc_1.0.3.oe b/avr-libc/avr-libc_1.0.3.oe
index 3123138128..b727df43c0 100644
--- a/avr-libc/avr-libc_1.0.3.oe
+++ b/avr-libc/avr-libc_1.0.3.oe
@@ -1,6 +1,7 @@
 HOMEPAGE = "http://www.nongnu.org/avr-libc"
 DESCRIPTION = "C library for use with GCC on Atmel AVR microcontrollers"
 PROVIDES = "virtual/libc"
+SECTION = "libs"
 
 python __anonymous () {
     import oe, re
diff --git a/balsa/balsa_2.0.17.oe b/balsa/balsa_2.0.17.oe
index ad7e4319ca..585a656293 100644
--- a/balsa/balsa_2.0.17.oe
+++ b/balsa/balsa_2.0.17.oe
@@ -1,10 +1,13 @@
 DESCRIPTION = "Balsa is an e-mail client for GNOME, highly configurable and \
 incorporating all the features you would expect in a robust mail client."
 HOMEPAGE = "http://balsa.gnome.org"
+SECTION = "x11/network"
+
 DEPENDS = "libesmtp glib-2.0 libgnome libgnomeui gtk+ gnome-vfs libbonobo aspell pcre libtool openssl gtkhtml-3.0"
 RDEPENDS = "gdk-pixbuf-loader-xpm"
 PR = "r3"
 
+
 SRC_URI = "http://balsa.gnome.org/balsa-2.0.17.tar.bz2 \
 	   file://libmutt-cross.patch;patch=1 \
 	   file://desktop-file-fix.patch;patch=1"
diff --git a/base-passwd/base-passwd_3.5.7.oe b/base-passwd/base-passwd_3.5.7.oe
index cf80de8be1..b0ff2e3690 100644
--- a/base-passwd/base-passwd_3.5.7.oe
+++ b/base-passwd/base-passwd_3.5.7.oe
@@ -1,4 +1,5 @@
 DESCRIPTION = "Base system password/group files."
+SECTION = "base"
 PR="r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
diff --git a/bash/bash_2.05b.oe b/bash/bash_2.05b.oe
index 8e7561b327..fc188313e4 100644
--- a/bash/bash_2.05b.oe
+++ b/bash/bash_2.05b.oe
@@ -1,5 +1,6 @@
 DEPENDS = "ncurses"
 DESCRIPTION = "An sh-compatible command language interpreter."
+SECTION = "base"
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
diff --git a/bc/bc_1.06.oe b/bc/bc_1.06.oe
index 28a445de4e..b1eb54a857 100644
--- a/bc/bc_1.06.oe
+++ b/bc/bc_1.06.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "An arbitrary precision calculator language."
-
+SECTION = "console/utils"
 SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
 
 inherit autotools
diff --git a/beepmp/beepmp_0.9.7rc2.oe b/beepmp/beepmp_0.9.7rc2.oe
index e69de29bb2..2c7bf21c26 100644
--- a/beepmp/beepmp_0.9.7rc2.oe
+++ b/beepmp/beepmp_0.9.7rc2.oe
@@ -0,0 +1,26 @@
+# beepmp OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="A GTK2 based media player that looks alot like XMMS"
+SECTION = "x11/multimedia"
+HOMEPAGE="http://beepmp.sourceforge.net"
+LICENSE="GPL"
+
+SRC_URI="${${SOURCEFORGE_MIRROR}/beepmp/bmp-${PV}.tar.gz \
+	file://bugfix.patch;patch=1"
+
+inherit autotools pkgconfig
+
+DEPENDS="gtk+ libglade libogg libvorbis"
+S="${WORKDIR}/bmp-0.9.7"
+
+FILES_${PN} += " ${libdir}/bmp/Output/*.so ${libdir}/bmp/Input/*.so \
+	${libdir}/bmp/Visualization/*.so ${datadir}/bmp"
+	
+EXTRA_OECONF="--disable-esd --disable-alsa --enable-simd"
+
+do_configure() {
+	rm -rf  m4/libtool.m4
+	autotools_do_configure	
+}
diff --git a/bison/bison-native_1.875.oe b/bison/bison-native_1.875.oe
index 9b73b7b750..21eeb5cf67 100644
--- a/bison/bison-native_1.875.oe
+++ b/bison/bison-native_1.875.oe
@@ -1,5 +1,5 @@
 include bison_${PV}.oe
-
+SECTION = "devel"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/bison-${PV}"
 S = "${WORKDIR}/bison-${PV}"
 
diff --git a/blueprobe/blueprobe_0.12.oe b/blueprobe/blueprobe_0.12.oe
index e69de29bb2..3df1207a75 100644
--- a/blueprobe/blueprobe_0.12.oe
+++ b/blueprobe/blueprobe_0.12.oe
@@ -0,0 +1,4 @@
+SRC_URI = "${GPE_MIRROR}/blueprobe-${PV}.tar.gz"
+SECTION = "x11/network"
+inherit gpe
+
diff --git a/blueprobe/blueprobe_0.13.oe b/blueprobe/blueprobe_0.13.oe
index e69de29bb2..900ed6a845 100644
--- a/blueprobe/blueprobe_0.13.oe
+++ b/blueprobe/blueprobe_0.13.oe
@@ -0,0 +1,3 @@
+SECTION = "x11/network"
+inherit gpe
+
diff --git a/bootmenu/bootmenu_0.6.oe b/bootmenu/bootmenu_0.6.oe
index e9e734c397..964da36b8a 100644
--- a/bootmenu/bootmenu_0.6.oe
+++ b/bootmenu/bootmenu_0.6.oe
@@ -1,4 +1,5 @@
 DESCRIPTION = "Pluginable bootup menu."
+SECTION = "base"
 
 SRC_URI = "http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-${PV}.tar.gz \
 	   file://compile.patch;patch=1"
diff --git a/bootmenu/bootmenu_0.7.oe b/bootmenu/bootmenu_0.7.oe
index c0a320c805..fd7814d5ca 100644
--- a/bootmenu/bootmenu_0.7.oe
+++ b/bootmenu/bootmenu_0.7.oe
@@ -1,4 +1,5 @@
 DESCRIPTION = "Pluginable bootup menu."
+SECTION = "base"
 
 SRC_URI = "http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-${PV}.tar.gz"
 
diff --git a/bridge-utils/bridge-utils_0.9.7.oe b/bridge-utils/bridge-utils_0.9.7.oe
index e69de29bb2..75a99eaf99 100644
--- a/bridge-utils/bridge-utils_0.9.7.oe
+++ b/bridge-utils/bridge-utils_0.9.7.oe
@@ -0,0 +1,15 @@
+DESCRIPTION = "Tools for ethernet bridging."
+LICENSE = "GPL"
+SECTION = "console/network"
+SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tgz \
+	   file://failout.patch;patch=1"
+S = "${WORKDIR}/bridge-utils-${PV}"
+
+# The default sourceforge mirror does not yet have this package, and
+# sourceforge redirects on the file missing so wget doesn't realize it failed.
+# Force our own default here, since its known to have it.
+PREMIRRORS_prepend = "${SOURCEFORGE_MIRROR}   http://unc.dl.sourceforge.net/sourceforge"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
diff --git a/bridge-utils/bridge-utils_1.0.4.oe b/bridge-utils/bridge-utils_1.0.4.oe
index 787ba2bb9b..4dcafa8565 100644
--- a/bridge-utils/bridge-utils_1.0.4.oe
+++ b/bridge-utils/bridge-utils_1.0.4.oe
@@ -1,4 +1,5 @@
 DESCRIPTION = "Tools for ethernet bridging."
+SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "sysfsutils"
 RDEPENDS = "kernel-module-bridge"
diff --git a/busybox/busybox_1.00-rc1.oe b/busybox/busybox_1.00-rc1.oe
index 5a1539f2ef..3156c336b0 100644
--- a/busybox/busybox_1.00-rc1.oe
+++ b/busybox/busybox_1.00-rc1.oe
@@ -9,6 +9,7 @@ provides a fairly complete POSIX environment for any small or embedded \
 system."
 HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
+SECTION = "base"
 PR = "r2"
 
 #	file://busybox-1.00-pre10-fuser.patch;patch=1
diff --git a/bvi/bvi_1.3.1.oe b/bvi/bvi_1.3.1.oe
index 728d532be1..a9c9c4762e 100644
--- a/bvi/bvi_1.3.1.oe
+++ b/bvi/bvi_1.3.1.oe
@@ -1,5 +1,6 @@
 HOMEPAGE = "http://bvi.sourceforge.net/"
 DESCRIPTION = "binary vi (binary file editor)"
+SECTION = "console/utils"
 DEPENDS = "ncurses"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bvi/bvi-${PV}.src.tar.gz \
diff --git a/bzflag/bzflag_1.10.6.20040515.oe b/bzflag/bzflag_1.10.6.20040515.oe
index e69de29bb2..0330712774 100644
--- a/bzflag/bzflag_1.10.6.20040515.oe
+++ b/bzflag/bzflag_1.10.6.20040515.oe
@@ -0,0 +1,9 @@
+DEPENDS = "adns ncurses x11"
+SECTION = "x11/games"
+SRC_URI = "${SOURCEFORGE_MIRROR}/bzflag/bzflag-${PV}.tar.bz2"
+S = "${WORKDIR}/bzflag-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-bzadmin \
+		--enable-client"
diff --git a/bzip2/bzip2_1.0.2.oe b/bzip2/bzip2_1.0.2.oe
index 7de4543692..f0a75caabc 100644
--- a/bzip2/bzip2_1.0.2.oe
+++ b/bzip2/bzip2_1.0.2.oe
@@ -1,4 +1,5 @@
 DESCRIPTION = "Very high-quality data compression program."
+SECTION = "console/utils"
 
 SRC_URI = "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-${PV}.tar.gz \
 	   file://installpaths.patch;patch=1"
diff --git a/c-ares/c-ares_1.1.0.oe b/c-ares/c-ares_1.1.0.oe
index 6962afd36c..de9b316393 100644
--- a/c-ares/c-ares_1.1.0.oe
+++ b/c-ares/c-ares_1.1.0.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "c-ares is a C library that resolves names asynchronously."
-
+SECTION = "libs"
 SRC_URI = "http://daniel.haxx.se/projects/c-ares/c-ares-${PV}.tar.gz"
 S = "${WORKDIR}/c-ares-${PV}"
 
diff --git a/came/came_1.7.oe b/came/came_1.7.oe
index e69de29bb2..0459fe0e7b 100644
--- a/came/came_1.7.oe
+++ b/came/came_1.7.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "camE is a rewrite of the xawtv webcam app, which adds imlib2 \
+support and additional features."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "curl giblib"
+SECTION = "x11/utils"
+
+SRC_URI = "http://linuxbrit.co.uk/downloads/camE-${PV}.tar.gz \
+           file://make.patch;patch=1 \
+           file://compile.patch;patch=1"
+S = "${WORKDIR}/camE-${PV}"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' \
+		   'prefix=${prefix}' \
+		   'exec_prefix=${exec_prefix}' \
+		   'bindir=${bindir}' \
+		   'mandir=${mandir}' \
+		   'docdir=${datadir}/doc/${P}' \
+		   install
+}
diff --git a/camsource/camsource_0.7.0.oe b/camsource/camsource_0.7.0.oe
index e69de29bb2..fa9994974d 100644
--- a/camsource/camsource_0.7.0.oe
+++ b/camsource/camsource_0.7.0.oe
@@ -0,0 +1,12 @@
+DESCRIPTION = "camsource grabs images from a video4linux device and makes them \
+available to various plugins for processing or handling."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "jpeg libxml2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/camsource/camsource-${PV}.tar.bz2 \
+	   file://gcc34.patch;patch=1"
+S = "${WORKDIR}/camsource-${PV}"
+
+inherit autotools
diff --git a/ccache/ccache_2.3.oe b/ccache/ccache_2.3.oe
index 38e1e629f9..d4d5053098 100644
--- a/ccache/ccache_2.3.oe
+++ b/ccache/ccache_2.3.oe
@@ -1,5 +1,6 @@
 HOMEPAGE = "http:/ccache.samba.org"
 DESCRIPTION = "compiler cache"
+SECTION = "devel"
 
 SRC_URI = "http://ccache.samba.org/ftp/ccache/ccache-${PV}.tar.gz"
 
diff --git a/centericq/centericq_4.11.0.oe b/centericq/centericq_4.11.0.oe
index e69de29bb2..26e42f3b6e 100644
--- a/centericq/centericq_4.11.0.oe
+++ b/centericq/centericq_4.11.0.oe
@@ -0,0 +1,15 @@
+DEPENDS = "openssl ncurses"
+DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \
+AIM, IRC, Jabber and LiveJournal"
+SECTION = "console/network"
+SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
+	   file://m4.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.."
+acpaths = "-I ${S}/m4"
+
+# FIXME: ugly compile failures
+BROKEN = "1"
diff --git a/centericq/centericq_4.9.10.oe b/centericq/centericq_4.9.10.oe
index ceecdb7807..12fe406ef5 100644
--- a/centericq/centericq_4.9.10.oe
+++ b/centericq/centericq_4.9.10.oe
@@ -1,7 +1,7 @@
 DEPENDS = "openssl ncurses"
 DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \
 AIM, IRC, Jabber and LiveJournal"
-
+SECTION = "console/network"
 SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
 	   file://m4.patch;patch=1"
diff --git a/centericq/centericq_4.9.7.oe b/centericq/centericq_4.9.7.oe
index bc00763330..51c6ad71da 100644
--- a/centericq/centericq_4.9.7.oe
+++ b/centericq/centericq_4.9.7.oe
@@ -1,6 +1,7 @@
 DEPENDS = "openssl ncurses"
 DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \
 AIM, IRC, Jabber and LiveJournal"
+SECTION = "console/network"
 
 SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
diff --git a/cetools/cetools-native_0.3.oe b/cetools/cetools-native_0.3.oe
index e69de29bb2..63f3ddf0c3 100644
--- a/cetools/cetools-native_0.3.oe
+++ b/cetools/cetools-native_0.3.oe
@@ -0,0 +1,7 @@
+SECTION = "console/network"
+include cetools_${PV}.oe
+inherit native
+
+do_stage() {
+	install -m 0755 rom2files rom2bin bin2rom dump2bin ${STAGING_BINDIR}
+}
diff --git a/cetools/cetools_0.3.oe b/cetools/cetools_0.3.oe
index e4b7fb537d..cd1a4ef97c 100644
--- a/cetools/cetools_0.3.oe
+++ b/cetools/cetools_0.3.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Ethload for Linux is a tool to send ROM images over ethernet using tftp."
-
+SECTION = "console/network"
 SRC_URI = "http://linuxsh.free.fr/tools/cetools-${PV}.tar.gz \
 	   file://sean-hsieh.patch;patch=1"
 S = "${WORKDIR}/cetools-${PV}"
diff --git a/cflow/cflow_2.0.oe b/cflow/cflow_2.0.oe
index 04a5bbf4e3..e10520eb64 100644
--- a/cflow/cflow_2.0.oe
+++ b/cflow/cflow_2.0.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Utility for viewing function call flow."
-
+SECTION = "devel"
 SRC_URI = "http://www.ibiblio.org/pub/Linux/devel/lang/c/cflow-${PV}.tar.gz \
 	   file://compile.patch;patch=1"
 
diff --git a/chkhinge/chkhinge_20040706.oe b/chkhinge/chkhinge_20040706.oe
index 1974d5a43d..89300c6a1c 100644
--- a/chkhinge/chkhinge_20040706.oe
+++ b/chkhinge/chkhinge_20040706.oe
@@ -1,3 +1,4 @@
+SECTION = "base"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/chkhinge;date=${PV}"
 S = "${WORKDIR}/chkhinge"
 
diff --git a/ckermit/ckermit_209.oe b/ckermit/ckermit_209.oe
index c6884f298d..1c08597360 100644
--- a/ckermit/ckermit_209.oe
+++ b/ckermit/ckermit_209.oe
@@ -3,7 +3,7 @@ software package offering a consistent, medium-independent, \
 cross-platform approach to connection establishment, terminal \
 sessions, file transfer, character-set translation, and automation \
 of communication tasks."
-
+SECTION = "console/network"
 SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
 	   file://compile.patch;patch=1"
diff --git a/conserver/conserver_8.1.2.oe b/conserver/conserver_8.1.2.oe
index d8fe7070aa..38d8ceafbc 100644
--- a/conserver/conserver_8.1.2.oe
+++ b/conserver/conserver_8.1.2.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Conserver provides remote access to serial port \
 consoles and logs all data to a central host."
-
+SECTION = "console/network"
 SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz"
 
 inherit autotools
diff --git a/cpufreqd/cpufreqd_1.1.2.oe b/cpufreqd/cpufreqd_1.1.2.oe
index 1a92d19755..8f0e3ace1b 100644
--- a/cpufreqd/cpufreqd_1.1.2.oe
+++ b/cpufreqd/cpufreqd_1.1.2.oe
@@ -2,6 +2,7 @@ DESCRIPTION = "cpufreqd is meant to be a replacement of the speedstep \
 applet you can find in Windows. It monitors battery level, CPU usage, \
 AC state, and running programs and adjusts the frequency governor \
 according to a set of rules specified in the config file."
+SECTION = "console/utils"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cpufreqd/cpufreqd-${PV}.tar.gz \
 	   file://nonrootinstall.patch;patch=1"
diff --git a/cramfs/cramfs-native_1.1.oe b/cramfs/cramfs-native_1.1.oe
index e69de29bb2..f7fcfd6080 100644
--- a/cramfs/cramfs-native_1.1.oe
+++ b/cramfs/cramfs-native_1.1.oe
@@ -0,0 +1,17 @@
+SECTION = "base"
+SRC_URI = "${SOURCEFORGE_MIRROR}/cramfs/cramfs-1.1.tar.gz"
+DEPENDS = "zlib-native"
+
+S = "${WORKDIR}/cramfs-${PV}"
+
+inherit native
+
+do_compile() {
+	oe_runmake
+}
+
+do_stage() {
+	install mkcramfs ${STAGING_BINDIR}
+	install cramfsck ${STAGING_BINDIR}
+}
+
diff --git a/cramfs/cramfs_1.1.oe b/cramfs/cramfs_1.1.oe
index e69de29bb2..dcf4e54b6c 100644
--- a/cramfs/cramfs_1.1.oe
+++ b/cramfs/cramfs_1.1.oe
@@ -0,0 +1,14 @@
+SECTION = "base"
+SRC_URI = "${SOURCEFORGE_MIRROR}/cramfs/cramfs-1.1.tar.gz"
+DEPENDS = "zlib"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install mkcramfs ${D}${bindir}
+	install cramfsck ${D}${bindir}
+}
+
diff --git a/cron/cron_3.0pl1.oe b/cron/cron_3.0pl1.oe
index 7dd6b9954b..4bbab86a1e 100644
--- a/cron/cron_3.0pl1.oe
+++ b/cron/cron_3.0pl1.oe
@@ -1,3 +1,4 @@
+SECTION = "base"
 DESCRIPTION = "Vixie cron."
 
 SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \
diff --git a/cscope/cscope_15.5.oe b/cscope/cscope_15.5.oe
index d98caab7d8..8fcb1d73d6 100644
--- a/cscope/cscope_15.5.oe
+++ b/cscope/cscope_15.5.oe
@@ -1,5 +1,6 @@
 DEPENDS = "ncurses"
 DESCRIPTION = "A text screen-based source browser."
+SECTION = "console/utils"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cscope/cscope-${PV}.tar.gz"
 
diff --git a/cups/cups_1.1.19.oe b/cups/cups_1.1.19.oe
index 511bfdc53c..953fe202c2 100644
--- a/cups/cups_1.1.19.oe
+++ b/cups/cups_1.1.19.oe
@@ -1,3 +1,4 @@
+SECTION = "console/utils"
 DEPENDS = "openssl jpeg libpng zlib"
 DESCRIPTION = "An Internet printing system for Unix."
 
diff --git a/cups/cups_1.1.20.oe b/cups/cups_1.1.20.oe
index 511bfdc53c..9ebc6067b2 100644
--- a/cups/cups_1.1.20.oe
+++ b/cups/cups_1.1.20.oe
@@ -1,5 +1,6 @@
 DEPENDS = "openssl jpeg libpng zlib"
 DESCRIPTION = "An Internet printing system for Unix."
+SECTION = "console/utils"
 
 SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2"
 
diff --git a/curl/curl_7.12.0.oe b/curl/curl_7.12.0.oe
index 0ef89dd167..8c8d882741 100644
--- a/curl/curl_7.12.0.oe
+++ b/curl/curl_7.12.0.oe
@@ -7,6 +7,7 @@
 DEPENDS = "zlib"
 DESCRIPTION = "Command line tool and library for \
 client-side URL transfers."
+SECTION = "console/network"
 PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
diff --git a/cyrus-imapd/cyrus-imapd_2.2.5.oe b/cyrus-imapd/cyrus-imapd_2.2.5.oe
index d92b384211..af5419b3b8 100644
--- a/cyrus-imapd/cyrus-imapd_2.2.5.oe
+++ b/cyrus-imapd/cyrus-imapd_2.2.5.oe
@@ -1,3 +1,4 @@
+SECTION = "console/network"
 DEPENDS = "cyrus-sasl"
 PR = "r1"
 
diff --git a/cyrus-sasl/cyrus-sasl_2.1.17.oe b/cyrus-sasl/cyrus-sasl_2.1.17.oe
index fd73b35d71..1b82a76aea 100644
--- a/cyrus-sasl/cyrus-sasl_2.1.17.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.17.oe
@@ -1,3 +1,4 @@
+SECTION = "console/network"
 DEPENDS = "db3"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 
diff --git a/cyrus-sasl/cyrus-sasl_2.1.18.oe b/cyrus-sasl/cyrus-sasl_2.1.18.oe
index 048b6a43df..72ba323f5e 100644
--- a/cyrus-sasl/cyrus-sasl_2.1.18.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.18.oe
@@ -1,3 +1,4 @@
+SECTION = "console/network"
 DEPENDS = "db3"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 
diff --git a/cyrus-sasl/cyrus-sasl_2.1.19.oe b/cyrus-sasl/cyrus-sasl_2.1.19.oe
index e69de29bb2..0ad919e036 100644
--- a/cyrus-sasl/cyrus-sasl_2.1.19.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.19.oe
@@ -0,0 +1,38 @@
+SECTION = "console/network"
+DEPENDS = "db3"
+DESCRIPTION = "Generic client/server library for SASL authentication."
+
+SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz"
+
+inherit autotools 
+
+acpaths = "-I ${S}/cmulocal -I ${S}/config -I ."
+CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include"
+EXTRA_OECONF = "--enable-shared --enable-static --with-dblib=berkeley \
+	        --with-bdb-libdir=${STAGING_LIBDIR} \
+	        --with-bdb-incdir=${STAGING_INCDIR} \
+		--without-opie --without-des"
+
+do_configure_prepend () {
+	rm -f acinclude.m4 config/libtool.m4
+}
+
+do_compile_prepend () {
+	cd include
+	${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} makemd5.c -o makemd5
+	touch makemd5.o makemd5.lo makemd5
+	cd ..
+}
+
+do_stage () {
+	oe_libinstall -so -a -C lib libsasl2 ${STAGING_LIBDIR}
+	install -d ${STAGING_LIBDIR}/sasl
+	install -d ${STAGING_INCDIR}/sasl
+	install -m 0644 ${S}/include/hmac-md5.h ${STAGING_INCDIR}/sasl/
+	install -m 0644 ${S}/include/md5.h ${STAGING_INCDIR}/sasl/
+	install -m 0644 ${S}/include/md5global.h ${STAGING_INCDIR}/sasl/
+	install -m 0644 ${S}/include/sasl.h ${STAGING_INCDIR}/sasl/
+	install -m 0644 ${S}/include/saslplug.h ${STAGING_INCDIR}/sasl/
+	install -m 0644 ${S}/include/saslutil.h ${STAGING_INCDIR}/sasl/
+	install -m 0644 ${S}/include/prop.h ${STAGING_INCDIR}/sasl/
+}
diff --git a/dasher/dasher-gpe_0.0cvs20040828.oe b/dasher/dasher-gpe_0.0cvs20040828.oe
index dfcca60c77..c673f1db01 100644
--- a/dasher/dasher-gpe_0.0cvs20040828.oe
+++ b/dasher/dasher-gpe_0.0cvs20040828.oe
@@ -1,7 +1,7 @@
 
 PR = "r1"
 DEPENDS = "libxsettings-client libglade xtst gconf gtk+"
-
+SECTION = "gpe"
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=dasher;date=20040828 \
 	file://configure-lossage.patch;patch=1"