summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2010-04-24 21:51:50 (GMT)
committerPhil Sutter <phil@nwl.cc>2010-06-12 12:06:19 (GMT)
commit02645c3876604612507880ae53603426a9cf25be (patch)
tree43036c99e190007d878d7f4e7af04bc5998fac61
parenta0f533460bcb41a04d592345303348575f2e23e2 (diff)
massive PKG_SECTION adjustments
-rw-r--r--package/6tunnel/Makefile2
-rw-r--r--package/aiccu/Makefile2
-rw-r--r--package/aircrack-ng/Makefile2
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/arpd/Makefile2
-rw-r--r--package/arpwatch/Makefile2
-rw-r--r--package/asterisk/Makefile2
-rw-r--r--package/atftp/Makefile2
-rw-r--r--package/aufs2-util/Makefile2
-rw-r--r--package/autoconf/Makefile2
-rw-r--r--package/automake/Makefile2
-rw-r--r--package/autossh/Makefile2
-rw-r--r--package/avahi/Makefile2
-rw-r--r--package/axtls/Makefile2
-rw-r--r--package/bind/Makefile2
-rw-r--r--package/binutils/Makefile2
-rw-r--r--package/bison/Makefile2
-rw-r--r--package/bitlbee/Makefile2
-rw-r--r--package/bridge-utils/Makefile2
-rw-r--r--package/bzip2/Makefile2
-rw-r--r--package/ca-certificates/Makefile2
-rw-r--r--package/chillispot/Makefile2
-rw-r--r--package/collectd/Makefile2
-rw-r--r--package/comgt/Makefile2
-rw-r--r--package/cpio/Makefile2
-rwxr-xr-xpackage/ctorrent/Makefile2
-rw-r--r--package/cups/Makefile2
-rw-r--r--package/curl/Makefile2
-rwxr-xr-xpackage/cutter/Makefile2
-rw-r--r--package/cxxtools/Makefile2
-rw-r--r--package/dansguardian/Makefile2
-rw-r--r--package/davfs2/Makefile2
-rw-r--r--package/dbus/Makefile2
-rw-r--r--package/dhcp-forwarder/Makefile2
-rw-r--r--package/dhcp/Makefile2
-rw-r--r--package/diffutils/Makefile2
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dosfstools/Makefile2
-rw-r--r--package/dovecot/Makefile2
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/e2fsprogs/Makefile2
-rw-r--r--package/ebtables/Makefile2
-rw-r--r--package/elinks/Makefile2
-rw-r--r--package/esound/Makefile2
-rw-r--r--package/evilwm/Makefile2
-rw-r--r--package/exmap/Makefile2
-rw-r--r--package/ez-ipupdate/Makefile2
-rw-r--r--package/fakeidentd/Makefile2
-rw-r--r--package/fetchmail/Makefile2
-rw-r--r--package/ffmpeg/Makefile2
-rw-r--r--package/flex/Makefile2
-rw-r--r--package/font-adobe-100dpi/Makefile2
-rw-r--r--package/font-adobe-75dpi/Makefile2
-rw-r--r--package/font-bh-100dpi/Makefile2
-rw-r--r--package/font-bh-75dpi/Makefile2
-rw-r--r--package/font-bh-lucidatypewriter-100dpi/Makefile2
-rw-r--r--package/font-bh-lucidatypewriter-75dpi/Makefile2
-rw-r--r--package/font-bh-ttf/Makefile2
-rw-r--r--package/font-bh-type1/Makefile2
-rw-r--r--package/font-bitstream-100dpi/Makefile2
-rw-r--r--package/font-bitstream-75dpi/Makefile2
-rw-r--r--package/font-bitstream-type1/Makefile2
-rw-r--r--package/font-misc-misc/Makefile2
-rw-r--r--package/font-util/Makefile2
-rw-r--r--package/font-xfree86-type1/Makefile2
-rw-r--r--package/freeradius-client/Makefile2
-rw-r--r--package/freeradius-server/Makefile2
-rw-r--r--package/frickin/Makefile2
-rw-r--r--package/fuse/Makefile2
-rw-r--r--package/gatling/Makefile2
-rw-r--r--package/gawk/Makefile2
-rw-r--r--package/gcc/Makefile2
-rw-r--r--package/gdb/Makefile2
-rw-r--r--package/gdbserver/Makefile2
-rw-r--r--package/gkrellmd/Makefile2
-rw-r--r--package/gmediaserver/Makefile2
-rw-r--r--package/gnupg/Makefile2
-rw-r--r--package/gnutls/Makefile2
-rw-r--r--package/gperf/Makefile2
-rw-r--r--package/gpsd/Makefile2
-rw-r--r--package/grep/Makefile2
-rw-r--r--package/haserl/Makefile2
-rw-r--r--package/hdparm/Makefile2
-rw-r--r--package/heimdal/Makefile2
-rw-r--r--package/heyu/Makefile2
-rw-r--r--package/hostapd/Makefile2
-rw-r--r--package/htpdate/Makefile2
-rw-r--r--package/httptunnel/Makefile2
-rw-r--r--package/icecast/Makefile2
-rw-r--r--package/igmpproxy/Makefile2
-rw-r--r--package/iproute2/Makefile2
-rw-r--r--package/ipsec-tools/Makefile2
-rw-r--r--package/ipset/Makefile2
-rw-r--r--package/iptables-snmp/Makefile2
-rw-r--r--package/iptables/Makefile2
-rw-r--r--package/irssi/Makefile2
-rw-r--r--package/iw/Makefile2
-rw-r--r--package/jamvm/Makefile2
-rw-r--r--package/kismet/Makefile1
-rw-r--r--package/knock/Makefile2
-rw-r--r--package/krb5/Makefile2
-rw-r--r--package/l2tpns/Makefile2
-rw-r--r--package/lame/Makefile2
-rw-r--r--package/less/Makefile2
-rw-r--r--package/libICE/Makefile2
-rw-r--r--package/libSM/Makefile2
-rw-r--r--package/libX11/Makefile2
-rw-r--r--package/libXau/Makefile2
-rw-r--r--package/libXaw/Makefile2
-rw-r--r--package/libXdmcp/Makefile2
-rw-r--r--package/libXext/Makefile2
-rw-r--r--package/libXfont/Makefile2
-rw-r--r--package/libXft/Makefile2
-rw-r--r--package/libXmu/Makefile2
-rw-r--r--package/libXpm/Makefile2
-rw-r--r--package/libXrender/Makefile2
-rw-r--r--package/libXt/Makefile2
-rw-r--r--package/libXv/Makefile2
-rw-r--r--package/libXxf86dga/Makefile2
-rw-r--r--package/libfontenc/Makefile2
-rw-r--r--package/libpciaccess/Makefile2
-rw-r--r--package/libtool/Makefile2
-rw-r--r--package/libvirt/Makefile2
-rw-r--r--package/libxkbfile/Makefile2
-rw-r--r--package/lighttpd/Makefile2
-rw-r--r--package/links/Makefile2
-rw-r--r--package/linux-atm/Makefile2
-rw-r--r--package/lrzsz/Makefile2
-rw-r--r--package/lua/Makefile2
-rw-r--r--package/lvm/Makefile2
-rw-r--r--package/lynx/Makefile2
-rw-r--r--package/m4/Makefile2
-rwxr-xr-xpackage/macchanger/Makefile2
-rw-r--r--package/madplay/Makefile2
-rw-r--r--package/make/Makefile2
-rw-r--r--package/maradns/Makefile2
-rw-r--r--package/mdadm/Makefile2
-rw-r--r--package/miau/Makefile2
-rw-r--r--package/microperl/Makefile2
-rw-r--r--package/mini_httpd/Makefile2
-rw-r--r--package/mini_sendmail/Makefile2
-rw-r--r--package/miredo/Makefile2
-rw-r--r--package/moc/Makefile2
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mpg123/Makefile2
-rw-r--r--package/mplayer/Makefile2
-rw-r--r--package/mrd6/Makefile2
-rw-r--r--package/mt-daapd/Makefile2
-rw-r--r--package/mtd/Makefile2
-rw-r--r--package/mutt/Makefile2
-rw-r--r--package/mysql/Makefile2
-rw-r--r--package/nand/Makefile2
-rw-r--r--package/nano/Makefile2
-rw-r--r--package/ndisc/Makefile2
-rw-r--r--package/net-snmp/Makefile2
-rw-r--r--package/netstat-nat/Makefile2
-rw-r--r--package/nfs-utils/Makefile2
-rw-r--r--package/ntpclient/Makefile2
-rw-r--r--package/nut/Makefile2
-rw-r--r--package/olsrd/Makefile2
-rw-r--r--package/openct/Makefile2
-rw-r--r--package/openldap/Makefile2
-rw-r--r--package/openntpd/Makefile2
-rw-r--r--package/opensips/Makefile2
-rw-r--r--package/openssh/Makefile2
-rw-r--r--package/openssl/Makefile2
-rw-r--r--package/openswan/Makefile2
-rw-r--r--package/openvpn/Makefile2
-rw-r--r--package/oprofile/Makefile2
-rw-r--r--package/p54-firmware/Makefile2
-rw-r--r--package/p910nd/Makefile2
-rw-r--r--package/palantir/Makefile2
-rw-r--r--package/parprouted/Makefile2
-rw-r--r--package/parted/Makefile2
-rw-r--r--package/patch/Makefile2
-rw-r--r--package/pciutils/Makefile2
-rw-r--r--package/pdnsd/Makefile2
-rw-r--r--package/perl/Makefile2
-rw-r--r--package/php/Makefile2
-rw-r--r--package/picocom/Makefile2
-rw-r--r--package/pipacs/Makefile2
-rw-r--r--package/pixman/Makefile2
-rw-r--r--package/pmacct/Makefile2
-rw-r--r--package/portmap/Makefile2
-rw-r--r--package/portsentry/Makefile2
-rw-r--r--package/postgresql/Makefile2
-rw-r--r--package/ppp/Makefile2
-rw-r--r--package/pptp/Makefile2
-rw-r--r--package/pptpd/Makefile2
-rw-r--r--package/privoxy/Makefile2
-rw-r--r--package/procmail/Makefile2
-rw-r--r--package/proftpd/Makefile2
-rw-r--r--package/ptunnel/Makefile2
-rw-r--r--package/quagga/Makefile2
-rwxr-xr-xpackage/raddump/Makefile2
-rw-r--r--package/radvd/Makefile2
-rw-r--r--package/rarpd/Makefile2
-rw-r--r--package/rdate/Makefile2
-rw-r--r--package/reaim/Makefile2
-rw-r--r--package/rng-tools/Makefile2
-rw-r--r--package/rp-pppoe/Makefile2
-rw-r--r--package/rpcbind/Makefile2
-rw-r--r--package/rrs/Makefile2
-rw-r--r--package/rsync/Makefile2
-rw-r--r--package/rt61-firmware/Makefile2
-rw-r--r--package/rtorrent/Makefile2
-rw-r--r--package/ruby/Makefile2
-rw-r--r--package/rxvt-unicode/Makefile2
-rw-r--r--package/samba/Makefile2
-rw-r--r--package/scanlogd/Makefile2
-rw-r--r--package/serdisplib/Makefile2
-rw-r--r--package/setpwc/Makefile2
-rw-r--r--package/setserial/Makefile2
-rw-r--r--package/shat/Makefile2
-rw-r--r--package/shorewall-common/Makefile2
-rw-r--r--package/shorewall-shell/Makefile2
-rw-r--r--package/siproxd/Makefile2
-rw-r--r--package/sispmctl/Makefile2
-rw-r--r--package/snort/Makefile2
-rw-r--r--package/socat/Makefile2
-rw-r--r--package/sqlite/Makefile2
-rw-r--r--package/squid/Makefile2
-rw-r--r--package/srelay/Makefile2
-rw-r--r--package/ssltunnel/Makefile2
-rw-r--r--package/ssmtp/Makefile2
-rw-r--r--package/strace/Makefile2
-rw-r--r--package/tar/Makefile2
-rw-r--r--package/tcp_wrappers/Makefile2
-rw-r--r--package/tinc/Makefile2
-rw-r--r--package/tinyproxy/Makefile2
-rw-r--r--package/tmsnc/Makefile2
-rw-r--r--package/tntnet/Makefile2
-rw-r--r--package/tor/Makefile2
-rw-r--r--package/tptest/Makefile2
-rw-r--r--package/traceroute/Makefile2
-rw-r--r--package/udev/Makefile2
-rw-r--r--package/udp-broadcast-relay/Makefile2
-rw-r--r--package/ulogd/Makefile2
-rw-r--r--package/updatedd/Makefile2
-rw-r--r--package/usbutils/Makefile2
-rw-r--r--package/util-linux-ng/Makefile2
-rw-r--r--package/valgrind/Makefile2
-rwxr-xr-xpackage/vgp/Makefile2
-rw-r--r--package/vilistextum/Makefile2
-rw-r--r--package/vim/Makefile2
-rw-r--r--package/vnc-reflector/Makefile2
-rw-r--r--package/vnstat/Makefile2
-rw-r--r--package/vpnc/Makefile2
-rw-r--r--package/vrrpd/Makefile2
-rw-r--r--package/vsftpd/Makefile2
-rw-r--r--package/vtun/Makefile2
-rw-r--r--package/watchdog/Makefile2
-rw-r--r--package/wccpd/Makefile2
-rw-r--r--package/wdfs/Makefile2
-rw-r--r--package/wget/Makefile2
-rw-r--r--package/wifidog/Makefile2
-rw-r--r--package/wondershaper/Makefile2
-rw-r--r--package/wpa_supplicant/Makefile2
-rw-r--r--package/wput/Makefile2
-rw-r--r--package/xauth/Makefile2
-rw-r--r--package/xf86-input-evtouch/Makefile2
-rw-r--r--package/xf86-input-keyboard/Makefile2
-rw-r--r--package/xf86-input-mouse/Makefile2
-rw-r--r--package/xf86-video-cirrus/Makefile2
-rw-r--r--package/xf86-video-fbdev/Makefile2
-rw-r--r--package/xf86-video-geode/Makefile2
-rw-r--r--package/xf86-video-siliconmotion/Makefile2
-rw-r--r--package/xfsprogs/Makefile2
-rw-r--r--package/xinetd/Makefile2
-rw-r--r--package/xkbcomp/Makefile2
-rw-r--r--package/xkeyboard-config/Makefile2
-rw-r--r--package/xlsfonts/Makefile2
-rw-r--r--package/xorg-server/Makefile2
-rw-r--r--package/xtrans/Makefile2
-rw-r--r--package/xz/Makefile2
275 files changed, 275 insertions, 274 deletions
diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index cb519c5..f6a8934 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11rc2
PKG_RELEASE:= 1
PKG_MD5SUM:= 74e02d4f0704b3083a01feda66033449
PKG_DESCR:= IPv4/IPv6 tunnel proxy
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_DEPENDS:= kmod-ipv6
PKG_URL:= http://toxygen.net/6tunnel/
PKG_SITES:= http://toxygen.net/6tunnel/
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 50b2f00..5a82ff0 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 20070115
PKG_RELEASE:= 8
PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350
PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_DEPENDS:= kmod-ipv6 libpthread
PKG_URL:= http://www.sixxs.net
PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index ff8e99c..f1ae237 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= dafbfaf944ca9d523fde4bae86f0c067
PKG_DESCR:= set of tools for auditing wireless networks
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= libpthread libopenssl libpcap
PKG_BUILDDEP+= openssl libpcap
PKG_URL:= http://www.aircrack-ng.org
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 63ce6fa..74224b9 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.22
PKG_RELEASE:= 2
PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d
PKG_DESCR:= ALSA mixer utility
-PKG_SECTION:= utils
+PKG_SECTION:= multimedia
PKG_DEPENDS:= alsa-lib libpthread
PKG_BUILDDEP+= alsa-lib
PKG_URL:= http://www.alsa-project.org
diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index 3d0f31f..249f4b8 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d
PKG_DESCR:= Generates ARP responses for IP address ranges
-PKG_SECTION:= net
+PKG_SECTION:= route
PKG_DEPENDS:= libpcap libdnet libevent
PKG_BUILDDEP+= libpcap libdnet libevent
PKG_URL:= http://niels.xtdnet.nl/honeyd/
diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile
index bdad780..83584fb 100644
--- a/package/arpwatch/Makefile
+++ b/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
+PKG_SECTION:= net/security
PKG_DEPENDS:= libpcap
PKG_BUILDDEP+= libpcap
PKG_URL:= http://www-nrg.ee.lbl.gov
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 425683f..7ae7725 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.2.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 9d1f7bcf6833605ced4b2740d14bd576
PKG_DESCR:= Open Source PBX
-PKG_SECTION:= net
+PKG_SECTION:= phone
PKG_MULTI:= 1
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= libncurses libpthread libopenssl libcurl
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 81939a1..e009111 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82
PKG_DESCR:= TFTP client
-PKG_SECTION:= net
+PKG_SECTION:= dhcp
PKG_DEPENDS:= libreadline libncurses
PKG_BUILDDEP+= readline ncurses
PKG_URL:= http://freshmeat.net/projects/atftp
diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index 89a9f0d..d757e9c 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= aufs2-util
PKG_VERSION:= 130809
PKG_RELEASE:= 1
PKG_DESCR:= aufs2 utilities
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_URL:= http://aufs.sf.net/
PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd !netbsd
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index 3e40e7a..7526535 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.65
PKG_RELEASE:= 1
PKG_MD5SUM:= 46cfb40e0babf4c64f8325f03da81c9b
PKG_DESCR:= GNU autoconf
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/autoconf/
PKG_SITES:= ${MASTER_SITE_GNU:=autoconf/}
PKG_OPTS:= noscripts
diff --git a/package/automake/Makefile b/package/automake/Makefile
index 645d44f..58fbb19 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.10
PKG_RELEASE:= 3
PKG_MD5SUM:= 452163c32d061c53a7acc0e8c1b689ba
PKG_DESCR:= GNU automake
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_DEPENDS:= microperl
PKG_URL:= http://www.gnu.org/software/automake/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/autossh/Makefile b/package/autossh/Makefile
index d1bb28b..8f7a776 100644
--- a/package/autossh/Makefile
+++ b/package/autossh/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4b
PKG_RELEASE:= 1
PKG_MD5SUM:= 8f9aa006f6f69e912d3c2f504622d6f7
PKG_DESCR:= Automatically restart SSH sessions and tunnels
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= openssh-client
PKG_URL:= http://www.harding.motd.ca/autossh
PKG_SITES:= http://www.harding.motd.ca/autossh/
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index ec3cd6f..07a5422 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.25
PKG_RELEASE:= 1
PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e
PKG_DESCR:= mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
-PKG_SECTION:= net
+PKG_SECTION:= dhcp
PKG_DEPENDS:= libavahi libdaemon libexpat gettext
PKG_BUILDDEP+= libdaemon expat gdbm glib gettext
PKG_URL:= http://avahi.org
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index 3826139..0b2e60d 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 03471b5a5874e2ce86025f24b3fa0958
PKG_DESCR:= small embedded webserver
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libaxtls
PKG_URL:= http://axtls.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/}
diff --git a/package/bind/Makefile b/package/bind/Makefile
index eb6eb46..9186bdd 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 9.7.0
PKG_RELEASE:= 1
PKG_MD5SUM:= c245b5d1aa0a4f53d9538faa1efe2c3f
PKG_DESCR:= popular DNS server
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_DEPENDS:= libopenssl libbind libxml2
PKG_BUILDDEP+= openssl libxml2
PKG_URL:= https://www.isc.org/software/bind
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 3d54ff6..8bcda82 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/binutils/Makefile.inc
PKG_DESCR:= binary utilities (nm, objdump, ar, as, ..)
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_HOST_DEPENDS:= !cygwin
include ${TOPDIR}/mk/package.mk
diff --git a/package/bison/Makefile b/package/bison/Makefile
index 4c36f58..b3642d1 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c58aa1da418dc9704070872489e89bf5
PKG_DESCR:= GNU parser generator
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/bison
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index a0fbdab..223fdd6 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 26b9bfc5446bdf0e932e8074d117be67
PKG_DESCR:= IRC gateway to IM chat networks
-PKG_SECTION:= net
+PKG_SECTION:= chat
PKG_DEPENDS:= glib libiconv libopenssl
PKG_BUILDDEP+= glib libiconv openssl
PKG_URL:= http://www.bitlbee.org
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index b80a1c2..1eca258 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 0182fcac3a2b307113bbec34e5f1c673
PKG_DESCR:= Ethernet bridging tools
-PKG_SECTION:= net
+PKG_SECTION:= bridge
PKG_DEPENDS:= kmod-bridge
PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/}
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index c954587..fc15ee0 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 3c15a0c8d1d3ee1c46a1634d00617b1a
PKG_DESCR:= bzip2 compression utility
-PKG_SECTION:= utils
+PKG_SECTION:= archive
PKG_URL:= http://www.bzip.org
PKG_SITES:= http://www.bzip.org/1.0.5/
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index 90754fb..56ee67f 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 20090814
PKG_RELEASE:= 2
PKG_MD5SUM:= 307052c985bec7f9a00eb84293eef779
PKG_DESCR:= Collection of common CA certificates
-PKG_SECTION:= shells
+PKG_SECTION:= net/security
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/
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index b4baec4..d7bbad3 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b
PKG_DESCR:= Wireless LAN Access Point Controller
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= kmod-tun
PKG_URL:= http://www.chillispot.info
PKG_SITES= http://www.chillispot.info/download/
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 0e81c83..8062e75 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.9.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 31a63d8e3a796dee247024f70426ed1c
PKG_DESCR:= System statistics collection daemon
-PKG_SECTION:= console
+PKG_SECTION:= misc
PKG_DEPENDS:= libpthread
PKG_URL:= http://collectd.org
PKG_SITES:= http://collectd.org/files/
diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index 50816d4..a598ea0 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.32
PKG_RELEASE:= 1
PKG_MD5SUM:= db2452680c3d953631299e331daf49ef
PKG_DESCR:= 3G/GPRS datacard control tool
-PKG_SECTION:= console
+PKG_SECTION:= utils
PKG_URL:= http://sourceforge.net/projects/comgt
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=comgt/}
diff --git a/package/cpio/Makefile b/package/cpio/Makefile
index ed6b0b4..d6a31c0 100644
--- a/package/cpio/Makefile
+++ b/package/cpio/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.11
PKG_RELEASE:= 1
PKG_MD5SUM:= 1112bb6c45863468b5496ba128792f6c
PKG_DESCR:= copies files into or out of a cpio archive
-PKG_SECTION:= net
+PKG_SECTION:= archive
PKG_URL:= http://www.gnu.org/software/cpio/
PKG_SITES:= ${MASTER_SITE_GNU:=cpio/}
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index aad41b8..c21c89d 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= openssl
PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6
PKG_DESCR:= console-based BitTorrent client
-PKG_SECTION:= net
+PKG_SECTION:= p2p
PKG_URL:= http://www.rahul.net/dholmes/ctorrent
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dtorrent/}
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 13ed31d..24fcfa4 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= zlib
PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b
PKG_DESCR:= Common Unix Printing System
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= zlib libpthread
PKG_BUILDDEP+= zlib
PKG_URL:= http://www.cups.org
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 9f771de..f102ddb 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 7.19.7
PKG_RELEASE:= 1
PKG_MD5SUM:= ecb2e37e45c9933e2a963cabe03670ab
PKG_DESCR:= a client-side URL transfer tool
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_DEPENDS:= libcurl
PKG_BUILDDEP+= openssl zlib
PKG_URL:= http://curl.haxx.se
diff --git a/package/cutter/Makefile b/package/cutter/Makefile
index 91317e9..0cf8a1c 100755
--- a/package/cutter/Makefile
+++ b/package/cutter/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.03
PKG_RELEASE:= 1
PKG_MD5SUM:= 50093db9b64277643969ee75b83ebbd1
PKG_DESCR:= Abort TCP/IP connections routed over a firewall
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://www.lowth.com/cutter/software/
PKG_SITES:= http://www.lowth.com/cutter/software/
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 7a3e3f1..a21312e 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af
PKG_DESCR:= a collection of general-purpose C++ classes
-PKG_SECTION:= net
+PKG_SECTION:= libs
PKG_DEPENDS:= libiconv
PKG_BUILDDEP+= libiconv
PKG_URL:= http://www.tntnet.org
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index f48f2d2..4d69720 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.10.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a
PKG_DESCR:= web content filter proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_CXX:= DANSGUARDIAN
PKG_DEPENDS:= libpcre zlib
PKG_BUILDDEP+= pcre zlib
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index b6c0267..954f15c 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION= 1.3.3
PKG_RELEASE= 1
PKG_MD5SUM= 57def26e4d6d63527e01612d10fd0515
PKG_DESCR:= WebDAV filesystem
-PKG_SECTION:= admin
+PKG_SECTION:= net/fs
PKG_BUILDDEP+= libiconv neon
ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
PKG_BUILDDEP+= fuse
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 6612144..0dc44e8 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.24
PKG_RELEASE:= 1
PKG_MD5SUM:= 565346cecd9cfecf1463540c6086cc2c
PKG_DESCR:= DBUS library
-PKG_SECTION:= net
+PKG_SECTION:= libs
PKG_DEPENDS:= libexpat
PKG_BUILDDEP+= expat
PKG_URL:= http://dbus.freedesktop.org
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index 7069f2b..a54e216 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8
PKG_RELEASE:= 1
PKG_MD5SUM:= fb3670dee9f71af1e55ac5dcd64e213e
PKG_DESCR:= DHCP relay agent
-PKG_SECTION:= net
+PKG_SECTION:= dhcp
PKG_URL:= http://www.nongnu.org/dhcp-fwd
PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ \
http://ftp.cc.uoc.gr/mirrors/nongnu.org/dhcp-fwd/
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index 1b12e3a..d376984 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.1.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 38a74c89d8913b9b5f33737047623c18
PKG_DESCR:= ISC DHCP server
-PKG_SECTION:= net
+PKG_SECTION:= dhcp
PKG_URL:= https://www.isc.org/software/dhcp
PKG_SITES:= ftp://ftp.isc.org/isc/dhcp/
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile
index 1253b59..66fa3c9 100644
--- a/package/diffutils/Makefile
+++ b/package/diffutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.8.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 71f9c5ae19b60608f6c7f162da86a428
PKG_DESCR:= show differences between two files
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/diffutils/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 8bcb361..0348610 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.51
PKG_RELEASE:= 1
PKG_MD5SUM:= 97465261a6de5258a3c3edfe51ca16a4
PKG_DESCR:= A lightweight DNS and DHCP server
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_URL:= http://thekelleys.org.uk/dnsmasq
PKG_SITES:= http://thekelleys.org.uk/dnsmasq/
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index 8fcf39a..269f26c 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.9
PKG_RELEASE:= 1
PKG_MD5SUM:= bd273cf8aa6341c0b52cbac72050bcf4
PKG_DESCR:= Utilities to create and check MS-DOS FAT filesystems
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools
PKG_SITES:= http://www.daniel-baumann.ch/software/dosfstools/
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index a8a6c34..9bab810 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.10
PKG_RELEASE:= 1
PKG_MD5SUM:= b7d0081b17ff6afae85e8dc14157fa57
PKG_DESCR:= A minimal and secure imap server
-PKG_SECTION:= net
+PKG_SECTION:= mail
PKG_URL:= http://www.dovecot.org
PKG_SITES:= http://www.dovecot.org/releases/1.2/
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 2ab254c..00d9b24 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.52
PKG_RELEASE:= 2
PKG_MD5SUM:= 1c69ec674481d7745452f68f2ea5597e
PKG_DESCR:= SSH 2 server/client designed for embedded systems
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_URL:= http://matt.ucc.asn.au/dropbear
PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 2bc49ab..3d586d4 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.41.9
PKG_RELEASE:= 3
PKG_MD5SUM:= 52f60a9e19a02f142f5546f1b5681927
PKG_DESCR:= Ext2/3/4 filesystem utilities
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_DEPENDS:= libcom-err libuuid libblkid libpthread
PKG_URL:= http://e2fsprogs.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 7dafb0f..35339bb 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 0e0c20adf2bba6d91dbd0b74a1a38c33
PKG_DESCR:= ethernet bridging firewall tool
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://ebtables.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ebtables/}
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index a555a5d..80de78b 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11.7
PKG_RELEASE:= 3
PKG_MD5SUM:= 145c510cae41c204d0f23dce4bdd23ab
PKG_DESCR:= advanced text web browser
-PKG_SECTION:= text
+PKG_SECTION:= browser
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
PKG_URL:= http://elinks.or.cz/
diff --git a/package/esound/Makefile b/package/esound/Makefile
index 3b327bd..c0d31c2 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.41
PKG_RELEASE:= 2
PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688
PKG_DESCR:= Enlightened Sound Daemon
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libaudiofile
PKG_BUILDDEP+= libaudiofile
PKG_URL:= http://www.tux.org/~ricdude/EsounD.html
diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile
index 95b1a42..f98696a 100644
--- a/package/evilwm/Makefile
+++ b/package/evilwm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8fd9256c635cce2289b648a01d54202c
PKG_DESCR:= A minimalist window manager for the X Window System
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= libx11 libxext
PKG_BUILDDEP+= libX11 libXext
PKG_URL:= http://www.6809.org.uk/evilwm/
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 5614959..3b27882 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 55aec784e214037e61400287a55b5426
PKG_DESCR:= memory analysing client tool
-PKG_SECTION:= utils
+PKG_SECTION:= debug
PKG_DEPENDS:= kmod-exmap libreadline glib
PKG_BUILDDEP+= glib readline
PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/
diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile
index 73888a9..3bf09fc 100644
--- a/package/ez-ipupdate/Makefile
+++ b/package/ez-ipupdate/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.11b8
PKG_RELEASE:= 10
PKG_MD5SUM:= 000211add4c4845ffa4211841bff4fb0
PKG_DESCR:= a client for dynamic DNS services
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_URL:= http://ez-ipupdate.com
PKG_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ \
http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate/
diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile
index a5a6aa0..d7180e6 100644
--- a/package/fakeidentd/Makefile
+++ b/package/fakeidentd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5
PKG_RELEASE:= 1
PKG_MD5SUM:= ebf398bd1843a1fd8c71f5fcf4a6e4f7
PKG_DESCR:= A static, secure identd
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= http://distfiles.gentoo.org/distfiles/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index f22a409..6773ece 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 6.3.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 72c20ad2b9629f1a109668b05a84d823
PKG_DESCR:= fetch mail from a POP or IMAP server
-PKG_SECTION:= text
+PKG_SECTION:= mail
ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index a2d577f..82505bf 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.5
PKG_RELEASE:= 2
PKG_MD5SUM:= be8503f15c3b81ba00eb8379ca8dcf33
PKG_DESCR:= solution to record, convert and stream audio and video
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libfaad2
PKG_BUILDDEP+= faad2
PKG_URL:= http://www.ffmpeg.org
diff --git a/package/flex/Makefile b/package/flex/Makefile
index 8243715..d026b24 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.35
PKG_RELEASE:= 1
PKG_MD5SUM:= 201d3f38758d95436cbc64903386de0b
PKG_DESCR:= fast lexical analyzer
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_URL:= http://flex.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index 1e97fa6..47ce19f 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 93bd04e2fb348a0c48e13ab3933f2381
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_DEPENDS:= font-util
PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index a592753..3e12e5f 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= d22283daba10129643800d73f5496aab
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_DEPENDS:= font-util
PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index 3accee2..fc0b6c2 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= d9383b2ddda241a464343b7b4de370a9
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index 04e6f1a..645aac5 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 200b38e879dcbf922ca2a9f71ad44657
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index be19a95..8df46f8 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8fa38b7845c10ff83d6077a1e238b15b
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index cfb5b18..271fe18 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f36b68aabef2d57258131ce6136c6f50
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index 12582a8..e36e871 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= baea1bb10808857e595f13c6be9cbfbe
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index 122a0a9..3cba714 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 000da66f92370ac59e3df1b6719fdd9a
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index 5686976..a65b12d 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 823c3c2a1a2307bdca5961145e3db37d
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index 07b3edf..40f4cec 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f8e982bcaaed199fdac03e9fc12b2952
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index a6618b5..97e8ada 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 08722299c09753a5540a0752ec5b5fc7
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index f60f867..a864ef0 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 047eae4d061f17d96213c4e78f7abccb
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index cdd1632..d1f286a 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 171ebfd3733aeae3af91ad57d126d29d
PKG_DESCR:= font util
-PKG_SECTION:= libs
+PKG_SECTION:= x11/apps
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
index 74f1a8a..2a08c9b 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 785f2b6e8d6d0dafec08b8d4c54ae2e3
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
index 17d7db7..ae4cc7c 100644
--- a/package/freeradius-client/Makefile
+++ b/package/freeradius-client/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.6
PKG_RELEASE:= 1
PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7
PKG_DESCR:= RADIUS client
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
PKG_URL:= http://www.freeradius.org
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index b202f44..92313ca 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.8
PKG_RELEASE:= 1
PKG_MD5SUM:= aa2ae711387af144df7c351b28b8789c
PKG_DESCR:= a flexible RADIUS server
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_MULTI:= 1
PKG_DEPENDS:= libltdl libopenssl libpthread
PKG_BUILDDEP+= libtool openssl
diff --git a/package/frickin/Makefile b/package/frickin/Makefile
index 0c16037..b157448 100644
--- a/package/frickin/Makefile
+++ b/package/frickin/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3
PKG_RELEASE:= 9
PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f
PKG_DESCR:= PPTP proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index f2682d4..06d20ec 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 4879f06570d2225667534c37fea04213
PKG_DESCR:= Filesystem in Userspace (utilities)
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_DEPENDS:= kmod-fuse-fs
PKG_URL:= http://fuse.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index 38a1afc..cae136e 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11
PKG_RELEASE:= 1
PKG_MD5SUM:= a0fb49ccb6b910bdbd7e76a9960394e3
PKG_DESCR:= small non-forking webserver
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_DEPENDS:= libiconv
PKG_BUILDDEP+= libowfat libiconv
PKG_URL:= http://www.fefe.de/gatling/
diff --git a/package/gawk/Makefile b/package/gawk/Makefile
index a4d1bbb..29bd9d1 100644
--- a/package/gawk/Makefile
+++ b/package/gawk/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.7
PKG_RELEASE:= 1
PKG_MD5SUM:= a38d5dec19320ace01f1d16c8beb1363
PKG_DESCR:= GNU awk
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/gawk/
PKG_SITES:= ${MASTER_SITE_GNU:=gawk/}
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index b77895f..77e3463 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gcc/Makefile.inc
PKG_DESCR:= GNU compiler collection
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_OPTS:= noremove
PKG_DEPENDS:= libgmp mpfr
PKG_BUILDDEP+= gmp mpfr
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 1438ac0..07371ea 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_DESCR:= GNU debugger
-PKG_SECTION:= comp
+PKG_SECTION:= debug
PKG_DEPENDS:= libthread-db libncurses libiconv libexpat
PKG_BUILDDEP+= ncurses readline libiconv expat
PKG_TARGET_DEPENDS:= !foxboard !ag241
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 32ce9fd..391e53f 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_DESCR:= GNU debugger (small server)
-PKG_SECTION:= comp
+PKG_SECTION:= debug
PKG_DEPENDS:= libthread-db
PKG_TARGET_DEPENDS:= !foxboard
diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile
index 3718147..5ef0ed4 100644
--- a/package/gkrellmd/Makefile
+++ b/package/gkrellmd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.3.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 600f4daa395112ed19a3633deb0829ff
PKG_DESCR:= The GNU Krell Monitors Server
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= glib libpthread
PKG_BUILDDEP+= glib
PKG_URL:= http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index 11b830a..53ae836 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.13.0
PKG_RELEASE:= 1
PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3
PKG_DESCR:= An UPnP music media server
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= id3lib libupnp
PKG_BUILDDEP+= id3lib libupnp
PKG_URL:= http://www.gnu.org/software/gmediaserver
diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile
index 950b1ff..3f30ef3 100644
--- a/package/gnupg/Makefile
+++ b/package/gnupg/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 991faf66d3352ac1452acc393c430b23
PKG_DESCR:= Gnu Privacy Guard
-PKG_SECTION:= text
+PKG_SECTION:= crypto
PKG_DEPENDS:= libreadline libiconv
PKG_BUILDDEP+= readline libiconv
PKG_URL:= http://www.gnupg.org
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 4745d15..4a08508 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.8.5
PKG_RELEASE:= 1
PKG_MD5SUM:= e3b2788b79bfc82acbe717e3c54d4e92
PKG_DESCR:= GNU TLS library
-PKG_SECTION:= libs
+PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt libtasn1 zlib
PKG_BUILDDEP+= libgcrypt liblzo libtasn1 opencdk zlib ncurses
PKG_URL:= http://www.gnu.org/software/gnutls
diff --git a/package/gperf/Makefile b/package/gperf/Makefile
index eb60454..be2b4b4 100644
--- a/package/gperf/Makefile
+++ b/package/gperf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= c1f1db32fb6598d6a93e6e88796a8632
PKG_DESCR:= perfect hash function generator
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/gperf/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 1559343..a1ce891 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.92
PKG_RELEASE:= 1
PKG_MD5SUM:= 50b60d9f6dd51e001f4dfbaeb825c988
PKG_DESCR:= An interface daemon for GPS receivers
-PKG_SECTION:= net
+PKG_SECTION:= misc
PKG_DEPENDS:= libpthread
PKG_BUILDDEP+= ncurses
PKG_CXX:= GPSD
diff --git a/package/grep/Makefile b/package/grep/Makefile
index f548948..d608bd8 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.4
PKG_RELEASE:= 2
PKG_MD5SUM:= 92258031d98d4f12dfc6a6d24057e672
PKG_DESCR:= global search for a regular expression and print out matched lines
-PKG_SECTION:= text
+PKG_SECTION:= utils
PKG_URL:= http://www.gnu.org/software/grep/
PKG_SITES:= ftp://ftp.gnu.org/gnu/grep/
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index 8a44ad0..956c20c 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8.0
PKG_RELEASE:= 1
PKG_MD5SUM:= bd9195d086566f56634c0bcbbbcbebea
PKG_DESCR:= a CGI wrapper to embed shell scripts in HTML documents
-PKG_SECTION:= web
+PKG_SECTION:= lang
PKG_URL:= http://haserl.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=haserl/}
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index bf8ff39..da8933a 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 9.15
PKG_RELEASE:= 1
PKG_MD5SUM:= 0524dd10ad986285ff4eeb3507f7471c
PKG_DESCR:= get/set ATA drive parameters
-PKG_SECTION:= misc
+PKG_SECTION:= utils
PKG_URL:= http://sourceforge.net/projects/hdparm
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=hdparm/}
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 96e1e24..6065af4 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e
PKG_DESCR:= Kerberos 5 server
-PKG_SECTION:= net
+PKG_SECTION:= crypto
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= libheimdal libheimdal-client libncurses libcom-err
PKG_BUILDDEP+= openssl ncurses e2fsprogs
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index 78ab5e1..d52aa0a 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 9c7624b61ea39bbfa70336dc703cd5f1
PKG_DESCR:= X10 home automation control using the CM11A
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_DEPENDS:= setserial
PKG_URL:= http://heyu.tanj.com
PKG_SITES:= http://heyu.tanj.com/download/
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 14013c3..652876c 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 3c4f71a889803935c7eb40fac6539d7c
PKG_DESCR:= an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= libnl libopenssl
PKG_BUILDDEP+= libnl openssl
PKG_URL:= http://hostap.epitest.fi
diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index 39fcc7c..b39f97a 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= a3da5ad8965345eb734695c765010acf
PKG_DESCR:= an HTP (Hypertext Time Protocol) implementation
-PKG_SECTION:= net
+PKG_SECTION:= ntp
PKG_URL:= http://www.vervest.org/htp/
PKG_SITES:= http://www.clevervest.com/htp/archive/c/
diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile
index 8df81f5..134a207 100644
--- a/package/httptunnel/Makefile
+++ b/package/httptunnel/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 2a710f377c82ab4eb201458f7b9f99c5
PKG_DESCR:= http tunneling software
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_URL:= http://www.nocrew.org/software/httptunnel
PKG_SITES:= http://www.nocrew.org/software/httptunnel/
diff --git a/package/icecast/Makefile b/package/icecast/Makefile
index b762101..24e5c66 100644
--- a/package/icecast/Makefile
+++ b/package/icecast/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_BUILDDEP+= curl libvorbis libxml2 libxslt
PKG_MD5SUM:= ff516b3ccd2bcc31e68f460cd316093f
PKG_DESCR:= A streaming media server
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libcurl libvorbis libpthread libxml2 libxslt
PKG_URL:= http://www.icecast.org/
PKG_SITES:= http://downloads.us.xiph.org/releases/icecast/
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index 1855979..9e9e814 100644
--- a/package/igmpproxy/Makefile
+++ b/package/igmpproxy/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.1
PKG_RELEASE:= 2
PKG_MD5SUM:= c56f41ec195bc1fe016369bf74efc5a1
PKG_DESCR:= a simple dynamic Multicast Routing Daemon
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_URL:= http://sourceforge.net/projects/igmpproxy/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/}
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index f65a61e..6213b59 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.6.29-1
PKG_RELEASE:= 2
PKG_MD5SUM:= c1bc258a6c345905e79935ac7a3cc582
PKG_DESCR:= iproute2 routing control utility
-PKG_SECTION:= net
+PKG_SECTION:= route
ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),)
PKG_BUILDDEP+= linux-atm
endif
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 3bee75f..7a3649a 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 72861f005746ee27984b2ee715ecc629
PKG_DESCR:= IPsec management tools
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
PKG_URL:= http://ipsec-tools.sourceforge.net
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 0dfca4d..3fca4bd 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 92bb09883dd8a77ec5cfbff1c8932b15
PKG_DESCR:= Netfilter ip sets administration utility
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://ipset.netfilter.org
PKG_SITES:= http://ipset.netfilter.org/
diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile
index cebcfc0..eb5d1bc 100644
--- a/package/iptables-snmp/Makefile
+++ b/package/iptables-snmp/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= net-snmp
PKG_MD5SUM:= 8370d2f0c899461a053da491400119d1
PKG_DESCR:= iptables support for net-snmp
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://www.nobiscuit.com/iptables-snmp/
PKG_SITES:= http://www.nobiscuit.com/iptables-snmp/
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 4aa2d58..d185386 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.6
PKG_RELEASE:= 1
PKG_MD5SUM:= c67cf30e281a924def6426be0973df56
PKG_DESCR:= The netfilter firewalling software
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack
PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-nf-nat
PKG_DEPENDS+= kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index 820bb94..f14f051 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8.13
PKG_RELEASE:= 1
PKG_MD5SUM:= 0d6fc2203832b514eff014fffd574664
PKG_DESCR:= IRC text client
-PKG_SECTION:= text
+PKG_SECTION:= chat
PKG_DEPENDS:= glib libncurses
PKG_BUILDDEP+= glib ncurses
ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
diff --git a/package/iw/Makefile b/package/iw/Makefile
index 4d55ffd..69b8a28 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.19
PKG_RELEASE:= 1
PKG_MD5SUM:= 3b88743f9c6ce8a7e2f5fd7d18fdea42
PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211)
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= libnl
PKG_BUILDDEP+= libnl
PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 6f7262d..a459673 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176
PKG_DESCR:= A Java Virtual Machine (JVM) implementation
-PKG_SECTION:= misc
+PKG_SECTION:= lang
PKG_DEPENDS:= libffi zlib
PKG_BUILDDEP+= libffi zlib
PKG_URL:= http://jamvm.sourceforge.net
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index 319d4b2..bca6144 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -7,6 +7,7 @@ PKG_NAME:= kismet
PKG_VERSION:= 2010-01-R1
PKG_RELEASE:= 1
PKG_DESCR:= Kismet
+PKG_SECTION:= wifi
PKG_BUILDDEP+= libpcap ncurses
PKG_DEPENDS:= libpcap libncurses
PKG_MD5SUM:= a6d6edcf65d5bb2cb5de6472bcc16f19
diff --git a/package/knock/Makefile b/package/knock/Makefile
index cbfeb90..75c8055 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= ca09d61458974cff90a700aba6120891
PKG_DESCR:= A port-knocking client
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://www.zeroflux.org/projects/knock
PKG_BUILDDEP+= libpcap
PKG_SITES:= http://www.zeroflux.org/proj/knock/files/
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index b9efa2b..4515d35 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7
PKG_RELEASE:= 3
PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564
PKG_DESCR:= MIT kerberos server
-PKG_SECTION:= net
+PKG_SECTION:= crypto
PKG_DEPENDS:= libkrb5 libncurses libss libcom-err
PKG_BUILDDEP+= ncurses e2fsprogs
PKG_URL:= http://web.mit.edu/kerberos
diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile
index 677eca1..caae332 100644
--- a/package/l2tpns/Makefile
+++ b/package/l2tpns/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.21
PKG_RELEASE:= 1
PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c
PKG_DESCR:= A layer 2 tunneling protocol network server (LNS)
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libcli
PKG_BUILDDEP+= libcli
PKG_URL:= http://l2tpns.sourceforge.net/
diff --git a/package/lame/Makefile b/package/lame/Makefile
index 1488591..baaa3b9 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 398-2
PKG_RELEASE:= 1
PKG_MD5SUM:= 719dae0ee675d0c16e0e89952930ed35
PKG_DESCR:= LAME MP3 encoder
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libncurses
PKG_URL:= http://lame.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/}
diff --git a/package/less/Makefile b/package/less/Makefile
index 4b5d28b..bf3976e 100644
--- a/package/less/Makefile
+++ b/package/less/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 429
PKG_RELEASE:= 1
PKG_MD5SUM:= 206f2f13b9b0a35e45df660fcb6af31d
PKG_DESCR:= A text mode pager
-PKG_SECTION:= text
+PKG_SECTION:= pager
PKG_DEPENDS:= libncurses
PKG_BUILDDEP+= ncurses
PKG_URL:= http://www.greenwoodsoftware.com/less
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index 13fd7b3..2f15c75 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 4a8f09f15fc92196b91d61e2dc9afcea
PKG_DESCR:= Inter-Client Exchange library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= xtrans xproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index dfedcaa..26dc455 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libICE
PKG_MD5SUM:= 1ee90d479298e48df7bb86a7ccbe00c9
PKG_DESCR:= X11 Session Management library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_DEPENDS:= libuuid
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 866579c..e878ab1 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.2
PKG_RELEASE:= 1
PKG_MD5SUM:= b68aebbfcac1174c4c95d260e9369766
PKG_DESCR:= X11 client-side library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index bb57992..0f00fe0 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 1a421d9376f43596fe068ce209a70b84
PKG_DESCR:= X11 authorisation library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index 9b6481d..446687f 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libXext libXmu libXpm
PKG_MD5SUM:= 67662e6b2dceb2907159215c83364c5a
PKG_DESCR:= X11 Athena Widget library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index b525949..3309901 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= c3f1bce1affc7dfbc222145e00e1310e
PKG_DESCR:= X11 display manager control protocol library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 42e972a..0352e41 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libX11
PKG_MD5SUM:= 6b61b3f657befded8ae66e04085c413e
PKG_DESCR:= X client interface to extensions of the X protocol
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 49cd7e9..5f31218 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= bf134b9f79a7fc6507577bf5b6d4f412
PKG_DESCR:= X font Library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_DEPENDS:= libfreetype
PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc xtrans
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index c9e990a..637ba46 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 0a1e129b1d8b2d3905dc02a64255b781
PKG_DESCR:= X FreeType library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= libXrender
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index c208c65..0a776b0 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= f49e3587cdc299707da0786a681f9c05
PKG_DESCR:= miscellaneous utility functions for X libraries
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= libXt
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index 05170d5..1bdb466 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.5.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 2d81d6633e67ac5562e2fbee126b2897
PKG_DESCR:= common operation for the XPM pixmap format
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index 4fcfcd8..4d7ea64 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 1791473c18a83a333a048b72d719fc55
PKG_DESCR:= X11 rendering library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= renderproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 8f42e9c..b60390b 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 28f627c7a5ca08c2413ce91d21c177d8
PKG_DESCR:= X Toolkit Intrinsics
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= libSM
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 1317266..24cf35b 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libX11 videoproto libXext
PKG_MD5SUM:= 6ee98790de6b3cd470074e60057d5c5c
PKG_DESCR:= X11 Xvideo extensions
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile
index 15209dd..9596359 100644
--- a/package/libXxf86dga/Makefile
+++ b/package/libXxf86dga/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= ecb81708157e1a1eeaba0e124f0ade08
PKG_DESCR:= client library for the XFree86-DGA extension
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= xf86dgaproto libXext libXaw
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile
index 3b2238b..c9d2a55 100644
--- a/package/libfontenc/Makefile
+++ b/package/libfontenc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 0fa1988d08021225d18ced519a30d2b1
PKG_DESCR:= helps to deal with different encodings of fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP+= xproto zlib
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index 3b4e9a2..1e06f69 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 8f7ea197384e5ddd1c355f55e639f677
PKG_DESCR:= X.org libpciaccess library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/
include $(TOPDIR)/mk/package.mk
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 237d358..544b845 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.6b
PKG_RELEASE:= 1
PKG_MD5SUM:= 07da460450490148c6d2df0f21481a25
PKG_DESCR:= a generic dynamic object loading library
-PKG_SECTION:= libs
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/libtool
PKG_SITES:= ${MASTER_SITE_GNU:=libtool/}
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 52244a2..d28f0cd 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.4
PKG_RELEASE:= 2
PKG_MD5SUM:= 1645975662a326969d2f42d5c04574aa
PKG_DESCR:= virtualization API
-PKG_SECTION:= utils
+PKG_SECTION:= libs
PKG_DEPENDS:= libxml2 libgnutls python
PKG_BUILDDEP+= libxml2 gnutls python
PKG_URL:= http://www.libvirt.org/
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile
index bad3081..87e7922 100644
--- a/package/libxkbfile/Makefile
+++ b/package/libxkbfile/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
PKG_MD5SUM:= a1384a9a48430397aff236f97e26ed05
PKG_DESCR:= X11 keyboard configuration extension library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= kbproto libX11
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 0c6954b..2a422f5 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.25
PKG_RELEASE:= 1
PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704
PKG_DESCR:= a flexible and lightweight web server
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_DEPENDS:= libxml2 libsqlite libpcre
PKG_BUILDDEP+= pcre libxml2 sqlite
ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
diff --git a/package/links/Makefile b/package/links/Makefile
index 1c2c02b..a7b1b94 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= openssl libpng jpeg gpm
PKG_MD5SUM:= c9937f9ed0061f264973182f871fb667
PKG_DESCR:= web browser with console graphic support
-PKG_SECTION:= net
+PKG_SECTION:= browser
PKG_DEPENDS:= libpng libjpeg libtiff gpm libopenssl
PKG_URL:= http://links.twibright.com
PKG_SITES:= http://links.twibright.com/download/
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 227459d..6bee291 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 9560b0e1f410a05b849dfdab465dd758
PKG_DESCR:= ATM library and tools for Linux
-PKG_SECTION:= libs
+PKG_SECTION:= route
PKG_URL:= http://linux-atm.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/}
PKG_NOPARALLEL:= 1
diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile
index ba6d107..e6cb5ac 100644
--- a/package/lrzsz/Makefile
+++ b/package/lrzsz/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.12.20
PKG_RELEASE:= 1
PKG_MD5SUM:= b5ce6a74abc9b9eb2af94dffdfd372a4
PKG_DESCR:= X-Modem, Y-modem, Z-modem protocol handlers
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_URL:= http://www.ohse.de/uwe/software/lrzsz.html
PKG_SITES:= http://www.ohse.de/uwe/releases/
diff --git a/package/lua/Makefile b/package/lua/Makefile
index bafdadb..c214837 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= d0870f2de55d59c1c8419f36e8fac150
PKG_DESCR:= LUA programming language
-PKG_SECTION:= admin
+PKG_SECTION:= lang
PKG_URL:= http://www.lua.org
PKG_SITES:= http://www.lua.org/ftp/ \
http://ftp.gwdg.de/pub/languages/lua/ \
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 55cd405..bd0a702 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.02.62
PKG_RELEASE:= 1
PKG_MD5SUM:= 72e3d66dc42aaf67dca475196a113528
PKG_DESCR:= logical volume management
-PKG_SECTION:= misc
+PKG_SECTION:= fs
PKG_DEPENDS:= libdevmapper libncurses
PKG_URL:= http://sourceware.org/lvm2/
PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 16d56d0..ab9215b 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION= 2.8.7
PKG_RELEASE= 1
PKG_MD5SUM= 124253e635f7c76bdffc47b9d036c812
PKG_DESCR:= Standard text browser
-PKG_SECTION:= text
+PKG_SECTION:= browser
PKG_DEPENDS:= libncurses libopenssl zlib
PKG_BUILDDEP+= ncurses openssl zlib
PKG_URL:= http://lynx.isc.org/
diff --git a/package/m4/Makefile b/package/m4/Makefile
index 2f762d7..5fe318c 100644
--- a/package/m4/Makefile
+++ b/package/m4/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.13
PKG_RELEASE:= 1
PKG_MD5SUM:= e9e36108b5f9855a82ca4a07ebc0fd2e
PKG_DESCR:= macro processor
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/m4/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile
index 723c932..54c8f3b 100755
--- a/package/macchanger/Makefile
+++ b/package/macchanger/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 79b7cdaeca3d8ebafa764c4b0dd03ab7
PKG_DESCR:= utility for viewing/manipulating the MAC address
-PKG_SECTION:= sys
+PKG_SECTION:= admin
PKG_URL:= http://www.alobbs.com/macchanger
PKG_SITES:= ${MASTER_SITE_GNU:=macchanger/}
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index c052d61..852865e 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libid3tag libmad
PKG_MD5SUM:= 6814b47ceaa99880c754c5195aa1aac1
PKG_DESCR:= MPEG audio player in fixed point
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libid3tag libmad
PKG_URL:= http://www.underbit.com/products/mad
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \
diff --git a/package/make/Makefile b/package/make/Makefile
index 5d546c0..ab8a929 100644
--- a/package/make/Makefile
+++ b/package/make/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.81
PKG_RELEASE:= 1
PKG_MD5SUM:= a4e9494ac6dc3f6b0c5ff75c5d52abba
PKG_DESCR:= GNU make
-PKG_SECTION:= misc
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/make
PKG_SITES:= ${MASTER_SITE_GNU:=make/}
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index 235bd1e..f940c45 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.03
PKG_RELEASE:= 1
PKG_MD5SUM:= 9e715104234cc9bf01e2afaad27eb787
PKG_DESCR:= small and secure DNS server
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.maradns.org
diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile
index 217279c..b650954 100644
--- a/package/mdadm/Makefile
+++ b/package/mdadm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8bfeea282d21b5ef8e825122fb359457
PKG_DESCR:= tool for managing Linux Software RAID arrays
-PKG_SECTION:= utils
+PKG_SECTION:= fs
PKG_URL:= http://neil.brown.name/blog/mdadm
PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/raid/mdadm/}
diff --git a/package/miau/Makefile b/package/miau/Makefile
index 3d7f474..ef7f42d 100644
--- a/package/miau/Makefile
+++ b/package/miau/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 76f794889d47ad277c25e9c5bbddefa4
PKG_DESCR:= miau is an IRC-bouncer/proxy
-PKG_SECTION:= net
+PKG_SECTION:= chat
PKG_URL:= http://miau.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=miau/}
diff --git a/package/microperl/Makefile b/package/microperl/Makefile
index 82e54df..03626ae 100644
--- a/package/microperl/Makefile
+++ b/package/microperl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.10.0
PKG_RELEASE:= 3
PKG_MD5SUM:= d2c39b002ebfd2c3c5dba589365c5a71
PKG_DESCR:= Perl without operating-specific functions
-PKG_SECTION:= net
+PKG_SECTION:= lang
PKG_URL:= www.perl.org
PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ \
ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0/ \
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index 569fd98..c0221a7 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.19
PKG_RELEASE:= 10
PKG_MD5SUM:= 7c68293ad265ecfe2edea917912f6f1f
PKG_DESCR:= A small HTTP server
-PKG_SECTION:= net
+PKG_SECTION:= www
ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),)
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile
index 96aa193..d52b4f4 100644
--- a/package/mini_sendmail/Makefile
+++ b/package/mini_sendmail/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.6
PKG_RELEASE:= 1
PKG_MD5SUM:= fb1585d2ad81c519a26d83bfd783dee8
PKG_DESCR:= A small sendmail-compatible mail forwarder
-PKG_SECTION:= net
+PKG_SECTION:= mail
PKG_URL:= http://www.acme.com/software/mini_sendmail
PKG_SITES:= http://www.acme.com/software/mini_sendmail/
diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index a9ac0ca..fafce86 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.6
PKG_RELEASE:= 1
PKG_MD5SUM:= bf49c1ddc068746760787d0cf76e40de
PKG_DESCR:= A Teredo client and relay daemon
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
ifeq (${ADK_COMPILE_MIREDO_WITH_UCLIBCXX},y)
PKG_BUILDDEP+= uclibc++
endif
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 77cd7cf..ed7579e 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.0-alpha4
PKG_RELEASE:= 1
PKG_MD5SUM:= 2dd0cb6481d77fda09c58ec3154a21c0
PKG_DESCR:= console music player
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libmad libvorbis libcurl libflac ffmpeg libiconv
PKG_DEPENDS+= libncurses libid3tag
PKG_BUILDDEP+= ncurses libvorbis curl libmad flac ffmpeg libiconv
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 4325332..a98d0f1 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.15.8
PKG_RELEASE:= 3
PKG_MD5SUM:= 6680970274c389fd07e2b35721de1764
PKG_DESCR:= A music player daemon
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= glib libstdcxx
PKG_BUILDDEP+= glib
ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),)
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index ab54b4b..25c6f94 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.10.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 0005c9a89c381484e2d2ff450b3dfe5e
PKG_DESCR:= mp3 console player
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libpthread alsa-lib libltdl
PKG_BUILDDEP+= alsa-lib
PKG_URL:= http://www.mpg123.de/
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 71e6190..d5f2abb 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0-29987
PKG_RELEASE:= 1
PKG_MD5SUM:= 416fa6a247987305d74572d03dc6dde7
PKG_DESCR:= popular video player
-PKG_SECTION:= video
+PKG_SECTION:= multimedia
PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses
PKG_DEPENDS+= libogg libpng libpthread libvorbis
PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index d495ff1..3f2dc9a 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b
PKG_DESCR:= IPv6 multicast routing daemon
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_CXX:= MRD6
PKG_DEPENDS:= kmod-ipv6
PKG_SITES:= http://www.openadk.org/distfiles/
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index ce223bc..6f0e22f 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8117141e8a88bfab54fe98b6bbd5cb3a
PKG_DESCR:= a multi-threaded DAAP daemon
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libgdbm libid3tag libpthread
PKG_BUILDDEP+= gdbm libid3tag
PKG_URL:= http://www.fireflymediaserver.org
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index 800d69f..7a186a3 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= mtd
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_DESCR:= MTD utility
-PKG_SECTION:= base
+PKG_SECTION:= fs
PKG_TARGET_DEPENDS:= ag241 foxboard
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index f68fc65..110db51 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.20
PKG_RELEASE:= 1
PKG_MD5SUM:= 027cdd9959203de0c3c64149a7ee351c
PKG_DESCR:= Mail text client
-PKG_SECTION:= text
+PKG_SECTION:= mail
PKG_DEPENDS:= libncurses libopenssl
PKG_BUILDDEP+= ncurses openssl
PKG_URL:= http://www.mutt.org
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index b1a9eb3..c0cce10 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.1.41
PKG_RELEASE:= 1
PKG_MD5SUM:= b5d39e8789174753f3c782959729e68c
PKG_DESCR:= MySQL client library
-PKG_SECTION:= libs
+PKG_SECTION:= db
PKG_DEPENDS:= libncurses zlib
PKG_BUILDDEP+= ncurses zlib readline
PKG_URL:= http://www.mysql.com
diff --git a/package/nand/Makefile b/package/nand/Makefile
index 0cd95f4..33f9ddc 100644
--- a/package/nand/Makefile
+++ b/package/nand/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= nand
PKG_VERSION:= 1.0
PKG_RELEASE:= 3
PKG_DESCR:= NAND utility
-PKG_SECTION:= base
+PKG_SECTION:= fs
PKG_TARGET_DEPENDS:= routerboard
diff --git a/package/nano/Makefile b/package/nano/Makefile
index 088ad4c..d20eb31 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 2be94dc43fb60fff4626a2401a977220
PKG_DESCR:= An enhanced clone of the Pico text editor
-PKG_SECTION:= admin
+PKG_SECTION:= editor
PKG_DEPENDS:= libncurses
PKG_BUILDDEP+= ncurses
PKG_URL:= http://www.nano-editor.org
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile
index e191474..bf60a60 100644
--- a/package/ndisc/Makefile
+++ b/package/ndisc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.8
PKG_RELEASE:= 1
PKG_MD5SUM:= cb8d70564b8d40aae95e19592c6be183
PKG_DESCR:= ICMPv6 Neighbour Discovery tools
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_URL:= http://www.remlab.net
PKG_SITES:= http://www.remlab.net/files/ndisc6/
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 4b454fb..cc4a8b5 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 5b2551e7bd024fbbee84dca22a5f13a1
PKG_DESCR:= SNMP Agent
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libnetsnmp libelf
PKG_BUILDDEP+= libelf
PKG_NOPARALLEL:= 1
diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile
index 2fa7d55..cc39286 100644
--- a/package/netstat-nat/Makefile
+++ b/package/netstat-nat/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 45e8d0f47623f619c22a6b894cd03cbc
PKG_DESCR:= a netstat variant for NAT connections
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://www.tweegy.nl/projects/netstat-nat/index.html
PKG_SITES:= http://www.tweegy.nl/download/
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 78017c6..849cd1d 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 2
PKG_MD5SUM:= c3ccd16c147befd49fe4541a506dd177
PKG_DESCR:= Utilities for NFS kernel server implementation
-PKG_SECTION:= net
+PKG_SECTION:= net/fs
PKG_DEPENDS:= kmod-nfsd
ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile
index 8e0a624..03a8f8d 100644
--- a/package/ntpclient/Makefile
+++ b/package/ntpclient/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2007_365
PKG_RELEASE:= 1
PKG_MD5SUM:= cb98711f11769cdd22fc592844cef414
PKG_DESCR:= NTP client for setting system time from NTP servers
-PKG_SECTION:= net
+PKG_SECTION:= ntp
PKG_URL:= http://doolittle.icarus.com/ntpclient
PKG_SITES:= http://doolittle.icarus.com/ntpclient/
diff --git a/package/nut/Makefile b/package/nut/Makefile
index e06a578..76c094c 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66
PKG_DESCR:= Network UPS Tools
-PKG_SECTION:= sys
+PKG_SECTION:= net/misc
ifneq (${ADK_PACKAGE_NUT_SSL},)
PKG_DEPENDS+= libopenssl
PKG_BUILDDEP+= openssl
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index 04923ea..566a30f 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.5.6-r2
PKG_RELEASE:= 1
PKG_MD5SUM:= acf15dbd0af521a6826541b567c6473a
PKG_DESCR:= Optimized Link State Routing protocol
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_MULTI:= 1
PKG_URL:= http://www.olsr.org
PKG_SITES:= http://www.olsr.org/releases/0.5/
diff --git a/package/openct/Makefile b/package/openct/Makefile
index 48a23ba..a3626e7 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libtool libusb
PKG_MD5SUM:= d8d8c63269985303a303a218c4b953d7
PKG_DESCR:= drivers for several smart card readers
-PKG_SECTION:= libs
+PKG_SECTION:= crypto
PKG_DEPENDS:= libltdl libusb
PKG_URL:= http://www.opensc-project.org/openct
PKG_SITES:= http://www.opensc-project.org/files/openct/
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index db05887..c86dfe4 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.21
PKG_RELEASE:= 1
PKG_MD5SUM:= e7128c57b2bacd940e8906057c94ff26
PKG_DESCR:= OpenLDAP client libraries
-PKG_SECTION:= libs
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libopenssl libsasl2
PKG_BUILDDEP+= cyrus-sasl openssl libdb
PKG_URL:= http://www.openldap.org
diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
index 328559f..c2ddc7b 100644
--- a/package/openntpd/Makefile
+++ b/package/openntpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.9p1
PKG_RELEASE:= 18
PKG_MD5SUM:= afc34175f38d08867c1403d9008600b3
PKG_DESCR:= NTP server daemon
-PKG_SECTION:= net
+PKG_SECTION:= ntp
PKG_URL:= http://www.openntpd.org
PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenNTPD/ \
diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index 77e9ed9..a1cd008 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= e7e59910183ca8a213c76a7a80789ea1
PKG_DESCR:= a high-performance, configurable, free SIP server
-PKG_SECTION:= net
+PKG_SECTION:= phone
PKG_MULTI:= 1
PKG_VARIANT:= tls
PKG_DEPENDS:= libopenssl
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 1eb7209..0d7ace1 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.5p1
PKG_RELEASE:= 1
PKG_MD5SUM:= 88633408f4cb1eb11ec7e2ec58b519eb
PKG_DESCR:= OpenSSH server
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= zlib libopenssl libpthread
PKG_BUILDDEP+= zlib openssl
ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y)
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 319deda..008874c 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.8l
PKG_RELEASE:= 1
PKG_MD5SUM:= 05a0ece1372392a2cf310ebb96333025
PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries
-PKG_SECTION:= libs
+PKG_SECTION:= crypto
PKG_DEPENDS:= zlib
PKG_BUILDDEP+= zlib
PKG_URL:= http://www.openssl.org
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 6c0adce..2dfe411 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.6.24
PKG_RELEASE:= 1
PKG_MD5SUM:= 1c76b6982c05392f7c360afb92699661
PKG_DESCR:= IPSec software
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= ip libgmp
PKG_BUILDDEP+= gmp
PKG_URL:= http://www.openswan.org
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 330b251..7e116f0 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= b273ed2b5ec8616fb9834cde8634bce7
PKG_DESCR:= Open Source VPN solution using SSL
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= kmod-tun
ifeq ($(ADK_COMPILE_OPENVPN_WITH_OPENSSL),y)
PKG_DEPENDS+= libopenssl
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 9acd481..c54ef06 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 82b059379895cf125261d7d773465915
PKG_DESCR:= system-wide profiles
-PKG_SECTION:= utils
+PKG_SECTION:= debug
PKG_DEPENDS:= libpopt
PKG_BUILDDEP+= popt
PKG_URL:= http://oprofile.sourceforge.net
diff --git a/package/p54-firmware/Makefile b/package/p54-firmware/Makefile
index b845174..120f14d 100644
--- a/package/p54-firmware/Makefile
+++ b/package/p54-firmware/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8e8ab005a4f8f0123bcdc51bc25b47f6
PKG_DESCR:= firmware for USB prism54 wireless cards (isl3887)
-PKG_SECTION:= sys
+PKG_SECTION:= wifi
PKG_SITES:= http://daemonizer.de/prism54/prism54-fw/fw-usb/
DISTFILES:= 2.13.24.0.lm87.arm
diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile
index 433f7db..0de71ee 100644
--- a/package/p910nd/Makefile
+++ b/package/p910nd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7
PKG_RELEASE:= 10
PKG_MD5SUM:= 7bf752532d26c9106f8039db95df3a6b
PKG_DESCR:= A small non-spooling printer server
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://www.etherboot.org/p910nd
PKG_SITES:= http://www.etherboot.org/p910nd/
diff --git a/package/palantir/Makefile b/package/palantir/Makefile
index c6286f7..210dcdf 100644
--- a/package/palantir/Makefile
+++ b/package/palantir/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 3a5b1fb340857f6d8e357bf39b77583e
PKG_DESCR:= A multichannel interactive streaming solution
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libjpeg libpthread
PKG_BUILDDEP+= jpeg
PKG_URL:= http://www.fastpath.it/products/palantir
diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile
index 8771625..600d799 100644
--- a/package/parprouted/Makefile
+++ b/package/parprouted/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 570f5deaf09600df8f80f589de79ecdb
PKG_DESCR:= a proxy ARP daemon
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.hazard.maks.net/parprouted
PKG_SITES:= http://www.hazard.maks.net/parprouted/
diff --git a/package/parted/Makefile b/package/parted/Makefile
index b54746d..3d23727 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.9.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d
PKG_DESCR:= GNU parted
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_DEPENDS:= libuuid libreadline libdevmapper libpthread
PKG_BUILDDEP+= e2fsprogs lvm readline
PKG_URL:= http://www.gnu.org/software/parted/index.shtml
diff --git a/package/patch/Makefile b/package/patch/Makefile
index b5bf8b9..975da39 100644
--- a/package/patch/Makefile
+++ b/package/patch/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.9
PKG_RELEASE:= 1
PKG_MD5SUM:= dacfb618082f8d3a2194601193cf8716
PKG_DESCR:= GNU patch
-PKG_SECTION:= misc
+PKG_SECTION:= utils
PKG_URL:= http://www.gnu.org/software/patch
PKG_SITES:= ${MASTER_SITE_GNU:=patch/}
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index 816c583..688d83c 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= d07da501bb11e6af40acd036536c2e9a
PKG_DESCR:= PCI Utilities
-PKG_SECTION:= sys
+PKG_SECTION:= utils
PKG_DEPENDS:= zlib
PKG_BUILDDEP+= zlib
PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils
diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile
index 61db9b3..65b21be 100644
--- a/package/pdnsd/Makefile
+++ b/package/pdnsd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.7
PKG_RELEASE:= 3
PKG_MD5SUM:= 114b3b21b09b43cbfcccdde726b84c12
PKG_DESCR:= Proxy DNS server with permanent caching
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.phys.uu.nl/~rombouts/pdnsd.html
PKG_SITES:= http://www.phys.uu.nl/~rombouts/pdnsd/releases/
diff --git a/package/perl/Makefile b/package/perl/Makefile
index 3c997da..f666c76 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.10.0
PKG_RELEASE:= 1
PKG_MD5SUM:= d2c39b002ebfd2c3c5dba589365c5a71
PKG_DESCR:= Perl without operating-specific functions
-PKG_SECTION:= net
+PKG_SECTION:= lang
PKG_URL:= www.perl.org
PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ \
ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0/ \
diff --git a/package/php/Makefile b/package/php/Makefile
index d0e5c81..9bfe6d8 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.3.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 4480d7c6d6b4a86de7b8ec8f0c2d1871
PKG_DESCR:= PHP CLI
-PKG_SECTION:= net
+PKG_SECTION:= lang
PKG_MULTI:= 1
PKG_DEPENDS:= libopenssl zlib
PKG_BUILDDEP+= openssl zlib
diff --git a/package/picocom/Makefile b/package/picocom/Makefile
index 8fc72b8..9b33eaf 100644
--- a/package/picocom/Makefile
+++ b/package/picocom/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 08fcc5f6bb9e7676a2569386d5ea9f70
PKG_DESCR:= minimal dumb-terminal emulation program
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_URL:= http://efault.net/npat/hacks/picocom
PKG_SITES:= http://efault.net/npat/hacks/picocom/dist/
diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile
index 06348ba..612771d 100644
--- a/package/pipacs/Makefile
+++ b/package/pipacs/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= pipacs
PKG_RELEASE:= 2
PKG_DESCR:= an UNIX socket accounting/wiewer program
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
NO_DISTFILES:= 1
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index 247baab..d79684b 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.16.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 02bd3669f53c404c19980d5efb6f86fb
PKG_DESCR:= Pixel manipulation library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= http://www.cairographics.org/releases/
ifeq ($(ADK_STATIC),y)
diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile
index c48e92d..cb92cbe 100644
--- a/package/pmacct/Makefile
+++ b/package/pmacct/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11.6
PKG_RELEASE:= 1
PKG_MD5SUM:= e0f3bcba9a73b7a70bbf5a303cd22f77
PKG_DESCR:= IP accounting daemons
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libpcap
PKG_BUILDDEP+= libpcap
ifneq ($(ADK_COMPILE_PMACCT_MYSQL),)
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index 229143a..28f3e4b 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= ac108ab68bf0f34477f8317791aaf1ff
PKG_DESCR:= RPC portmapper
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
PKG_DEPENDS:= libwrap
PKG_BUILDDEP+= tcp_wrappers
diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile
index baab746..ef2d0d7 100644
--- a/package/portsentry/Makefile
+++ b/package/portsentry/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 3ebd3618ba9abfea2525e236bd44cebd
PKG_DESCR:= Software for protection against port scans
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_URL:= http://sourceforge.net/projects/sentrytools
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sentrytools/}
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 3f89ddf..832b134 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 8.3.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 6e36f3b4dd27ae0c352376ea9f843de2
PKG_DESCR:= PostgreSQL database library
-PKG_SECTION:= libs
+PKG_SECTION:= db
PKG_BUILDDEP+= zlib
PKG_URL:= http://www.postgresql.org
PKG_SITES:= ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ \
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 2d38f6a..278968a 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.4
PKG_RELEASE:= 18
PKG_MD5SUM:= 183800762e266132218b204dfb428d29
PKG_DESCR:= Point-to-Point Protocol software
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_MULTI:= 1
PKG_DEPENDS:= kmod-ppp
PKG_URL:= http://ppp.samba.org
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 6c1700a..c68d509 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.0
PKG_RELEASE:= 3
PKG_MD5SUM:= 9a706327fb9827541d7c86d48ceb9631
PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) client
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= ppp kmod-net-ipgre
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/}
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index fdd8231..8930056 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.4
PKG_RELEASE:= 1
PKG_MD5SUM:= b38df9c431041922c997c1148bedf591
PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) server
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= ppp kmod-crypto kmod-mppe kmod-ppp
PKG_URL:= http://www.poptop.org
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/}
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index 0133920..bfc1373 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_VARIANT:= beta
PKG_MD5SUM:= 6571dc9524e945e79c2af62fefe7b107
PKG_DESCR:= web proxy with advanced filtering capabilities
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libpthread libpcre
PKG_BUILDDEP+= pcre
PKG_URL:= http://www.privoxy.org
diff --git a/package/procmail/Makefile b/package/procmail/Makefile
index f8c3d25..dfea503 100644
--- a/package/procmail/Makefile
+++ b/package/procmail/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.22
PKG_RELEASE:= 1
PKG_MD5SUM:= 1678ea99b973eb77eda4ecf6acae53f1
PKG_DESCR:= Mail processing tools
-PKG_SECTION:= text
+PKG_SECTION:= mail
PKG_URL:= http://www.procmail.org
PKG_SITES:= http://www.procmail.org/
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
index 840cde0..20f2e09 100644
--- a/package/proftpd/Makefile
+++ b/package/proftpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 97ad29f31f4fe633a9f8d021bab2df20
PKG_DESCR:= An advanced and very configurable FTP server
-PKG_SECTION:= utils
+PKG_SECTION:= www
PKG_NOPARALLEL:= 1
PKG_URL:= http://www.proftpd.org/
PKG_SITES:= ftp://ftp.proftpd.org/distrib/source/
diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile
index 4018ffa..85f30e5 100644
--- a/package/ptunnel/Makefile
+++ b/package/ptunnel/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.61
PKG_RELEASE:= 1
PKG_MD5SUM:= b45f73875f2af48f101816672f83a5fe
PKG_DESCR:= Tunnel TCP connections over ICMP packets
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libpcap libpthread
PKG_BUILDDEP+= libpcap
PKG_URL:= http://www.cti.ecp.fr/~beauxir5/ptunnel/
diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index 1c6e438..4af29f7 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= readline ncurses
PKG_MD5SUM:= 8975414c76a295f4855a417af0b5ddce
PKG_DESCR:= A routing software package
-PKG_SECTION:= net
+PKG_SECTION:= route
PKG_MULTI:= 1
PKG_URL:= http://www.quagga.net
PKG_SITES:= http://www.quagga.net/download/ \
diff --git a/package/raddump/Makefile b/package/raddump/Makefile
index d681a2f..19819b2 100755
--- a/package/raddump/Makefile
+++ b/package/raddump/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.3.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f8c29c67141ea78bb6ae8b97d5149480
PKG_DESCR:= interprets captured RADIUS packets
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= libpcap libopenssl
PKG_BUILDDEP+= openssl libpcap
PKG_URL:= http://sourceforge.net/projects/raddump
diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index 9ac4def..3f52ff9 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 78598b60ed9d64920739189c3dc0934d
PKG_DESCR:= Routing Advertisement Daemon for IPv6
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_DEPENDS:= kmod-ipv6
PKG_URL:= http://www.litech.org/radvd
PKG_SITES:= http://v6web.litech.org/radvd/dist/ \
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index a4faf0e..58eed45 100644
--- a/package/rarpd/Makefile
+++ b/package/rarpd/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 11
PKG_BUILDDEP+= libnet
PKG_MD5SUM:= 04e2ca849e758d0b88c8281775ec3b58
PKG_DESCR:= Reverse ARP Daemon
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libnet
PKG_SITES:= ftp://ftp.dementia.org/pub/net-tools/
diff --git a/package/rdate/Makefile b/package/rdate/Makefile
index fa5bde6..13bf70d 100644
--- a/package/rdate/Makefile
+++ b/package/rdate/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION= 20070817
PKG_RELEASE= 2
PKG_MD5SUM= 9a6489d7de4311678a3fab001bb503df
PKG_DESCR:= A small rdate and NTP client
-PKG_SECTION:= net
+PKG_SECTION:= ntp
PKG_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/rdate/}
WRKDIST= ${WRKDIR}/${PKG_NAME}
diff --git a/package/reaim/Makefile b/package/reaim/Makefile
index 2d06332..b06011d 100644
--- a/package/reaim/Makefile
+++ b/package/reaim/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8
PKG_RELEASE:= 9
PKG_MD5SUM:= 647d2ab72ec454f89294accfb3182c09
PKG_DESCR:= A transparent AIM / MSN proxy
-PKG_SECTION:= net
+PKG_SECTION:= chat
PKG_DEPENDS:= iptables
PKG_URL:= http://reaim.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/}
diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile
index 126de7f..dc56c66 100644
--- a/package/rng-tools/Makefile
+++ b/package/rng-tools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2
PKG_RELEASE:= 2
PKG_MD5SUM:= 63d503191eabed630324c104cc024475
PKG_DESCR:= Daemon to use hardware random number generators.
-PKG_SECTION:= utils
+PKG_SECTION:= crypto
PKG_URL:= http://gkernel.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/}
diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index a507e4a..29b480f 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.10
PKG_RELEASE:= 1
PKG_MD5SUM:= d58a13cc4185bca6121a606ff456dec0
PKG_DESCR:= PPPoE (PPP over Ethernet) tools
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= ppp
PKG_URL:= http://www.roaringpenguin.com
PKG_SITES:= http://www.roaringpenguin.com/files/download/
diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile
index ee939d0..a25bb02 100644
--- a/package/rpcbind/Makefile
+++ b/package/rpcbind/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 1a77ddb1aaea8099ab19c351eeb26316
PKG_DESCR:= converts RPC program numbers into universal addresses
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libtirpc
PKG_BUILDDEP+= libtirpc
PKG_URL:= http://sourceforge.net/projects/rpcbind/
diff --git a/package/rrs/Makefile b/package/rrs/Makefile
index 077943b..cd5144d 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.70
PKG_RELEASE:= 2
PKG_MD5SUM:= b400d03c0e39e3e78a7327ba78f789f0
PKG_DESCR:= A reverse (connecting) remote shell, with SSL support.
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_CXX:= RRS
PKG_BUILDDEP+= zlib
ifneq ($(ADK_PACKAGE_RRS),)
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index edc2bf4..b0ce107 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= b53525900817cf1ba7ad3a516ab5bfe9
PKG_DESCR:= utility that provides fast incremental file transfer
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libpopt
PKG_BUILDDEP+= popt
PKG_URL:= http://rsync.samba.org
diff --git a/package/rt61-firmware/Makefile b/package/rt61-firmware/Makefile
index 650dd9f..ea33868 100644
--- a/package/rt61-firmware/Makefile
+++ b/package/rt61-firmware/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1
PKG_RELEASE:= 1
PKG_MD5SUM:= d4c690c93b470bc9a681297c2adc6281
PKG_DESCR:= firmware for rt61/rt2601 wireless cards
-PKG_SECTION:= sys
+PKG_SECTION:= wifi
PKG_SITES:= http://www.ralinktech.com.tw/data/
DISTFILES:= RT61_Firmware_V1.2.zip
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index e7829d1..85f8282 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8.5
PKG_RELEASE:= 1
PKG_MD5SUM:= e701095e1824b7e512a17000f4c0a783
PKG_DESCR:= console torrent application
-PKG_SECTION:= net
+PKG_SECTION:= p2p
PKG_DEPENDS:= libncurses libtorrent libcurl
PKG_BUILDDEP+= ncurses libtorrent curl
PKG_URL:= http://libtorrent.rakshasa.no
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 21ec528..38651ec 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.9.1-p378
PKG_RELEASE:= 1
PKG_MD5SUM:= 9fc5941bda150ac0a33b299e1e53654c
PKG_DESCR:= interpreter for the ruby language
-PKG_SECTION:= net
+PKG_SECTION:= lang
PKG_NOPARALLEL:= 1
PKG_URL:= http://www.ruby-lang.org
PKG_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/1.9/
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index 5706fc5..b56e219 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 9.07
PKG_RELEASE:= 1
PKG_MD5SUM:= 49bb52c99e002bf85eb41d8385d903b5
PKG_DESCR:= x-term with unicode support
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= libx11 fontconfig libxft libxml2
PKG_BUILDDEP+= libX11 fontconfig libXft libxml2
PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html
diff --git a/package/samba/Makefile b/package/samba/Makefile
index e953e22..ac8d013 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.4.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 8e8a484782f2b7716b6c6bd9a7d2bf71
PKG_DESCR:= NetBIOS/SMB file and print server
-PKG_SECTION:= net
+PKG_SECTION:= net/fs
PKG_URL:= http://www.samba.org
PKG_SITES:= http://samba.org/samba/ftp/stable/
diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index b21bfa9..29bfad4 100644
--- a/package/scanlogd/Makefile
+++ b/package/scanlogd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.6
PKG_RELEASE:= 8
PKG_MD5SUM:= 7b8187ea718ebe47f22805b921b909ab
PKG_DESCR:= Portscan logger
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libpcap libnet libnids
PKG_BUILDDEP+= libpcap libnids libnet
PKG_URL:= http://www.openwall.com/scanlogd
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index 85d680f..3107667 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.97.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 2aa91c43d01d2dfc9fbc1116e3063ae1
PKG_DESCR:= display drivers (serial, parallel, USB)
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_BUILDDEP+= libgd libusb
PKG_URL:= http://serdisplib.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=serdisplib/}
diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile
index 4814b9a..9812340 100644
--- a/package/setpwc/Makefile
+++ b/package/setpwc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 1bc721cdfcbac24027e2afc93685d29f
PKG_DESCR:= Philips (and compatibles) WebCams (PWC) control utility
-PKG_SECTION:= admin
+PKG_SECTION:= multimedia
PKG_URL:= http://www.vanheusden.com/setpwc/
PKG_SITES:= http://www.vanheusden.com/setpwc/
diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index e95c9e6..2411332 100644
--- a/package/setserial/Makefile
+++ b/package/setserial/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.17
PKG_RELEASE:= 2
PKG_MD5SUM:= c4867d72c41564318e0107745eb7a0f2
PKG_DESCR:= configuration utility for serial ports
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=setserial/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/shat/Makefile b/package/shat/Makefile
index 164280e..6afe710 100644
--- a/package/shat/Makefile
+++ b/package/shat/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.7
PKG_RELEASE:= 1
PKG_MD5SUM:= da06846f35838b14d1513523dad84d24
PKG_DESCR:= Source Hardware Address Translation - a tool for nomadic routing
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=shat/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
index 5e311d3..552fe76 100644
--- a/package/shorewall-common/Makefile
+++ b/package/shorewall-common/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.0.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 2df43356b1fdbc91920d48c5595aa101
PKG_DESCR:= high-level netfilter configuration tool
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_DEPENDS:= iptables
PKG_URL:= http://www.shorewall.net
PKG_SITES:= http://www1.shorewall.net/pub/shorewall/4.0/shorewall-${PKG_VERSION}/
diff --git a/package/shorewall-shell/Makefile b/package/shorewall-shell/Makefile
index 21971a8..574458f 100644
--- a/package/shorewall-shell/Makefile
+++ b/package/shorewall-shell/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.0.14.1
PKG_RELEASE:= 1
PKG_MD5SUM:= ab61c2f3db82382351f432f783980fa7
PKG_DESCR:= shell compiler for shorewall
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://www.shorewall.net
PKG_SITES:= http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.14/
diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile
index 3fbf804..a5c56b8 100644
--- a/package/siproxd/Makefile
+++ b/package/siproxd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 45e5a44803181e2bf3361d562060c904
PKG_DESCR:= a SIP (Session Initiation Protocol) proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libosip2 libpthread
PKG_BUILDDEP+= libosip2
PKG_URL:= http://siproxd.sourceforge.net
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index 8c66000..fc2d678 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 2457f76cd129f880634f3381be0aeb76
PKG_DESCR:= control application for power sockets
-PKG_SECTION:= misc
+PKG_SECTION:= utils
PKG_DEPENDS:= libusb libusb-compat
PKG_BUILDDEP+= libusb libusb-compat
PKG_URL:= http://sispmctl.sourceforge.net
diff --git a/package/snort/Makefile b/package/snort/Makefile
index 4f9cee8..aa14d88 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.8.5.2
PKG_RELEASE:= 1
PKG_MD5SUM:= e6a8bc5aa1ebe4d2100533d7709c4a9e
PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS)
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= libnet libpcap libpcre
PKG_BUILDDEP+= libnet libpcap pcre
diff --git a/package/socat/Makefile b/package/socat/Makefile
index b264096..93dda9a 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.0.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 82967132b5a8ca4d07e54370fdcb2662
PKG_DESCR:= A multipurpose relay (SOcket CAT)
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libpthread libopenssl
PKG_BUILDDEP+= openssl
PKG_URL:= http://www.dest-unreach.org/socat
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index 97d0a75..69cf2a2 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.6.20
PKG_RELEASE:= 1
PKG_MD5SUM:= 0faf8fc8ccff5297513c6532b2b4ce23
PKG_DESCR:= Self-contained, embeddable, zero-configuration SQL database
-PKG_SECTION:= libs
+PKG_SECTION:= db
PKG_BUILDDEP+= ncurses readline
PKG_URL:= http://www.sqlite.org
PKG_SITES:= http://www.sqlite.org/
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 24dbef8..28104f2 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.STABLE20
PKG_RELEASE:= 3
PKG_MD5SUM:= b69577cfc5cfb6808ec426e3a933220d
PKG_DESCR:= squid web and cache proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libopenssl libpthread
PKG_BUILDDEP+= openssl
PKG_URL:= http://www.squid-cache.org
diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index bdda82b..561b1d6 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.7p3
PKG_RELEASE:= 1
PKG_MD5SUM:= 214ca8bc476c5e0eab54adb01972be6a
PKG_DESCR:= A socks 4/5 proxy server
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index 93825ae..7f497bc 100644
--- a/package/ssltunnel/Makefile
+++ b/package/ssltunnel/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.16
PKG_RELEASE:= 1
PKG_MD5SUM:= 4039b50566a33a4077883ea974e476d5
PKG_DESCR:= A PPP over SSL vpn tool
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libopenssl ppp
PKG_BUILDDEP+= openssl ppp
PKG_SITES:= http://www.hsc.fr/ressources/outils/ssltunnel/download/
diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile
index dc3ea50..99cf8ac 100644
--- a/package/ssmtp/Makefile
+++ b/package/ssmtp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.61
PKG_RELEASE:= 1
PKG_MD5SUM:= 957e6fff08625fe34f4fc33d0925bbc9
PKG_DESCR:= A minimal and secure mail sender
-PKG_SECTION:= net
+PKG_SECTION:= mail
PKG_SITES:= http://ftp.debian.org/debian/pool/main/s/ssmtp/
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 66e0e14..59cabfd 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.5.19
PKG_RELEASE:= 1
PKG_MD5SUM:= 2415e435d61e40315a298c80aced0cda
PKG_DESCR:= System call trace program
-PKG_SECTION:= misc
+PKG_SECTION:= debug
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/tar/Makefile b/package/tar/Makefile
index 380f885..b6a0813 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.22
PKG_RELEASE:= 1
PKG_MD5SUM:= efafad1b256e3de410f4fce5335d9c9d
PKG_DESCR:= GNU tar
-PKG_SECTION:= utils
+PKG_SECTION:= archive
PKG_URL:= http://mirrors.kernel.org/gnu/tar
PKG_SITES:= ftp://ftp.informatik.rwth-aachen.de/pub/gnu/tar/ \
http://mirrors.kernel.org/gnu/tar/
diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile
index 35fbf56..d04433f 100644
--- a/package/tcp_wrappers/Makefile
+++ b/package/tcp_wrappers/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 7.6
PKG_RELEASE:= 1
PKG_MD5SUM:= e6fa25f71226d090f34de3f6b122fb5a
PKG_DESCR:= IP based access control
-PKG_SECTION:= net
+PKG_SECTION:= libs
PKG_NOPARALLEL:= 1
PKG_SITES:= ftp://ftp.porcupine.org/pub/security/
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index 29b443a..895593f 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.11
PKG_RELEASE:= 1
PKG_MD5SUM:= ee0b1a3366c6e379cae34be6fa5dcb15
PKG_DESCR:= VPN tunnel daemon
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= zlib liblzo libopenssl kmod-tun
PKG_BUILDDEP+= zlib liblzo openssl
PKG_URL:= http://www.tinc-vpn.org
diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile
index 88f003d..d384eab 100644
--- a/package/tinyproxy/Makefile
+++ b/package/tinyproxy/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.5
PKG_RELEASE:= 2
PKG_MD5SUM:= 2b2862ba33d2939e4572688d442ba415
PKG_DESCR:= Tinyproxy is a lightweight HTTP and HTTPS proxy.
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_URL:= https://www.banu.com/tinyproxy
PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.6/
diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile
index 7d22319..73be4f1 100644
--- a/package/tmsnc/Makefile
+++ b/package/tmsnc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.3.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 337dae91d4775e03b6681f61db56d2a7
PKG_DESCR:= a textbased MSN client
-PKG_SECTION:= net
+PKG_SECTION:= chat
PKG_URL:= http://tmsnc.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tmsnc/}
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 183f4da..9f9f372 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.4
PKG_RELEASE:= 1
PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996
PKG_DESCR:= small C++ application server
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_DEPENDS:= cxxtools zlib libiconv libpthread
PKG_BUILDDEP+= cxxtools zlib libiconv
ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
diff --git a/package/tor/Makefile b/package/tor/Makefile
index b6e1fc0..41dde66 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.1.24
PKG_RELEASE:= 1
PKG_MD5SUM:= cb5629b2709ada82d34c22fef3ed77a9
PKG_DESCR:= An anonymous Internet communication system
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libevent libopenssl zlib libpthread
PKG_BUILDDEP+= libevent openssl zlib
PKG_URL:= http://tor.eff.org
diff --git a/package/tptest/Makefile b/package/tptest/Makefile
index 436fce4..2dad849 100644
--- a/package/tptest/Makefile
+++ b/package/tptest/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 46f941bdab738a2a11ecc2a5f757ec77
PKG_DESCR:= Internet bandwidth tester
-PKG_SECTION:= utils
+PKG_SECTION:= net
PKG_URL:= http://tptest.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tptest/}
diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile
index fbec995..a393f7a 100644
--- a/package/traceroute/Makefile
+++ b/package/traceroute/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.11
PKG_RELEASE:= 1
PKG_MD5SUM:= d400573042d41559fc3e5260275300d8
PKG_DESCR:= Utility to trace the route of IP packets
-PKG_SECTION:= utils
+PKG_SECTION:= net
PKG_URL:= http://traceroute.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=traceroute/}
diff --git a/package/udev/Makefile b/package/udev/Makefile
index d3c33b9..609106a 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 151
PKG_RELEASE:= 1
PKG_MD5SUM:= aeae0e6273dcbec246c3c1b9868ebed1
PKG_DESCR:= Dynamic device management subsystem
-PKG_SECTION:= base
+PKG_SECTION:= utils
PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/kernel/hotplug/}
diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile
index d2d4bd8..4ba2052 100644
--- a/package/udp-broadcast-relay/Makefile
+++ b/package/udp-broadcast-relay/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= a32f983b7063d6ac670e6b22be9b9d24
PKG_DESCR:= listens for packets on a specified UDP broadcast port
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://www.joachim-breitner.de/udp-broadcast-relay
PKG_SITES:= http://www.joachim-breitner.de/udp-broadcast-relay/files/
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index 535f202..344cee5 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.0beta3
PKG_RELEASE:= 1
PKG_MD5SUM:= be8137d3b7ae70ebbce7ca8852b9e901
PKG_DESCR:= Netfilter userspace logging daemon
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_MULTI:= 1
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= iptables libnetfilter_conntrack libnetfilter_log
diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile
index 6859dd6..a8779fc 100644
--- a/package/updatedd/Makefile
+++ b/package/updatedd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 95655596eb6e0e381d60a458f6a45fee
PKG_DESCR:= A tool to update dynamic dns services.
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_MULTI:= 1
PKG_SITES:= http://savannah.nongnu.org/download/updatedd/
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index d5d5d21..a539a11 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.86
PKG_RELEASE:= 1
PKG_MD5SUM:= 34979f675d2bcb3e1b45012fa830a53f
PKG_DESCR:= A program to list USB devices
-PKG_SECTION:= misc
+PKG_SECTION:= utils
PKG_DEPENDS:= libusb libusb-compat libpthread
PKG_BUILDDEP+= libusb libusb-compat
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-usb/}
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index 7e3c121..eea53ac 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.17
PKG_RELEASE:= 1
PKG_MD5SUM:= b4c0f196de2f583a4ed91d6f53ba2d88
PKG_DESCR:= Linux utilities
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_BUILDDEP+= e2fsprogs ncurses
PKG_URL:= http://userweb.kernel.org/~kzak/util-linux-ng
PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v${PKG_VERSION}/}
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index a7dfe28..24e9939 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.5.0
PKG_RELEASE:= 1
PKG_MD5SUM:= f03522a4687cf76c676c9494fcc0a517
PKG_DESCR:= memory management debugging
-PKG_SECTION:= utils
+PKG_SECTION:= debug
PKG_URL:= http://valgrind.org
PKG_SITES:= http://valgrind.org/downloads/
diff --git a/package/vgp/Makefile b/package/vgp/Makefile
index 616108c..f852be8 100755
--- a/package/vgp/Makefile
+++ b/package/vgp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= b8c25b5dfcb944f78bbc584be9c230c7
PKG_DESCR:= vgp is a daemon working like Cisco HSRP
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://vgpd.freaknet.org
PKG_SITES:= http://vgpd.freaknet.org/files/
diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile
index 0beb9ce..01202e9 100644
--- a/package/vilistextum/Makefile
+++ b/package/vilistextum/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libiconv
PKG_MD5SUM:= 5ba56ffdc56758da716bb46c3e0f517e
PKG_DESCR:= html to ascii converter
-PKG_SECTION:= text
+PKG_SECTION:= mail
PKG_DEPENDS:= libiconv
PKG_SITES:= http://bhaak.dyndns.org/${PKG_NAME}/
diff --git a/package/vim/Makefile b/package/vim/Makefile
index e27c76f..f3ad2cc 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE= 1
PKG_BUILDDEP+= ncurses
PKG_MD5SUM= f0901284b338e448bfd79ccca0041254
PKG_DESCR:= The text editor
-PKG_SECTION:= text
+PKG_SECTION:= editor
PKG_DEPENDS:= libncurses
PKG_URL:= http://www.vim.org
PKG_SITES= ftp://ftp.vim.org/pub/vim/unix/
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile
index 48158a8..7cdc7ba 100644
--- a/package/vnc-reflector/Makefile
+++ b/package/vnc-reflector/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= c3f88bc62f228b335c25c07f9744ab0c
PKG_DESCR:= specialized VNC server which acts as a proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libjpeg zlib
PKG_BUILDDEP+= jpeg zlib
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vnc-reflector/}
diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile
index 59f8809..5cd4349 100644
--- a/package/vnstat/Makefile
+++ b/package/vnstat/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 9184f79b5e60499bc059f670032291e5
PKG_DESCR:= Console-based network traffic monitor
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= http://humdi.net/vnstat/
include ${TOPDIR}/mk/package.mk
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index 24a5478..72fa694 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.5.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 4378f9551d5b077e1770bbe09995afb3
PKG_DESCR:= client for cisco3000 VPN Concentrator.
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libgcrypt libgpg-error kmod-tun
PKG_BUILDDEP+= libgcrypt libgpg-error
PKG_URL:= http://www.unix-ag.uni-kl.de/~massar/vpnc/
diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile
index cda1288..2c9aba5 100644
--- a/package/vrrpd/Makefile
+++ b/package/vrrpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 9
PKG_MD5SUM:= 6d5066ea1a6ced817376ca0f54765447
PKG_DESCR:= An implementation of the Virtual Router Redundancy Protocol
-PKG_SECTION:= net
+PKG_SECTION:= route
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vrrpd/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index c295af1..20a7184 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.0
PKG_RELEASE:= 1
PKG_MD5SUM:= e4eb190af270ae65d57a84274a38ec31
PKG_DESCR:= a fast and secure FTP server
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_URL:= http://vsftpd.beasts.org
PKG_SITES:= ftp://vsftpd.beasts.org/users/cevans/
diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index 194c948..781e54b 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c342ffe77055d4248a38f0b380f28c1b
PKG_DESCR:= A VPN tunnel daemon
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= zlib libopenssl liblzo kmod-tun
PKG_BUILDDEP+= zlib openssl liblzo
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/}
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index 14abf0c..b1813a0 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 31766450ecfc9aff70fe966c0b9df06d
PKG_DESCR:= watchdog daemon
-PKG_SECTION:= sys
+PKG_SECTION:= utils
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index 9763248..88c2efb 100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 5f15c274de61dfb88e0dbfc1ccbe6b67
PKG_DESCR:= A WCCP (Web Cache Coordination Protocol) server daemon
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=wccpd/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile
index bdc8ae8..2516986 100644
--- a/package/wdfs/Makefile
+++ b/package/wdfs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION= 1.4.2
PKG_RELEASE= 2
PKG_MD5SUM= 628bb44194d04c1cf8aacc446ed0a230
PKG_DESCR:= WebDAV filesystem
-PKG_SECTION:= net
+PKG_SECTION:= fs
PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse-fs neon glib
PKG_BUILDDEP+= openssl fuse neon glib
PKG_SITES= http://noedler.de/projekte/wdfs/
diff --git a/package/wget/Makefile b/package/wget/Makefile
index 8269ef5..03a9b62 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.11.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 69e8a7296c0e12c53bd9ffd786462e87
PKG_DESCR:= retrieving files using HTTP, HTTPS and FTP
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_URL:= http://www.gnu.org/software/wget/
PKG_SITES:= ${MASTER_SITE_GNU:=wget/}
diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile
index 9acd562..629982e 100644
--- a/package/wifidog/Makefile
+++ b/package/wifidog/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.5
PKG_RELEASE:= 1
PKG_MD5SUM:= abe5f7123179a0f08c493ce59fb3cb31
PKG_DESCR:= a complete and embeddable captive portal
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= iptables
PKG_URL:= http://dev.wifidog.org
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile
index 2e8fe6b..1a7d788 100644
--- a/package/wondershaper/Makefile
+++ b/package/wondershaper/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1a
PKG_RELEASE:= 7
PKG_MD5SUM:= bbc5a3a4485ab286e337ce8550e7b990
PKG_DESCR:= WonderShaper is a tc based traffic shaping tool.
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://lartc.org/wondershaper
PKG_SITES:= http://lartc.org/wondershaper/
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index a5b906c..dc16589 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 02c475f949e5c131856915bbb87fa55d
PKG_DESCR:= WPA Supplicant with support for WPA and WPA2
-PKG_SECTION:= net
+PKG_SECTION:= wifi
ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y)
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
diff --git a/package/wput/Makefile b/package/wput/Makefile
index fd9bc0c..74fdb16 100644
--- a/package/wput/Makefile
+++ b/package/wput/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 92b41efed4db8eb4f3443c23bf7ceecf
PKG_DESCR:= a wget-like command-line FTP client
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=wput/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
diff --git a/package/xauth/Makefile b/package/xauth/Makefile
index a12c62f..26ebb14 100644
--- a/package/xauth/Makefile
+++ b/package/xauth/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 2eb3cc3e4421e1b747c4ac16aac20cda
PKG_DESCR:= X authority file utility
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= libx11 libxext libxmu
PKG_BUILDDEP+= libX11 libXext libXmu
PKG_URL:= http://www.x.org
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
index 6dbab29..487ade6 100644
--- a/package/xf86-input-evtouch/Makefile
+++ b/package/xf86-input-evtouch/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 4d8e092356d8353002f60a4907046c13
PKG_DESCR:= X11 driver for touchscreen
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server kmod-input-evdev
PKG_BUILDDEP+= xorg-server
PKG_SITES:= http://www.conan.de/touchscreen/
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index be80953..9d24097 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.0
PKG_RELEASE:= 1
PKG_MD5SUM:= fc836be5364d80604cb11f4daacceb23
PKG_DESCR:= X11 driver for keyboard
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_BUILDDEP+= xorg-server
PKG_DEPENDS:= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 623364b..4c87d82 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.0
PKG_RELEASE:= 1
PKG_MD5SUM:= a662883fd9709c3dad7fb113ad8d2908
PKG_DESCR:= X11 driver for mouse
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index 22e4b24..742a62d 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= xorg-server
PKG_MD5SUM:= c63a29917c48d0c317445991fc36d09a
PKG_DESCR:= X11 driver for Cirrus VGA chips
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index ba05cf8..7da4c87 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c297e40b93b3636a72189cfac43d1a87
PKG_DESCR:= X11 driver for Linux Framebuffer devices
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index 837c769..7cb85e1 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.11.6
PKG_RELEASE:= 1
PKG_MD5SUM:= a673c0f88037d12fbb96d9fefc82785b
PKG_DESCR:= X11 driver for AMD Geode VGA chip
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index b984790..e372928 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 39da891cd368960443613e7a61398216
PKG_DESCR:= X11 driver for Silicon Motion VGA chips
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 30da515..25f22f8 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c2308b46ee707597ac50aae418d321b8
PKG_DESCR:= Utilities to create and check XFS filesystems
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_DEPENDS:= libuuid libpthread
PKG_BUILDDEP+= e2fsprogs
PKG_URL:= http://oss.sgi.com/projects/xfs
diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index 7147efb..868678b 100644
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.3.14
PKG_RELEASE:= 1
PKG_MD5SUM:= 567382d7972613090215c6c54f9b82d9
PKG_DESCR:= a powerful and secure superserver
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://www.xinetd.org
PKG_SITES:= http://www.xinetd.org/
diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile
index a52d749..0b7d94b 100644
--- a/package/xkbcomp/Makefile
+++ b/package/xkbcomp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 10e6661a35aa994a9aa73ded0cf70259
PKG_DESCR:= x11 keyboard compiler
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/
include $(TOPDIR)/mk/package.mk
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index 7f5f258..d0252dd 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= xkbcomp
PKG_MD5SUM:= c024a6e2a5b8c4ce3d9d1f1286466163
PKG_DESCR:= X keyboard config
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= http://xlibs.freedesktop.org/xkbdesc/
include $(TOPDIR)/mk/package.mk
diff --git a/package/xlsfonts/Makefile b/package/xlsfonts/Makefile
index d76e6c7..dcdd2cd 100644
--- a/package/xlsfonts/Makefile
+++ b/package/xlsfonts/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 7a6bee1512ccdef52fc519a86684891e
PKG_DESCR:= List X11 fonts
-PKG_SECTION:= libs
+PKG_SECTION:= x11/apps
PKG_URL:= http://www.x.org/
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/app/
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 00bfea2..02aa8f5 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.6
PKG_RELEASE:= 1
PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2
PKG_DESCR:= Xorg server
-PKG_SECTION:= x11
+PKG_SECTION:= x11/server
PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \
libfontenc xkeyboard-config xkbcomp libxau libxaw \
libxmu libxpm libxrender libxt libxxf86dga libxext \
diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile
index 7928210..90b8190 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.5
PKG_RELEASE:= 1
PKG_MD5SUM:= b2f47d49faf1f24e8294b624b21b9b93
PKG_DESCR:= X transport library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/xz/Makefile b/package/xz/Makefile
index 58d3379..05e762a 100644
--- a/package/xz/Makefile
+++ b/package/xz/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.999.9beta
PKG_RELEASE:= 1
PKG_MD5SUM:= f2073579b6da2fe35d453adee1aaf1b2
PKG_DESCR:= lzma compression utility
-PKG_SECTION:= net
+PKG_SECTION:= archive
PKG_URL:= http://tukaani.org/xz/
PKG_SITES:= http://tukaani.org/xz/