resolve merge conflict

Config.in

@@ -61,6 +61,10 @@ endmenu
 menu "Package selection"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
 
+source "package/Config.in.auto.global"
+source "package/Config.in"
+
+menu "Package options"
 config ADK_LEAVE_ETC_ALONE
 	boolean "do not install anything into /etc"
 	default n
@@ -101,8 +105,7 @@ config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS
 	  Note that without further customisation, turning this option
 	  off will almost certainly render the resulting system unusable.
 
-source "package/Config.in.auto.global"
+endmenu
-source "package/Config.in.auto"
 endmenu
 
 menu "Runtime configuration"

adk/tools/pkgmaker.c

@@ -225,17 +225,24 @@ static int hash_str(char *string) {
 
 static void iter(const char *key, const char *value, const void *obj) {
 
-	FILE *config, *section;
+	FILE *config, *section, *global;
 	int hash;
-	char *valuestr, *pkg, *subpkg;
+	char *valuestr, *pkg, *subpkg, *subsect, *sect, *keystr;
 	char buf[MAXPATH];
 	char infile[MAXPATH];
 	char outfile[MAXPATH];
+	char configsect[MAXPATH];
+
+	keystr = strdup(key);
+	sect = strtok(keystr, "/");
+	subsect = strtok(NULL, "/");
+
+	snprintf(configsect, MAXPATH, "package/Config.in.auto.%s.%s", sect, subsect);
 
 	valuestr = strdup(value);
-	config = fopen("package/Config.in.auto", "a");
+	config = fopen(configsect, "a");
 	if (config == NULL)
-		fatal_error("Can not open file package/Config.in.auto");
+		fatal_error("Can not open file Config.in.auto.<section>.<subsection>");
 
 	hash = hash_str(valuestr);
 	snprintf(infile, MAXPATH, "package/pkglist.d/sectionlst.%d", hash);
@@ -358,7 +365,7 @@ int main() {
 	p_ptr = NULL;
 	s_ptr = NULL;
 
-	unlink("package/Config.in.auto");
+	system("rm package/Config.in.auto.*");
 	unlink(runtime);
 	/* open global sectionfile */
 	menuglobal = fopen("package/Config.in.auto.global", "w");
@@ -498,8 +505,8 @@ int main() {
 						fclose(section);
 					}
 				} else
-					fatal_error("Can not find section description for package %s.",
+					fatal_error("Can not find section description %s for package %s.",
-							pkgdirp->d_name);
+							pkg_section, pkgdirp->d_name);
 				
 				fclose(pkg);
 				continue;
@@ -702,7 +709,7 @@ int main() {
 				pseudo_name = malloc(MAXLINE);
 				memset(pseudo_name, 0, MAXLINE);
 				strncat(pseudo_name, token, strlen(token));
-				while (strlen(pseudo_name) < 20)
+				while (strlen(pseudo_name) < 23)
 					strncat(pseudo_name, ".", 1);
 
 				if (snprintf(path, MAXPATH, "package/pkgconfigs.d/%s/Config.in.%s", pkgdirp->d_name, token) < 0)

mk/build.mk

@@ -402,14 +402,14 @@ endif
 			>> $(TOPDIR)/all.config; \
 	fi
 
-menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto
+menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto.global
 	@if [ ! -f .config ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
 	fi
 	@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
 	${POSTCONFIG}
 
-_config: $(CONFIG)/conf .menu package/Config.in.auto
+_config: $(CONFIG)/conf .menu package/Config.in.auto.global
 	-@touch .config
 	@$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN)
 	${POSTCONFIG}
@@ -444,7 +444,7 @@ $(TOPDIR)/adk/tools/pkgmaker: $(TOPDIR)/adk/tools/pkgmaker.c $(TOPDIR)/adk/tools
 $(TOPDIR)/adk/tools/pkgrebuild: $(TOPDIR)/adk/tools/pkgrebuild.c $(TOPDIR)/adk/tools/strmap.c
 	@$(CC_FOR_BUILD) -g -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
 
-package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) $(TOPDIR)/adk/tools/pkgmaker $(TOPDIR)/adk/tools/pkgrebuild
+package/Config.in.auto.global menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) $(TOPDIR)/adk/tools/pkgmaker $(TOPDIR)/adk/tools/pkgrebuild
 	@echo "Generating menu structure ..."
 	@$(TOPDIR)/adk/tools/pkgmaker
 	@:>.menu

package/6tunnel/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		6tunnel
 PKG_VERSION:=		0.11rc2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		74e02d4f0704b3083a01feda66033449
-PKG_DESCR:=		IPv4/IPv6 tunnel proxy
+PKG_DESCR:=		ipv4/ipv6 tunnel proxy
-PKG_SECTION:=		ipv6
+PKG_SECTION:=		net/ipv6
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://toxygen.net/6tunnel/
 PKG_SITES:=		http://toxygen.net/6tunnel/

package/Config.in

@@ -0,0 +1,86 @@
+menu "Base system"
+source package/Config.in.auto.base.boot
+source package/Config.in.auto.base.libs
+source package/Config.in.auto.base.apps
+source package/Config.in.auto.base.shells
+source package/Config.in.auto.base.misc
+endmenu
+
+menu "System"
+source package/Config.in.auto.sys.fs
+source package/Config.in.auto.sys.serial
+source package/Config.in.auto.sys.utils
+source package/Config.in.auto.sys.firmware
+source package/Config.in.auto.sys.misc
+endmenu
+
+menu "Applications"
+source package/Config.in.auto.app.archive
+source package/Config.in.auto.app.browser
+source package/Config.in.auto.app.chat
+source package/Config.in.auto.app.crypto
+source package/Config.in.auto.app.debug
+source package/Config.in.auto.app.editor
+source package/Config.in.auto.app.p2p
+endmenu
+
+menu "Networking"
+source package/Config.in.auto.net.acct
+source package/Config.in.auto.net.dns
+source package/Config.in.auto.net.debug
+source package/Config.in.auto.net.firewall
+source package/Config.in.auto.net.fs
+source package/Config.in.auto.net.http
+source package/Config.in.auto.net.ipv6
+source package/Config.in.auto.net.mail
+source package/Config.in.auto.net.misc
+source package/Config.in.auto.net.ntp
+source package/Config.in.auto.net.perf
+source package/Config.in.auto.net.ppp
+source package/Config.in.auto.net.proxy
+source package/Config.in.auto.net.radius
+source package/Config.in.auto.net.route
+source package/Config.in.auto.net.security
+source package/Config.in.auto.net.voip
+source package/Config.in.auto.net.wifi
+endmenu
+
+menu "Multimedia"
+source package/Config.in.auto.mm.audio
+source package/Config.in.auto.mm.image
+source package/Config.in.auto.mm.video
+endmenu
+
+menu "Xorg"
+source package/Config.in.auto.x11.apps
+source package/Config.in.auto.x11.utils
+source package/Config.in.auto.x11.drivers
+source package/Config.in.auto.x11.misc
+source package/Config.in.auto.x11.fonts
+source package/Config.in.auto.x11.libs
+endmenu
+
+menu "Libraries"
+source package/Config.in.auto.libs.audio
+source package/Config.in.auto.libs.crypto
+source package/Config.in.auto.libs.data
+source package/Config.in.auto.libs.db
+source package/Config.in.auto.libs.fonts
+source package/Config.in.auto.libs.image
+source package/Config.in.auto.libs.misc
+source package/Config.in.auto.libs.net
+source package/Config.in.auto.libs.video
+endmenu
+
+menu "Programming"
+source package/Config.in.auto.dev.lang
+source package/Config.in.auto.dev.python
+source package/Config.in.auto.dev.perl
+source package/Config.in.auto.dev.scm
+source package/Config.in.auto.dev.tools
+endmenu
+
+menu "Headers"
+depends on ADK_PACKAGE_GCC
+source package/Config.in.auto.dev.header
+endmenu

package/DirectFB/Makefile

@@ -8,8 +8,8 @@ PKG_VERSION:=		1.6.3
 PKG_RELEASE:=		3
 PKG_EXTRAVER:=		1.6-0
 PKG_MD5SUM:=		641e8e999c017770da647f9b5b890906
-PKG_DESCR:=		Thin graphic library for the Linux framebuffer devices
+PKG_DESCR:=		thin graphic library for framebuffer devices
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/image
 PKG_DEPENDS:=		libpng libjpeg-turbo libfreetype
 PKG_BUILDDEP:=		libpng libjpeg-turbo freetype
 PKG_URL:=		http://www.directfb.org/

package/ImageMagick/Makefile

@@ -9,26 +9,26 @@ PKG_EXTRAVER:=		1
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		8134257e3fbb43cc06fb32a6d725d3d0
 PKG_DESCR:=		image processing and converting utility
-PKG_SECTION:=		multimedia
+PKG_SECTION:=		mm/image
 PKG_DEPENDS:=		libstdcxx
 PKG_BUILDDEP:=		libpng libjpeg-turbo libtiff fontconfig libiconv-tiny
 PKG_BUILDDEP+=		pango libtool e2fsprogs
 PKG_URL:=		http://www.imagemagick.org/
 PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
-PKG_LIBNAME:=		libimagemagic
+PKG_LIBNAME:=		libimagemagick
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_SUBPKGS:=		CONVERT DISPLAY LIBIMAGEMAGICK
 PKGSD_LIBIMAGEMAGICK:=	imagemagick library
-PKGSC_LIBIMAGEMAGICK:=	libs
+PKGSC_LIBIMAGEMAGICK:=	libs/image
 PKGSS_LIBIMAGEMAGICK:=	libjpeg-turbo libtiff libpng
 PKGSD_CONVERT:=		image processing and converting utility
-PKGSC_CONVERT:=		multimedia
+PKGSC_CONVERT:=		mm/image
 PKGSS_CONVERT:=		libimagemagick
 PKGSD_DISPLAY:=		image display application
-PKGSC_DISPLAY:=		multimedia
+PKGSC_DISPLAY:=		mm/image
 PKGSS_DISPLAY:=		libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng libltdl
 PKGSB_DISPLAY:=		libX11
 

package/MesaLib/Makefile

@@ -8,8 +8,8 @@ PKG_VERSION:=		10.1.0
 PKG_SUBVER:=		10.1
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		08e796ec7122aa299d32d4f67a254315
-PKG_DESCR:=		MESA 3D graphics library
+PKG_DESCR:=		3d graphics library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		libxdamage libxfixes libdrm libxxf86vm libexpat
 PKG_DEPENDS+=		libxml2 libxml2-python libstdcxx
 PKG_BUILDDEP:=		autotool python2 libxml2 libXdamage libXfixes

package/SDL_gfx/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		SDL_gfx
 PKG_VERSION:=		2.0.22
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		330f291f1f09a1bdf397c9b40d92ca41
-PKG_DESCR:=		SDL GFX library
+PKG_DESCR:=		sdl graphic library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		libsdl
 PKG_BUILDDEP:=		sdl
 PKG_URL:=		http://www.ferzkopp.net/joomla/content/view/19/14/

package/SDL_ttf/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		SDL_ttf
 PKG_VERSION:=		2.0.10
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		814e6e17e8879254208d23b3b7e0354b
-PKG_DESCR:=		truetype fonts for SDL applications
+PKG_DESCR:=		truetype fonts for sdl applications
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/fonts
 PKG_DEPENDS:=		libsdl libfreetype
 PKG_BUILDDEP:=		sdl freetype gettext-tiny
 PKG_URL:=		http://www.libsdl.org/projects/SDL_ttf/

package/adk-helper/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		adk-helper
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
 PKG_DESCR:=		adk helper utilities
-PKG_SECTION:=		misc
+PKG_SECTION:=		base/misc
 
 PKG_CFLINE_ADK_HELPER:=	depends on ADK_HOST_ONLY
 

package/adk-test-tools/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		adk-test-tools
 PKG_VERSION:=		0.1
 PKG_RELEASE:=		7
 PKG_DESCR:=		helper tools and scripts for adk-test-framework
-PKG_SECTION:=		misc
+PKG_SECTION:=		base/misc
 PKG_URL:=		http://openadk.org/
 
 NO_DISTFILES:=		1

package/adkinstall/Makefile

@@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		adkinstall
 PKG_VERSION:=		2.0
 PKG_RELEASE:=		1
-PKG_DESCR:=		ADK disk/flash installer
+PKG_DESCR:=		adk disk/flash installer
-PKG_SECTION:=		base
+PKG_SECTION:=		base/misc
 PKG_DEPENDS:=		mke2fs parted sfdisk dosfstools mksh
 
 PKG_SYSTEM_DEPENDS:=	mikrotik-rb532 lemote-yeelong

package/aiccu/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		aiccu
 PKG_VERSION:=		20070115
 PKG_RELEASE:=		11
 PKG_MD5SUM:=		c9bcc83644ed788e22a7c3f3d4021350
-PKG_DESCR:=		SixXS Automatic IPv6 Connectivity Client Utility
+PKG_DESCR:=		sixxs automatic ipv6 connectivity client utility
-PKG_SECTION:=		ipv6
+PKG_SECTION:=		net/ipv6
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.sixxs.net/
 PKG_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/

package/aircrack-ng/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.1
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		f7a24ed8fad122c4187d06bfd6f998b4
 PKG_DESCR:=		set of tools for auditing wireless networks
-PKG_SECTION:=		wifi
+PKG_SECTION:=		net/wifi
 PKG_DEPENDS:=		libpthread libopenssl libpcap
 PKG_BUILDDEP:=		openssl libpcap
 PKG_URL:=		http://www.aircrack-ng.org/

package/alix-switch/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		alix-switch
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		4
 PKG_DESCR:=		daemon listening on button events
-PKG_SECTION:=		base
+PKG_SECTION:=		base/misc
 PKG_URL:=		http://openadk.org/
 
 PKG_SYSTEM_DEPENDS:=	pcengines-alix2d2 pcengines-alix2d13
@@ -22,8 +22,6 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-TARGET_CFLAGS+=		-Wall
-
 do-build:
 	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/alix-switchd ${WRKBUILD}/alix-switchd.c

package/alix-temperature/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		alix-temperature
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
 PKG_DESCR:=		read alix boards i2c thermal sensor
-PKG_SECTION:=		utils
+PKG_SECTION:=		sys/utils
 PKG_DEPENDS:=		i2c-tools
 
 PKG_SYSTEM_DEPENDS:=	pcengines-alix2d2 pcengines-alix2d13

package/alsa-lib/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		alsa-lib
 PKG_VERSION:=		1.0.27.2
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		69129a7c37697f81ac092335e9fa452b
-PKG_DESCR:=		ALSA sound library
+PKG_DESCR:=		sound library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/audio
 PKG_BUILDDEP:=		alsa-lib-host
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/lib/

package/alsa-utils/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.27.2
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		b65e9a04181bd7c9db7667a4566f8dc3
 PKG_DESCR:=		mixer/player utility
-PKG_SECTION:=		multimedia
+PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		alsa-lib libpthread librt
 PKG_BUILDDEP:=		alsa-lib
 PKG_URL:=		http://www.alsa-project.org/

package/ant/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		ant
 PKG_VERSION:=		1.8.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
-PKG_DESCR:=		ant utility
+PKG_DESCR:=		java code build utility
-PKG_SECTION:=		lang
+PKG_SECTION:=		dev/tools
 HOST_BUILDDEP:=		gcj-host
 PKG_SITES:=		http://archive.apache.org/dist/ant/source/
 

package/apr-util/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.4.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		666a5d56098a9debf998510e304c8095
 PKG_DESCR:=		apache portable runtime utility library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libexpat apr
 PKG_BUILDDEP:=		expat apr
 PKG_URL:=		http://apr.apache.org/

package/apr/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		apr
 PKG_VERSION:=		1.4.6
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		76cc4457fbb71eefdafa27dba8f511fb
-PKG_DESCR:=		Apache Portable Runtime library
+PKG_DESCR:=		apache portable runtime library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://apr.apache.org/
 PKG_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/

package/arpd/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
-PKG_DESCR:=		generates ARP responses for IP address ranges
+PKG_DESCR:=		generates arp responses for ip address ranges
-PKG_SECTION:=		route
+PKG_SECTION:=		net/route
 PKG_DEPENDS:=		libpcap libdnet libevent
 PKG_BUILDDEP:=		libpcap libdnet libevent
 PKG_URL:=		http://niels.xtdnet.nl/honeyd/

package/arpwatch/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.1a15
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		cebfeb99c4a7c2a6cee2564770415fe7
 PKG_DESCR:=		ethernet monitor program
-PKG_SECTION:=		net/security
+PKG_SECTION:=		net/debug
 PKG_DEPENDS:=		libpcap
 PKG_BUILDDEP:=		libpcap
 PKG_URL:=		http://www-nrg.ee.lbl.gov/

package/asterisk/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		asterisk
 PKG_VERSION:=		1.8.20.1
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		99204257de80a42c4e287fc93dfe714a
-PKG_DESCR:=		open source PBX
+PKG_DESCR:=		open source pbx
-PKG_SECTION:=		phone
+PKG_SECTION:=		net/voip
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl libstdcxx
 PKG_BUILDDEP:=		ncurses openssl zlib curl popt gtk+
 PKG_URL:=		http://www.asterisk.org/

package/atftp/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		atftp
 PKG_VERSION:=		0.7
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		3b27365772d918050b2251d98a9c7c82
-PKG_DESCR:=		TFTP client
+PKG_DESCR:=		tftp client
-PKG_SECTION:=		dhcp
+PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libreadline libncurses
 PKG_BUILDDEP:=		readline ncurses
 PKG_URL:=		http://freshmeat.net/projects/atftp/
@@ -19,7 +19,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_LIBC_DEPENDS:=	uclibc glibc
 
 PKG_SUBPKGS:=		ATFTP ATFTPD
-PKGSD_ATFTPD:=		TFTP server
+PKGSD_ATFTPD:=		tftp server
 PKGSS_ATFTPD:=		libreadline libncurses
 
 include $(TOPDIR)/mk/package.mk

package/atk/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		atk
 PKG_VERSION:=		2.11.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2b4316e69cbe0a1998ba39cdc8c89692
-PKG_DESCR:=		atk library
+PKG_DESCR:=		accessibility toolkit library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		${MASTER_SITE_GNOME:=/atk/2.11/}

package/autoconf/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.69
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		50f97f4159805e374639a73e2636f22e
 PKG_DESCR:=		automatically configure software source code packages
-PKG_SECTION:=		lang
+PKG_SECTION:=		dev/tools
 HOST_BUILDDEP:=		m4-host
 PKG_URL:=		http://www.gnu.org/software/autoconf/
 PKG_SITES:=		${MASTER_SITE_GNU:=autoconf/}

package/automake/Makefile

@@ -8,8 +8,8 @@ PKG_VERSION:=		1.14.1
 PKG_RELEASE:=		1
 PKG_EXTRAVER:=		1.14
 PKG_MD5SUM:=		7fc29854c520f56b07aa232a0f880292
-PKG_DESCR:=		tool for automatically generating Makefile.in
+PKG_DESCR:=		tool for automatically generating makefiles
-PKG_SECTION:=		lang
+PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host autoconf-host autoconf
 HOST_BUILDDEP:=		autoconf-host
 PKG_URL:=		http://www.gnu.org/software/automake/

package/autossh/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		autossh
 PKG_VERSION:=		1.4b
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		8f9aa006f6f69e912d3c2f504622d6f7
-PKG_DESCR:=		Automatically restart SSH sessions and tunnels
+PKG_DESCR:=		automatically restart ssh sessions and tunnels
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		openssh-client
 PKG_URL:=		http://www.harding.motd.ca/autossh/

package/autotool/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=		autotool
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		2
 PKG_DESCR:=		autotool infrastructure for host
-PKG_SECTION:=		devel
+PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host pkgconf-host autoconf-host automake-host
 PKG_BUILDDEP+=		libtool-host
 

package/avahi/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		avahi
 PKG_VERSION:=		0.6.31
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		2f22745b8f7368ad5a0a3fddac343f2d
-PKG_DESCR:=		mDNS daemon
+PKG_DESCR:=		multicast dns daemon
-PKG_SECTION:=		dhcp
+PKG_SECTION:=		net/dns
 PKG_DEPENDS:=		libstdcxx
 PKG_BUILDDEP:=		autotool libdaemon expat gdbm glib
 PKG_BUILDDEP+=		gettext-tiny gtk+ dbus
@@ -24,7 +24,7 @@ PKGSS_AVAHI_DAEMON:=	libavahi libdaemon libexpat libintl libgtk dbus
 PKGSS_AVAHI_DNSCONFD:=	libavahi libdaemon avahi-daemon
 PKGSD_AVAHI_DNSCONFD:=	DNS server from mDNS configuration daemon
 PKGSD_LIBAVAHI:=	DNS-SD over mDNS library
-PKGSC_LIBAVAHI:=	libs
+PKGSC_LIBAVAHI:=	libs/misc
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix

package/axtls/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		axtls
 PKG_VERSION:=		1.4.9
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		6d519bc3b5f20faa6ef8d423f5062241
-PKG_DESCR:=		small embedded webserver with TLS
+PKG_DESCR:=		small embedded webserver with tls
-PKG_SECTION:=		www
+PKG_SECTION:=		net/http
 PKG_DEPENDS:=		libaxtls
 PKG_URL:=		http://axtls.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=axtls/}
@@ -17,7 +17,7 @@ PKG_OPTS:=		dev
 
 PKG_SUBPKGS:=		AXHTTPD LIBAXTLS
 PKGSD_LIBAXTLS:=	small tls library
-PKGSC_LIBAXTLS:=	libs
+PKGSC_LIBAXTLS:=	libs/crypto
 
 DISTFILES:=		axTLS-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/axTLS

package/b43-firmware/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		37c8d2c029a7e5b82f4433a6fa1e2ee5
 PKG_DESCR:=		firmware for b43 wireless cards
-PKG_SECTION:=		wifi
+PKG_SECTION:=		sys/firmware
 PKG_SITES:=		http://openadk.org/distfiles/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz

package/base-files/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/mk/rootfs.mk
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		96
-PKG_SECTION:=		base
+PKG_SECTION:=		base/apps
 PKG_DESCR:=		basic files and scripts
 
 WRKDIST=		${WRKDIR}/base-files

package/bash/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		bash
 PKG_VERSION:=		4.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		81348932d5da294953e15d4814c74dd1
-PKG_DESCR:=		Bourne-Again SHell
+PKG_DESCR:=		bourne-again shell
-PKG_SECTION:=		shells
+PKG_SECTION:=		base/shells
 PKG_URL:=		http://www.gnu.org/software/bash/
 PKG_SITES:=		http://ftp.gnu.org/gnu/bash/
 

package/bc/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.06
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d44b5dddebd8a7a7309aea6c36fda117
 PKG_DESCR:=		arbitrary precision calculator language
-PKG_SECTION:=		utils
+PKG_SECTION:=		sys/utils
 PKG_BUILDDEP:=		m4-host flex-host
 HOST_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.gnu.org/software/bc/

package/bcm2835-bootloader/Makefile

@@ -9,7 +9,7 @@ PKG_VERSION:=		0.8
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		08beaa7d66e7dd6b0ab58483d0f4ce40
 PKG_DESCR:=		bootloader for raspberry pi (bcm2835)
-PKG_SECTION:=		boot
+PKG_SECTION:=		base/boot
 PKG_URL:=		https://github.com/raspberrypi/firmware
 PKG_SITES:=		http://openadk.org/distfiles/
 

package/bcm2835-vc/Makefile

@@ -9,7 +9,7 @@ PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		06ef68599607e3f041ded24d431ca460
 PKG_DESCR:=		videocore tools and libraries for raspberry pi
-PKG_SECTION:=		base
+PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		cmake-host
 PKG_URL:=		https://github.com/raspberrypi/userland

package/bdftopcf/Makefile

@@ -7,9 +7,9 @@ PKG_NAME:=		bdftopcf
 PKG_VERSION:=		1.0.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f2d5c8a7813c3f9902e163c620a83dd4
-PKG_DESCR:=		bdftopcf font utility
+PKG_DESCR:=		font converter utility
 PKG_BUILDDEP:=		libXfont
-PKG_SECTION:=		x11/apps
+PKG_SECTION:=		x11/fonts
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz

package/beecrypt/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		4.2.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		8441c014170823f2dff97e33df55af1e
 PKG_DESCR:=		cryptography toolkit library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/crypto
 PKG_DEPENDS:=		libstdcxx
 PKG_URL:=		http://beecrypt.sourceforge.net/
 PKG_SITES:=		http://sourceforge.net/projects/beecrypt/files/beecrypt/$(PKG_VERSION)/

package/bigreqsproto/Makefile

@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		bigreqsproto
 PKG_VERSION:=		1.1.2
 PKG_RELEASE:=		2
-PKG_DESCR:=		Big Requests Extension headers
+PKG_DESCR:=		big requests extension headers
-PKG_SECTION:=		devel
+PKG_SECTION:=		dev/header
 PKG_MD5SUM:=		9b83369ac7a5eb2bf54c8f34db043a0e
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly

package/bind/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		bind
 PKG_VERSION:=		9.7.3
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		207477c4cf95f2db5be0ded8a22669e0
-PKG_DESCR:=		popular DNS server
+PKG_DESCR:=		dns server
-PKG_SECTION:=		dns
+PKG_SECTION:=		net/dns
 PKG_DEPENDS:=		libopenssl libbind libxml2 libstdcxx
 PKG_BUILDDEP:=		openssl libxml2
 PKG_URL:=		https://www.isc.org/software/bind/
@@ -20,25 +20,25 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG LIBBIND
 PKGSD_BIND_NSUPDATE:=	nsupdate utility
-PKGSC_BIND_NSUPDATE:=	dns
+PKGSC_BIND_NSUPDATE:=	net/dns
 PKGSS_BIND_NSUPDATE:=	libbind libopenssl libxml2
 PKGSD_BIND_RNDC:=	rndc & rndc-confgen utilities
-PKGSC_BIND_RNDC:=	dns
+PKGSC_BIND_RNDC:=	net/dns
 PKGSS_BIND_RNDC:=	libbind libopenssl libxml2
 PKGSD_BIND_CHECK:=	check utilities
-PKGSC_BIND_CHECK:=	dns
+PKGSC_BIND_CHECK:=	net/dns
 PKGSS_BIND_CHECK:=	libbind libopenssl libxml2
 PKGSD_BIND_DNSSEC:=	dnssec utilities
-PKGSC_BIND_DNSSEC:=	dns
+PKGSC_BIND_DNSSEC:=	net/dns
 PKGSS_BIND_DNSSEC:=	libbind libopenssl libxml2
 PKGSD_BIND_HOST:=	host utility
-PKGSC_BIND_HOST:=	dns
+PKGSC_BIND_HOST:=	net/dns
 PKGSS_BIND_HOST:=	libbind libopenssl libxml2
 PKGSD_BIND_DIG:=	dig utility
-PKGSC_BIND_DIG:=	dns
+PKGSC_BIND_DIG:=	net/dns
 PKGSS_BIND_DIG:=	libbind libopenssl libxml2
 PKGSD_LIBBIND:=		library for the bind software suite
-PKGSC_LIBBIND:=		libs
+PKGSC_LIBBIND:=		libs/net
 
 PKG_FLAVOURS_BIND_SERVER:=	WITH_IPV6
 PKGFD_WITH_IPV6:=		enable IPv6 support

package/binutils/Makefile

@@ -6,13 +6,13 @@ include ${TOPDIR}/toolchain/binutils/Makefile.inc
 
 PKG_NAME:=		binutils
 PKG_DESCR:=		binary utilities (nm, objdump, as, ..)
-PKG_SECTION:=		lang
+PKG_SECTION:=		dev/tools
 PKG_DEPENDS:=		libbfd
 PKG_OPTS:=		dev
 
 PKG_SUBPKGS:=		BINUTILS LIBBFD
 PKGSD_LIBBFD:=		binary file descriptor library
-PKGSC_LIBBFD:=		libs
+PKGSC_LIBBFD:=		libs/misc
 
 PKG_HOST_DEPENDS:=      !cygwin
 

package/bison/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		3.0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		146be9ff9fbd27497f0bf2286a5a2082
 PKG_DESCR:=		parser generator
-PKG_SECTION:=		lang
+PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host flex-host bison-host
 HOST_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.gnu.org/software/bison/

package/bitlbee/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		bitlbee
 PKG_VERSION:=		3.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		4d00c6e09859b653f955b16b988db0ac
-PKG_DESCR:=		IRC gateway to IM chat networks
+PKG_DESCR:=		irc gateway to im chat networks
-PKG_SECTION:=		chat
+PKG_SECTION:=		app/chat
 PKG_DEPENDS:=		glib libopenssl
 PKG_BUILDDEP:=		glib libiconv-tiny openssl
 PKG_URL:=		http://www.bitlbee.org/

package/bkeymaps/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.13
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		a68058ab4a81cf9a8dcbaaa7a5df5b11
 PKG_DESCR:=		binary keymaps for busybox loadkmap
-PKG_SECTION:=		utils
+PKG_SECTION:=		sys/utils
 PKG_BUILDDEP:=		base-files
 PKG_SITES:=		http://openadk.org/distfiles/
 

package/bluez-firmware/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		bluez-firmware
 PKG_VERSION:=		1.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1cc3cefad872e937e05de5a0a2b390dd
-PKG_DESCR:=		firmware for BCM2033
+PKG_DESCR:=		firmware for bcm2033 bluetooth dongle
-PKG_SECTION:=		misc
+PKG_SECTION:=		sys/firmware
 PKG_DEPENDS:=		bluez
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://bluez.sourceforge.net/download/

package/bluez/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		5.12
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		5d37e581107b3d6f91b81194a5006407
 PKG_DESCR:=		bluetooth applications
-PKG_SECTION:=		wifi
+PKG_SECTION:=		net/wifi
 PKG_DEPENDS:=		glib dbus libreadline
 PKG_BUILDDEP:=		autotool glib dbus readline
 PKG_URL:=		http://www.bluez.org/

package/bogofilter/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2.2
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		39d27c13eae8a5064d68e20d585e60de
 PKG_DESCR:=		mail filter software
-PKG_SECTION:=		mail
+PKG_SECTION:=		net/mail
 PKG_BUILDDEP:=		libiconv-tiny db
 PKG_DEPENDS:=		libdb libstdcxx
 PKG_URL:=		http://bogofilter.sourceforge.net/

package/boost/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		boost
 PKG_VERSION:=		1.55.0
 PKG_RELEASE:=		5
 PKG_MD5SUM:=		93780777cfbf999a600f62883bd54b17
-PKG_DESCR:=		boost C++ library
+PKG_DESCR:=		boost c++ library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_BUILDDEP:=		autotool bzip2-host python2-host
 PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}

package/boot-wrapper-aarch64/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2ffdbf8c05854e3b855314d9ac21bbc4
 PKG_DESCR:=		boot-wrapper for aarch64
-PKG_SECTION:=		boot
+PKG_SECTION:=		base/boot
 PKG_BUILDDEP:=		autotool
 PKG_SITES:=		http://www.openadk.org/distfiles/
 

package/brcm-bluetooth/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		85a7d1d1386143fad312a5a82c422380
 PKG_DESCR:=		firmware for broadcom bluetooth chips
-PKG_SECTION:=		wifi
+PKG_SECTION:=		sys/firmware
 
 NO_DISTFILES:=		1
 

package/brcmfmac-firmware/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		85a7d1d1386143fad312a5a82c422380
 PKG_DESCR:=		firmware for broadcom wireless cards
-PKG_SECTION:=		wifi
+PKG_SECTION:=		sys/firmware
 
 NO_DISTFILES:=		1
 

package/bridge-utils/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.5
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		ec7b381160b340648dede58c31bb2238
 PKG_DESCR:=		ethernet bridging tools
-PKG_SECTION:=		bridge
+PKG_SECTION:=		net/route
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.linuxfoundation.org/en/Net:Bridge
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bridge/}

package/busybox/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.22.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		337d1a15ab1cb1d4ed423168b1eb7d7e
 PKG_DESCR:=		core utilities for embedded systems
-PKG_SECTION:=		core
+PKG_SECTION:=		base/apps
 PKG_BUILDDEP:=		bzip2-host
 PKG_URL:=		http://www.busybox.net/
 PKG_SITES:=		http://www.busybox.net/downloads/

package/bwm/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		bwm
 PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		51021a036acb92d2bda0c0c0483f9552
-PKG_DESCR:=		A very tiny bandwidth monitor
+PKG_DESCR:=		very tiny bandwidth monitor
-PKG_SECTION:=		net
+PKG_SECTION:=		net/perf
 PKG_SITES:=		http://ftp.debian.org/debian/pool/main/b/bwm/
 
 DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.orig.tar.gz

package/bzip2/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		00b516f4704d4a7cb50a1d97e6e8e15b
 PKG_DESCR:=		compression utility
-PKG_SECTION:=		archive
+PKG_SECTION:=		app/archive
 PKG_BUILDDEP:=		bzip2-host
 PKG_DEPENDS:=		libbz2
 PKG_URL:=		http://www.bzip.org/
@@ -21,7 +21,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		BZIP2 LIBBZ2
 PKGSD_LIBBZ2:=		bzip2 compression library
-PKGSC_LIBBZ2:=		libs
+PKGSC_LIBBZ2:=		libs/misc
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix

package/bzr/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		bzr
 PKG_VERSION:=		2.6.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		28c86653d0df10d202c6b842deb0ea35
-PKG_DESCR:=		bazaar
+PKG_DESCR:=		source code management system
-PKG_SECTION:=		scm
+PKG_SECTION:=		dev/scm
 PKG_BUILDDEP:=		python2
 PKG_DEPENDS:=		python2
 PKG_URL:=		http://bazaar.canonical.com/en/

package/ca-certificates/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		ca-certificates
 PKG_VERSION:=		20090814
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		307052c985bec7f9a00eb84293eef779
-PKG_DESCR:=		Collection of common CA certificates
+PKG_DESCR:=		collection of common ca certificates
-PKG_SECTION:=		net/security
+PKG_SECTION:=		app/crypto
 PKG_DEPENDS:=		openssl-util libopenssl
 PKG_URL:=		http://packages.debian.org/sid/ca-certificates
 PKG_SITES:=		http://ftp.debian.org/debian/pool/main/c/ca-certificates/
@@ -16,7 +16,7 @@ PKG_SITES:=		http://ftp.debian.org/debian/pool/main/c/ca-certificates/
 DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.tar.gz
 
 PKG_FLAVOURS_CA_CERTS:=	SMALL
-PKGFD_SMALL:=		Minimal set of CA certificates
+PKGFD_SMALL:=		minimal set of CA certificates
 
 include $(TOPDIR)/mk/package.mk
 

package/cairo/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.12.16
 PKG_RELEASE:=		4
 PKG_MD5SUM:=		a1304edcdc99282f478b995ee5f8f854
 PKG_DESCR:=		cairo graphics library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/image
 PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman
 PKG_DEPENDS+=		libxrender
 PKG_BUILDDEP:=		libpng pixman freetype fontconfig libX11 libXrender glib

package/ccache/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		ccache
 PKG_VERSION:=		3.1.9
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		367916e4ecba4968f77f59a378e61458
-PKG_DESCR:=		ccache utility
+PKG_DESCR:=		compiler cache utility
-PKG_SECTION:=		misc
+PKG_SECTION:=		dev/tools
 PKG_SITES:=		http://samba.org/ftp/ccache/
 
 PKG_CFLINE_CCACHE:=	depends on ADK_HOST_ONLY

package/ccid/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		ccid
 PKG_VERSION:=		1.4.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		79ef91103bcdd99a3b31cb5c5721a829
-PKG_DESCR:=		a generic USB CCID and ICCD driver
+PKG_DESCR:=		generic usb ccid and iccd driver
-PKG_SECTION:=		crypto
+PKG_SECTION:=		app/crypto
 PKG_BUILDDEP:=		pcsc-lite
 PKG_URL:=		http://pcsclite.alioth.debian.org/ccid.html
 PKG_SITES:=		http://openadk.org/distfiles/

package/cdrtools/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		cdrtools
 PKG_VERSION:=		3.01
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		afd4563e335a614a11e042c7b6734d66
-PKG_DESCR:=		cdrtools
+PKG_DESCR:=		cd writing tools
-PKG_SECTION:=		fs
+PKG_SECTION:=		sys/fs
 PKG_URL:=		http://cdrecord.berlios.de/private/cdrecord.html
 PKG_SITES:=		ftp://ftp.berlios.de/pub/cdrecord/
 

package/cfgfs/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.10
 PKG_RELEASE:=		1
 PKG_DESCR:=		compressed config filesystem
-PKG_SECTION:=		base
+PKG_SECTION:=		base/apps
 PKG_URL:=		http://openadk.org/
 
 PKG_CFLINE_CFGFS:=	select BUSYBOX_COMM@

package/cgilib/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		cgilib
 PKG_VERSION:=		0.7
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		2c7053f58dfb06f7a80a112797ed7e86
-PKG_DESCR:=		simple CGI library
+PKG_DESCR:=		simple cgi library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/net
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.infodrom.org/projects/cgilib/
 PKG_SITES:=		http://www.infodrom.org/projects/cgilib/download/

package/check/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		check
 PKG_VERSION:=		0.9.12
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		46fe540d1a03714c7a1967dbc6d484e7
-PKG_DESCR:=		unit testing framework for C
+PKG_DESCR:=		unit testing framework for c
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_URL:=		http://check.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=check/}
 PKG_LIBNAME:=		libcheck

package/cherokee/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2.101
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ef47003355a2e368e4d9596cd070ef23
 PKG_DESCR:=		small and fast webserver
-PKG_SECTION:=		www
+PKG_SECTION:=		net/http
 PKG_URL:=		http://www.cherokee-project.com
 PKG_SITES:=		http://www.cherokee-project.de/mirrors/cherokee/1.2/${PKG_VERSION}/
 

package/cherrypy/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		3.3.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		4ac4af5ac21a893f07221cbd7ec4be11
 PKG_DESCR:=		python web framework
-PKG_SECTION:=		libs
+PKG_SECTION:=		net/http
 PKG_DEPENDS:=		python2
 PKG_BUILDDEP:=		python2
 PKG_URL:=		http://www.cherrypy.org/

package/chillispot/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		chillispot
 PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		9d2597756af3fa14d7331b4a3651fc9b
-PKG_DESCR:=		wireless LAN access point controller
+PKG_DESCR:=		wireless lan access point controller
-PKG_SECTION:=		wifi
+PKG_SECTION:=		net/wifi
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.chillispot.info/
 PKG_SITES=		http://www.chillispot.info/download/

package/cifs-utils/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		cifs-utils
 PKG_VERSION:=		6.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		93697dbc043cb4d5c66e15e281f872e5
-PKG_DESCR:=		CIFS network filesystem utilities
+PKG_DESCR:=		network filesystem utilities
 PKG_SECTION:=		net/fs
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		https://wiki.samba.org/index.php/LinuxCIFS_utils
@@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CIFS_UTILS,cifs-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_STATIC),y)
-TARGET_LDFLAGS+=        -static
-endif
-
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--disable-cifsupcall \
 			--disable-cifsidmap \

package/classpath/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		classpath
 PKG_VERSION:=		0.98
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		90c6571b8b0309e372faa0f9f6255ea9
-PKG_DESCR:=		GNU Classpath
+PKG_DESCR:=		java classpath
-PKG_SECTION:=		lang
+PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		gtk+ gdk-pixbuf orbit2 gconf
 PKG_DEPENDS:=		libgtk gdk-pixbuf orbit2 gconf
 PKG_URL:=		http://www.gnu.org/software/classpath/home.html

package/cmake/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.8.12
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		105bc6d21cc2e9b6aff901e43c53afea
 PKG_DESCR:=		cmake utility
-PKG_SECTION:=		lang
+PKG_SECTION:=		dev/tools
 PKG_URL:=		http://www.cmake.org/
 PKG_SITES:=		http://www.cmake.org/files/v2.8/
 

package/collectd/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		5.4.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		6514ab3f7fd2135d2713f1ab25068841
 PKG_DESCR:=		system statistics collection daemon
-PKG_SECTION:=		misc
+PKG_SECTION:=		sys/misc
 PKG_BUILDDEP:=		libtool
 PKG_DEPENDS:=		libpthread libltdl
 PKG_URL:=		http://collectd.org/

package/comgt/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		comgt
 PKG_VERSION:=		0.32
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		db2452680c3d953631299e331daf49ef
-PKG_DESCR:=		3G/GPRS datacard control tool
+PKG_DESCR:=		3g/gprs datacard control tool
-PKG_SECTION:=		utils
+PKG_SECTION:=		sys/utils
 PKG_URL:=		http://sourceforge.net/projects/comgt
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=comgt/}
 

package/compositeproto/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		compositeproto
 PKG_VERSION:=		0.4.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2dea7c339432b3363faf2d29c208e7b5
-PKG_DESCR:=		X11 composite headers
+PKG_DESCR:=		composite headers
-PKG_SECTION:=		devel
+PKG_SECTION:=		dev/header
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 

package/confuse/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.7
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		45932fdeeccbb9ef4228f1c1a25e9c8f
 PKG_DESCR:=		configuration file parser library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_URL:=		http://www.nongnu.org/confuse/
 PKG_SITES:=		http://savannah.nongnu.org/download/confuse/
 PKG_LIBNAME:=		libconfuse

package/conntrack-tools/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.4.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		b1f9d006e7bf000a77395ff7cd3fac16
 PKG_DESCR:=		connection tracking userspace tools
-PKG_SECTION:=		firewall
+PKG_SECTION:=		net/firewall
 PKG_DEPENDS:=		libtirpc libnetfilter_queue libnetfilter-conntrack libnetfilter-cttimeout libnetfilter-cthelper libmnl
 PKG_BUILDDEP:=		libtirpc libnetfilter_queue libnetfilter_conntrack libnetfilter_cttimeout libnetfilter_cthelper libmnl
 PKG_URL:=		http://conntrack-tools.netfilter.org/

package/coreutils/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		8.22
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		8fb0ae2267aa6e728958adc38f8163a2
 PKG_DESCR:=		basic file, shell and text manipulation utilities
-PKG_SECTION:=		core
+PKG_SECTION:=		base/apps
 PKG_BUILDDEP:=		gmp autotool
 PKG_URL:=		http://www.gnu.org/software/coreutils/
 PKG_SITES:=		http://ftp.gnu.org/gnu/coreutils/

package/cpio/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1112bb6c45863468b5496ba128792f6c
 PKG_DESCR:=		archive utility
-PKG_SECTION:=		archive
+PKG_SECTION:=		app/archive
 PKG_URL:=		http://www.gnu.org/software/cpio/
 PKG_SITES:=		${MASTER_SITE_GNU:=cpio/}
 PKG_BB:=		1

package/cpufrequtils/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		cpufrequtils
 PKG_VERSION:=		008
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		52d3e09e47ffef634833f7fab168eccf
-PKG_DESCR:=		utilities for the Linux kernel cpufreq subsystem
+PKG_DESCR:=		utilities for cpufreq subsystem
-PKG_SECTION:=		utils
+PKG_SECTION:=		sys/utils
 PKG_URL:=		http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/kernel/cpufreq/
 

package/cryptinit/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		cryptinit
 PKG_VERSION:=		2.0
 PKG_RELEASE:=		1
 PKG_DESCR:=		init for encrypted rootfilesystem
-PKG_SECTION:=		base
+PKG_SECTION:=		base/misc
 PKG_DEPENDS:=		cryptsetup
 
 PKG_CFLINE_CRYPTINIT:=	select BUSYBOX_STTY@

package/cryptodev-linux/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		cryptodev-linux
 PKG_VERSION:=		1.6
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		eade38998313c25fd7934719cdf8a2ea
-PKG_DESCR:=		cryptodev-linux kernel module
+PKG_DESCR:=		device that allows access to kernel cryptographic drivers
-PKG_SECTION:=		crypto
+PKG_SECTION:=		app/crypto
 PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://home.gna.org/cryptodev-linux/
 PKG_SITES:=		http://download.gna.org/cryptodev-linux/

package/cryptsetup/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		cryptsetup
 PKG_VERSION:=		1.6.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a7aeb549a543eeac433eadfb6bc67837
-PKG_DESCR:=		LUKS cryptsetup tools
+PKG_DESCR:=		utility used to conveniently setup disk encryption 
-PKG_SECTION:=		crypto
+PKG_SECTION:=		app/crypto
 PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt
 PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt
 PKG_BUILDDEP:=		libgcrypt popt e2fsprogs lvm

package/ctorrent/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		ctorrent
 PKG_VERSION:=		dnh3.3.2
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
-PKG_DESCR:=		console-based BitTorrent client
+PKG_DESCR:=		console-based bittorrent client
-PKG_SECTION:=		p2p
+PKG_SECTION:=		app/p2p
 PKG_DEPENDS:=		libstdcxx
 PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://www.rahul.net/dholmes/ctorrent

package/cups/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		cups
 PKG_VERSION:=		1.7.1
 PKG_RELEASE:=		4
 PKG_MD5SUM:=		55277c40fd4b7183dc3671d39c5c42b7
-PKG_DESCR:=		Common Unix Printing System
+PKG_DESCR:=		common unix printing system
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		zlib libpthread libstdcxx
 PKG_BUILDDEP:=		cups-host zlib

package/curl/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		curl
 PKG_VERSION:=		7.37.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c35d0b20a7ef38951da81b6cae7e5c36
-PKG_DESCR:=		client-side URL transfer tool
+PKG_DESCR:=		client-side url transfer tool
-PKG_SECTION:=		www
+PKG_SECTION:=		net/http
 PKG_DEPENDS:=		libcurl
 PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://curl.haxx.se/
@@ -19,19 +19,19 @@ PKG_OPTS:=		dev
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		CURL LIBCURL
-PKGSD_LIBCURL:=		client-side URL transfer library
+PKGSD_LIBCURL:=		client-side url transfer library
-PKGSC_LIBCURL:=		libs
+PKGSC_LIBCURL:=		libs/net
 PKGSS_LIBCURL:=		zlib
 
 PKG_FLAVOURS_CURL:=	WITH_IPV6
-PKGFD_WITH_IPV6:=	enable IPv6 support
+PKGFD_WITH_IPV6:=	enable ipv6 support
 
 PKG_CHOICES_LIBCURL:=	WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL
-PKGCD_WITHOUT_SSL:=	use no SSL
+PKGCD_WITHOUT_SSL:=	use no ssl
-PKGCD_WITH_OPENSSL:=	use OpenSSL for crypto
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates libgmp
 PKGCB_WITH_OPENSSL:=	openssl
-PKGCD_WITH_GNUTLS:=	use GnuTLS for crypto
+PKGCD_WITH_GNUTLS:=	use gnutls for crypto
 PKGCS_WITH_GNUTLS:=	libgnutls ca-certificates libgmp
 PKGCB_WITH_GNUTLS:=	gnutls
 

package/cutter/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		cutter
 PKG_VERSION:=		1.03
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		50093db9b64277643969ee75b83ebbd1
-PKG_DESCR:=		Abort TCP/IP connections routed over a firewall
+PKG_DESCR:=		abort tcp/ip connections routed over a firewall
-PKG_SECTION:=		firewall
+PKG_SECTION:=		net/firewall
 PKG_URL:=		http://www.lowth.com/cutter/software/
 PKG_SITES:=		http://openadk.org/distfiles/
 
@@ -22,8 +22,6 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-TARGET_CFLAGS+=		-Wall
-
 do-build:
 	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter

package/cvs/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.11.23
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		bf185eb51b5918330a04671c3f3cccde
 PKG_DESCR:=		concurrent version system
-PKG_SECTION:=		scm
+PKG_SECTION:=		dev/scm
 PKG_URL:=		http://www.nongnu.org/cvs/
 PKG_SITES:=		http://ftp.gnu.org/non-gnu/cvs/source/stable/${PKG_VERSION}/
 

package/cxxtools/Makefile

@@ -7,9 +7,9 @@ PKG_NAME:=		cxxtools
 PKG_VERSION:=		2.2.1
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		aab00068ae5237435b37ac86f2ac7576
-PKG_DESCR:=		collection of general-purpose C++ classes
+PKG_DESCR:=		collection of general-purpose c++ classes
 PKG_DEPENDS:=		libstdcxx
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_URL:=		http://www.tntnet.org/
 PKG_SITES:=		http://www.tntnet.org/download/
 PKG_OPTS:=		dev

package/cyrus-sasl/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		cyrus-sasl
 PKG_VERSION:=		2.1.26
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		a7f4e5e559a0e37b3ffc438c9456e425
-PKG_DESCR:=		a general purpose authentication library
+PKG_DESCR:=		general purpose authentication library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/crypto
 PKG_BUILDDEP:=		openssl
 PKG_DEPENDS:=		libopenssl
 PKG_URL:=		http://cyrusimap.org/

package/damageproto/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		damageproto
 PKG_VERSION:=		1.2.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		bf8c47b7f48625230cff155180f8ddce
-PKG_DESCR:=		X DAMAGE Extension headers
+PKG_DESCR:=		x damage extension headers
-PKG_SECTION:=		devel
+PKG_SECTION:=		dev/header
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=              dev devonly
 

package/dansguardian/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.12.0.3
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		2a88d0392cd28eaec02b7ee727b2e253
 PKG_DESCR:=		web content filter proxy
-PKG_SECTION:=		proxy
+PKG_SECTION:=		net/proxy
 PKG_DEPENDS:=		libpcre zlib
 PKG_BUILDDEP:=		pcre zlib
 PKG_URL:=		http://dansguardian.org/

package/daq/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		daq
 PKG_VERSION:=		2.0.0
 PKG_RELEASE:=		4
 PKG_MD5SUM:=		a00855a153647df76d47f1ea454f74ae
-PKG_DESCR:=		daq
+PKG_DESCR:=		data acquisition library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libpcap libdnet
 PKG_BUILDDEP:=		libpcap libdnet autotool
 PKG_URL:=		http://www.snort.org

package/davfs2/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		davfs2
 PKG_VERSION:=		1.4.7
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c75f9d7d260e7364362b89beba2b3186
-PKG_DESCR:=		WebDAV filesystem
+PKG_DESCR:=		webdav filesystem
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		fuse-utils neon
 PKG_BUILDDEP:=		libiconv-tiny neon fuse

package/db/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		5.3.21
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		3fda0b004acdaa6fa350bfc41a3b95ca
 PKG_DESCR:=		disk file format database which stores key/data-pairs in single files
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/db
 PKG_DEPENDS:=		libstdcxx
 PKG_URL:=		http://www.oracle.com/technology/software/products/berkeley-db
 PKG_SITES:=		http://www.openadk.org/distfiles/

package/dbus-glib/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		dbus-glib
 PKG_VERSION:=		0.100.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ad0920c7e3aad669163bb59171cf138e
-PKG_DESCR:=		DBUS glib bindings
+PKG_DESCR:=		glib bindings for dbus
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libdbus glib
 PKG_BUILDDEP:=		dbus glib
 PKG_URL:=		http://www.freedesktop.org/wiki/Software/DBusBindings
@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-checks
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
 

package/dbus-python/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		dbus-python
 PKG_VERSION:=		1.2.0
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		b09cd2d1a057cc432ce944de3fc06bf7
-PKG_DESCR:=		DBUS python bindings
+PKG_DESCR:=		python bindings for dbus
-PKG_SECTION:=		libs
+PKG_SECTION:=		dev/python
 PKG_DEPENDS:=		dbus dbus-glib
 PKG_BUILDDEP:=		dbus dbus-glib
 PKG_URL:=		http://dbus.freedesktop.org/doc/dbus-python/
@@ -30,7 +30,5 @@ dbus-python-install:
 	$(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop
 	$(CP) $(WRKINST)/usr/lib/python2.7/site-packages/dbus/mainloop/*.py \
 		$(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop
-	
-	
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/dbus/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		dbus
 PKG_VERSION:=		1.6.18
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		b02e9c95027a416987b81f9893831061
-PKG_DESCR:=		DBUS daemon
+PKG_DESCR:=		desktop bus daemon
-PKG_SECTION:=		misc
+PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		libdbus libexpat
 PKG_BUILDDEP:=		expat util-linux
 PKG_URL:=		http://dbus.freedesktop.org/
@@ -20,7 +20,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		DBUS LIBDBUS
 PKGSD_LIBDBUS:=		DBUS library
-PKGSC_LIBDBUS:=		libs
+PKGSC_LIBDBUS:=		libs/misc
 PKGSS_LIBDBUS:=		libexpat libuuid
 
 ifeq ($(ADK_STATIC),y)
@@ -33,7 +33,6 @@ $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LIBDBUS,libdbus,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBDBUS},${PKGSD_LIBDBUS},${PKGSC_LIBDBUS},${PKG_OPTS}))
 
 TARGET_LDFLAGS+=	-luuid
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
 			--enable-checks \

package/deco/Makefile

@@ -7,8 +7,8 @@ PKG_NAME:=		deco
 PKG_VERSION:=		39
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		f77f60e8be0cae1f814cba1ef61bf4d0
-PKG_DESCR:=		text-based, full featured file manager
+PKG_DESCR:=		full featured text-based file manager
-PKG_SECTION:=		misc
+PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		libncurses
 PKG_BUILDDEP:=		ncurses
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=deco/}