5 files changed, 12 insertions, 9 deletions

diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index 8c58efb..55d0b93 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -1,2 +1,3 @@
 QMAKE_CFLAGS = -DHAVE_OPENPTY
+TMAKE_FLAGS += -DHAVE_OPENPTY
 QMAKE_LIBS = -lutil
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 34bf681..61ce421 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -1,2 +1,2 @@
-Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* etc/keytabs/default.Keytab bin/sz bin/rz
+Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* etc/keytabs/default.Keytab 
 Priority: optional
@@ -6,3 +6,3 @@ Architecture: arm
 Version: 0.6-$SUB_VERSION
-Depends: qpe-base ($QPE_VERSION), libopie1 ($QPE_VERSION), opie-console-help-en
+Depends: qpe-base ($QPE_VERSION), libopie1 ($QPE_VERSION), opie-console-help-en, lrzsz
 License: GPL
diff --git a/noncore/unsupported/mail2/bend/config.in b/noncore/unsupported/mail2/bend/config.in
index dfff29e..097a965 100644
--- a/noncore/unsupported/mail2/bend/config.in
+++ b/noncore/unsupported/mail2/bend/config.in
@@ -1,4 +1,4 @@
   config BEND
-    boolean
-    default "y" if MAIL
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBMAIL
+    boolean "bend"
+    default "y" if OPIEMAIL2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEMAIL2
diff --git a/noncore/unsupported/mail2/libmail/config.in b/noncore/unsupported/mail2/libmail/config.in
index 344b19d..dd7b2dc 100644
--- a/noncore/unsupported/mail2/libmail/config.in
+++ b/noncore/unsupported/mail2/libmail/config.in
@@ -1,4 +1,4 @@
   config LIBMAIL
-    boolean
-    default "y" if MAIL
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    boolean "libmail"
+    default "y" if OPIEMAIL2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEMAIL2
diff --git a/packages b/packages
index b0d4eff..c237bf4 100644
--- a/packages
+++ b/packages
@@ -97,3 +97,2 @@ CONFIG_LIQUID	noncore/styles/liquid	liquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
-        CONFIG_MAIL     noncore/mailmail.pro
         CONFIG_MANAGER  noncore/net/opietooth/managermanager.pro
@@ -113,2 +112,3 @@ CONFIG_OPIE-CONSOLE	noncore/apps/opie-console	opie-console.pro
         CONFIG_OPIE-LOGIN       core/opie-loginopie-login.pro
+        CONFIG_OPIEMAIL2noncore/mail mail.pro
         CONFIG_OPIE-READER      noncore/apps/opie-readeropie-reader.pro
@@ -126,2 +126,3 @@ CONFIG_QASTEROIDS	noncore/games/qasteroids	qasteroids.pro
         CONFIG_QCOP     core/apps/qcopqcop.pro
+        CONFIG_ODICT    noncore/apps/odictodict.pro
         CONFIG_QPDF     noncore/graphics/qpdfqpdf.pro
@@ -156,2 +157,3 @@ CONFIG_TODAY_STOCKTICKER	noncore/todayplugins/stockticker/stockticker	stockticke
         CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
+        CONFIG_TODAY_WEATHERnoncore/todayplugins/weather weather.pro
         CONFIG_TODAY_TODOLIST   core/pim/today/plugins/todolisttodolist.pro