reorganize/rationalize/format package menuconfig,

make updatedd modular

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

openwrt/package/6tunnel/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_6TUNNEL
-	tristate "6tunnel - IPv4 / IPv6 tunnel proxy"
+	prompt "6tunnel........................... IPv4 / IPv6 tunnel proxy"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_IPV6
 	help
@@ -9,4 +10,3 @@ config BR2_PACKAGE_6TUNNEL
 	  
 	  http://toxygen.net/6tunnel/
 
-

openwrt/package/Config.in

@@ -15,6 +15,7 @@ comment "Applications"
 source "package/deco/Config.in"
 source "package/gpsd/Config.in"
 source "package/haserl/Config.in"
+source "package/irssi/Config.in"
 source "package/lcd4linux/Config.in"
 source "package/less/Config.in"
 source "package/lua/Config.in"
@@ -24,12 +25,12 @@ source "package/nano/Config.in"
 source "package/osiris/Config.in"
 source "package/php4/Config.in"
 source "package/php5/Config.in"
-menu "sablevm - a Java Virtual Machine (JVM) implementation"
+menu "sablevm........................... A Java Virtual Machine (JVM) implementation"
 source "package/sablevm/Config.in"
 source "package/sablevm-classpath/Config.in"
 source "package/libffi-sable/Config.in"
 endmenu
-menu "rrdtool - Round-Robin Database (RRD) libraries and tools"
+menu "rrdtool........................... Round-Robin Database (RRD) libraries and tools"
 source "package/rrdtool/Config.in"
 source "package/rrdtool1/Config.in"
 source "package/rrdcollect/Config.in"
@@ -37,8 +38,6 @@ endmenu
 source "package/screen/Config.in"
 
 comment "Networking"
-source "package/6tunnel/Config.in"
-source "package/aiccu/Config.in"
 source "package/aircrack/Config.in"
 source "package/amwall/Config.in"
 source "package/arpd/Config.in"
@@ -78,9 +77,7 @@ source "package/linux-atm/Config.in"
 source "package/maradns/Config.in"
 source "package/mini_httpd/Config.in"
 source "package/mini_sendmail/Config.in"
-source "package/miredo/Config.in"
 source "package/mtr/Config.in"
-source "package/ndisc/Config.in"
 source "package/net-snmp/Config.in"
 source "package/netstat-nat/Config.in"
 source "package/nfs-server/Config.in"
@@ -102,7 +99,6 @@ source "package/rp-pppoe/Config.in"
 source "package/pptp/Config.in"
 source "package/pptpd/Config.in"
 source "package/quagga/Config.in"
-source "package/radvd/Config.in"
 source "package/rarpd/Config.in"
 source "package/reaim/Config.in"
 source "package/robocfg/Config.in"
@@ -138,6 +134,13 @@ source "package/wrt-radauth/Config.in"
 source "package/xinetd/Config.in"
 source "package/xsupplicant/Config.in"
 
+comment "IPv6"
+source "package/6tunnel/Config.in"
+source "package/aiccu/Config.in"
+source "package/miredo/Config.in"
+source "package/ndisc/Config.in"
+source "package/radvd/Config.in"
+
 comment "Libraries"
 source "package/cgilib/Config.in"
 source "package/glib/Config.in"
@@ -195,9 +198,8 @@ source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
 source "package/uclibc++/Config.in"
 source "package/zlib/Config.in"
-source "package/irssi/Config.in"
 
-comment "Multimedia ---"
+comment "Multimedia"
 source "package/gmediaserver/Config.in"
 source "package/icecast/Config.in"
 source "package/mpd/Config.in"
@@ -205,25 +207,25 @@ source "package/mt-daapd/Config.in"
 source "package/palantir/Config.in"
 source "package/setpwc/Config.in"
 
-comment "Serial communications & terminal emulation ---"
+comment "Serial communications & terminal emulation"
 source "package/microcom/Config.in"
 source "package/picocom/Config.in"
 source "package/setserial/Config.in"
 
-comment "Utilities ---"
+comment "Utilities"
 source "package/gdbserver/Config.in"
 source "package/madwifi-tools/Config.in"
 source "package/usbutils/Config.in"  # lsusb
 source "package/strace/Config.in"
 
-comment "FileSystems related ---"
+comment "FileSystems related"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/fuse/Config.in"
 source "package/shfs/Config.in"
 source "package/util-linux/Config.in"
 
-comment "Bluetooth related ---"
+comment "Bluetooth"
 source "package/bluez-libs/Config.in"
 source "package/bluez-utils/Config.in"
 

openwrt/package/Makefile

@@ -10,9 +10,9 @@ package-$(BR2_PACKAGE_ARPD) += arpd
 package-$(BR2_PACKAGE_ARPTABLES) += arptables
 package-$(BR2_PACKAGE_ARPWATCH) += arpwatch
 package-$(BR2_PACKAGE_ASTERISK) += asterisk
-package-$(BR2_PACKAGE_ATFP) += atftp
+package-$(BR2_COMPILE_ATFTP) += atftp
 package-$(BR2_COMPILE_AVAHI) += avahi
-package-$(BR2_PACKAGE_BIND) += bind
+package-$(BR2_COMPILE_BIND) += bind
 package-$(BR2_PACKAGE_BLUEZ_LIBS) += bluez-libs
 package-$(BR2_PACKAGE_BLUEZ_UTILS) += bluez-utils
 package-$(BR2_PACKAGE_BRIDGE) += bridge
@@ -23,9 +23,10 @@ package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
 package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
 package-$(BR2_PACKAGE_CUPS) += cups
 package-$(BR2_COMPILE_CURL) += curl
-package-$(BR2_PACKAGE_CYRUS_SASL) += cyrus-sasl
+package-$(BR2_COMPILE_CYRUS_SASL) += cyrus-sasl
+package-$(BR2_COMPILE_DB) += libdb
 package-$(BR2_PACKAGE_DECO) += deco
-package-$(BR2_PACKAGE_DHCP) += dhcp
+package-$(BR2_COMPILE_DHCP) += dhcp
 package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
 package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq
 package-$(BR2_PACKAGE_DOSFSTOOLS) += dosfstools
@@ -41,30 +42,30 @@ package-$(BR2_PACKAGE_FPING) += fping
 package-$(BR2_PACKAGE_FPROBE) += fprobe
 package-$(BR2_PACKAGE_FPROBE_ULOG) += fprobe-ulog
 package-$(BR2_PACKAGE_FREERADIUS) += freeradius
-package-$(BR2_PACKAGE_FREETYPE) += freetype
+package-$(BR2_COMPILE_FREETYPE) += freetype
 package-$(BR2_PACKAGE_FRICKIN) += frickin
-package-$(BR2_PACKAGE_FUSE) += fuse
+package-$(BR2_COMPILE_FUSE) += fuse
 package-$(BR2_PACKAGE_GDBSERVER) += gdbserver
-package-$(BR2_PACKAGE_GLIB) += glib
+package-$(BR2_COMPILE_GLIB) += glib
 package-$(BR2_PACKAGE_GMEDIASERVER) += gmediaserver
-package-$(BR2_PACKAGE_GMP) += gmp
+package-$(BR2_COMPILE_GMP) += gmp
 package-$(BR2_COMPILE_GNUTLS) += gnutls
 package-$(BR2_PACKAGE_GPSD) += gpsd
 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_HOSTAPD) += hostapd
-package-$(BR2_PACKAGE_HOWL) += howl
+package-$(BR2_COMPILE_HOWL) += howl
 package-$(BR2_PACKAGE_HTPDATE) += htpdate
 package-$(BR2_PACKAGE_ICECAST) += icecast
 package-$(BR2_PACKAGE_ID3LIB) += id3lib
 package-$(BR2_PACKAGE_IPERF) += iperf
 package-$(BR2_PACKAGE_IPKG) += ipkg
-package-$(BR2_PACKAGE_IPROUTE2) += iproute2
+package-$(BR2_COMPILE_IPROUTE2) += iproute2
 package-$(BR2_PACKAGE_IPSET) += ipset
-package-$(BR2_PACKAGE_IPTABLES) += iptables
+package-$(BR2_COMPILE_IPTABLES) += iptables
 package-$(BR2_PACKAGE_IPTRAF) += iptraf
 package-$(BR2_PACKAGE_IRSSI) += irssi
 package-$(BR2_COMPILE_JPEG) += jpeg
-package-$(BR2_PACKAGE_KISMET) += kismet
+package-$(BR2_COMPILE_KISMET) += kismet
 package-$(BR2_PACKAGE_L2TPD) += l2tpd
 package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
 package-$(BR2_PACKAGE_LESS) += less
@@ -72,7 +73,6 @@ package-$(BR2_PACKAGE_LIBAMSEL) += libamsel
 package-$(BR2_PACKAGE_LIBAO) += libao
 package-$(BR2_PACKAGE_LIBART) += libart
 package-$(BR2_PACKAGE_LIBDAEMON) += libdaemon
-package-$(BR2_PACKAGE_LIBDB) += libdb
 package-$(BR2_PACKAGE_LIBDNET) += libdnet
 package-$(BR2_PACKAGE_LIBELF) += libelf
 package-$(BR2_PACKAGE_LIBEVENT) += libevent
@@ -91,7 +91,7 @@ package-$(BR2_PACKAGE_LIBPCAP) += libpcap
 package-$(BR2_PACKAGE_LIBPNG) += libpng
 package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread
 package-$(BR2_PACKAGE_LIBTASN1) += libtasn1
-package-$(BR2_PACKAGE_LIBTOOL) += libtool
+package-$(BR2_COMPILE_LIBTOOL) += libtool
 package-$(BR2_PACKAGE_LIBUPNP) += libupnp
 package-$(BR2_PACKAGE_LIBUSB) += libusb
 package-$(BR2_PACKAGE_LIBVORBIS) += libvorbis
@@ -100,11 +100,11 @@ package-$(BR2_PACKAGE_LIBXML2) += libxml2
 package-$(BR2_PACKAGE_LIBXSLT) += libxslt
 package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
 package-$(BR2_PACKAGE_LINUX_ATM) += linux-atm
-package-$(BR2_PACKAGE_LUA) += lua
+package-$(BR2_COMPILE_LUA) += lua
-package-$(BR2_PACKAGE_LZO) += lzo
+package-$(BR2_COMPILE_LZO) += lzo
 package-$(BR2_PACKAGE_MADWIFI_TOOLS) += madwifi-tools
 package-$(BR2_PACKAGE_MARADNS) += maradns
-package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
+package-$(BR2_COMPILE_MATRIXSSL) += matrixssl
 package-$(BR2_PACKAGE_MICROCOM) += microcom
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_COMPILE_MINI_HTTPD) += mini_httpd
@@ -115,9 +115,9 @@ package-$(BR2_PACKAGE_MPD) += mpd
 package-$(BR2_PACKAGE_MT_DAAPD) += mt-daapd
 package-$(BR2_PACKAGE_MTD) += mtd
 package-$(BR2_PACKAGE_MTR) += mtr
-package-$(BR2_PACKAGE_MYSQL) += mysql
+package-$(BR2_COMPILE_MYSQL) += mysql
 package-$(BR2_PACKAGE_NANO) += nano
-package-$(BR2_PACKAGE_NCURSES) += ncurses
+package-$(BR2_COMPILE_NCURSES) += ncurses
 package-$(BR2_COMPILE_NDISC6) += ndisc
 package-$(BR2_COMPILE_NET_SNMP) += net-snmp
 package-$(BR2_PACKAGE_NETSTAT_NAT) += netstat-nat
@@ -127,33 +127,33 @@ package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
 package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient
 package-$(BR2_PACKAGE_NVRAM) += nvram
 package-$(BR2_PACKAGE_OLSRD) += olsrd
-package-$(BR2_PACKAGE_OPENCDK) += opencdk
+package-$(BR2_COMPILE_OPENCDK) += opencdk
-package-$(BR2_PACKAGE_OPENLDAP) += openldap
+package-$(BR2_COMPILE_OPENLDAP) += openldap
 package-$(BR2_PACKAGE_OPENNTPD) += openntpd
-package-$(BR2_PACKAGE_OPENSSH) += openssh
+package-$(BR2_COMPILE_OPENSSH) += openssh
-package-$(BR2_PACKAGE_OPENSSL) += openssl
+package-$(BR2_COMPILE_OPENSSL) += openssl
 package-$(BR2_PACKAGE_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_OPENVPN) += openvpn
-package-$(BR2_PACKAGE_OSIRIS) += osiris
+package-$(BR2_COMPILE_OSIRIS) += osiris
 package-$(BR2_PACKAGE_PALANTIR) += palantir
 package-$(BR2_PACKAGE_P910ND) += p910nd
 package-$(BR2_PACKAGE_PARPROUTED) += parprouted
-package-$(BR2_PACKAGE_PCRE) += pcre
+package-$(BR2_COMPILE_PCRE) += pcre
 package-$(BR2_COMPILE_PHP4) += php4
 package-$(BR2_COMPILE_PHP5) += php5
 package-$(BR2_PACKAGE_PICOCOM) += picocom
-package-$(BR2_PACKAGE_PMACCT) += pmacct
+package-$(BR2_COMPILE_PMACCT) += pmacct
-package-$(BR2_PACKAGE_POPT) += popt
+package-$(BR2_COMPILE_POPT) += popt
 package-$(BR2_PACKAGE_PORTMAP) += portmap
 package-$(BR2_PACKAGE_PORTSENTRY) += portsentry
-package-$(BR2_PACKAGE_POSTGRESQL) += postgresql
+package-$(BR2_COMPILE_POSTGRESQL) += postgresql
 package-$(BR2_PACKAGE_PPP) += ppp
 package-$(BR2_PACKAGE_PPTP) += pptp
 package-$(BR2_PACKAGE_PPTPD) += pptpd
 package-$(BR2_PACKAGE_QUAGGA) += quagga
 package-$(BR2_PACKAGE_RADVD) += radvd
 package-$(BR2_PACKAGE_RARPD) += rarpd
-package-$(BR2_PACKAGE_READLINE) += readline
+package-$(BR2_COMPILE_READLINE) += readline
 package-$(BR2_PACKAGE_REAIM) += reaim
 package-$(BR2_PACKAGE_ROBOCFG) += robocfg
 package-$(BR2_COMPILE_RP_PPPOE) += rp-pppoe
@@ -163,7 +163,7 @@ package-$(BR2_COMPILE_RRDTOOL1) += rrdtool1
 package-$(BR2_COMPILE_RRS) += rrs
 package-$(BR2_PACKAGE_RSYNC) += rsync
 package-$(BR2_PACKAGE_SABLEVM) += sablevm
-package-$(BR2_PACKAGE_SABLEVM_CLASSPATH) += sablevm-classpath
+package-$(BR2_COMPILE_SABLEVM_CLASSPATH) += sablevm-classpath
 package-$(BR2_COMPILE_SAMBA) += samba
 package-$(BR2_PACKAGE_SCDP) += scdp
 package-$(BR2_PACKAGE_SCREEN) += screen
@@ -172,14 +172,14 @@ package-$(BR2_PACKAGE_SER) += ser
 package-$(BR2_PACKAGE_SETPWC) += setpwc
 package-$(BR2_PACKAGE_SETSERIAL) += setserial
 package-$(BR2_PACKAGE_SHAT) += shat
-package-$(BR2_PACKAGE_SHFS) += shfs
+package-$(BR2_COMPILE_SHFS) += shfs
 package-$(BR2_PACKAGE_SIPROXD) += siproxd
 package-$(BR2_PACKAGE_SIPSAK) += sipsak
-package-$(BR2_PACKAGE_SNORT) += snort
+package-$(BR2_COMPILE_SNORT) += snort
 package-$(BR2_PACKAGE_SOCAT) += socat
-package-$(BR2_PACKAGE_SPEEX) += speex
+package-$(BR2_COMPILE_SPEEX) += speex
-package-$(BR2_PACKAGE_SQLITE) += sqlite
+package-$(BR2_COMPILE_SQLITE) += sqlite
-package-$(BR2_PACKAGE_SQLITE2) += sqlite2
+package-$(BR2_COMPILE_SQLITE2) += sqlite2
 package-$(BR2_PACKAGE_SSMTP) += ssmtp
 package-$(BR2_PACKAGE_SRELAY) += srelay
 package-$(BR2_PACKAGE_STRACE) += strace
@@ -190,7 +190,7 @@ package-$(BR2_PACKAGE_TTCP) += ttcp
 package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++
 package-$(BR2_PACKAGE_ULOGD) += ulogd
 package-$(BR2_PACKAGE_UPDATEDD) += updatedd
-package-$(BR2_PACKAGE_USBUTILS) += usbutils
+package-$(BR2_COMPILE_USBUTILS) += usbutils
 package-$(BR2_COMPILE_UTIL_LINUX) += util-linux
 package-$(BR2_PACKAGE_VTUN) += vtun
 package-$(BR2_PACKAGE_VSFTPD) += vsftpd
@@ -403,10 +403,10 @@ php5-compile: expat-compile
 endif
 
 pmacct-compile: libpcap-compile
-ifneq ($(BR2_PACKAGE_PMACCT_MYSQL),)
+ifneq ($(BR2_COMPILE_PMACCT_MYSQL),)
 pmacct-compile: mysql-compile
 endif
-ifneq ($(BR2_PACKAGE_PMACCT_PGSQL),)
+ifneq ($(BR2_COMPILE_PMACCT_PGSQL),)
 pmacct-compile: postgresql-compile
 endif
 

openwrt/package/aiccu/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_AICCU
-	tristate "aiccu - SixXS Automatic IPv6 Connectivity Client Utility"
+	prompt "aiccu............................. SixXS Automatic IPv6 Connectivity Client Utility"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_IPV6
 	select BR2_PACKAGE_LIBPTHREAD
@@ -8,4 +9,3 @@ config BR2_PACKAGE_AICCU
 	  
 	  For more information about SixXS check http://www.sixxs.net/
 
-

openwrt/package/aircrack/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_AIRCRACK
-	tristate "aircrack - a set of tools for auditing wireless networks"
+	prompt "aircrack.......................... A set of tools for auditing wireless networks"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	help
@@ -12,4 +13,3 @@ config BR2_PACKAGE_AIRCRACK
 	  
 	  http://www.cr0.net:8040/code/network/aircrack/
 
-

openwrt/package/amwall/Config.in

@@ -1,9 +1,10 @@
 config BR2_PACKAGE_AMWALL
-        tristate "amwall - pf to iptables "
+	prompt "amwall............................ PF to iptables"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBAMSEL
-        help
+	help
-          See 
+	  PF for iptables
 	  
-          http://amselinux.de/
+	  http://amselinux.de/
 

openwrt/package/arpd/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ARPD
-	tristate "arpd - fake ARP replies"
+	prompt "arpd.............................. A daemon to fake ARP replies"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBDNET

openwrt/package/arptables/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_ARPTABLES
-	tristate "arptables - ARP firewall administration utility"
+	prompt "arptables......................... ARP firewall administration utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  ARP Firewalling (arptables)
 	  
 	  http://ebtables.sourceforge.net/
 
-

openwrt/package/arpwatch/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ARPWATCH
-	tristate "arpwatch - Ethernet station activity monitor"
+	prompt "arpwatch.......................... Ethernet station activity monitor"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Ethernet monitor program for keeping track of ethernet/ip address pairings

openwrt/package/asterisk/Config.in

@@ -1,7 +1,7 @@
-menu "asterisk - Complete open source PBX"
+menu "asterisk.......................... Complete open source PBX"
 
 config BR2_PACKAGE_ASTERISK
-	prompt "asterisk - Complete open source PBX"
+	prompt "asterisk.......................... Complete open source PBX"
 	tristate
 	default m if CONFIG_DEVEL
 	help
@@ -12,9 +12,8 @@ config BR2_PACKAGE_ASTERISK
 	  
 	  http://www.asterisk.org/
 
-
 config BR2_PACKAGE_ASTERISK_CHAN_BLUETOOTH
-	prompt "...-chan-bluetooth - Bluetooth HandsFreeProfile support for Asterisk"
+	prompt   "asterisk-chan-bluetooth......... Bluetooth HandsFreeProfile support for Asterisk"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -23,7 +22,7 @@ config BR2_PACKAGE_ASTERISK_CHAN_BLUETOOTH
 	  The Bluetooth HandsFreeProfile support for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CHAN_MGCP
-	prompt "...-chan-mgcp - Media Gateway Control Protocol implementation"
+	prompt   "asterisk-chan-mgcp.............. Media Gateway Control Protocol implementation"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -31,7 +30,7 @@ config BR2_PACKAGE_ASTERISK_CHAN_MGCP
 	  Media Gateway Control Protocol implementation for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CHAN_SKINNY
-	prompt "...-chan-skinny - Skinny Client Control Protocol implementation"
+	prompt   "asterisk-chan-skinny............ Skinny Client Control Protocol implementation"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -39,7 +38,7 @@ config BR2_PACKAGE_ASTERISK_CHAN_SKINNY
 	  Skinny Client Control Protocol implementation for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CODEC_ILBC
-	prompt "...-codec-ilbc - Internet Low Bitrate Codec (ILBC) Translator"
+	prompt   "asterisk-codec-ilbc............. Internet Low Bitrate Codec (ILBC) Translator"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -47,7 +46,7 @@ config BR2_PACKAGE_ASTERISK_CODEC_ILBC
 	  The Internet Low Bitrate Codec (ILBC) Translator for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CODEC_LPC10
-	prompt "...-codec-lpc10 - LPC10 (Linear Predictor Code) 2.4kbps Voice Coder"
+	prompt   "asterisk-codec-lpc10............ LPC10 (Linear Predictor Code) 2.4kbps Voice Coder"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -55,7 +54,7 @@ config BR2_PACKAGE_ASTERISK_CODEC_LPC10
 	  The LPC10 (Linear Predictor Code) 2.4kbps Voice Coder for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CODEC_SPEEX
-	prompt "...-codec-speex - Speex/PCM16 Codec Translator"
+	prompt   "asterisk-codec-speex............ Speex/PCM16 Codec Translator"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -64,7 +63,7 @@ config BR2_PACKAGE_ASTERISK_CODEC_SPEEX
 	  The Speex speech compression codec for Asterisk
 
 config BR2_PACKAGE_ASTERISK_PBX_DUNDI
-	prompt "...-pbx-dundi - Distributed Universal Number Discovery (DUNDi) support"
+	prompt   "asterisk-pbx-dundi.............. Distributed Universal Number Discovery (DUNDi) support"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -72,7 +71,7 @@ config BR2_PACKAGE_ASTERISK_PBX_DUNDI
 	  Distributed Universal Number Discovery (DUNDi) support for Asterisk
 
 config BR2_PACKAGE_ASTERISK_RES_AGI
-	prompt "...-res-agi - Asterisk Gateway Interface module"
+	prompt   "asterisk-res-agi................ Asterisk Gateway Interface module"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -80,7 +79,7 @@ config BR2_PACKAGE_ASTERISK_RES_AGI
 	  Asterisk Gateway Interface module
 
 config BR2_PACKAGE_ASTERISK_MYSQL
-	prompt "...-mysql - MySQL modules"
+	prompt   "asterisk-mysql.................. MySQL modules"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -89,7 +88,7 @@ config BR2_PACKAGE_ASTERISK_MYSQL
 	  MySQL modules for Asterisk
 
 config BR2_PACKAGE_ASTERISK_PGSQL
-	prompt "...-pgsql - PostgreSQL modules"
+	prompt   "asterisk-pgsql.................. PostgreSQL modules"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -98,7 +97,7 @@ config BR2_PACKAGE_ASTERISK_PGSQL
 	  PostgreSQL modules for Asterisk
 	  
 config BR2_PACKAGE_ASTERISK_SOUNDS
-	prompt "...-sounds - Sound files"
+	prompt   "asterisk-sounds................. Sound files"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -106,7 +105,7 @@ config BR2_PACKAGE_ASTERISK_SOUNDS
 	  Sound files for Asterisk
 
 config BR2_PACKAGE_ASTERISK_VOICEMAIL
-	prompt "...-voicemail - Voicemail support"
+	prompt   "asterisk-voicemail.............. Voicemail support"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK

openwrt/package/atftp/Config.in

@@ -1,11 +1,24 @@
+#menu "atftp............................. TFTP implementation"
+
+config BR2_COMPILE_ATFTP
+	bool
+	default n
+	depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD
+	
 config BR2_PACKAGE_ATFTP
-	tristate "atftp - a tftp client"
+	prompt "atftp............................. TFTP client"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_ATFTP
 	help
-	tftp client
+	  TFTP client
 
 config BR2_PACKAGE_ATFTPD
-	tristate "atftpd - a tftp server"
+	prompt "atftpd............................ TFTP server"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_ATFTP
 	help
-	tftp server 
+	  TFTP server 
+
+#endmenu

openwrt/package/avahi/Config.in

@@ -1,4 +1,4 @@
-menu "avahi - An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation"
+menu "avahi............................. An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation"
 
 config BR2_COMPILE_AVAHI
 	bool
@@ -6,7 +6,8 @@ config BR2_COMPILE_AVAHI
 	depends BR2_PACKAGE_AVAHI_DAEMON || BR2_PACKAGE_AVAHI_DNSCONFD || BR2_PACKAGE_LIBAVAHI
 
 config BR2_PACKAGE_AVAHI_DAEMON
-	tristate "avahi-daemon - an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon)"
+	prompt   "avahi-daemon.................... An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon)"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_AVAHI
 	select BR2_PACKAGE_LIBAVAHI
@@ -23,9 +24,9 @@ config BR2_PACKAGE_AVAHI_DAEMON
 	  
 	  This package contains an mDNS/DNS-SD daemon.
 
-
 config BR2_PACKAGE_AVAHI_DNSCONFD
-	tristate "avahi-dnsconfd - an Unicast DNS server from mDNS/DNS-SD configuration daemon"
+	prompt     "avahi-dnsconfd................ An Unicast DNS server from mDNS/DNS-SD configuration daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_AVAHI
 	depends BR2_PACKAGE_AVAHI_DAEMON
@@ -43,9 +44,9 @@ config BR2_PACKAGE_AVAHI_DNSCONFD
 	  daemon, which may be used to configure conventional DNS servers using mDNS 
 	  in a DHCP-like fashion. Especially useful on IPv6.
 
-
 config BR2_PACKAGE_LIBAVAHI
-	tristate "libavahi - an DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) implementation (library)"
+	prompt   "libavahi........................ An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library)"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_AVAHI
 	help
@@ -60,5 +61,4 @@ config BR2_PACKAGE_LIBAVAHI
 	  
 	  This package contains the mDNS/DNS-SD shared libraries, used by other programs.
 
-
 endmenu

openwrt/package/bind/Config.in

@@ -1,25 +1,34 @@
-menu "bind - DNS server implementation"
+#menu "bind.............................. A DNS server implementation"
 
-config BR2_PACKAGE_BIND
+config BR2_COMPILE_BIND
-	bool "bind - popular dns server"
+	bool
-	default y if CONFIG_DEVEL
+	default n
+	depends BR2_PACKAGE_BIND_CLIENT || BR2_PACKAGE_BIND_SERVER
+	
+config BR2_PACKAGE_BIND_CLIENT
+	prompt "bind-client....................... A dynamic DNS client"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
+	select BR2_PACKAGE_LIBOPENSSL
 	help
-	  DNS server implementation
+	  A DNS dynamic client (nsupdate)
 	  
-	  http://www.isc.org/
+	  http://www.isc.org/sw/bind/
 	  
 	  Depends: openssl
 
 config BR2_PACKAGE_BIND_SERVER
-	tristate "named - popular dns server"
+	prompt "bind-server....................... A DNS server"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
 	select BR2_PACKAGE_LIBOPENSSL
-	depends BR2_PACKAGE_BIND
+	help
+	  A DNS server (named)
 	  
-config BR2_PACKAGE_BIND_CLIENT
+	  http://www.isc.org/sw/bind/
-	tristate "nsupdate - dynamic dns client"
-	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LIBOPENSSL
-	depends BR2_PACKAGE_BIND
 	  
-endmenu
+	  Depends: openssl
+
+#endmenu

openwrt/package/bluez-libs/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BLUEZ_LIBS
-	tristate "bluez-libs - bluetooth library"
+	prompt "bluez-libs........................ Bluetooth library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Bluez libs. 

openwrt/package/bluez-utils/Config.in

@@ -1,7 +1,8 @@
 config BR2_PACKAGE_BLUEZ_UTILS
-	tristate "bluez-utils - bluetooth utils"
+	prompt "bluez-utils....................... Bluetooth utilities"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_GLIB
+	select BR2_PACKAGE_GLIB1
 	select BR2_PACKAGE_BLUEZ_LIBS
 	help
 	  Bluez utils. 
@@ -9,3 +10,4 @@ config BR2_PACKAGE_BLUEZ_UTILS
 	  http://bluez.org
 	  
 	  Depends: libpthread, bluez-libs
+

openwrt/package/bridge/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BRIDGE
-	tristate "bridge - Ethernet bridging configuration utility"
+	prompt "bridge............................ Ethernet bridging configuration utility"
+	tristate
 	default y
 	help
 	  Manage ethernet bridging; a way to connect networks together to 
@@ -7,4 +8,3 @@ config BR2_PACKAGE_BRIDGE
 	  
 	  http://bridge.sourceforge.net/
 
-

openwrt/package/busybox/Config.in

@@ -1,5 +1,8 @@
+menu "busybox........................... The Swiss Army Knife of embedded Linux"
+
 config BR2_PACKAGE_BUSYBOX
-	bool "busybox - The Swiss Army Knife of embedded Linux"
+	prompt "busybox........................... The Swiss Army Knife of embedded Linux"
+	bool
 	default y
 	help
 	  The Swiss Army Knife of embedded Linux.  It slices, it dices, it
@@ -25,3 +28,5 @@ menu "Busybox Configuration"
 source package/busybox/config/Config.in
 
 endmenu
+
+endmenu

openwrt/package/bwm/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BWM
-	tristate "bwm - Very tiny BandWidth Monitor"
+	prompt "bwm............................... A very tiny BandWidth Monitor"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A very tiny bandwidth monitor.

openwrt/package/cgilib/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CGILIB
-	tristate "cgilib - Simple CGI Library"
+	prompt "cgilib............................ Simple CGI Library"
+	tristate
 #	default m if CONFIG_DEVEL
 	default n
 	help
@@ -9,4 +10,3 @@ config BR2_PACKAGE_CGILIB
 	  
 	  http://www.infodrom.org/projects/cgilib/
 
-

openwrt/package/chillispot/Config.in

@@ -1,6 +1,8 @@
 config BR2_PACKAGE_CHILLISPOT
-	tristate "chillispot - Wireless LAN access point controller"
+	prompt "chillispot........................ Wireless LAN access point controller"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_KMOD_TUN
 	help
 	  ChilliSpot is an open source captive portal or wireless LAN
 	  access point controller. It is used for authenticating users

openwrt/package/cifsmount/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CIFSMOUNT
-	tristate "cifsmount - Helper utility for mounting remote CIFS shares"
+	prompt "cifsmount......................... Helper utility for mounting remote CIFS shares"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  An user space helper for mounting remote CIFS shares

openwrt/package/cups/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CUPS
-	tristate "cups - Common UNIX Printing System"
+	prompt "cups.............................. Common UNIX Printing System"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A printer spooling system for devices with USB or LP support

openwrt/package/curl/Config.in

@@ -4,7 +4,8 @@ config BR2_COMPILE_CURL
 	depends BR2_PACKAGE_LIBCURL
 
 config BR2_PACKAGE_LIBCURL
-	tristate "libcurl - A client-side URL transfer library"
+	prompt "libcurl........................... A client-side URL transfer library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_CURL
 	select BR2_PACKAGE_LIBOPENSSL
@@ -14,9 +15,9 @@ config BR2_PACKAGE_LIBCURL
 	  
 	  http://curl.haxx.se/
 
-
 config BR2_PACKAGE_CURL
-	tristate "curl - A client-side URL transfer tool"
+	prompt   "curl............................ A client-side URL transfer tool"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBCURL
 	help
@@ -24,4 +25,3 @@ config BR2_PACKAGE_CURL
 	  
 	  http://curl.haxx.se/
 
-

openwrt/package/cyrus-sasl/Config.in

@@ -1,12 +1,15 @@
+config BR2_COMPILE_CYRUS_SASL
+	bool
+	default n
+	depends BR2_PACKAGE_LIBSASL2
+
 config BR2_PACKAGE_LIBSASL2
-	tristate "libsasl2 - General purpose authentication library"
+	prompt "libsasl2.......................... General purpose authentication library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_CYRUS_SASL
 	help
 	  A general purpose authentication library.
 	  
 	  http://asg.web.cmu.edu/sasl/
 
-
-config BR2_PACKAGE_CYRUS_SASL
-	tristate
-	default BR2_PACKAGE_LIBSASL2

openwrt/package/deco/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DECO
-	tristate "deco - Text-based full featured file manager"
+	prompt "deco.............................. Text-based full featured file manager"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNCURSES
 	help
@@ -8,4 +9,3 @@ config BR2_PACKAGE_DECO
 	  
 	  http://deco.sourceforge.net/
 
-

openwrt/package/dhcp-forwarder/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_DHCP_FORWARDER
-	tristate "dhcp-forwarder - DHCP relay agent"
+	prompt "dhcp-forwarder.................... DHCP relay agent"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A DHCP relay agent
 	  
 	  http://www.nongnu.org/dhcp-fwd/
 
-

openwrt/package/dhcp/Config.in

@@ -1,27 +1,30 @@
-config BR2_PACKAGE_DHCP
+#menu "dhcp.............................. ISC DHCP (Dynamic Host Configuration Protocol) implementation"
-	tristate
+
+config BR2_COMPILE_DHCP
+	bool
 	default n
 	depends BR2_PACKAGE_DHCP_RELAY || BR2_PACKAGE_DHCP_SERVER
 
 config BR2_PACKAGE_DHCP_RELAY
-	tristate "dhcp-relay - ISC DHCP relay"
+	prompt "dhcp-relay........................ ISC DHCP relay"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_DHCP
+	select BR2_COMPILE_DHCP
 	help
 	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration 
 	  Protocol) relay daemon.
 	  
 	  http://www.isc.org/
 
-
 config BR2_PACKAGE_DHCP_SERVER
-	tristate "dhcp-server - ISC DHCP server"
+	prompt "dhcp-server....................... ISC DHCP server"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_DHCP
+	select BR2_COMPILE_DHCP
 	help
 	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration 
 	  Protocol) server daemon.
 	  
 	  http://www.isc.org/
 
-
+#endmenu

openwrt/package/dnsmasq/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DNSMASQ
-	tristate "dnsmasq - Lightweight DNS and DHCP server"
+	prompt "dnsmasq........................... Lightweight DNS and DHCP server"
+	tristate
 	default y
 	help
 	  A lightweight DNS and DHCP server.  It is intended to provide 

openwrt/package/dosfstools/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_DOSFSTOOLS
-	tristate "dosfstools - Utilities to create and check MS-DOS FAT filesystems"
+	prompt "dosfstools........................ Utilities to create and check MS-DOS FAT filesystems"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Utilities to create and check MS-DOS FAT filesystems.
 	  
 	  ftp://ftp.uni-erlangen.de:/pub/Linux/LOCAL/dosfstools/
 
-

openwrt/package/dropbear/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DROPBEAR
-	tristate "dropbear - Small SSH 2 client/server"
+	prompt "dropbear.......................... Small SSH 2 client/server"
+	tristate
 	default y
 	select BR2_PACKAGE_ZLIB
 	help

openwrt/package/dsniff/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DSNIFF
-	tristate "dsniff - network auditing and penetration testing"
+	prompt "dsniff............................ A collection of tools for betwork auditing and penetration testing"
+	tristate
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBNIDS
 	select BR2_PACKAGE_LIBNET
@@ -7,7 +8,7 @@ config BR2_PACKAGE_DSNIFF
 	select BR2_PACKAGE_LIBGDBM
 	default m if CONFIG_DEVEL
 	help
+	  A collection of tools for network auditing and penetration testing
 	  
-	collection of tools for network auditing and penetration testing
+	  http://www.monkey.org/~dugsong/dsniff/
 
-	http://www.monkey.org/~dugsong/dsniff/

openwrt/package/e2fsprogs/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_E2FSPROGS
-	tristate "e2fsprogs - Ext2/3 filesystem utilities"
+	prompt "e2fsprogs......................... Ext2/3 filesystem utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  This package contains essential ext2 filesystem utilities which consists of 

openwrt/package/ebtables/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_EBTABLES
-	tristate "ebtables - Ethernet bridge firewall administration utility"
+	prompt "ebtables.......................... Ethernet bridge firewall administration utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Ethernet Bridge Firewalling (ebtables)
 	  
 	  http://ebtables.sourceforge.net/
 
-

openwrt/package/ether-wake/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ETHER_WAKE
-	tristate "ether-wake - A Wake-On-LAN (WOL) client"
+	prompt "ether-wake........................ A Wake-On-LAN (WOL) client"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A Wake-On-LAN (WOL) client,

openwrt/package/expat/Config.in

@@ -4,7 +4,8 @@ config BR2_COMPILE_EXPAT
 	depends BR2_PACKAGE_LIBEXPAT
 
 config BR2_PACKAGE_LIBEXPAT
-	tristate "libexpat - a fast, non-validating, stream-oriented XML parsing library"
+	prompt "libexpat.......................... A fast, non-validating, stream-oriented XML parsing library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_EXPAT
 	help
@@ -12,4 +13,3 @@ config BR2_PACKAGE_LIBEXPAT
 	  
 	  http://expat.sourceforge.net/
 
-

openwrt/package/ez-ipupdate/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_EZIPUPDATE
-	tristate "ez-ipupdate - Client for most dynamic DNS services"
+	prompt "ez-ipupdate....................... Client for most dynamic DNS services"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A client for many Dynamic DNS services.
 	  
 	  http://ez-ipupdate.com/
 
-

openwrt/package/flac/Config.in

@@ -4,7 +4,8 @@ config BR2_COMPILE_FLAC
 	depends BR2_PACKAGE_LIBFLAC
 
 config BR2_PACKAGE_LIBFLAC
-	tristate "libflac - Free Lossless Audio Codec library"
+	prompt "libflac........................... Free Lossless Audio Codec library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_FLAC
 	help

openwrt/package/fping/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FPING
-	tristate "fping - Program to ping multiple hosts in parallel"
+	prompt "fping............................. A program to ping multiple hosts in parallel"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  fping is a ping(1) like program which uses the Internet Control Message Protocol

openwrt/package/fprobe-ulog/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FPROBE_ULOG
-	tristate "fprobe-ulog - NetFlow probe (ulog-based)"
+	prompt "fprobe-ulog....................... NetFlow probe (ulog-based)"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	help

openwrt/package/fprobe/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FPROBE
-	tristate "fprobe - NetFlow probe (libpcap-based)"
+	prompt "fprobe............................ NetFlow probe (libpcap-based)"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBPTHREAD

openwrt/package/freeradius/Config.in

@@ -1,7 +1,7 @@
-menu "freeradius - Flexible RADIUS server"
+menu "freeradius........................ A Flexible RADIUS server implementation"
 
 config BR2_PACKAGE_FREERADIUS
-	prompt "freeradius - Flexible RADIUS server"
+	prompt "freeradius........................ Flexible RADIUS server"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBLTDL
@@ -20,116 +20,115 @@ config BR2_PACKAGE_FREERADIUS
 	    - libopenldap (for LDAP support)
 	    - libpq (for PostgreSQL support)
 
-
 config BR2_PACKAGE_FREERADIUS_DEMOCERTS
-	depends BR2_PACKAGE_FREERADIUS
+	prompt   "freeradius-democerts............ Demo certificates to test the server"
-	prompt "...-democerts - Demo certificates to test the server"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_CHAP
-	depends BR2_PACKAGE_FREERADIUS
+	prompt   "freeradius-mod-chap............. CHAP module"
-	prompt "...-mod-chap - CHAP module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP
-	depends BR2_PACKAGE_FREERADIUS
+	prompt   "freeradius-mod-eap.............. Base EAP module"
-	prompt "...-mod-eap - Base EAP module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_GTC
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
+	prompt     "freeradius-mod-eap-gtc........ EAP/GTC module"
-	prompt "...-mod-eap-gtc - EAP/GTC module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_MD5
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
+	prompt     "freeradius-mod-eap-md5........ EAP/MD5 module"
-	prompt "...-mod-eap-md5 - EAP/MD5 module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_MSCHAPV2
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
+	prompt     "freeradius-mod-eap-mschapv2... EAP/MS-CHAPv2 module"
-	prompt "...-mod-eap-mschapv2 - EAP/MS-CHAPv2 module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_PEAP
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
+	prompt     "freeradius-mod-eap-peap....... EAP/PEAP module"
-	prompt "...-mod-eap-peap - EAP/PEAP module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_TLS
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
+	prompt     "freeradius-mod-eap-tls........ EAP/TLS module"
-	prompt "...-mod-eap-tls - EAP/TLS module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_TTLS
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP_TLS
+	prompt       "freeradius-mod-eap-ttls..... EAP/TTLS module"
-	prompt "...-mod-eap-ttls - EAP/TTLS module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP_TLS
 
 config BR2_PACKAGE_FREERADIUS_MOD_FILES
-	depends BR2_PACKAGE_FREERADIUS
+	prompt   "freeradius-mod-files............ Module using local files for authorization"
-	prompt "...-mod-files - Module using local files for authorization"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_LDAP
-	depends BR2_PACKAGE_FREERADIUS
+	prompt   "freeradius-mod-ldap............. LDAP module"
-	prompt "...-mod-ldap - LDAP module"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOPENLDAP
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_MSCHAP
-	depends BR2_PACKAGE_FREERADIUS
+	prompt   "freeradius-mod-mschap........... MS-CHAP and MS-CHAPv2 module"
-	prompt "...-mod-mschap - MS-CHAP and MS-CHAPv2 module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_PAP
-	depends BR2_PACKAGE_FREERADIUS
+	prompt   "freeradius-mod-pap.............. PAP module"
-	prompt "...-mod-pap - PAP module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_SQL
-	depends BR2_PACKAGE_FREERADIUS
+	prompt   "freeradius-mod-sql.............. Base SQL module"
-	prompt "...-mod-sql - Base SQL module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_SQL_MYSQL
-	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
+	prompt     "freeradius-mod-sql-mysql...... MySQL module"
-	prompt "...-mod-sql-mysql - MySQL module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
 	select BR2_PACKAGE_LIBMYSQLCLIENT
 
 config BR2_PACKAGE_FREERADIUS_MOD_SQL_PGSQL
-	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
+	prompt     "freeradius-mod-sql-pgsql...... PostgreSQL module"
-	prompt "...-mod-sql-pgsql - PostgreSQL module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
 	select BR2_PACKAGE_LIBPQ
 
 config BR2_PACKAGE_FREERADIUS_MOD_SQLCOUNTER
-	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
+	prompt     "freeradius-mod-sqlcounter..... Generic SQL Counter module"
-	prompt "...-mod-sqlcounter - Generic SQL Counter module"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
 
 config BR2_PACKAGE_FREERADIUS_UTILS
-	depends BR2_PACKAGE_FREERADIUS
+	prompt   "freeradius-utils................ Misc. client utilities"
-	prompt "...-utils - Misc. client utilities"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 endmenu

openwrt/package/freetype/Config.in

@@ -1,13 +1,13 @@
-config BR2_PACKAGE_FREETYPE
+config BR2_COMPILE_FREETYPE
 	bool
 	default n
 	depends BR2_PACKAGE_LIBFREETYPE
 
 config BR2_PACKAGE_LIBFREETYPE
-	tristate "libfreetype - A free, high-quality and portable font engine"
+	tristate "libfreetype....................... A free, high-quality and portable font engine"
 #	default m if CONFIG_DEVEL
 	default n
-	select BR2_PACKAGE_FREETYPE
+	select BR2_COMPILE_FREETYPE
 	select BR2_PACKAGE_ZLIB
 	help
 	  The FreeType project is a team of volunteers who develop free,

openwrt/package/frickin/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FRICKIN
-	tristate "frickin - PPTP (Point-to-Point Tunneling Protocol) proxy"
+	prompt "frickin........................... PPTP (Point-to-Point Tunneling Protocol) proxy"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP) 

openwrt/package/fuse/Config.in

@@ -1,13 +1,13 @@
-config BR2_PACKAGE_FUSE
+config BR2_COMPILE_FUSE
 	bool
 	default n
 	depends BR2_PACKAGE_LIBFUSE
 
-
 config BR2_PACKAGE_LIBFUSE
-	prompt "libfuse - FUSE library"
+	prompt "libfuse........................... FUSE library"
 	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_FUSE
 	select BR2_PACKAGE_KMOD_FUSE
 	select BR2_PACKAGE_LIBPTHREAD
 	help
@@ -24,16 +24,14 @@ config BR2_PACKAGE_LIBFUSE
 	   * Runs on Linux kernels 2.4.X and 2.6.X
 	   * Has proven very stable over time
 	  
-	  
 	  http://fuse.sourceforge.net/
 	  
 	  This package contains the fuse shared library, needed by other programs.
 	  
 	  Depends: libpthread
 
-
 config BR2_PACKAGE_FUSE_UTILS
-	prompt "fuse-utils - FUSE utilities"
+	prompt   "fuse-utils...................... FUSE utilities"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBFUSE
@@ -52,7 +50,6 @@ config BR2_PACKAGE_FUSE_UTILS
 	   * Runs on Linux kernels 2.4.X and 2.6.X
 	   * Has proven very stable over time
 	  
-	  
 	  http://fuse.sourceforge.net/
 	  
 	  This package contains the fusermount userland utility.

openwrt/package/gdbserver/Config.in

@@ -1,8 +1,8 @@
 config BR2_PACKAGE_GDBSERVER
-	tristate "gdbserver - Remote Server for the GNU Debugger"
+	prompt "gdbserver......................... Remote Server for the GNU Debugger"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 GDBSERVER is a program that allows you to run GDB on a different machine
+	  GDBSERVER is a program that allows you to run GDB on a different machine
-	 than the one which is running the program being debugged.
+	  than the one which is running the program being debugged.
-	 
 

openwrt/package/glib/Config.in

@@ -1,6 +1,12 @@
+config BR2_COMPILE_GLIB
+	bool
+	depends BR2_PACKAGE_GLIB1
+
 config BR2_PACKAGE_GLIB1
-	tristate "glib 1.2 - The GLib library of C routines"
+	prompt "glib1............................. The GLib library of C routines (v1.2)"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_GLIB
 	select BR2_PACKAGE_LIBPTHREAD
 	help
 	  GLib is a library containing many useful C routines for things such
@@ -10,6 +16,3 @@ config BR2_PACKAGE_GLIB1
 	  
 	  Depends: libpthread
 
-config BR2_PACKAGE_GLIB
-	tristate
-	default BR2_PACKAGE_GLIB1

openwrt/package/gmediaserver/Config.in

@@ -1,14 +1,13 @@
 config BR2_PACKAGE_GMEDIASERVER
-	prompt "gmediaserver - An UPnP music media server"
+	prompt "gmediaserver...................... An UPnP music media server"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_ID3LIB
 	select BR2_PACKAGE_LIBUPNP
 	help
-	 An UPnP music media server.
+	  An UPnP music media server.
 	  
-	 http://www.nongnu.org/gmediaserver/
+	  http://www.nongnu.org/gmediaserver/
-	 
-	 Depends: id3lib, libupnp
 	  
+	  Depends: id3lib, libupnp
 

openwrt/package/gmp/Config.in

@@ -1,12 +1,15 @@
+config BR2_COMPILE_GMP
+	bool
+	default n
+	depends BR2_PACKAGE_LIBGMP
+
 config BR2_PACKAGE_LIBGMP
-	tristate "libgmp - GNU multiprecision arithmetic library"
+	prompt "libgmp............................ GNU multiprecision arithmetic library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_GMP
 	help
 	  GNU multiprecision arithmetic library
 	  
 	  http://www.swox.com/gmp/
 
-
-config BR2_PACKAGE_GMP
-	tristate
-	default BR2_PACKAGE_LIBGMP

openwrt/package/gnutls/Config.in

@@ -4,96 +4,96 @@ config BR2_COMPILE_GNUTLS
 	depends BR2_PACKAGE_LIBGNUTLS
 
 config BR2_PACKAGE_LIBGNUTLS
-	tristate "libgnutls - The GNU TLS library"
+	prompt "libgnutls......................... The GNU TLS library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_GNUTLS
 	select BR2_PACKAGE_LIBGCRYPT
 	help
-	 GnuTLS is a project that aims to develop a library which provides a 
+	  GnuTLS is a project that aims to develop a library which provides a 
-	 secure layer, over a reliable transport layer. Currently the GnuTLS 
+	  secure layer, over a reliable transport layer. Currently the GnuTLS 
-	 library implements the proposed standards by the IETF's TLS working 
+	  library implements the proposed standards by the IETF's TLS working 
-	 group.
+	  group.
 	  
-	 Quoting from RFC2246 - the TLS 1.0 protocol specification:
+	  Quoting from RFC2246 - the TLS 1.0 protocol specification:
 	  
-	 "The TLS protocol provides communications privacy over the Internet.
+	  "The TLS protocol provides communications privacy over the Internet.
-	  The protocol allows client/server applications to communicate in a 
+	   The protocol allows client/server applications to communicate in a 
-	  way that is designed to prevent eavesdropping, tampering, or message 
+	   way that is designed to prevent eavesdropping, tampering, or message 
-	  forgery."
+	   forgery."
 	  
-	 Features
+	  Features
 	  
-	   * Support for TLS 1.1 and SSL 3.0 protocols
+	    * Support for TLS 1.1 and SSL 3.0 protocols
-	   * Support for TLS extensions
+	    * Support for TLS extensions
-	   * Support for authentication using the SRP protocol
+	    * Support for authentication using the SRP protocol
-	   * Support for authentication using both X.509 certificates
+	    * Support for authentication using both X.509 certificates
-	   * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
+	    * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
-	   * Supports all the strong encryption algorithms
+	    * Supports all the strong encryption algorithms
 	  
-	 http://www.gnu.org/software/gnutls/
+	  http://www.gnu.org/software/gnutls/
-	 
-	 This packages contains the GnuTLS shared libraries, needed by other programs.
 	  
+	  This packages contains the GnuTLS shared libraries, needed by other programs.
 
 config BR2_PACKAGE_GNUTLS_UTILS
-	tristate "gnutls-utils - The GNU TLS utilities"
+	prompt   "gnutls-utils.................... The GNU TLS utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBGNUTLS
 	help
-	 GnuTLS is a project that aims to develop a library which provides a 
+	  GnuTLS is a project that aims to develop a library which provides a 
-	 secure layer, over a reliable transport layer. Currently the GnuTLS 
+	  secure layer, over a reliable transport layer. Currently the GnuTLS 
-	 library implements the proposed standards by the IETF's TLS working 
+	  library implements the proposed standards by the IETF's TLS working 
-	 group.
+	  group.
 	  
-	 Quoting from RFC2246 - the TLS 1.0 protocol specification:
+	  Quoting from RFC2246 - the TLS 1.0 protocol specification:
 	  
-	 "The TLS protocol provides communications privacy over the Internet.
+	  "The TLS protocol provides communications privacy over the Internet.
-	  The protocol allows client/server applications to communicate in a 
+	   The protocol allows client/server applications to communicate in a 
-	  way that is designed to prevent eavesdropping, tampering, or message 
+	   way that is designed to prevent eavesdropping, tampering, or message 
-	  forgery."
+	   forgery."
 	  
-	 Features
+	  Features
 	  
-	   * Support for TLS 1.1 and SSL 3.0 protocols
+	    * Support for TLS 1.1 and SSL 3.0 protocols
-	   * Support for TLS extensions
+	    * Support for TLS extensions
-	   * Support for authentication using the SRP protocol
+	    * Support for authentication using the SRP protocol
-	   * Support for authentication using both X.509 certificates
+	    * Support for authentication using both X.509 certificates
-	   * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
+	    * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
-	   * Supports all the strong encryption algorithms
+	    * Supports all the strong encryption algorithms
 	  
-	 http://www.gnu.org/software/gnutls/
+	  http://www.gnu.org/software/gnutls/
-	 
-	 This packages contains some GnuTLS utilities.
 	  
+	  This packages contains some GnuTLS utilities.
 
 config BR2_PACKAGE_LIBGNUTLS_OPENSSL
-	tristate "libgnutls-openssl - The GNU TLS OpenSSL compatibility layer library"
+	prompt   "libgnutls-openssl............... The GNU TLS OpenSSL compatibility layer library"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBGNUTLS
 	help
-	 GnuTLS is a project that aims to develop a library which provides a 
+	  GnuTLS is a project that aims to develop a library which provides a 
-	 secure layer, over a reliable transport layer. Currently the GnuTLS 
+	  secure layer, over a reliable transport layer. Currently the GnuTLS 
-	 library implements the proposed standards by the IETF's TLS working 
+	  library implements the proposed standards by the IETF's TLS working 
-	 group.
+	  group.
 	  
-	 Quoting from RFC2246 - the TLS 1.0 protocol specification:
+	  Quoting from RFC2246 - the TLS 1.0 protocol specification:
 	  
-	 "The TLS protocol provides communications privacy over the Internet.
+	  "The TLS protocol provides communications privacy over the Internet.
-	  The protocol allows client/server applications to communicate in a 
+	   The protocol allows client/server applications to communicate in a 
-	  way that is designed to prevent eavesdropping, tampering, or message 
+	   way that is designed to prevent eavesdropping, tampering, or message 
-	  forgery."
+	   forgery."
 	  
-	 Features
+	  Features
 	  
-	   * Support for TLS 1.1 and SSL 3.0 protocols
+	    * Support for TLS 1.1 and SSL 3.0 protocols
-	   * Support for TLS extensions
+	    * Support for TLS extensions
-	   * Support for authentication using the SRP protocol
+	    * Support for authentication using the SRP protocol
-	   * Support for authentication using both X.509 certificates
+	    * Support for authentication using both X.509 certificates
-	   * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
+	    * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
-	   * Supports all the strong encryption algorithms
+	    * Supports all the strong encryption algorithms
 	  
-	 http://www.gnu.org/software/gnutls/
+	  http://www.gnu.org/software/gnutls/
-	 
-	 This packages contains the GnuTLS OpenSSL compatibility layer shared library.
 	  
+	  This packages contains the GnuTLS OpenSSL compatibility layer shared library.
 

openwrt/package/gpsd/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GPSD
-	tristate "gpsd - An interface daemon for GPS receivers"
+	prompt "gpsd.............................. An interface daemon for GPS receivers"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	select BR2_PACKAGE_UCLIBCXX

openwrt/package/haserl/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_HASERL
-	tristate "haserl - CGI wrapper to embed shell scripts in HTML documents"
+	prompt "haserl............................ A CGI wrapper to embed shell scripts in HTML documents"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A CGI wrapper to embed shell scripts in HTML documents.
 	  
 	  http://haserl.sourceforge.net/
 
-

openwrt/package/hostapd/Config.in

@@ -1,8 +1,9 @@
 config BR2_PACKAGE_HOSTAPD
-	tristate "hostapd - IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator"
+	prompt "hostapd........................... An IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_MADWIFI
-	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBOPENSSL
 	help
 	  hostapd is a user space daemon for access point and 
 	  authentication servers. It implements IEEE 802.11 access point 
@@ -11,4 +12,3 @@ config BR2_PACKAGE_HOSTAPD
 	  
 	  http://hostap.epitest.fi/hostapd/
 
-

openwrt/package/howl/Config.in

@@ -1,46 +1,62 @@
-menu "howl - Zeroconf networking implementation"
+menu "howl.............................. A Zeroconf networking implementation"
 
-config BR2_PACKAGE_HOWL
+config BR2_COMPILE_HOWL
 	bool
 	default n
 	depends BR2_PACKAGE_LIBHOWL
 
 config BR2_PACKAGE_LIBHOWL
-	prompt "libhowl - howl library"
+	prompt "libhowl........................... The howl library"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_HOWL
+	select BR2_COMPILE_HOWL
 	help
-	  
 	  A cross-platform implementation of Zeroconf networking.
 	  
 	  http://www.porchdogsoft.com/products/howl/
 	  
 	  This package contains shared libraries, needed by other programs.
 
-
 config BR2_PACKAGE_HOWL_UTILS
-	depends BR2_PACKAGE_LIBHOWL
+	prompt   "howl-utils...................... The howl client utilities"
-	prompt "howl-utils - howl client utilities"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIBHOWL
+	help
+	  A cross-platform implementation of Zeroconf networking.
+	  
+	  http://www.porchdogsoft.com/products/howl/
+
+comment "Daemons ---"
 
 config BR2_PACKAGE_AUTOIPD
-	depends BR2_PACKAGE_LIBHOWL
+	prompt "autoipd........................... An IPv4 Link-Local address self-assigner daemon"
-	prompt "autoipd - an IPv4 Link-Local address self-assigner daemon"
 	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBHOWL
+	help
+	  A cross-platform implementation of Zeroconf networking.
+	  
+	  http://www.porchdogsoft.com/products/howl/
 
 config BR2_PACKAGE_MDNSRESPONDER
-	depends BR2_PACKAGE_LIBHOWL
+	prompt "mdnsresponder..................... An mDNS (Multicast DNS) service responder daemon"
-	prompt "mdnsresponder - an mDNS (Multicast DNS) service responder daemon"
 	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBHOWL
+	help
+	  A cross-platform implementation of Zeroconf networking.
+	  
+	  http://www.porchdogsoft.com/products/howl/
 
 config BR2_PACKAGE_NIFD
-	depends BR2_PACKAGE_LIBHOWL
+	prompt "nifd.............................. A network interface monitor daemon"
-	prompt "nifd - a network interface monitor daemon"
 	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBHOWL
+	help
+	  A cross-platform implementation of Zeroconf networking.
+	  
+	  http://www.porchdogsoft.com/products/howl/
 
 endmenu

openwrt/package/htpdate/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_HTPDATE
-	tristate "htpdate - HTP (Hypertext Time Protocol) implementation"
+	prompt "htpdate........................... HTP (Hypertext Time Protocol) implementation"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  An HTP (Hypertext Time Protocol) implementation
 	  
 	  http://www.clevervest.com/htp/
 
-

openwrt/package/icecast/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ICECAST
-	tristate "icecast - A streaming media server for Ogg/Vorbis and MP3 audio streams"
+	prompt "icecast........................... A streaming media server for Ogg/Vorbis and MP3 audio streams"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBVORBISIDEC
@@ -21,4 +22,3 @@ config BR2_PACKAGE_ICECAST
 	   * libxml2
 	   * libxslt
 
-

openwrt/package/id3lib/Config.in

@@ -1,14 +1,13 @@
 config BR2_PACKAGE_ID3LIB
-	prompt "id3lib - An ID3v1/ID3v2 tagging library"
+	prompt "id3lib............................ An ID3v1/ID3v2 tagging library"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_UCLIBCXX
 	select BR2_PACKAGE_ZLIB
 	help
-	 An ID3v1/ID3v2 tagging library.
+	  An ID3v1/ID3v2 tagging library.
 	  
-	 http://www.id3lib.org/
+	  http://www.id3lib.org/
-	 
-	 Depends: uClibc++, zlib
 	  
+	  Depends: uClibc++, zlib
 

openwrt/package/iperf/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_IPERF
-	tristate "iperf - Internet Protocol bandwidth measuring tool"
+	prompt "iperf............................. Internet Protocol bandwidth measuring tool"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Iperf is a modern alternative for measuring TCP and UDP bandwidth 
@@ -8,4 +9,3 @@ config BR2_PACKAGE_IPERF
 	  
 	  http://dast.nlanr.net/Projects/Iperf/
 
-

openwrt/package/ipkg/Config.in

@@ -1,17 +1,18 @@
 config BR2_PACKAGE_IPKG
-	tristate "ipkg - itsy package management system"
+	prompt "ipkg.............................. The itsy package management system"
-	depends ! BUSYBOX_CONFIG_IPKG
+	tristate
-	default y
+	default m if BUSYBOX_CONFIG_IPKG
+	default y if ! BUSYBOX_CONFIG_IPKG
 	help
-	 Lightweight package management system
+	  Lightweight package management system
-	 ipkg is the Itsy Package Management System, for handling
+	  ipkg is the Itsy Package Management System, for handling
-	 installation and removal of packages on a system. It can
+	  installation and removal of packages on a system. It can
-	 recursively follow dependencies and download all packages
+	  recursively follow dependencies and download all packages
-	 necessary to install a particular package.
+	  necessary to install a particular package.
 	  
-	 ipkg knows how to install both .ipk and .deb packages.
+	  ipkg knows how to install both .ipk and .deb packages.
 	  
-	 ipkg is intended to serve the same functions (and more) for
+	  ipkg is intended to serve the same functions (and more) for
-	 Familiar that dpkg and apt serve for Debian, (while taking
+	  Familiar that dpkg and apt serve for Debian, (while taking
-	 up much less space).
+	  up much less space).
 

openwrt/package/iproute2/Config.in

@@ -1,17 +1,21 @@
-config BR2_PACKAGE_IPROUTE2
+menu "iproute2.......................... A collection of utilites for controlling TCP/IP networking and Traffic Control"
-	tristate
+
-	depends BR2_PACKAGE_IPROUTE2_IP || BR2_PACKAGE_IPROUTE2_TC
+config BR2_COMPILE_IPROUTE2
+	bool
 	default n
+	depends BR2_PACKAGE_IPROUTE2_IP || BR2_PACKAGE_IPROUTE2_TC
 
-config BR2_PACKAGE_IPROUTE2_IP
+config BR2_PACKAGE_IP
-	tristate "iproute2 routing control (ip)"
+	prompt   "ip.............................. A routing control utility"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_IPROUTE2
+	select BR2_COMPILE_IPROUTE2
 
-config BR2_PACKAGE_IPROUTE2_TC
+config BR2_PACKAGE_TC
-	tristate "iproute2 traffic control (tc)"
+	prompt   "tc.............................. A traffic control utility"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_IPROUTE2
+	select BR2_COMPILE_IPROUTE2
 	select BR2_PACKAGE_KMOD_SCHED
 
-	
+endmenu

openwrt/package/ipset/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_IPSET
-	tristate "ipset - Netfilter ip sets administration utility"
+	prompt "ipset............................. Netfilter ip sets administration utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Netfilter ip sets administration utility
 	  
 	  http://ipset.netfilter.org/
 
-

openwrt/package/iptables/Config.in

@@ -1,32 +1,49 @@
+menu "iptables.......................... IPv4 / IPv6 firewall administration"
+
+config BR2_COMPILE_IPTABLES
+	bool
+	default n
+	depends BR2_PACKAGE_IPTABLES || BR2_PACKAGE_IP6TABLES
+
 config BR2_PACKAGE_IPTABLES
-	tristate "iptables - IPv4 firewall administration tool"
+	prompt "iptables.......................... IPv4 firewall administration tool"
+	tristate
 	default y
+	select BR2_COMPILE_IPTABLES
 	help
-	  Linux kernel (2.4+) firewall, NAT, and packet mangling tools.
+	  IPv4 firewall, NAT, and packet mangling tools.
 	  
 	  http://www.iptables.org/
 
-
 config BR2_PACKAGE_IPTABLES_UTILS
-	tristate "iptables - Save and restore utilities"
+	prompt   "iptables-utils.................. Save and restore utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	help
 	  iptables-save and iptables-restore
 	  
+	  http://www.iptables.org/
+
 config BR2_PACKAGE_IPTABLES_EXTRA
-	tristate "extra modules - Extra modules not found elsewhere"
+	prompt   "iptables-extra.................. Extra modules not found elsewhere"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	help
 	  Extra modules for iptables (kernel and user space)
 	  
+	  http://www.iptables.org/
+
 config BR2_PACKAGE_IP6TABLES
-	tristate "ip6tables - IPv6 firewall administration tool"
+	prompt "ip6tables......................... IPv6 firewall administration tool"
+	tristate
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
+	select BR2_COMPILE_IPTABLES
 	select BR2_PACKAGE_KMOD_IPV6
 	help
-	  IPv6 firewalling
+	  IPv6 firewall, NAT, and packet mangling tools.
 	  
+	  http://www.iptables.org/
 
+endmenu

openwrt/package/iptraf/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_IPTRAF
-	tristate "iptraf - A console-based network monitoring program"
+	prompt "iptraf............................ A console-based network monitoring program"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  IPTraf is a console-based network statistics utility for Linux. It gathers 
@@ -9,4 +10,3 @@ config BR2_PACKAGE_IPTRAF
 	  
 	  http://iptraf.seul.org/
 
-

openwrt/package/irssi/Config.in

@@ -1,11 +1,11 @@
 config BR2_PACKAGE_IRSSI
-	tristate "irssi - console irc client"
+	prompt "irssi............................. console irc client"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_GLIB1
 	select BR2_PACKAGE_LIBNCURSES
-
 	help
-	IRC client for the text console
+	  IRC client for the text console
 	  
-	http://irssi.org
+	  http://irssi.org
 

openwrt/package/jpeg/Config.in

@@ -4,7 +4,8 @@ config BR2_COMPILE_JPEG
 	depends BR2_PACKAGE_LIBJPEG
 
 config BR2_PACKAGE_LIBJPEG
-	tristate "libjpeg - The Independent JPEG Group's JPEG runtime library"
+	prompt "libjpeg........................... The Independent JPEG Group's JPEG runtime library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_JPEG
 	help
@@ -12,4 +13,3 @@ config BR2_PACKAGE_LIBJPEG
 	  
 	  http://www.ijg.org/
 
-

openwrt/package/kismet/Config.in

@@ -1,15 +1,15 @@
-menu "kismet - an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+#menu "kismet............................ An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 
-config BR2_PACKAGE_KISMET
+config BR2_COMPILE_KISMET
-	tristate
+	bool
 	default n
 	depends BR2_PACKAGE_KISMET_CLIENT || BR2_PACKAGE_KISMET_DRONE || BR2_PACKAGE_KISMET_SERVER
 
 config BR2_PACKAGE_KISMET_CLIENT
-	prompt "kismet-client - the Kismet client"
+	prompt "kismet-client..................... The Kismet client"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_KISMET
+	select BR2_COMPILE_KISMET
 	select BR2_PACKAGE_LIBNCURSES
 	select BR2_PACKAGE_UCLIBCXX
 	help
@@ -25,12 +25,11 @@ config BR2_PACKAGE_KISMET_CLIENT
 	    - libpcap
 	    - uClibc++
 
-
 config BR2_PACKAGE_KISMET_DRONE
-	prompt "kismet-drone - the Kismet drone"
+	prompt "kismet-drone...................... The Kismet drone"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_KISMET
+	select BR2_COMPILE_KISMET
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_UCLIBCXX
 	help
@@ -45,12 +44,11 @@ config BR2_PACKAGE_KISMET_DRONE
 	    - libpcap
 	    - uClibc++
 
-
 config BR2_PACKAGE_KISMET_SERVER
-	prompt "kismet-server - the Kismet server"
+	prompt "kismet-server..................... The Kismet server"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_KISMET
+	select BR2_COMPILE_KISMET
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_UCLIBCXX
 	help
@@ -65,5 +63,4 @@ config BR2_PACKAGE_KISMET_SERVER
 	    - libpcap
 	    - uClibc++
 
-
+#endmenu
-endmenu

openwrt/package/l2tpd/Config.in

@@ -1,9 +1,13 @@
 config BR2_PACKAGE_L2TPD
-	tristate "l2tpd - L2TP (Layer 2 Tunneling Protocol) daemon"
+	prompt "l2tpd............................. An L2TP (Layer 2 Tunneling Protocol) daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 A layer 2 tunneling protocol implementation.
+	  A layer 2 tunneling protocol implementation.
-	 l2tpd is the open source implementation of the L2TP tunneling
+	  l2tpd is the open source implementation of the L2TP tunneling
-	 protocol (RFC2661). It does implement both LAC and LNS role 
+	  protocol (RFC2661). It does implement both LAC and LNS role 
-	 in a L2TP networking architecture. The main goal of this protocol is 
+	  in a L2TP networking architecture. The main goal of this protocol is 
-	 to tunnel PPP frame trough an ip network. 
+	  to tunnel PPP frame trough an ip network. 
+	  
+	  http://l2tpd.sourceforge.net/
+

openwrt/package/lcd4linux/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LCD4LINUX
-	tristate "lcd4linux - Program to access an external LCD"
+	prompt "lcd4linux......................... Program to access an external LCD"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNCURSES
 	help
@@ -7,4 +8,3 @@ config BR2_PACKAGE_LCD4LINUX
 	  
 	  https://ssl.bulix.org/projects/lcd4linux/wiki/Howto
 
-

openwrt/package/less/Config.in

@@ -1,9 +1,10 @@
 config BR2_PACKAGE_LESS
-	tristate "less - a text file viewer."
+	prompt "less.............................. A text file viewer."
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNCURSES
 	help
 	  less - less is a pager. A pager usually displays text files.
 	  
-          http://www.greenwoodsoftware.com/less/
+	  http://www.greenwoodsoftware.com/less/
 

openwrt/package/libamsel/Config.in

@@ -1,8 +1,9 @@
 config BR2_PACKAGE_LIBAMSEL
-        tristate "libamsel - amwall library"
+	prompt "libamsel.......................... The amwall library"
-        default m if CONFIG_DEVEL
+	tristate
-        help
+	default m if CONFIG_DEVEL
-          A library for amwall configuration files
+	help
+	  A library for amwall configuration files
 	  
-          http://amselinux.de/
+	  http://amselinux.de/
 

openwrt/package/libao/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBAO
-	tristate "libao - A cross platform audio library"
+	prompt "libao............................. A cross platform audio library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Libao is a cross-platform audio library that allows programs to 
@@ -7,4 +8,3 @@ config BR2_PACKAGE_LIBAO
 	  
 	  http://www.xiph.org/ao/
 
-

openwrt/package/libart/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBART
-	tristate "libart - An high-performance 2D graphics library"
+	prompt "libart............................ An high-performance 2D graphics library"
+	tristate
 #	default m if CONFIG_DEVEL
 	default n
 	help

openwrt/package/libdaemon/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBDAEMON
-	tristate "libdaemon - A lightweight C library that eases the writing of UNIX daemons"
+	prompt "libdaemon......................... A lightweight C library that eases the writing of UNIX daemons"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  libdaemon is a lightweight C library that eases the writing of UNIX daemons. 
@@ -14,6 +15,5 @@ config BR2_PACKAGE_LIBDAEMON
 	  APIs like these are used in most daemon software available. It is not that 
 	  simple to get it done right and code duplication is not a goal.
 	  
-	  
 	  http://0pointer.de/lennart/projects/libdaemon/
 

openwrt/package/libdb/Config.in

@@ -1,7 +1,15 @@
+config BR2_COMPILE_DB
+	bool
+	default n
+	depends BR2_PACKAGE_LIBDB
+
 config BR2_PACKAGE_LIBDB
-	tristate "libdb - Berkeley DB"
+	prompt "libdb............................. Berkeley DB"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_DB
 	help
-	 disk file format database which stores key/data-pairs in single files.  
+	  disk file format database which stores key/data-pairs in single files.  
 	  
 	  http://www.sleepycat.com/products/db.shtml
+

openwrt/package/libdnet/Config.in

@@ -1,7 +1,9 @@
 config BR2_PACKAGE_LIBDNET
-	tristate "libdnet - Low-level network library"
+	prompt "libdnet........................... Low-level network library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  simplified, portable interface to several low-level networking routines
 	  
 	  http://sourceforge.net/projects/libdnet/
+

openwrt/package/libelf/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBELF
-	tristate "libelf - ELF object file access library"
+	prompt "libelf............................ ELF object file access library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  This is the public release of libelf-0.8.5, a free ELF object

openwrt/package/libevent/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBEVENT
-	tristate "libevent - Event notification library for event-driven network servers"
+	prompt "libevent.......................... Event notification library for event-driven network servers"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  The libevent API provides a mechanism to execute a callback function 

openwrt/package/libffi-sable/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBFFI_SABLE
-	tristate "libffi-sable - Foreign Function Interface library (for sablevm)"
+	prompt "libffi-sable...................... Foreign Function Interface library (for sablevm)"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  The libffi library provides a portable, high level programming

openwrt/package/libgcrypt/Config.in

@@ -1,14 +1,15 @@
 config BR2_PACKAGE_LIBGCRYPT
-	tristate "libgcrypt - The GNU crypto library"
+	prompt "libgcrypt......................... The GNU crypto library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help
-	 This is a general purpose cryptographic library based on the code from 
+	  This is a general purpose cryptographic library based on the code from 
-	 GnuPG. It provides functions for all cryptograhic building blocks: 
+	  GnuPG. It provides functions for all cryptograhic building blocks: 
-	 symmetric ciphers (AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash 
+	  symmetric ciphers (AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash 
-	 algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all 
+	  algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all 
-	 hash algorithms), public key algorithms (RSA, ElGamal, DSA), large 
+	  hash algorithms), public key algorithms (RSA, ElGamal, DSA), large 
-	 integer functions, random numbers and a lot of supporting functions.
+	  integer functions, random numbers and a lot of supporting functions.
 	  
-	 http://directory.fsf.org/security/libgcrypt.html
+	  http://directory.fsf.org/security/libgcrypt.html
 

openwrt/package/libgd/Config.in

@@ -1,10 +1,9 @@
 config BR2_PACKAGE_LIBGD
-	tristate "libgd - The GD Graphics Library"
+	prompt "libgd............................. The GD Graphics Library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 The GD Graphics Library
+	  The GD Graphics Library
-	 
-	 http://www.boutell.com/gd/
-	 
 	  
+	  http://www.boutell.com/gd/
 

openwrt/package/libgdbm/Config.in

@@ -1,7 +1,9 @@
 config BR2_PACKAGE_LIBGDBM
-	tristate "libgdbm - GNU database manager"
+	prompt "libgdbm........................... The GNU database manager"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 disk file format database which stores key/data-pairs in single files.  
+	  disk file format database which stores key/data-pairs in single files.  
 	  
 	  http://www.gnu.org
+

openwrt/package/libgpg-error/Config.in

@@ -1,11 +1,12 @@
 config BR2_PACKAGE_LIBGPG_ERROR
-	tristate "libgpg-error - An helper library for common error codes and descriptions"
+	prompt "libgpg-error...................... An helper library for common error codes and descriptions"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 This is a library that defines common error values for all GnuPG
+	  This is a library that defines common error values for all GnuPG
-	 components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
+	  components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
-	 Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the
+	  Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the
-	 future.
+	  future.
 	  
-	 http://www.gnupg.org/related_software/libgpg-error/
+	  http://www.gnupg.org/related_software/libgpg-error/
 

openwrt/package/libid3tag/Config.in

@@ -1,12 +1,13 @@
 config BR2_PACKAGE_LIBID3TAG
-	tristate "libid3tag - An ID3 tag manipulation library"
+	prompt "libid3tag......................... An ID3 tag manipulation library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_ZLIB
 	help
-	 libid3tag is a library for reading and (eventually) writing ID3 tags, both
+	  libid3tag is a library for reading and (eventually) writing ID3 tags, both
-	 ID3v1 and the various versions of ID3v2.
+	  ID3v1 and the various versions of ID3v2.
 	  
-	 http://mad.sourceforge.net/
+	  http://mad.sourceforge.net/
 	  
-	 Depends: zlib
+	  Depends: zlib
 

openwrt/package/libmad/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBMAD
-	tristate "libmad - An high-quality MPEG audio decoding library"
+	prompt "libmad............................ An high-quality MPEG audio decoding library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  MAD is a high-quality MPEG audio decoder. It currently supports 

openwrt/package/libnet/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBNET
-	tristate "libnet - Low-level packet creation library"
+	prompt "libnet............................ Low-level packet creation library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
 	help
@@ -9,4 +10,3 @@ config BR2_PACKAGE_LIBNET
 	  
 	  Depends: libpcap
 
-

openwrt/package/libnids/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBNIDS
-	tristate "libnids - network intrusion detection library"
+	prompt "libnids........................... A network intrusion detection library"
+	tristate
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBNET
 	default m if CONFIG_DEVEL

openwrt/package/libogg/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBOGG
-	tristate "libogg - The Ogg bitstream handling library"
+	prompt "libogg............................ The Ogg bitstream handling library"
+	tristate
 	default n
 	help
 	  The Ogg bitstream handling library.

openwrt/package/libosip2/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LIBOSIP2
-	tristate "libosip2 - GNU oSIP library"
+	prompt "libosip2.......................... The GNU oSIP library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	help
 	  GNU oSIP library, a Session Initiation Protocol (SIP) implementation
 	  
 	  http://www.gnu.org/software/osip/
-	  

openwrt/package/libpcap/Config.in

@@ -1,7 +1,9 @@
 config BR2_PACKAGE_LIBPCAP
-	tristate "libpcap - Low-level packet capture library"
+	prompt "libpcap........................... Low-level packet capture library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A system-independent library for user-level network packet capture.
 	  
 	  http://www.tcpdump.org/
+

openwrt/package/libpng/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBPNG
-	tristate "libpng - PNG (Portable Network Graphics) format files handling library"
+	prompt "libpng............................ PNG (Portable Network Graphics) format files handling library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_ZLIB
 	help
@@ -7,4 +8,3 @@ config BR2_PACKAGE_LIBPNG
 	  
 	  http://www.libpng.org/pub/png/libpng.html
 
-

openwrt/package/libpthread/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBPTHREAD
-	tristate "libpthread - POSIX threads library"
+	prompt "libpthread........................ POSIX threads library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  POSIX threads library

openwrt/package/libtasn1/Config.in

@@ -1,10 +1,11 @@
 config BR2_PACKAGE_LIBTASN1
-	tristate "libtasn1 - an ASN.1 and DER structures manipulation library"
+	prompt "libtasn1.......................... An ASN.1 and DER structures manipulation library"
+	tristate
 #	default m if CONFIG_DEVEL
 	default n
 	help
-	 This is a library for Abstract Syntax Notation One (ASN.1) and 
+	  This is a library for Abstract Syntax Notation One (ASN.1) and 
-	 Distinguish Encoding Rules (DER) manipulation.
+	  Distinguish Encoding Rules (DER) manipulation.
 	  
-	 ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
+	  ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
 

openwrt/package/libtool/Config.in

@@ -1,13 +1,14 @@
+config BR2_COMPILE_LIBTOOL
+	bool
+	depends BR2_PACKAGE_LIBLTDL
+
 config BR2_PACKAGE_LIBLTDL
-	tristate "libltdl - Generic dynamic object loading library"
+	prompt "libltdl........................... A generic dynamic object loading library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_LIBTOOL
 	help
 	  A generic dynamic object loading library.
 	  
 	  http://www.gnu.org/software/libtool/
 
-
-config BR2_PACKAGE_LIBTOOL
-	tristate
-	default BR2_PACKAGE_LIBLTDL
-

openwrt/package/libupnp/Config.in

@@ -1,13 +1,13 @@
 config BR2_PACKAGE_LIBUPNP
-	tristate "libupnp - Universal Plug and Play (UPnP) SDK library"
+	prompt "libupnp........................... Universal Plug and Play (UPnP) SDK library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 The Universal Plug and Play (UPnP) SDK for Linux provides support 
+	  The Universal Plug and Play (UPnP) SDK for Linux provides support 
-	 for building UPnP-compliant control points, devices, and bridges 
+	  for building UPnP-compliant control points, devices, and bridges 
-	 on Linux.
+	  on Linux.
 	  
-	 http://upnp.sourceforge.net/
+	  http://upnp.sourceforge.net/
-	 
-	 Depends: libpthread
 	  
+	  Depends: libpthread
 

openwrt/package/libusb/Config.in

@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LIBUSB
-	tristate "libusb - Library for accessing Linux USB devices"
+	prompt "libusb............................ A library for accessing Linux USB devices"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A library for accessing Linux USB devices
 	  
 	  http://libusb.sourceforge.net/
 
-

openwrt/package/libvorbis/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBVORBIS
-	tristate "libvorbis - The Vorbis General Audio Compression Codec library"
+	prompt "libvorbis......................... The Vorbis General Audio Compression Codec library"
+	tristate
 	default n
 	select BR2_PACKAGE_LIBOGG
 	help

openwrt/package/libvorbisidec/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBVORBISIDEC
-	tristate "libvorbisidec - a fixed-point implementation (Tremor) of libogg/libvorbis"
+	prompt "libvorbisidec..................... A fixed-point implementation (Tremor) of libogg/libvorbis"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  libvorbisidec is "tremor", a fixed-point implementation of libvorbis.

openwrt/package/libxml2/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBXML2
-	tristate "libxml2 - Gnome XML library"
+	prompt "libxml2........................... Gnome XML library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	select BR2_PACKAGE_ZLIB

openwrt/package/libxslt/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBXSLT
-	tristate "libxslt - Gnome XSLT library"
+	prompt "libxslt........................... Gnome XSLT library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBXML2
 	help

openwrt/package/lighttpd/Config.in

@@ -1,7 +1,7 @@
-menu "lighttpd - Flexible and lightweight web server"
+menu "lighttpd.......................... Flexible and lightweight web server"
 
 config BR2_PACKAGE_LIGHTTPD
-	prompt "lighttpd - Flexible and lightweight web server"
+	prompt "lighttpd.......................... Flexible and lightweight web server"
 	tristate 
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOPENSSL
@@ -13,83 +13,82 @@ config BR2_PACKAGE_LIGHTTPD
 	  
 	  Depends: libopenssl, libpcre
 
-
 config BR2_PACKAGE_LIGHTTPD_MOD_ALIAS
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-alias.............. Directory alias module"
-	prompt "...-mod-alias - Directory alias module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_AUTH
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-auth............... Authentication module"
-	prompt "...-mod-auth - Authentication module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_CGI
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-cgi................ CGI module"
-	prompt "...-mod-cgi - CGI module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_EXPIRE
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-expire............. Expire module"
-	prompt "...-mod-expire - Expire module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_FASTCGI
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-fastcgi............ FastCGI module"
-	prompt "...-mod-fastcgi - FastCGI module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_PROXY
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-proxy.............. Proxy module"
-	prompt "...-mod-proxy - Proxy module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_REDIRECT
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-redirect........... URL redirection module"
-	prompt "...-mod-redirect - URL redirection module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_REWRITE
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-rewrite............ URL rewriting module"
-	prompt "...-mod-rewrite - URL rewriting module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_SETENV
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-setenv............. Environment variable setting module"
-	prompt "...-mod-setenv - Environment variable setting module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_SIMPLE_VHOST
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-simple-vhost....... Simple virtual hosting module"
-	prompt "...-mod-simple-vhost - Simple virtual hosting module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_SSI
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-ssi................ SSI module"
-	prompt "...-mod-ssi - SSI module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_STATUS
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-status............. Server status display module"
-	prompt "...-mod-status - Server status display module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_USERTRACK
-	depends BR2_PACKAGE_LIGHTTPD
+	prompt   "lighttpd-mod-usertrack.......... User tracking module"
-	prompt "...-mod-usertrack - User tracking module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 endmenu

openwrt/package/linux-atm/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LINUX_ATM
-	tristate "linux-atm - ATM Library/Utilities for Linux"
+	prompt "linux-atm......................... ATM Library/Utilities for Linux"
+	tristate
 	default y if BR2_LINUX_2_4_AR7
 	help
 	  ATM Library for linux
@@ -7,7 +8,8 @@ config BR2_PACKAGE_LINUX_ATM
 	  http://ftp.debian.org/debian/pool/main/l/linux-atm/
 
 config BR2_PACKAGE_BR2684CTL
-	tristate "br2684ctl - RFC2684 bridging utility"
+	prompt   "br2684ctl....................... RFC2684 bridging utility"
+	tristate
 	default y if BR2_LINUX_2_4_AR7
 	depends BR2_PACKAGE_LINUX_ATM
 	help
@@ -15,3 +17,4 @@ config BR2_PACKAGE_BR2684CTL
 	  Useful for PPPoE
 	  
 	  http://ftp.debian.org/debian/pool/main/l/linux-atm/
+