make bulk build on Debian/lenny x86 complete

- fix some menu descriptions
- fix gcc package compile

package/Config.in

@@ -96,6 +96,7 @@ source "package/sane-backends/Config.in"
 source "package/screen/Config.in"
 source "package/scsi-spin/Config.in"
 source "package/ser2net/Config.in"
+source "package/sqlite/Config.in"
 source "package/syslog-ng/Config.in"
 source "package/tar/Config.in"
 source "package/xz/Config.in"
@@ -203,6 +204,7 @@ source "package/updatedd/Config.in"
 endmenu
 
 menu "HTTP / FTP"
+source "package/curl/Config.in"
 source "package/gatling/Config.in"
 source "package/lighttpd/Config.in"
 source "package/mini_httpd/Config.in"
@@ -367,7 +369,6 @@ source "package/autoconf/Config.in"
 source "package/automake/Config.in"
 source "package/binutils/Config.in"
 source "package/bison/Config.in"
-source "package/cxxtools/Config.in"
 source "package/diffutils/Config.in"
 source "package/flex/Config.in"
 source "package/gcc/Config.in"
@@ -382,7 +383,6 @@ source "package/perl/Config.in"
 source "package/php/Config.in"
 source "package/python/Config.in"
 source "package/ruby/Config.in"
-source "package/libffi/Config.in"
 source "package/tcl/Config.in"
 endmenu
 
@@ -395,7 +395,9 @@ source "package/apr-util/Config.in"
 source "package/avahi/Config.in.lib"
 source "package/axtls/Config.in.lib"
 source "package/cgilib/Config.in"
+source "package/cxxtools/Config.in"
 source "package/dbus/Config.in"
+source "package/e2fsprogs/Config.in.lib"
 source "package/gettext/Config.in"
 source "package/glib/Config.in"
 source "package/id3lib/Config.in"
@@ -403,12 +405,13 @@ source "package/libao/Config.in"
 source "package/libaudiofile/Config.in"
 source "package/libart/Config.in"
 source "package/libcli/Config.in"
-source "package/curl/Config.in" # libcurl
+source "package/curl/Config.in.lib"
 source "package/libdaemon/Config.in"
 source "package/libdb/Config.in"
 source "package/libdnet/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
+source "package/libffi/Config.in"
 source "package/expat/Config.in" # libexpat
 source "package/faad2/Config.in"  # libfaad2
 source "package/flac/Config.in"  # libflac
@@ -455,7 +458,7 @@ source "package/libthread_db/Config.in"
 source "package/readline/Config.in"  # libreadline
 source "package/cyrus-sasl/Config.in"  # libsasl2
 source "package/speex/Config.in" # libspeex
-source "package/sqlite/Config.in" # libsqlite
+source "package/sqlite/Config.in.lib"
 source "package/librpcsecgss/Config.in"
 source "package/libshout/Config.in"
 source "package/libsigc++/Config.in"
@@ -473,6 +476,7 @@ source "package/libvorbisidec/Config.in"
 source "package/tcp_wrappers/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
+source "package/lua/Config.in.lib"
 source "package/uclibc++/Config.in"
 source "package/ustl/Config.in"
 source "package/zlib/Config.in"
@@ -501,7 +505,7 @@ source "package/libXpm/Config.in"
 source "package/libXt/Config.in"
 source "package/libXxf86dga/Config.in"
 source "package/pixman/Config.in"
-source "package/xf86dga/Config.in"
+#source "package/xf86dga/Config.in"
 source "package/xkbcomp/Config.in"
 source "package/xkeyboard-config/Config.in"
 endmenu

package/alsa-lib/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_ALSA_LIB
-	prompt "alsa-lib............................ alsa library"
+	prompt "alsa-lib.......................... alsa library"
 	tristate
 	default n
 	help

package/bison/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_BISON
-	prompt "bison.............................. GNU parser generator"
+	prompt "bison............................. GNU parser generator"
 	tristate
 	default n
 	help

package/cfinstall/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_CFINSTALL
-	prompt "cfinstall........................... compact flash installer"
+	prompt "cfinstall............................ compact flash installer"
 	tristate
 	select ADK_PACKAGE_SFDISK
 	select ADK_PACKAGE_PARTED

package/curl/Config.in

@@ -3,30 +3,8 @@ config ADK_COMPILE_CURL
 	default n
 	depends on ADK_PACKAGE_LIBCURL
 
-config ADK_PACKAGE_LIBCURL
-	prompt "libcurl........................... A client-side URL transfer library"
-	tristate
-	default n
-	select ADK_COMPILE_CURL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  http://curl.haxx.se/
-
-config ADK_PACKAGE_LIBCURL_DEV
-	prompt "libcurl-dev....................... development files for libcurl"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBCURL
-	select ADK_COMPILE_CURL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  http://curl.haxx.se/
-
-
 config ADK_PACKAGE_CURL
-	prompt   "curl............................ A client-side URL transfer tool"
+	prompt   "curl.............................. A client-side URL transfer tool"
 	tristate
 	default n
 	depends on ADK_PACKAGE_LIBCURL

package/curl/Config.in.lib

@@ -0,0 +1,20 @@
+config ADK_PACKAGE_LIBCURL
+	prompt "libcurl........................... A client-side URL transfer library"
+	tristate
+	default n
+	select ADK_COMPILE_CURL
+	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_ZLIB
+	help
+	  http://curl.haxx.se/
+
+config ADK_PACKAGE_LIBCURL_DEV
+	prompt "libcurl-dev....................... development files for libcurl"
+	tristate
+	default n
+	select ADK_COMPILE_CURL
+	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_ZLIB
+	help
+	  http://curl.haxx.se/
+

package/cxxtools/Config.in

@@ -21,6 +21,7 @@ config ADK_COMPILE_CXXTOOLS_WITH_STDCXX
 config ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX
 	bool "Embedded uClibc++ library"
 	select ADK_PACKAGE_UCLIBCXX
+	depends on ADK_BROKEN
 	help
 
 endchoice

package/e2fsprogs/Config.in

@@ -13,30 +13,3 @@ config ADK_PACKAGE_E2FSPROGS
 
 	  http://e2fsprogs.sourceforge.net/
 
-config ADK_PACKAGE_LIBUUID
-	prompt "libuuid......................... UUID library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
-config ADK_PACKAGE_LIBBLKID
-	prompt "libblkid........................ BlockID library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
-config ADK_PACKAGE_LIBCOM_ERR
-	prompt "libcom_err...................... Common error library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
-config ADK_PACKAGE_LIBSS
-	prompt "libss........................... Subsystem command parsing library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help

package/e2fsprogs/Config.in.lib

@@ -0,0 +1,28 @@
+config ADK_PACKAGE_LIBUUID
+	prompt "libuuid......................... UUID library"
+	depends on ADK_PACKAGE_E2FSPROGS
+	tristate
+	default n
+	help
+
+config ADK_PACKAGE_LIBBLKID
+	prompt "libblkid........................ BlockID library"
+	depends on ADK_PACKAGE_E2FSPROGS
+	tristate
+	default n
+	help
+
+config ADK_PACKAGE_LIBCOM_ERR
+	prompt "libcom_err...................... Common error library"
+	depends on ADK_PACKAGE_E2FSPROGS
+	tristate
+	default n
+	help
+
+config ADK_PACKAGE_LIBSS
+	prompt "libss........................... Subsystem command parsing library"
+	depends on ADK_PACKAGE_E2FSPROGS
+	tristate
+	default n
+	help
+

package/gcc/Makefile

@@ -15,11 +15,10 @@ $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},
 
 TCFLAGS:=		''
 TCPPFLAGS:=		''
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 ifeq ($(ADK_LINUX_MIPS64_LEMOTE),y)
 CONFIGURE_ARGS+=	--with-abi=64
 endif
-CONFIGURE_ENV+=		ac_cv_func_fputc_unlocked=no
 CONFIGURE_ARGS+=	--enable-languages=c,c++ \
 			--libexecdir=/usr/lib \
 			--host=$(REAL_GNU_TARGET_NAME) \

package/gcc/patches/cross-gcc-fix.patch

@@ -0,0 +1,13 @@
+diff -Nur gcc-4.4.2.orig/gcc/Makefile.in gcc-4.4.2/gcc/Makefile.in
+--- gcc-4.4.2.orig/gcc/Makefile.in	2009-07-25 19:53:35.000000000 +0200
++++ gcc-4.4.2/gcc/Makefile.in	2009-11-22 15:30:27.000000000 +0100
+@@ -898,7 +898,8 @@
+ # Likewise.  Put INCLUDES at the beginning: this way, if some autoconf macro
+ # puts -I options in CPPFLAGS, our include files in the srcdir will always
+ # win against random include files in /usr/include.
+-ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS)
++#ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS)
++ALL_CPPFLAGS = $(INCLUDES)
+ 
+ # Build and host support libraries.
+ LIBIBERTY = ../libiberty/libiberty.a

package/glib/Config.in

@@ -1,7 +1,8 @@
 config ADK_PACKAGE_GLIB
-	prompt "glib............................. low-level core library that forms the basis of GTK+"
+	prompt "glib.............................. low-level core library that forms the basis of GTK+"
 	tristate
-	default n
 	select ADK_PACKAGE_LIBPTHREAD
 	select ADK_PACKAGE_LIBICONV
 	select ADK_PACKAGE_GETTEXT
+	default n
+	help

package/gperf/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_GPERF
-	prompt "gperf.............................. perfect hash function generator"
+	prompt "gperf............................. perfect hash function generator"
 	tristate
 	default n
 	select ADK_PACKAGE_LIBSTDCXX

package/libICE/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBICE
-	prompt "libICE.................................. X library"
+	prompt "libICE............................... Inter-Client Exchange library"
 	tristate
 	default n
 	help

package/libSM/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBSM
-	prompt "libSM................................... X library"
+	prompt "libSM................................ X11 Session Management library"
 	tristate
 	default n
 	select ADK_PACKAGE_LIBUUID

package/libX11/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBX11
-	prompt "libX11................................. X library"
+	prompt "libX11............................... X11 client-side library"
 	tristate
 	select ADK_PACKAGE_LIBXDMCP
 	default n

package/libXau/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXAU
-	prompt "libXau................................. X library"
+	prompt "libXau............................... X11 authorisation library"
 	tristate
 	default n
 	help

package/libXaw/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXAW
-	prompt "libXaw................................. X library"
+	prompt "libXaw............................... X11 Athena Widget library"
 	tristate
 	default n
 	help

package/libXdmcp/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXDMCP
-	prompt "libXdmcp............................... X library"
+	prompt "libXdmcp............................. X11 display manager control protocol library"
 	tristate
 	default n
 	help

package/libXext/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXEXT
-	prompt "libXext................................. X library"
+	prompt "libXext.............................. X client interface to extensions of the X protocol"
 	tristate
 	default n
 	help

package/libXfont/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXFONT
-	prompt "libxfont................................ X font library"
+	prompt "libxfont............................. X font library"
 	tristate
 	default n
 	select ADK_PACKAGE_LIBFREETYPE

package/libXmu/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXMU
-	prompt "libXmu................................. X library"
+	prompt "libXmu............................... miscellaneous utility functions for X libraries"
 	tristate
 	default n
 	help

package/libXpm/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXPM
-	prompt "libXpm................................. X library"
+	prompt "libXpm............................... common operation for the XPM pixmap format"
 	tristate
 	default n
 	help

package/libXt/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXT
-	prompt "libXt................................... X library"
+	prompt "libXt................................ X Toolkit Intrinsics"
 	tristate
 	default n
 	help

package/libXv/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXV
-	prompt "libXv................................. X library"
+	prompt "libXv................................ X11 Xvideo extensions"
 	tristate
 	default n
 	help

package/libXxf86dga/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXXF86DGA
-	prompt "libXxf86dga................................. X library"
+	prompt "libXxf86dga.......................... client library for the XFree86-DGA extension"
 	tristate
 	default n
 	help

package/libffi/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBFFI
-	prompt "libffi.......................... Foreign Function Interface library"
+	prompt "libffi............................ Foreign Function Interface library"
 	tristate
 	default n
 	help

package/libfontenc/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBFONTENC
-	prompt "libfontenc.............................. X font encoding library"
+	prompt "libfontenc........................... X font encoding library"
 	tristate
 	select ADK_PACKAGE_ZLIB
 	default n

package/libpciaccess/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBPCIACCESS
-	prompt "libpciaccess.......................... PCI access library"
+	prompt "libpciaccess......................... PCI access library"
 	tristate
 	default n
 	help

package/libxkbfile/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_LIBXKBFILE
-	prompt "libxkbfile.............................. X keyboard library"
+	prompt "libxkbfile........................... X keyboard library"
 	tristate
 	default n
 	help

package/lua/Config.in

@@ -1,35 +1,10 @@
-#menu "lua............................... LUA programming language"
+menu "lua............................... LUA programming language"
 
 config ADK_COMPILE_LUA
 	tristate
 	default n
 	depends on ADK_PACKAGE_LIBLUA
 
-config ADK_PACKAGE_LIBLUA
-	prompt "liblua............................ LUA programming language shared libraries"
-	tristate
-	select ADK_COMPILE_LUA
-	help
-	  Lua is a powerful light-weight programming language designed for extending 
-	  applications. Lua is also frequently used as a general-purpose, stand-alone 
-	  language. Lua is free software.
-	  
-	  Lua combines simple procedural syntax with powerful data description 
-	  constructs based on associative arrays and extensible semantics. Lua is 
-	  dynamically typed, interpreted from bytecodes, and has automatic memory 
-	  management with garbage collection, making it ideal for configuration, 
-	  scripting, and rapid prototyping.
-	  
-	  Lua is implemented as a small library of C functions, written in ANSI C, and 
-	  compiles unmodified in all known platforms. The implementation goals are 
-	  simplicity, efficiency, portability, and low embedding cost. The result is a 
-	  fast language engine with small footprint, making it ideal in embedded systems 
-	  too.
-	  
-	  http://www.lua.org/
-	  
-	  This package contains the LUA shared libraries, needed by other programs.
-
 config ADK_PACKAGE_LUA
 	prompt "lua............................... LUA programming language interpreter"
 	tristate
@@ -108,4 +83,4 @@ config ADK_PACKAGE_LUA_EXAMPLES
 	  
 	  This package contains LUA language examples.
 
-#endmenu
+endmenu

package/lua/Config.in.lib

@@ -0,0 +1,25 @@
+config ADK_PACKAGE_LIBLUA
+	prompt "liblua............................ LUA programming language shared libraries"
+	tristate
+	select ADK_COMPILE_LUA
+	help
+	  Lua is a powerful light-weight programming language designed for extending 
+	  applications. Lua is also frequently used as a general-purpose, stand-alone 
+	  language. Lua is free software.
+	  
+	  Lua combines simple procedural syntax with powerful data description 
+	  constructs based on associative arrays and extensible semantics. Lua is 
+	  dynamically typed, interpreted from bytecodes, and has automatic memory 
+	  management with garbage collection, making it ideal for configuration, 
+	  scripting, and rapid prototyping.
+	  
+	  Lua is implemented as a small library of C functions, written in ANSI C, and 
+	  compiles unmodified in all known platforms. The implementation goals are 
+	  simplicity, efficiency, portability, and low embedding cost. The result is a 
+	  fast language engine with small footprint, making it ideal in embedded systems 
+	  too.
+	  
+	  http://www.lua.org/
+	  
+	  This package contains the LUA shared libraries, needed by other programs.
+

package/m4/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_M4
-	prompt "m4.............................. macro processor"
+	prompt "m4................................ macro processor"
 	tristate
 	default n
 	help

package/php/Config.in

@@ -1,4 +1,4 @@
-menu "php.............................. PHP Hypertext preprocessor"
+menu "php............................... PHP Hypertext preprocessor"
 
 config ADK_COMPILE_PHP
 	prompt "php.............................. PHP Hypertext preprocessor"

package/pixman/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_PIXMAN
-	prompt "pixman.............................. pixman library"
+	prompt "pixman............................... pixman library"
 	tristate
 	default n
 	help

package/python/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_PYTHON
-	prompt "python........................... Python scripting language"
+	prompt "python............................ Python scripting language"
 	tristate
 	default n
 	help

package/python/Makefile

@@ -42,7 +42,7 @@ pre-configure:
 	);
 	$(MAKE) -C ${WRKBUILD} python Parser/pgen
 	${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/pgen
-	${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/python
+	${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/hostpython
 	${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen
 	${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython
 	$(MAKE) -C ${WRKBUILD} distclean

package/sqlite/Config.in

@@ -3,41 +3,6 @@ config ADK_COMPILE_SQLITE
 	default n
 	depends on ADK_PACKAGE_LIBSQLITE
 
-config ADK_PACKAGE_LIBSQLITE
-	prompt "libsqlite......................... Self-contained, embeddable, zero-configuration SQL database engine"
-	tristate
-	default n
-	select ADK_COMPILE_SQLITE
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBREADLINE
-	help
-	  SQLite is a small C library that implements a self-contained, embeddable, 
-	  zero-configuration SQL database engine. Features include:
-	  
-	    * Transactions are atomic, consistent, isolated, and durable (ACID) 
-	      even after system crashes and power failures.
-	    * Zero-configuration - no setup or administration needed.
-	    * Implements most of SQL92. (Features not supported)
-	    * A complete database is stored in a single disk file.
-	    * Database files can be freely shared between machines with different 
-	      byte orders.
-	    * Supports databases up to 2 terabytes (241 bytes) in size.
-	    * Sizes of strings and BLOBs limited only by available memory.
-	    * Small code footprint: less than 30K lines of C code, less than 250KB 
-	      code space (gcc on i486)
-	    * Faster than popular client/server database engines for most common 
-	      operations.
-	    * Simple, easy to use API.
-	    * TCL bindings included. Bindings for many other languages available 
-	      separately.
-	    * Well-commented source code with over 95% test coverage.
-	    * Self-contained: no external dependencies.
-	    * Sources are in the public domain. Use for any purpose.
-	  
-	  http://www.sqlite.org/
-	  
-	  This package contains the shared library, needed by other programs.
-
 config ADK_PACKAGE_SQLITE_CLI
 	prompt   "sqlite-cli...................... Command line interface for SQLite"
 	tristate

package/sqlite/Config.in.lib

@@ -0,0 +1,35 @@
+config ADK_PACKAGE_LIBSQLITE
+	prompt "libsqlite......................... Self-contained, embeddable, zero-configuration SQL database engine"
+	tristate
+	default n
+	select ADK_COMPILE_SQLITE
+	select ADK_PACKAGE_LIBNCURSES
+	select ADK_PACKAGE_LIBREADLINE
+	help
+	  SQLite is a small C library that implements a self-contained, embeddable, 
+	  zero-configuration SQL database engine. Features include:
+	  
+	    * Transactions are atomic, consistent, isolated, and durable (ACID) 
+	      even after system crashes and power failures.
+	    * Zero-configuration - no setup or administration needed.
+	    * Implements most of SQL92. (Features not supported)
+	    * A complete database is stored in a single disk file.
+	    * Database files can be freely shared between machines with different 
+	      byte orders.
+	    * Supports databases up to 2 terabytes (241 bytes) in size.
+	    * Sizes of strings and BLOBs limited only by available memory.
+	    * Small code footprint: less than 30K lines of C code, less than 250KB 
+	      code space (gcc on i486)
+	    * Faster than popular client/server database engines for most common 
+	      operations.
+	    * Simple, easy to use API.
+	    * TCL bindings included. Bindings for many other languages available 
+	      separately.
+	    * Well-commented source code with over 95% test coverage.
+	    * Self-contained: no external dependencies.
+	    * Sources are in the public domain. Use for any purpose.
+	  
+	  http://www.sqlite.org/
+	  
+	  This package contains the shared library, needed by other programs.
+

package/tntnet/Config.in

@@ -50,6 +50,7 @@ config ADK_COMPILE_TNTNET_WITH_STDCXX
 config ADK_COMPILE_TNTNET_WITH_UCLIBCXX
 	bool "Embedded uClibc++ library"
 	select ADK_PACKAGE_UCLIBCXX
+	depends on ADK_BROKEN
 	help
 
 endchoice

package/uclibc/Config.in

@@ -8,11 +8,10 @@ config ADK_PACKAGE_UCLIBC
 	  Embedded C library.
 
 config ADK_PACKAGE_UCLIBC_DEV
-	prompt "uclibc-dev........................... development files"
+	prompt "uClibc-dev........................... development files"
 	bool
 	default n
 	depends on ADK_TARGET_LIB_UCLIBC
 	help
 	  C library header files.
 
-

package/wget/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_WGET
-	prompt "wget............................. retrieving files using HTTP, HTTPS and FTP"
+	prompt "wget.............................. retrieving files using HTTP, HTTPS and FTP"
 	tristate
 	default n
 	help

package/xf86-video-geode/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_XF86_VIDEO_GEODE
-	prompt "xf86-video-geode........................... X11 driver for AMD Geode"
+	prompt "xf86-video-geode.......................... X11 driver for AMD Geode"
 	tristate
 	default n
 	depends on ADK_LINUX_X86_ALIX1C

package/xf86dga/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_XF86DGA
-	prompt "xf86dga................................ X library"
+	prompt "xf86dga.............................. X library"
 	tristate
 	default n
 	help

package/xf86dga/Makefile

@@ -11,8 +11,8 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/xkbcomp/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_XKBCOMP
-	prompt "xkbcomp........................... X11 keyboard compiler"
+	prompt "xkbcomp.............................. X11 keyboard compiler"
 	tristate
 	default n
 	help

package/xkeyboard-config/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_XKEYBOARD_CONFIG
-	prompt "xkeyboard-config............................ X keyboard config"
+	prompt "xkeyboard-config..................... X keyboard config"
 	tristate
 	default n
 	help