4 files changed, 5 insertions, 22 deletions
diff --git a/packages/octave/octave_2.1.63.bb b/packages/octave/octave_2.1.63.bb
deleted file mode 100644
index c042621381..0000000000
--- a/packages/octave/octave_2.1.63.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
-It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
-and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
-It may also be used as a batch-oriented language." 
-SECTION = "console/util"
-DEPENDS = "readline ncurses"
-SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz"
-
-inherit autotools
-
-FILES_${PN}-dev += "${libdir}/octave-${PV}/*.la ${libdir}/octave-${PV}/*.a"
-
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
diff --git a/packages/octave/octave_2.1.71.bb b/packages/octave/octave_2.1.71.bb
index c042621381..462eccbf65 100644
--- a/packages/octave/octave_2.1.71.bb
+++ b/packages/octave/octave_2.1.71.bb
@@ -1,9 +1,9 @@
-LICENSE = "GPL"
 DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
 It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
 and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
 It may also be used as a batch-oriented language." 
-SECTION = "console/util"
+SECTION = "console/utils"
+LICENSE = "GPL"
 DEPENDS = "readline ncurses"
 SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz"
 
diff --git a/packages/popt/popt-native_1.7.bb b/packages/popt/popt-native_1.7.bb
index f8644f1425..75b90d0763 100644
--- a/packages/popt/popt-native_1.7.bb
+++ b/packages/popt/popt-native_1.7.bb
@@ -1,4 +1,3 @@
-SECTION = "unknown"
 require popt_${PV}.bb
 inherit native
 
diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb
index 6984dbdb13..6f4dfd7acf 100644
--- a/packages/popt/popt_1.7.bb
+++ b/packages/popt/popt_1.7.bb
@@ -1,8 +1,9 @@
-SECTION = "libs"
 DESCRIPTION = "The popt library exists essentially \
 for parsing command line options."
 LICENSE = "MIT"
-PR = "r3"
+SECTION = "libs"
+DEPENDS = "gettext-native"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
 	   file://m4.patch;patch=1 \