summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/abiword/abiword-2.5.inc3
-rw-r--r--packages/abiword/abiword-plugins_2.4.5.bb15
-rw-r--r--packages/abiword/abiword-plugins_2.4.6.bb14
-rw-r--r--packages/abiword/abiword.inc5
-rw-r--r--packages/bmon/bmon_2.1.0.bb3
-rw-r--r--packages/ccxstream/ccxstream_1.0.15.bb2
-rw-r--r--packages/dcop/dcopidl-native_3.5.4.bb4
-rw-r--r--packages/dcop/dcopidl2cpp-native_3.5.4.bb4
-rw-r--r--packages/freeze/freeze.bb2
-rw-r--r--packages/freeze/unfreeze.bb2
-rw-r--r--packages/gpephone/linphone_1.5.0.bb2
-rw-r--r--packages/ipsec-tools/ipsec-tools_0.6.6.bb3
-rw-r--r--packages/libaal/libaal_1.0.4.bb2
-rw-r--r--packages/libidl/libidl_0.8.2.bb2
-rw-r--r--packages/libidl/libidl_0.8.3.bb4
-rw-r--r--packages/libidl/libidl_0.8.6.bb4
-rw-r--r--packages/linphone/linphone_1.6.0.bb2
-rw-r--r--packages/musicpd/glurp_0.11.3.bb3
-rw-r--r--packages/musicpd/gmpc_0.11.2.bb2
-rw-r--r--packages/musicpd/gmpc_0.13.0.bb2
-rw-r--r--packages/musicpd/gmpc_svn.bb3
-rw-r--r--packages/musicpd/libmpd_svn.bb3
-rw-r--r--packages/musicpd/mpc_0.11.2.bb2
-rw-r--r--packages/musicpd/mpc_0.12.0.bb3
-rw-r--r--packages/musicpd/mpd-alsa_0.11.5.bb2
-rw-r--r--packages/musicpd/mpd_0.11.2.bb2
-rw-r--r--packages/musicpd/mpd_0.11.5.bb2
-rw-r--r--packages/musicpd/mpd_svn.bb2
-rw-r--r--packages/musicpd/ncmpc_0.11.1.bb3
-rw-r--r--packages/musicpd/py-libmpdclient_0.10.0.bb3
-rw-r--r--packages/netcat/netcat_0.7.1.bb2
-rw-r--r--packages/nis/nis-all.bb6
-rw-r--r--packages/nis/nis.inc4
-rw-r--r--packages/nonworking/icecast/icecast_2.2.0.bb2
-rw-r--r--packages/pam/libpam_0.79.bb2
-rw-r--r--packages/reiser4progs/reiser4progs_1.0.4.bb2
-rw-r--r--packages/treecc/treecc_0.3.6.bb2
-rw-r--r--packages/upslug/upslug-native_1.0.bb2
-rw-r--r--packages/upslug/upslug-native_cvs.bb2
-rw-r--r--packages/yeaphone/yeaphone_0.1.bb2
40 files changed, 57 insertions, 74 deletions
diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc
index cd95777227..3184be72b4 100644
--- a/packages/abiword/abiword-2.5.inc
+++ b/packages/abiword/abiword-2.5.inc
@@ -1,8 +1,7 @@
DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
-SECTION = "gnome/office"
HOMEPAGE = "http://www.abiword.org""
+SECTION = "x11/office"
LICENSE = "GPLv2"
-
DEPENDS = "perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2"
RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb
index d488820620..0715026684 100644
--- a/packages/abiword/abiword-plugins_2.4.5.bb
+++ b/packages/abiword/abiword-plugins_2.4.5.bb
@@ -1,15 +1,14 @@
-DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-SECTION = "gnome/office"
-HOMEPAGE="http://www.abiword.org""
-LICENSE="GPLv2"
-
-DEPENDS = "libwpd librsvg goffice poppler"
-PR="r1"
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+HOMEPAGE = "http://www.abiword.org""
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "libwpd librsvg goffice poppler"
+RDEPENDS='abiword'
+PR = "r1"
SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
-RDEPENDS='abiword'
inherit autotools
diff --git a/packages/abiword/abiword-plugins_2.4.6.bb b/packages/abiword/abiword-plugins_2.4.6.bb
index 28d076aaa4..21ac8ea909 100644
--- a/packages/abiword/abiword-plugins_2.4.6.bb
+++ b/packages/abiword/abiword-plugins_2.4.6.bb
@@ -1,15 +1,13 @@
-DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-SECTION = "gnome/office"
-HOMEPAGE="http://www.abiword.org""
-LICENSE="GPLv2"
-
-DEPENDS = "libwpd librsvg goffice poppler"
-PR="r0"
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+HOMEPAGE = "http://www.abiword.org""
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "libwpd librsvg goffice poppler"
+RDEPENDS = "abiword"
SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
-RDEPENDS='abiword'
inherit autotools
diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc
index c8f3243b9c..8569845394 100644
--- a/packages/abiword/abiword.inc
+++ b/packages/abiword/abiword.inc
@@ -1,8 +1,7 @@
-DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
-SECTION = "gnome/office"
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
HOMEPAGE = "http://www.abiword.org""
+SECTION = "x11/office"
LICENSE = "GPLv2"
-
DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2"
RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
diff --git a/packages/bmon/bmon_2.1.0.bb b/packages/bmon/bmon_2.1.0.bb
index 32e956fb26..d6cd03f614 100644
--- a/packages/bmon/bmon_2.1.0.bb
+++ b/packages/bmon/bmon_2.1.0.bb
@@ -1,10 +1,9 @@
DESCRIPTION = "Portable Bandwidth Monitor and rate estimator"
HOMEPAGE = "http://people.suug.ch/~tgr/bmon/"
-SECTION = "console/utilities"
+SECTION = "console/utils"
LICENSE = "MIT"
# only works with libnl-0.5.0
DEPENDS = "libnl"
-PR = "r0"
SRC_URI = "http://people.suug.ch/~tgr/bmon/files/bmon-2.1.0.tar.gz \
file://no-strip.patch;patch=1"
diff --git a/packages/ccxstream/ccxstream_1.0.15.bb b/packages/ccxstream/ccxstream_1.0.15.bb
index cc42d895ca..466a116ec2 100644
--- a/packages/ccxstream/ccxstream_1.0.15.bb
+++ b/packages/ccxstream/ccxstream_1.0.15.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "XStream Server"
DEPENDS = "readline"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
PR = "r2"
SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \
diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb
index 820700d56e..af90d5a20e 100644
--- a/packages/dcop/dcopidl-native_3.5.4.bb
+++ b/packages/dcop/dcopidl-native_3.5.4.bb
@@ -1,15 +1,13 @@
DESCRIPTION = "DCOP IDL parser"
-SECTION = "kde/dev"
+SECTION = "kde/devel"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-
SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \
file://dcopidl-compile.patch;patch=1 "
S = "${WORKDIR}/dcopidl"
-
inherit native qmake qt3e
export OE_QMAKE_LINK="${CXX}"
diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
index 29a4f71d3c..10969db923 100644
--- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb
+++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
@@ -1,16 +1,14 @@
DESCRIPTION = "DCOP IDL parser"
-SECTION = "kde/dev"
+SECTION = "kde/devel"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-
SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp "
#\
# file://dcopidl-compile.patch;patch=1 "
S = "${WORKDIR}/dcopidl2cpp"
-
inherit native qmake qt3e
export OE_QMAKE_LINK="${CXX}"
diff --git a/packages/freeze/freeze.bb b/packages/freeze/freeze.bb
index 48a0ba63d2..fa11fecb97 100644
--- a/packages/freeze/freeze.bb
+++ b/packages/freeze/freeze.bb
@@ -13,7 +13,7 @@
# as appropriate, directory is the sub-directory of 'packages'.
#
DESCRIPTION = "Freeze the bitbake files in the build"
-SECTION = "console/networking"
+SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "MIT"
PR = "r1"
diff --git a/packages/freeze/unfreeze.bb b/packages/freeze/unfreeze.bb
index ff280dee9c..f2232c304f 100644
--- a/packages/freeze/unfreeze.bb
+++ b/packages/freeze/unfreeze.bb
@@ -2,7 +2,7 @@
# configuration fails empty (they just contain a comment).
#
DESCRIPTION = "Unfreeze the bitbake files in the build"
-SECTION = "console/networking"
+SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "MIT"
PR = "r1"
diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb
index 3720512150..bef090e22a 100644
--- a/packages/gpephone/linphone_1.5.0.bb
+++ b/packages/gpephone/linphone_1.5.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "SIP-based IP phone"
HOMEPAGE = "http://www.linphone.org/?lang=us"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
DEPENDS = "libosip2 speex libogg alsa-lib readline"
PR = "r0"
diff --git a/packages/ipsec-tools/ipsec-tools_0.6.6.bb b/packages/ipsec-tools/ipsec-tools_0.6.6.bb
index 0e2a82e370..9b0676aece 100644
--- a/packages/ipsec-tools/ipsec-tools_0.6.6.bb
+++ b/packages/ipsec-tools/ipsec-tools_0.6.6.bb
@@ -1,10 +1,9 @@
DESCRIPTION = "IPsec-Tools is a port of KAME's IPsec utilities to the \
Linux-2.6 IPsec implementation."
HOMEPAGE = "http://ipsec-tools.sourceforge.net/"
-SECTION = "console/net"
+SECTION = "console/network"
LICENSE = "BSD"
DEPENDS = "virtual/kernel openssl readline flex"
-PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2 \
file://racoon-search-missing.patch;patch=1"
diff --git a/packages/libaal/libaal_1.0.4.bb b/packages/libaal/libaal_1.0.4.bb
index 0acfccc48d..af847f50c6 100644
--- a/packages/libaal/libaal_1.0.4.bb
+++ b/packages/libaal/libaal_1.0.4.bb
@@ -5,7 +5,7 @@ PR = "r1"
DESCRIPTION = "Library for user-level code accessing Reiser4 filesystems"
HOMEPAGE = "http://www.namesys.com"
SECTION = "base"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
SRC_URI = "ftp://ftp.namesys.com/pub/reiser4progs/old-versions/${P}.tar.gz"
diff --git a/packages/libidl/libidl_0.8.2.bb b/packages/libidl/libidl_0.8.2.bb
index b8c5ec6966..85114d6524 100644
--- a/packages/libidl/libidl_0.8.2.bb
+++ b/packages/libidl/libidl_0.8.2.bb
@@ -1,5 +1,5 @@
+SECTION = "x11/gnome/libs"
LICENSE = "LGPL"
-SECTION = "libs"
SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2"
S = "${WORKDIR}/libIDL-${PV}"
diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb
index 2ca114be2c..7a5a0d454e 100644
--- a/packages/libidl/libidl_0.8.3.bb
+++ b/packages/libidl/libidl_0.8.3.bb
@@ -1,6 +1,6 @@
-LICENSE = "LGPL"
DESCRIPTION = "Library for parsing CORBA IDL files"
-SECTION = "gnome/libs"
+SECTION = "x11/gnome/libs"
+LICENSE = "LGPL"
DEPENDS = "glib-2.0"
PR = "r2"
diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb
index 916bfb6e5f..ccc93e291a 100644
--- a/packages/libidl/libidl_0.8.6.bb
+++ b/packages/libidl/libidl_0.8.6.bb
@@ -1,6 +1,6 @@
-LICENSE = "LGPL"
DESCRIPTION = "Library for parsing CORBA IDL files"
-SECTION = "gnome/libs"
+SECTION = "x11/gnome/libs"
+LICENSE = "LGPL"
DEPENDS = "glib-2.0 libidl-native"
PR = "r2"
diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb
index 43b8daa131..563f21440e 100644
--- a/packages/linphone/linphone_1.6.0.bb
+++ b/packages/linphone/linphone_1.6.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "SIP-based IP phone (console edition)"
HOMEPAGE = "http://www.linphone.org/?lang=us"
SECTION = "x11/utils"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
DEPENDS = "intltool libosip2 speex libogg alsa-lib readline"
DEPENDS_${PN} = "liblinphone"
diff --git a/packages/musicpd/glurp_0.11.3.bb b/packages/musicpd/glurp_0.11.3.bb
index 4d9449c904..59cea4f8c9 100644
--- a/packages/musicpd/glurp_0.11.3.bb
+++ b/packages/musicpd/glurp_0.11.3.bb
@@ -1,9 +1,8 @@
DESCRIPTION = "glurp - frontend for mpd"
HOMEPAGE = "http://www.musicpd.org/glurp.shtml"
+SECTION = "x11/multimedia"
LICENSE = "GPLv2"
-SECTION = "gnome/multimedia"
DEPENDS = "gtk+ libglade"
-PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/glurp/glurp-${PV}.tar.gz"
diff --git a/packages/musicpd/gmpc_0.11.2.bb b/packages/musicpd/gmpc_0.11.2.bb
index 9468a07249..6ed2ada569 100644
--- a/packages/musicpd/gmpc_0.11.2.bb
+++ b/packages/musicpd/gmpc_0.11.2.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "GTK+ Frontend for mpd"
HOMEPAGE = "http://www.musicpd.org/gmpc.shtml"
+SECTION = "x11/multimedia"
LICENSE = "GPLv2"
-SECTION = "gnome/multimedia"
DEPENDS = "gtk+ libglade gnome-vfs"
PR = "r1"
diff --git a/packages/musicpd/gmpc_0.13.0.bb b/packages/musicpd/gmpc_0.13.0.bb
index 3d9c668527..f8c99efb36 100644
--- a/packages/musicpd/gmpc_0.13.0.bb
+++ b/packages/musicpd/gmpc_0.13.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "GTK+ Frontend for mpd"
HOMEPAGE = "http://www.musicpd.org/gmpc.shtml"
+SECTION = "x11/multimedia"
LICENSE = "GPLv2"
-SECTION = "gnome/multimedia"
DEPENDS = "libmpd gtk+ libglade gnome-vfs"
PR = "r0"
diff --git a/packages/musicpd/gmpc_svn.bb b/packages/musicpd/gmpc_svn.bb
index 9c03faa395..fbaea3e5f2 100644
--- a/packages/musicpd/gmpc_svn.bb
+++ b/packages/musicpd/gmpc_svn.bb
@@ -1,11 +1,10 @@
DESCRIPTION = "GTK+ Frontend for mpd"
HOMEPAGE = "http://www.musicpd.org/gmpc.shtml"
+SECTION = "x11/multimedia"
LICENSE = "GPLv2"
-SECTION = "gnome/multimedia"
DEPENDS = "libmpd gtk+ libglade gnome-vfs gob2"
SRCDATE = "20070120"
PV = "0.13.0+svn${SRCDATE}"
-PR = "r0"
SRC_URI = "svn://svn.musicpd.org/gmpc;module=trunk;proto=https"
S = "${WORKDIR}/trunk"
diff --git a/packages/musicpd/libmpd_svn.bb b/packages/musicpd/libmpd_svn.bb
index eea7b952a3..4c78eb15f4 100644
--- a/packages/musicpd/libmpd_svn.bb
+++ b/packages/musicpd/libmpd_svn.bb
@@ -1,10 +1,9 @@
DESCRIPTION = "Music Player Daemon (mpd) library"
HOMEPAGE = "http://www.musicpd.org"
+SECTION = "libs/multimedia"
LICENSE = "GPLv2"
-SECTION = "lib/multimedia"
SRCDATE = "20070120"
PV = "0.0.0+svn${SRCDATE}"
-PR = "r0"
SRC_URI = "svn://svn.musicpd.org/libmpd;module=trunk;proto=https"
S = "${WORKDIR}/trunk"
diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb
index 8806653357..8d3eaa183a 100644
--- a/packages/musicpd/mpc_0.11.2.bb
+++ b/packages/musicpd/mpc_0.11.2.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client"
HOMEPAGE = "http://www.musicpd.org/mpc.shtml"
-LICENSE = "GPLv2"
SECTION = "console/multimedia"
+LICENSE = "GPLv2"
PR = "r1"
SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz"
diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.0.bb
index 6d47f9418f..ccd6926fcd 100644
--- a/packages/musicpd/mpc_0.12.0.bb
+++ b/packages/musicpd/mpc_0.12.0.bb
@@ -1,8 +1,7 @@
DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client"
HOMEPAGE = "http://www.musicpd.org/mpc.shtml"
-LICENSE = "GPLv2"
SECTION = "console/multimedia"
-PR = "r0"
+LICENSE = "GPLv2"
SRC_URI = "http://www.musicpd.org/uploads/files/mpc-${PV}.tar.bz2"
EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \
diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb
index 1ba1fabd16..939ecec836 100644
--- a/packages/musicpd/mpd-alsa_0.11.5.bb
+++ b/packages/musicpd/mpd-alsa_0.11.5.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa support"
HOMEPAGE = "http://www.musicpd.org"
-LICENSE = "GPLv2"
SECTION = "console/multimedia"
+LICENSE = "GPLv2"
DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv"
RDEPENDS = "libao-alsa"
PR = "r3"
diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb
index 493f677a50..9d3c5f90b0 100644
--- a/packages/musicpd/mpd_0.11.2.bb
+++ b/packages/musicpd/mpd_0.11.2.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Music Player Daemon (mpd)"
HOMEPAGE = "http://www.musicpd.org"
-LICENSE = "GPLv2"
SECTION = "console/multimedia"
+LICENSE = "GPLv2"
DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile"
PR = "r2"
diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb
index d501d0e478..7a1d17ef5d 100644
--- a/packages/musicpd/mpd_0.11.5.bb
+++ b/packages/musicpd/mpd_0.11.5.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Music Player Daemon (mpd)"
HOMEPAGE = "http://www.musicpd.org"
-LICENSE = "GPLv2"
SECTION = "console/multimedia"
+LICENSE = "GPLv2"
DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2"
PR = "r8"
diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb
index 3478bc76fa..5a338aa7d2 100644
--- a/packages/musicpd/mpd_svn.bb
+++ b/packages/musicpd/mpd_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Music Player Daemon (mpd)"
HOMEPAGE = "http://www.musicpd.org"
-LICENSE = "GPLv2"
SECTION = "console/multimedia"
+LICENSE = "GPLv2"
DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
SRCDATE = "20070120"
PV = "0.12.1+svn${SRCDATE}"
diff --git a/packages/musicpd/ncmpc_0.11.1.bb b/packages/musicpd/ncmpc_0.11.1.bb
index c687f9ea02..32195ccb9d 100644
--- a/packages/musicpd/ncmpc_0.11.1.bb
+++ b/packages/musicpd/ncmpc_0.11.1.bb
@@ -1,9 +1,8 @@
DESCRIPTION = "Ncurses based Music Player Daemon (mpd) Client"
HOMEPAGE = "http://www.musicpd.org/ncmpc.shtml"
-LICENSE = "GPLv2"
SECTION = "console/multimedia"
+LICENSE = "GPLv2"
DEPENDS = "ncurses glib-2.0"
-PR = "r0"
SRC_URI = "http://mercury.chem.pitt.edu/~shank/ncmpc-${PV}.tar.gz"
diff --git a/packages/musicpd/py-libmpdclient_0.10.0.bb b/packages/musicpd/py-libmpdclient_0.10.0.bb
index 675567eede..92423f0c88 100644
--- a/packages/musicpd/py-libmpdclient_0.10.0.bb
+++ b/packages/musicpd/py-libmpdclient_0.10.0.bb
@@ -1,9 +1,8 @@
DESCRIPTION = "Python library for Music Player Daemon (mpd)"
HOMEPAGE = "http://www.musicpd.org/py-libmpdclient.shtml"
+SECTION = "libs/multimedia"
LICENSE = "GPLv2"
-SECTION = "lib/multimedia"
DEPENDS = "libmpd python"
-PR = "r0"
SRC_URI = "http://mercury.chem.pitt.edu/~shank/py-libmpdclient-${PV}.tar.gz"
diff --git a/packages/netcat/netcat_0.7.1.bb b/packages/netcat/netcat_0.7.1.bb
index a6361f0731..c7ceccddf2 100644
--- a/packages/netcat/netcat_0.7.1.bb
+++ b/packages/netcat/netcat_0.7.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "GNU Netcat"
HOMEPAGE = "http://netcat.sourceforge.net"
+SECTION = "console/network"
LICENSE = "GPLv2"
-SECTION = "console/networking"
PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2"
diff --git a/packages/nis/nis-all.bb b/packages/nis/nis-all.bb
index a0af47b0cb..181a06cd2e 100644
--- a/packages/nis/nis-all.bb
+++ b/packages/nis/nis-all.bb
@@ -1,12 +1,12 @@
# This meta package is a convenience to build all of the
# NIS packages.
#
-PR = "r0"
+
DESCRIPTION="NIS services"
HOMEPAGE="http://www.linux-nis.org/nis/"
-SECTION = "console/networking"
+SECTION = "console/network"
PRIORITY = "optional"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
INHIBIT_DEFAULT_DEPS = "1"
diff --git a/packages/nis/nis.inc b/packages/nis/nis.inc
index 45232881cb..90f7ff50a0 100644
--- a/packages/nis/nis.inc
+++ b/packages/nis/nis.inc
@@ -5,9 +5,9 @@
# the rpcsvc functionality is not present in uclibc
DESCRIPTION ?= "NIS Server and Tools"
HOMEPAGE ?= "http://www.linux-nis.org/nis/"
-SECTION ?= "console/networking"
+SECTION ?= "console/network"
PRIORITY ?= "optional"
-LICENSE ?= "GPL-2"
+LICENSE ?= "GPLv2"
# Override these *after* the include file if necessary!
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/${P}.tar.bz2"
diff --git a/packages/nonworking/icecast/icecast_2.2.0.bb b/packages/nonworking/icecast/icecast_2.2.0.bb
index c4738cb46f..c0f500ac4a 100644
--- a/packages/nonworking/icecast/icecast_2.2.0.bb
+++ b/packages/nonworking/icecast/icecast_2.2.0.bb
@@ -1,5 +1,5 @@
PR = "r4"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
DEPENDS = "libvorbis libogg libxslt"
diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb
index c19d0ff9c8..14dab423f8 100644
--- a/packages/pam/libpam_0.79.bb
+++ b/packages/pam/libpam_0.79.bb
@@ -17,7 +17,7 @@ Administrators' Guide."
HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam"
SECTION = "libs"
PRIORITY = "optional"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
PR = "r1"
# The project is actually called Linux-PAM but that gives
diff --git a/packages/reiser4progs/reiser4progs_1.0.4.bb b/packages/reiser4progs/reiser4progs_1.0.4.bb
index 8185b8df89..c54b2f1ba4 100644
--- a/packages/reiser4progs/reiser4progs_1.0.4.bb
+++ b/packages/reiser4progs/reiser4progs_1.0.4.bb
@@ -5,7 +5,7 @@ PR = "r1"
DESCRIPTION = "User-level tools for Reiser4 filesystems"
HOMEPAGE = "http://www.namesys.com"
SECTION = "base"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
SRC_URI = "ftp://ftp.namesys.com/pub/${PN}/old-versions/${P}.tar.gz \
file://oid40.c.patch;patch=1 \
diff --git a/packages/treecc/treecc_0.3.6.bb b/packages/treecc/treecc_0.3.6.bb
index 9a6c7c8eda..e54beb4810 100644
--- a/packages/treecc/treecc_0.3.6.bb
+++ b/packages/treecc/treecc_0.3.6.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Tree Compiler-Compiler from dotGNU"
SECTION = "devel"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
HOMEPAGE = "http://www.southern-storm.com.au/treecc.html"
PRIORITY = "optional"
diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb
index 729f176a75..02c41eb42b 100644
--- a/packages/upslug/upslug-native_1.0.bb
+++ b/packages/upslug/upslug-native_1.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "NSLU2 binary upload tool"
HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
SECTION = "console/network"
PRIORITY = "optional"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
COMPATIBLE_MACHINE = "nslu2"
SRC_TAG = "UPSLUG_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb
index 95b340c589..e0d7f2b708 100644
--- a/packages/upslug/upslug-native_cvs.bb
+++ b/packages/upslug/upslug-native_cvs.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "NSLU2 binary upload tool"
HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
SECTION = "console/network"
PRIORITY = "optional"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
COMPATIBLE_MACHINE = "nslu2"
# Use releases in preference
diff --git a/packages/yeaphone/yeaphone_0.1.bb b/packages/yeaphone/yeaphone_0.1.bb
index d17e8c2fcf..e1e06d52e9 100644
--- a/packages/yeaphone/yeaphone_0.1.bb
+++ b/packages/yeaphone/yeaphone_0.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "A VoIP SIP phone for the Yealink USB handset"
HOMEPAGE = "http://www.devbase.at/voip/"
MAINTAINER = "Thomas Reitmayr <treitmayr@yahoo.com>"
-LICENSE = "GPL-2"
+LICENSE = "GPLv2"
PRIORITY = "optional"
DEPENDS = "liblinphone"
RDEPENDS = "liblinphone"