* t*..z*.in: turn bool into tristate for package selections

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8310 33e552b5-05e3-0310-8538-816dae2090ed

36 files changed, 74 insertions, 59 deletions

diff --git a/rules/tcpdump.in b/rules/tcpdump.in
index 94d3f21ff..23c7bb64f 100644
--- a/rules/tcpdump.in
+++ b/rules/tcpdump.in
@@ -1,6 +1,6 @@
 menuconfig TCPDUMP
-	bool
-	prompt "tcpdump             "
+	tristate
+	prompt "tcpdump                       "
 	select LIBPCAP
 	select OPENSSL if TCPDUMP_DISABLE_CRYPTO
 	help
@@ -12,10 +12,11 @@ menuconfig TCPDUMP
 	  a network interface.  In all cases, only packets that match
 	  expression will be processed by tcpdump.
 
+if TCPDUMP
+
 config TCPDUMP_ENABLE_CRYPTO
 	bool
 	prompt "enable crypto support"
-	depends on TCPDUMP
 	depends on BROKEN
 	help
 	  Select this, if you don't need support for
@@ -25,17 +26,17 @@ config TCPDUMP_SMB
 	bool
 	prompt "enable possibly-buggy SMB printer"
 	default y
-	depends on TCPDUMP
 	help
 	  Notes from configure, when this entry is checked:
 	   The SMB printer may have exploitable buffer overflows!!!
 
 config TCPDUMP_IPV6
 	bool
-	depends on TCPDUMP
 	select LIBPCAP_IPV6
 	default no
 	prompt "enable ipv6 (with ipv4) support"
 	help
 	  Enable this if you require ipv6 support. This also requires ipv6
 	  support in libpcap (already done if you check this entry)
+
+endif
diff --git a/rules/tcpwrapper.in b/rules/tcpwrapper.in
index 38ca2879e..8b0aa9a43 100644
--- a/rules/tcpwrapper.in
+++ b/rules/tcpwrapper.in
@@ -1,6 +1,6 @@
 menuconfig	TCPWRAPPER
-	bool
-	prompt "tcpwrapper          "
+	tristate
+	prompt "tcpwrapper                    "
 	help
 	  With this package you can monitor and filter incoming requests for the
 	  SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK, and other
diff --git a/rules/template-in b/rules/template-in
index 64591e4ba..01b52e66a 100644
--- a/rules/template-in
+++ b/rules/template-in
@@ -1,5 +1,5 @@
 config @PACKET@
-	bool
+	tristate
 	prompt "@packet@"
 	help
 	  FIXME
diff --git a/rules/termcap.in b/rules/termcap.in
index fdaa49fd1..9a4660cc3 100644
--- a/rules/termcap.in
+++ b/rules/termcap.in
@@ -1,6 +1,6 @@
 menuconfig	TERMCAP
-	bool
-	prompt "termcap                     "
+	tristate
+	prompt "termcap                       "
 	help
 	  This is the GNU termcap library -- a library of C functions that
 	  enable programs to send control strings to terminals in a way
diff --git a/rules/thttpd.in b/rules/thttpd.in
index 773957f32..c3a3dd44f 100644
--- a/rules/thttpd.in
+++ b/rules/thttpd.in
@@ -1,6 +1,6 @@
 menuconfig THTTPD
-	bool
-	prompt "thttpd              "
+	tristate
+	prompt "thttpd                        "
 	help
 	  thttpd (thin httpd) is a small, fast secure webserver.
 
diff --git a/rules/timezone.in b/rules/timezone.in
index 7f60e60a5..143405c2b 100644
--- a/rules/timezone.in
+++ b/rules/timezone.in
@@ -2,8 +2,8 @@ comment "Time zone support doesn't work with OSELAS.Toolchain-1.1.0"
 comment "and prio versions, hence marked as broken for now"
 
 menuconfig TIMEZONE
-	bool
-	prompt "Timezone Files           "
+	tristate
+	prompt "Timezone Files                "
 	depends on GLIBC
 	depends on BROKEN
 	help
diff --git a/rules/tk.in b/rules/tk.in
index 561e9e4be..8c40d5382 100644
--- a/rules/tk.in
+++ b/rules/tk.in
@@ -1,6 +1,6 @@
 menuconfig TK
-	bool
-	prompt "Tk                 "
+	tristate
+	prompt "Tk (Tcl/Tk)                   "
 	select ROOTFS_DEV
 	depends on TCL
 	depends on BROKEN
diff --git a/rules/troll-ftpd.in b/rules/troll-ftpd.in
index b0220f7a2..458679872 100644
--- a/rules/troll-ftpd.in
+++ b/rules/troll-ftpd.in
@@ -1,5 +1,5 @@
 config TROLL_FTPD
-	bool
+	tristate
 	prompt "troll-ftpd [BROKEN]"
 	depends on BROKEN
 	help
diff --git a/rules/tslib.in b/rules/tslib.in
index d5cef342b..489e9aa29 100644
--- a/rules/tslib.in
+++ b/rules/tslib.in
@@ -1,6 +1,6 @@
 menuconfig TSLIB
-	bool
-	prompt "tslib (touch library) "
+	tristate
+	prompt "tslib (touch library)         "
 	help
 	  Tslib is an abstraction layer for touchscreen panel events,
 	  as well as a filter stack for the manipulation of those
diff --git a/rules/udev.in b/rules/udev.in
index b0d2ae20f..5b3d38968 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -1,6 +1,6 @@
 menuconfig UDEV
-	bool
-	prompt "udev                "
+	tristate
+	prompt "udev                          "
 	select ROOTFS_DEV
 	help
 	  udev provides a dynamic device directory containing only
diff --git a/rules/unionfs.in b/rules/unionfs.in
index 51af3aebd..878657adf 100644
--- a/rules/unionfs.in
+++ b/rules/unionfs.in
@@ -1,5 +1,6 @@
 menuconfig UNIONFS
-	bool "unionfs [BROKEN]    "
+	tristate
+	prompt "unionfs [BROKEN]    "
 	depends on BROKEN
 	select KERNEL
 	select E2FSPROGS
diff --git a/rules/unzip.in b/rules/unzip.in
index 0f4817a45..253a34b3b 100644
--- a/rules/unzip.in
+++ b/rules/unzip.in
@@ -1,5 +1,6 @@
 menuconfig UNZIP
-	bool "unzip                         "
+	tristate
+	"unzip                         "
 	help
 	  UnZip is an extraction utility for archives compressed in .zip
 	  format (also called "zipfiles").
diff --git a/rules/urshd.in b/rules/urshd.in
index 48356801e..8d53a077c 100644
--- a/rules/urshd.in
+++ b/rules/urshd.in
@@ -2,4 +2,7 @@ config URSHD
 	tristate
 	prompt "urshd"
 	help
-	  FIXME
+	  urshd (micro remote shell server) is a server for rsh program.
+	  It is (indirectly) derived from BSD rshd with all the security
+	  checks cut off.  Unlike other versions it is standalone server
+	  that does not depend on the inetd daemon.
diff --git a/rules/usbutils.in b/rules/usbutils.in
index 03a182c24..767622436 100644
--- a/rules/usbutils.in
+++ b/rules/usbutils.in
@@ -1,7 +1,7 @@
 menuconfig USBUTILS
 	select LIBUSB
-	bool
-	prompt "usbutils            "
+	tristate
+	prompt "usbutils                      "
 	help
 	  usbutils
 
diff --git a/rules/usplash.in b/rules/usplash.in
index d0b65e8b1..11c8d3b10 100644
--- a/rules/usplash.in
+++ b/rules/usplash.in
@@ -1,6 +1,7 @@
 config USPLASH
-	bool
+	tristate
 	select LIBGD
 	prompt "usplash"
 	help
-	  FIXME
+	  Usplash is a userspace application that uses the Linux
+	  framebuffer interface to draw a splash screen at boot.
diff --git a/rules/utelnetd.in b/rules/utelnetd.in
index 88b20c345..f9495b5fd 100644
--- a/rules/utelnetd.in
+++ b/rules/utelnetd.in
@@ -1,7 +1,7 @@
 menuconfig UTELNETD
 	depends on !BB_CONFIG_TELNETD
-	bool
-	prompt "utelnetd            "
+	tristate
+	prompt "utelnetd                      "
 	help
 	  utelnet is a very small telnetd implementation.
 
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index defe72c84..d42acf783 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -1,6 +1,7 @@
 menuconfig UTIL_LINUX_NG
 
-	bool "util-linux-ng       "
+	tristate
+	"util-linux-ng                 "
 	select NCURSES if UTIL_LINUX_NG_CFDISK
 	select E2FSPROGS
 
diff --git a/rules/util-linux.in b/rules/util-linux.in
index d01ea9aff..674703df3 100644
--- a/rules/util-linux.in
+++ b/rules/util-linux.in
@@ -1,6 +1,7 @@
 menuconfig UTIL_LINUX
 
-	bool "util-linux          "
+	tristate
+	"util-linux                    "
 	select NCURSES if UTIL_LINUX_CFDISK
 
 config UTIL_LINUX_FDISK
diff --git a/rules/valgrind.in b/rules/valgrind.in
index 44e306455..e92eb17aa 100644
--- a/rules/valgrind.in
+++ b/rules/valgrind.in
@@ -1,5 +1,5 @@
 config VALGRIND
-	bool
+	tristate
 	prompt "valgrind"
 	help
 	  Valgrind is a GPL'd system for debugging and profiling x86-Linux
diff --git a/rules/vice.in b/rules/vice.in
index b7a3efd21..85fe11551 100644
--- a/rules/vice.in
+++ b/rules/vice.in
@@ -1,5 +1,5 @@
 config VICE
-	bool
+	tristate
 	select READLINE
 	select ALSA_LIB
 	prompt "vice"
@@ -7,4 +7,4 @@ config VICE
 	  VICE emulates well the hardware of the Commodore Business
 	  Machines of the pre-Amiga era. Supported are the various Pets, the
 	  VIC-20, the  Commodore 64, the Commodore 128, the CBM-II series, and
-	  the PLUS/4.
\ No newline at end of file
+	  the PLUS/4.
diff --git a/rules/wget.in b/rules/wget.in
index f708a600c..c3e02ea8f 100644
--- a/rules/wget.in
+++ b/rules/wget.in
@@ -1,5 +1,5 @@
 config WGET
-	bool
+	tristate
 	prompt "wget"
 	depends on !BB_CONFIG_WGET
 	help
diff --git a/rules/wine.in b/rules/wine.in
index d086a450d..9e10015d4 100644
--- a/rules/wine.in
+++ b/rules/wine.in
@@ -1,3 +1,4 @@
 config WINE
 	bool
+# only needed for its "usp10.h", e.g. by GTK
 
diff --git a/rules/wireless.in b/rules/wireless.in
index cd9a8b15d..988297b54 100644
--- a/rules/wireless.in
+++ b/rules/wireless.in
@@ -1,7 +1,7 @@
-menu    "Wireless Tools      "
+menu    "Wireless Tools                "
 
 config WIRELESS
-	bool
+	tristate
 	prompt "Wireless Tools"
 	help
  	  The wireless tools are used to manipulate the
diff --git a/rules/wireshark.in b/rules/wireshark.in
index ae9695028..c1b39595f 100644
--- a/rules/wireshark.in
+++ b/rules/wireshark.in
@@ -1,5 +1,5 @@
 menuconfig WIRESHARK
-	bool
+	tristate
 	depends on BROKEN
 	# incorrectly runs libgnutls-config from the host while trying
 	# to find out where tls is
@@ -13,11 +13,12 @@ menuconfig WIRESHARK
 	  to capture packets off the wire. Wireshark decodes
 	  numerous protocols (too many to list).
 
+if WIRESHARK
+
 config WIRESHARK_TSHARK
 	bool
 	default y
 	prompt "tshark"
-	depends on WIRESHARK
 	help
 	  This is the textmode version of wireshark
 
@@ -26,7 +27,6 @@ config WIRESHARK_TSHARK
 #	bool
 #	default n
 #	prompt "wireshark"
-#	depends on WIRESHARK
 #	help
 #	  This is the graphical version of wireshark
 #
@@ -34,8 +34,9 @@ config WIRESHARK_TSHARK
 #config WIRESHARK_IPV6
 #	bool
 #	default n
-#	depends on WIRESHARK
 #	prompt "support ipv6"
 #	help
 #	  Activate this to support ipv6 in wireshark
 #
+
+endif
diff --git a/rules/wxWindows.in b/rules/wxWindows.in
index eed825f9a..7b3fbafe1 100644
--- a/rules/wxWindows.in
+++ b/rules/wxWindows.in
@@ -1,5 +1,6 @@
 menuconfig WXWINDOWS
-	bool "wxWidgets [BROKEN]    "
+	tristate
+	"wxWidgets [BROKEN]    "
 	depends on BROKEN
 	help
 	  wxWindows Cross-platform C++ GUI toolkit
diff --git a/rules/xawtv.in b/rules/xawtv.in
index aa2e492f3..1a6fa7d95 100644
--- a/rules/xawtv.in
+++ b/rules/xawtv.in
@@ -1,6 +1,6 @@
 config XAWTV
+	tristate
 	prompt "xawtv"
-	bool
 	select LIBJPEG
 	select NCURSES
 	select XORG_LIB_XFONT
diff --git a/rules/xcursor-transparent-theme.in b/rules/xcursor-transparent-theme.in
index b5e4bfaf4..1ef3aacac 100644
--- a/rules/xcursor-transparent-theme.in
+++ b/rules/xcursor-transparent-theme.in
@@ -1,5 +1,5 @@
 config XCURSOR_TRANSPARENT_THEME
-	bool
+	tristate
 	depends on XORG_CURSOR
 	prompt "xcursor transparent theme"
 	help
diff --git a/rules/xerces.in b/rules/xerces.in
index 617a4f85c..4ea90f11c 100644
--- a/rules/xerces.in
+++ b/rules/xerces.in
@@ -2,7 +2,7 @@
 
 menuconfig XERCES
 	bool
-	prompt "xerces                      "
+	prompt "xerces                        "
 	help
 	  Xerces-C++ is a validating XML parser written in a portable
 	  subset of C++. Xerces-C++ makes it easy to give your
diff --git a/rules/xli.in b/rules/xli.in
index e315fee17..9e23b3c68 100644
--- a/rules/xli.in
+++ b/rules/xli.in
@@ -1,5 +1,5 @@
 config XLI
-	bool
+	tristate
 	select LIBPNG
 	select LIBJPEG
 	select XORG_LIB_X11
diff --git a/rules/xmlbench.in b/rules/xmlbench.in
index 5e4c47277..1a8c27021 100644
--- a/rules/xmlbench.in
+++ b/rules/xmlbench.in
@@ -1,6 +1,6 @@
 menuconfig XMLBENCH
 	depends on BROKEN
-	bool
+	tristate
 	prompt "xmlbench [BROKEN]"
 	help
 	  xmlbench provides benchmarking toolset for all
diff --git a/rules/xmlstarlet.in b/rules/xmlstarlet.in
index 6253e8c6a..fb6679c8c 100644
--- a/rules/xmlstarlet.in
+++ b/rules/xmlstarlet.in
@@ -1,5 +1,5 @@
 config XMLSTARLET
-	bool
+	tristate
 	select LIBXML2
 	select LIBXSLT
 	prompt "xmlstarlet"
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index a871035c7..bc205956a 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -9,7 +9,8 @@
 # REQUIRED_LIBS="xfont xau fontenc"
 #
 menuconfig XORG_SERVER
-	bool "xorg server           "
+	tristate
+	prompt "xorg server                   "
 # Always required:
 	select XORG_LIB_X11
 	select XORG_LIB_XAW
diff --git a/rules/xterm.in b/rules/xterm.in
index ba0b7c1b6..0cbb7366e 100644
--- a/rules/xterm.in
+++ b/rules/xterm.in
@@ -1,5 +1,5 @@
 config XTERM
-	bool
+	tristate
 	select XORG_LIB_XAW
 	select XORG_LIB_XMU
 	select XORG_LIB_XEXT
@@ -10,4 +10,5 @@ config XTERM
 	select NCURSES
 	prompt "xterm"
 	help
-	  FIXME
+	  The xterm program is the standard terminal emulator for the X
+	  Window System.
diff --git a/rules/zebra.in b/rules/zebra.in
index 04e1c770c..effe72383 100644
--- a/rules/zebra.in
+++ b/rules/zebra.in
@@ -1,5 +1,5 @@
 config ZEBRA
-	bool
+	tristate
 	prompt "GNU Zebra [BROKEN]"
 	depends on BROKEN
 	help
diff --git a/rules/zip.in b/rules/zip.in
index d1f3bae3d..f3bf0ff6e 100644
--- a/rules/zip.in
+++ b/rules/zip.in
@@ -1,5 +1,6 @@
 menuconfig ZIP
-	bool "zip                           "
+	tristate
+	"zip                           "
 	help
 	  zip is a compression and file packaging utility for Unix, VMS, MSDOS,
 	  OS/2, Windows NT, Minix, Atari and Macintosh, Amiga and Acorn RISC OS.
@@ -8,18 +9,18 @@ menuconfig ZIP
 	  press(1) and is compatible with PKZIP (Phil Katz's ZIP for MSDOS sys-
 	  tems).
 
+if ZIP
+
 config ZIP_ZIP
 	bool "zip"
-	depends on ZIP
 
 config ZIP_ZIPCLOAK
 	bool "zipcloak"
-	depends on ZIP
 
 config ZIP_ZIPNOTE
 	bool "zipnote"
-	depends on ZIP
 
 config ZIP_ZIPSPLIT
 	bool "zipsplit"
-	depends on ZIP
+
+endif
diff --git a/rules/zlib.in b/rules/zlib.in
index 3c4049055..fd914bfe0 100644
--- a/rules/zlib.in
+++ b/rules/zlib.in
@@ -1,5 +1,5 @@
 menuconfig ZLIB
-	bool
+	tristate
 	prompt "zlib                        "
 	help
 	  A Massively Spiffy Yet Delicately Unobtrusive