adapt to directory changes and menu structure changes

3 files changed, 14 insertions, 10 deletions

diff --git a/config.in b/config.in
index 6adf17e..742b8e3 100644
--- a/config.in
+++ b/config.in
@@ -163,7 +163,6 @@ endmenu
 
 menu "Communications and Networking"
   source noncore/comm/config.in
-  source noncore/mail/config.in
   source noncore/net/config.in
 endmenu
 
@@ -216,6 +215,16 @@ menu "Examples"
 endmenu
 
 comment ""
+
+menu "Unsupported / Unmaintained"
+  source noncore/unsupported/mail2/config.in
+  source noncore/unsupported/filebrowser/config.in
+  source noncore/unsupported/oipkg/config.in
+  source noncore/unsupported/qpdf/config.in
+  source noncore/unsupported/gsmtool/config.in
+endmenu
+
+comment ""
   depends on EXPERIMENTAL
 menu "Experimental"
   depends on EXPERIMENTAL
@@ -227,7 +236,7 @@ menu "Experimental"
   help
 	This adds the SQL-Support, using SQLite. Which database is used
 	by the backends is defined by the file "pimaccess.conf" in the
-	directory "Settings". 
+	directory "Settings".
 	There currently do exist to groups "[contact]" and "[todo]". You can
 	select the used backend by the variable "usebackend=<type>", where
 	<type> is "sql" or "xml". "xml" is the default !
diff --git a/noncore/unsupported/mail2/config.in b/noncore/unsupported/mail2/config.in
index c9896cb..6f279b0 100644
--- a/noncore/unsupported/mail2/config.in
+++ b/noncore/unsupported/mail2/config.in
@@ -1,12 +1,7 @@
-  config MAIL
-    boolean "EMail support"
-    default "y" if OPIEMAIL
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
-
  config OPIEMAIL2
     boolean "opie-mail2 (an IMAP mail client)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL && MAIL
 
-  source noncore/mail/bend/config.in
-  source noncore/mail/libmail/config.in
+  source noncore/unsupported/mail2/bend/config.in
+  source noncore/unsupported/mail2/libmail/config.in
diff --git a/packages b/packages
index 3f3e20f..8c9f3cb 100644
--- a/packages
+++ b/packages
@@ -6,7 +6,7 @@ CONFIG_AQPKG	noncore/settings/aqpkg	aqpkg.pro
 CONFIG_BACKGAMMON	noncore/games/backgammon backgammon.pro
 CONFIG_BACKUP	noncore/settings/backup	backup.pro
 CONFIG_BATTERYAPPLET	core/applets/batteryapplet	batteryapplet.pro
-CONFIG_BEND	noncore/mail/bend	bend.pro
+CONFIG_BEND	noncore/unsupported/mail2/bend	bend.pro
 CONFIG_BINARY	noncore/tools/calc2/binary	binary.pro
 CONFIG_BLUE-PIN	noncore/net/opietooth/blue-pin	blue-pin.pro
 CONFIG_BOUNCE	noncore/games/bounce	bounce.pro