modify many PKG_DESCR variables to fit better into 80 width terminal window

32 files changed, 66 insertions, 103 deletions

diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
index 5210e9d49..65745cd08 100644
--- a/package/adkinstall/Makefile
+++ b/package/adkinstall/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		adkinstall
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		5
-PKG_DESCR:=		installer for cf, mmc, sd or mtd devices
+PKG_DESCR:=		openadk installer
 PKG_SECTION:=		base
 PKG_DEPENDS:=		parted sfdisk e2fsprogs
 
diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile
index 442d2d3af..493a73053 100644
--- a/package/alix-switch/Makefile
+++ b/package/alix-switch/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		alix-switch
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
-PKG_DESCR:=		simple daemon listening on button events
+PKG_DESCR:=		daemon listening on button events
 PKG_SECTION:=		base
 
 PKG_TARGET_DEPENDS:=	alix
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 07a54221d..ba55ad05a 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		avahi
 PKG_VERSION:=		0.6.25
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a83155a6e29e3988f07e5eea3287b21e
-PKG_DESCR:=		mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
+PKG_DESCR:=		mDNS daemon
 PKG_SECTION:=		dhcp
 PKG_DEPENDS:=		libavahi libdaemon libexpat gettext
 PKG_BUILDDEP+=		libdaemon expat gdbm glib gettext
@@ -15,7 +15,7 @@ PKG_URL:=		http://avahi.org
 PKG_SITES:=		http://avahi.org/download/
 
 PKG_DEPENDS_DNSCONFD:=	libavahi libdaemon avahi-daemon
-PKG_DESCR_DNSCONFD:=	Unicast DNS server from mDNS/DNS-SD configuration daemon
+PKG_DESCR_DNSCONFD:=	DNS server from mDNS configuration daemon
 PKG_DESCR_LIB:=		DNS-SD over mDNS library
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index da179470a..d47a1348e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		21
 PKG_SECTION:=		base
-PKG_DESCR:=		basic filesystem structure and scripts
+PKG_DESCR:=		basic files and scripts
 
 WRKDIST=		${WRKDIR}/base-files
 NO_DISTFILES:=		1
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 9186bddcd..c2dda8f42 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -15,10 +15,10 @@ PKG_URL:=		https://www.isc.org/software/bind
 PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
 
 PKG_DESCR_1:=		dynamic dns client (nsupdate utility)
-PKG_DESCR_2:=		Support library for the bind tools and dns server/client
+PKG_DESCR_2:=		library for the bind software suite
 PKG_DESCR_3:=		rndc & rndc-confgen utilities
-PKG_DESCR_4:=		named-checkconf & named-checkzone utilities
-PKG_DESCR_5:=		dnssec-keygen & dnssec-signzone utilities
+PKG_DESCR_4:=		check utilities
+PKG_DESCR_5:=		dnssec utilities
 PKG_DESCR_6:=		host utility
 PKG_DESCR_7:=		dig utility
 
diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual
index 4e7251520..c037bf992 100644
--- a/package/busybox/Config.in.manual
+++ b/package/busybox/Config.in.manual
@@ -4,7 +4,7 @@ config ADK_COMPILE_BUSYBOX
 	default n
 
 config ADK_PACKAGE_BUSYBOX
-	prompt "busybox........................... Core utilities for embedded Linux systems"
+	prompt "busybox................ Core utilities for embedded systems"
 	boolean
 	select ADK_COMPILE_BUSYBOX
 	default y if !ADK_TOOLCHAIN_ONLY
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 0485fa800..7fb4f46dd 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		busybox
 PKG_VERSION:=		1.17.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2908d1d1ca83ff12bc0b05f0d2a3335c
-PKG_DESCR:=		Core utilities for embedded Linux systems
+PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
 PKG_URL:=		http://www.busybox.net/
 PKG_SITES:=		http://www.busybox.net/downloads/
diff --git a/package/cpio/Makefile b/package/cpio/Makefile
index d6a31c061..9215765e3 100644
--- a/package/cpio/Makefile
+++ b/package/cpio/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		cpio
 PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1112bb6c45863468b5496ba128792f6c
-PKG_DESCR:=		copies files into or out of a cpio archive
+PKG_DESCR:=		manages cpio archives
 PKG_SECTION:=		archive
 PKG_URL:=		http://www.gnu.org/software/cpio/
 PKG_SITES:=		${MASTER_SITE_GNU:=cpio/}
diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual
index e7acac9dc..e8c14eb0d 100644
--- a/package/eglibc/Config.in.manual
+++ b/package/eglibc/Config.in.manual
@@ -1,5 +1,5 @@
 config ADK_PACKAGE_EGLIBC
-	prompt "eglibc............................ embedded GNU C library"
+	prompt "eglibc................. embedded GNU C library"
 	bool
 	default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY
 	default n
@@ -8,7 +8,7 @@ config ADK_PACKAGE_EGLIBC
 	  embedded GNU C library.
 
 config ADK_PACKAGE_EGLIBC_DEV
-	prompt "eglibc-dev........................ development files"
+	prompt "eglibc-dev.............. development files"
 	tristate
 	default n
 	depends on ADK_TARGET_LIB_EGLIBC
diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual
index 6e7db32c9..e149fb144 100644
--- a/package/glibc/Config.in.manual
+++ b/package/glibc/Config.in.manual
@@ -1,5 +1,5 @@
 config ADK_PACKAGE_GLIBC
-	prompt "glibc............................... GNU C library"
+	prompt "glibc.................... GNU C library"
 	bool
 	default y if ADK_TARGET_LIB_GLIBC && !ADK_TOOLCHAIN_ONLY
 	default n
@@ -8,7 +8,7 @@ config ADK_PACKAGE_GLIBC
 	  GNU C library.
 
 config ADK_PACKAGE_GLIBC_DEV
-	prompt "glibc-dev........................... development files"
+	prompt "glibc-dev................ development files"
 	tristate
 	default n
 	depends on ADK_TARGET_LIB_GLIBC
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 426dac2e5..d547c9c94 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -5,17 +5,30 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		hostapd
 PKG_VERSION:=		0.7.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f47689c62ee8c1c59989b402d4f130c3
 PKG_DESCR:=		an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator
 PKG_SECTION:=		wifi
+PKG_MULTI:=		1
 PKG_DEPENDS:=		libnl libopenssl
 PKG_BUILDDEP+=		libnl openssl
 PKG_URL:=		http://hostap.epitest.fi
+ifeq (${ADK_PACKAGE_HOSTAPD_WITH_OPENSSL},y)
+PKG_BUILDDEP+=		openssl
+endif
+ifeq (${ADK_PACKAGE_HOSTAPD_WITH_GNUTLS},y)
+PKG_BUILDDEP+=		gnutls
+endif
 PKG_SITES:=		http://hostap.epitest.fi/releases/
 
 WRKSRC=			${WRKDIST}/${PKG_NAME}
 
+PKG_CHOICES:=		WITH_OPENSSL WITH_GNUTLS
+PKGCD_WITH_OPENSSL:=	use OpenSSL for crypto
+PKGCS_WITH_OPENSSL:=	libopenssl
+PKGCD_WITH_GNUTLS:=	use GnuTLS for crypto
+PKGCS_WITH_GNUTLS:=	libgnutls
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -26,6 +39,9 @@ INSTALL_STYLE:=		manual
 
 do-configure:
 	${CP} ./files/hostapd.config ${WRKBUILD}/.config
+ifneq (${ADK_PACKAGE_HOSTAPD_WITH_GNUTLS},)
+	${SED} "s#openssl#gnutls#" ${WRKBUILD}/.config
+endif
 
 do-install:
 	${INSTALL_DIR} ${IDIR_HOSTAPD_UTILS}/usr/sbin
diff --git a/package/hostapd/files/hostapd.config b/package/hostapd/files/hostapd.config
index 6af8c3971..1ac8a7838 100644
--- a/package/hostapd/files/hostapd.config
+++ b/package/hostapd/files/hostapd.config
@@ -9,72 +9,17 @@
 # be modified from here. In most cass, these lines should use += in order not
 # to override previous values of the variables.
 
+# use openssl by default
+CONFIG_TLS=openssl
+
 # Driver interface for drivers using the nl80211 kernel interface
 CONFIG_DRIVER_NL80211=y
 
-# Driver interface for Host AP driver
-#CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for wired authenticator
-#CONFIG_DRIVER_WIRED=y
-
-# Driver interface for madwifi driver
-#CONFIG_DRIVER_MADWIFI=y
-#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src
-
-# Driver interface for Prism54 driver
-#CONFIG_DRIVER_PRISM54=y
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-
-# IEEE 802.11F/IAPP
-#CONFIG_IAPP=y
-
-# WPA2/IEEE 802.11i RSN pre-authentication
-# CONFIG_RSN_PREAUTH=y
-
-# Integrated EAP authenticator
-#CONFIG_EAP=y
-
-# EAP-MD5 for the integrated EAP authenticator
-#CONFIG_EAP_MD5=y
-
-# EAP-TLS for the integrated EAP authenticator
-#CONFIG_EAP_TLS=y
-
-# EAP-MSCHAPv2 for the integrated EAP authenticator
-#CONFIG_EAP_MSCHAPV2=y
-
-# EAP-PEAP for the integrated EAP authenticator
-#CONFIG_EAP_PEAP=y
-
-# EAP-PSK for the integrated EAP authenticator
-#CONFIG_EAP_PSK=y
-
-# EAP-GTC for the integrated EAP authenticator
-#CONFIG_EAP_GTC=y
-
-# EAP-TTLS for the integrated EAP authenticator
-#CONFIG_EAP_TTLS=y
-
-# EAP-SIM for the integrated EAP authenticator
-#CONFIG_EAP_SIM=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-#CONFIG_PKCS12=y
-
-# RADIUS authentication server. This provides access to the integrated EAP
-# authenticator from external hosts using RADIUS.
-#CONFIG_RADIUS_SERVER=y
-#
 # Remove debugging code that is printing out debug messages to stdout.
 # This can be used to reduce the size of the hostapd considerably if debugging
 # code is not needed.
-#CONFIG_NO_STDOUT_DEBUG=y
+CONFIG_NO_STDOUT_DEBUG=y
+
 # Remove support for RADIUS accounting
 CONFIG_NO_ACCOUNTING=y
 
@@ -88,4 +33,3 @@ CONFIG_NO_VLAN=y
 # This can be used to reduce binary size at the cost of disabling a debugging
 # option.
 CONFIG_NO_DUMP_STATE=y
-
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index c6eaec68e..ddb4e293b 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		ipset
 PKG_VERSION:=		3.0
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		92bb09883dd8a77ec5cfbff1c8932b15
-PKG_DESCR:=		Netfilter ip sets administration utility
+PKG_DESCR:=		ip sets administration utility
 PKG_SECTION:=		firewall
 PKG_URL:=		http://ipset.netfilter.org
 PKG_SITES:=		http://ipset.netfilter.org/
@@ -15,10 +15,12 @@ PKG_SECTION_KMOD_IPSET:=kernel
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+PKG_DESCR_KMOD:=	ipset kernel module
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION_KMOD_IPSET}))
+$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD},${PKG_SECTION_KMOD_IPSET}))
 
 CONFIG_STYLE:=		manual
 
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 2a422f5ed..a6f75ac63 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		lighttpd
 PKG_VERSION:=		1.4.25
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		87e936ec272ddaba8a2fdfecd8c6b704
-PKG_DESCR:=		a flexible and lightweight web server
+PKG_DESCR:=		a lightweight web server
 PKG_SECTION:=		www
 PKG_DEPENDS:=		libxml2 libsqlite libpcre
 PKG_BUILDDEP+=		pcre libxml2 sqlite
diff --git a/package/links/Makefile b/package/links/Makefile
index a7b1b944e..bae20042c 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		2.2
 PKG_RELEASE:=		1
 PKG_BUILDDEP+=		openssl libpng jpeg gpm
 PKG_MD5SUM:=		c9937f9ed0061f264973182f871fb667
-PKG_DESCR:=		web browser with console graphic support
+PKG_DESCR:=		web browser with graphic support
 PKG_SECTION:=		browser
 PKG_DEPENDS:=		libpng libjpeg libtiff gpm libopenssl
 PKG_URL:=		http://links.twibright.com
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index c0221a7bd..2065a9698 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:=		1.19
 PKG_RELEASE:=		10
 PKG_MD5SUM:=		7c68293ad265ecfe2edea917912f6f1f
 PKG_DESCR:=		A small HTTP server
+PKG_MULTI:=		1
 PKG_SECTION:=		www
 ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),)
 PKG_DEPENDS:=		libopenssl
diff --git a/package/nano/Makefile b/package/nano/Makefile
index fc374ed18..afab4ffff 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		nano
 PKG_VERSION:=		2.2.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		6304308afb1f7ef4a5e93eb99206632a
-PKG_DESCR:=		An enhanced clone of the Pico text editor
+PKG_DESCR:=		An enhanced clone of the Pico editor
 PKG_SECTION:=		editor
 PKG_DEPENDS:=		libncurses
 PKG_BUILDDEP+=		ncurses
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index 265a09d8d..41d01c3f0 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -7,7 +7,7 @@ PKG_NAME=		ntfs-3g
 PKG_VERSION=		2010.1.16
 PKG_RELEASE=		1
 PKG_MD5SUM=		e104c914e8d7d29ee83e63d46afbba25
-PKG_DESCR:=		ntfs filesystem driver with read and write support
+PKG_DESCR:=		ntfs filesystem driver
 PKG_SECTION:=		kernel
 PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://tuxera.com
diff --git a/package/openct/Makefile b/package/openct/Makefile
index a3626e7bc..eb4b841d1 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		0.6.16
 PKG_RELEASE:=		1
 PKG_BUILDDEP+=		libtool libusb
 PKG_MD5SUM:=		d8d8c63269985303a303a218c4b953d7
-PKG_DESCR:=		drivers for several smart card readers
+PKG_DESCR:=		drivers for smart card readers
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libltdl libusb
 PKG_URL:=		http://www.opensc-project.org/openct
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index 2cf89050e..89a32d2fe 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		opensc
 PKG_VERSION:=		0.11.13
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		98fa151e947941f9c3f27420fdf47c11
-PKG_DESCR:=		a set of libraries and utilities to access smart cards
+PKG_DESCR:=		utilities to access smart cards
 PKG_SECTION:=		crypto
 PKG_BUILDDEP+=		libtool
 PKG_URL:=		http://www.opensc-project.org/opensc
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 70d8e9e2d..43b860369 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -14,17 +14,17 @@ PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.openssl.org/
 PKG_SITES:=		http://www.openssl.org/source/
 
-PKG_DESCR_UTIL:=	OpenSSL (Secure Socket Layer) command line tool
+PKG_DESCR_UTIL:=	OpenSSL command line tool
 PKG_SECTION_UTIL:=	crypto
 PKG_DEPENDS_UTIL:=	libopenssl
+PKG_DESCR_DEV:=		development files for openssl
+PKG_SECTION_DEV:=	devel
 PKG_DEPENDS_DEV:=	libopenssl
-PKG_DESCR_LIB_DEV:=	development files for openssl
-PKG_SECTION_LIB_DEV:=	devel
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DEV},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
+$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DEV},${PKG_DESCR_DEV},${PKG_SECTION_DEV}))
 $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTIL},${PKG_DESCR_UTIL},${PKG_SECTION_UTIL}))
 
 SUB_INSTALLS-y:=
diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile
index 65b21be52..045cb953d 100644
--- a/package/pdnsd/Makefile
+++ b/package/pdnsd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		pdnsd
 PKG_VERSION:=		1.2.7
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		114b3b21b09b43cbfcccdde726b84c12
-PKG_DESCR:=		Proxy DNS server with permanent caching
+PKG_DESCR:=		Proxy DNS server
 PKG_SECTION:=		dns
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.phys.uu.nl/~rombouts/pdnsd.html
diff --git a/package/pkgmaker b/package/pkgmaker
index 169b05643..f4d8355ef 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -94,7 +94,7 @@ for dn in */Makefile; do
 		# pseudo package, does not produce an ipkg package
 		ppnf=$PKG_NAME			# ppnf: pseudopkg name, filled
 		if [[ -n $PKG_DESCR ]]; then
-			while (( ${#ppnf} < 34 )); do
+			while (( ${#ppnf} < 23 )); do
 				ppnf=$ppnf.
 			done
 			ppnf="$ppnf $PKG_DESCR"
@@ -192,7 +192,7 @@ for dn in */Makefile; do
 		print -u$h config ADK_PACKAGE_$spcu
 		spnf=$sppn			# spnf: subpackage name, filled
 		if [[ -n ${desc:-$PKG_NAME} ]]; then
-			while (( ${#spnf} < 34 )); do
+			while (( ${#spnf} < 23 )); do
 				spnf=$spnf.
 			done
 			spnf="$spnf ${desc:-$PKG_NAME}"
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
index 20f2e09c3..6f446e646 100644
--- a/package/proftpd/Makefile
+++ b/package/proftpd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		proftpd
 PKG_VERSION:=		1.3.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		97ad29f31f4fe633a9f8d021bab2df20
-PKG_DESCR:=		An advanced and very configurable FTP server
+PKG_DESCR:=		A very configurable FTP server
 PKG_SECTION:=		www
 PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.proftpd.org/
diff --git a/package/rtsp/Makefile b/package/rtsp/Makefile
index 666db5d0f..ec5bb1d91 100644
--- a/package/rtsp/Makefile
+++ b/package/rtsp/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		rtsp
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		92bb09883dd8a77ec5cfbff1c8932b15
-PKG_DESCR:=		Netfilter connection tracking for RTSP
+PKG_DESCR:=		connection tracking for RTSP
 PKG_SECTION:=		kernel
 PKG_URL:=		http://github.com/maru-sama/rtsp-linux-v2.6
 
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index 69cf2a222..9fa748083 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -7,10 +7,10 @@ PKG_NAME:=		sqlite
 PKG_VERSION:=		3.6.20
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		0faf8fc8ccff5297513c6532b2b4ce23
-PKG_DESCR:=		Self-contained, embeddable, zero-configuration SQL database
+PKG_DESCR:=		embeddable SQL database
 PKG_SECTION:=		db
 PKG_BUILDDEP+=		ncurses readline
-PKG_URL:=		http://www.sqlite.org
+PKG_URL:=		http://www.sqlite.org/
 PKG_SITES:=		http://www.sqlite.org/
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/uclibc++/Config.in.manual b/package/uclibc++/Config.in.manual
index 04a11d4cf..dbe311e13 100644
--- a/package/uclibc++/Config.in.manual
+++ b/package/uclibc++/Config.in.manual
@@ -1,5 +1,5 @@
 config ADK_PACKAGE_UCLIBCXX
-	prompt "uClibc++.......................... C++ library for embedded systems"
+	prompt "uClibc++..................... C++ library for embedded systems"
 	tristate
 	depends on ADK_TARGET_LIB_UCLIBC
 	default n
diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual
index bfc1b08c5..6afaf2b06 100644
--- a/package/uclibc/Config.in.manual
+++ b/package/uclibc/Config.in.manual
@@ -1,5 +1,5 @@
 config ADK_PACKAGE_UCLIBC
-	prompt "uClibc............................ embedded C library"
+	prompt "uClibc................. embedded C library"
 	bool
 	default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
 	default n
@@ -8,7 +8,7 @@ config ADK_PACKAGE_UCLIBC
 	  Embedded C library.
 
 config ADK_PACKAGE_UCLIBC_DEV
-	prompt "uClibc-dev........................ development files"
+	prompt "uClibc-dev............. development files"
 	tristate
 	default n
 	depends on ADK_TARGET_LIB_UCLIBC && ADK_PACKAGE_UCLIBC
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index 12c1c64b1..c6fcaad95 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -17,7 +17,7 @@ PKG_DESCR_FDISK:=	Partition table manipulation utility
 PKG_DESCR_SFDISK:=	Scriptable Partition table manipulation utility
 PKG_DESCR_SWAP:=	Swap space management utilities
 PKG_DEPENDS_SWAP:=	libblkid
-PKG_DESCR_LOOP:=	Loop devices setup and control utility
+PKG_DESCR_LOOP:=	Loop devices management utilities
 PKG_DEPENDS_LOOP:=	kmod-blk-dev-loop
 PKG_DESCR_MCOOKIE:=	Generate magic cookies for xauth
 PKG_SECT_MCOOKIE:=	x11/apps
diff --git a/package/uvd/Makefile b/package/uvd/Makefile
index a1ebf2897..92a6b07a2 100644
--- a/package/uvd/Makefile
+++ b/package/uvd/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		uvd
 PKG_VERSION:=		0.1
 PKG_RELEASE:=		2
-PKG_DESCR:=		small udp server for version information
+PKG_DESCR:=		udp server for version information
 PKG_SECTION:=		base
 PKG_URL:=		http://www.openadk.org
 
diff --git a/package/wget/Makefile b/package/wget/Makefile
index 174db870f..6629e12b3 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		wget
 PKG_VERSION:=		1.12
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		141461b9c04e454dc8933c9d1f2abf83
-PKG_DESCR:=		retrieving files using HTTP, HTTPS and FTP
+PKG_DESCR:=		retrieving files using HTTP(S) and FTP
 PKG_SECTION:=		www
 PKG_URL:=		http://www.gnu.org/software/wget/
 PKG_SITES:=		${MASTER_SITE_GNU:=wget/}
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 51b6231c8..7dfe22149 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		xfsprogs
 PKG_VERSION:=		3.1.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c2308b46ee707597ac50aae418d321b8
-PKG_DESCR:=		Utilities to create and check XFS filesystems
+PKG_DESCR:=		Utilities for XFS filesystems
 PKG_SECTION:=		fs
 PKG_DEPENDS:=		libuuid libpthread
 PKG_BUILDDEP+=		e2fsprogs