Fix and standardize Config.in

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1046 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 72 insertions, 38 deletions

diff --git a/package/fuse/Config.in b/package/fuse/Config.in
index 2973a3e11c..92852bf1cb 100644
--- a/package/fuse/Config.in
+++ b/package/fuse/Config.in
@@ -1,7 +1,14 @@
+config BR2_PACKAGE_FUSE
+	bool
+	default n
+	depends BR2_PACKAGE_KMOD_FUSE
+
 config BR2_PACKAGE_KMOD_FUSE
 	select BR2_PACKAGE_FUSE
-	tristate "kmod-fuse - FUSE kernel module"
+	prompt "kmod-fuse - FUSE kernel module"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_FUSE
 	help
 	  With FUSE it is possible to implement a fully functional 
 	  filesystem in a userspace program.
@@ -19,10 +26,12 @@ config BR2_PACKAGE_KMOD_FUSE
 	  
 	  http://fuse.sourceforge.net/
 	  
-	  Depends: libpthread
+	  This package contains the fuse.o kernel module.
+	  
 
 config BR2_PACKAGE_LIBFUSE
-	tristate "libfuse - FUSE library"
+	prompt "libfuse - FUSE library"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_KMOD_FUSE
 	select BR2_PACKAGE_LIBPTHREAD
@@ -43,10 +52,14 @@ config BR2_PACKAGE_LIBFUSE
 	  
 	  http://fuse.sourceforge.net/
 	  
+	  This package contains the fuse shared library, needed by other programs.
+	  
 	  Depends: libpthread
+	  
 
 config BR2_PACKAGE_FUSE_UTILS
-	tristate "fuse-utils - FUSE utilities"
+	prompt "fuse-utils - FUSE utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBFUSE
 	select BR2_PACKAGE_LIBPTHREAD
@@ -67,10 +80,5 @@ config BR2_PACKAGE_FUSE_UTILS
 	  
 	  http://fuse.sourceforge.net/
 	  
-	  Depends: libpthread
-
-
-config BR2_PACKAGE_FUSE
-	tristate
-	default BR2_PACKAGE_KMOD_FUSE
-
+	  This package contains the fusermount userland utility.
+	  
diff --git a/package/openldap/Config.in b/package/openldap/Config.in
index 02c675c0dd..21d2301db7 100644
--- a/package/openldap/Config.in
+++ b/package/openldap/Config.in
@@ -1,6 +1,13 @@
+config BR2_PACKAGE_OPENLDAP
+	bool
+	default n
+	depends BR2_PACKAGE_LIBOPENLDAP
+
 config BR2_PACKAGE_LIBOPENLDAP
-	tristate "libopenldap - Open source LDAP (Lightweight Directory Access Protocol) client libraries"
+	prompt "libopenldap - Open source LDAP (Lightweight Directory Access Protocol) client libraries"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_OPENLDAP
 	help
 	  
 	  OpenLDAP Software is an open source implementation of the 
@@ -8,13 +15,14 @@ config BR2_PACKAGE_LIBOPENLDAP
 	  
 	  http://www.openldap.org/
 	  
-	  This package contains the LDAP client libraries, needed by other programs.
+	  This package contains the shared LDAP client libraries, needed by other programs.
 	  
 
 config BR2_PACKAGE_OPENLDAP_UTILS
-	tristate "openldap-utils - OpenLDAP client utilities"
-	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBOPENLDAP
+	prompt "openldap-utils - OpenLDAP client utilities"
+	tristate
+	default m if CONFIG_DEVEL
 	help
 	  
 	  OpenLDAP Software is an open source implementation of the 
@@ -25,6 +33,3 @@ config BR2_PACKAGE_OPENLDAP_UTILS
 	  This package contains client programs required to access LDAP servers.
 	  
 
-config BR2_PACKAGE_OPENLDAP
-	tristate
-	depends BR2_PACKAGE_LIBOPENLDAP
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index a69a6d76f1..61c0953a1d 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -1,6 +1,13 @@
+config BR2_PACKAGE_OPENSSL
+	bool
+	default n
+	depends BR2_PACKAGE_LIBOPENSSL
+	
 config BR2_PACKAGE_LIBOPENSSL
-	tristate "libopenssl - Open source SSL (Secure Socket Layer) libraries"
+	prompt "libopenssl - Open source SSL (Secure Socket Layer) libraries"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_OPENSSL
 	help
 	  	
 	  The OpenSSL Project is a collaborative effort to develop a robust, 
@@ -14,9 +21,10 @@ config BR2_PACKAGE_LIBOPENSSL
 	  
 
 config BR2_PACKAGE_OPENSSL_UTIL
-	tristate "openssl-util - OpenSSL command line tool"
-	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBOPENSSL
+	prompt "openssl-util - OpenSSL command line tool"
+	tristate
+	default m if CONFIG_DEVEL
 	help
 	  	
 	  The OpenSSL Project is a collaborative effort to develop a robust, 
@@ -28,7 +36,3 @@ config BR2_PACKAGE_OPENSSL_UTIL
 	  
 	  This package contains the multi-purpose OpenSSL binary tool.
 	  
-
-config BR_PACKAGE_OPENSSL
-	tristate
-	default BR2_PACKAGE_LIBOPENSSL
diff --git a/package/shfs/Config.in b/package/shfs/Config.in
index 8d27f1f228..5db9308f2a 100644
--- a/package/shfs/Config.in
+++ b/package/shfs/Config.in
@@ -1,10 +1,14 @@
+config BR2_PACKAGE_SHFS
+	bool
+	default n
+	depends BR2_PACKAGE_KMOD_SHFS
+
 config BR2_PACKAGE_KMOD_SHFS
-	tristate "kmod-shfs - Shell FileSystem kernel module (ShFS) kernel module"
+	prompt "kmod-shfs - Shell FileSystem kernel module (ShFS) kernel module"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_SHFS
 	help
-	  
-	  Shell FileSystem kernel module
-	  
 	  ShFS is a simple and easy to use Linux kernel module which 
 	  allows you to mount remote filesystems using a plain shell 
 	  (SSH) connection. When using ShFS, you can access all remote 
@@ -21,22 +25,35 @@ config BR2_PACKAGE_KMOD_SHFS
 	   * arbitrary command used for connection (instead of SSH)
 	   * persistent connection (reconnect after SSH dies) 
 	  
-	  
 	  http://shfs.sourceforge.net/
 	  
+	  This package contains the shfs.o kernel module.
+	  
 
 config BR2_PACKAGE_SHFS_UTILS
 	depends BR2_PACKAGE_KMOD_SHFS
-	tristate "shfs-utils - ShFS mount/umount utilities"
+	prompt "shfs-utils - ShFS mount/umount utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	help
+	  ShFS is a simple and easy to use Linux kernel module which 
+	  allows you to mount remote filesystems using a plain shell 
+	  (SSH) connection. When using ShFS, you can access all remote 
+	  files just like the local ones, only the access is governed 
+	  through the transport security of SSH.
 	  
-	  Shell FileSystem mount/umount utilities
+	  ShFS supports some nice features:
+	  
+	   * file cache for access speedup
+	   * perl and shell code for the remote (server) side
+	   * could preserve uid/gid (root connection)
+	   * number of remote host platforms (Linux, Solaris, Cygwin, ...)
+	   * Linux kernel 2.4.10+ and 2.6
+	   * arbitrary command used for connection (instead of SSH)
+	   * persistent connection (reconnect after SSH dies) 
+	  
+	  http://shfs.sourceforge.net/
+	  
+	  This package contains the shfs mount/umount utilities.
 	  
-
-config BR2_PACKAGE_SHFS
-	tristate
-	default n
-	depends BR2_PACKAGE_KMOD_SHFS
-	help