summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-29 09:40:49 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-29 19:56:31 (GMT)
commitf14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch)
tree7617315e619f969c13e79c1f44c2428871719357 /package
parent365261c9db442081290b7d21aba6201244af294d (diff)
resolve merge conflict
Diffstat (limited to 'package')
-rw-r--r--package/6tunnel/Makefile4
-rw-r--r--package/Config.in86
-rw-r--r--package/DirectFB/Makefile4
-rw-r--r--package/ImageMagick/Makefile10
-rw-r--r--package/MesaLib/Makefile4
-rw-r--r--package/SDL_gfx/Makefile4
-rw-r--r--package/SDL_ttf/Makefile4
-rw-r--r--package/adk-helper/Makefile2
-rw-r--r--package/adk-test-tools/Makefile2
-rw-r--r--package/adkinstall/Makefile4
-rw-r--r--package/aiccu/Makefile4
-rw-r--r--package/aircrack-ng/Makefile2
-rw-r--r--package/alix-switch/Makefile4
-rw-r--r--package/alix-temperature/Makefile2
-rw-r--r--package/alsa-lib/Makefile4
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/ant/Makefile4
-rw-r--r--package/apr-util/Makefile2
-rw-r--r--package/apr/Makefile4
-rw-r--r--package/arpd/Makefile4
-rw-r--r--package/arpwatch/Makefile2
-rw-r--r--package/asterisk/Makefile4
-rw-r--r--package/atftp/Makefile6
-rw-r--r--package/atk/Makefile4
-rw-r--r--package/autoconf/Makefile2
-rw-r--r--package/automake/Makefile4
-rw-r--r--package/autossh/Makefile2
-rw-r--r--package/autotool/Makefile2
-rw-r--r--package/avahi/Makefile6
-rw-r--r--package/axtls/Makefile6
-rw-r--r--package/b43-firmware/Makefile2
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/bash/Makefile4
-rw-r--r--package/bc/Makefile2
-rw-r--r--package/bcm2835-bootloader/Makefile2
-rw-r--r--package/bcm2835-vc/Makefile2
-rw-r--r--package/bdftopcf/Makefile4
-rw-r--r--package/beecrypt/Makefile2
-rw-r--r--package/bigreqsproto/Makefile4
-rw-r--r--package/bind/Makefile18
-rw-r--r--package/binutils/Makefile4
-rw-r--r--package/bison/Makefile2
-rw-r--r--package/bitlbee/Makefile4
-rw-r--r--package/bkeymaps/Makefile2
-rw-r--r--package/bluez-firmware/Makefile4
-rw-r--r--package/bluez/Makefile2
-rw-r--r--package/bogofilter/Makefile2
-rw-r--r--package/boost/Makefile4
-rw-r--r--package/boot-wrapper-aarch64/Makefile2
-rw-r--r--package/brcm-bluetooth/Makefile2
-rw-r--r--package/brcmfmac-firmware/Makefile2
-rw-r--r--package/bridge-utils/Makefile2
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/bwm/Makefile4
-rw-r--r--package/bzip2/Makefile4
-rw-r--r--package/bzr/Makefile4
-rw-r--r--package/ca-certificates/Makefile6
-rw-r--r--package/cairo/Makefile2
-rw-r--r--package/ccache/Makefile4
-rw-r--r--package/ccid/Makefile4
-rw-r--r--package/cdrtools/Makefile4
-rw-r--r--package/cfgfs/Makefile2
-rw-r--r--package/cgilib/Makefile4
-rw-r--r--package/check/Makefile4
-rw-r--r--package/cherokee/Makefile2
-rw-r--r--package/cherrypy/Makefile2
-rw-r--r--package/chillispot/Makefile4
-rw-r--r--package/cifs-utils/Makefile6
-rw-r--r--package/classpath/Makefile4
-rw-r--r--package/cmake/Makefile2
-rw-r--r--package/collectd/Makefile2
-rw-r--r--package/comgt/Makefile4
-rw-r--r--package/compositeproto/Makefile4
-rwxr-xr-xpackage/confuse/Makefile2
-rw-r--r--package/conntrack-tools/Makefile2
-rw-r--r--package/coreutils/Makefile2
-rw-r--r--package/cpio/Makefile2
-rw-r--r--package/cpufrequtils/Makefile4
-rw-r--r--package/cryptinit/Makefile2
-rw-r--r--package/cryptodev-linux/Makefile4
-rw-r--r--package/cryptsetup/Makefile4
-rwxr-xr-xpackage/ctorrent/Makefile4
-rw-r--r--package/cups/Makefile2
-rw-r--r--package/curl/Makefile16
-rwxr-xr-xpackage/cutter/Makefile6
-rw-r--r--package/cvs/Makefile2
-rw-r--r--package/cxxtools/Makefile4
-rw-r--r--package/cyrus-sasl/Makefile4
-rw-r--r--package/damageproto/Makefile4
-rw-r--r--package/dansguardian/Makefile2
-rw-r--r--package/daq/Makefile4
-rw-r--r--package/davfs2/Makefile2
-rw-r--r--package/db/Makefile2
-rw-r--r--package/dbus-glib/Makefile5
-rw-r--r--package/dbus-python/Makefile6
-rw-r--r--package/dbus/Makefile7
-rw-r--r--package/deco/Makefile4
-rw-r--r--package/dhcp-forwarder/Makefile4
-rw-r--r--package/dhcp/Makefile6
-rw-r--r--package/dialog/Makefile2
-rw-r--r--package/diffutils/Makefile2
-rw-r--r--package/digitemp/Makefile2
-rw-r--r--package/dmidecode/Makefile2
-rw-r--r--package/dnsmasq/Makefile4
-rw-r--r--package/dosfstools/Makefile2
-rw-r--r--package/dovecot/Makefile2
-rw-r--r--package/drbd/Makefile2
-rw-r--r--package/dri2proto/Makefile4
-rw-r--r--package/dri3proto/Makefile4
-rw-r--r--package/dropbear/Makefile6
-rw-r--r--package/dsniff/Makefile2
-rw-r--r--package/e2fsprogs/Makefile18
-rw-r--r--package/easy-rsa/Makefile2
-rw-r--r--package/ebtables/Makefile2
-rw-r--r--package/ecj/Makefile2
-rw-r--r--package/ed/Makefile2
-rw-r--r--package/elinks/Makefile2
-rw-r--r--package/esound/Makefile6
-rw-r--r--package/ether-wake/Makefile7
-rw-r--r--package/ethtool/Makefile2
-rw-r--r--package/eudev/Makefile8
-rw-r--r--package/eventlog/Makefile2
-rw-r--r--package/evieext/Makefile4
-rw-r--r--package/evilwm/Makefile2
-rw-r--r--package/exmap/Makefile2
-rw-r--r--package/expat/Makefile4
-rw-r--r--package/ez-ipupdate/Makefile4
-rw-r--r--package/faac/Makefile4
-rw-r--r--package/faad2/Makefile5
-rw-r--r--package/fakeidentd/Makefile4
-rw-r--r--package/fastjar/Makefile2
-rw-r--r--package/fbset/Makefile2
-rw-r--r--package/fbsplash/Makefile2
-rw-r--r--package/feh/Makefile2
-rw-r--r--package/fetchmail/Makefile4
-rw-r--r--package/ffmpeg/Makefile18
-rw-r--r--package/file/Makefile4
-rw-r--r--package/findutils/Makefile2
-rw-r--r--package/fixesproto/Makefile4
-rw-r--r--package/flac/Makefile2
-rw-r--r--package/flex/Makefile2
-rw-r--r--package/fltk/Makefile2
-rw-r--r--package/fluxbox/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/Makefile4
-rw-r--r--package/font-xfree86-type1/Makefile2
-rw-r--r--package/fontcacheproto/Makefile2
-rw-r--r--package/fontconfig/Makefile2
-rw-r--r--package/fontsproto/Makefile2
-rw-r--r--package/forked-daapd/Makefile4
-rw-r--r--package/fping/Makefile2
-rw-r--r--package/fprobe-ulog/Makefile4
-rw-r--r--package/fprobe/Makefile4
-rw-r--r--package/freeglut/Makefile4
-rw-r--r--package/freeradius-client/Makefile6
-rw-r--r--package/freeradius-server/Makefile4
-rw-r--r--package/freetype/Makefile2
-rw-r--r--package/fribidi/Makefile2
-rw-r--r--package/frickin/Makefile4
-rw-r--r--package/fuse/Makefile4
-rw-r--r--package/gatling/Makefile2
-rw-r--r--package/gawk/Makefile4
-rw-r--r--package/gcc/Makefile6
-rw-r--r--package/gcj/Makefile4
-rw-r--r--package/gconf/Makefile4
-rw-r--r--package/gdb/Makefile7
-rw-r--r--package/gdbm/Makefile2
-rw-r--r--package/gdbserver/Makefile2
-rw-r--r--package/gdk-pixbuf/Makefile4
-rw-r--r--package/genext2fs/Makefile4
-rw-r--r--package/gettext-tiny/Makefile4
-rw-r--r--package/giblib/Makefile2
-rw-r--r--package/giflib/Makefile4
-rw-r--r--package/git/Makefile2
-rw-r--r--package/gkrellm/Makefile2
-rw-r--r--package/glib/Makefile4
-rw-r--r--package/glibc/Makefile7
-rw-r--r--package/glproto/Makefile4
-rw-r--r--package/glu/Makefile4
-rw-r--r--package/gmediaserver/Makefile4
-rw-r--r--package/gmp/Makefile4
-rw-r--r--package/gnupg/Makefile2
-rw-r--r--package/gnutls/Makefile10
-rw-r--r--package/gperf/Makefile2
-rw-r--r--package/gpm/Makefile2
-rw-r--r--package/gpsd/Makefile4
-rw-r--r--package/grep/Makefile2
-rw-r--r--package/grub/Makefile6
-rw-r--r--package/gsm/Makefile8
-rw-r--r--package/gst-plugins-base/Makefile2
-rw-r--r--package/gstreamer/Makefile2
-rw-r--r--package/gtk+/Makefile6
-rw-r--r--package/gzip/Makefile2
-rw-r--r--package/harfbuzz/Makefile4
-rw-r--r--package/haserl/Makefile4
-rw-r--r--package/hdparm/Makefile4
-rw-r--r--package/heimdal/Makefile8
-rw-r--r--package/heirloom-cpio/Makefile2
-rw-r--r--package/heyu/Makefile4
-rw-r--r--package/hostapd/Makefile8
-rw-r--r--package/htop/Makefile2
-rw-r--r--package/htpdate/Makefile4
-rw-r--r--package/httping/Makefile4
-rw-r--r--package/huawei/Makefile4
-rw-r--r--package/i2c-tools/Makefile4
-rw-r--r--package/icecast/Makefile2
-rw-r--r--package/icu4c/Makefile2
-rw-r--r--package/id3lib/Makefile4
-rw-r--r--package/iftop/Makefile2
-rw-r--r--package/igmpproxy/Makefile2
-rw-r--r--package/imlib2/Makefile4
-rw-r--r--package/inputproto/Makefile4
-rw-r--r--package/intltool/Makefile2
-rw-r--r--package/ipcad/Makefile4
-rw-r--r--package/iperf/Makefile2
-rw-r--r--package/iproute2/Makefile20
-rw-r--r--package/ipsec-tools/Makefile2
-rw-r--r--package/ipset/Makefile2
-rw-r--r--package/iptables/Makefile2
-rw-r--r--package/iptraf/Makefile2
-rw-r--r--package/ipvsadm/Makefile4
-rw-r--r--package/irssi/Makefile4
-rw-r--r--package/iw/Makefile4
-rw-r--r--package/jack/Makefile4
-rw-r--r--package/jamvm/Makefile4
-rw-r--r--package/jikes/Makefile4
-rw-r--r--package/joe/Makefile6
-rw-r--r--package/json-c/Makefile4
-rw-r--r--package/json-glib/Makefile4
-rw-r--r--package/kbd/Makefile2
-rw-r--r--package/kbproto/Makefile4
-rw-r--r--package/kexec-tools/Makefile4
-rw-r--r--package/kexecinit/Makefile2
-rw-r--r--package/keychain/Makefile4
-rw-r--r--package/keyutils/Makefile2
-rw-r--r--package/kismet/Makefile10
-rw-r--r--package/kmod/Makefile2
-rw-r--r--package/knock/Makefile2
-rw-r--r--package/krb5/Makefile25
-rw-r--r--package/l2tpns/Makefile2
-rw-r--r--package/lame/Makefile8
-rw-r--r--package/less/Makefile2
-rw-r--r--package/libICE/Makefile2
-rw-r--r--package/libIDL/Makefile4
-rw-r--r--package/libSM/Makefile2
-rw-r--r--package/libX11/Makefile2
-rw-r--r--package/libXScrnSaver/Makefile2
-rw-r--r--package/libXau/Makefile2
-rw-r--r--package/libXaw/Makefile2
-rw-r--r--package/libXcomposite/Makefile2
-rw-r--r--package/libXcursor/Makefile2
-rw-r--r--package/libXdamage/Makefile2
-rw-r--r--package/libXdmcp/Makefile2
-rw-r--r--package/libXext/Makefile2
-rw-r--r--package/libXfixes/Makefile2
-rw-r--r--package/libXfont/Makefile2
-rw-r--r--package/libXft/Makefile2
-rw-r--r--package/libXi/Makefile2
-rw-r--r--package/libXinerama/Makefile2
-rw-r--r--package/libXmu/Makefile2
-rw-r--r--package/libXp/Makefile2
-rw-r--r--package/libXpm/Makefile2
-rw-r--r--package/libXrandr/Makefile2
-rw-r--r--package/libXrender/Makefile2
-rw-r--r--package/libXt/Makefile2
-rw-r--r--package/libXtst/Makefile2
-rw-r--r--package/libXv/Makefile2
-rw-r--r--package/libXxf86dga/Makefile2
-rw-r--r--package/libXxf86vm/Makefile2
-rw-r--r--package/libaio/Makefile4
-rwxr-xr-xpackage/libantlr3c/Makefile4
-rw-r--r--package/libao/Makefile2
-rw-r--r--package/libart/Makefile4
-rw-r--r--package/libass/Makefile4
-rw-r--r--package/libatomic_ops/Makefile2
-rw-r--r--package/libaudiofile/Makefile2
-rwxr-xr-xpackage/libavl/Makefile4
-rw-r--r--package/libbluray/Makefile2
-rw-r--r--package/libcap/Makefile2
-rw-r--r--package/libcapi20/Makefile4
-rw-r--r--package/libcdio/Makefile4
-rw-r--r--package/libcec/Makefile4
-rwxr-xr-xpackage/libcli/Makefile4
-rw-r--r--package/libcroco/Makefile4
-rw-r--r--package/libdaemon/Makefile4
-rw-r--r--package/libdnet/Makefile3
-rw-r--r--package/libdrm/Makefile4
-rw-r--r--package/libelf/Makefile2
-rw-r--r--package/libevent/Makefile2
-rw-r--r--package/libffi/Makefile4
-rw-r--r--package/libgc/Makefile2
-rw-r--r--package/libgcrypt/Makefile4
-rw-r--r--package/libgd/Makefile4
-rw-r--r--package/libglew/Makefile4
-rw-r--r--package/libgpg-error/Makefile2
-rw-r--r--package/libgssglue/Makefile4
-rw-r--r--package/libhugetlbfs/Makefile2
-rw-r--r--package/libiconv-tiny/Makefile3
-rw-r--r--package/libid3tag/Makefile4
-rw-r--r--package/libjansson/Makefile4
-rw-r--r--package/libjasper/Makefile4
-rw-r--r--package/libjpeg-turbo/Makefile4
-rw-r--r--package/libjson/Makefile4
-rw-r--r--package/liblzo/Makefile4
-rw-r--r--package/libmad/Makefile4
-rw-r--r--package/libmicrohttpd/Makefile4
-rw-r--r--package/libmms/Makefile2
-rw-r--r--package/libmnl/Makefile4
-rw-r--r--package/libmodplug/Makefile4
-rw-r--r--package/libmpc/Makefile4
-rw-r--r--package/libmpdclient/Makefile4
-rw-r--r--package/libmpeg2/Makefile4
-rw-r--r--package/libnet/Makefile2
-rw-r--r--package/libnetfilter_acct/Makefile4
-rw-r--r--package/libnetfilter_conntrack/Makefile4
-rw-r--r--package/libnetfilter_cthelper/Makefile4
-rw-r--r--package/libnetfilter_cttimeout/Makefile2
-rw-r--r--package/libnetfilter_log/Makefile4
-rw-r--r--package/libnetfilter_queue/Makefile4
-rw-r--r--package/libnettle/Makefile2
-rw-r--r--package/libnfnetlink/Makefile2
-rw-r--r--package/libnfs/Makefile4
-rw-r--r--package/libnfsidmap/Makefile4
-rw-r--r--package/libnids/Makefile2
-rw-r--r--package/libnl/Makefile2
-rw-r--r--package/libnotify/Makefile2
-rw-r--r--package/libogg/Makefile4
-rw-r--r--package/libosip2/Makefile4
-rw-r--r--package/libowfat/Makefile2
-rw-r--r--package/libp11/Makefile4
-rw-r--r--package/libpcap/Makefile4
-rw-r--r--package/libpciaccess/Makefile2
-rw-r--r--package/libpng/Makefile4
-rw-r--r--package/libpri/Makefile4
-rw-r--r--package/libpthread-stubs/Makefile4
-rw-r--r--package/libpthread/Makefile4
-rw-r--r--package/libqb/Makefile2
-rw-r--r--package/librpcsecgss/Makefile4
-rw-r--r--package/librsvg/Makefile4
-rw-r--r--package/librt/Makefile4
-rw-r--r--package/libsamplerate/Makefile2
-rw-r--r--package/libsecret/Makefile2
-rw-r--r--package/libshout/Makefile4
-rw-r--r--package/libsigc++/Makefile4
-rw-r--r--package/libsndfile/Makefile2
-rw-r--r--package/libsoup/Makefile4
-rw-r--r--package/libssh/Makefile4
-rw-r--r--package/libssh2/Makefile4
-rw-r--r--package/libssp/Makefile2
-rw-r--r--package/libstdcxx/Makefile4
-rw-r--r--package/libtasn1/Makefile4
-rw-r--r--package/libtheora/Makefile4
-rw-r--r--package/libthread_db/Makefile4
-rw-r--r--package/libtiff/Makefile4
-rw-r--r--package/libtirpc/Makefile4
-rw-r--r--package/libtool/Makefile4
-rw-r--r--package/libtorrent/Makefile2
-rwxr-xr-xpackage/libunistring/Makefile4
-rw-r--r--package/libupnp/Makefile5
-rw-r--r--package/libusb-compat/Makefile4
-rw-r--r--package/libusb/Makefile4
-rw-r--r--package/libvirt/Makefile4
-rw-r--r--package/libvorbis/Makefile4
-rw-r--r--package/libvorbisidec/Makefile4
-rw-r--r--package/libvpx/Makefile4
-rw-r--r--package/libwebp/Makefile2
-rw-r--r--package/libx264/Makefile4
-rw-r--r--package/libxcb/Makefile3
-rw-r--r--package/libxkbfile/Makefile2
-rw-r--r--package/libxml2/Makefile6
-rw-r--r--package/libxshmfence/Makefile2
-rw-r--r--package/libxslt/Makefile6
-rw-r--r--package/lighttpd/Makefile6
-rw-r--r--package/links/Makefile2
-rw-r--r--package/linux-atm/Makefile6
-rw-r--r--package/llvm/Makefile2
-rw-r--r--package/lm_sensors/Makefile6
-rw-r--r--package/log4cplus/Makefile4
-rw-r--r--package/log4cxx/Makefile4
-rw-r--r--package/logrotate/Makefile2
-rw-r--r--package/lrzsz/Makefile4
-rw-r--r--package/lsof/Makefile2
-rw-r--r--package/lsscsi/Makefile4
-rw-r--r--package/ltrace/Makefile2
-rw-r--r--package/lua/Makefile16
-rw-r--r--package/lvm/Makefile4
-rw-r--r--package/lynx/Makefile4
-rw-r--r--package/lzma/Makefile4
-rw-r--r--package/lzop/Makefile3
-rw-r--r--package/m4/Makefile2
-rwxr-xr-xpackage/macchanger/Makefile4
-rw-r--r--package/madplay/Makefile4
-rw-r--r--package/mailutils/Makefile4
-rw-r--r--package/make/Makefile4
-rw-r--r--package/maradns/Makefile2
-rw-r--r--package/mc/Makefile2
-rw-r--r--package/mdadm/Makefile4
-rw-r--r--package/mesa-demos/Makefile6
-rw-r--r--package/mgetty/Makefile2
-rw-r--r--package/miau/Makefile4
-rw-r--r--package/midori/Makefile2
-rw-r--r--package/mini_httpd/Makefile4
-rw-r--r--package/mini_sendmail/Makefile2
-rw-r--r--package/miredo/Makefile28
-rw-r--r--package/mkfontdir/Makefile2
-rw-r--r--package/mkfontscale/Makefile2
-rw-r--r--package/mkimage/Makefile2
-rw-r--r--package/mksh/Makefile4
-rw-r--r--package/moc/Makefile2
-rw-r--r--package/monit/Makefile2
-rw-r--r--package/motion/Makefile4
-rw-r--r--package/mpc/Makefile2
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mpdbox/Makefile4
-rw-r--r--package/mpfr/Makefile4
-rw-r--r--package/mpg123/Makefile2
-rw-r--r--package/mplayer/Makefile2
-rw-r--r--package/mrd6/Makefile4
-rw-r--r--package/mt-daapd/Makefile4
-rw-r--r--package/mtd-utils/Makefile2
-rw-r--r--package/mtd/Makefile6
-rw-r--r--package/mtr/Makefile4
-rw-r--r--package/musl/Makefile4
-rw-r--r--package/mutt/Makefile2
-rwxr-xr-xpackage/mxml/Makefile4
-rw-r--r--package/mysql/Makefile4
-rw-r--r--package/nand/Makefile6
-rw-r--r--package/nano/Makefile2
-rw-r--r--package/nasm/Makefile2
-rw-r--r--package/ncurses/Makefile2
-rw-r--r--package/ndisc/Makefile13
-rw-r--r--package/neon/Makefile4
-rw-r--r--package/net-snmp/Makefile10
-rw-r--r--package/net-tools/Makefile4
-rw-r--r--package/netcat/Makefile2
-rw-r--r--package/netperf/Makefile2
-rw-r--r--package/netstat-nat/Makefile4
-rw-r--r--package/nfs-utils/Makefile4
-rw-r--r--package/nginx/Makefile2
-rw-r--r--package/nmap/Makefile2
-rw-r--r--package/nspr/Makefile4
-rw-r--r--package/nss/Makefile4
-rw-r--r--package/ntfs-3g/Makefile2
-rw-r--r--package/ntpclient/Makefile4
-rw-r--r--package/nut/Makefile2
-rw-r--r--package/obexftp/Makefile6
-rw-r--r--package/olsrd/Makefile2
-rw-r--r--package/omxplayer/Makefile2
-rw-r--r--package/open-iscsi/Makefile4
-rw-r--r--package/openafs/Makefile2
-rw-r--r--package/openct/Makefile4
-rw-r--r--package/openjdk7/Makefile5
-rw-r--r--package/openldap/Makefile8
-rw-r--r--package/openntpd/Makefile4
-rw-r--r--package/openobex/Makefile4
-rw-r--r--package/opensc/Makefile4
-rw-r--r--package/opensips/Makefile4
-rw-r--r--package/openssl-pkcs11/Makefile2
-rw-r--r--package/openssl/Makefile8
-rw-r--r--package/openswan/Makefile2
-rw-r--r--package/openvpn/Makefile4
-rw-r--r--package/oprofile/Makefile2
-rw-r--r--package/opus/Makefile2
-rw-r--r--package/orbit2/Makefile4
-rw-r--r--package/owfs/Makefile2
-rw-r--r--package/p5-XML-Parser/Makefile4
-rw-r--r--package/p54-firmware/Makefile4
-rw-r--r--package/p910nd/Makefile2
-rw-r--r--package/pam/Makefile2
-rw-r--r--package/pango/Makefile2
-rw-r--r--package/parprouted/Makefile4
-rw-r--r--package/parted/Makefile2
-rw-r--r--package/patch/Makefile4
-rw-r--r--package/pcc-libs/Makefile4
-rw-r--r--package/pcc/Makefile4
-rw-r--r--package/pciutils/Makefile4
-rw-r--r--package/pcmciautils/Makefile4
-rw-r--r--package/pcre/Makefile4
-rw-r--r--package/pcrepp/Makefile4
-rw-r--r--package/pcsc-lite/Makefile2
-rw-r--r--package/pdnsd/Makefile4
-rw-r--r--package/perl/Makefile4
-rw-r--r--package/php/Makefile4
-rw-r--r--package/picocom/Makefile2
-rw-r--r--package/pipacs/Makefile2
-rw-r--r--package/pkgconf/Makefile2
-rw-r--r--package/pm-utils/Makefile2
-rw-r--r--package/pmacct/Makefile4
-rw-r--r--package/polarssl/Makefile4
-rw-r--r--package/polipo/Makefile4
-rw-r--r--package/poppler/Makefile2
-rw-r--r--package/popt/Makefile4
-rw-r--r--package/postfix/Makefile2
-rw-r--r--package/postgresql/Makefile2
-rw-r--r--package/ppp/Makefile4
-rw-r--r--package/pptp/Makefile4
-rw-r--r--package/pptpd/Makefile4
-rw-r--r--package/presentproto/Makefile2
-rw-r--r--package/printproto/Makefile4
-rw-r--r--package/privoxy/Makefile2
-rw-r--r--package/procmail/Makefile2
-rw-r--r--package/procps/Makefile3
-rw-r--r--package/ptunnel/Makefile2
-rw-r--r--package/pulseaudio/Makefile4
-rw-r--r--package/pycurl/Makefile4
-rw-r--r--package/pyrex/Makefile4
-rw-r--r--package/python2/Makefile2
-rw-r--r--package/python3/Makefile2
-rw-r--r--package/qemu/Makefile2
-rw-r--r--package/qingy/Makefile2
-rw-r--r--package/quagga/Makefile2
-rwxr-xr-xpackage/raddump/Makefile4
-rw-r--r--package/radvd/Makefile4
-rw-r--r--package/randrproto/Makefile4
-rw-r--r--package/rarpd/Makefile2
-rw-r--r--package/rdate/Makefile4
-rw-r--r--package/rdesktop/Makefile4
-rw-r--r--package/readline/Makefile2
-rw-r--r--package/reaim/Makefile4
-rw-r--r--package/realtek-firmware/Makefile2
-rw-r--r--package/recordproto/Makefile4
-rw-r--r--package/renderproto/Makefile4
-rw-r--r--package/resourceproto/Makefile2
-rw-r--r--package/rfkill/Makefile2
-rw-r--r--package/rng-tools/Makefile4
-rw-r--r--package/rp-pppoe/Makefile4
-rw-r--r--package/rpcbind/Makefile2
-rw-r--r--package/rrdcollect/Makefile4
-rw-r--r--package/rrdtool/Makefile8
-rw-r--r--package/rsync/Makefile5
-rw-r--r--package/rt61-firmware/Makefile2
-rw-r--r--package/rtmpdump/Makefile8
-rw-r--r--package/rtorrent/Makefile2
-rw-r--r--package/ruby-ldap/Makefile4
-rw-r--r--package/ruby/Makefile4
-rw-r--r--package/rxvt-unicode/Makefile2
-rw-r--r--package/samba/Makefile13
-rw-r--r--package/sane-backends/Makefile2
-rw-r--r--package/scons/Makefile4
-rw-r--r--package/screen/Makefile2
-rw-r--r--package/scrnsaverproto/Makefile4
-rw-r--r--package/scsi-spin/Makefile6
-rw-r--r--package/sdl-image/Makefile2
-rw-r--r--package/sdl/Makefile4
-rw-r--r--package/section.lst101
-rw-r--r--package/sed/Makefile2
-rw-r--r--package/ser2net/Makefile2
-rw-r--r--package/serdisplib/Makefile4
-rw-r--r--package/setpwc/Makefile5
-rw-r--r--package/setserial/Makefile2
-rw-r--r--package/setxkbmap/Makefile2
-rw-r--r--package/shorewall-common/Makefile2
-rw-r--r--package/shorewall-shell/Makefile2
-rw-r--r--package/siproxd/Makefile4
-rw-r--r--package/sipsak/Makefile4
-rw-r--r--package/sispmctl/Makefile2
-rw-r--r--package/snort/Makefile2
-rw-r--r--package/socat/Makefile2
-rw-r--r--package/sox/Makefile2
-rw-r--r--package/speex/Makefile2
-rw-r--r--package/sqlite/Makefile8
-rw-r--r--package/squashfs/Makefile2
-rw-r--r--package/squeezelite/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/Makefile5
-rw-r--r--package/stress/Makefile2
-rw-r--r--package/strongswan/Makefile2
-rw-r--r--package/subversion/Makefile2
-rw-r--r--package/sudo/Makefile2
-rw-r--r--package/swig/Makefile2
-rw-r--r--package/sysfsutils/Makefile2
-rw-r--r--package/syslinux/Makefile2
-rw-r--r--package/syslog-ng/Makefile2
-rw-r--r--package/sysstat/Makefile2
-rw-r--r--package/taglib/Makefile2
-rw-r--r--package/tar/Makefile2
-rw-r--r--package/tcl/Makefile4
-rw-r--r--package/tcp_wrappers/Makefile4
-rw-r--r--package/tcpdump/Makefile2
-rw-r--r--package/tcsh/Makefile2
-rw-r--r--package/tinc/Makefile2
-rw-r--r--package/tinycdb/Makefile4
-rw-r--r--package/tinyproxy/Makefile4
-rw-r--r--package/tinyxml/Makefile4
-rw-r--r--package/tmsnc/Makefile4
-rw-r--r--package/tntnet/Makefile4
-rw-r--r--package/tor/Makefile6
-rw-r--r--package/totd/Makefile4
-rw-r--r--package/tptest/Makefile2
-rw-r--r--package/traceroute/Makefile4
-rw-r--r--package/trafshow/Makefile2
-rw-r--r--package/transproxy/Makefile4
-rw-r--r--package/tslib/Makefile2
-rw-r--r--package/ttcp/Makefile6
-rw-r--r--package/tzdata/Makefile18
-rw-r--r--package/u-boot-imx6/Makefile2
-rw-r--r--package/u-boot/Makefile2
-rw-r--r--package/uclibc++/Makefile2
-rw-r--r--package/uclibc/Makefile4
-rw-r--r--package/udp-broadcast-relay/Makefile2
-rw-r--r--package/ulogd/Makefile2
-rw-r--r--package/updatedd/Makefile2
-rw-r--r--package/urlgrabber/Makefile4
-rw-r--r--package/usbutils/Makefile4
-rw-r--r--package/util-linux/Makefile26
-rw-r--r--package/uvd/Makefile4
-rw-r--r--package/v4l-utils/Makefile6
-rw-r--r--package/vala/Makefile4
-rw-r--r--package/valgrind/Makefile2
-rwxr-xr-xpackage/vgp/Makefile2
-rw-r--r--package/videoproto/Makefile4
-rw-r--r--package/vilistextum/Makefile2
-rw-r--r--package/vim/Makefile2
-rw-r--r--package/virtinst/Makefile2
-rw-r--r--package/vlc/Makefile2
-rw-r--r--package/vnc-reflector/Makefile4
-rw-r--r--package/vnstat/Makefile2
-rw-r--r--package/vpnc/Makefile2
-rw-r--r--package/vrrpd/Makefile2
-rw-r--r--package/vsftpd/Makefile4
-rw-r--r--package/vtun/Makefile4
-rw-r--r--package/w3m/Makefile2
-rw-r--r--package/watchdog/Makefile2
-rw-r--r--package/wccpd/Makefile4
-rw-r--r--package/wdfs/Makefile2
-rw-r--r--package/webkitgtk/Makefile2
-rw-r--r--package/weechat/Makefile4
-rw-r--r--package/wget/Makefile4
-rw-r--r--package/wifidog/Makefile4
-rw-r--r--package/wireless-tools/Makefile4
-rw-r--r--package/wol/Makefile4
-rw-r--r--package/wondershaper/Makefile2
-rw-r--r--package/wpa_supplicant/Makefile4
-rw-r--r--package/wput/Makefile4
-rw-r--r--package/x11vnc/Makefile2
-rw-r--r--package/xauth/Makefile4
-rw-r--r--package/xbindkeys/Makefile4
-rw-r--r--package/xbmc/Makefile2
-rw-r--r--package/xcb-proto/Makefile4
-rw-r--r--package/xcb-util/Makefile4
-rw-r--r--package/xcmiscproto/Makefile4
-rw-r--r--package/xconsole/Makefile4
-rw-r--r--package/xdm/Makefile2
-rw-r--r--package/xdpyinfo/Makefile4
-rw-r--r--package/xextproto/Makefile4
-rw-r--r--package/xf86-input-evdev/Makefile2
-rw-r--r--package/xf86-video-ati/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-intel/Makefile2
-rw-r--r--package/xf86-video-siliconmotion/Makefile2
-rw-r--r--package/xf86dga/Makefile2
-rw-r--r--package/xf86dgaproto/Makefile4
-rw-r--r--package/xf86driproto/Makefile4
-rw-r--r--package/xf86vidmodeproto/Makefile4
-rw-r--r--package/xfsprogs/Makefile4
-rw-r--r--package/xineramaproto/Makefile4
-rw-r--r--package/xinit/Makefile2
-rw-r--r--package/xinput/Makefile4
-rw-r--r--package/xinput_calibrator/Makefile4
-rw-r--r--package/xkbcomp/Makefile2
-rw-r--r--package/xkeyboard-config/Makefile4
-rw-r--r--package/xlsfonts/Makefile4
-rw-r--r--package/xorg-server/Makefile2
-rw-r--r--package/xproto/Makefile4
-rw-r--r--package/xrdb/Makefile4
-rw-r--r--package/xset/Makefile4
-rw-r--r--package/xsetroot/Makefile2
-rw-r--r--package/xsm/Makefile4
-rw-r--r--package/xterm/Makefile2
-rw-r--r--package/xtrans/Makefile4
-rw-r--r--package/xvidcore/Makefile4
-rw-r--r--package/xvinfo/Makefile4
-rw-r--r--package/xz/Makefile2
-rw-r--r--package/yajl/Makefile4
-rw-r--r--package/yasm/Makefile4
-rw-r--r--package/zile/Makefile2
-rw-r--r--package/zip/Makefile2
-rw-r--r--package/zlib/Makefile2
-rw-r--r--package/zsh/Makefile4
695 files changed, 1329 insertions, 1307 deletions
diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index b34909e..ea6f97e 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= 6tunnel
PKG_VERSION:= 0.11rc2
PKG_RELEASE:= 1
PKG_MD5SUM:= 74e02d4f0704b3083a01feda66033449
-PKG_DESCR:= IPv4/IPv6 tunnel proxy
-PKG_SECTION:= ipv6
+PKG_DESCR:= ipv4/ipv6 tunnel proxy
+PKG_SECTION:= net/ipv6
PKG_BUILDDEP:= autotool
PKG_URL:= http://toxygen.net/6tunnel/
PKG_SITES:= http://toxygen.net/6tunnel/
diff --git a/package/Config.in b/package/Config.in
new file mode 100644
index 0000000..1955879
--- /dev/null
+++ b/package/Config.in
@@ -0,0 +1,86 @@
+menu "Base system"
+source package/Config.in.auto.base.boot
+source package/Config.in.auto.base.libs
+source package/Config.in.auto.base.apps
+source package/Config.in.auto.base.shells
+source package/Config.in.auto.base.misc
+endmenu
+
+menu "System"
+source package/Config.in.auto.sys.fs
+source package/Config.in.auto.sys.serial
+source package/Config.in.auto.sys.utils
+source package/Config.in.auto.sys.firmware
+source package/Config.in.auto.sys.misc
+endmenu
+
+menu "Applications"
+source package/Config.in.auto.app.archive
+source package/Config.in.auto.app.browser
+source package/Config.in.auto.app.chat
+source package/Config.in.auto.app.crypto
+source package/Config.in.auto.app.debug
+source package/Config.in.auto.app.editor
+source package/Config.in.auto.app.p2p
+endmenu
+
+menu "Networking"
+source package/Config.in.auto.net.acct
+source package/Config.in.auto.net.dns
+source package/Config.in.auto.net.debug
+source package/Config.in.auto.net.firewall
+source package/Config.in.auto.net.fs
+source package/Config.in.auto.net.http
+source package/Config.in.auto.net.ipv6
+source package/Config.in.auto.net.mail
+source package/Config.in.auto.net.misc
+source package/Config.in.auto.net.ntp
+source package/Config.in.auto.net.perf
+source package/Config.in.auto.net.ppp
+source package/Config.in.auto.net.proxy
+source package/Config.in.auto.net.radius
+source package/Config.in.auto.net.route
+source package/Config.in.auto.net.security
+source package/Config.in.auto.net.voip
+source package/Config.in.auto.net.wifi
+endmenu
+
+menu "Multimedia"
+source package/Config.in.auto.mm.audio
+source package/Config.in.auto.mm.image
+source package/Config.in.auto.mm.video
+endmenu
+
+menu "Xorg"
+source package/Config.in.auto.x11.apps
+source package/Config.in.auto.x11.utils
+source package/Config.in.auto.x11.drivers
+source package/Config.in.auto.x11.misc
+source package/Config.in.auto.x11.fonts
+source package/Config.in.auto.x11.libs
+endmenu
+
+menu "Libraries"
+source package/Config.in.auto.libs.audio
+source package/Config.in.auto.libs.crypto
+source package/Config.in.auto.libs.data
+source package/Config.in.auto.libs.db
+source package/Config.in.auto.libs.fonts
+source package/Config.in.auto.libs.image
+source package/Config.in.auto.libs.misc
+source package/Config.in.auto.libs.net
+source package/Config.in.auto.libs.video
+endmenu
+
+menu "Programming"
+source package/Config.in.auto.dev.lang
+source package/Config.in.auto.dev.python
+source package/Config.in.auto.dev.perl
+source package/Config.in.auto.dev.scm
+source package/Config.in.auto.dev.tools
+endmenu
+
+menu "Headers"
+depends on ADK_PACKAGE_GCC
+source package/Config.in.auto.dev.header
+endmenu
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index 9078bf0..11d5d86 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 1.6.3
PKG_RELEASE:= 3
PKG_EXTRAVER:= 1.6-0
PKG_MD5SUM:= 641e8e999c017770da647f9b5b890906
-PKG_DESCR:= Thin graphic library for the Linux framebuffer devices
-PKG_SECTION:= libs
+PKG_DESCR:= thin graphic library for framebuffer devices
+PKG_SECTION:= libs/image
PKG_DEPENDS:= libpng libjpeg-turbo libfreetype
PKG_BUILDDEP:= libpng libjpeg-turbo freetype
PKG_URL:= http://www.directfb.org/
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 4979c76..8903498 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -9,26 +9,26 @@ PKG_EXTRAVER:= 1
PKG_RELEASE:= 3
PKG_MD5SUM:= 8134257e3fbb43cc06fb32a6d725d3d0
PKG_DESCR:= image processing and converting utility
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/image
PKG_DEPENDS:= libstdcxx
PKG_BUILDDEP:= libpng libjpeg-turbo libtiff fontconfig libiconv-tiny
PKG_BUILDDEP+= pango libtool e2fsprogs
PKG_URL:= http://www.imagemagick.org/
PKG_SITES:= http://image_magick.veidrodis.com/image_magick/
-PKG_LIBNAME:= libimagemagic
+PKG_LIBNAME:= libimagemagick
PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK
PKGSD_LIBIMAGEMAGICK:= imagemagick library
-PKGSC_LIBIMAGEMAGICK:= libs
+PKGSC_LIBIMAGEMAGICK:= libs/image
PKGSS_LIBIMAGEMAGICK:= libjpeg-turbo libtiff libpng
PKGSD_CONVERT:= image processing and converting utility
-PKGSC_CONVERT:= multimedia
+PKGSC_CONVERT:= mm/image
PKGSS_CONVERT:= libimagemagick
PKGSD_DISPLAY:= image display application
-PKGSC_DISPLAY:= multimedia
+PKGSC_DISPLAY:= mm/image
PKGSS_DISPLAY:= libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng libltdl
PKGSB_DISPLAY:= libX11
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index e3db576..e34ef66 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 10.1.0
PKG_SUBVER:= 10.1
PKG_RELEASE:= 3
PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315
-PKG_DESCR:= MESA 3D graphics library
-PKG_SECTION:= libs
+PKG_DESCR:= 3d graphics library
+PKG_SECTION:= libs/video
PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat
PKG_DEPENDS+= libxml2 libxml2-python libstdcxx
PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes
diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile
index ade1c17..c7d3fc5 100644
--- a/package/SDL_gfx/Makefile
+++ b/package/SDL_gfx/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= SDL_gfx
PKG_VERSION:= 2.0.22
PKG_RELEASE:= 2
PKG_MD5SUM:= 330f291f1f09a1bdf397c9b40d92ca41
-PKG_DESCR:= SDL GFX library
-PKG_SECTION:= libs
+PKG_DESCR:= sdl graphic library
+PKG_SECTION:= libs/video
PKG_DEPENDS:= libsdl
PKG_BUILDDEP:= sdl
PKG_URL:= http://www.ferzkopp.net/joomla/content/view/19/14/
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile
index 659646d..66233e3 100644
--- a/package/SDL_ttf/Makefile
+++ b/package/SDL_ttf/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= SDL_ttf
PKG_VERSION:= 2.0.10
PKG_RELEASE:= 2
PKG_MD5SUM:= 814e6e17e8879254208d23b3b7e0354b
-PKG_DESCR:= truetype fonts for SDL applications
-PKG_SECTION:= libs
+PKG_DESCR:= truetype fonts for sdl applications
+PKG_SECTION:= libs/fonts
PKG_DEPENDS:= libsdl libfreetype
PKG_BUILDDEP:= sdl freetype gettext-tiny
PKG_URL:= http://www.libsdl.org/projects/SDL_ttf/
diff --git a/package/adk-helper/Makefile b/package/adk-helper/Makefile
index d386bd5..4654aa9 100644
--- a/package/adk-helper/Makefile
+++ b/package/adk-helper/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= adk-helper
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_DESCR:= adk helper utilities
-PKG_SECTION:= misc
+PKG_SECTION:= base/misc
PKG_CFLINE_ADK_HELPER:= depends on ADK_HOST_ONLY
diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile
index efc8713..211fd25 100644
--- a/package/adk-test-tools/Makefile
+++ b/package/adk-test-tools/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= adk-test-tools
PKG_VERSION:= 0.1
PKG_RELEASE:= 7
PKG_DESCR:= helper tools and scripts for adk-test-framework
-PKG_SECTION:= misc
+PKG_SECTION:= base/misc
PKG_URL:= http://openadk.org/
NO_DISTFILES:= 1
diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
index 1ebfa29..d9f5029 100644
--- a/package/adkinstall/Makefile
+++ b/package/adkinstall/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= adkinstall
PKG_VERSION:= 2.0
PKG_RELEASE:= 1
-PKG_DESCR:= ADK disk/flash installer
-PKG_SECTION:= base
+PKG_DESCR:= adk disk/flash installer
+PKG_SECTION:= base/misc
PKG_DEPENDS:= mke2fs parted sfdisk dosfstools mksh
PKG_SYSTEM_DEPENDS:= mikrotik-rb532 lemote-yeelong
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 155da93..a98a22b 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= aiccu
PKG_VERSION:= 20070115
PKG_RELEASE:= 11
PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350
-PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility
-PKG_SECTION:= ipv6
+PKG_DESCR:= sixxs automatic ipv6 connectivity client utility
+PKG_SECTION:= net/ipv6
PKG_DEPENDS:= 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 88b679e..43c7ee8 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1
PKG_RELEASE:= 2
PKG_MD5SUM:= f7a24ed8fad122c4187d06bfd6f998b4
PKG_DESCR:= set of tools for auditing wireless networks
-PKG_SECTION:= wifi
+PKG_SECTION:= net/wifi
PKG_DEPENDS:= libpthread libopenssl libpcap
PKG_BUILDDEP:= openssl libpcap
PKG_URL:= http://www.aircrack-ng.org/
diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile
index 8beb783..6bbfabc 100644
--- a/package/alix-switch/Makefile
+++ b/package/alix-switch/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= alix-switch
PKG_VERSION:= 1.0
PKG_RELEASE:= 4
PKG_DESCR:= daemon listening on button events
-PKG_SECTION:= base
+PKG_SECTION:= base/misc
PKG_URL:= http://openadk.org/
PKG_SYSTEM_DEPENDS:= pcengines-alix2d2 pcengines-alix2d13
@@ -22,8 +22,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-o ${WRKBUILD}/alix-switchd ${WRKBUILD}/alix-switchd.c
diff --git a/package/alix-temperature/Makefile b/package/alix-temperature/Makefile
index e877241..16a666d 100644
--- a/package/alix-temperature/Makefile
+++ b/package/alix-temperature/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= alix-temperature
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_DESCR:= read alix boards i2c thermal sensor
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_DEPENDS:= i2c-tools
PKG_SYSTEM_DEPENDS:= pcengines-alix2d2 pcengines-alix2d13
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index f4f7983..6a09e54 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= alsa-lib
PKG_VERSION:= 1.0.27.2
PKG_RELEASE:= 3
PKG_MD5SUM:= 69129a7c37697f81ac092335e9fa452b
-PKG_DESCR:= ALSA sound library
-PKG_SECTION:= libs
+PKG_DESCR:= sound library
+PKG_SECTION:= libs/audio
PKG_BUILDDEP:= alsa-lib-host
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/lib/
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index d0b0806..6a88dff 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.27.2
PKG_RELEASE:= 2
PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3
PKG_DESCR:= mixer/player utility
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= alsa-lib libpthread librt
PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.alsa-project.org/
diff --git a/package/ant/Makefile b/package/ant/Makefile
index 6c75bc0..3c83c94 100644
--- a/package/ant/Makefile
+++ b/package/ant/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ant
PKG_VERSION:= 1.8.4
PKG_RELEASE:= 1
PKG_MD5SUM:= c474fa9d0c35a24037c23b6e476862c1
-PKG_DESCR:= ant utility
-PKG_SECTION:= lang
+PKG_DESCR:= java code build utility
+PKG_SECTION:= dev/tools
HOST_BUILDDEP:= gcj-host
PKG_SITES:= http://archive.apache.org/dist/ant/source/
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index e743915..395d16d 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 666a5d56098a9debf998510e304c8095
PKG_DESCR:= apache portable runtime utility library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libexpat apr
PKG_BUILDDEP:= expat apr
PKG_URL:= http://apr.apache.org/
diff --git a/package/apr/Makefile b/package/apr/Makefile
index 4041f40..34e7536 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= apr
PKG_VERSION:= 1.4.6
PKG_RELEASE:= 2
PKG_MD5SUM:= 76cc4457fbb71eefdafa27dba8f511fb
-PKG_DESCR:= Apache Portable Runtime library
-PKG_SECTION:= libs
+PKG_DESCR:= apache portable runtime library
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpthread
PKG_URL:= http://apr.apache.org/
PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index bdc603d..bb09013 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= arpd
PKG_VERSION:= 0.2
PKG_RELEASE:= 3
PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d
-PKG_DESCR:= generates ARP responses for IP address ranges
-PKG_SECTION:= route
+PKG_DESCR:= generates arp responses for ip address ranges
+PKG_SECTION:= net/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 c2823f8..95d2348 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/security
+PKG_SECTION:= net/debug
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 12025b5..39be1d9 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= asterisk
PKG_VERSION:= 1.8.20.1
PKG_RELEASE:= 3
PKG_MD5SUM:= 99204257de80a42c4e287fc93dfe714a
-PKG_DESCR:= open source PBX
-PKG_SECTION:= phone
+PKG_DESCR:= open source pbx
+PKG_SECTION:= net/voip
PKG_DEPENDS:= libncurses libpthread libopenssl libcurl libstdcxx
PKG_BUILDDEP:= ncurses openssl zlib curl popt gtk+
PKG_URL:= http://www.asterisk.org/
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 0d4f140..8668781 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= atftp
PKG_VERSION:= 0.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82
-PKG_DESCR:= TFTP client
-PKG_SECTION:= dhcp
+PKG_DESCR:= tftp client
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libreadline libncurses
PKG_BUILDDEP:= readline ncurses
PKG_URL:= http://freshmeat.net/projects/atftp/
@@ -19,7 +19,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_LIBC_DEPENDS:= uclibc glibc
PKG_SUBPKGS:= ATFTP ATFTPD
-PKGSD_ATFTPD:= TFTP server
+PKGSD_ATFTPD:= tftp server
PKGSS_ATFTPD:= libreadline libncurses
include $(TOPDIR)/mk/package.mk
diff --git a/package/atk/Makefile b/package/atk/Makefile
index 0701c45..7c54346 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= atk
PKG_VERSION:= 2.11.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 2b4316e69cbe0a1998ba39cdc8c89692
-PKG_DESCR:= atk library
-PKG_SECTION:= libs
+PKG_DESCR:= accessibility toolkit library
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= glib
PKG_URL:= http://www.gnome.org/
PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/2.11/}
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index d28d04f..32f2c99 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.69
PKG_RELEASE:= 1
PKG_MD5SUM:= 50f97f4159805e374639a73e2636f22e
PKG_DESCR:= automatically configure software source code packages
-PKG_SECTION:= lang
+PKG_SECTION:= dev/tools
HOST_BUILDDEP:= m4-host
PKG_URL:= http://www.gnu.org/software/autoconf/
PKG_SITES:= ${MASTER_SITE_GNU:=autoconf/}
diff --git a/package/automake/Makefile b/package/automake/Makefile
index 97b92dc..a77c0af 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 1.14.1
PKG_RELEASE:= 1
PKG_EXTRAVER:= 1.14
PKG_MD5SUM:= 7fc29854c520f56b07aa232a0f880292
-PKG_DESCR:= tool for automatically generating Makefile.in
-PKG_SECTION:= lang
+PKG_DESCR:= tool for automatically generating makefiles
+PKG_SECTION:= dev/tools
PKG_BUILDDEP:= m4-host autoconf-host autoconf
HOST_BUILDDEP:= autoconf-host
PKG_URL:= http://www.gnu.org/software/automake/
diff --git a/package/autossh/Makefile b/package/autossh/Makefile
index 526f444..f9b1df5 100644
--- a/package/autossh/Makefile
+++ b/package/autossh/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= autossh
PKG_VERSION:= 1.4b
PKG_RELEASE:= 1
PKG_MD5SUM:= 8f9aa006f6f69e912d3c2f504622d6f7
-PKG_DESCR:= Automatically restart SSH sessions and tunnels
+PKG_DESCR:= automatically restart ssh sessions and tunnels
PKG_SECTION:= net/security
PKG_DEPENDS:= openssh-client
PKG_URL:= http://www.harding.motd.ca/autossh/
diff --git a/package/autotool/Makefile b/package/autotool/Makefile
index 8d8b8eb..498ea52 100644
--- a/package/autotool/Makefile
+++ b/package/autotool/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:= autotool
PKG_VERSION:= 1.0
PKG_RELEASE:= 2
PKG_DESCR:= autotool infrastructure for host
-PKG_SECTION:= devel
+PKG_SECTION:= dev/tools
PKG_BUILDDEP:= m4-host pkgconf-host autoconf-host automake-host
PKG_BUILDDEP+= libtool-host
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 453555e..9968729 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= avahi
PKG_VERSION:= 0.6.31
PKG_RELEASE:= 3
PKG_MD5SUM:= 2f22745b8f7368ad5a0a3fddac343f2d
-PKG_DESCR:= mDNS daemon
-PKG_SECTION:= dhcp
+PKG_DESCR:= multicast dns daemon
+PKG_SECTION:= net/dns
PKG_DEPENDS:= libstdcxx
PKG_BUILDDEP:= autotool libdaemon expat gdbm glib
PKG_BUILDDEP+= gettext-tiny gtk+ dbus
@@ -24,7 +24,7 @@ PKGSS_AVAHI_DAEMON:= libavahi libdaemon libexpat libintl libgtk dbus
PKGSS_AVAHI_DNSCONFD:= libavahi libdaemon avahi-daemon
PKGSD_AVAHI_DNSCONFD:= DNS server from mDNS configuration daemon
PKGSD_LIBAVAHI:= DNS-SD over mDNS library
-PKGSC_LIBAVAHI:= libs
+PKGSC_LIBAVAHI:= libs/misc
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index 11166e6..164d790 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= axtls
PKG_VERSION:= 1.4.9
PKG_RELEASE:= 2
PKG_MD5SUM:= 6d519bc3b5f20faa6ef8d423f5062241
-PKG_DESCR:= small embedded webserver with TLS
-PKG_SECTION:= www
+PKG_DESCR:= small embedded webserver with tls
+PKG_SECTION:= net/http
PKG_DEPENDS:= libaxtls
PKG_URL:= http://axtls.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/}
@@ -17,7 +17,7 @@ PKG_OPTS:= dev
PKG_SUBPKGS:= AXHTTPD LIBAXTLS
PKGSD_LIBAXTLS:= small tls library
-PKGSC_LIBAXTLS:= libs
+PKGSC_LIBAXTLS:= libs/crypto
DISTFILES:= axTLS-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/axTLS
diff --git a/package/b43-firmware/Makefile b/package/b43-firmware/Makefile
index 274e199..e4ee5c4 100644
--- a/package/b43-firmware/Makefile
+++ b/package/b43-firmware/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 37c8d2c029a7e5b82f4433a6fa1e2ee5
PKG_DESCR:= firmware for b43 wireless cards
-PKG_SECTION:= wifi
+PKG_SECTION:= sys/firmware
PKG_SITES:= http://openadk.org/distfiles/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index a34f504..6f09ab0 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
PKG_RELEASE:= 96
-PKG_SECTION:= base
+PKG_SECTION:= base/apps
PKG_DESCR:= basic files and scripts
WRKDIST= ${WRKDIR}/base-files
diff --git a/package/bash/Makefile b/package/bash/Makefile
index be6d969..3e2e399 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= bash
PKG_VERSION:= 4.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 81348932d5da294953e15d4814c74dd1
-PKG_DESCR:= Bourne-Again SHell
-PKG_SECTION:= shells
+PKG_DESCR:= bourne-again shell
+PKG_SECTION:= base/shells
PKG_URL:= http://www.gnu.org/software/bash/
PKG_SITES:= http://ftp.gnu.org/gnu/bash/
diff --git a/package/bc/Makefile b/package/bc/Makefile
index 60336c4..8032874 100644
--- a/package/bc/Makefile
+++ b/package/bc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.06
PKG_RELEASE:= 1
PKG_MD5SUM:= d44b5dddebd8a7a7309aea6c36fda117
PKG_DESCR:= arbitrary precision calculator language
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_BUILDDEP:= m4-host flex-host
HOST_BUILDDEP:= m4-host flex-host
PKG_URL:= http://www.gnu.org/software/bc/
diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile
index aca7b39..1bc96ae 100644
--- a/package/bcm2835-bootloader/Makefile
+++ b/package/bcm2835-bootloader/Makefile
@@ -9,7 +9,7 @@ PKG_VERSION:= 0.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 08beaa7d66e7dd6b0ab58483d0f4ce40
PKG_DESCR:= bootloader for raspberry pi (bcm2835)
-PKG_SECTION:= boot
+PKG_SECTION:= base/boot
PKG_URL:= https://github.com/raspberrypi/firmware
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile
index a14efdb..eb36770 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm2835-vc/Makefile
@@ -9,7 +9,7 @@ PKG_VERSION:= 0.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 06ef68599607e3f041ded24d431ca460
PKG_DESCR:= videocore tools and libraries for raspberry pi
-PKG_SECTION:= base
+PKG_SECTION:= libs/video
PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= cmake-host
PKG_URL:= https://github.com/raspberrypi/userland
diff --git a/package/bdftopcf/Makefile b/package/bdftopcf/Makefile
index 0452c7e..64c65be 100644
--- a/package/bdftopcf/Makefile
+++ b/package/bdftopcf/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:= bdftopcf
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= f2d5c8a7813c3f9902e163c620a83dd4
-PKG_DESCR:= bdftopcf font utility
+PKG_DESCR:= font converter utility
PKG_BUILDDEP:= libXfont
-PKG_SECTION:= x11/apps
+PKG_SECTION:= x11/fonts
PKG_SITES:= ${MASTER_SITE_XORG}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile
index 4d2af4e..51b68ca 100644
--- a/package/beecrypt/Makefile
+++ b/package/beecrypt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8441c014170823f2dff97e33df55af1e
PKG_DESCR:= cryptography toolkit library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libstdcxx
PKG_URL:= http://beecrypt.sourceforge.net/
PKG_SITES:= http://sourceforge.net/projects/beecrypt/files/beecrypt/$(PKG_VERSION)/
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index 038c3d4..a945a8e 100644
--- a/package/bigreqsproto/Makefile
+++ b/package/bigreqsproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= bigreqsproto
PKG_VERSION:= 1.1.2
PKG_RELEASE:= 2
-PKG_DESCR:= Big Requests Extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= big requests extension headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 9b83369ac7a5eb2bf54c8f34db043a0e
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 1cedc9b..965c118 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= bind
PKG_VERSION:= 9.7.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 207477c4cf95f2db5be0ded8a22669e0
-PKG_DESCR:= popular DNS server
-PKG_SECTION:= dns
+PKG_DESCR:= dns server
+PKG_SECTION:= net/dns
PKG_DEPENDS:= libopenssl libbind libxml2 libstdcxx
PKG_BUILDDEP:= openssl libxml2
PKG_URL:= https://www.isc.org/software/bind/
@@ -20,25 +20,25 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG LIBBIND
PKGSD_BIND_NSUPDATE:= nsupdate utility
-PKGSC_BIND_NSUPDATE:= dns
+PKGSC_BIND_NSUPDATE:= net/dns
PKGSS_BIND_NSUPDATE:= libbind libopenssl libxml2
PKGSD_BIND_RNDC:= rndc & rndc-confgen utilities
-PKGSC_BIND_RNDC:= dns
+PKGSC_BIND_RNDC:= net/dns
PKGSS_BIND_RNDC:= libbind libopenssl libxml2
PKGSD_BIND_CHECK:= check utilities
-PKGSC_BIND_CHECK:= dns
+PKGSC_BIND_CHECK:= net/dns
PKGSS_BIND_CHECK:= libbind libopenssl libxml2
PKGSD_BIND_DNSSEC:= dnssec utilities
-PKGSC_BIND_DNSSEC:= dns
+PKGSC_BIND_DNSSEC:= net/dns
PKGSS_BIND_DNSSEC:= libbind libopenssl libxml2
PKGSD_BIND_HOST:= host utility
-PKGSC_BIND_HOST:= dns
+PKGSC_BIND_HOST:= net/dns
PKGSS_BIND_HOST:= libbind libopenssl libxml2
PKGSD_BIND_DIG:= dig utility
-PKGSC_BIND_DIG:= dns
+PKGSC_BIND_DIG:= net/dns
PKGSS_BIND_DIG:= libbind libopenssl libxml2
PKGSD_LIBBIND:= library for the bind software suite
-PKGSC_LIBBIND:= libs
+PKGSC_LIBBIND:= libs/net
PKG_FLAVOURS_BIND_SERVER:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 0d968c7..8743048 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -6,13 +6,13 @@ include ${TOPDIR}/toolchain/binutils/Makefile.inc
PKG_NAME:= binutils
PKG_DESCR:= binary utilities (nm, objdump, as, ..)
-PKG_SECTION:= lang
+PKG_SECTION:= dev/tools
PKG_DEPENDS:= libbfd
PKG_OPTS:= dev
PKG_SUBPKGS:= BINUTILS LIBBFD
PKGSD_LIBBFD:= binary file descriptor library
-PKGSC_LIBBFD:= libs
+PKGSC_LIBBFD:= libs/misc
PKG_HOST_DEPENDS:= !cygwin
diff --git a/package/bison/Makefile b/package/bison/Makefile
index ac6b5ac..7511bce 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 146be9ff9fbd27497f0bf2286a5a2082
PKG_DESCR:= parser generator
-PKG_SECTION:= lang
+PKG_SECTION:= dev/tools
PKG_BUILDDEP:= m4-host flex-host bison-host
HOST_BUILDDEP:= m4-host flex-host
PKG_URL:= http://www.gnu.org/software/bison/
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index e663814..6347486 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= bitlbee
PKG_VERSION:= 3.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 4d00c6e09859b653f955b16b988db0ac
-PKG_DESCR:= IRC gateway to IM chat networks
-PKG_SECTION:= chat
+PKG_DESCR:= irc gateway to im chat networks
+PKG_SECTION:= app/chat
PKG_DEPENDS:= glib libopenssl
PKG_BUILDDEP:= glib libiconv-tiny openssl
PKG_URL:= http://www.bitlbee.org/
diff --git a/package/bkeymaps/Makefile b/package/bkeymaps/Makefile
index 394098f..e797f0a 100644
--- a/package/bkeymaps/Makefile
+++ b/package/bkeymaps/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.13
PKG_RELEASE:= 2
PKG_MD5SUM:= a68058ab4a81cf9a8dcbaaa7a5df5b11
PKG_DESCR:= binary keymaps for busybox loadkmap
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_BUILDDEP:= base-files
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile
index 33d9067..16f0c02 100644
--- a/package/bluez-firmware/Makefile
+++ b/package/bluez-firmware/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= bluez-firmware
PKG_VERSION:= 1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 1cc3cefad872e937e05de5a0a2b390dd
-PKG_DESCR:= firmware for BCM2033
-PKG_SECTION:= misc
+PKG_DESCR:= firmware for bcm2033 bluetooth dongle
+PKG_SECTION:= sys/firmware
PKG_DEPENDS:= bluez
PKG_URL:= http://www.bluez.org/
PKG_SITES:= http://bluez.sourceforge.net/download/
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index e2bdec7..3a57cb9 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.12
PKG_RELEASE:= 1
PKG_MD5SUM:= 5d37e581107b3d6f91b81194a5006407
PKG_DESCR:= bluetooth applications
-PKG_SECTION:= wifi
+PKG_SECTION:= net/wifi
PKG_DEPENDS:= glib dbus libreadline
PKG_BUILDDEP:= autotool glib dbus readline
PKG_URL:= http://www.bluez.org/
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index a622726..db2fae6 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 39d27c13eae8a5064d68e20d585e60de
PKG_DESCR:= mail filter software
-PKG_SECTION:= mail
+PKG_SECTION:= net/mail
PKG_BUILDDEP:= libiconv-tiny db
PKG_DEPENDS:= libdb libstdcxx
PKG_URL:= http://bogofilter.sourceforge.net/
diff --git a/package/boost/Makefile b/package/boost/Makefile
index ab7b730..6ac6228 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= boost
PKG_VERSION:= 1.55.0
PKG_RELEASE:= 5
PKG_MD5SUM:= 93780777cfbf999a600f62883bd54b17
-PKG_DESCR:= boost C++ library
-PKG_SECTION:= libs
+PKG_DESCR:= boost c++ library
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= autotool bzip2-host python2-host
PKG_URL:= http://www.boost.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/}
diff --git a/package/boot-wrapper-aarch64/Makefile b/package/boot-wrapper-aarch64/Makefile
index 06503c5..e8af61f 100644
--- a/package/boot-wrapper-aarch64/Makefile
+++ b/package/boot-wrapper-aarch64/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 2ffdbf8c05854e3b855314d9ac21bbc4
PKG_DESCR:= boot-wrapper for aarch64
-PKG_SECTION:= boot
+PKG_SECTION:= base/boot
PKG_BUILDDEP:= autotool
PKG_SITES:= http://www.openadk.org/distfiles/
diff --git a/package/brcm-bluetooth/Makefile b/package/brcm-bluetooth/Makefile
index d5551e8..7c60066 100644
--- a/package/brcm-bluetooth/Makefile
+++ b/package/brcm-bluetooth/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 85a7d1d1386143fad312a5a82c422380
PKG_DESCR:= firmware for broadcom bluetooth chips
-PKG_SECTION:= wifi
+PKG_SECTION:= sys/firmware
NO_DISTFILES:= 1
diff --git a/package/brcmfmac-firmware/Makefile b/package/brcmfmac-firmware/Makefile
index c2fe817..06d7fb5 100644
--- a/package/brcmfmac-firmware/Makefile
+++ b/package/brcmfmac-firmware/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 85a7d1d1386143fad312a5a82c422380
PKG_DESCR:= firmware for broadcom wireless cards
-PKG_SECTION:= wifi
+PKG_SECTION:= sys/firmware
NO_DISTFILES:= 1
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 38f5ee3..bfe4722 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5
PKG_RELEASE:= 2
PKG_MD5SUM:= ec7b381160b340648dede58c31bb2238
PKG_DESCR:= ethernet bridging tools
-PKG_SECTION:= bridge
+PKG_SECTION:= net/route
PKG_BUILDDEP:= autotool
PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/}
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 9cc9714..36ed09f 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.22.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 337d1a15ab1cb1d4ed423168b1eb7d7e
PKG_DESCR:= core utilities for embedded systems
-PKG_SECTION:= core
+PKG_SECTION:= base/apps
PKG_BUILDDEP:= bzip2-host
PKG_URL:= http://www.busybox.net/
PKG_SITES:= http://www.busybox.net/downloads/
diff --git a/package/bwm/Makefile b/package/bwm/Makefile
index 6f52a13..56cc41a 100644
--- a/package/bwm/Makefile
+++ b/package/bwm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= bwm
PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 51021a036acb92d2bda0c0c0483f9552
-PKG_DESCR:= A very tiny bandwidth monitor
-PKG_SECTION:= net
+PKG_DESCR:= very tiny bandwidth monitor
+PKG_SECTION:= net/perf
PKG_SITES:= http://ftp.debian.org/debian/pool/main/b/bwm/
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index 0dca612..61e58e1 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.6
PKG_RELEASE:= 3
PKG_MD5SUM:= 00b516f4704d4a7cb50a1d97e6e8e15b
PKG_DESCR:= compression utility
-PKG_SECTION:= archive
+PKG_SECTION:= app/archive
PKG_BUILDDEP:= bzip2-host
PKG_DEPENDS:= libbz2
PKG_URL:= http://www.bzip.org/
@@ -21,7 +21,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= BZIP2 LIBBZ2
PKGSD_LIBBZ2:= bzip2 compression library
-PKGSC_LIBBZ2:= libs
+PKGSC_LIBBZ2:= libs/misc
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/bzr/Makefile b/package/bzr/Makefile
index 42ff286..8e9843e 100644
--- a/package/bzr/Makefile
+++ b/package/bzr/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= bzr
PKG_VERSION:= 2.6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 28c86653d0df10d202c6b842deb0ea35
-PKG_DESCR:= bazaar
-PKG_SECTION:= scm
+PKG_DESCR:= source code management system
+PKG_SECTION:= dev/scm
PKG_BUILDDEP:= python2
PKG_DEPENDS:= python2
PKG_URL:= http://bazaar.canonical.com/en/
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index 4eeacf7..7994bea 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ca-certificates
PKG_VERSION:= 20090814
PKG_RELEASE:= 3
PKG_MD5SUM:= 307052c985bec7f9a00eb84293eef779
-PKG_DESCR:= Collection of common CA certificates
-PKG_SECTION:= net/security
+PKG_DESCR:= collection of common ca certificates
+PKG_SECTION:= app/crypto
PKG_DEPENDS:= openssl-util libopenssl
PKG_URL:= http://packages.debian.org/sid/ca-certificates
PKG_SITES:= http://ftp.debian.org/debian/pool/main/c/ca-certificates/
@@ -16,7 +16,7 @@ PKG_SITES:= http://ftp.debian.org/debian/pool/main/c/ca-certificates/
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz
PKG_FLAVOURS_CA_CERTS:= SMALL
-PKGFD_SMALL:= Minimal set of CA certificates
+PKGFD_SMALL:= minimal set of CA certificates
include $(TOPDIR)/mk/package.mk
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 35fcf82..177a4a4 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.12.16
PKG_RELEASE:= 4
PKG_MD5SUM:= a1304edcdc99282f478b995ee5f8f854
PKG_DESCR:= cairo graphics library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/image
PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman
PKG_DEPENDS+= libxrender
PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib
diff --git a/package/ccache/Makefile b/package/ccache/Makefile
index c61f1c4..191d0b8 100644
--- a/package/ccache/Makefile
+++ b/package/ccache/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ccache
PKG_VERSION:= 3.1.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 367916e4ecba4968f77f59a378e61458
-PKG_DESCR:= ccache utility
-PKG_SECTION:= misc
+PKG_DESCR:= compiler cache utility
+PKG_SECTION:= dev/tools
PKG_SITES:= http://samba.org/ftp/ccache/
PKG_CFLINE_CCACHE:= depends on ADK_HOST_ONLY
diff --git a/package/ccid/Makefile b/package/ccid/Makefile
index ec48810..e4dfca7 100644
--- a/package/ccid/Makefile
+++ b/package/ccid/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ccid
PKG_VERSION:= 1.4.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 79ef91103bcdd99a3b31cb5c5721a829
-PKG_DESCR:= a generic USB CCID and ICCD driver
-PKG_SECTION:= crypto
+PKG_DESCR:= generic usb ccid and iccd driver
+PKG_SECTION:= app/crypto
PKG_BUILDDEP:= pcsc-lite
PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/cdrtools/Makefile b/package/cdrtools/Makefile
index 612a553..d423692 100644
--- a/package/cdrtools/Makefile
+++ b/package/cdrtools/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= cdrtools
PKG_VERSION:= 3.01
PKG_RELEASE:= 1
PKG_MD5SUM:= afd4563e335a614a11e042c7b6734d66
-PKG_DESCR:= cdrtools
-PKG_SECTION:= fs
+PKG_DESCR:= cd writing tools
+PKG_SECTION:= sys/fs
PKG_URL:= http://cdrecord.berlios.de/private/cdrecord.html
PKG_SITES:= ftp://ftp.berlios.de/pub/cdrecord/
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 6497eac..6c114cd 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= cfgfs
PKG_VERSION:= 1.0.10
PKG_RELEASE:= 1
PKG_DESCR:= compressed config filesystem
-PKG_SECTION:= base
+PKG_SECTION:= base/apps
PKG_URL:= http://openadk.org/
PKG_CFLINE_CFGFS:= select BUSYBOX_COMM@
diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile
index 375dab2..194c8d3 100644
--- a/package/cgilib/Makefile
+++ b/package/cgilib/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= cgilib
PKG_VERSION:= 0.7
PKG_RELEASE:= 3
PKG_MD5SUM:= 2c7053f58dfb06f7a80a112797ed7e86
-PKG_DESCR:= simple CGI library
-PKG_SECTION:= libs
+PKG_DESCR:= simple cgi library
+PKG_SECTION:= libs/net
PKG_BUILDDEP:= autotool
PKG_URL:= http://www.infodrom.org/projects/cgilib/
PKG_SITES:= http://www.infodrom.org/projects/cgilib/download/
diff --git a/package/check/Makefile b/package/check/Makefile
index a64d4bb..63a8e9d 100644
--- a/package/check/Makefile
+++ b/package/check/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= check
PKG_VERSION:= 0.9.12
PKG_RELEASE:= 2
PKG_MD5SUM:= 46fe540d1a03714c7a1967dbc6d484e7
-PKG_DESCR:= unit testing framework for C
-PKG_SECTION:= libs
+PKG_DESCR:= unit testing framework for c
+PKG_SECTION:= libs/misc
PKG_URL:= http://check.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=check/}
PKG_LIBNAME:= libcheck
diff --git a/package/cherokee/Makefile b/package/cherokee/Makefile
index a63f4ac..194e733 100644
--- a/package/cherokee/Makefile
+++ b/package/cherokee/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.101
PKG_RELEASE:= 1
PKG_MD5SUM:= ef47003355a2e368e4d9596cd070ef23
PKG_DESCR:= small and fast webserver
-PKG_SECTION:= www
+PKG_SECTION:= net/http
PKG_URL:= http://www.cherokee-project.com
PKG_SITES:= http://www.cherokee-project.de/mirrors/cherokee/1.2/${PKG_VERSION}/
diff --git a/package/cherrypy/Makefile b/package/cherrypy/Makefile
index b103c02..f904be4 100644
--- a/package/cherrypy/Makefile
+++ b/package/cherrypy/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.3.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 4ac4af5ac21a893f07221cbd7ec4be11
PKG_DESCR:= python web framework
-PKG_SECTION:= libs
+PKG_SECTION:= net/http
PKG_DEPENDS:= python2
PKG_BUILDDEP:= python2
PKG_URL:= http://www.cherrypy.org/
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index aa5c084..27b895a 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= chillispot
PKG_VERSION:= 1.1.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b
-PKG_DESCR:= wireless LAN access point controller
-PKG_SECTION:= wifi
+PKG_DESCR:= wireless lan access point controller
+PKG_SECTION:= net/wifi
PKG_BUILDDEP:= autotool
PKG_URL:= http://www.chillispot.info/
PKG_SITES= http://www.chillispot.info/download/
diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index c58a8ec..e0a60ad 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= cifs-utils
PKG_VERSION:= 6.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 93697dbc043cb4d5c66e15e281f872e5
-PKG_DESCR:= CIFS network filesystem utilities
+PKG_DESCR:= network filesystem utilities
PKG_SECTION:= net/fs
PKG_BUILDDEP:= autotool
PKG_URL:= https://wiki.samba.org/index.php/LinuxCIFS_utils
@@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,CIFS_UTILS,cifs-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_STATIC),y)
-TARGET_LDFLAGS+= -static
-endif
-
AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ARGS+= --disable-cifsupcall \
--disable-cifsidmap \
diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index 4475acf..7e43f23 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= classpath
PKG_VERSION:= 0.98
PKG_RELEASE:= 1
PKG_MD5SUM:= 90c6571b8b0309e372faa0f9f6255ea9
-PKG_DESCR:= GNU Classpath
-PKG_SECTION:= lang
+PKG_DESCR:= java classpath
+PKG_SECTION:= dev/tools
PKG_BUILDDEP:= gtk+ gdk-pixbuf orbit2 gconf
PKG_DEPENDS:= libgtk gdk-pixbuf orbit2 gconf
PKG_URL:= http://www.gnu.org/software/classpath/home.html
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 890ada3..1a983c3 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.8.12
PKG_RELEASE:= 2
PKG_MD5SUM:= 105bc6d21cc2e9b6aff901e43c53afea
PKG_DESCR:= cmake utility
-PKG_SECTION:= lang
+PKG_SECTION:= dev/tools
PKG_URL:= http://www.cmake.org/
PKG_SITES:= http://www.cmake.org/files/v2.8/
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index bee32f0..c47168d 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 6514ab3f7fd2135d2713f1ab25068841
PKG_DESCR:= system statistics collection daemon
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_BUILDDEP:= libtool
PKG_DEPENDS:= libpthread libltdl
PKG_URL:= http://collectd.org/
diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index f843381..f606bee 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= comgt
PKG_VERSION:= 0.32
PKG_RELEASE:= 3
PKG_MD5SUM:= db2452680c3d953631299e331daf49ef
-PKG_DESCR:= 3G/GPRS datacard control tool
-PKG_SECTION:= utils
+PKG_DESCR:= 3g/gprs datacard control tool
+PKG_SECTION:= sys/utils
PKG_URL:= http://sourceforge.net/projects/comgt
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=comgt/}
diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile
index 5300e97..2126886 100644
--- a/package/compositeproto/Makefile
+++ b/package/compositeproto/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= compositeproto
PKG_VERSION:= 0.4.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 2dea7c339432b3363faf2d29c208e7b5
-PKG_DESCR:= X11 composite headers
-PKG_SECTION:= devel
+PKG_DESCR:= composite headers
+PKG_SECTION:= dev/header
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/confuse/Makefile b/package/confuse/Makefile
index 4f671a9..2587c32 100755
--- a/package/confuse/Makefile
+++ b/package/confuse/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 45932fdeeccbb9ef4228f1c1a25e9c8f
PKG_DESCR:= configuration file parser library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.nongnu.org/confuse/
PKG_SITES:= http://savannah.nongnu.org/download/confuse/
PKG_LIBNAME:= libconfuse
diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile
index f5a0086..f6c81d0 100644
--- a/package/conntrack-tools/Makefile
+++ b/package/conntrack-tools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.2
PKG_RELEASE:= 1
PKG_MD5SUM:= b1f9d006e7bf000a77395ff7cd3fac16
PKG_DESCR:= connection tracking userspace tools
-PKG_SECTION:= firewall
+PKG_SECTION:= net/firewall
PKG_DEPENDS:= libtirpc libnetfilter_queue libnetfilter-conntrack libnetfilter-cttimeout libnetfilter-cthelper libmnl
PKG_BUILDDEP:= libtirpc libnetfilter_queue libnetfilter_conntrack libnetfilter_cttimeout libnetfilter_cthelper libmnl
PKG_URL:= http://conntrack-tools.netfilter.org/
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile
index 855e99a..25cc677 100644
--- a/package/coreutils/Makefile
+++ b/package/coreutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 8.22
PKG_RELEASE:= 3
PKG_MD5SUM:= 8fb0ae2267aa6e728958adc38f8163a2
PKG_DESCR:= basic file, shell and text manipulation utilities
-PKG_SECTION:= core
+PKG_SECTION:= base/apps
PKG_BUILDDEP:= gmp autotool
PKG_URL:= http://www.gnu.org/software/coreutils/
PKG_SITES:= http://ftp.gnu.org/gnu/coreutils/
diff --git a/package/cpio/Makefile b/package/cpio/Makefile
index cbe8cc3..abf8901 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:= archive utility
-PKG_SECTION:= archive
+PKG_SECTION:= app/archive
PKG_URL:= http://www.gnu.org/software/cpio/
PKG_SITES:= ${MASTER_SITE_GNU:=cpio/}
PKG_BB:= 1
diff --git a/package/cpufrequtils/Makefile b/package/cpufrequtils/Makefile
index c8588ed..575d962 100644
--- a/package/cpufrequtils/Makefile
+++ b/package/cpufrequtils/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= cpufrequtils
PKG_VERSION:= 008
PKG_RELEASE:= 1
PKG_MD5SUM:= 52d3e09e47ffef634833f7fab168eccf
-PKG_DESCR:= utilities for the Linux kernel cpufreq subsystem
-PKG_SECTION:= utils
+PKG_DESCR:= utilities for cpufreq subsystem
+PKG_SECTION:= sys/utils
PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index 9cb15f9..1193537 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= cryptinit
PKG_VERSION:= 2.0
PKG_RELEASE:= 1
PKG_DESCR:= init for encrypted rootfilesystem
-PKG_SECTION:= base
+PKG_SECTION:= base/misc
PKG_DEPENDS:= cryptsetup
PKG_CFLINE_CRYPTINIT:= select BUSYBOX_STTY@
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile
index 4dc988f..90de5e5 100644
--- a/package/cryptodev-linux/Makefile
+++ b/package/cryptodev-linux/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= cryptodev-linux
PKG_VERSION:= 1.6
PKG_RELEASE:= 3
PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea
-PKG_DESCR:= cryptodev-linux kernel module
-PKG_SECTION:= crypto
+PKG_DESCR:= device that allows access to kernel cryptographic drivers
+PKG_SECTION:= app/crypto
PKG_BUILDDEP:= openssl
PKG_URL:= http://home.gna.org/cryptodev-linux/
PKG_SITES:= http://download.gna.org/cryptodev-linux/
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index 2e9d42f..234e0ee 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= cryptsetup
PKG_VERSION:= 1.6.3
PKG_RELEASE:= 1
PKG_MD5SUM:= a7aeb549a543eeac433eadfb6bc67837
-PKG_DESCR:= LUKS cryptsetup tools
-PKG_SECTION:= crypto
+PKG_DESCR:= utility used to conveniently setup disk encryption
+PKG_SECTION:= app/crypto
PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt
PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt
PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index 95a7923..dc76949 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ctorrent
PKG_VERSION:= dnh3.3.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6
-PKG_DESCR:= console-based BitTorrent client
-PKG_SECTION:= p2p
+PKG_DESCR:= console-based bittorrent client
+PKG_SECTION:= app/p2p
PKG_DEPENDS:= libstdcxx
PKG_BUILDDEP:= openssl
PKG_URL:= http://www.rahul.net/dholmes/ctorrent
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 0272d30..6efa5b3 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= cups
PKG_VERSION:= 1.7.1
PKG_RELEASE:= 4
PKG_MD5SUM:= 55277c40fd4b7183dc3671d39c5c42b7
-PKG_DESCR:= Common Unix Printing System
+PKG_DESCR:= common unix printing system
PKG_SECTION:= net/misc
PKG_DEPENDS:= zlib libpthread libstdcxx
PKG_BUILDDEP:= cups-host zlib
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 55ac89c..0a03090 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= curl
PKG_VERSION:= 7.37.0
PKG_RELEASE:= 1
PKG_MD5SUM:= c35d0b20a7ef38951da81b6cae7e5c36
-PKG_DESCR:= client-side URL transfer tool
-PKG_SECTION:= www
+PKG_DESCR:= client-side url transfer tool
+PKG_SECTION:= net/http
PKG_DEPENDS:= libcurl
PKG_BUILDDEP:= zlib
PKG_URL:= http://curl.haxx.se/
@@ -19,19 +19,19 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= CURL LIBCURL
-PKGSD_LIBCURL:= client-side URL transfer library
-PKGSC_LIBCURL:= libs
+PKGSD_LIBCURL:= client-side url transfer library
+PKGSC_LIBCURL:= libs/net
PKGSS_LIBCURL:= zlib
PKG_FLAVOURS_CURL:= WITH_IPV6
-PKGFD_WITH_IPV6:= enable IPv6 support
+PKGFD_WITH_IPV6:= enable ipv6 support
PKG_CHOICES_LIBCURL:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL
-PKGCD_WITHOUT_SSL:= use no SSL
-PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
+PKGCD_WITHOUT_SSL:= use no ssl
+PKGCD_WITH_OPENSSL:= use openssl for crypto
PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp
PKGCB_WITH_OPENSSL:= openssl
-PKGCD_WITH_GNUTLS:= use GnuTLS for crypto
+PKGCD_WITH_GNUTLS:= use gnutls for crypto
PKGCS_WITH_GNUTLS:= libgnutls ca-certificates libgmp
PKGCB_WITH_GNUTLS:= gnutls
diff --git a/package/cutter/Makefile b/package/cutter/Makefile
index ca4b12b..86ca925 100755
--- a/package/cutter/Makefile
+++ b/package/cutter/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= cutter
PKG_VERSION:= 1.03
PKG_RELEASE:= 2
PKG_MD5SUM:= 50093db9b64277643969ee75b83ebbd1
-PKG_DESCR:= Abort TCP/IP connections routed over a firewall
-PKG_SECTION:= firewall
+PKG_DESCR:= abort tcp/ip connections routed over a firewall
+PKG_SECTION:= net/firewall
PKG_URL:= http://www.lowth.com/cutter/software/
PKG_SITES:= http://openadk.org/distfiles/
@@ -22,8 +22,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter
diff --git a/package/cvs/Makefile b/package/cvs/Makefile
index 8dd9585..f8929f2 100644
--- a/package/cvs/Makefile
+++ b/package/cvs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.11.23
PKG_RELEASE:= 2
PKG_MD5SUM:= bf185eb51b5918330a04671c3f3cccde
PKG_DESCR:= concurrent version system
-PKG_SECTION:= scm
+PKG_SECTION:= dev/scm
PKG_URL:= http://www.nongnu.org/cvs/
PKG_SITES:= http://ftp.gnu.org/non-gnu/cvs/source/stable/${PKG_VERSION}/
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index f28d82f..c0f0afe 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:= cxxtools
PKG_VERSION:= 2.2.1
PKG_RELEASE:= 2
PKG_MD5SUM:= aab00068ae5237435b37ac86f2ac7576
-PKG_DESCR:= collection of general-purpose C++ classes
+PKG_DESCR:= collection of general-purpose c++ classes
PKG_DEPENDS:= libstdcxx
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.tntnet.org/
PKG_SITES:= http://www.tntnet.org/download/
PKG_OPTS:= dev
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index a68084b..ad11432 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= cyrus-sasl
PKG_VERSION:= 2.1.26
PKG_RELEASE:= 2
PKG_MD5SUM:= a7f4e5e559a0e37b3ffc438c9456e425
-PKG_DESCR:= a general purpose authentication library
-PKG_SECTION:= libs
+PKG_DESCR:= general purpose authentication library
+PKG_SECTION:= libs/crypto
PKG_BUILDDEP:= openssl
PKG_DEPENDS:= libopenssl
PKG_URL:= http://cyrusimap.org/
diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile
index 5dec9b7..17a5f17 100644
--- a/package/damageproto/Makefile
+++ b/package/damageproto/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= damageproto
PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= bf8c47b7f48625230cff155180f8ddce
-PKG_DESCR:= X DAMAGE Extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= x damage extension headers
+PKG_SECTION:= dev/header
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index 5264f7d..55ee3d6 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.12.0.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 2a88d0392cd28eaec02b7ee727b2e253
PKG_DESCR:= web content filter proxy
-PKG_SECTION:= proxy
+PKG_SECTION:= net/proxy
PKG_DEPENDS:= libpcre zlib
PKG_BUILDDEP:= pcre zlib
PKG_URL:= http://dansguardian.org/
diff --git a/package/daq/Makefile b/package/daq/Makefile
index 61a50e2..dfc5872 100644
--- a/package/daq/Makefile
+++ b/package/daq/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= daq
PKG_VERSION:= 2.0.0
PKG_RELEASE:= 4
PKG_MD5SUM:= a00855a153647df76d47f1ea454f74ae
-PKG_DESCR:= daq
-PKG_SECTION:= libs
+PKG_DESCR:= data acquisition library
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpcap libdnet
PKG_BUILDDEP:= libpcap libdnet autotool
PKG_URL:= http://www.snort.org
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index 7555a01..0bfbc41 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= davfs2
PKG_VERSION:= 1.4.7
PKG_RELEASE:= 1
PKG_MD5SUM:= c75f9d7d260e7364362b89beba2b3186
-PKG_DESCR:= WebDAV filesystem
+PKG_DESCR:= webdav filesystem
PKG_SECTION:= net/fs
PKG_DEPENDS:= fuse-utils neon
PKG_BUILDDEP:= libiconv-tiny neon fuse
diff --git a/package/db/Makefile b/package/db/Makefile
index 4c73488..4a3ac57 100644
--- a/package/db/Makefile
+++ b/package/db/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.3.21
PKG_RELEASE:= 2
PKG_MD5SUM:= 3fda0b004acdaa6fa350bfc41a3b95ca
PKG_DESCR:= disk file format database which stores key/data-pairs in single files
-PKG_SECTION:= libs
+PKG_SECTION:= libs/db
PKG_DEPENDS:= libstdcxx
PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db
PKG_SITES:= http://www.openadk.org/distfiles/
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile
index 6d6b3c9..a8bb274 100644
--- a/package/dbus-glib/Makefile
+++ b/package/dbus-glib/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= dbus-glib
PKG_VERSION:= 0.100.2
PKG_RELEASE:= 1
PKG_MD5SUM:= ad0920c7e3aad669163bb59171cf138e
-PKG_DESCR:= DBUS glib bindings
-PKG_SECTION:= libs
+PKG_DESCR:= glib bindings for dbus
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libdbus glib
PKG_BUILDDEP:= dbus glib
PKG_URL:= http://www.freedesktop.org/wiki/Software/DBusBindings
@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-checks
CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no
diff --git a/package/dbus-python/Makefile b/package/dbus-python/Makefile
index b73d43a..4392a99 100644
--- a/package/dbus-python/Makefile
+++ b/package/dbus-python/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= dbus-python
PKG_VERSION:= 1.2.0
PKG_RELEASE:= 2
PKG_MD5SUM:= b09cd2d1a057cc432ce944de3fc06bf7
-PKG_DESCR:= DBUS python bindings
-PKG_SECTION:= libs
+PKG_DESCR:= python bindings for dbus
+PKG_SECTION:= dev/python
PKG_DEPENDS:= dbus dbus-glib
PKG_BUILDDEP:= dbus dbus-glib
PKG_URL:= http://dbus.freedesktop.org/doc/dbus-python/
@@ -30,7 +30,5 @@ dbus-python-install:
$(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop
$(CP) $(WRKINST)/usr/lib/python2.7/site-packages/dbus/mainloop/*.py \
$(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop
-
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 4a5dbae..65ef43b 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= dbus
PKG_VERSION:= 1.6.18
PKG_RELEASE:= 2
PKG_MD5SUM:= b02e9c95027a416987b81f9893831061
-PKG_DESCR:= DBUS daemon
-PKG_SECTION:= misc
+PKG_DESCR:= desktop bus daemon
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libdbus libexpat
PKG_BUILDDEP:= expat util-linux
PKG_URL:= http://dbus.freedesktop.org/
@@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= DBUS LIBDBUS
PKGSD_LIBDBUS:= DBUS library
-PKGSC_LIBDBUS:= libs
+PKGSC_LIBDBUS:= libs/misc
PKGSS_LIBDBUS:= libexpat libuuid
ifeq ($(ADK_STATIC),y)
@@ -33,7 +33,6 @@ $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
$(eval $(call PKG_template,LIBDBUS,libdbus,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBDBUS},${PKGSD_LIBDBUS},${PKGSC_LIBDBUS},${PKG_OPTS}))
TARGET_LDFLAGS+= -luuid
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-tests \
--disable-abstract-sockets \
--enable-checks \
diff --git a/package/deco/Makefile b/package/deco/Makefile
index eed3eb8..d6a7760 100644
--- a/package/deco/Makefile
+++ b/package/deco/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= deco
PKG_VERSION:= 39
PKG_RELEASE:= 2
PKG_MD5SUM:= f77f60e8be0cae1f814cba1ef61bf4d0
-PKG_DESCR:= text-based, full featured file manager
-PKG_SECTION:= misc
+PKG_DESCR:= full featured text-based file manager
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=deco/}
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index acecd9c..e50e8ed 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= dhcp-forwarder
PKG_VERSION:= 0.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 3b96dd27f6d05502d4048acab453808d
-PKG_DESCR:= DHCP relay agent
-PKG_SECTION:= dhcp
+PKG_DESCR:= dhcp relay agent
+PKG_SECTION:= net/dns
PKG_URL:= http://www.nongnu.org/dhcp-fwd/
PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index d0fd9c1..8b7a324 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -7,15 +7,15 @@ PKG_NAME:= dhcp
PKG_VERSION:= 4.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 38a74c89d8913b9b5f33737047623c18
-PKG_DESCR:= ISC DHCP server
-PKG_SECTION:= dhcp
+PKG_DESCR:= dhcp server
+PKG_SECTION:= net/dns
PKG_URL:= https://www.isc.org/software/dhcp/
PKG_SITES:= ftp://ftp.isc.org/isc/dhcp/${PKG_VERSION}/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= DHCP_SERVER DHCP_RELAY
-PKGSD_DHCP_RELAY:= ISC DHCP relay server
+PKGSD_DHCP_RELAY:= dhcp relay server
include ${TOPDIR}/mk/package.mk
diff --git a/package/dialog/Makefile b/package/dialog/Makefile
index 755dd99..223f50f 100644
--- a/package/dialog/Makefile
+++ b/package/dialog/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2-20130928
PKG_RELEASE:= 1
PKG_MD5SUM:= 2cf55cd9d4603ffdb4b24cd6843d740c
PKG_DESCR:= text gui interface
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_SITES:= ftp://ftp.us.debian.org/debian/pool/main/d/dialog/
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile
index d0502b6..166d39c 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:= lang
+PKG_SECTION:= sys/utils
PKG_URL:= http://www.gnu.org/software/diffutils/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
PKG_BB:= 1
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index 30baec1..f4ac13a 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 9be2e48db37920f21925ae6e88f83b84
PKG_DESCR:= program for reading values from 1-wire devices
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libusb
PKG_BUILDDEP:= libusb libusb-compat
PKG_URL:= http://www.digitemp.com/software/linux/
diff --git a/package/dmidecode/Makefile b/package/dmidecode/Makefile
index aa10971..8e142ea 100644
--- a/package/dmidecode/Makefile
+++ b/package/dmidecode/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.11
PKG_RELEASE:= 1
PKG_MD5SUM:= 9fddbbc3e330bee5950b8b5d424a57cb
PKG_DESCR:= reports information about your system's hardware
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_URL:= http://www.nongnu.org/dmidecode/
PKG_SITES:= http://download.savannah.gnu.org/releases/dmidecode/
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 88239aa..fe1e51c 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= dnsmasq
PKG_VERSION:= 2.70
PKG_RELEASE:= 1
PKG_MD5SUM:= 1d654e80888ab5dbba015548fd284d46
-PKG_DESCR:= lightweight DNS and DHCP server
-PKG_SECTION:= dns
+PKG_DESCR:= lightweight dns, dhcp and tftp server
+PKG_SECTION:= net/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 4fcfcc8..95651e4 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.26
PKG_RELEASE:= 5
PKG_MD5SUM:= 45012f5f56f2aae3afcd62120b9e5a08
PKG_DESCR:= utilities to create and check FAT filesystems
-PKG_SECTION:= fs
+PKG_SECTION:= sys/fs
PKG_BUILDDEP:= libiconv-tiny
PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools/
PKG_SITES:= http://daniel-baumann.ch/files/software/dosfstools/
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index ab36f43..4f5daae 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 25395269fa2e0525e2d144d71d0450eb
PKG_DESCR:= minimal and secure imap server
PKG_BUILDDEP:= openssl
PKG_DEPENDS:= libopenssl
-PKG_SECTION:= mail
+PKG_SECTION:= net/mail
PKG_URL:= http://www.dovecot.org/
PKG_SITES:= http://www.dovecot.org/releases/2.2/
diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index a80363f..e58a33c 100644
--- a/package/drbd/Makefile
+++ b/package/drbd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 8.4.4
PKG_RELEASE:= 2
PKG_MD5SUM:= b51815343c1a9151e2936b3b97520388
PKG_DESCR:= admin tools for drbd
-PKG_SECTION:= fs
+PKG_SECTION:= sys/fs
PKG_URL:= http://www.drbd.org/
PKG_SITES:= http://oss.linbit.com/drbd/8.4/
diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile
index ed79520..2353280 100644
--- a/package/dri2proto/Makefile
+++ b/package/dri2proto/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= dri2proto
PKG_VERSION:= 2.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 19ea18f63d8ae8053c9fa84b60365b77
-PKG_DESCR:= DRI2 protocol headers
-PKG_SECTION:= devel
+PKG_DESCR:= dri2 protocol headers
+PKG_SECTION:= dev/header
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/dri3proto/Makefile b/package/dri3proto/Makefile
index 4682089..957f790 100644
--- a/package/dri3proto/Makefile
+++ b/package/dri3proto/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= dri3proto
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 25e84a49a076862277ee12aebd49ff5f
-PKG_DESCR:= DRI protocol headers
-PKG_SECTION:= devel
+PKG_DESCR:= dri3 protocol headers
+PKG_SECTION:= dev/header
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index c73d34a..2de8b0b 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= dropbear
PKG_VERSION:= 2014.63
PKG_RELEASE:= 2
PKG_MD5SUM:= 7066bb9a2da708f3ed06314fdc9c47fd
-PKG_DESCR:= SSH 2 server/client designed for embedded systems
+PKG_DESCR:= ssh server/client designed for embedded systems
PKG_SECTION:= net/security
PKG_URL:= http://matt.ucc.asn.au/dropbear/
PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/
@@ -25,10 +25,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,DROPBEAR,dropbear,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION}))
-ifeq ($(ADK_STATIC),y)
-TARGET_LDFLAGS+= -static
-endif
-
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
CONFIGURE_ARGS+= --disable-pam \
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index 2a59865..80d40c5 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4b1
PKG_RELEASE:= 2
PKG_MD5SUM:= 2f761fa3475682a7512b0b43568ee7d6
PKG_DESCR:= tools for network auditing and penetration testing
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libnet libpcap libnids libopenssl libgdbm
PKG_BUILDDEP:= libnids openssl gdbm libpcap libnet
PKG_URL:= http://www.monkey.org/~dugsong/dsniff/
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index b102014..a93185c 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= e2fsprogs
PKG_VERSION:= 1.42.9
PKG_RELEASE:= 2
PKG_MD5SUM:= 3f8e41e63b432ba114b33f58674563f7
-PKG_DESCR:= Ext2/3/4 filesystem utilities
-PKG_SECTION:= fs
+PKG_DESCR:= ext2/3/4 filesystem utilities
+PKG_SECTION:= sys/fs
PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= util-linux
PKG_URL:= http://e2fsprogs.sourceforge.net/
@@ -20,22 +20,22 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS
PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS
PKGSD_LIBE2FS:= e2fsprogs library
-PKGSC_LIBE2FS:= libs
+PKGSC_LIBE2FS:= libs/misc
PKGSD_LIBCOM_ERR:= common error library
-PKGSC_LIBCOM_ERR:= libs
+PKGSC_LIBCOM_ERR:= libs/misc
PKGSD_LIBSS:= subsystem command parsing library
-PKGSC_LIBSS:= libs
+PKGSC_LIBSS:= libs/misc
PKGSD_RESIZE2FS:= ext2/3/4 resize utility
-PKGSC_RESIZE2FS:= fs
+PKGSC_RESIZE2FS:= sys/fs
PKGSS_RESIZE2FS:= libe2fs libcom-err libblkid
PKGSD_TUNE2FS:= ext2/3/4 tune utility
-PKGSC_TUNE2FS:= fs
+PKGSC_TUNE2FS:= sys/fs
PKGSS_TUNE2FS:= libe2fs libcom-err libblkid libuuid
PKGSD_E2FSCK:= ext2/3/4 filesystem check utility
-PKGSC_E2FSCK:= fs
+PKGSC_E2FSCK:= sys/fs
PKGSS_E2FSCK:= libe2fs libcom-err libblkid libuuid
PKGSD_MKE2FS:= ext2/3/4 filesystem creation utility
-PKGSC_MKE2FS:= fs
+PKGSC_MKE2FS:= sys/fs
PKGSS_MKE2FS:= libe2fs libcom-err libblkid libuuid libncurses
include ${TOPDIR}/mk/package.mk
diff --git a/package/easy-rsa/Makefile b/package/easy-rsa/Makefile
index ec7ab8f..5d17fa0 100644
--- a/package/easy-rsa/Makefile
+++ b/package/easy-rsa/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= cd55a94b0785a0b1e1076b4dc018d531
PKG_DESCR:= openssl ca scripts
-PKG_SECTION:= crypto
+PKG_SECTION:= app/crypto
PKG_DEPENDS:= openssl-util
PKG_URL:= https://github.com/OpenVPN/easy-rsa
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index e39f580..2c4ddd7 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 506742a3d44b9925955425a659c1a8d0
PKG_DESCR:= ethernet bridging firewall tool
-PKG_SECTION:= firewall
+PKG_SECTION:= net/route
PKG_URL:= http://ebtables.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ebtables/}
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 73c5555..c8eb494 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 7339f199ba11c941890031fd9981d7be
PKG_DESCR:= ecj java compiler
-PKG_SECTION:= lang
+PKG_SECTION:= dev/lang
PKG_SITES:= ftp://sourceware.org/pub/java/
PKG_CFLINE_ECJ:= depends on ADK_HOST_ONLY
diff --git a/package/ed/Makefile b/package/ed/Makefile
index 70a4a5d..6623751 100644
--- a/package/ed/Makefile
+++ b/package/ed/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5
PKG_RELEASE:= 1
PKG_MD5SUM:= e66c03d7e4c67b025d5b6093ec678267
PKG_DESCR:= unix editor
-PKG_SECTION:= editor
+PKG_SECTION:= app/editor
PKG_URL:= http://www.gnu.org/software/ed/ed.html
PKG_SITES:= ${MASTER_SITE_GNU:=ed/}
PKG_BB:= 1
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index 77b5cf1..55f326e 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:= browser
+PKG_SECTION:= app/browser
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP:= openssl
PKG_URL:= http://elinks.or.cz/
diff --git a/package/esound/Makefile b/package/esound/Makefile
index 20a0662..02c72fe 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.41
PKG_RELEASE:= 8
PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688
PKG_DESCR:= enlightened sound daemon
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libaudiofile libesd
PKG_BUILDDEP:= libaudiofile autotool
PKG_URL:= http://www.tux.org/~ricdude/EsounD.html
@@ -19,8 +19,8 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= ESOUND LIBESD
-PKGSC_LIBESD:= libs
-PKGSD_LIBESD:= Esound library
+PKGSC_LIBESD:= libs/audio
+PKGSD_LIBESD:= esound library
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index 9e82c31..637009a 100644
--- a/package/ether-wake/Makefile
+++ b/package/ether-wake/Makefile
@@ -6,12 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ether-wake
PKG_VERSION:= 1.09
PKG_RELEASE:= 1
-PKG_DESCR:= Wake-On-LAN (WOL) client
-PKG_SECTION:= net
+PKG_DESCR:= wake-on-lan client
+PKG_SECTION:= net/misc
PKG_BB:= 1
PKG_LIBC_DEPENDS:= uclibc glibc
-
NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
@@ -22,8 +21,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-o ${WRKBUILD}/ether-wake ${WRKBUILD}/ether-wake.c
diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile
index e4d859a..7916d43 100644
--- a/package/ethtool/Makefile
+++ b/package/ethtool/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.13
PKG_RELEASE:= 2
PKG_MD5SUM:= dcb8f345d44ee79108282e7d0bdf5013
PKG_DESCR:= display or change ethernet card settings
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= https://www.kernel.org/pub/software/network/ethtool/
include ${TOPDIR}/mk/package.mk
diff --git a/package/eudev/Makefile b/package/eudev/Makefile
index d2bbf8c..cf16880 100644
--- a/package/eudev/Makefile
+++ b/package/eudev/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 51380938b489385cc394f4ebabc048f0
PKG_DESCR:= device manager (udev clone)
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_BUILDDEP:= gperf-host glib
PKG_DEPENDS:= glib
PKG_URL:= http://www.gentoo.org/proj/en/eudev/
@@ -19,9 +19,9 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= UDEV LIBUDEV
-PKGSD_UDEV:= Dynamic device management manager
-PKGSC_LIBUDEV:= libs
-PKGSD_LIBUDEV:= Dynamic device management library
+PKGSD_UDEV:= dynamic device management manager
+PKGSC_LIBUDEV:= libs/misc
+PKGSD_LIBUDEV:= dynamic device management library
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/eventlog/Makefile b/package/eventlog/Makefile
index 110886f..99c46c3 100644
--- a/package/eventlog/Makefile
+++ b/package/eventlog/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.12
PKG_RELEASE:= 1
PKG_MD5SUM:= a044b1cd097613c3c1d09c4a7de51c43
PKG_DESCR:= eventlog library for syslog-ng
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.balabit.com
PKG_SITES:= http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.5.4.1/source/
diff --git a/package/evieext/Makefile b/package/evieext/Makefile
index e696d4a..cdfac64 100644
--- a/package/evieext/Makefile
+++ b/package/evieext/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= evieext
PKG_VERSION:= 1.1.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 68e61ce53caa495a3ad4085f66010eb8
-PKG_DESCR:= collection of XEVIE extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= collection of xevie extension headers
+PKG_SECTION:= dev/header
PKG_SITES:= ftp://ftp.x.org/pub/individual/proto/
PKG_OPTS:= dev devonly
diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile
index c1191c6..0a221d9 100644
--- a/package/evilwm/Makefile
+++ b/package/evilwm/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= evilwm
PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 5f14cc3019320860c85bb07c60a76bd7
-PKG_DESCR:= minimalist window manager for the X Window System
+PKG_DESCR:= minimalist window manager
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libx11 libxext
PKG_BUILDDEP:= libX11 libXext
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 6755f89..1ea6177 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.1
PKG_RELEASE:= 4
PKG_MD5SUM:= 55aec784e214037e61400287a55b5426
PKG_DESCR:= memory analysing tools
-PKG_SECTION:= debug
+PKG_SECTION:= app/debug
PKG_DEPENDS:= libreadline glib
PKG_BUILDDEP:= glib readline autotool
PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/
diff --git a/package/expat/Makefile b/package/expat/Makefile
index 8046858..126a6b7 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= expat
PKG_VERSION:= 2.0.1
PKG_RELEASE:= 2
PKG_MD5SUM:= ee8b492592568805593f81f8cdf2a04c
-PKG_DESCR:= XML parsing library
-PKG_SECTION:= libs
+PKG_DESCR:= xml parsing library
+PKG_SECTION:= libs/data
PKG_URL:= http://expat.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/}
PKG_LIBNAME:= libexpat
diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile
index 73d40a2..8c9af89 100644
--- a/package/ez-ipupdate/Makefile
+++ b/package/ez-ipupdate/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ez-ipupdate
PKG_VERSION:= 3.0.11b8
PKG_RELEASE:= 11
PKG_MD5SUM:= 000211add4c4845ffa4211841bff4fb0
-PKG_DESCR:= client for dynamic DNS services
-PKG_SECTION:= dns
+PKG_DESCR:= client for dynamic dns services
+PKG_SECTION:= net/dns
PKG_URL:= http://ez-ipupdate.com/
PKG_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/
diff --git a/package/faac/Makefile b/package/faac/Makefile
index b6d8e35..a64dd29 100644
--- a/package/faac/Makefile
+++ b/package/faac/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= faac
PKG_VERSION:= 1.28
PKG_RELEASE:= 1
PKG_MD5SUM:= 80763728d392c7d789cde25614c878f6
-PKG_DESCR:= AAC encoder
-PKG_SECTION:= libs
+PKG_DESCR:= aac encoder library
+PKG_SECTION:= libs/audio
PKG_URL:= http://www.audiocoding.com/faac.html
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/}
PKG_LIBNAME:= libfaac
diff --git a/package/faad2/Makefile b/package/faad2/Makefile
index d6ce720..83101c4 100644
--- a/package/faad2/Makefile
+++ b/package/faad2/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= faad2
PKG_VERSION:= 2.7
PKG_RELEASE:= 1
PKG_MD5SUM:= ee1b4d67ea2d76ee52c5621bc6dbf61e
-PKG_DESCR:= MP4 decoding library
-PKG_SECTION:= libs
+PKG_DESCR:= mp4 decoding library
+PKG_SECTION:= libs/video
PKG_BUILDDEP:= autotool
PKG_URL:= http://sourceforge.net/projects/faac/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/}
@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
AUTOTOOL_STYLE:= autoreconf
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
# check for lrintf fails on Darwin, don't know why
CONFIGURE_ENV+= ac_cv_c99_lrintf=yes
CONFIGURE_ARGS+= --without-mpeg4ip \
diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile
index cd3b1eb..78ba5cd 100644
--- a/package/fakeidentd/Makefile
+++ b/package/fakeidentd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= fakeidentd
PKG_VERSION:= 2.5
PKG_RELEASE:= 1
PKG_MD5SUM:= ebf398bd1843a1fd8c71f5fcf4a6e4f7
-PKG_DESCR:= secure identd
+PKG_DESCR:= secure ident daemon
PKG_SECTION:= net/misc
PKG_SITES:= http://distfiles.gentoo.org/distfiles/
@@ -22,8 +22,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-o ${WRKBUILD}/fakeidentd ${WRKBUILD}/identd.c
diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile
index d8e5458..b0b4a4f 100644
--- a/package/fastjar/Makefile
+++ b/package/fastjar/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.94
PKG_RELEASE:= 1
PKG_MD5SUM:= 14d4bdfac236e347d806c6743dba48c6
PKG_DESCR:= fastjar utility
-PKG_SECTION:= lang
+PKG_SECTION:= dev/tools
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fastjar/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index 7aa761d..44bf864 100644
--- a/package/fbset/Makefile
+++ b/package/fbset/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= e547cfcbb8c1a4f2a6b8ba4acb8b7164
PKG_DESCR:= framebuffer utility
PKG_DEPENDS:= bison-host flex-host
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_SITES:= http://users.telenet.be/geertu/Linux/fbdev/
PKG_BB:= 1
diff --git a/package/fbsplash/Makefile b/package/fbsplash/Makefile
index d487680..b40dacd 100644
--- a/package/fbsplash/Makefile
+++ b/package/fbsplash/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 2
PKG_MD5SUM:= aa0a9e735e086228bc245b18e231bf6c
PKG_DESCR:= framebuffer splash utility
-PKG_SECTION:= misc
+PKG_SECTION:= sys/utils
PKG_BUILDDEP:= libjpeg-turbo libpng freetype
PKG_DEPENDS:= libjpeg-turbo libpng libfreetype
PKG_URL:= https://github.com/alanhaggai/fbsplash
diff --git a/package/feh/Makefile b/package/feh/Makefile
index 4f9f564..7b43606 100644
--- a/package/feh/Makefile
+++ b/package/feh/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 6714dedeff1db5c3593c4a27b0d9cf50
PKG_DESCR:= image viewer
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/image
PKG_BUILDDEP:= imlib2 giblib libXt
PKG_DEPENDS:= imlib2 giblib
PKG_SITES:= http://feh.finalrewind.org/
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index 0d18d70..e30790f 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= fetchmail
PKG_VERSION:= 6.3.26
PKG_RELEASE:= 1
PKG_MD5SUM:= d9ae3d939205a3c06a21ea79b8f14793
-PKG_DESCR:= fetch mail from a POP or IMAP server
-PKG_SECTION:= mail
+PKG_DESCR:= fetch mail from a pop3 or imap server
+PKG_SECTION:= net/mail
PKG_URL:= http://fetchmail.berlios.de/
PKG_SITES:= http://download.berlios.de/fetchmail/
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index e06a04c..930b1f4 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 581affe5d820d89ce21fe3f0316ef2c3
PKG_DESCR:= record, convert and stream audio & video
-PKG_SECTION:= libs
+PKG_SECTION:= libs/video
PKG_FDEPENDS:= libpthread
PKG_URL:= http://www.ffmpeg.org/
PKG_SITES:= http://www.ffmpeg.org/releases/
@@ -16,21 +16,21 @@ PKH_LIBNAME:= libffmpeg
PKG_OPTS:= dev
PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG
-#PKGSD_FFPLAY:= ffmpeg based video player
-#PKGSC_FFPLAY:= multimedia
+#PKGSD_FFPLAY:= video player
+#PKGSC_FFPLAY:= mm/video
#PKGSS_FFPLAY:= libsdl libpthread libffmpeg
#PKGSB_FFPLAY:= sdl
-PKGSD_FFMPEG:= ffmpeg video converter
-PKGSC_FFMPEG:= multimedia
+PKGSD_FFMPEG:= video converter
+PKGSC_FFMPEG:= mm/video
PKGSS_FFMPEG:= libffmpeg
PKGSD_FFSERVER:= streaming server
-PKGSC_FFSERVER:= multimedia
+PKGSC_FFSERVER:= mm/video
PKGSS_FFSERVER:= libffmpeg
PKGSD_FFPROBE:= simple multimedia stream analyzer
-PKGSC_FFPROBE:= multimedia
+PKGSC_FFPROBE:= mm/video
PKGSS_FFPROBE:= libffmpeg
-PKGSD_LIBFFMPEG:= ffmpeg library
-PKGSC_LIBFFMPEG:= libs
+PKGSD_LIBFFMPEG:= video library
+PKGSC_LIBFFMPEG:= libs/video
PKG_FLAVOURS_LIBFFMPEG:= WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA
PKG_FLAVOURS_LIBFFMPEG+= WITH_XVID WITH_VORBIS WITH_X264
diff --git a/package/file/Makefile b/package/file/Makefile
index 398d4e4..7b47a65 100644
--- a/package/file/Makefile
+++ b/package/file/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.17
PKG_RELEASE:= 1
PKG_MD5SUM:= e19c47e069ced7b01ccb4db402cc01d3
PKG_DESCR:= file type guesser
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_BUILDDEP:= file-host
PKG_DEPENDS:= libmagic
PKG_URL:= http://www.darwinsys.com/file
@@ -21,7 +21,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= FILE LIBMAGIC
PKGSD_LIBMAGIC:= file type guesser library
-PKGSC_LIBMAGIC:= libs
+PKGSC_LIBMAGIC:= libs/misc
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 93f0d3d..250072f 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.4.2
PKG_RELEASE:= 6
PKG_MD5SUM:= 351cc4adb07d54877fa15f75fb77d39f
PKG_DESCR:= utilities for finding files
-PKG_SECTION:= core
+PKG_SECTION:= base/apps
PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= autotool
HOST_BUILDDEP:= autotool
diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile
index 2048bbe..cbc568c 100644
--- a/package/fixesproto/Makefile
+++ b/package/fixesproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= fixesproto
PKG_VERSION:= 5.0
PKG_RELEASE:= 1
-PKG_DESCR:= XFIXES Extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= xfixes extension headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 1b3115574cadd4cbea1f197faa7c1de4
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/flac/Makefile b/package/flac/Makefile
index 23dc252..cac21d7 100644
--- a/package/flac/Makefile
+++ b/package/flac/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 13b5c214cee8373464d3d65dee362cdd
PKG_DESCR:= free lossless audio codec library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/audio
PKG_URL:= http://flac.sourceforge.net
PKG_SITES:= http://downloads.xiph.org/releases/flac/
PKG_LIBNAME:= libflac
diff --git a/package/flex/Makefile b/package/flex/Makefile
index b0fa1c4..cf21386 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:= lang
+PKG_SECTION:= dev/tools
PKG_BUILDDEP:= m4-host flex-host
PKG_URL:= http://flex.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 0adfec2..7bae905 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.2
PKG_RELEASE:= 4
PKG_MD5SUM:= 9f7e707d4fb7a5a76f0f9b73ff70623d
PKG_DESCR:= fast light toolkit
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= mesalib libx11 libxi freeglut libfreetype
PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype
PKG_URL:= http://www.fltk.org/
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index 80dbfc8..887bc67 100644
--- a/package/fluxbox/Makefile
+++ b/package/fluxbox/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= fluxbox
PKG_VERSION:= 1.3.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 52e76de0ae96d8c5e87374661d0c7112
-PKG_DESCR:= X11 window manager featuring tabs and an iconbar
+PKG_DESCR:= window manager featuring tabs and an iconbar
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libstdcxx
PKG_BUILDDEP:= libXpm libXft
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index 07c5b9a..8bb8f63 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-adobe-100dpi
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= ba61e7953f4f5cec5a8e69c262bbc7f9
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_DEPENDS:= font-util
PKG_BUILDDEP:= font-util
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index 297ef69..6bd556c 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-adobe-75dpi
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 7a414bb661949cec938938fd678cf649
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_DEPENDS:= font-util
PKG_BUILDDEP:= font-util
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index 80fc101..f0006aa 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-bh-100dpi
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 09e63a5608000531179e1ab068a35878
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index c89c167..569e064 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-bh-75dpi
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 88fec4ebc4a265684bff3abdd066f14f
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index 9285b21..2e342c0 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-bh-lucidatypewriter-100dpi
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 5f716f54e497fb4ec1bb3a5d650ac6f7
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index 19873b5..c9e81a8 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-bh-lucidatypewriter-75dpi
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= cab8a44ae329aab7141c7adeef0daf5a
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index 2ae5704..850abe9 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-bh-ttf
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 4ce741ec4edaa11cd38988d355a7578b
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index 830d17f..4727254 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-bh-type1
PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 000da66f92370ac59e3df1b6719fdd9a
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index d0a9c3e..195904f 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-bitstream-100dpi
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= c27bf37e9b8039f93bd90b8131ed37ad
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index 24cc303..75fdb2a 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-bitstream-75dpi
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 4ff6c5d6aebe69371e27b09ad8313d25
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index b458618..26141b7 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-bitstream-type1
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= ff91738c4d3646d7999e00aa9923f2a0
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index e740c05..2454057 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-misc-misc
PKG_VERSION:= 1.1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 23a79b92275375315129b440206c85b9
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index eb1f3aa..d0dad32 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= font-util
PKG_VERSION:= 1.1.1
PKG_RELEASE:= 3
PKG_MD5SUM:= 171ebfd3733aeae3af91ad57d126d29d
-PKG_DESCR:= font util
-PKG_SECTION:= x11/apps
+PKG_DESCR:= font utility
+PKG_SECTION:= x11/fonts
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 b6efdd9..34a7456 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= font-xfree86-type1
PKG_VERSION:= 1.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 89c33c5176cd580de6636ad50ce7777b
-PKG_DESCR:= X fonts
+PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/fontcacheproto/Makefile b/package/fontcacheproto/Makefile
index 535f387..37a4b8e 100644
--- a/package/fontcacheproto/Makefile
+++ b/package/fontcacheproto/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= fontcacheproto
PKG_VERSION:= 0.1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= dc8c34a8c3559bf3b008bcdf7ba5a743
-PKG_SECTION:= devel
+PKG_SECTION:= dev/header
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 79a3c79..92a2ee9 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.11.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 84278204cd7f36adbea7ad8094e039ac
PKG_DESCR:= library for configuring and customizing font access
-PKG_SECTION:= libs
+PKG_SECTION:= libs/fonts
PKG_DEPENDS:= libxml2
PKG_BUILDDEP:= freetype libxml2 libiconv-tiny
HOST_BUILDDEP:= expat-host
diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile
index 5087ef0..ca4f2eb 100644
--- a/package/fontsproto/Makefile
+++ b/package/fontsproto/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 642a8c5700519a84efe28944afe5cbdc
PKG_DESCR:= fonts extension headers
-PKG_SECTION:= devel
+PKG_SECTION:= dev/header
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
index 5b727c0..330500d 100644
--- a/package/forked-daapd/Makefile
+++ b/package/forked-daapd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= forked-daapd
PKG_VERSION:= 0.19
PKG_RELEASE:= 1
PKG_MD5SUM:= 53e6f1d6683e3275e7c7698ec923a97e
-PKG_DESCR:= DAAPD server
-PKG_SECTION:= multimedia
+PKG_DESCR:= daapd server
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libunistring zlib libconfuse sqlite libffmpeg libgcrypt
PKG_DEPENDS+= libavahi libmxml libevent libavl libantlr3c alsa-lib
PKG_DEPENDS+= libsqlite libintl dbus
diff --git a/package/fping/Makefile b/package/fping/Makefile
index 52056f6..d56d2f9 100644
--- a/package/fping/Makefile
+++ b/package/fping/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 6a0ddecb671df1d580d20c0dd1095773
PKG_DESCR:= program to ping hosts in parallel
-PKG_SECTION:= net
+PKG_SECTION:= net/debug
PKG_URL:= http://fping.org
PKG_SITES:= http://fping.org/dist/
diff --git a/package/fprobe-ulog/Makefile b/package/fprobe-ulog/Makefile
index b87cd7b..109d4c6 100644
--- a/package/fprobe-ulog/Makefile
+++ b/package/fprobe-ulog/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= fprobe-ulog
PKG_VERSION:= 1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= cdb2e4edc47e8a3d5479eeabfb979ebc
-PKG_DESCR:= NetFlow probe
-PKG_SECTION:= net
+PKG_DESCR:= netflow probe
+PKG_SECTION:= net/acct
PKG_DEPENDS:= libpcap libpthread
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/}
diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile
index ba361e8..f11ceff 100644
--- a/package/fprobe/Makefile
+++ b/package/fprobe/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= fprobe
PKG_VERSION:= 1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 65850d0470078269b33eee58cba77ac2
-PKG_DESCR:= NetFlow probe
-PKG_SECTION:= net
+PKG_DESCR:= netflow probe
+PKG_SECTION:= net/acct
PKG_DEPENDS:= libpcap libpthread
PKG_BUILDDEP:= libpcap
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/}
diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index 0b9ec90..1a40a91 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= freeglut
PKG_VERSION:= 2.8.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 918ffbddcffbac83c218bc52355b6d5a
-PKG_DESCR:= OpenGL Utility Toolkit libraries
-PKG_SECTION:= libs
+PKG_DESCR:= opengl utility toolkit libraries
+PKG_SECTION:= libs/video
PKG_DEPENDS:= libglu libstdcxx
PKG_BUILDDEP:= glu
PKG_URL:= http://freeglut.sourceforge.net/
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
index a788856..92805fd 100644
--- a/package/freeradius-client/Makefile
+++ b/package/freeradius-client/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= freeradius-client
PKG_VERSION:= 1.1.6
PKG_RELEASE:= 2
PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7
-PKG_DESCR:= RADIUS client
-PKG_SECTION:= ppp
+PKG_DESCR:= radius client
+PKG_SECTION:= net/radius
PKG_DEPENDS:= libopenssl libfreeradius-client
PKG_BUILDDEP:= openssl
PKG_URL:= http://www.freeradius.org/
@@ -17,7 +17,7 @@ PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= FREERADIUS_CLIENT LIBFREERADIUS_CLIENT
-PKGSC_LIBFREERADIUS_CLIENT:= libs
+PKGSC_LIBFREERADIUS_CLIENT:= libs/net
include ${TOPDIR}/mk/package.mk
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index d05f35f..ce2af99 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= freeradius-server
PKG_VERSION:= 3.0.2
PKG_RELEASE:= 3
PKG_MD5SUM:= 3532b6439270f9da0ebfc03d3623f962
-PKG_DESCR:= flexible RADIUS server
-PKG_SECTION:= ppp
+PKG_DESCR:= flexible radius server
+PKG_SECTION:= net/radius
PKG_DEPENDS:= libltdl libopenssl libpthread libpcre
PKG_BUILDDEP:= autotool libtool openssl samba pcre
PKG_URL:= http://www.freeradius.org/
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 6563656..5270891 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.3
PKG_RELEASE:= 1
PKG_MD5SUM:= cafe9f210e45360279c730d27bf071e9
PKG_DESCR:= free, high-quality and portable font engine
-PKG_SECTION:= libs
+PKG_SECTION:= libs/fonts
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib freetype-host
PKG_URL:= http://www.freetype.org/
diff --git a/package/fribidi/Makefile b/package/fribidi/Makefile
index b3b3adf..23371b0 100644
--- a/package/fribidi/Makefile
+++ b/package/fribidi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.19.6
PKG_RELEASE:= 1
PKG_MD5SUM:= ce93d862344991173dabb609bf93ca1d
PKG_DESCR:= unicode bidirectional algorithm
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.fribidi.org/
PKG_SITES:= http://fribidi.org/download/
PKG_OPTS:= dev
diff --git a/package/frickin/Makefile b/package/frickin/Makefile
index 67545b5..4c00e1d 100644
--- a/package/frickin/Makefile
+++ b/package/frickin/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= frickin
PKG_VERSION:= 1.3
PKG_RELEASE:= 9
PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f
-PKG_DESCR:= PPTP proxy
-PKG_SECTION:= proxy
+PKG_DESCR:= pptp proxy
+PKG_SECTION:= net/proxy
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/}
PKG_NOPARALLEL:= 1
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 15f7ee2..befbacc 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.9.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 33cae22ca50311446400daf8a6255c6a
PKG_DESCR:= filesystem in userspace utility
-PKG_SECTION:= fs
+PKG_SECTION:= sys/fs
PKG_DEPENDS:= libfuse
PKG_BUILDDEP:= libiconv-tiny
PKG_URL:= http://fuse.sourceforge.net/
@@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= FUSE_UTILS LIBFUSE
PKGSD_LIBFUSE:= filesystem in userspace library
-PKGSC_LIBFUSE:= libs
+PKGSC_LIBFUSE:= libs/misc
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index e37daa8..c0cd0ac 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:= www
+PKG_SECTION:= net/http
PKG_BUILDDEP:= libowfat libiconv-tiny
PKG_URL:= http://www.fefe.de/gatling/
PKG_SITES:= http://dl.fefe.de/
diff --git a/package/gawk/Makefile b/package/gawk/Makefile
index f1a5386..21071ff 100644
--- a/package/gawk/Makefile
+++ b/package/gawk/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= gawk
PKG_VERSION:= 4.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= a2a26543ce410eb74bc4a508349ed09a
-PKG_DESCR:= AWK programming language interpreter
-PKG_SECTION:= lang
+PKG_DESCR:= awk programming language interpreter
+PKG_SECTION:= dev/lang
PKG_URL:= http://www.gnu.org/software/gawk/
PKG_SITES:= ${MASTER_SITE_GNU:=gawk/}
PKG_BB:= 1
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index b0d3194..1b81046 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -5,14 +5,14 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gcc/Makefile.inc
PKG_NAME:= gcc
-PKG_DESCR:= GNU C compiler
-PKG_SECTION:= lang
+PKG_DESCR:= c compiler
+PKG_SECTION:= dev/lang
PKG_OPTS:= noremove
PKG_DEPENDS:= libmpc libgmp mpfr
PKG_BUILDDEP:= libmpc gmp mpfr
PKG_SUBPKGS:= GCC GXX
-PKGSD_GXX:= GNU C++ compiler
+PKGSD_GXX:= c++ compiler
WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index cfa6427..4489324 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= gcj
PKG_VERSION:= 4.8.2
PKG_RELEASE:= 1
PKG_MD5SUM:= a3d7d63b9cb6b6ea049469a0c4a43c9d
-PKG_DESCR:= GNU java compiler
-PKG_SECTION:= lang
+PKG_DESCR:= java compiler
+PKG_SECTION:= dev/lang
PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
PKG_CFLINE_GCJ:= depends on ADK_HOST_ONLY
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index 38a14e6..92cc9a4 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 2.32.1
PKG_EXTRAVER:= 2.32
PKG_RELEASE:= 1
PKG_MD5SUM:= de83e70453910ac62f9ee2a86444bdab
-PKG_DESCR:= a system for storing application preferences
-PKG_SECTION:= libs
+PKG_DESCR:= system for storing application preferences
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= dbus dbus-glib orbit2
PKG_DEPENDS:= dbus dbus-glib orbit2
PKG_URL:= http://projects.gnome.org/gconf/
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 0ee1da3..a69cc58 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_NAME:= gdb
PKG_DESCR:= programm debugger
-PKG_SECTION:= debug
+PKG_SECTION:= app/debug
PKG_DEPENDS:= libthread-db libncurses libexpat zlib
PKG_BUILDDEP:= ncurses readline libiconv-tiny expat zlib
PKG_NOPARALLEL:= 1
@@ -15,11 +15,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_STATIC),y)
-TARGET_CFLAGS+= -static
-CONFIGURE_ARGS+= --enable-static
-endif
-
TARGET_CFLAGS+= ${TARGET_CPPFLAGS} -fPIC
CONFIGURE_ARGS+= --without-uiout \
--disable-tui \
diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile
index 847d53a..7fc6d3f 100644
--- a/package/gdbm/Makefile
+++ b/package/gdbm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.8.3
PKG_RELEASE:= 3
PKG_MD5SUM:= 1d1b1d5c0245b1c00aff92da751e9aa1
PKG_DESCR:= disk file format database
-PKG_SECTION:= libs
+PKG_SECTION:= libs/db
PKG_URL:= http://www.gnu.org/software/gdbm/
PKG_SITES:= ${MASTER_SITE_GNU:=gdbm/}
PKG_LIBNAME:= libgdbm
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 8138533..7f3e821 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_NAME:= gdb
PKG_DESCR:= remote programm debugger utility
-PKG_SECTION:= debug
+PKG_SECTION:= app/debug
PKG_DEPENDS:= libthread-db
PKG_ARCH_DEPENDS:= !m68k
diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile
index 22f24d5..bcc74f5 100644
--- a/package/gdk-pixbuf/Makefile
+++ b/package/gdk-pixbuf/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= gdk-pixbuf
PKG_VERSION:= 2.24.0
PKG_RELEASE:= 2
PKG_MD5SUM:= bd7c2a9d23b573db467e39833f12103d
-PKG_DESCR:= pixbuf library
-PKG_SECTION:= libs
+PKG_DESCR:= image loading and pixel buffer manipulation library
+PKG_SECTION:= libs/image
PKG_DEPENDS:= libstdcxx
PKG_BUILDDEP:= libjpeg-turbo libtiff
HOST_BUILDDEP:= glib-host
diff --git a/package/genext2fs/Makefile b/package/genext2fs/Makefile
index cf88ab0..7534848 100644
--- a/package/genext2fs/Makefile
+++ b/package/genext2fs/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= genext2fs
PKG_VERSION:= 1.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= b7b6361bcce2cedff1ae437fadafe53b
-PKG_DESCR:= genext2fs utility
-PKG_SECTION:= fs
+PKG_DESCR:= generate ext2 filesystem utility
+PKG_SECTION:= sys/fs
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=genext2fs/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile
index a09dc3b..120a766 100644
--- a/package/gettext-tiny/Makefile
+++ b/package/gettext-tiny/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= gettext-tiny
PKG_VERSION:= 0.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 09f6a74945df5961080234f7851f352c
-PKG_DESCR:= Gettext stub and replacement
-PKG_SECTION:= libs
+PKG_DESCR:= gettext stub and replacement
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= gettext-tiny-host
PKG_URL:= https://github.com/rofl0r/gettext-tiny
PKG_SITES:= http://ftp.barfooze.de/pub/sabotage/tarballs/
diff --git a/package/giblib/Makefile b/package/giblib/Makefile
index fc01902..9cd195b 100644
--- a/package/giblib/Makefile
+++ b/package/giblib/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.4
PKG_RELEASE:= 2
PKG_MD5SUM:= c810ef5389baf24882a1caca2954385e
PKG_DESCR:= imlib2 wrapper library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/image
PKG_DEPENDS:= imlib2
PKG_BUILDDEP:= imlib2
PKG_SITES:= http://linuxbrit.co.uk/downloads/
diff --git a/package/giflib/Makefile b/package/giflib/Makefile
index 8229a3c..e3ef993 100644
--- a/package/giflib/Makefile
+++ b/package/giflib/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= giflib
PKG_VERSION:= 4.1.6
PKG_RELEASE:= 3
PKG_MD5SUM:= 4ff2ecec336b9724c5190f06e8a40f9e
-PKG_DESCR:= GIF graphics library
-PKG_SECTION:= libs
+PKG_DESCR:= gif graphics library
+PKG_SECTION:= libs/image
PKG_URL:= http://sourceforge.net/projects/giflib/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
PKG_OPTS:= dev
diff --git a/package/git/Makefile b/package/git/Makefile
index 3bdf0f1..f202efb 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.8.4.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 6f63d103465b86ca0ebe4189ea54731c
PKG_DESCR:= fast version control system
-PKG_SECTION:= scm
+PKG_SECTION:= dev/scm
PKG_BUILDDEP:= openssl curl expat autotool
PKG_DEPENDS:= libopenssl libcurl libexpat libpthread
PKG_URL:= http://git-scm.com/
diff --git a/package/gkrellm/Makefile b/package/gkrellm/Makefile
index 86cd25b..6f3a933 100644
--- a/package/gkrellm/Makefile
+++ b/package/gkrellm/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= gkrellm
PKG_VERSION:= 2.3.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 05d00fa8d6376038b0c7e967583c0b8d
-PKG_DESCR:= GNU krell monitors server
+PKG_DESCR:= krell monitors server
PKG_SECTION:= net/misc
PKG_DEPENDS:= glib libpthread
PKG_BUILDDEP:= glib
diff --git a/package/glib/Makefile b/package/glib/Makefile
index b18056f..00560e4 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 2.38.2
PKG_RELEASE:= 4
PKG_EXTRAVER:= 2.38
PKG_MD5SUM:= 26d1d08e478fc48c181ca8be44f5b69f
-PKG_DESCR:= low-level core library that forms the basis of GTK+
-PKG_SECTION:= libs
+PKG_DESCR:= low-level core library that forms the basis of gtk+
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= glib-host libffi gettext-tiny libiconv-tiny zlib libelf dbus
HOST_BUILDDEP:= libffi-host gettext-tiny-host libiconv-tiny-host python2-host
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index acf7d86..b6440e4 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk
include $(TOPDIR)/toolchain/glibc/Makefile.inc
PKG_NAME:= glibc
-PKG_DESCR:= GNU C library
-PKG_SECTION:= base
+PKG_DESCR:= gnu c library
+PKG_SECTION:= base/libs
PKG_OPTS:= noremove
-PKG_SUBPKGS:= GLIBC GLIBC_DEV GLIBC_STATIC
+PKG_SUBPKGS:= GLIBC GLIBC_DEV
NO_DISTFILES:= 1
@@ -16,7 +16,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,GLIBC_STATIC,$(PKG_NAME)-static,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
diff --git a/package/glproto/Makefile b/package/glproto/Makefile
index 496437c..17a9510 100644
--- a/package/glproto/Makefile
+++ b/package/glproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= glproto
PKG_VERSION:= 1.4.17
PKG_RELEASE:= 1
-PKG_DESCR:= OpenGL headers
-PKG_SECTION:= devel
+PKG_DESCR:= opengl headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= d69554c1b51a83f2c6976a640819911b
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/glu/Makefile b/package/glu/Makefile
index d24c6fa..b691760 100644
--- a/package/glu/Makefile
+++ b/package/glu/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= glu
PKG_VERSION:= 9.0.0
PKG_RELEASE:= 1
PKG_MD5SUM:= be9249132ff49275461cf92039083030
-PKG_DESCR:= GLU library
-PKG_SECTION:= libs
+PKG_DESCR:= opengl utility library
+PKG_SECTION:= libs/video
PKG_URL:= http://cgit.freedesktop.org/mesa/glu/
PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/glu/
PKG_LIBNAME:= libglu
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index ab5ed4a..e5d93df 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= gmediaserver
PKG_VERSION:= 0.13.0
PKG_RELEASE:= 2
PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3
-PKG_DESCR:= UPnP music media server
-PKG_SECTION:= multimedia
+PKG_DESCR:= media server
+PKG_SECTION:= mm/video
PKG_DEPENDS:= id3lib libupnp libmagic
PKG_BUILDDEP:= id3lib libupnp file libiconv-tiny
PKG_URL:= http://www.gnu.org/software/gmediaserver
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 5d70773..38a5a64 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -5,8 +5,8 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gmp/Makefile.inc
PKG_NAME:= gmp
-PKG_DESCR:= GNU multiprecision arithmetic library
-PKG_SECTION:= libs
+PKG_DESCR:= multiprecision arithmetic library
+PKG_SECTION:= libs/misc
PKG_URL:= http://gmplib.org/
PKG_BUILDDEP:= m4-host flex-host bison-host
PKG_LIBNAME:= libgmp
diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile
index ed29979..3f34c0f 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:= crypto
+PKG_SECTION:= app/crypto
PKG_DEPENDS:= libreadline
PKG_BUILDDEP:= readline libiconv-tiny
PKG_URL:= http://www.gnupg.org/
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index cac41d5..ff2196d 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.2.14
PKG_RELEASE:= 1
PKG_MD5SUM:= 807bbf14a5b6c81a9249fffab5c3982b
PKG_DESCR:= transport layer security library
-PKG_SECTION:= crypto
+PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp
PKG_BUILDDEP:= libiconv-tiny libgcrypt liblzo libtasn1
PKG_BUILDDEP+= zlib ncurses libnettle
@@ -20,10 +20,10 @@ PKG_OPTS:= dev
PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL
PKGSD_GNUTLS_UTILS:= transport layer security utilities
PKGSS_GNUTLS_UTILS:= libgnutls libgnutls-extra
-PKGSC_GNUTLS_UTILS:= crypto
-PKGSC_LIBGNUTLS:= libs
-PKGSC_LIBGNUTLS_EXTRA:= libs
-PKGSC_LIBGNUTLS_OPENSSL:= libs
+PKGSC_GNUTLS_UTILS:= app/crypto
+PKGSC_LIBGNUTLS:= libs/crypto
+PKGSC_LIBGNUTLS_EXTRA:= libs/crypto
+PKGSC_LIBGNUTLS_OPENSSL:= libs/crypto
PKG_FLAVOURS_LIBGNUTLS:= WITH_CRYPTODEV
PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux
diff --git a/package/gperf/Makefile b/package/gperf/Makefile
index c8d2fe2..d7b1b56 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:= lang
+PKG_SECTION:= dev/tools
PKG_BUILDDEP:= gperf-host
PKG_DEPENDS:= libstdc++
PKG_URL:= http://www.gnu.org/software/gperf/
diff --git a/package/gpm/Makefile b/package/gpm/Makefile
index 8bcb52e..1513bb2 100644
--- a/package/gpm/Makefile
+++ b/package/gpm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.20.7
PKG_RELEASE:= 2
PKG_MD5SUM:= e9a4ba2711753c89b37950aada7aed4a
PKG_DESCR:= console mouse support
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_BUILDDEP:= autotool bison-host
PKG_URL:= http://launchpad.net/gpm
PKG_SITES:= http://www.nico.schottelius.org/software/gpm/archives/
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index e09d9b8..f854583 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= gpsd
PKG_VERSION:= 3.10
PKG_RELEASE:= 2
PKG_MD5SUM:= fc5b03aae38b9b5b6880b31924d0ace3
-PKG_DESCR:= An interface daemon for GPS receivers
-PKG_SECTION:= misc
+PKG_DESCR:= interface daemon for gps receivers
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= scons-host ncurses
PKG_URL:= http://catb.org/gpsd/
diff --git a/package/grep/Makefile b/package/grep/Makefile
index 3666cef..61b2acf 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.19
PKG_RELEASE:= 1
PKG_MD5SUM:= ac732142227d9fe9567d71301e127979
PKG_DESCR:= global search for a regex and print out matched lines
-PKG_SECTION:= utils
+PKG_SECTION:= base/apps
PKG_DEPENDS:= libpcre
PKG_BUILDDEP:= pcre
PKG_URL:= http://www.gnu.org/software/grep/
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 66100ba..ca61820 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= grub
PKG_VERSION:= 2.00
PKG_RELEASE:= 5
PKG_MD5SUM:= a1043102fbc7bcedbf53e7ee3d17ab91
-PKG_DESCR:= GRUB2 bootloader
-PKG_SECTION:= boot
+PKG_DESCR:= multiboot boot loader
+PKG_SECTION:= base/boot
PKG_BUILDDEP:= bison-host
PKG_URL:= http://www.gnu.org/software/grub
PKG_SITES:= ftp://ftp.gnu.org/gnu/grub/
@@ -18,7 +18,7 @@ PKG_SYSTEM_DEPENDS:= !mikrotik-rb532
PKG_NOPARALLEL:= 1
PKG_SUBPKGS:= GRUB GRUB_TOOLS
-PKGSD_GRUB_TOOLS:= GRUB2 tools
+PKGSD_GRUB_TOOLS:= grub2 tools
PKG_CHOICES_GRUB:= PC EFI
PKGCD_PC:= build for PC BIOS
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index 4377788..3b854e3 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= gsm
PKG_VERSION:= 1.0.10
PKG_RELEASE:= 2
PKG_MD5SUM:= 4b148480f82e96d274248e13880ec873
-PKG_DESCR:= GSM 06.10 full-rate speech transcoding library
-PKG_SECTION:= libs
+PKG_DESCR:= gsm full-rate speech transcoding library
+PKG_SECTION:= libs/misc
PKG_URL:= http://www-rn.informatik.uni-bremen.de/software/gsm/
PKG_SITES:= http://www-rn.informatik.uni-bremen.de/software/gsm/
PKG_NOPARALLEL:= 1
@@ -18,9 +18,9 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LIBGSM GSM_UTILS
-PKGSD_GSM_UTILS:= GSM 06.10 full-rate speech transcoding utilities
+PKGSD_GSM_UTILS:= gsm full-rate speech transcoding utilities
PKGSS_GSM_UTILS:= libgsm
-PKGSC_GSM_UTILS:= misc
+PKGSC_GSM_UTILS:= sys/misc
WRKDIST= ${WRKDIR}/${PKG_NAME}-1.0-pl10
diff --git a/package/gst-plugins-base/Makefile b/package/gst-plugins-base/Makefile
index 2759558..8f21a26 100644
--- a/package/gst-plugins-base/Makefile
+++ b/package/gst-plugins-base/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 2e75fb03ed7e4d24d88601fcac4d57aa
PKG_DESCR:= gstreamer base plugins
-PKG_SECTION:= libs
+PKG_SECTION:= libs/video
PKG_DEPENDS:= gstreamer
PKG_BUILDDEP:= gstreamer libvorbis libtheora alsa-lib
PKG_URL:= http://gstreamer.freedesktop.org/
diff --git a/package/gstreamer/Makefile b/package/gstreamer/Makefile
index 6a30126..2732faa 100644
--- a/package/gstreamer/Makefile
+++ b/package/gstreamer/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 55d50f48a496799dbb0b195c9c6c6153
PKG_DESCR:= opensource multimedia framework
-PKG_SECTION:= libs
+PKG_SECTION:= libs/video
PKG_URL:= http://gstreamer.freedesktop.org/
PKG_SITES:= http://gstreamer.freedesktop.org/src/gstreamer/
PKG_OPTS:= dev
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 97bc105..357e0b2 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 2.24.22
PKG_EXTRAVER:= 2.24
PKG_RELEASE:= 1
PKG_MD5SUM:= 5fbbfb7637bbd571a572a2dae0e736d2
-PKG_DESCR:= GTK+ library
-PKG_SECTION:= libs
+PKG_DESCR:= multi-platform toolkit for creating graphical user interfaces
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= glib libstdcxx
PKG_BUILDDEP:= cairo atk pango libXext renderproto libXrender
PKG_BUILDDEP+= gdk-pixbuf libXcomposite libXdamage
@@ -18,8 +18,6 @@ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/
PKG_LIBNAME:= libgtk
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !m68k
-
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
endif
diff --git a/package/gzip/Makefile b/package/gzip/Makefile
index c7c09b9..cabe162 100644
--- a/package/gzip/Makefile
+++ b/package/gzip/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 618b61219aa2d812893281bf6c66f158
PKG_DESCR:= compression utility
-PKG_SECTION:= archive
+PKG_SECTION:= app/archive
PKG_URL:= http://www.gzip.org/
PKG_SITES:= ${MASTER_SITE_GNU:=gzip/}
PKG_BB:= 1
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index fbe1a6c..07f4a93 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= harfbuzz
PKG_VERSION:= 0.9.28
PKG_RELEASE:= 1
PKG_MD5SUM:= accbeb679f39d839038b95a87e40870e
-PKG_DESCR:= OpenType text shaping engine
-PKG_SECTION:= libs
+PKG_DESCR:= opentype text shaping engine
+PKG_SECTION:= libs/fonts
PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/
PKG_DEPENDS:= libstdcxx cairo icu4c
PKG_BUILDDEP:= libstdcxx cairo icu4c
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index 27ee7bc..3a6544a 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= haserl
PKG_VERSION:= 0.9.27
PKG_RELEASE:= 1
PKG_MD5SUM:= 1f692db8939858338a44e25d0190aa9e
-PKG_DESCR:= CGI wrapper to embed shell scripts in HTML documents
-PKG_SECTION:= lang
+PKG_DESCR:= cgi wrapper to embed shell scripts in html documents
+PKG_SECTION:= net/http
PKG_URL:= http://haserl.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=haserl/}
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index 6f2c9f2..7c189e7 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= hdparm
PKG_VERSION:= 9.43
PKG_RELEASE:= 1
PKG_MD5SUM:= f73233be118d86c779a8463d8b6a3cdb
-PKG_DESCR:= get/set ATA/SATA drive parameters
-PKG_SECTION:= fs
+PKG_DESCR:= get/set ata/sata drive parameters
+PKG_SECTION:= sys/fs
PKG_URL:= http://sourceforge.net/projects/hdparm
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=hdparm/}
PKG_BB:= 1
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 52ba4a1..56f407b 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= heimdal
PKG_VERSION:= 1.5.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 30b379e3de12f332fbd201131f02ffca
-PKG_DESCR:= kerberos 5 server
-PKG_SECTION:= crypto
+PKG_DESCR:= kerberos server
+PKG_SECTION:= app/crypto
PKG_BUILDDEP:= autotool openssl ncurses e2fsprogs readline heimdal-host
PKG_DEPENDS:= libheimdal libncurses libcom-err libreadline libopenssl
HOST_BUILDDEP:= bison-host
@@ -21,8 +21,8 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= HEIMDAL_SERVER LIBHEIMDAL
-PKGSD_LIBHEIMDAL:= kerberos 5 libraries
-PKGSC_LIBHEIMDAL:= libs
+PKGSD_LIBHEIMDAL:= kerberos libraries
+PKGSC_LIBHEIMDAL:= libs/crypto
PKG_FLAVOURS_HEIMDAL_SERVER:= WITH_PKINIT
PKGFD_WITH_PKINIT: Enable PK-INIT
diff --git a/package/heirloom-cpio/Makefile b/package/heirloom-cpio/Makefile
index a91b71e..124af9a 100644
--- a/package/heirloom-cpio/Makefile
+++ b/package/heirloom-cpio/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= heirloom-cpio
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_DESCR:= patched version of heirloom cpio
-PKG_SECTION:= archive
+PKG_SECTION:= app/archive
PKG_CFLINE_HEIRLOOM_CPIO:= depends on ADK_HOST_ONLY
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index 8a9c588..efeb0f6 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= heyu
PKG_VERSION:= 2.6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 9c7624b61ea39bbfa70336dc703cd5f1
-PKG_DESCR:= X10 home automation control using the CM11A
-PKG_SECTION:= serial
+PKG_DESCR:= x10 home automation control utility
+PKG_SECTION:= sys/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 44a5ae1..dbb46ee 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= hostapd
PKG_VERSION:= 2.0
PKG_RELEASE:= 1
PKG_MD5SUM:= ba22e639bc57aa4035d2ea8ffa9bbbee
-PKG_DESCR:= IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator
-PKG_SECTION:= wifi
+PKG_DESCR:= wireless authenticator
+PKG_SECTION:= net/wifi
PKG_DEPENDS:= libnl
PKG_BUILDDEP:= libnl
PKG_URL:= http://hostap.epitest.fi/
@@ -18,10 +18,10 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= HOSTAPD HOSTAPD_UTILS
PKG_CHOICES_HOSTAPD:= WITH_GNUTLS WITH_OPENSSL
-PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
+PKGCD_WITH_OPENSSL:= use openssl for crypto
PKGCS_WITH_OPENSSL:= libopenssl
PKGCB_WITH_OPENSSL:= openssl
-PKGCD_WITH_GNUTLS:= use GnuTLS for crypto
+PKGCD_WITH_GNUTLS:= use gnutls for crypto
PKGCS_WITH_GNUTLS:= libgnutls
PKGCB_WITH_GNUTLS:= gnutls
PKGSN_HOSTAPD_UTILS:= hostapd
diff --git a/package/htop/Makefile b/package/htop/Makefile
index aba3748..211ff33 100644
--- a/package/htop/Makefile
+++ b/package/htop/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= e768b9b55c033d9c1dffda72db3a6ac7
PKG_DESCR:= graphical process manager
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://hisham.hm/htop
diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index f7800da..30ec957 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= htpdate
PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 40f193e3d7220265f6e6f8d4d7f887da
-PKG_DESCR:= HTP (Hypertext Time Protocol) implementation
-PKG_SECTION:= ntp
+PKG_DESCR:= hypertext time protocol implementation
+PKG_SECTION:= net/ntp
PKG_URL:= http://www.vervest.org/htp/
PKG_SITES:= http://www.vervest.org/htp/archive/c/
diff --git a/package/httping/Makefile b/package/httping/Makefile
index 7714807..5c2e5fe 100644
--- a/package/httping/Makefile
+++ b/package/httping/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= httping
PKG_VERSION:= 1.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= bde1ff3c01343d2371d8f34fbf8a1d9a
-PKG_DESCR:= Httping is like 'ping' but for http-requests
-PKG_SECTION:= net
+PKG_DESCR:= like ping but for http-requests
+PKG_SECTION:= net/http
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP:= openssl
PKG_SITES:= http://www.vanheusden.com/httping/
diff --git a/package/huawei/Makefile b/package/huawei/Makefile
index d85bc13..030cbae 100644
--- a/package/huawei/Makefile
+++ b/package/huawei/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= huawei
PKG_VERSION:= 0.1
PKG_RELEASE:= 1
PKG_DESCR:= huawei modem control
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_DEPENDS:= libusb libusb-compat
PKG_BUILDDEP:= libusb libusb-compat
@@ -21,8 +21,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-o ${WRKBUILD}/huawei ${WRKBUILD}/huawei.c -lusb
diff --git a/package/i2c-tools/Makefile b/package/i2c-tools/Makefile
index eb6358f..fc6c031 100644
--- a/package/i2c-tools/Makefile
+++ b/package/i2c-tools/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= i2c-tools
PKG_VERSION:= 3.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 0fdbff53ebd0b8d9249256d6c56480b1
-PKG_DESCR:= I2C tools
-PKG_SECTION:= misc
+PKG_DESCR:= i2c tools
+PKG_SECTION:= sys/misc
PKG_URL:= http://www.lm-sensors.org/wiki/I2CTools
PKG_SITES:= http://dl.lm-sensors.org/i2c-tools/releases/
diff --git a/package/icecast/Makefile b/package/icecast/Makefile
index dce7161..56474f0 100644
--- a/package/icecast/Makefile
+++ b/package/icecast/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.3.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 2b5d1b40778922e5f6431b7758c359ad
PKG_DESCR:= streaming media server
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libcurl libvorbis libpthread libxml2 libxslt
PKG_BUILDDEP:= curl libvorbis libxml2 libxslt autotool
PKG_URL:= http://www.icecast.org/
diff --git a/package/icu4c/Makefile b/package/icu4c/Makefile
index fe87c65..50a21e9 100644
--- a/package/icu4c/Makefile
+++ b/package/icu4c/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 52.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 9e96ed4c1d99c0d14ac03c140f9f346c
PKG_DESCR:= unicode and globalization library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= icu4c-host
PKG_URL:= http://icu-project.org
PKG_SITES:= http://download.icu-project.org/files/icu4c/52.1/
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 650a8ae..eaaa6cb 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= id3lib
PKG_VERSION:= 3.8.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7
-PKG_DESCR:= ID3v1/ID3v2 tagging library
-PKG_SECTION:= libs
+PKG_DESCR:= id3 tagging library
+PKG_SECTION:= libs/audio
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib libiconv-tiny
PKG_URL:= http://id3lib.sourceforge.net/
diff --git a/package/iftop/Makefile b/package/iftop/Makefile
index f2c1883..0be7b16 100644
--- a/package/iftop/Makefile
+++ b/package/iftop/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.17
PKG_RELEASE:= 1
PKG_MD5SUM:= 062bc8fb3856580319857326e0b8752d
PKG_DESCR:= display bandwith usage on an interface
-PKG_SECTION:= net
+PKG_SECTION:= net/perf
PKG_DEPENDS:= libncurses libpcap libpthread
PKG_BUILDDEP:= libpcap libpthread ncurses
PKG_URL:= http://www.ex-parrot.com/~pdw/iftop/
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index 34a8b42..160ebf9 100644
--- a/package/igmpproxy/Makefile
+++ b/package/igmpproxy/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.1
PKG_RELEASE:= 3
PKG_MD5SUM:= c56f41ec195bc1fe016369bf74efc5a1
PKG_DESCR:= simple dynamic multicast routing daemon
-PKG_SECTION:= proxy
+PKG_SECTION:= net/route
PKG_URL:= http://sourceforge.net/projects/igmpproxy/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/}
diff --git a/package/imlib2/Makefile b/package/imlib2/Makefile
index c77538b..8bdc4e0 100644
--- a/package/imlib2/Makefile
+++ b/package/imlib2/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= imlib2
PKG_VERSION:= 1.4.4
PKG_RELEASE:= 4
PKG_MD5SUM:= 20d59c7cda06742015baade6f5975415
-PKG_DESCR:= advanced replacement library for libraries like libXpm
-PKG_SECTION:= libs
+PKG_DESCR:= advanced replacement library for libraries like libxpm
+PKG_SECTION:= libs/image
PKG_DEPENDS:= libfreetype zlib libpng libtiff libx11 libxext
PKG_BUILDDEP:= freetype zlib libpng libtiff libX11 libXext
PKG_URL:= http://www.enlightenment.org/
diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index 19945f0..5d53f66 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= inputproto
PKG_VERSION:= 2.3
PKG_RELEASE:= 1
-PKG_DESCR:= X Input Extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= input extension headers
+PKG_SECTION:= dev/header
PKG_BUILDDEP:= inputproto-host
PKG_MD5SUM:= 5ea366d32a9a78d6204a47ea35d9dc5c
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/intltool/Makefile b/package/intltool/Makefile
index 3aaaa76..e346129 100644
--- a/package/intltool/Makefile
+++ b/package/intltool/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.50.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 23fbd879118253cb99aeac067da5f591
PKG_DESCR:= internationalization utility to create po files
-PKG_SECTION:= misc
+PKG_SECTION:= dev/tools
PKG_URL:= http://freedesktop.org/wiki/Software/intltool/
PKG_SITES:= https://launchpad.net/intltool/trunk/0.50.2/+download/
diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile
index feceeca..63105ce 100644
--- a/package/ipcad/Makefile
+++ b/package/ipcad/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ipcad
PKG_VERSION:= 3.7.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 125605249958894148ec26d3c88189f5
-PKG_DESCR:= IP Cisco Accounting Daemon
-PKG_SECTION:= net
+PKG_DESCR:= ip cisco accounting daemon
+PKG_SECTION:= net/acct
PKG_DEPENDS:= libpcap
PKG_BUILDDEP:= libpcap
PKG_URL:= http://lionet.info/ipcad
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 4cde89a..4171ae9 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 8c5bc14cc2ea55f18f22afe3c23e3dcb
PKG_DESCR:= internet protocol bandwidth measuring tool
-PKG_SECTION:= net
+PKG_SECTION:= net/perf
PKG_DEPENDS:= libpthread
PKG_URL:= http://sourceforge.net/projects/iperf
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/}
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index c74245a..a8f2387 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -7,27 +7,27 @@ PKG_NAME:= iproute2
PKG_VERSION:= 3.12.0
PKG_RELEASE:= 3
PKG_MD5SUM:= f87386aaaecafab95607fd10e8152c68
-PKG_DESCR:= iproute2 routing control utility
-PKG_SECTION:= route
+PKG_DESCR:= routing control utility
+PKG_SECTION:= net/route
PKG_BUILDDEP:= iptables libnl linux-atm
PKG_DEPENDS:= libnl
PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2
PKG_SITES:= http://www.kernel.org/pub/linux/utils/net/iproute2/
PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS
-PKGSD_TC:= iproute2 traffic control utility
+PKGSD_TC:= traffic control utility
PKGSB_TC:= iptables
-PKGSD_TC_ATM:= iproute2 traffic control ATM support library
+PKGSD_TC_ATM:= traffic control atm support library
PKGSS_TC_ATM:= tc libatm
PKGSB_TC_ATM:= linux-atm
-PKGSD_TC_IPT:= iproute2 traffic control IPTables support library
+PKGSD_TC_IPT:= traffic control iptables support library
PKGSS_TC_IPT:= tc iptables
PKGSB_TC_IPT:= iptables
-PKGSD_IFSTAT:= iproute2 interface statistics utility
-PKGSD_LNSTAT:= iproute2 network statistics utilities
-PKGSD_ROUTEL:= iproute2 route list and flush utilities
-PKGSD_RTMON:= iproute2 RTnetlink monitor
-PKGSD_SS:= iproute2 socket statistics utility
+PKGSD_IFSTAT:= interface statistics utility
+PKGSD_LNSTAT:= network statistics utilities
+PKGSD_ROUTEL:= route list and flush utilities
+PKGSD_RTMON:= rtnetlink monitor
+PKGSD_SS:= socket statistics utility
include ${TOPDIR}/mk/package.mk
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 2856c1d..8c5da86 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= ipsec-tools
PKG_VERSION:= 0.8.0
PKG_RELEASE:= 2
PKG_MD5SUM:= b79aae3055a51f8de5c0f1b8ca6cf619
-PKG_DESCR:= IPsec management tools
+PKG_DESCR:= ipsec management tools
PKG_SECTION:= net/security
PKG_BUILDDEP:= openssl flex
PKG_DEPENDS:= libopenssl
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 34fea7f..cffee98 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= d104007fdf5ea64fef774c22b1c0a97b
PKG_DESCR:= ip sets administration utility
-PKG_SECTION:= firewall
+PKG_SECTION:= net/firewall
PKG_URL:= http://ipset.netfilter.org/
PKG_SITES:= http://ipset.netfilter.org/
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 766ff20..553f52c 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.21
PKG_RELEASE:= 6
PKG_MD5SUM:= 536d048c8e8eeebcd9757d0863ebb0c0
PKG_DESCR:= netfilter firewalling software
-PKG_SECTION:= firewall
+PKG_SECTION:= net/firewall
PKG_DEPENDS:= libnetfilter_conntrack libmnl libnfnetlink
PKG_BUILDDEP:= autotool libnetfilter_conntrack
PKG_URL:= http://www.netfilter.org/
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index 76e9e8a..6f9dab1 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 004c2c005a1b78739e22bc49d33e244d
PKG_DESCR:= console-based network monitoring program.
-PKG_SECTION:= net
+PKG_SECTION:= net/perf
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://iptraf.seul.org/
diff --git a/package/ipvsadm/Makefile b/package/ipvsadm/Makefile
index 918a3a4..6c04ab5 100644
--- a/package/ipvsadm/Makefile
+++ b/package/ipvsadm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ipvsadm
PKG_VERSION:= 1.26
PKG_RELEASE:= 2
PKG_MD5SUM:= eac3ba3f62cd4dea2da353aeddd353a8
-PKG_DESCR:= IPVS admin utility
-PKG_SECTION:= net
+PKG_DESCR:= ip virtual server admin utility
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libpopt
PKG_BUILDDEP:= popt
PKG_URL:= http://www.linuxvirtualserver.org/
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index 4d37e20..38ffaa7 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= irssi
PKG_VERSION:= 0.8.15
PKG_RELEASE:= 2
PKG_MD5SUM:= 870db8e319f640c2bf446c30d0c24ef6
-PKG_DESCR:= IRC text client
-PKG_SECTION:= chat
+PKG_DESCR:= irc text client
+PKG_SECTION:= app/chat
PKG_DEPENDS:= glib libncurses
PKG_BUILDDEP:= glib ncurses
PKG_URL:= http://www.irssi.org/
diff --git a/package/iw/Makefile b/package/iw/Makefile
index fc20c2f..f908770 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= iw
PKG_VERSION:= 3.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 17704d7c41bcb85cb32cb33b07a1c4cc
-PKG_DESCR:= tools for setting up WiFi cards via netlink (nl80211)
-PKG_SECTION:= wifi
+PKG_DESCR:= tools for setting up wiFi cards via netlink
+PKG_SECTION:= net/wifi
PKG_DEPENDS:= libnl
PKG_BUILDDEP:= libnl
PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw
diff --git a/package/jack/Makefile b/package/jack/Makefile
index 90ddd18..d5df467 100644
--- a/package/jack/Makefile
+++ b/package/jack/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= jack
PKG_VERSION:= 1.9.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 9759670feecbd43eeccf1c0f743ec199
-PKG_DESCR:= JACK Audio Connection Kit
-PKG_SECTION:= multimedia
+PKG_DESCR:= audio connection kit
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= alsa-lib
PKG_BUILDDEP:= python2 alsa-lib
PKG_URL:= http://jackaudio.org
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index ff87be3..4dade8a 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= jamvm
PKG_VERSION:= 1.5.4
PKG_RELEASE:= 5
PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176
-PKG_DESCR:= Java Virtual Machine (JVM) implementation
-PKG_SECTION:= lang
+PKG_DESCR:= java virtual machine implementation
+PKG_SECTION:= dev/lang
PKG_DEPENDS:= libffi zlib
PKG_BUILDDEP:= libffi zlib
PKG_URL:= http://jamvm.sourceforge.net
diff --git a/package/jikes/Makefile b/package/jikes/Makefile
index be7e6a7..e321d2a 100644
--- a/package/jikes/Makefile
+++ b/package/jikes/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:= jikes
PKG_VERSION:= 1.22
PKG_RELEASE:= 1
PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85
-PKG_DESCR:= jikes java compiler
+PKG_DESCR:= java compiler
PKG_BUILDDEP:= jikes-host
-PKG_SECTION:= lang
+PKG_SECTION:= dev/lang
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/joe/Makefile b/package/joe/Makefile
index 1b3b0c6..417915a 100644
--- a/package/joe/Makefile
+++ b/package/joe/Makefile
@@ -8,15 +8,15 @@ PKG_VERSION:= 3.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 66de1b073e869ba12abbfcde3885c577
PKG_DESCR:= small editor
-PKG_SECTION:= editor
+PKG_SECTION:= app/editor
PKG_URL:= http://joe-editor.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_FLAVOURS_JOE:= LANGUAGE SYNTAX
-PKGFD_LANGUAGE:= Install translation files
-PKGFD_SYNTAX:= Install syntax highlighting files
+PKGFD_LANGUAGE:= install translation files
+PKGFD_SYNTAX:= install syntax highlighting files
include ${TOPDIR}/mk/package.mk
diff --git a/package/json-c/Makefile b/package/json-c/Makefile
index 24f6a89..3229ba9 100644
--- a/package/json-c/Makefile
+++ b/package/json-c/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= json-c
PKG_VERSION:= 0.11
PKG_RELEASE:= 1
PKG_MD5SUM:= aa02367d2f7a830bf1e3376f77881e98
-PKG_DESCR:= JSON library
-PKG_SECTION:= libs
+PKG_DESCR:= json library
+PKG_SECTION:= libs/data
PKG_URL:= https://github.com/json-c/json-c/wiki
PKG_SITES:= https://s3.amazonaws.com/json-c_releases/releases/
PKG_OPTS:= dev
diff --git a/package/json-glib/Makefile b/package/json-glib/Makefile
index f293c83..5514344 100644
--- a/package/json-glib/Makefile
+++ b/package/json-glib/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= json-glib
PKG_VERSION:= 0.14.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 2a22832c4654156a35b38ee027f6f065
-PKG_DESCR:= a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format
-PKG_SECTION:= libs
+PKG_DESCR:= library providing serialization and deserialization support for the json format
+PKG_SECTION:= libs/data
PKG_URL:= https://wiki.gnome.org/JsonGlib/
PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.14/
PKG_OPTS:= dev
diff --git a/package/kbd/Makefile b/package/kbd/Makefile
index 9e9a513..f29a202 100644
--- a/package/kbd/Makefile
+++ b/package/kbd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 55453cb09d90370005e696949092b8f6
PKG_DESCR:= keyboard utility
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_DEPENDS:= libcheck
PKG_BUILDDEP:= flex-host bison-host check
PKG_URL:= http://kbd-project.org/
diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile
index 32db2a2..c866b3c 100644
--- a/package/kbproto/Makefile
+++ b/package/kbproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= kbproto
PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
-PKG_DESCR:= X11 keyboard protocol headers
-PKG_SECTION:= devel
+PKG_DESCR:= keyboard protocol headers
+PKG_SECTION:= dev/header
PKG_BUILDDEP:= kbproto-host
PKG_MD5SUM:= 9c650b7947fe59b3f144518400e8d029
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index cda4c48..60771a4 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= kexec-tools
PKG_VERSION:= 2.0.5
PKG_RELEASE:= 3
PKG_MD5SUM:= da5887e30eec16895e9d98ef072dc257
-PKG_DESCR:= kexec tools
-PKG_SECTION:= misc
+PKG_DESCR:= kernel exec tools
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= zlib
PKG_BUILDEP:= zlib
PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/
diff --git a/package/kexecinit/Makefile b/package/kexecinit/Makefile
index 06aa301..7a14533 100644
--- a/package/kexecinit/Makefile
+++ b/package/kexecinit/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= kexecinit
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_DESCR:= init for kexec rootfilesystem
-PKG_SECTION:= base
+PKG_SECTION:= base/misc
WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
NO_DISTFILES:= 1
diff --git a/package/keychain/Makefile b/package/keychain/Makefile
index 55450d8..262a44a 100644
--- a/package/keychain/Makefile
+++ b/package/keychain/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= keychain
PKG_VERSION:= 2.7.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 07c622833192189f483cbaec287f9704
-PKG_DESCR:= manage ssh and GPG keys in a secure manner
-PKG_SECTION:= crypto
+PKG_DESCR:= manage ssh and gpg keys in a secure manner
+PKG_SECTION:= app/crypto
PKG_URL:= http://www.funtoo.org/en/security/keychain/intro/
PKG_SITES:= http://www.funtoo.org/archive/keychain/
diff --git a/package/keyutils/Makefile b/package/keyutils/Makefile
index e54bdc7..9b8d462 100644
--- a/package/keyutils/Makefile
+++ b/package/keyutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 7f8ac985c45086b5fbcd12cecd23cf07
PKG_DESCR:= utilities for managing the key retention facility
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_SITES:= http://people.redhat.com/dhowells/keyutils/
PKG_OPTS:= dev
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index fc1197f..74e1505 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -7,17 +7,17 @@ PKG_NAME:= kismet
PKG_VERSION:= 2013-03-R1b
PKG_RELEASE:= 1
PKG_MD5SUM:= 596acdd2940887dd05a498ea27475eea
-PKG_DESCR:= Kismet
-PKG_SECTION:= wifi
+PKG_DESCR:= wireless network detector, sniffer, and intrusion detection system
+PKG_SECTION:= net/wifi
PKG_DEPENDS:= libpcap libncurses libpthread
PKG_BUILDDEP:= autotool libpcap ncurses
PKG_URL:= http://www.kismetwireless.net/
PKG_SITES:= http://www.kismetwireless.net/code/
PKG_SUBPKGS:= KISMET KISMET_CLIENT KISMET_DRONE KISMET_SERVER
-PKGSD_KISMET_CLIENT:= Kismet client
-PKGSD_KISMET_SERVER:= Kismet server
-PKGSD_KISMET_DRONE:= Kismet drone
+PKGSD_KISMET_CLIENT:= kismet client
+PKGSD_KISMET_SERVER:= kismet server
+PKGSD_KISMET_DRONE:= kismet drone
include ${TOPDIR}/mk/package.mk
diff --git a/package/kmod/Makefile b/package/kmod/Makefile
index 6e76c99..f1b5deb 100644
--- a/package/kmod/Makefile
+++ b/package/kmod/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 17
PKG_RELEASE:= 1
PKG_MD5SUM:= bc36d28b12dcb2b664a35411560c5610
PKG_DESCR:= kernel module loading library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://profusion.mobi/index.php
PKG_SITES:= https://www.kernel.org/pub/linux/utils/kernel/kmod/
PKG_OPTS:= dev
diff --git a/package/knock/Makefile b/package/knock/Makefile
index 6ae1ed8..d81a468 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6
PKG_RELEASE:= 1
PKG_MD5SUM:= e6e486be75b0d6433bac22a7de0e11f5
PKG_DESCR:= port-knocking client
-PKG_SECTION:= firewall
+PKG_SECTION:= net/firewall
PKG_BUILDDEP:= libpcap
PKG_URL:= http://www.zeroflux.org/projects/knock
PKG_SITES:= http://www.zeroflux.org/proj/knock/files/
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 692b7d6..83f2352 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= krb5
PKG_VERSION:= 1.12.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 524b1067b619cb5bf780759b6884c3f5
-PKG_DESCR:= MIT kerberos server
-PKG_SECTION:= crypto
+PKG_DESCR:= kerberos server
+PKG_SECTION:= app/crypto
PKG_DEPENDS:= libkrb5 libncurses libss libcom-err keyutils
PKG_DEPENDS+= libpthread
PKG_BUILDDEP:= ncurses e2fsprogs gettext-tiny bison-host
@@ -18,15 +18,12 @@ PKG_NOPARALLEL:= 1
PKG_LIBNAME:= libkrb5
PKG_OPTS:= dev
-PKG_SUBPKGS:= KRB5_SERVER KRB5_CLIENT KRB5_UTIL LIBKRB5
-PKGSD_LIBKRB5:= MIT kerberos libraries
-PKGSC_LIBKRB5:= libs
-PKGSD_KRB5_CLIENT:= MIT kerberos client tools
-PKGSC_KRB5_CLIENT:= crypto
+PKG_SUBPKGS:= KRB5_SERVER KRB5_CLIENT LIBKRB5
+PKGSD_LIBKRB5:= kerberos libraries
+PKGSC_LIBKRB5:= libs/crypto
+PKGSD_KRB5_CLIENT:= kerberos client tools
+PKGSC_KRB5_CLIENT:= app/crypto
PKGSS_KRB5_CLIENT:= libkrb5 libncurses libss libcom-err
-PKGSD_KRB5_UTIL:= MIT kerberos utility (ktutil)
-PKGSC_KRB5_UTIL:= crypto
-PKGSS_KRB5_UTIL:= libkrb5 libncurses libss libcom-err
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar
WRKSRC= ${WRKDIST}/src
@@ -35,7 +32,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,KRB5_CLIENT,krb5-client,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_KRB5_CLIENT},${PKGSD_KRB5_CLIENT},${PKGSC_KRB5_CLIENT}))
-$(eval $(call PKG_template,KRB5_UTIL,krb5-util,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_KRB5_UTIL},${PKGSD_KRB5_UTIL},${PKGSC_KRB5_UTIL}))
$(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-static \
@@ -57,11 +53,6 @@ pre-build:
# fix nm call in script, we need the GNU version of nm
$(SED) "s#@@NM@@#${NM}#" ${WRKSRC}/util/export-check.pl
-krb5-util-install:
- ${INSTALL_DIR} ${IDIR_KRB5_UTIL}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/ktutil \
- ${IDIR_KRB5_UTIL}/usr/bin
-
krb5-server-install:
${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc
${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin
@@ -77,7 +68,7 @@ krb5-server-install:
krb5-client-install:
${INSTALL_DIR} ${IDIR_KRB5_CLIENT}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/{kinit,kpasswd,klist,kdestroy} \
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/{kinit,kpasswd,klist,kdestroy,ktutil} \
${IDIR_KRB5_CLIENT}/usr/bin
libkrb5-install:
diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile
index c3e9f07..9586937 100644
--- a/package/l2tpns/Makefile
+++ b/package/l2tpns/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= l2tpns
PKG_VERSION:= 2.1.21
PKG_RELEASE:= 3
PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c
-PKG_DESCR:= layer 2 tunneling protocol network server (LNS)
+PKG_DESCR:= layer 2 tunneling protocol network server
PKG_SECTION:= net/security
PKG_DEPENDS:= libcli
PKG_BUILDDEP:= libcli
diff --git a/package/lame/Makefile b/package/lame/Makefile
index 87e84ab..7a0149b 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= lame
PKG_VERSION:= 3.99
PKG_RELEASE:= 1
PKG_MD5SUM:= 7abacd1d0a65a63733335786015626db
-PKG_DESCR:= MP3 encoder
-PKG_SECTION:= multimedia
+PKG_DESCR:= mp3 encoder
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://lame.sourceforge.net/
@@ -19,8 +19,8 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LAME LIBMP3LAME
-PKGSD_LIBMP3LAME:= MP3 encoding library
-PKGSC_LIBMP3LAME:= libs
+PKGSD_LIBMP3LAME:= mp3 encoding library
+PKGSC_LIBMP3LAME:= libs/audio
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/less/Makefile b/package/less/Makefile
index de2ac77..70daced 100644
--- a/package/less/Makefile
+++ b/package/less/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 436
PKG_RELEASE:= 1
PKG_MD5SUM:= 817bf051953ad2dea825a1cdf460caa4
PKG_DESCR:= text mode pager
-PKG_SECTION:= pager
+PKG_SECTION:= app/editor
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://www.greenwoodsoftware.com/less/
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index 1c28200..0593c92 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libICE
PKG_VERSION:= 1.0.8
PKG_RELEASE:= 2
PKG_MD5SUM:= 4b8dae73fce37e994c3a6fa05d6db7ca
-PKG_DESCR:= Inter-Client Exchange library
+PKG_DESCR:= inter-client exchange library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xtrans xproto
HOST_BUILDDEP:= xtrans-host xproto-host
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index d6eb307..cfdd250 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libIDL
PKG_VERSION:= 0.8.14
PKG_RELEASE:= 2
PKG_MD5SUM:= 531fbc1b40b80dd1d6f3b5e76b99067c
-PKG_DESCR:= libraries for Interface Definition Language files
-PKG_SECTION:= libs
+PKG_DESCR:= libraries for interface definition language files
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= glib
PKG_BUILDDEP:= glib-host glib m4-host flex-host bison-host libIDL-host
PKG_URL:= http://www.gnome.org/
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index aa77da9..fda4607 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libSM
PKG_VERSION:= 1.2.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 1d507651e9fa50aab7ef11be9e0e2f20
-PKG_DESCR:= X11 Session Management library
+PKG_DESCR:= session management library
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libuuid
PKG_BUILDDEP:= libICE util-linux
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index bc6c453..3b6334d 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libX11
PKG_VERSION:= 1.6.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 7e17129e1678355d8268883ee31a6edf
-PKG_DESCR:= X11 client-side library
+PKG_DESCR:= x11 client-side library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto-host xextproto-host libXau-host libpthread-stubs-host
PKG_BUILDDEP+= xcb-proto-host libxcb-host kbproto-host
diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile
index 1b934f1..40d86ad 100644
--- a/package/libXScrnSaver/Makefile
+++ b/package/libXScrnSaver/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXScrnSaver
PKG_VERSION:= 1.2.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 8e459e544298caa27fc7c7e5a56e2a6d
-PKG_DESCR:= X.Org XScrnSaver library
+PKG_DESCR:= screensaver library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= scrnsaverproto libXext
PKG_URL:= http://xorg.freedesktop.org/
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index f1164bd..61db4c0 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXau
PKG_VERSION:= 1.0.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 3ab7a4d1aac1b7f8ccc6b9755a19f252
-PKG_DESCR:= X11 authorisation library
+PKG_DESCR:= x11 authorisation library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto libXau-host
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index be7b78d..80e68aa 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXaw
PKG_VERSION:= 1.0.11
PKG_RELEASE:= 2
PKG_MD5SUM:= c487a810a8a9b0eb5091f382790b4e75
-PKG_DESCR:= X11 Athena Widget library
+PKG_DESCR:= athena widget library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXext libXmu libXpm
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile
index ffc71f4..c3075bb 100644
--- a/package/libXcomposite/Makefile
+++ b/package/libXcomposite/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXcomposite
PKG_VERSION:= 0.4.3
PKG_RELEASE:= 2
PKG_MD5SUM:= b93dac50c86db6eba3f72e949f5bed2a
-PKG_DESCR:= X composite library
+PKG_DESCR:= composite library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 compositeproto libXfixes
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXcursor/Makefile b/package/libXcursor/Makefile
index 1edce97..8021422 100644
--- a/package/libXcursor/Makefile
+++ b/package/libXcursor/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXcursor
PKG_VERSION:= 1.1.13
PKG_RELEASE:= 2
PKG_MD5SUM:= 38a6c7ce393cb5bc10e67de087f9d582
-PKG_DESCR:= xcursor library
+PKG_DESCR:= cursor library
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_BUILDDEP:= libXfixes libXrender
diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile
index 0fa0b2e..6e5218d 100644
--- a/package/libXdamage/Makefile
+++ b/package/libXdamage/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXdamage
PKG_VERSION:= 1.1.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 5e54789fd1c56392d38d29c6b8dad142
-PKG_DESCR:= X Window System client interface to the DAMAGE extension to the X protocol
+PKG_DESCR:= client interface to the damage extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXfixes damageproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index 1a00688..70aff9b 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXdmcp
PKG_VERSION:= 1.1.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 194f30d2bb67b23dc33351e128db40a9
-PKG_DESCR:= X11 display manager control protocol library
+PKG_DESCR:= display manager control protocol library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 0bd2997..640f7ed 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXext
PKG_VERSION:= 1.3.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 249478eae5c4fab7722894cb99565405
-PKG_DESCR:= X client interface to extensions of the X protocol
+PKG_DESCR:= client interface to extensions of the x protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 xextproto libXext-host
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile
index cf6242e..27327dd 100644
--- a/package/libXfixes/Makefile
+++ b/package/libXfixes/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXfixes
PKG_VERSION:= 5.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 0a2139e91df4758218e0fddbd549e13c
-PKG_DESCR:= X Fixes Library
+PKG_DESCR:= x11 fixes library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= fixesproto xextproto xproto libX11
PKG_URL:= http://xorg.freedesktop.org/
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index c220b35..751c404 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXfont
PKG_VERSION:= 1.4.5
PKG_RELEASE:= 2
PKG_MD5SUM:= a54dea0debecf232a346c22e71d76836
-PKG_DESCR:= X font Library
+PKG_DESCR:= x11 font library
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libfreetype
PKG_BUILDDEP:= freetype fontcacheproto fontsproto libfontenc xtrans
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index 3a3954d..2fe551b 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXft
PKG_VERSION:= 2.3.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 946a157090eec5c3041cf17530d93f59
-PKG_DESCR:= X FreeType library
+PKG_DESCR:= freetype library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXrender fontconfig
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index c53095a..8b2e627 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXi
PKG_VERSION:= 1.6.1
PKG_RELEASE:= 2
PKG_MD5SUM:= d024a9de73191628f9772893f02054d8
-PKG_DESCR:= client interface to the XINPUT extension
+PKG_DESCR:= client interface to the xinput extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto xextproto libXext libXi-host
PKG_URL:= http://xorg.freedesktop.org/
diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile
index f1e2597..cfa4637 100644
--- a/package/libXinerama/Makefile
+++ b/package/libXinerama/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXinerama
PKG_VERSION:= 1.1.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 29a813b3850d499a3524a8d5d5ecb099
-PKG_DESCR:= Xinerama library
+PKG_DESCR:= xinerama library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xineramaproto libXinerama-host
HOST_BUILDDEP:= xineramaproto-host libXext-host
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index 28c1772..11ff12b 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXmu
PKG_VERSION:= 1.1.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 53fd02bc7174dd643a26bcc88147c146
-PKG_DESCR:= miscellaneous utility functions for X libraries
+PKG_DESCR:= miscellaneous utility functions for x libraries
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXt libXext
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXp/Makefile b/package/libXp/Makefile
index 2d94fd9..e6894b1 100644
--- a/package/libXp/Makefile
+++ b/package/libXp/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXp
PKG_VERSION:= 1.0.1
PKG_RELEASE:= 2
PKG_MD5SUM:= a960c831f11e6b4249fde78a5b969000
-PKG_DESCR:= X Print library
+PKG_DESCR:= x11 printing library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXext printproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index 9d47e24..a32e767 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXpm
PKG_VERSION:= 3.5.10
PKG_RELEASE:= 2
PKG_MD5SUM:= a70507638d74541bf30a771f1e5938bb
-PKG_DESCR:= common operation for the XPM pixmap format
+PKG_DESCR:= common operation for the xpm pixmap format
PKG_BUILDDEP:= libX11 libXt
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXrandr/Makefile b/package/libXrandr/Makefile
index 11bff2e..4286823 100644
--- a/package/libXrandr/Makefile
+++ b/package/libXrandr/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXrandr
PKG_VERSION:= 1.3.2
PKG_RELEASE:= 2
PKG_MD5SUM:= edacf83655be2e48348b626c0dc454f3
-PKG_DESCR:= Xrandr library
+PKG_DESCR:= xrandr library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= randrproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index d19fcab..8bbbf86 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXrender
PKG_VERSION:= 0.9.7
PKG_RELEASE:= 2
PKG_MD5SUM:= b6702e6f56f9d9103dc688f4336529a9
-PKG_DESCR:= X11 rendering library
+PKG_DESCR:= x11 rendering library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= renderproto-host xproto-host xextproto-host libXau-host
PKG_BUILDDEP+= xcb-proto-host libpthread-stubs-host libxcb-host kbproto-host
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 622c107..b66cc23 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXt
PKG_VERSION:= 1.1.3
PKG_RELEASE:= 3
PKG_MD5SUM:= 7a80ed7aba06668b12ebd0910318a1f1
-PKG_DESCR:= X Toolkit Intrinsics libraries
+PKG_DESCR:= x toolkit intrinsics libraries
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb
PKG_BUILDDEP:= autotool
diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile
index ff89456..4790863 100644
--- a/package/libXtst/Makefile
+++ b/package/libXtst/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXtst
PKG_VERSION:= 1.2.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 8918809e47c29b44d25eb16b1586a15b
-PKG_DESCR:= Xtst library
+PKG_DESCR:= client interface to the record extension to the x protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP+= recordproto libXi
HOST_BUILDDEP:= recordproto-host xproto-host xextproto-host
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 0842c67..25cbd08 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXv
PKG_VERSION:= 1.0.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 066145bab1f182476589af0ee9c18152
-PKG_DESCR:= X11 Xvideo extensions library
+PKG_DESCR:= xvideo extensions library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 videoproto libXext
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile
index a897fac..a5198a6 100644
--- a/package/libXxf86dga/Makefile
+++ b/package/libXxf86dga/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXxf86dga
PKG_VERSION:= 1.1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 8ed1c8674e730e8d333dfe4b9f2097d9
-PKG_DESCR:= client library for the XFree86-DGA extension
+PKG_DESCR:= client library for the xfree86-dga extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xf86dgaproto libXext libXaw
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile
index cbcfa0f..df374f9 100644
--- a/package/libXxf86vm/Makefile
+++ b/package/libXxf86vm/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libXxf86vm
PKG_VERSION:= 1.1.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 84d26e26c07f8cbcb5f447590df5b5c3
-PKG_DESCR:= interface to the XFree86-VidModeExtension extension
+PKG_DESCR:= interface to the xfree86-vidmode extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xf86vidmodeproto libXext
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libaio/Makefile b/package/libaio/Makefile
index 4aed7b6..ab697f7 100644
--- a/package/libaio/Makefile
+++ b/package/libaio/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libaio
PKG_VERSION:= 0.3.109
PKG_RELEASE:= 2
PKG_MD5SUM:= 435a5b16ca6198eaf01155263d855756
-PKG_DESCR:= Asynchronous I/O library
-PKG_SECTION:= libs
+PKG_DESCR:= asynchronous I/O library
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.kernel.org
PKG_SITES:= http://openadk.org/distfiles/
PKG_OPTS:= dev
diff --git a/package/libantlr3c/Makefile b/package/libantlr3c/Makefile
index dc57e74..561f5a2 100755
--- a/package/libantlr3c/Makefile
+++ b/package/libantlr3c/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libantlr3c
PKG_VERSION:= 3.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 674646e1d1bf5c6015435480cead725a
-PKG_DESCR:= ANother Tool for Language Recognition
-PKG_SECTION:= libs
+PKG_DESCR:= another tool for language recognition
+PKG_SECTION:= libs/misc
PKG_SITES:= http://www.antlr.org/download/C/
PKG_OPTS:= dev
diff --git a/package/libao/Makefile b/package/libao/Makefile
index 6b35831..0e5b923 100644
--- a/package/libao/Makefile
+++ b/package/libao/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 2b2508c29bc97e4dc218fa162cf883c8
PKG_DESCR:= cross platform audio library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/audio
PKG_DEPENDS:= alsa-lib
PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.xiph.org/ao
diff --git a/package/libart/Makefile b/package/libart/Makefile
index bdc3250..c83cc34 100644
--- a/package/libart/Makefile
+++ b/package/libart/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libart
PKG_VERSION:= 2.3.17
PKG_RELEASE:= 2
PKG_MD5SUM:= f1f6b3e5490f382535dccb288f5d8b14
-PKG_DESCR:= An high-performance 2D graphics library
-PKG_SECTION:= libs
+PKG_DESCR:= high-performance 2d graphics library
+PKG_SECTION:= libs/image
PKG_SITES:= ${MASTER_SITE_GNOME:=libart_lgpl/2.3/}
PKG_OPTS:= dev
diff --git a/package/libass/Makefile b/package/libass/Makefile
index c4cdffe..3e74c1a 100644
--- a/package/libass/Makefile
+++ b/package/libass/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libass
PKG_VERSION:= 0.10.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 0f54b1f3a24fa897ebbbcc5bc744b32a
-PKG_DESCR:= a portable subtitle renderer for the ASS/SSA format
-PKG_SECTION:= libs
+PKG_DESCR:= portable subtitle renderer
+PKG_SECTION:= libs/video
PKG_DEPENDS:= fribidi fontconfig
PKG_BUILDDEP:= fribidi fontconfig
PKG_URL:= http://code.google.com/p/libass/
diff --git a/package/libatomic_ops/Makefile b/package/libatomic_ops/Makefile
index 6486f14..58d2a12 100644
--- a/package/libatomic_ops/Makefile
+++ b/package/libatomic_ops/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 7.4.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 59f9a7cc845dcc775e7b7901eb582766
PKG_DESCR:= atomic operations library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.hboehm.info/gc/
PKG_SITES:= http://www.hboehm.info/gc/gc_source/
PKG_OPTS:= dev
diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile
index b58a87a..ea88b9c 100644
--- a/package/libaudiofile/Makefile
+++ b/package/libaudiofile/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.3.6
PKG_RELEASE:= 2
PKG_MD5SUM:= 2731d79bec0acef3d30d2fc86b0b72fd
PKG_DESCR:= audiofile library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/audio
PKG_URL:= http://audiofile.68k.org/
PKG_BUILDDEP:= flac
PKG_DEPENDS:= libflac
diff --git a/package/libavl/Makefile b/package/libavl/Makefile
index 2ac4045..c8b9d78 100755
--- a/package/libavl/Makefile
+++ b/package/libavl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libavl
PKG_VERSION:= 0.3.5
PKG_RELEASE:= 2
PKG_MD5SUM:= 882c68ea7f71876ca110f3b84d7ab12d
-PKG_DESCR:= AVL library
-PKG_SECTION:= libs
+PKG_DESCR:= avl library
+PKG_SECTION:= libs/misc
PKG_SITES:= http://openadk.org/distfiles/
PKG_OPTS:= dev
diff --git a/package/libbluray/Makefile b/package/libbluray/Makefile
index 4fe6952..bc233fc 100644
--- a/package/libbluray/Makefile
+++ b/package/libbluray/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.0
PKG_RELEASE:= 2
PKG_MD5SUM:= c7a1cc71cb9747f93122ec650d4ae933
PKG_DESCR:= bluray library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/video
PKG_BUILDDEP:= libxml2
PKG_URL:= http://www.videolan.org/developers/libbluray.html
PKG_SITES:= ftp://ftp.videolan.org/pub/videolan/libbluray/${PKG_VERSION}/
diff --git a/package/libcap/Makefile b/package/libcap/Makefile
index 5c5f4ed..cd693ac 100644
--- a/package/libcap/Makefile
+++ b/package/libcap/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.22
PKG_RELEASE:= 3
PKG_MD5SUM:= ce64058bdb3f086ddbfca8ce6c919845
PKG_DESCR:= capabilities library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= pam
PKG_URL:= http://www.friedhoff.org/posixfilecaps.html
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/libcapi20/Makefile b/package/libcapi20/Makefile
index 2b81fb8..84e03a5 100644
--- a/package/libcapi20/Makefile
+++ b/package/libcapi20/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libcapi20
PKG_VERSION:= 3.0.5-cm2
PKG_RELEASE:= 1
PKG_MD5SUM:= cf81d182fe7a4dbab61bce929824db2c
-PKG_DESCR:= CAPI library
-PKG_SECTION:= libs
+PKG_DESCR:= capi library
+PKG_SECTION:= libs/misc
PKG_URL:= ftp://ftp.melware.net/capi-utils/
PKG_SITES:= ftp://ftp.melware.net/capi-utils/
PKG_OPTS:= dev
diff --git a/package/libcdio/Makefile b/package/libcdio/Makefile
index c4a7322..b75375c 100644
--- a/package/libcdio/Makefile
+++ b/package/libcdio/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libcdio
PKG_VERSION:= 0.92
PKG_RELEASE:= 1
PKG_MD5SUM:= 86f3f2869c1d34e4c6e52db77992b918
-PKG_DESCR:= library for CD-ROM and CD image access
-PKG_SECTION:= libs
+PKG_DESCR:= library for cd-rom and cd image access
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= libiconv-tiny
PKG_URL:= http://www.gnu.org/software/libcdio
PKG_SITES:= ${MASTER_SITE_GNU:=libcdio/}
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index 378cc4d..809861e 100644
--- a/package/libcec/Makefile
+++ b/package/libcec/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libcec
PKG_VERSION:= 2.1.4
PKG_RELEASE:= 4
PKG_MD5SUM:= faa58944f87e9beda165f615d4b46766
-PKG_DESCR:= control your device with your TV remote control
-PKG_SECTION:= libs
+PKG_DESCR:= control your device with your tv remote control
+PKG_SECTION:= libs/video
PKG_BUILDDEP:= autotool
PKG_URL:= http://libcec.pulse-eight.com/
PKG_SITES:= http://packages.pulse-eight.net/pulse/sources/libcec/
diff --git a/package/libcli/Makefile b/package/libcli/Makefile
index cec7642..e150182 100755
--- a/package/libcli/Makefile
+++ b/package/libcli/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libcli
PKG_VERSION:= 1.9.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 1b07b09e2840f910defde66afa28fbe7
-PKG_DESCR:= Cisco-like command-line interface library
-PKG_SECTION:= libs
+PKG_DESCR:= cisco-like command-line interface library
+PKG_SECTION:= libs/misc
PKG_URL:= http://sites.dparrish.com/libcli
PKG_SITES:= https://github.com/dparrish/libcli
PKG_OPTS:= dev
diff --git a/package/libcroco/Makefile b/package/libcroco/Makefile
index 8e67753..8173e5c 100644
--- a/package/libcroco/Makefile
+++ b/package/libcroco/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libcroco
PKG_VERSION:= 0.6.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 767e73c4174f75b99695d4530fd9bb80
-PKG_DESCR:= CSS2 parsing and manipulation library
-PKG_SECTION:= libs
+PKG_DESCR:= css2 parsing and manipulation library
+PKG_SECTION:= libs/misc
PKG_URL:= https://github.com/GNOME/libcroco
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/
PKG_OPTS:= dev
diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile
index 6262a30..698a6e7 100644
--- a/package/libdaemon/Makefile
+++ b/package/libdaemon/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libdaemon
PKG_VERSION:= 0.14
PKG_RELEASE:= 1
PKG_MD5SUM:= 509dc27107c21bcd9fbf2f95f5669563
-PKG_DESCR:= library that eases the writing of UNIX daemons
-PKG_SECTION:= libs
+PKG_DESCR:= library that eases the writing of daemons
+PKG_SECTION:= libs/misc
PKG_URL:= http://0pointer.de/lennart/projects/libdaemon/
PKG_SITES:= http://0pointer.de/lennart/projects/libdaemon/
PKG_OPTS:= dev
diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile
index 6c5b331..07b7892 100644
--- a/package/libdnet/Makefile
+++ b/package/libdnet/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.11
PKG_RELEASE:= 3
PKG_MD5SUM:= 04c394ed8e1e7fc455456e79e908916d
PKG_DESCR:= low-level networking library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/net
PKG_BUILDDEP:= autotool
PKG_URL:= http://libdnet.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/}
@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
AUTOTOOL_STYLE:= autoreconf
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no
CONFIGURE_ARGS+= --without-check
diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile
index 68b4d82..bed9c15 100644
--- a/package/libdrm/Makefile
+++ b/package/libdrm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libdrm
PKG_VERSION:= 2.4.53
PKG_RELEASE:= 1
PKG_MD5SUM:= 12e30247fb3caafc835e5f3f768c426a
-PKG_DESCR:= DRM library
-PKG_SECTION:= libs
+PKG_DESCR:= drm library
+PKG_SECTION:= libs/video
PKG_BUILDDEP:= libpthread-stubs cairo libpciaccess
PKG_URL:= http://dri.freedesktop.org/wiki/
PKG_SITES:= http://dri.freedesktop.org/libdrm/
diff --git a/package/libelf/Makefile b/package/libelf/Makefile
index bbd8dcc..2ad7a1e 100644
--- a/package/libelf/Makefile
+++ b/package/libelf/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/libelf/Makefile.inc
PKG_NAME:= libelf
PKG_DESCR:= elf library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_SITES:= http://www.mr511.de/software/
PKG_OPTS:= dev
diff --git a/package/libevent/Makefile b/package/libevent/Makefile
index 3c6d1d0..e15dd75 100644
--- a/package/libevent/Makefile
+++ b/package/libevent/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.21
PKG_RELEASE:= 1
PKG_MD5SUM:= b2405cc9ebf264aa47ff615d9de527a2
PKG_DESCR:= event notification library for event-driven network servers
-PKG_SECTION:= libs
+PKG_SECTION:= libs/net
PKG_URL:= http://libevent.org/
PKG_SITES:= https://github.com/downloads/libevent/libevent/
PKG_OPTS:= dev
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index daa682b..0b1577b 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libffi
PKG_VERSION:= 3.0.13
PKG_RELEASE:= 1
PKG_MD5SUM:= 45f3b6dbc9ee7c7dfbbbc5feba571529
-PKG_DESCR:= Foreign Function Interface library
-PKG_SECTION:= libs
+PKG_DESCR:= foreign function interface library
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= autotool libffi-host
HOST_BUILDDEP:= autotool
PKG_URL:= http://sourceware.org/libffi/
diff --git a/package/libgc/Makefile b/package/libgc/Makefile
index 731c7f9..b0795cc 100644
--- a/package/libgc/Makefile
+++ b/package/libgc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 7.4.0
PKG_RELEASE:= 2
PKG_MD5SUM:= f40d9a47c90d60791eeecb484f8df5ee
PKG_DESCR:= garbage collector library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= libatomic_ops
HOST_BUILDDEP:= libatomic_ops-host
PKG_URL:= http://www.hboehm.info/gc/
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index 4e31b33..1df7b47 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libgcrypt
PKG_VERSION:= 1.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= d155aa1b06fa879175922ba28f6a6509
-PKG_DESCR:= GNU crypto library
-PKG_SECTION:= libs
+PKG_DESCR:= crypto library
+PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libgpg-error
PKG_BUILDDEP:= libgpg-error
PKG_URL:= http://directory.fsf.org/project/libgcrypt
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index 21d80e7..2ca6904 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libgd
PKG_VERSION:= 2.1.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 03588159bf4faab9079849c8d709acc6
-PKG_DESCR:= A library for the dynamic creation of images
-PKG_SECTION:= libs
+PKG_DESCR:= library for the dynamic creation of images
+PKG_SECTION:= libs/image
PKG_DEPENDS:= libpng libjpeg-turbo
PKG_BUILDDEP:= libpng libjpeg-turbo
PKG_URL:= http://www.libgd.org/
diff --git a/package/libglew/Makefile b/package/libglew/Makefile
index 8fd3468..380a318 100644
--- a/package/libglew/Makefile
+++ b/package/libglew/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libglew
PKG_VERSION:= 1.10.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 2f09e5e6cb1b9f3611bcac79bc9c2d5d
-PKG_DESCR:= OpenGL Extension Wrangler Library (GLEW)
-PKG_SECTION:= libs
+PKG_DESCR:= opengl extension wrangler library
+PKG_SECTION:= libs/video
PKG_DEPENDS:= libx11 libxmu libxi libxext
PKG_BUILDDEP:= libX11 libXmu libXi libXext
PKG_URL:= http://glew.sourceforge.net/index.html
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index 945c345..2b142d7 100644
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.12
PKG_RELEASE:= 1
PKG_MD5SUM:= 8f0eb41a344d19ac2aa9bd101dfb9ce6
PKG_DESCR:= helper library for common error codes and descriptions
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.gnupg.org/
PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/
PKG_OPTS:= dev
diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile
index bfa2b1c..8a4293b 100644
--- a/package/libgssglue/Makefile
+++ b/package/libgssglue/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libgssglue
PKG_VERSION:= 0.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 48aaad11b7371ba3270faa322202c038
-PKG_DESCR:= GSS glue library for NFSv4
-PKG_SECTION:= libs
+PKG_DESCR:= gss glue library for nfsv4
+PKG_SECTION:= libs/net
PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/
PKG_OPTS:= dev
diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile
index 53659c9..dca0349 100644
--- a/package/libhugetlbfs/Makefile
+++ b/package/libhugetlbfs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.11
PKG_RELEASE:= 2
PKG_MD5SUM:= 35e68f16b704f2e339622a8ca07fdee0
PKG_DESCR:= easy hugepage access
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://libhugetlbfs.ozlabs.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/}
PKG_OPTS:= dev
diff --git a/package/libiconv-tiny/Makefile b/package/libiconv-tiny/Makefile
index 4e749b7..e0f8245 100644
--- a/package/libiconv-tiny/Makefile
+++ b/package/libiconv-tiny/Makefile
@@ -8,8 +8,7 @@ PKG_VERSION:= 0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 4898b62aebc1614edab60bf1fe0ac661
PKG_DESCR:= iconv stub and replacement
-PKG_SECTION:= libs
-PKG_BUILDDEP:= libiconv-tiny-host
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.openwrt.org/
PKG_SITES:= http://www.openadk.org/distfiles/
PKG_OPTS:= dev devonly
diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile
index 5a6ad3a..b3cd8f9 100644
--- a/package/libid3tag/Makefile
+++ b/package/libid3tag/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libid3tag
PKG_VERSION:= 0.15.1b
PKG_RELEASE:= 3
PKG_MD5SUM:= e5808ad997ba32c498803822078748c3
-PKG_DESCR:= ID3 tag manipulation library
-PKG_SECTION:= libs
+PKG_DESCR:= id3 tag manipulation library
+PKG_SECTION:= libs/audio
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/}
diff --git a/package/libjansson/Makefile b/package/libjansson/Makefile
index 4fef0dd..5213bba 100644
--- a/package/libjansson/Makefile
+++ b/package/libjansson/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libjansson
PKG_VERSION:= 2.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 46ac93bec48aacf207b67b51c8fbf7f1
-PKG_DESCR:= JSON library
-PKG_SECTION:= libs
+PKG_DESCR:= json library
+PKG_SECTION:= libs/data
PKG_URL:= http://www.digip.org/jansson/
PKG_SITES:= http://www.digip.org/jansson/releases/
PKG_OPTS:= dev
diff --git a/package/libjasper/Makefile b/package/libjasper/Makefile
index e4b45a1..8bb52a3 100644
--- a/package/libjasper/Makefile
+++ b/package/libjasper/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libjasper
PKG_VERSION:= 1.900
PKG_RELEASE:= 2
PKG_MD5SUM:= a342b2b4495b3e1394e161eb5d85d754
-PKG_DESCR:= implementation of the codec specified in the JPEG-2000 Part-1 standard
-PKG_SECTION:= libs
+PKG_DESCR:= implementation of the codec specified in the jpeg-2000 standard
+PKG_SECTION:= libs/image
PKG_URL:= http://www.ece.uvic.ca/~frodo/jasper/
PKG_SITES:= http://www.ece.uvic.ca/~frodo/jasper/software/
PKG_OPTS:= dev
diff --git a/package/libjpeg-turbo/Makefile b/package/libjpeg-turbo/Makefile
index d4e1a63..751ec4c 100644
--- a/package/libjpeg-turbo/Makefile
+++ b/package/libjpeg-turbo/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libjpeg-turbo
PKG_VERSION:= 1.3.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 2c3a68129dac443a72815ff5bb374b05
-PKG_DESCR:= JPEG library
-PKG_SECTION:= libs
+PKG_DESCR:= jpeg image library
+PKG_SECTION:= libs/image
PKG_URL:= http://libjpeg-turbo.virtualgl.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
PKG_OPTS:= dev
diff --git a/package/libjson/Makefile b/package/libjson/Makefile
index 6520bd4..fcb4ba9 100644
--- a/package/libjson/Makefile
+++ b/package/libjson/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libjson
PKG_VERSION:= 7.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 82f3fcbf9f8cf3c4e25e1bdd77d65164
-PKG_DESCR:= JSON library
-PKG_SECTION:= libs
+PKG_DESCR:= json library
+PKG_SECTION:= libs/data
PKG_URL:= http://sourceforge.net/projects/libjson/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjson/}
PKG_OPTS:= dev
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index 9402b7a..81f69f5 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= lzo
PKG_VERSION:= 2.06
PKG_RELEASE:= 1
PKG_MD5SUM:= 95380bd4081f85ef08c5209f4107e9f8
-PKG_DESCR:= a real-time data compression library
-PKG_SECTION:= libs
+PKG_DESCR:= real-time data compression library
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.oberhumer.com/opensource/lzo
PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/
PKG_LIBNAME:= liblzo
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index b3e035c..b122454 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libmad
PKG_VERSION:= 0.15.1b
PKG_RELEASE:= 6
PKG_MD5SUM:= 1be543bc30c56fb6bea1d7bf6a64e66c
-PKG_DESCR:= high-quality MPEG audio decoding library
-PKG_SECTION:= libs
+PKG_DESCR:= high-quality mpeg audio decoding library
+PKG_SECTION:= libs/audio
PKG_BUILDDEP:= autotool
PKG_URL:= http://sourceforge.net/projects/mad
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/}
diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile
index 4fcf1c0..ba1e006 100644
--- a/package/libmicrohttpd/Makefile
+++ b/package/libmicrohttpd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libmicrohttpd
PKG_VERSION:= 0.9.36
PKG_RELEASE:= 1
PKG_MD5SUM:= d4ebabaef27a2126efb7af0d085b1895
-PKG_DESCR:= library make it easy to run an HTTP server
-PKG_SECTION:= libs
+PKG_DESCR:= library make it easy to run an webserver
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libgcrypt
PKG_BUILDDEP:= libgcrypt
PKG_URL:= http://www.gnu.org/software/libmicrohttpd/
diff --git a/package/libmms/Makefile b/package/libmms/Makefile
index 4feb1d5..e3033bf 100644
--- a/package/libmms/Makefile
+++ b/package/libmms/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 9f63aa363deb4874e072a45850161bff
PKG_DESCR:= common library for parsing mms:// type network streams
-PKG_SECTION:= libs
+PKG_SECTION:= libs/audio
PKG_BUILDDEP:= glib
PKG_DEPENDS:= glib
PKG_URL:= http://libmms.sourceforge.net/
diff --git a/package/libmnl/Makefile b/package/libmnl/Makefile
index 6536063..09e9c44 100644
--- a/package/libmnl/Makefile
+++ b/package/libmnl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libmnl
PKG_VERSION:= 1.0.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 7d95fc3bea3365bc03c48e484224f65f
-PKG_DESCR:= minimalistic user-space library oriented to Netlink developers
-PKG_SECTION:= libs
+PKG_DESCR:= minimalistic user-space library oriented to netlink developers
+PKG_SECTION:= libs/net
PKG_URL:= http://www.netfilter.org/projects/libmnl/
PKG_SITES:= http://www.netfilter.org/projects/libmnl/files/
PKG_OPTS:= dev
diff --git a/package/libmodplug/Makefile b/package/libmodplug/Makefile
index c64c83d..7a87db4 100644
--- a/package/libmodplug/Makefile
+++ b/package/libmodplug/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libmodplug
PKG_VERSION:= 0.8.8.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 5f30241db109d647781b784e62ddfaa1
-PKG_DESCR:= MOD player library
-PKG_SECTION:= libs
+PKG_DESCR:= mod player library
+PKG_SECTION:= libs/audio
PKG_URL:= http://modplug-xmms.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=modplug-xmms/libmodplug/0.8.8.5/}
PKG_OPTS:= dev
diff --git a/package/libmpc/Makefile b/package/libmpc/Makefile
index 0a0baeb..9141435 100644
--- a/package/libmpc/Makefile
+++ b/package/libmpc/Makefile
@@ -5,8 +5,8 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/mpc/Makefile.inc
PKG_NAME:= mpc
-PKG_DESCR:= GNU multiprecision arithmetic library
-PKG_SECTION:= libs
+PKG_DESCR:= multiprecision arithmetic library
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= gmp mpfr
PKG_URL:= http://www.multiprecision.org/
PKG_LIBNAME:= libmpc
diff --git a/package/libmpdclient/Makefile b/package/libmpdclient/Makefile
index 91a4f2c..33dea0e 100644
--- a/package/libmpdclient/Makefile
+++ b/package/libmpdclient/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libmpdclient
PKG_VERSION:= 2.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 4b101a36e5c0cf967dc063391260ddbf
-PKG_DESCR:= library for interfacing MPD
-PKG_SECTION:= libs
+PKG_DESCR:= library for interfacing mpd
+PKG_SECTION:= libs/audio
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/libmpdclient/2/
PKG_OPTS:= dev
diff --git a/package/libmpeg2/Makefile b/package/libmpeg2/Makefile
index aa54600..aa77c3a 100644
--- a/package/libmpeg2/Makefile
+++ b/package/libmpeg2/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libmpeg2
PKG_VERSION:= 0.5.1
PKG_RELEASE:= 3
PKG_MD5SUM:= 0f92c7454e58379b4a5a378485bbd8ef
-PKG_DESCR:= MPEG-1 & -2 decoding library
-PKG_SECTION:= libs
+PKG_DESCR:= mpeg1 and mpeg2 decoding library
+PKG_SECTION:= libs/video
PKG_URL:= http://libmpeg2.sourceforge.net/
PKG_SITES:= http://libmpeg2.sourceforge.net/files/
PKG_OPTS:= dev
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index d06081e..72bbd28 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 710296fe424a49344e5fcc0d09e53317
PKG_DESCR:= low-level packet creation library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libpcap libstdcxx
PKG_BUILDDEP:= libpcap autotool
PKG_URL:= http://sourceforge.net/projects/libnet-dev/
diff --git a/package/libnetfilter_acct/Makefile b/package/libnetfilter_acct/Makefile
index 4c88722..0a2565c 100644
--- a/package/libnetfilter_acct/Makefile
+++ b/package/libnetfilter_acct/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libnetfilter_acct
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 2118d9514c079839ebd9cb3144ad2ad7
-PKG_DESCR:= API to extended accounting infrastructure
-PKG_SECTION:= libs
+PKG_DESCR:= extended accounting infrastructure library
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libnfnetlink
PKG_BUILDDEP:= libnfnetlink
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_acct/
diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile
index 90c74f5..a23579d 100644
--- a/package/libnetfilter_conntrack/Makefile
+++ b/package/libnetfilter_conntrack/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libnetfilter_conntrack
PKG_VERSION:= 1.0.4
PKG_RELEASE:= 2
PKG_MD5SUM:= 18cf80c4b339a3285e78822dbd4f08d7
-PKG_DESCR:= API to connection tracking state table
-PKG_SECTION:= libs
+PKG_DESCR:= connection tracking state table library
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libnfnetlink libmnl
PKG_BUILDDEP:= libnfnetlink libmnl
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_conntrack/
diff --git a/package/libnetfilter_cthelper/Makefile b/package/libnetfilter_cthelper/Makefile
index df0f8b9..bd804aa 100644
--- a/package/libnetfilter_cthelper/Makefile
+++ b/package/libnetfilter_cthelper/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libnetfilter_cthelper
PKG_VERSION:= 1.0.0
PKG_RELEASE:= 2
PKG_MD5SUM:= b2efab1a3a198a5add448960ba011acd
-PKG_DESCR:= userspace library that provides the API to the user-space helper infrastructure
-PKG_SECTION:= libs
+PKG_DESCR:= userspace library that provides the api to the user-space helper infrastructure
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libnfnetlink libmnl
PKG_BUILDDEP:= libnfnetlink libmnl
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_cthelper/
diff --git a/package/libnetfilter_cttimeout/Makefile b/package/libnetfilter_cttimeout/Makefile
index 5fa0c4e..9f4de8a 100644
--- a/package/libnetfilter_cttimeout/Makefile
+++ b/package/libnetfilter_cttimeout/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 7697437fc9ebb6f6b83df56a633db7f9
PKG_DESCR:= API to the fine-grain connection tracking timeout infrastructure
-PKG_SECTION:= libs
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libnfnetlink libmnl
PKG_BUILDDEP:= libnfnetlink libmnl
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_cttimeout/
diff --git a/package/libnetfilter_log/Makefile b/package/libnetfilter_log/Makefile
index 0443ef0..90666c7 100644
--- a/package/libnetfilter_log/Makefile
+++ b/package/libnetfilter_log/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libnetfilter_log
PKG_VERSION:= 1.0.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 2a4bb0654ae675a52d2e8d1c06090b94
-PKG_DESCR:= API to packets that have been logged
-PKG_SECTION:= libs
+PKG_DESCR:= api to packets that have been logged
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libnfnetlink
PKG_BUILDDEP:= libnfnetlink
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_log/
diff --git a/package/libnetfilter_queue/Makefile b/package/libnetfilter_queue/Makefile
index 88ec8f1..5a12f4b 100644
--- a/package/libnetfilter_queue/Makefile
+++ b/package/libnetfilter_queue/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libnetfilter_queue
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 3
PKG_MD5SUM:= df09befac35cb215865b39a36c96a3fa
-PKG_DESCR:= API to packets that have been queued by the kernel packet filter
-PKG_SECTION:= libs
+PKG_DESCR:= api to packets that have been queued by the kernel packet filter
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libnfnetlink libmnl
PKG_BUILDDEP:= libnfnetlink libmnl
PKG_URL:= http://www.netfilter.org/projects/libnetfilter_queue/
diff --git a/package/libnettle/Makefile b/package/libnettle/Makefile
index e195457..0fce107 100644
--- a/package/libnettle/Makefile
+++ b/package/libnettle/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 003d5147911317931dd453520eb234a5
PKG_DESCR:= crypto library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libgmp
PKG_BUILDDEP:= gmp
PKG_URL:= http://www.lysator.liu.se/~nisse/
diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile
index 0d4da94..21a55ae 100644
--- a/package/libnfnetlink/Makefile
+++ b/package/libnfnetlink/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 5
PKG_MD5SUM:= 98927583d2016a9fb1936fed992e2c5e
PKG_DESCR:= netfilter related kernel/userspace communication
-PKG_SECTION:= libs
+PKG_SECTION:= libs/net
PKG_URL:= http://www.netfilter.org/projects/libnfnetlink/
PKG_SITES:= http://www.netfilter.org/projects/libnfnetlink/files/
PKG_OPTS:= dev
diff --git a/package/libnfs/Makefile b/package/libnfs/Makefile
index 0e172b7..a904fac 100644
--- a/package/libnfs/Makefile
+++ b/package/libnfs/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libnfs
PKG_VERSION:= 1.9.3
PKG_RELEASE:= 1
PKG_MD5SUM:= a07656eeca58ad8d4870da546745628a
-PKG_DESCR:= NFS client library
-PKG_SECTION:= libs
+PKG_DESCR:= nfs client library
+PKG_SECTION:= libs/net
PKG_BUILDDEP:= autotool
PKG_URL:= https://github.com/sahlberg/libnfs
PKG_SITES:= https://sites.google.com/site/libnfstarballs/li/
diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile
index 2881c1a..6213659 100644
--- a/package/libnfsidmap/Makefile
+++ b/package/libnfsidmap/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libnfsidmap
PKG_VERSION:= 0.25
PKG_RELEASE:= 3
PKG_MD5SUM:= 2ac4893c92716add1a1447ae01df77ab
-PKG_DESCR:= idmap library for NFSv4
-PKG_SECTION:= libs
+PKG_DESCR:= idmap library for nfsv4
+PKG_SECTION:= libs/net
PKG_URL:= http://www.citi.umich.edu/projects/nfsv4/linux/
PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
PKG_OPTS:= dev
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index c70e54b..1529723 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.24
PKG_RELEASE:= 3
PKG_MD5SUM:= 72d37c79c85615ffe158aa524d649610
PKG_DESCR:= network intrusion detection system library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libnet libpcap glib
PKG_BUILDDEP:= autotool libnet libpcap glib
PKG_URL:= http://libnids.sourceforge.net/
diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index 85d46c7..a5d6dcf 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.2.24
PKG_RELEASE:= 1
PKG_MD5SUM:= 6e0e7bad0674749d930dd9f285343d55
PKG_DESCR:= netlink library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/net
PKG_BUILDDEP:= m4-host flex-host
PKG_URL:= http://www.infradead.org/~tgr/libnl/
PKG_SITES:= http://www.infradead.org/~tgr/libnl/files/
diff --git a/package/libnotify/Makefile b/package/libnotify/Makefile
index 221b117..690fcb6 100644
--- a/package/libnotify/Makefile
+++ b/package/libnotify/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.5
PKG_RELEASE:= 3
PKG_MD5SUM:= 472e2c1f808848365572a9b024d9e8f5
PKG_DESCR:= notify library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libstdcxx
PKG_BUILDDEP:= gtk+ dbus-glib
PKG_URL:= http://www.galago-project.org/
diff --git a/package/libogg/Makefile b/package/libogg/Makefile
index 7dfb47b..7f71981 100644
--- a/package/libogg/Makefile
+++ b/package/libogg/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libogg
PKG_VERSION:= 1.3.1
PKG_RELEASE:= 1
PKG_MD5SUM:= ca25d8da0ddfc8c6cbbf78d847a209fe
-PKG_DESCR:= Ogg bitstream handling library
-PKG_SECTION:= libs
+PKG_DESCR:= ogg bitstream handling library
+PKG_SECTION:= libs/audio
PKG_URL:= http://www.xiph.org/ogg
PKG_SITES:= http://downloads.xiph.org/releases/ogg/
PKG_OPTS:= dev
diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile
index 65060c3..67b7b77 100644
--- a/package/libosip2/Makefile
+++ b/package/libosip2/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libosip2
PKG_VERSION:= 3.3.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 81493bb4d4ae6d55b71a0d4369339125
-PKG_DESCR:= SIP (Session Initiation Protocol) implementation
-PKG_SECTION:= libs
+PKG_DESCR:= session initiation protocol implementation
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.gnu.org/software/osip
PKG_SITES:= ${MASTER_SITE_GNU:=osip/}
diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile
index 3b099d6..ea8bb6e 100644
--- a/package/libowfat/Makefile
+++ b/package/libowfat/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libowfat
PKG_VERSION:= 0.29
PKG_RELEASE:= 1
PKG_MD5SUM:= 1187c6acf11429e7adb9ebe180f644bb
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.fefe.de/libowfat
PKG_SITES:= http://dl.fefe.de/
diff --git a/package/libp11/Makefile b/package/libp11/Makefile
index 09eec9a..4a256a9 100644
--- a/package/libp11/Makefile
+++ b/package/libp11/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libp11
PKG_VERSION:= 0.2.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 564ab53ad7353903ddfdc15b153c44fb
-PKG_DESCR:= library implementing a small layer on top of PKCS11 API
-PKG_SECTION:= libs
+PKG_DESCR:= library implementing a small layer on top of pkcs11 api
+PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libopenssl libltdl
PKG_BUILDDEP:= openssl libtool
PKG_URL:= http://www.opensc-project.org/libp11
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index f8f6784..aa8b952 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libpcap
PKG_VERSION:= 1.5.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 33ba2f10f3a402cb5d34f5e2a904794a
-PKG_DESCR:= a low-level packet capture library
-PKG_SECTION:= libs
+PKG_DESCR:= low-level packet capture library
+PKG_SECTION:= libs/net
PKG_BUILDDEP:= m4-host flex-host bison-host libnl
PKG_URL:= http://www.tcpdump.org/
PKG_SITES:= http://www.tcpdump.org/release/
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index e9b7478..c32a325 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libpciaccess
PKG_VERSION:= 0.13.2
PKG_RELEASE:= 1
PKG_MD5SUM:= c49bd638c78fa4124e11432c1a94b5f4
-PKG_DESCR:= X.org PCI access library
+PKG_DESCR:= pci access library
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 0a35c42..12f5bcf 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libpng
PKG_VERSION:= 1.6.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 5f414b20f683b1d96b163c89e3eff768
-PKG_DESCR:= library for reading/writing PNG images
-PKG_SECTION:= libs
+PKG_DESCR:= library for reading/writing png images
+PKG_SECTION:= libs/image
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.libpng.org/pub/png/libpng.html
diff --git a/package/libpri/Makefile b/package/libpri/Makefile
index 00b1ec9..4415e1c 100644
--- a/package/libpri/Makefile
+++ b/package/libpri/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libpri
PKG_VERSION:= 1.4.12
PKG_RELEASE:= 2
PKG_MD5SUM:= 9de39b866f049cc20a4f431cc6245166
-PKG_DESCR:= C implementation of the Primary Rate ISDN specification
-PKG_SECTION:= libs
+PKG_DESCR:= c implementation of the primary rate isdn specification
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.asterisk.org/
PKG_SITES:= http://downloads.asterisk.org/pub/telephony/libpri/releases/
PKG_OPTS:= dev
diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile
index 60052bf..cd48346 100644
--- a/package/libpthread-stubs/Makefile
+++ b/package/libpthread-stubs/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libpthread-stubs
PKG_VERSION:= 0.3
PKG_RELEASE:= 2
PKG_MD5SUM:= a09d928c4af54fe5436002345ef71138
-PKG_DESCR:= Pthread-stubs
-PKG_SECTION:= devel
+PKG_DESCR:= pthread stubs
+PKG_SECTION:= dev/header
PKG_BUILDDEP:= libpthread-stubs-host
PKG_URL:= http://xcb.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index 50d8172..ae8512c 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -14,8 +14,8 @@ include ${TOPDIR}/toolchain/uclibc/Makefile.inc
endif
PKG_NAME:= libpthread
-PKG_DESCR:= POSIX threading library
-PKG_SECTION:= libs
+PKG_DESCR:= posix threading library
+PKG_SECTION:= libs/misc
PKG_OPTS:= noremove
NO_DISTFILES:= 1
diff --git a/package/libqb/Makefile b/package/libqb/Makefile
index 9562a39..99fc2a7 100644
--- a/package/libqb/Makefile
+++ b/package/libqb/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.16.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 51d2ca372c6b8151bf3544d93bcdc8db
PKG_DESCR:= high performance client server reusable features
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= https://github.com/asalkeld/libqb/wiki#wiki-Releases
PKG_SITES:= https://fedorahosted.org/releases/q/u/quarterback/
PKG_OPTS:= dev
diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile
index ef483bf..3fea60e 100644
--- a/package/librpcsecgss/Makefile
+++ b/package/librpcsecgss/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= librpcsecgss
PKG_VERSION:= 0.19
PKG_RELEASE:= 3
PKG_MD5SUM:= b45ed565bdc3099023aa35830ec92997
-PKG_DESCR:= Secure RPC library for NFSv4
-PKG_SECTION:= libs
+PKG_DESCR:= secure rpc library for nfsv4
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libgssglue libtirpc
PKG_BUILDDEP:= libgssglue libtirpc autotool
PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/
diff --git a/package/librsvg/Makefile b/package/librsvg/Makefile
index 1776cd1..b4e4fe0 100644
--- a/package/librsvg/Makefile
+++ b/package/librsvg/Makefile
@@ -7,10 +7,10 @@ PKG_NAME:= librsvg
PKG_VERSION:= 2.40.2
PKG_RELEASE:= 1
PKG_MD5SUM:= acdecdb9f08f3bf662a68bf7dafb8b82
-PKG_DESCR:= SVG library
+PKG_DESCR:= svg library
PKG_BUILDDEP:= libcroco
HOST_BUILDDEP:= libcroco-host gdk-pixbuf-host pango-host
-PKG_SECTION:= libs
+PKG_SECTION:= libs/image
PKG_URL:= https://wiki.gnome.org/action/show/Projects/LibRsvg?action=show&redirect=LibRsvg
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/
diff --git a/package/librt/Makefile b/package/librt/Makefile
index a9bd0f3..7acd31f 100644
--- a/package/librt/Makefile
+++ b/package/librt/Makefile
@@ -11,8 +11,8 @@ include ${TOPDIR}/toolchain/uclibc/Makefile.inc
endif
PKG_NAME:= librt
-PKG_DESCR:= Realtime library
-PKG_SECTION:= libs
+PKG_DESCR:= realtime library
+PKG_SECTION:= libs/misc
PKG_OPTS:= noremove
NO_DISTFILES:= 1
diff --git a/package/libsamplerate/Makefile b/package/libsamplerate/Makefile
index a07d762..717d73b 100644
--- a/package/libsamplerate/Makefile
+++ b/package/libsamplerate/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.1.8
PKG_RELEASE:= 3
PKG_MD5SUM:= 1c7fb25191b4e6e3628d198a66a84f47
PKG_DESCR:= sample rate converter for audio
-PKG_SECTION:= libs
+PKG_SECTION:= libs/audio
PKG_URL:= http://www.mega-nerd.com/SRC/
PKG_SITES:= http://www.mega-nerd.com/SRC/
PKG_OPTS:= dev
diff --git a/package/libsecret/Makefile b/package/libsecret/Makefile
index 04fc40e..86502ed 100644
--- a/package/libsecret/Makefile
+++ b/package/libsecret/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.18
PKG_RELEASE:= 1
PKG_MD5SUM:= 279d723cd005e80d1d304f74a3488acc
PKG_DESCR:= library for storing and retrieving passwords
-PKG_SECTION:= libs
+PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libgcrypt glib
PKG_BUILDDEP:= intltool-host gettext-tiny libgcrypt glib
PKG_URL:= https://wiki.gnome.org/Libsecret
diff --git a/package/libshout/Makefile b/package/libshout/Makefile
index f84a9bf..3ddb346 100644
--- a/package/libshout/Makefile
+++ b/package/libshout/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libshout
PKG_VERSION:= 2.3.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 11765b2592e7ea623ccd93d3f8df172c
-PKG_DESCR:= Library which can be used to write a source client for streaming
-PKG_SECTION:= libs
+PKG_DESCR:= library which can be used to write a source client for streaming
+PKG_SECTION:= libs/audio
PKG_DEPENDS:= libvorbis libogg
PKG_BUILDDEP:= libvorbis
PKG_URL:= http://directory.fsf.org/project/libshout
diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile
index f820568..0b1d0fe 100644
--- a/package/libsigc++/Makefile
+++ b/package/libsigc++/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libsigc++
PKG_VERSION:= 2.2.10
PKG_RELEASE:= 2
PKG_MD5SUM:= 6d350ae0bc17b8915a06ce6b7e4240e8
-PKG_DESCR:= Callback framework for C++
-PKG_SECTION:= libs
+PKG_DESCR:= callback framework for c++
+PKG_SECTION:= libs/misc
PKG_URL:= http://libsigc.sourceforge.net
PKG_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/}
PKG_OPTS:= dev
diff --git a/package/libsndfile/Makefile b/package/libsndfile/Makefile
index ad5d35f..325902d 100644
--- a/package/libsndfile/Makefile
+++ b/package/libsndfile/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.25
PKG_RELEASE:= 1
PKG_MD5SUM:= e2b7bb637e01022c7d20f95f9c3990a2
PKG_DESCR:= reading and writing files containing sampled sound
-PKG_SECTION:= libs
+PKG_SECTION:= libs/audio
PKG_URL:= http://www.mega-nerd.com/libsndfile/
PKG_SITES:= http://www.mega-nerd.com/libsndfile/files/
PKG_OPTS:= dev
diff --git a/package/libsoup/Makefile b/package/libsoup/Makefile
index 967f375..c062403 100644
--- a/package/libsoup/Makefile
+++ b/package/libsoup/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libsoup
PKG_VERSION:= 2.44.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 92aa3667357157e8f3489bcca287f2fa
-PKG_DESCR:= HTTP client/server library
-PKG_SECTION:= libs
+PKG_DESCR:= http client/server library
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libsqlite
PKG_BUILDDEP:= autotool sqlite
PKG_URL:= https://wiki.gnome.org/LibSoup
diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 841c71c..69a1bc8 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libssh
PKG_VERSION:= 0.6.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 66cf16e77f60913b4d54f18c92cdbf71
-PKG_DESCR:= SSH library
-PKG_SECTION:= libs
+PKG_DESCR:= secure shell library
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libopenssl zlib
PKG_BUILDDEP:= cmake-host openssl zlib
PKG_URL:= http://www.libssh.org/
diff --git a/package/libssh2/Makefile b/package/libssh2/Makefile
index 28dabfe..bba5d69 100644
--- a/package/libssh2/Makefile
+++ b/package/libssh2/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libssh2
PKG_VERSION:= 1.4.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 071004c60c5d6f90354ad1b701013a0b
-PKG_DESCR:= client-side C library implementing SSH2 protocol
-PKG_SECTION:= libs
+PKG_DESCR:= client-side c library implementing ssh2 protocol
+PKG_SECTION:= libs/net
PKG_BUILDDEP:= openssl zlib
PKG_DEPENDS:= libopenssl zlib
PKG_URL:= http://www.libssh2.org/
diff --git a/package/libssp/Makefile b/package/libssp/Makefile
index c1e3dab..4d714b3 100644
--- a/package/libssp/Makefile
+++ b/package/libssp/Makefile
@@ -15,7 +15,7 @@ endif
PKG_NAME:= libssp
PKG_DESCR:= stack smashing protection library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_OPTS:= noremove
NO_DISTFILES:= 1
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index d0246e2..f15a650 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -14,8 +14,8 @@ include ${TOPDIR}/toolchain/uclibc/Makefile.inc
endif
PKG_NAME:= libstdcxx
-PKG_DESCR:= C++ support library
-PKG_SECTION:= libs
+PKG_DESCR:= c++ support library
+PKG_SECTION:= libs/misc
NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
index 0925440..8d124ec 100644
--- a/package/libtasn1/Makefile
+++ b/package/libtasn1/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libtasn1
PKG_VERSION:= 3.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 6ed38e161e11013054f2a2bb4c4da449
-PKG_DESCR:= ASN.1 and DER structures manipulation library
-PKG_SECTION:= libs
+PKG_DESCR:= asn.1 and der structures manipulation library
+PKG_SECTION:= libs/crypto
PKG_URL:= http://www.gnupg.org/
PKG_SITES:= ${MASTER_SITE_GNU:=libtasn1/}
PKG_OPTS:= dev
diff --git a/package/libtheora/Makefile b/package/libtheora/Makefile
index aac2a22..6c9b242 100644
--- a/package/libtheora/Makefile
+++ b/package/libtheora/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libtheora
PKG_VERSION:= 1.1.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 292ab65cedd5021d6b7ddd117e07cd8e
-PKG_DESCR:= Theora video codec
-PKG_SECTION:= libs
+PKG_DESCR:= open source video codec library
+PKG_SECTION:= libs/video
PKG_DEPENDS:= libogg libvorbis
PKG_BUILDDEP:= libogg libvorbis
PKG_URL:= http://www.theora.org/
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index dde7d45..59aa2e8 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -14,8 +14,8 @@ include ${TOPDIR}/toolchain/uclibc/Makefile.inc
endif
PKG_NAME:= libthread-db
-PKG_DESCR:= POSIX threads library for gdb/gdbserver
-PKG_SECTION:= libs
+PKG_DESCR:= posix threads library for gdb/gdbserver
+PKG_SECTION:= libs/misc
PKG_CFLINE_LIBTHREAD_DB:=depends on ADK_PACKAGE_GDB || ADK_PACKAGE_GDBSERVER
diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile
index e9e3c66..c62a47f 100644
--- a/package/libtiff/Makefile
+++ b/package/libtiff/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:= tiff
PKG_VERSION:= 3.9.4
PKG_RELEASE:= 4
PKG_MD5SUM:= 2006c1bdd12644dbf02956955175afd6
-PKG_DESCR:= library for reading/writing TIFF images
+PKG_DESCR:= library for reading/writing tiff images
PKG_DEPENDS:= libstdcxx
-PKG_SECTION:= libs
+PKG_SECTION:= libs/image
PKG_URL:= http://www.libtiff.org/
PKG_SITES:= ftp://ftp.remotesensing.org/pub/libtiff/
PKG_LIBNAME:= libtiff
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index a22b89c..8244b3a 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libtirpc
PKG_VERSION:= 0.2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 847995e8d002cbf1387bda05947be086
-PKG_DESCR:= transport independent RPC library
-PKG_SECTION:= libs
+PKG_DESCR:= transport independent rpc library
+PKG_SECTION:= libs/net
PKG_BUILDDEP:= autotool
PKG_URL:= http://sourceforge.net/projects/libtirpc/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libtirpc/}
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 0588e89..547d458 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.2
PKG_RELEASE:= 3
PKG_MD5SUM:= 2ec8997e0c07249eb4cbd072417d70fe
PKG_DESCR:= generic dynamic object loading library
-PKG_SECTION:= lang
+PKG_SECTION:= dev/tools
PKG_BUILDDEP:= m4-host libtool-host
PKG_URL:= http://www.gnu.org/software/libtool/
PKG_SITES:= ${MASTER_SITE_GNU:=libtool/}
@@ -16,7 +16,7 @@ PKG_LIBNAME:= libltdl
PKG_OPTS:= dev
PKG_SUBPKGS:= LIBTOOL LIBLTDL
-PKGSC_LIBLTDL:= libs
+PKGSC_LIBLTDL:= libs/misc
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 4e68e32..c6143d8 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.13.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 96c0b81501357df402ab592f59ecaeab
PKG_DESCR:= bittorrent library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/net
PKG_DEPENDS:= libopenssl libsigc++
PKG_BUILDDEP:= openssl libsigc++ gettext-tiny
PKG_URL:= http://libtorrent.rakshasa.no/
diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile
index a8c2350..0dfb46d 100755
--- a/package/libunistring/Makefile
+++ b/package/libunistring/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libunistring
PKG_VERSION:= 0.9.3
PKG_RELEASE:= 2
PKG_MD5SUM:= db8eca3b64163abadf8c40e5cecc261f
-PKG_DESCR:= functions for manipulating Unicode strings
-PKG_SECTION:= libs
+PKG_DESCR:= functions for manipulating unicode strings
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.gnu.org/software/libunistring/
PKG_SITES:= ${MASTER_SITE_GNU:=libunistring/}
PKG_OPTS:= dev
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 18eda96..092c371 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libupnp
PKG_VERSION:= 1.6.19
PKG_RELEASE:= 1
PKG_MD5SUM:= ee16e5d33a3ea7506f38d71facc057dd
-PKG_DESCR:= The Universal Plug and Play (UPnP) SDK library
-PKG_SECTION:= libs
+PKG_DESCR:= universal plug and play sdk library
+PKG_SECTION:= libs/net
PKG_BUILDDEP:= autotool
PKG_DEPENDS:= libpthread
PKG_URL:= http://pupnp.sourceforge.net/
@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
AUTOTOOL_STYLE:= autoreconf
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CFLAGS+= -fPIC
CONFIGURE_ARGS+= --disable-samples
diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile
index c4942d8..91ae03c 100644
--- a/package/libusb-compat/Makefile
+++ b/package/libusb-compat/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libusb-compat
PKG_VERSION:= 0.1.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 2780b6a758a1e2c2943bdbf7faf740e4
-PKG_DESCR:= a library for accessing Linux USB devices
-PKG_SECTION:= libs
+PKG_DESCR:= library for accessing usb devices
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= libusb
PKG_URL:= http://www.libusb.org/wiki/libusb-compat-0.1
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusb/}
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index 9772b76..a445dcd 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libusbx
PKG_VERSION:= 1.0.16
PKG_RELEASE:= 3
PKG_MD5SUM:= 7f5715d624cd6c26b30a317eb6c2fe5e
-PKG_DESCR:= a library for accessing Linux USB devices
-PKG_SECTION:= libs
+PKG_DESCR:= library for accessing usb devices
+PKG_SECTION:= libs/misc
PKG_URL:= http://libusb.wiki.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusbx/}
PKG_LIBNAME:= libusb
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 931554f..c51ce66 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libvirt
PKG_VERSION:= 1.2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= da7a9ca519df45a460659189fe0024e6
-PKG_DESCR:= virtualization API
-PKG_SECTION:= libs
+PKG_DESCR:= virtualization api
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted eudev qemu
PKG_DEPENDS:= libxml2 libgnutls python2 libpcap libreadline
PKG_DEPENDS+= dmidecode dnsmasq qemu libnl libudev
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index add4897..38328e2 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libvorbis
PKG_VERSION:= 1.3.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 71b649d3e08e63ece16649df906ce8b9
-PKG_DESCR:= Vorbis General Audio Compression Codec library
-PKG_SECTION:= libs
+PKG_DESCR:= vorbis general audio compression codec library
+PKG_SECTION:= libs/audio
PKG_BUILDDEP:= libogg
PKG_URL:= http://www.xiph.org/vorbis/
PKG_SITES:= http://downloads.xiph.org/releases/vorbis/
diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile
index 867c730..4c8d76d 100644
--- a/package/libvorbisidec/Makefile
+++ b/package/libvorbisidec/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 1.0.2
PKG_RELEASE:= 3
PKG_VARIANT:= svn15687
PKG_MD5SUM:= cd3f62e87e38548c3e1120b1b2d3cac7
-PKG_DESCR:= Fixed point vorbis library
-PKG_SECTION:= libs
+PKG_DESCR:= fixed point vorbis library
+PKG_SECTION:= libs/audio
PKG_BUILDDEP:= autotool
PKG_SITES:= http://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec/
PKG_OPTS:= dev
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile
index d30c358..90744cc 100644
--- a/package/libvpx/Makefile
+++ b/package/libvpx/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libvpx
PKG_VERSION:= 1.3.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 14783a148872f2d08629ff7c694eb31f
-PKG_DESCR:= VP8/VP9 codec library
-PKG_SECTION:= libs
+PKG_DESCR:= vp8/vp9 codec library
+PKG_SECTION:= libs/video
PKG_URL:= http://www.webmproject.org/about/
PKG_SITES:= https://webm.googlecode.com/files/
PKG_OPTS:= dev
diff --git a/package/libwebp/Makefile b/package/libwebp/Makefile
index 7fc6524..a330035 100644
--- a/package/libwebp/Makefile
+++ b/package/libwebp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.3.1
PKG_RELEASE:= 1
PKG_MD5SUM:= dc862bb4006d819b7587767a9e83d31f
PKG_DESCR:= new image format for the web
-PKG_SECTION:= libs
+PKG_SECTION:= libs/image
PKG_URL:= https://developers.google.com/speed/webp/
PKG_SITES:= https://webp.googlecode.com/files/
PKG_OPTS:= dev
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 20e2e5f..5208ffd 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -8,8 +8,8 @@ PKG_NAME:= libx264
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 43946c39a27327f25751cddc1db0ed77
-PKG_DESCR:= H264 encoding library
-PKG_SECTION:= libs
+PKG_DESCR:= h264 encoding library
+PKG_SECTION:= libs/video
PKG_URL:= http://www.videolan.org/developers/x264.html
PKG_SITES:= http://openadk.org/distfiles/
PKG_OPTS:= dev
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index 563e08d..8dffea1 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libxcb
PKG_VERSION:= 1.10
PKG_RELEASE:= 1
PKG_MD5SUM:= a484793fbfb974b09d54fa1ebf44b2e4
-PKG_DESCR:= X11 keyboard library
+PKG_DESCR:= interface to the x window system protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXau-host libpthread-stubs-host xcb-proto-host
PKG_BUILDDEP+= libxcb-host
@@ -26,7 +26,6 @@ $(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
include $(TOPDIR)/mk/python.mk
HOST_STYLE:= auto
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ENV+= PYTHON=$(PYTHON)
libxcb-install:
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile
index fc7d52c..d2086af 100644
--- a/package/libxkbfile/Makefile
+++ b/package/libxkbfile/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libxkbfile
PKG_VERSION:= 1.0.8
PKG_RELEASE:= 2
PKG_MD5SUM:= f5b92ef9813c6b78105dfa960ddddcaa
-PKG_DESCR:= X11 keyboard configuration extension library
+PKG_DESCR:= keyboard configuration extension library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= kbproto libX11
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 957a3a3..f10b3e2 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libxml2
PKG_VERSION:= 2.9.1
PKG_RELEASE:= 6
PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380
-PKG_DESCR:= XML C parser and toolkit
-PKG_SECTION:= libs
+PKG_DESCR:= xml parser and toolkit
+PKG_SECTION:= libs/data
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= libxml2-host zlib
HOST_BUILDDEP:= python2-host
@@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON
PKGSD_LIBXML2_PYTHON:= XML python bindings
-PKGSC_LIBXML2_PYTHON:= libs
+PKGSC_LIBXML2_PYTHON:= libs/misc
PKGSB_LIBXML2_PYTHON:= python2
PKGSS_LIBXML2_PYTHON:= python2
diff --git a/package/libxshmfence/Makefile b/package/libxshmfence/Makefile
index ecfbcab..c4181c9 100644
--- a/package/libxshmfence/Makefile
+++ b/package/libxshmfence/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= libxshmfence
PKG_VERSION:= 1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 323bb06c70765a2395df1d9c7ec3d14a
-PKG_DESCR:= X11 xshmfence library
+PKG_DESCR:= interface to shared-memory fences
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 2915909..5cc1b17 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= libxslt
PKG_VERSION:= 1.1.28
PKG_RELEASE:= 2
PKG_MD5SUM:= 9667bf6f9310b957254fdcf6596600b7
-PKG_DESCR:= XSLT Library
-PKG_SECTION:= libs
+PKG_DESCR:= xslt Library
+PKG_SECTION:= libs/data
PKG_DEPENDS:= libxml2 libstdcxx
PKG_BUILDDEP:= autotool libxml2
HOST_BUILDDEP:= libxml2-host
@@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LIBXSLT XSLTPROC
PKGSD_XSLTPROC:= XSLT processor utility
-PKGSC_XSLTPROC:= misc
+PKGSC_XSLTPROC:= sys/misc
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index a479318..fc88b94 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -8,13 +8,13 @@ PKG_VERSION:= 1.4.35
PKG_RELEASE:= 1
PKG_MD5SUM:= c7ae774eab4cb7ac85e41b712f4ee9ba
PKG_DESCR:= lightweight web server
-PKG_SECTION:= www
+PKG_SECTION:= net/http
PKG_URL:= http://www.lighttpd.net/
PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/
PKG_FLAVOURS_LIGHTTPD:= WITH_IPV6 WITH_SSL
-PKGFD_WITH_IPV6:= enable IPv6 support
-PKGFD_WITH_SSL:= enable SSL support
+PKGFD_WITH_IPV6:= enable ipv6 support
+PKGFD_WITH_SSL:= enable ssl support
PKGFB_WITH_SSL:= openssl
PKGFS_WITH_SSL:= libopenssl
diff --git a/package/links/Makefile b/package/links/Makefile
index 0147179..5d16fc4 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 6b5ca02e180aed2f78ca2712f85e3ba5
PKG_DESCR:= web browser with graphic support
-PKG_SECTION:= browser
+PKG_SECTION:= app/browser
PKG_DEPENDS:= libpng libjpeg-turbo libtiff gpm libopenssl
PKG_BUILDDEP:= openssl libpng libjpeg-turbo gpm
PKG_URL:= http://links.twibright.com/
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index eaa2db1..34d6c69 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= linux-atm
PKG_VERSION:= 2.5.1
PKG_RELEASE:= 3
PKG_MD5SUM:= 9560b0e1f410a05b849dfdab465dd758
-PKG_DESCR:= ATM library for Linux
-PKG_SECTION:= libs
+PKG_DESCR:= atm library
+PKG_SECTION:= libs/net
PKG_BUILDDEP:= flex-host
PKG_URL:= http://linux-atm.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/}
@@ -21,7 +21,7 @@ PKG_HOST_DEPENDS:= !freebsd
PKG_SUBPKGS:= LIBATM BR2684CTL
PKGSD_BR2684CTL:= br2684ctl ATM utility
PKGSS_BR2684CTL:= libatm
-PKGSC_BR2684CTL:= route
+PKGSC_BR2684CTL:= net/route
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
diff --git a/package/llvm/Makefile b/package/llvm/Makefile
index 8bc1c59..6af19eb 100644
--- a/package/llvm/Makefile
+++ b/package/llvm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 46ed668a1ce38985120dbf6344cf6116
PKG_DESCR:= collection of modular and reusable compiler and toolchain technologies
-PKG_SECTION:= lang
+PKG_SECTION:= dev/lang
PKG_URL:= http://llvm.org/
PKG_SITES:= http://llvm.org/releases/3.4/
diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile
index f32cdea..5926100 100644
--- a/package/lm_sensors/Makefile
+++ b/package/lm_sensors/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= lm_sensors
PKG_VERSION:= 3.3.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 8c0eebda8524fc87da1393b4564d279b
-PKG_DESCR:= linux hw sensor toolset
-PKG_SECTION:= misc
+PKG_DESCR:= hardware sensor toolset
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= sysfsutils
PKG_URL:= http://www.lm-sensors.org
PKG_SITES:= http://dl.lm-sensors.org/lm-sensors/releases/
@@ -19,7 +19,7 @@ PKG_ARCH_DEPENDS:= x86 x86_64
PKG_SUBPKGS:= LM_SENSORS LM_SENSORS_DETECT
PKGSD_LM_SENSORS_DETECT:= lm_sensors perl scripts (e.g. sensors-detect)
-PKGSC_LM_SENSORS_DETECT:= misc
+PKGSC_LM_SENSORS_DETECT:= sys/misc
PKGSS_LM_SENSORS_DETECT:= perl
PKGSB_LM_SENSORS_DETECT:= perl
diff --git a/package/log4cplus/Makefile b/package/log4cplus/Makefile
index 4fd0fbe..e5414fe 100644
--- a/package/log4cplus/Makefile
+++ b/package/log4cplus/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= log4cplus
PKG_VERSION:= 1.0.4
PKG_RELEASE:= 2
PKG_MD5SUM:= 977d0a390b3be1a4ad8cfab2e4dd3af3
-PKG_DESCR:= Logging framework for C++
-PKG_SECTION:= libs
+PKG_DESCR:= logging framework for c++
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= libpthread
PKG_URL:= http://log4cplus.sourceforge.net/
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
index fd2dedb..3d60eb4 100644
--- a/package/log4cxx/Makefile
+++ b/package/log4cxx/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= log4cxx
PKG_VERSION:= 0.10.0
PKG_RELEASE:= 2
PKG_MD5SUM:= b30ffb8da3665178e68940ff7a61084c
-PKG_DESCR:= Apache logging framework for C++
-PKG_SECTION:= libs
+PKG_DESCR:= apache logging framework for c++
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= apr apr-util
PKG_BUILDDEP:= apr apr-util
PKG_URL:= http://logging.apache.org/log4cxx/
diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile
index 0a80e56..122804f 100644
--- a/package/logrotate/Makefile
+++ b/package/logrotate/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.8.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 99e08503ef24c3e2e3ff74cc5f3be213
PKG_DESCR:= logfile rotation utility
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libpopt
PKG_BUILDDEP:= popt
PKG_SITES:= https://fedorahosted.org/releases/l/o/logrotate/
diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile
index 5e14e7e..73e8edd 100644
--- a/package/lrzsz/Makefile
+++ b/package/lrzsz/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= lrzsz
PKG_VERSION:= 0.12.20
PKG_RELEASE:= 1
PKG_MD5SUM:= b5ce6a74abc9b9eb2af94dffdfd372a4
-PKG_DESCR:= X-Modem, Y-modem, Z-modem protocol handlers
-PKG_SECTION:= serial
+PKG_DESCR:= x-Modem, y-modem, z-modem protocol handlers
+PKG_SECTION:= sys/serial
PKG_URL:= http://www.ohse.de/uwe/software/lrzsz.html
PKG_SITES:= http://www.ohse.de/uwe/releases/
diff --git a/package/lsof/Makefile b/package/lsof/Makefile
index 478d63a..63610e0 100644
--- a/package/lsof/Makefile
+++ b/package/lsof/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.84
PKG_RELEASE:= 3
PKG_MD5SUM:= 6dae655988c810a7042c06a4e2fa3c5f
PKG_DESCR:= list open files
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libtirpc
PKG_BUILDDEP:= libtirpc
PKG_URL:= http://people.freebsd.org/~abe/
diff --git a/package/lsscsi/Makefile b/package/lsscsi/Makefile
index 8cc7472..a67cba8 100644
--- a/package/lsscsi/Makefile
+++ b/package/lsscsi/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= lsscsi
PKG_VERSION:= 0.27
PKG_RELEASE:= 1
PKG_MD5SUM:= 33ab2927a9e567a47905e6a618c17859
-PKG_DESCR:= list SCSI devices
-PKG_SECTION:= utils
+PKG_DESCR:= list scsi devices
+PKG_SECTION:= sys/utils
PKG_URL:= http://sg.danny.cz/scsi/lsscsi.html
PKG_SITES:= http://sg.danny.cz/scsi/
diff --git a/package/ltrace/Makefile b/package/ltrace/Makefile
index e271ea9..e7942f2 100644
--- a/package/ltrace/Makefile
+++ b/package/ltrace/Makefile
@@ -9,7 +9,7 @@ PKG_VERSION:= 0.7.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 266580175adba8cbb02b6b792d9f05f5
PKG_DESCR:= intercepts and records dynamic library calls
-PKG_SECTION:= debug
+PKG_SECTION:= app/debug
PKG_DEPENDS:= libelf
PKG_BUILDDEP:= autotool libelf
PKG_URL:= http://ltrace.org/
diff --git a/package/lua/Makefile b/package/lua/Makefile
index 153d61c..e6d2501 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= lua
PKG_VERSION:= 5.1.4
PKG_RELEASE:= 2
PKG_MD5SUM:= d0870f2de55d59c1c8419f36e8fac150
-PKG_DESCR:= LUA programming language interpreter
-PKG_SECTION:= lang
+PKG_DESCR:= lua programming language interpreter
+PKG_SECTION:= dev/lang
PKG_DEPENDS:= libreadline
PKG_BUILDDEP:= readline
PKG_URL:= http://www.lua.org/
@@ -16,17 +16,14 @@ PKG_SITES:= http://www.lua.org/ftp/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_SUBPKGS:= LUA LUAC LUA_EXAMPLES
-PKGSD_LUAC:= LUA bytecode compiler
+PKG_SUBPKGS:= LUA LUAC
+PKGSD_LUAC:= lua bytecode compiler
PKGSN_LUAC:= lua
-PKGSD_LUAEXAMPLES:= LUA script examples
-PKGSN_LUAEXAMPLES:= lua
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LUAC},${PKG_SECTION}))
-$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LUAEXAMPLES},${PKG_SECTION}))
CONFIG_STYLE:= manual
MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} -DLUA_USE_LINUX -fPIC" \
@@ -45,9 +42,4 @@ luac-install:
${INSTALL_DIR} ${IDIR_LUAC}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/luac ${IDIR_LUAC}/usr/bin/
-lua-examples-install:
- ${INSTALL_DIR} ${IDIR_LUA_EXAMPLES}/usr/share/lua/examples
- ${INSTALL_DATA} ${WRKBUILD}/test/*.lua \
- ${IDIR_LUA_EXAMPLES}/usr/share/lua/examples/
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 6355f19..a090ff6 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.02.106
PKG_RELEASE:= 3
PKG_MD5SUM:= 77f84279fb649b3dc4edad1c6d1a1b0e
PKG_DESCR:= logical volume management
-PKG_SECTION:= fs
+PKG_SECTION:= sys/fs
PKG_DEPENDS:= libdevmapper libncurses
PKG_BUILDDEP:= ncurses util-linux
PKG_URL:= http://sourceware.org/lvm2/
@@ -20,7 +20,7 @@ PKG_SUBPKGS:= LVM DEVICE_MAPPER LIBDEVMAPPER
PKGSD_DEVICE_MAPPER:= device-mapper utility
PKGSS_DEVICE_MAPPER:= libdevmapper
PKGSD_LIBDEVMAPPER:= device-mapper library
-PKGSC_LIBDEVMAPPER:= libs
+PKGSC_LIBDEVMAPPER:= libs/misc
DISTFILES:= LVM2.${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index b15da35..299d028 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= lynx
PKG_VERSION:= 2.8.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 7caa6773f94e136556c1c30629fe1431
-PKG_DESCR:= Standard text browser
-PKG_SECTION:= browser
+PKG_DESCR:= text browser
+PKG_SECTION:= app/browser
PKG_DEPENDS:= libncurses libopenssl zlib
PKG_BUILDDEP:= ncurses openssl zlib
PKG_URL:= http://lynx.isc.org/
diff --git a/package/lzma/Makefile b/package/lzma/Makefile
index 8cf989c..35b197b 100644
--- a/package/lzma/Makefile
+++ b/package/lzma/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= lzma
PKG_VERSION:= 4.32.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 79c31b18a76254c1cb078c1d40a47c44
-PKG_DESCR:= LZMA compression utility
-PKG_SECTION:= archive
+PKG_DESCR:= compression utility
+PKG_SECTION:= app/archive
PKG_URL:= http://tukaani.org/lzma/
PKG_SITES:= http://tukaani.org/lzma/
diff --git a/package/lzop/Makefile b/package/lzop/Makefile
index 3f10ace..e2d5980 100644
--- a/package/lzop/Makefile
+++ b/package/lzop/Makefile
@@ -8,10 +8,9 @@ PKG_VERSION:= 1.03
PKG_RELEASE:= 1
PKG_MD5SUM:= 006c5e27fb78cdd14a628fdfa5aa1905
PKG_DESCR:= compression utility
-PKG_SECTION:= archive
+PKG_SECTION:= app/archive
PKG_DEPENDS:= liblzo
PKG_BUILDDEP:= liblzo
-HOST_BUILDDEP:= liblzo-host
PKG_URL:= http://www.lzop.org/
PKG_SITES:= http://www.lzop.org/download/
PKG_BB:= 1
diff --git a/package/m4/Makefile b/package/m4/Makefile
index 867903f..37ee750 100644
--- a/package/m4/Makefile
+++ b/package/m4/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.17
PKG_RELEASE:= 1
PKG_MD5SUM:= 12a3c829301a4fd6586a57d3fcf196dc
PKG_DESCR:= macro processor
-PKG_SECTION:= lang
+PKG_SECTION:= dev/tools
PKG_BUILDDEP:= m4-host
HOST_BUILDDEP:= xz-host
PKG_URL:= http://www.gnu.org/software/m4/
diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile
index c02eb96..74597e9 100755
--- a/package/macchanger/Makefile
+++ b/package/macchanger/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= macchanger
PKG_VERSION:= 1.5.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 79b7cdaeca3d8ebafa764c4b0dd03ab7
-PKG_DESCR:= utility for viewing/manipulating the MAC address
-PKG_SECTION:= admin
+PKG_DESCR:= utility for viewing/manipulating the mac address
+PKG_SECTION:= sys/utils
PKG_URL:= http://www.alobbs.com/macchanger
PKG_SITES:= ${MASTER_SITE_GNU:=macchanger/}
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index 09e2853..2c52122 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= madplay
PKG_VERSION:= 0.15.2b
PKG_RELEASE:= 2
PKG_MD5SUM:= 6814b47ceaa99880c754c5195aa1aac1
-PKG_DESCR:= MPEG audio player in fixed point
-PKG_SECTION:= multimedia
+PKG_DESCR:= mpeg audio player in fixed point
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libid3tag libmad alsa-lib
PKG_BUILDDEP:= libid3tag libmad alsa-lib
PKG_URL:= http://www.underbit.com/products/mad
diff --git a/package/mailutils/Makefile b/package/mailutils/Makefile
index 4bed18e..82a3c67 100644
--- a/package/mailutils/Makefile
+++ b/package/mailutils/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mailutils
PKG_VERSION:= 2.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 3abca5873249f0eeb184361a75f2229e
-PKG_DESCR:= GNU mail program
-PKG_SECTION:= mail
+PKG_DESCR:= mail program
+PKG_SECTION:= net/mail
PKG_BUILDDEP:= readline
PKG_DEPENDS:= libreadline
PKG_URL:= http://mailutils.org/
diff --git a/package/make/Makefile b/package/make/Makefile
index e09be88..05ffa32 100644
--- a/package/make/Makefile
+++ b/package/make/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= make
PKG_VERSION:= 3.81
PKG_RELEASE:= 1
PKG_MD5SUM:= a4e9494ac6dc3f6b0c5ff75c5d52abba
-PKG_DESCR:= GNU make
-PKG_SECTION:= lang
+PKG_DESCR:= c/c++ code buildtool
+PKG_SECTION:= dev/tools
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 46f241f..4b341dd 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.05
PKG_RELEASE:= 1
PKG_MD5SUM:= aff277f6ba0e1ff46d32a60ab84f16cb
PKG_DESCR:= small and secure DNS server
-PKG_SECTION:= dns
+PKG_SECTION:= net/dns
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.maradns.org
PKG_SITES:= http://www.maradns.org/download/1.4/${PKG_VERSION}/
diff --git a/package/mc/Makefile b/package/mc/Makefile
index 503ab62..1412152 100644
--- a/package/mc/Makefile
+++ b/package/mc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.8.12
PKG_RELEASE:= 2
PKG_MD5SUM:= 7ecccc03df060cd0ca1414a5a14e6649
PKG_DESCR:= norton commander clone
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= glib libncurses libssh2
PKG_BUILDDEP:= glib ncurses libssh2
PKG_URL:= http://www.midnight-commander.org/
diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile
index ee1dc5d..775e7aa 100644
--- a/package/mdadm/Makefile
+++ b/package/mdadm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mdadm
PKG_VERSION:= 3.3
PKG_RELEASE:= 1
PKG_MD5SUM:= abb19b309281b93cf79d29fb2dfb2e85
-PKG_DESCR:= tool for managing Linux Software RAID arrays
-PKG_SECTION:= fs
+PKG_DESCR:= tool for managing software RAID arrays
+PKG_SECTION:= sys/fs
PKG_URL:= http://neil.brown.name/blog/mdadm
PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/raid/mdadm/}
diff --git a/package/mesa-demos/Makefile b/package/mesa-demos/Makefile
index 05b53f3..6ae6409 100644
--- a/package/mesa-demos/Makefile
+++ b/package/mesa-demos/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mesa-demos
PKG_VERSION:= 8.1.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 4049d98dd4131212e2842b770f1b0fa5
-PKG_DESCR:= MESA demo apps
-PKG_SECTION:= misc
+PKG_DESCR:= opengl demo apps
+PKG_SECTION:= mm/video
PKG_DEPENDS:= mesalib
PKG_BUILDDEP:= MesaLib libglew glu
PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_VERSION}/
@@ -18,7 +18,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm
PKG_SUBPKGS:= GLXINFO
-PKGSD_GLXINFO:= glxinfo
+PKGSD_GLXINFO:= command-line tool for diagnosing problems with your 3D acceleration card
PKGSS_GLXINFO:= libxt libxau libxdmcp libxcb libx11 libxext libglew
include $(TOPDIR)/mk/package.mk
diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile
index 814f0bb..e76971b 100644
--- a/package/mgetty/Makefile
+++ b/package/mgetty/Makefile
@@ -9,7 +9,7 @@ PKG_XVERSION:= Jun15
PKG_RELEASE:= 1
PKG_MD5SUM:= 0320e98c6b86bcca48fc5f355b94ead4
PKG_DESCR:= mgetty + sendfax
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_SITES:= ftp://alpha.greenie.net/pub/mgetty/source/1.1/
DISTFILES:= ${PKG_NAME}${PKG_VERSION}-${PKG_XVERSION}.tar.gz
diff --git a/package/miau/Makefile b/package/miau/Makefile
index aad9b6d..c7a750b 100644
--- a/package/miau/Makefile
+++ b/package/miau/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= miau
PKG_VERSION:= 0.6.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 76f794889d47ad277c25e9c5bbddefa4
-PKG_DESCR:= IRC-bouncer/proxy
-PKG_SECTION:= chat
+PKG_DESCR:= irc-bouncer/proxy
+PKG_SECTION:= app/chat
PKG_URL:= http://miau.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=miau/}
diff --git a/package/midori/Makefile b/package/midori/Makefile
index 2c10136..85da07f 100644
--- a/package/midori/Makefile
+++ b/package/midori/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= midori
PKG_VERSION:= 0.5.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 5815eac39f4d9511ce2c71a81567647f
-PKG_DESCR:= web browser
+PKG_DESCR:= graphical web browser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libnotify webkitgtk
PKG_BUILDDEP:= autotool cmake-host vala-host libnotify webkitgtk
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index 731b95d..d3e5959 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mini-httpd
PKG_VERSION:= 1.19
PKG_RELEASE:= 10
PKG_MD5SUM:= 7c68293ad265ecfe2edea917912f6f1f
-PKG_DESCR:= small HTTP server with SSL
-PKG_SECTION:= www
+PKG_DESCR:= small webserver with ssl
+PKG_SECTION:= net/http
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP:= openssl
PKG_URL:= http://www.acme.com/software/mini_httpd/
diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile
index 64522f6..6466b67 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:= small sendmail-compatible mail forwarder
-PKG_SECTION:= mail
+PKG_SECTION:= net/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 f63354f..707d908 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -7,18 +7,20 @@ PKG_NAME:= miredo
PKG_VERSION:= 1.2.6
PKG_RELEASE:= 2
PKG_MD5SUM:= 5bcdbaced54f40b6cb1e9c9a8dbac411
-PKG_DESCR:= A Teredo client and relay daemon
-PKG_SECTION:= ipv6
+PKG_DESCR:= teredo application
+PKG_SECTION:= net/ipv6
PKG_BUILDDEP:= autotool
PKG_URL:= http://www.remlab.net/
PKG_SITES:= http://www.remlab.net/files/miredo/
-PKG_SUBPKGS:= MIREDO MIREDO_SERVER
+PKG_SUBPKGS:= MIREDO_CLIENT MIREDO_SERVER
+PKGSD_MIREDO_CLIENT:= teredo client
+PKGSD_MIREDO_SERVER:= teredo relay daemon
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MIREDO_CLIENT,miredo-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MIREDO_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MIREDO_SERVER},${PKG_SECTION}))
AUTOTOOL_STYLE:= autoreconf
TARGET_CFLAGS+= -std=gnu99
@@ -28,16 +30,16 @@ CONFIGURE_ARGS+= --without-Judy \
--enable-teredo-client \
--enable-miredo-user=root
-XAKE_FLAGS+= CXXLINK="\$${LINK}" \
+XAKE_FLAGS+= CXXLINK="\$${LINK}"
-miredo-install:
- ${INSTALL_DIR} ${IDIR_MIREDO}/etc/miredo ${IDIR_MIREDO}/usr/sbin
- ${INSTALL_DIR} ${IDIR_MIREDO}/usr/lib
+miredo-client-install:
+ ${INSTALL_DIR} ${IDIR_MIREDO_CLIENT}/etc/miredo ${IDIR_MIREDO_CLIENT}/usr/sbin
+ ${INSTALL_DIR} ${IDIR_MIREDO_CLIENT}/usr/lib
${INSTALL_DATA} ${WRKINST}/etc/miredo/miredo.conf \
- ${IDIR_MIREDO}/etc/miredo
- ${CP} ${WRKINST}/usr/lib/libtun*.so* ${IDIR_MIREDO}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libteredo.so* ${IDIR_MIREDO}/usr/lib
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/miredo ${IDIR_MIREDO}/usr/sbin/
+ ${IDIR_MIREDO_CLIENT}/etc/miredo
+ ${CP} ${WRKINST}/usr/lib/libtun*.so* ${IDIR_MIREDO_CLIENT}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libteredo.so* ${IDIR_MIREDO_CLIENT}/usr/lib
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/miredo ${IDIR_MIREDO_CLIENT}/usr/sbin/
miredo-server-install:
${INSTALL_DIR} ${IDIR_MIREDO_SERVER}/usr/sbin
diff --git a/package/mkfontdir/Makefile b/package/mkfontdir/Makefile
index 7ad7df4..c97c877 100644
--- a/package/mkfontdir/Makefile
+++ b/package/mkfontdir/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 52a5bc129f3f3ac54e7115608cec3cdc
PKG_DESCR:= font utility
-PKG_SECTION:= x11/apps
+PKG_SECTION:= x11/fonts
PKG_DEPENDS:= mkfontscale
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= noscripts
diff --git a/package/mkfontscale/Makefile b/package/mkfontscale/Makefile
index 7452583..5209187 100644
--- a/package/mkfontscale/Makefile
+++ b/package/mkfontscale/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= c663f511a17e0052fe08139700321955
PKG_DESCR:= font utility
-PKG_SECTION:= x11/apps
+PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= freetype libfontenc
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/mkimage/Makefile b/package/mkimage/Makefile
index 3d6fbc4..3c3dd30 100644
--- a/package/mkimage/Makefile
+++ b/package/mkimage/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 1b7a781fb4cf8938842279bd3e8ee852
PKG_DESCR:= stripped down mkimage utility
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
NO_DISTFILES:= 1
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index 3f56fa7..1c1f599 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mksh
PKG_VERSION:= 49
PKG_RELEASE:= 1
PKG_MD5SUM:= e8c205cac72c3dc8540bbc3897421422
-PKG_DESCR:= MirBSD Korn Shell
-PKG_SECTION:= shells
+PKG_DESCR:= mirbsd korn shell
+PKG_SECTION:= base/shells
PKG_URL:= http://www.mirbsd.org/
PKG_SITES:= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 797e76b..21a011b 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.0-beta2
PKG_RELEASE:= 1
PKG_MD5SUM:= da87b90b57934234589b63e347921458
PKG_DESCR:= console music player
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libmad libvorbis libcurl libflac
PKG_DEPENDS+= libncurses libid3tag
PKG_BUILDDEP:= ncurses libvorbis curl libmad flac libiconv-tiny
diff --git a/package/monit/Makefile b/package/monit/Makefile
index af96c74..bf069e4 100644
--- a/package/monit/Makefile
+++ b/package/monit/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.6
PKG_RELEASE:= 2
PKG_MD5SUM:= 19dfc1ce8512e832134d06eedd96ba50
PKG_DESCR:= utility for system services monitoring
-PKG_SECTION:= admin
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libpthread libopenssl
PKG_BUILDDEP:= openssl
PKG_URL:= http://mmonit.com/monit/
diff --git a/package/motion/Makefile b/package/motion/Makefile
index e4ba763..a912ba7 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -8,8 +8,8 @@ PKG_NAME:= motion
PKG_VERSION:= 4.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 6b8730c875e0f550c1abdb647027d8e1
-PKG_DESCR:= Webcam motion sensing and logging
-PKG_SECTION:= multimedia
+PKG_DESCR:= webcam motion sensing and logging
+PKG_SECTION:= mm/video
PKG_DEPENDS:= libjpeg-turbo libpthread libsdl
PKG_BUILDDEP:= libjpeg-turbo sdl
PKG_URL:= http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
diff --git a/package/mpc/Makefile b/package/mpc/Makefile
index 947188e..d781f6b 100644
--- a/package/mpc/Makefile
+++ b/package/mpc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.25
PKG_RELEASE:= 1
PKG_MD5SUM:= 76aec8e973e3c6c131e9e9f2ad8f34c3
PKG_DESCR:= music player client
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libmpdclient
PKG_BUILDDEP:= libmpdclient
PKG_URL:= http://www.musicpd.org/
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 0f8bf77..df72f96 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.18.11
PKG_RELEASE:= 1
PKG_MD5SUM:= be23120f342250e8352f6499cb960fd2
PKG_DESCR:= music player daemon
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= glib libstdcxx libiconv-tiny libmpdclient librt
PKG_FDEPENDS:= glib libstdcxx libiconv-tiny libmpdclient librt
PKG_BUILDDEP:= glib libmpdclient
diff --git a/package/mpdbox/Makefile b/package/mpdbox/Makefile
index 625b6e6..e40ebb4 100644
--- a/package/mpdbox/Makefile
+++ b/package/mpdbox/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mpdbox
PKG_VERSION:= 1.0
PKG_RELEASE:= 2
PKG_MD5SUM:= ac0dc1cc7141c1eca66d8ddd98574e0b
-PKG_DESCR:= MPD web interface
-PKG_SECTION:= multimedia
+PKG_DESCR:= mpd web interface
+PKG_SECTION:= mm/audio
PKG_URL:= http://www.openadk.org/cgi-bin/gitweb.cgi?p=mpdbox.git;a=summary
PKG_SITES:= http://www.openadk.org/distfiles/
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index 41647e0..eb14687 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/mpfr/Makefile.inc
PKG_NAME:= mpfr
PKG_DESCR:= multi precision library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= gmp
PKG_URL:= http://www.mpfr.org/
PKG_OPTS:= dev
@@ -15,8 +15,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
-
mpfr-install:
${INSTALL_DIR} ${IDIR_MPFR}/usr/lib
${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index 0fdbe17..0dfa5bd 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.19.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 87731f1437cfd8c50537a606d81130e4
PKG_DESCR:= mp3 console player
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libpthread alsa-lib
PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.mpg123.de/
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 51eccee..38a702a 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.1
PKG_RELEASE:= 3
PKG_MD5SUM:= 39dd55f30eb5403f219a606e79a6648a
PKG_DESCR:= popular video player
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/video
PKG_DEPENDS:= alsa-lib libjpeg-turbo libfaad2 libmad libncurses
PKG_DEPENDS+= libogg libpng libpthread libvorbis giflib
PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 9b39f4f..8c1582a 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mrd6
PKG_VERSION:= 0.9.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b
-PKG_DESCR:= IPv6 multicast routing daemon
-PKG_SECTION:= ipv6
+PKG_DESCR:= ipv6 multicast routing daemon
+PKG_SECTION:= net/ipv6
PKG_SITES:= http://www.openadk.org/distfiles/
PKG_CXX:= MRD6
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index 85ceefa..73272d0 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mt-daapd
PKG_VERSION:= 0.2.4.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 67bef9fb14d487693b0dfb792c3f1b05
-PKG_DESCR:= a multi-threaded DAAP daemon
-PKG_SECTION:= multimedia
+PKG_DESCR:= multi-threaded daap daemon
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libgdbm libid3tag libpthread
PKG_BUILDDEP:= gdbm libid3tag
PKG_URL:= http://www.fireflymediaserver.org/
diff --git a/package/mtd-utils/Makefile b/package/mtd-utils/Makefile
index af8c939..8cb23eb 100644
--- a/package/mtd-utils/Makefile
+++ b/package/mtd-utils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.0
PKG_RELEASE:= 1
PKG_MD5SUM:= a4df1ad29684be79b0fa699bdae01faf
PKG_DESCR:= flash filesystem utilities
-PKG_SECTION:= fs
+PKG_SECTION:= sys/fs
HOST_BUILDDEP:= liblzo-host
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index 3ec0680..380124d 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= mtd
PKG_VERSION:= 1.0
PKG_RELEASE:= 2
-PKG_DESCR:= MTD utility
-PKG_SECTION:= fs
+PKG_DESCR:= flash utility
+PKG_SECTION:= sys/fs
PKG_DFLT_MTD:= y if ADK_TARGET_WITH_MTD
PKG_CFLINE_MTD:= depends on ADK_TARGET_WITH_MTD
@@ -22,8 +22,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-o ${WRKBUILD}/mtd ${WRKBUILD}/mtd.c
diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index c73ffce..769066c 100644
--- a/package/mtr/Makefile
+++ b/package/mtr/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mtr
PKG_VERSION:= 0.75
PKG_RELEASE:= 2
PKG_MD5SUM:= 23baca52d0922c2ecba7eba05317868c
-PKG_DESCR:= ncurses traceroute/ping tool
-PKG_SECTION:= net
+PKG_DESCR:= traceroute/ping tool
+PKG_SECTION:= net/debug
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://www.bitwizard.nl/mtr/
diff --git a/package/musl/Makefile b/package/musl/Makefile
index f400ba3..bc6b831 100644
--- a/package/musl/Makefile
+++ b/package/musl/Makefile
@@ -6,12 +6,12 @@ include $(TOPDIR)/toolchain/musl/Makefile.inc
PKG_NAME:= musl
PKG_DESCR:= embedded C library
-PKG_SECTION:= base
+PKG_SECTION:= base/libs
PKG_OPTS:= noremove
PKG_SUBPKGS:= MUSL MUSL_DEV
PKGSD_MUSL_DEV:= development files for musl
-PKGSC_MUSL_DEV:= devel
+PKGSC_MUSL_DEV:= dev/header
NO_DISTFILES:= 1
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index 18cdeac..84fccd5 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.23
PKG_RELEASE:= 1
PKG_MD5SUM:= 11f5b6a3eeba1afa1257fe93c9f26bff
PKG_DESCR:= mail text client
-PKG_SECTION:= mail
+PKG_SECTION:= net/mail
PKG_DEPENDS:= libncurses libopenssl
PKG_BUILDDEP:= ncurses openssl
PKG_URL:= http://www.mutt.org/
diff --git a/package/mxml/Makefile b/package/mxml/Makefile
index be72bd3..1f831be 100755
--- a/package/mxml/Makefile
+++ b/package/mxml/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mxml
PKG_VERSION:= 2.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 68977789ae64985dddbd1a1a1652642e
-PKG_DESCR:= lightweight XML library
-PKG_SECTION:= libs
+PKG_DESCR:= lightweight xml library
+PKG_SECTION:= libs/data
PKG_URL:= http://www.msweet.org/projects.php?Z3
PKG_SITES:= http://www.msweet.org/files/project3/
PKG_LIBNAME:= libmxml
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index c16e03f..8db7618 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= mysql
PKG_VERSION:= 5.6.17
PKG_RELEASE:= 2
PKG_MD5SUM:= 82114fa7c13fa3ca897b34666577d9f4
-PKG_DESCR:= MySQL client library
-PKG_SECTION:= libs
+PKG_DESCR:= mysql client library
+PKG_SECTION:= libs/db
PKG_DEPENDS:= libncurses zlib
PKG_BUILDDEP:= cmake-host mysql-host ncurses zlib readline
HOST_BUILDDEP:= cmake-host
diff --git a/package/nand/Makefile b/package/nand/Makefile
index da66808..f6bfd0f 100644
--- a/package/nand/Makefile
+++ b/package/nand/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= nand
PKG_VERSION:= 1.0
PKG_RELEASE:= 3
-PKG_DESCR:= NAND utility
-PKG_SECTION:= fs
+PKG_DESCR:= nand flash utility
+PKG_SECTION:= sys/fs
PKG_DFLT_NAND:= y if ADK_TARGET_WITH_NAND
PKG_CFLINE_NAND:= depends on ADK_TARGET_WITH_NAND
@@ -22,8 +22,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-o ${WRKBUILD}/nand ${WRKBUILD}/nand.c
diff --git a/package/nano/Makefile b/package/nano/Makefile
index 59e40a6..04d9e5a 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 03233ae480689a008eb98feb1b599807
PKG_DESCR:= enhanced clone of the pico editor
-PKG_SECTION:= editor
+PKG_SECTION:= app/editor
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://www.nano-editor.org/
diff --git a/package/nasm/Makefile b/package/nasm/Makefile
index 494766f..d2d5391 100644
--- a/package/nasm/Makefile
+++ b/package/nasm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.11.02
PKG_RELEASE:= 1
PKG_MD5SUM:= ec43582b8febae24e5b440ae816120c8
PKG_DESCR:= assembler application
-PKG_SECTION:= lang
+PKG_SECTION:= dev/lang
PKG_BUILDDEP:= nasm-host
PKG_URL:= http://sourceforge.net/projects/nasm/
PKG_SITES:= http://www.nasm.us/pub/nasm/releasebuilds/${PKG_VERSION}/
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 16578ac..249cc88 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.9
PKG_RELEASE:= 5
PKG_MD5SUM:= 8cb9c412e5f2d96bc6f459aa8c6282a1
PKG_DESCR:= terminal handling library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= ncurses-host
PKG_URL:= http://www.gnu.org/software/ncurses/
PKG_SITES:= ${MASTER_SITE_GNU:=ncurses/}
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile
index fbd5f4a..765eab8 100644
--- a/package/ndisc/Makefile
+++ b/package/ndisc/Makefile
@@ -7,22 +7,25 @@ PKG_NAME:= ndisc6
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 50cb4c19606cf6ff2b7388e71832f579
-PKG_DESCR:= ICMPv6 Neighbour Discovery tools
-PKG_SECTION:= ipv6
+PKG_DESCR:= icmpv6 neighbour discovery tools
+PKG_SECTION:= net/ipv6
PKG_URL:= http://www.remlab.net/
PKG_SITES:= http://www.remlab.net/files/ndisc6/
PKG_LIBC_DEPENDS:= uclibc glibc
PKG_SUBPKGS:= NDISC6 RDISC6 TCPTRACEROUTE6
+PKGSD_NDISC6:= icmpv6 neighbour discovery tool
+PKGSD_RDISC6:= icmpv6 router discovery tool
+PKGSD_TCPTRACEROUTE6:= lightweight ipv6 tcptraceroute
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_NDISC6},${PKG_SECTION}))
+$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_RDISC6},${PKG_SECTION}))
+$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TCPTRACEROUTE6},${PKG_SECTION}))
MAKE_FLAGS+= CC="${TARGET_CC}"
diff --git a/package/neon/Makefile b/package/neon/Makefile
index 2d2daea..ad98ae3 100644
--- a/package/neon/Makefile
+++ b/package/neon/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= neon
PKG_VERSION:= 0.29.5
PKG_RELEASE:= 2
PKG_MD5SUM:= ff369e69ef0f0143beb5626164e87ae2
-PKG_DESCR:= HTTP and WebDAV library
-PKG_SECTION:= libs
+PKG_DESCR:= http and webdav library
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpthread libxml2 libopenssl zlib
PKG_BUILDDEP:= libpthread libxml2 openssl zlib
PKG_URL:= http://webdav.org/neon/
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 2bb6b92..309df00 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= net-snmp
PKG_VERSION:= 5.7.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 7db683faba037249837b226f64d566d4
-PKG_DESCR:= SNMP Agent
+PKG_DESCR:= snmp agent
PKG_SECTION:= net/misc
PKG_DEPENDS:= libnetsnmp libelf libnl
PKG_BUILDDEP:= libelf libnl
@@ -20,14 +20,14 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= SNMPD SNMP_UTILS LIBNETSNMP
-PKGSD_SNMP_UTILS:= SNMP utilities
+PKGSD_SNMP_UTILS:= snmp utilities
PKGSS_SNMP_UTILS:= libnetsnmp libelf
-PKGSD_LIBNETSNMP:= SNMP library
+PKGSD_LIBNETSNMP:= snmp library
PKGSS_LIBNETSNMP:= libelf
-PKGSC_LIBNETSNMP:= libs
+PKGSC_LIBNETSNMP:= libs/net
PKG_FLAVOURS_SNMPD:= WITH_IPV6
-PKGFD_WITH_IPV6:= enable IPv6 support
+PKGFD_WITH_IPV6:= enable ipv6 support
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/net-tools/Makefile b/package/net-tools/Makefile
index c95c43c..6b8cceb 100644
--- a/package/net-tools/Makefile
+++ b/package/net-tools/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= net-tools
PKG_VERSION:= 1.60
PKG_RELEASE:= 2
PKG_MD5SUM:= 888774accab40217dde927e21979c165
-PKG_DESCR:= Linux net-tools
-PKG_SECTION:= net
+PKG_DESCR:= arp networking tool
+PKG_SECTION:= net/misc
PKG_URL:= http://net-tools.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-tools/}
PKG_NOPARALLEL:= 1
diff --git a/package/netcat/Makefile b/package/netcat/Makefile
index 0ad7a5b..17a48d2 100644
--- a/package/netcat/Makefile
+++ b/package/netcat/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= netcat
PKG_VERSION:= 0.7.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 088def25efe04dcdd1f8369d8926ab34
-PKG_DESCR:= the GNU network swiss army knife
+PKG_DESCR:= network swiss army knife
PKG_SECTION:= net/misc
PKG_URL:= http://netcat.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=netcat/}
diff --git a/package/netperf/Makefile b/package/netperf/Makefile
index e72e85e..2c137f3 100644
--- a/package/netperf/Makefile
+++ b/package/netperf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 391a0d98954c72a6ad7f08b8a115e1ce
PKG_DESCR:= network performance measurement tools
-PKG_SECTION:= net
+PKG_SECTION:= net/perf
PKG_URL:= http://www.netperf.org/netperf/
PKG_SITES:= ftp://ftp.netperf.org/netperf/archive/
diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile
index 1d6874a..78feb7d 100644
--- a/package/netstat-nat/Makefile
+++ b/package/netstat-nat/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= netstat-nat
PKG_VERSION:= 1.4.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 45e8d0f47623f619c22a6b894cd03cbc
-PKG_DESCR:= netstat variant for NAT connections
-PKG_SECTION:= firewall
+PKG_DESCR:= netstat variant for nat connections
+PKG_SECTION:= net/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 90ccda2..caffe5e 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -23,8 +23,8 @@ PKGSD_NFS_UTILS_SERVER:=server daemons and utilities
PKGSN_NFS_UTILS_SERVER:=nfs-utils
PKG_CHOICES_NFS_UTILS:= V3 V4
-PKGCD_V3:= NFS version 3
-PKGCD_V4:= NFS version 4
+PKGCD_V3:= nfs version 3
+PKGCD_V4:= nfs version 4
PKGCB_V4:= libevent libnfsidmap krb5 libgssglue librpcsecgss
PKGCS_V4:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
diff --git a/package/nginx/Makefile b/package/nginx/Makefile
index 5da12f5..3565b65 100644
--- a/package/nginx/Makefile
+++ b/package/nginx/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.12
PKG_RELEASE:= 1
PKG_MD5SUM:= c21589daaec0743d6d4cdf41503ffd53
PKG_DESCR:= powerful http reverse proxy and webserver
-PKG_SECTION:= proxy
+PKG_SECTION:= net/http
PKG_BUILDDEP:= openssl pcre zlib
PKG_DEPENDS:= libopenssl libpcre libpthread zlib
PKG_URL:= http://nginx.org/
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 0e105ed..750753e 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 6.46
PKG_RELEASE:= 1
PKG_MD5SUM:= 5a36ad3a63d5b7ea5514f745a397436a
PKG_DESCR:= utility for network exploration or security auditing
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libdnet libpcap libpcre libstdcxx
PKG_BUILDDEP:= libdnet libpcap pcre
PKG_URL:= http://nmap.org/
diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index 7ab5bba..2a8bf09 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= nspr
PKG_VERSION:= 4.10.5
PKG_RELEASE:= 1
PKG_MD5SUM:= c903557c620b4b84457f57ddc80934c4
-PKG_DESCR:= Netscape Portable Runtime library
-PKG_SECTION:= libs
+PKG_DESCR:= netscape portable runtime library
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.mozilla.org/projects/nspr/
PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKG_VERSION}/src/
PKG_OPTS:= dev
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 61f5987..4468cad 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -11,8 +11,8 @@ PKG_MIN_VERSION:= 15
PKG_PATCH_VERSION:= 3
PKG_PATCH2_VERSION:= 1
PKG_MD5SUM:= 1d444fffdb1f890a000003b50295b5aa
-PKG_DESCR:= Network Security Services (NSS) library
-PKG_SECTION:= libs
+PKG_DESCR:= network security services library
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= nspr zlib sqlite
PKG_DEPENDS:= nspr zlib libsqlite
PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index 2e733cb..0bcfefc 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2014.2.15
PKG_RELEASE:= 4
PKG_MD5SUM:= f11d563816249d730a00498983485f3a
PKG_DESCR:= ntfs filesystem driver using fuse
-PKG_SECTION:= fs
+PKG_SECTION:= sys/fs
PKG_URL:= http://tuxera.com
PKG_SITES:= http://tuxera.com/opensource/
diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile
index 126efca..2d76400 100644
--- a/package/ntpclient/Makefile
+++ b/package/ntpclient/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ntpclient
PKG_VERSION:= 2010_365
PKG_RELEASE:= 2
PKG_MD5SUM:= a64689398f2df8933ee0d8da246e9eaa
-PKG_DESCR:= NTP client for setting system time from NTP servers
-PKG_SECTION:= ntp
+PKG_DESCR:= client for setting system time from ntp servers
+PKG_SECTION:= net/ntp
PKG_DEPENDS:= libpthread
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 0ff92d8..b4918d9 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= nut
PKG_VERSION:= 2.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66
-PKG_DESCR:= Network UPS Tools
+PKG_DESCR:= network ups tools
PKG_SECTION:= net/misc
PKG_URL:= http://www.networkupstools.org/
PKG_SITES:= http://www.networkupstools.org/source/2.4/
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index 0aaff10..ed1af08 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= obexftp
PKG_VERSION:= 0.23
PKG_RELEASE:= 4
PKG_MD5SUM:= f20762061b68bc921e80be4aebc349eb
-PKG_DESCR:= OBEX ftp application
-PKG_SECTION:= misc
+PKG_DESCR:= bluetooth ftp application
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= openobex libobexftp
PKG_BUILDDEP:= openobex libiconv-tiny
PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
@@ -17,7 +17,7 @@ PKG_LIBNAME:= libobexftp
PKG_OPTS:= dev
PKG_SUBPKGS:= OBEXFTP LIBOBEXFTP
-PKGSC_LIBOBEXFTP:= libs
+PKGSC_LIBOBEXFTP:= libs/net
PKGSD_LIBOBEXFTP:= obex ftp library
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index e65b75e..55b63bc 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 65181a5280391d69411908c186fd0c1f
PKG_DESCR:= optimized link state routing protocol
-PKG_SECTION:= wifi
+PKG_SECTION:= net/wifi
PKG_URL:= http://www.olsr.org/
PKG_SITES:= http://www.olsr.org/releases/0.6/
PKG_NOPARALLEL:= 1
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index 6c86bab..724865a 100644
--- a/package/omxplayer/Makefile
+++ b/package/omxplayer/Makefile
@@ -9,7 +9,7 @@ PKG_VERSION:= 0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 1c882539dfcbc4e8efeae85ff8069cbe
PKG_DESCR:= video player for raspberry pi
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/video
PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre
PKG_DEPENDS+= librt zlib libpthread libstdcxx libdbus
PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus
diff --git a/package/open-iscsi/Makefile b/package/open-iscsi/Makefile
index c4d2304..5ce21fc 100644
--- a/package/open-iscsi/Makefile
+++ b/package/open-iscsi/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 2.0
PKG_EXTRAVER:= 871
PKG_RELEASE:= 1
PKG_MD5SUM:= 0c403e8c9ad41607571ba0e6e8ff196e
-PKG_DESCR:= iSCSI utilities
-PKG_SECTION:= fs
+PKG_DESCR:= iscsi utilities
+PKG_SECTION:= sys/fs
PKG_URL:= http://www.open-iscsi.org/
PKG_SITES:= http://www.open-iscsi.org/bits/
diff --git a/package/openafs/Makefile b/package/openafs/Makefile
index b0a2b5d..99e0911 100644
--- a/package/openafs/Makefile
+++ b/package/openafs/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= openafs
PKG_VERSION:= 1.6.5.1
PKG_RELEASE:= 1
PKG_MD5SUM:= e33e0b031760d4f90815d40b8ab3c540
-PKG_DESCR:= AFS implementation
+PKG_DESCR:= afs implementation
PKG_SECTION:= net/fs
PKG_URL:= http://openafs.org
PKG_SITES:= http://www.openafs.org/dl/openafs/${PKG_VERSION}/
diff --git a/package/openct/Makefile b/package/openct/Makefile
index e14ea22..cf3f04d 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.20
PKG_RELEASE:= 3
PKG_MD5SUM:= a1da3358ab798f1cb9232f1dbababc21
PKG_DESCR:= drivers for smart card readers
-PKG_SECTION:= crypto
+PKG_SECTION:= app/crypto
PKG_DEPENDS:= libopenct
PKG_BUILDDEP:= libtool
PKG_URL:= http://www.opensc-project.org/openct/
@@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= OPENCT LIBOPENCT
PKGSD_LIBOPENCT:= crypto token library
-PKGSC_LIBOPENCT:= libs
+PKGSC_LIBOPENCT:= libs/crypto
PKGSS_LIBOPENCT:= libltdl libusb
PKGSB_LIBOPENCT:= libtool libusb
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 8b9397b..cd0fa26 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= openjdk7
PKG_VERSION:= 2.4.7
PKG_RELEASE:= 4
PKG_MD5SUM:= f6b28633b9978fadc724247cfc264ff0
-PKG_DESCR:= OpenJDK 7 Java VM
-PKG_SECTION:= lang
+PKG_DESCR:= java virtual machine
+PKG_SECTION:= dev/lang
PKG_BUILDDEP:= openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
PKG_BUILDDEP+= libpng giflib gtk+ glib fontconfig nss
@@ -29,7 +29,6 @@ GCJ_VER:= 4.8.2
PKG_HOST_DEPENDS:= linux
PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64
PKG_LIBC_DEPENDS:= uclibc glibc
-PKG_SYSTEM_DEPENDS:= !lemote-yeelong
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index ef5f63b..794da84 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= openldap
PKG_VERSION:= 2.4.39
PKG_RELEASE:= 1
PKG_MD5SUM:= b0d5ee4b252c841dec6b332d679cf943
-PKG_DESCR:= LDAP client libraries
-PKG_SECTION:= libs
+PKG_DESCR:= ldap client libraries
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libopenssl libsasl2 libdb libpthread libuuid libstdcxx
PKG_BUILDDEP:= cyrus-sasl openssl db util-linux
PKG_URL:= http://www.openldap.org/
@@ -17,10 +17,10 @@ PKG_LIBNAME:= libopenldap
PKG_OPTS:= dev
PKG_SUBPKGS:= LIBOPENLDAP OPENLDAP_UTILS OPENLDAP_SLAPD
-PKGSD_OPENLDAP_UTILS:= OpenLDAP utilities
+PKGSD_OPENLDAP_UTILS:= ldap utilities
PKGSS_OPENLDAP_UTILS:= libopenldap
PKGSC_OPENLDAP_UTILS:= net/misc
-PKGSD_OPENLDAP_SLAPD:= OpenLDAP server daemon
+PKGSD_OPENLDAP_SLAPD:= ldap server daemon
PKGSS_OPENLDAP_SLAPD:= libopenldap
PKGSC_OPENLDAP_SLAPD:= net/misc
diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
index e3f197d..a9f55c6 100644
--- a/package/openntpd/Makefile
+++ b/package/openntpd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= openntpd
PKG_VERSION:= 3.9p1
PKG_RELEASE:= 18
PKG_MD5SUM:= afc34175f38d08867c1403d9008600b3
-PKG_DESCR:= NTP server daemon
-PKG_SECTION:= ntp
+PKG_DESCR:= ntp server daemon
+PKG_SECTION:= net/ntp
PKG_DEPENDS:= libopenssl
PKG_URL:= http://www.openntpd.org/
PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/
diff --git a/package/openobex/Makefile b/package/openobex/Makefile
index 541ca79..c8c21dd 100644
--- a/package/openobex/Makefile
+++ b/package/openobex/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= openobex
PKG_VERSION:= 1.5
PKG_RELEASE:= 2
PKG_MD5SUM:= 0d83dc86445a46a1b9750107ba7ab65c
-PKG_DESCR:= implementation of the Object Exchange (OBEX) protocol
-PKG_SECTION:= misc
+PKG_DESCR:= implementation of the obex protocol
+PKG_SECTION:= sys/misc
PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart
PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/}
PKG_OPTS:= dev
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index 6971a99..b6b1686 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11.13
PKG_RELEASE:= 5
PKG_MD5SUM:= 98fa151e947941f9c3f27420fdf47c11
PKG_DESCR:= utilities to access smart cards
-PKG_SECTION:= crypto
+PKG_SECTION:= app/crypto
PKG_BUILDDEP:= openct pcsc-lite openssl readline
PKG_DEPENDS:= libopensc libopenct pcsc-lite libopenssl libreadline
PKG_URL:= http://www.opensc-project.org/opensc/
@@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= OPENSC LIBOPENSC
PKGSD_LIBOPENSC:= opensc library
-PKGSC_LIBOPENSC:= libs
+PKGSC_LIBOPENSC:= libs/crypto
PKGSS_LIBOPENSC:= libltdl
PKGSB_LIBOPENSC:= libtool
diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index a34797f..69674ef 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= opensips
PKG_VERSION:= 1.11.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 34d30e9ce870988970dff5f8a9abd239
-PKG_DESCR:= high-performance, configurable, free SIP server
-PKG_SECTION:= phone
+PKG_DESCR:= high-performance, configurable, free sip server
+PKG_SECTION:= net/voip
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP:= openssl
PKG_URL:= http://opensips.org/
diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile
index 96e5cd1..ac73397 100644
--- a/package/openssl-pkcs11/Makefile
+++ b/package/openssl-pkcs11/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.1.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 693b402eafba152666e66431ed4c1b9e
PKG_DESCR:= pkcs11 engine for openssl
-PKG_SECTION:= crypto
+PKG_SECTION:= app/crypto
PKG_BUILDDEP:= libp11
PKG_URL:= http://www.opensc-project.org/engine_pkcs11
PKG_SITES:= http://www.opensc-project.org/files/engine_pkcs11/
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 806d64c..a9836ff 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= openssl
PKG_VERSION:= 1.0.1g
PKG_RELEASE:= 1
PKG_MD5SUM:= de62b43dfcd858e66a74bee1c834e959
-PKG_DESCR:= Secure Socket Layer libraries
-PKG_SECTION:= libs
+PKG_DESCR:= secure socket layer libraries
+PKG_SECTION:= libs/crypto
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.openssl.org/
@@ -19,8 +19,8 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= LIBOPENSSL OPENSSL_UTIL
-PKGSD_OPENSSL_UTIL:= OpenSSL command line tool
-PKGSC_OPENSSL_UTIL:= crypto
+PKGSD_OPENSSL_UTIL:= openssl command line tool
+PKGSC_OPENSSL_UTIL:= app/crypto
PKGSS_OPENSSL_UTIL:= libopenssl
PKG_FLAVOURS_LIBOPENSSL:= WITH_CRYPTODEV
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 40ea416..787c452 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= openswan
PKG_VERSION:= 2.6.41
PKG_RELEASE:= 1
PKG_MD5SUM:= da2e8b02ecc30a408cc5766767fef84f
-PKG_DESCR:= IPsec software
+PKG_DESCR:= ipsec software
PKG_SECTION:= net/security
PKG_DEPENDS:= ip libgmp libpthread
PKG_BUILDDEP:= gmp
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index e6d8532..e756348 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= openvpn
PKG_VERSION:= 2.3.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 9b70be9fb45e407117c3c9b118e4ba22
-PKG_DESCR:= VPN solution using SSL/TLS
+PKG_DESCR:= vpn solution using ssl/tls
PKG_SECTION:= net/security
PKG_BUILDDEP:= autotool
PKG_DEPENDS:= ip
@@ -15,7 +15,7 @@ PKG_URL:= http://openvpn.net/
PKG_SITES:= http://swupdate.openvpn.org/community/releases/
PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS
-PKGFD_WITH_LZO:= enable LZO compression support
+PKGFD_WITH_LZO:= enable lzo compression support
PKGFS_WITH_LZO:= liblzo
PKGFB_WITH_LZO:= liblzo
PKGFD_WITH_MANAGEMENT:= enable management server support
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 4b741ff..f14d8c7 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.9
PKG_RELEASE:= 4
PKG_MD5SUM:= 00aec1287da2dfffda17a9b1c0a01868
PKG_DESCR:= system-wide profiles
-PKG_SECTION:= debug
+PKG_SECTION:= app/debug
PKG_DEPENDS:= libpopt libbfd libstdcxx
PKG_BUILDDEP:= popt binutils gcc
PKG_URL:= http://oprofile.sourceforge.net/
diff --git a/package/opus/Makefile b/package/opus/Makefile
index 580ecc2..9f19094 100644
--- a/package/opus/Makefile
+++ b/package/opus/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c5a8cf7c0b066759542bc4ca46817ac6
PKG_DESCR:= open, royalty-free, highly versatile audio codec
-PKG_SECTION:= libs
+PKG_SECTION:= libs/audio
PKG_URL:= http://opus-codec.org/
PKG_SITES:= http://downloads.xiph.org/releases/opus/
PKG_LIBNAME:= libopus
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index d7718fe..f5dd701 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -8,8 +8,8 @@ PKG_VERSION:= 2.14.19
PKG_EXTRAVER:= 2.14
PKG_RELEASE:= 5
PKG_MD5SUM:= 87c69c56c6d0bdafa4de5e18ae115cc9
-PKG_DESCR:= a CORBA 2.4-compliant Object Request Broker
-PKG_SECTION:= libs
+PKG_DESCR:= corba 2.4-compliant object request broker
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= gettext-tiny glib-host libIDL-host glib libIDL
PKG_URL:= http://projects.gnome.org/ORBit2/
PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
diff --git a/package/owfs/Makefile b/package/owfs/Makefile
index 0262546..3dad68a 100644
--- a/package/owfs/Makefile
+++ b/package/owfs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.9p1
PKG_RELEASE:= 1
PKG_MD5SUM:= 56ba145be208002e58775a7203369851
PKG_DESCR:= software to access 1-wire devices
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_BUILDDEP:= fuse
PKG_URL:= http://owfs.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=owfs/}
diff --git a/package/p5-XML-Parser/Makefile b/package/p5-XML-Parser/Makefile
index 7c77451..f2f402a 100644
--- a/package/p5-XML-Parser/Makefile
+++ b/package/p5-XML-Parser/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= p5-XML-Parser
PKG_VERSION:= 2.40
PKG_RELEASE:= 2
PKG_MD5SUM:= c66e9adba003d0667cc40115ccd837a5
-PKG_DESCR:= XML::Parser
-PKG_SECTION:= lang
+PKG_DESCR:= xml parser
+PKG_SECTION:= dev/perl
PKG_DEPENDS:= perl libexpat
PKG_BUILDDEP:= perl-host expat
PKG_SITES:= http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/
diff --git a/package/p54-firmware/Makefile b/package/p54-firmware/Makefile
index 120f14d..72fc56a 100644
--- a/package/p54-firmware/Makefile
+++ b/package/p54-firmware/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= p54-firmware
PKG_VERSION:= 1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8e8ab005a4f8f0123bcdc51bc25b47f6
-PKG_DESCR:= firmware for USB prism54 wireless cards (isl3887)
-PKG_SECTION:= wifi
+PKG_DESCR:= firmware for usb prism54 wireless cards
+PKG_SECTION:= sys/firmware
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 7389132..ae2f7e9 100644
--- a/package/p910nd/Makefile
+++ b/package/p910nd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= p910nd
PKG_VERSION:= 0.7
PKG_RELEASE:= 10
PKG_MD5SUM:= 7bf752532d26c9106f8039db95df3a6b
-PKG_DESCR:= A small non-spooling printer server
+PKG_DESCR:= small non-spooling printer server
PKG_SECTION:= net/misc
PKG_URL:= http://www.etherboot.org/p910nd/
PKG_SITES:= http://www.etherboot.org/p910nd/
diff --git a/package/pam/Makefile b/package/pam/Makefile
index 80ee5c3..10aa6b8 100644
--- a/package/pam/Makefile
+++ b/package/pam/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 3
PKG_MD5SUM:= 5107bbf54042400b6200e8367cc7feef
PKG_DESCR:= pluggable authentication modules
PKG_BUILDDEP:= autotool flex
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_URL:= http://www.linux-pam.org/
PKG_SITES:= http://www.linux-pam.org/library/
PKG_OPTS:= dev
diff --git a/package/pango/Makefile b/package/pango/Makefile
index 0d51994..d818fad 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.36.3
PKG_RELEASE:= 1
PKG_MD5SUM:= d9532826e95bdb374355deebc42441bb
PKG_DESCR:= library for laying out and rendering of text
-PKG_SECTION:= libs
+PKG_SECTION:= libs/fonts
PKG_DEPENDS:= libstdcxx
PKG_BUILDDEP:= libXft glib cairo harfbuzz libstdcxx fontconfig
HOST_BUILDDEP:= cairo-host harfbuzz-host
diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile
index 8c22c44..3c2b1c4 100644
--- a/package/parprouted/Makefile
+++ b/package/parprouted/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= parprouted
PKG_VERSION:= 0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 570f5deaf09600df8f80f589de79ecdb
-PKG_DESCR:= a proxy ARP daemon
-PKG_SECTION:= proxy
+PKG_DESCR:= proxy arp daemon
+PKG_SECTION:= net/misc
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 fe86ba7..6248412 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1
PKG_RELEASE:= 3
PKG_MD5SUM:= 5d89d64d94bcfefa9ce8f59f4b81bdcb
PKG_DESCR:= partition table editor
-PKG_SECTION:= fs
+PKG_SECTION:= sys/fs
PKG_DEPENDS:= libblkid libuuid libreadline libpthread
PKG_BUILDDEP:= util-linux readline
PKG_URL:= http://www.gnu.org/software/parted/index.shtml
diff --git a/package/patch/Makefile b/package/patch/Makefile
index bdc5506..4fff228 100644
--- a/package/patch/Makefile
+++ b/package/patch/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= patch
PKG_VERSION:= 2.7.1
PKG_RELEASE:= 1
PKG_MD5SUM:= e9ae5393426d3ad783a300a338c09b72
-PKG_DESCR:= GNU patch utility
-PKG_SECTION:= utils
+PKG_DESCR:= patch utility
+PKG_SECTION:= sys/utils
PKG_URL:= http://www.gnu.org/software/patch/
PKG_SITES:= ${MASTER_SITE_GNU:=patch/}
PKG_BB:= 1
diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile
index fb5a4d6..aa2dc7a 100644
--- a/package/pcc-libs/Makefile
+++ b/package/pcc-libs/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pcc-libs
PKG_VERSION:= 1.0.0
PKG_RELEASE:= 1
PKG_MD5SUM:= a8dfcd6d3be512bc3f16f96c9abf132e
-PKG_DESCR:= runtime for the Portable C Compiler
-PKG_SECTION:= lang
+PKG_DESCR:= runtime for the portable c compiler
+PKG_SECTION:= dev/lang
PKG_URL:= http://pcc.ludd.ltu.se/
PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index 531f146..457b444 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pcc
PKG_VERSION:= 1.0.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 6e5d851ee57fe58702fe4e80ecd1f852
-PKG_DESCR:= Portable C Compiler
-PKG_SECTION:= lang
+PKG_DESCR:= portable c compiler
+PKG_SECTION:= dev/lang
PKG_DEPENDS:= pcc-libs
PKG_URL:= http://pcc.ludd.ltu.se/
PKG_SITES:= http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index 6dac7a7..1735b2a 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pciutils
PKG_VERSION:= 3.1.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 72ebc3624ccb43ae2ddf872b5dfdb3c9
-PKG_DESCR:= PCI utilities (lspci/setpci)
-PKG_SECTION:= utils
+PKG_DESCR:= pci utilities (lspci/setpci)
+PKG_SECTION:= sys/utils
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils/
diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile
index 1cec544..2529427 100644
--- a/package/pcmciautils/Makefile
+++ b/package/pcmciautils/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pcmciautils
PKG_VERSION:= 018
PKG_RELEASE:= 1
PKG_MD5SUM:= 3c388cb559975b37a75cb5965e9800a9
-PKG_DESCR:= Utilities for PCMCIA subsystem
-PKG_SECTION:= utils
+PKG_DESCR:= utilities for pcmcia subsystem
+PKG_SECTION:= sys/utils
PKG_BUILDDEP:= sysfsutils bison-host flex-host
PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index ebf04b4..94d661c 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pcre
PKG_VERSION:= 8.34
PKG_RELEASE:= 2
PKG_MD5SUM:= eb34b2c9c727fd64940d6fd9a00995eb
-PKG_DESCR:= Perl Compatible Regular Expression library
-PKG_SECTION:= libs
+PKG_DESCR:= perl compatible regular expression library
+PKG_SECTION:= libs/misc
PKG_BUILDDEPS:= gettext-tiny
PKG_URL:= http://www.pcre.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/}
diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile
index 2c3fdd3..0830720 100644
--- a/package/pcrepp/Makefile
+++ b/package/pcrepp/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pcrepp
PKG_VERSION:= 0.9.5
PKG_RELEASE:= 2
PKG_MD5SUM:= 1fe6ea8e23ece01fde2ce5fb4746acc2
-PKG_DESCR:= cpp wrapper classes for PCRE
-PKG_SECTION:= libs
+PKG_DESCR:= cpp wrapper classes for pcre
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpcre
PKG_BUILDDEP:= pcre
PKG_URL:= http://www.daemon.de/PCRE
diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile
index 1dc2bc5..80f97b3 100644
--- a/package/pcsc-lite/Makefile
+++ b/package/pcsc-lite/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.4
PKG_RELEASE:= 2
PKG_MD5SUM:= 1caf0b8ca2ecbf82fe3b035b3fff22dd
PKG_DESCR:= middleware for smartcards
-PKG_SECTION:= crypto
+PKG_SECTION:= app/crypto
PKG_DEPENDS:= libusb libusb-compat libpthread
PKG_BUILDDEP:= libusb libusb-compat
PKG_URL:= http://pcsclite.alioth.debian.org/
diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile
index ae0f25e..99d8f5f 100644
--- a/package/pdnsd/Makefile
+++ b/package/pdnsd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pdnsd
PKG_VERSION:= 1.2.7
PKG_RELEASE:= 3
PKG_MD5SUM:= 114b3b21b09b43cbfcccdde726b84c12
-PKG_DESCR:= Proxy DNS server
-PKG_SECTION:= dns
+PKG_DESCR:= proxy dns server
+PKG_SECTION:= net/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 ccf82f8..6d9249e 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= perl
PKG_VERSION:= 5.18.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 304cb5bd18e48c44edd6053337d3386d
-PKG_DESCR:= Perl interpreter
-PKG_SECTION:= lang
+PKG_DESCR:= perl interpreter
+PKG_SECTION:= dev/lang
PKG_BUILDDEP:= perl-host
PKG_URL:= http://www.perl.org/
PKG_SITES:= http://www.cpan.org/src/
diff --git a/package/php/Makefile b/package/php/Makefile
index ee29ed9..ea7b20b 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= php
PKG_VERSION:= 5.5.12
PKG_RELEASE:= 1
PKG_MD5SUM:= 3fb091987063135fd86b3b5ba5010479
-PKG_DESCR:= PHP language interpreter
-PKG_SECTION:= lang
+PKG_DESCR:= php language interpreter
+PKG_SECTION:= dev/lang
PKG_DEPENDS:= libpthread librt
PHP_URL:= http://www.php.net/
PKG_SITES:= http://de.php.net/distributions/
diff --git a/package/picocom/Makefile b/package/picocom/Makefile
index d67e360..065f00e 100644
--- a/package/picocom/Makefile
+++ b/package/picocom/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 8eaba1d31407e8408674d6e57af447ef
PKG_DESCR:= minimal dumb-terminal emulation program
-PKG_SECTION:= serial
+PKG_SECTION:= sys/serial
PKG_URL:= http://code.google.com/p/picocom
PKG_SITES:= http://picocom.googlecode.com/files/
diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile
index b859132..7478a55 100644
--- a/package/pipacs/Makefile
+++ b/package/pipacs/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= pipacs
PKG_VERSION:= 0.1
PKG_RELEASE:= 2
-PKG_DESCR:= an UNIX socket accounting/viewer program
+PKG_DESCR:= unix socket accounting/viewer program
PKG_SECTION:= net/misc
NO_DISTFILES:= 1
diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile
index 7b5420c..7484a17 100644
--- a/package/pkgconf/Makefile
+++ b/package/pkgconf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.5
PKG_RELEASE:= 1
PKG_MD5SUM:= babb4e02f0fb8f4044ee95ad2241a676
PKG_DESCR:= smart pkg-config replacement
-PKG_SECTION:= lang
+PKG_SECTION:= dev/tools
PKG_URL:= https://github.com/pkgconf/pkgconf
PKG_SITES:= http://rabbit.dereferenced.org/~nenolod/distfiles/
diff --git a/package/pm-utils/Makefile b/package/pm-utils/Makefile
index 76a3707..dfb91c7 100644
--- a/package/pm-utils/Makefile
+++ b/package/pm-utils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 1742a556089c36c3a89eb1b957da5a60
PKG_DESCR:= power management utilities
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_URL:= http://pm-utils.freedesktop.org/
PKG_SITES:= http://pm-utils.freedesktop.org/releases/
diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile
index f793a8e..c90d993 100644
--- a/package/pmacct/Makefile
+++ b/package/pmacct/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pmacct
PKG_VERSION:= 0.12.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 3d10f9301a17f034a0f221490a99a5d0
-PKG_DESCR:= IP accounting daemons
-PKG_SECTION:= net/misc
+PKG_DESCR:= ip accounting tools
+PKG_SECTION:= net/acct
PKG_DEPENDS:= libpcap
PKG_BUILDDEP:= libpcap
PKG_URL:= http://www.pmacct.net/
diff --git a/package/polarssl/Makefile b/package/polarssl/Makefile
index 0fe24b6..602c9f1 100644
--- a/package/polarssl/Makefile
+++ b/package/polarssl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= polarssl
PKG_VERSION:= 1.3.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 1245884d3e73150cfcc196f91de2b5c4
-PKG_DESCR:= embedded SSL/TLS library
-PKG_SECTION:= libs
+PKG_DESCR:= embedded ssl/tls library
+PKG_SECTION:= libs/crypto
PKG_URL:= https://polarssl.org/
PKG_SITES:= https://polarssl.org/download/
PKG_LIBNAME:= libpolarssl
diff --git a/package/polipo/Makefile b/package/polipo/Makefile
index 9422a49..d4589a5 100644
--- a/package/polipo/Makefile
+++ b/package/polipo/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= polipo
PKG_VERSION:= 1.0.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= bfc5c85289519658280e093a270d6703
-PKG_DESCR:= HTTP 1.1 proxy with Socks5 support
-PKG_SECTION:= proxy
+PKG_DESCR:= web proxy with socks5 support
+PKG_SECTION:= net/proxy
PKG_URL:= http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/
PKG_SITES:= http://freehaven.net/~chrisd/polipo/
diff --git a/package/poppler/Makefile b/package/poppler/Makefile
index e231855..accce81 100644
--- a/package/poppler/Makefile
+++ b/package/poppler/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.24.5
PKG_RELEASE:= 2
PKG_MD5SUM:= 334f2ac95cc8039f2a57fe63e4a81c69
PKG_DESCR:= pdf rendering library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= fontconfig libstdcxx libpng cairo
PKG_DEPENDS:= fontconfig libstdcxx libpng cairo
PKG_URL:= http://poppler.freedesktop.org/
diff --git a/package/popt/Makefile b/package/popt/Makefile
index e30d957..0d6cc55 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= popt
PKG_VERSION:= 1.16
PKG_RELEASE:= 4
PKG_MD5SUM:= 3743beefa3dd6247a73f8f7a32c14c33
-PKG_DESCR:= a command line option parsing library
-PKG_SECTION:= libs
+PKG_DESCR:= command line option parsing library
+PKG_SECTION:= libs/misc
PKG_BUILDDEP:= libiconv-tiny
PKG_URL:= http://rpm5.org/
PKG_SITES:= http://rpm5.org/files/popt/
diff --git a/package/postfix/Makefile b/package/postfix/Makefile
index 9be9b90..d75ae32 100644
--- a/package/postfix/Makefile
+++ b/package/postfix/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.11.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 25fe7dd05f81cc0755131beecee046fd
PKG_DESCR:= popular mail transfer agent
-PKG_SECTION:= mail
+PKG_SECTION:= net/mail
PKG_BUILDDEP:= tinycdb
PKG_URL:= http://www.postfix.org/
PKG_SITES:= http://de.postfix.org/ftpmirror/official/
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 46b8cfc..eb18171 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 9.3.4
PKG_RELEASE:= 1
PKG_MD5SUM:= d9be740a612f8a0b9ea61dd524abfa4c
PKG_DESCR:= postgresql database library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/db
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.postgresql.org/
PKG_SITES:= http://ftp.postgresql.org/pub/source/v9.3.4/
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 0930e93..50e10c2 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ppp
PKG_VERSION:= 2.4.5
PKG_RELEASE:= 7
PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57
-PKG_DESCR:= Point-to-Point Protocol software
-PKG_SECTION:= ppp
+PKG_DESCR:= point-to-point protocol software
+PKG_SECTION:= net/ppp
PKG_BUILDDEP:= libpcap
PKG_URL:= http://ppp.samba.org/
PKG_SITES:= ftp://ftp.samba.org/pub/ppp/
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 7cc3691..b4a3f3d 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pptp
PKG_VERSION:= 1.8.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 4efce9f263e2c3f38d79d9df222476de
-PKG_DESCR:= Point-to-Point Tunneling Protocol (PPTP) client
-PKG_SECTION:= ppp
+PKG_DESCR:= point-to-point tunneling protocol client
+PKG_SECTION:= net/ppp
PKG_DEPENDS:= ppp
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/}
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index 5934d24..1e76579 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pptpd
PKG_VERSION:= 1.3.4
PKG_RELEASE:= 2
PKG_MD5SUM:= b38df9c431041922c997c1148bedf591
-PKG_DESCR:= Point-to-Point Tunneling Protocol (PPTP) server
-PKG_SECTION:= ppp
+PKG_DESCR:= point-to-point tunneling protocol server
+PKG_SECTION:= net/ppp
PKG_DEPENDS:= ppp
PKG_URL:= http://www.poptop.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/}
diff --git a/package/presentproto/Makefile b/package/presentproto/Makefile
index 189f77a..45c08a1 100644
--- a/package/presentproto/Makefile
+++ b/package/presentproto/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 57eaf4bb58e86476ec89cfb42d675961
PKG_DESCR:= present protocol headers
-PKG_SECTION:= devel
+PKG_SECTION:= dev/header
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/printproto/Makefile b/package/printproto/Makefile
index edb904f..7ef045a 100644
--- a/package/printproto/Makefile
+++ b/package/printproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= printproto
PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
-PKG_DESCR:= X Print Extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= x print extension headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 5afeb3a7de8a14b417239a14ea724268
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
PKG_OPTS:= dev devonly
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index 6b529c1..d0220a1 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_VARIANT:= stable
PKG_MD5SUM:= 57acc79059565cc42eda67982842785d
PKG_DESCR:= web proxy with advanced filtering capabilities
-PKG_SECTION:= proxy
+PKG_SECTION:= net/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 db65cd7..aeccd8a 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:= mail
+PKG_SECTION:= net/mail
PKG_URL:= http://www.procmail.org/
PKG_SITES:= http://www.procmail.org/
diff --git a/package/procps/Makefile b/package/procps/Makefile
index f946231..4cd64fa 100644
--- a/package/procps/Makefile
+++ b/package/procps/Makefile
@@ -8,11 +8,12 @@ PKG_VERSION:= 3.2.8
PKG_RELEASE:= 2
PKG_MD5SUM:= 9532714b6846013ca9898984ba4cd7e0
PKG_DESCR:= /proc file system utilities
-PKG_SECTION:= utils
+PKG_SECTION:= base/apps
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://procps.sourceforge.net/
PKG_SITES:= http://procps.sourceforge.net/
+PKG_BB:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile
index 927e26e..bd19188 100644
--- a/package/ptunnel/Makefile
+++ b/package/ptunnel/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= ptunnel
PKG_VERSION:= 0.61
PKG_RELEASE:= 2
PKG_MD5SUM:= b45f73875f2af48f101816672f83a5fe
-PKG_DESCR:= tunnel TCP connections over ICMP packets
+PKG_DESCR:= tunnel tcp connections over icmp packets
PKG_SECTION:= net/security
PKG_DEPENDS:= libpcap libpthread
PKG_BUILDDEP:= libpcap
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index ddca9a2..6e095a6 100644
--- a/package/pulseaudio/Makefile
+++ b/package/pulseaudio/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pulseaudio
PKG_VERSION:= 4.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 591f211db2790a7e4d222f2dc6858db3
-PKG_DESCR:= sound system for POSIX OSes
-PKG_SECTION:= multimedia
+PKG_DESCR:= sound system
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libltdl json-c libsndfile libspeex libncurses
PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile
PKG_DEPENDS+= libpthread librt alsa-lib libsamplerate
diff --git a/package/pycurl/Makefile b/package/pycurl/Makefile
index 7ddb9c8..70bcb32 100644
--- a/package/pycurl/Makefile
+++ b/package/pycurl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pycurl
PKG_VERSION:= 7.19.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 518be33976dbc6838e42495ada64b43f
-PKG_DESCR:= Python module for fetching of files
-PKG_SECTION:= lang
+PKG_DESCR:= python module for fetching of files
+PKG_SECTION:= dev/python
PKG_BUILDDEP:= python2 curl
PKG_DEPENDS:= python2 libcurl
PKG_URL:= http://pycurl.sourceforge.net/
diff --git a/package/pyrex/Makefile b/package/pyrex/Makefile
index 8f4a1a7..8b1fb78 100644
--- a/package/pyrex/Makefile
+++ b/package/pyrex/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= Pyrex
PKG_VERSION:= 0.9.9
PKG_RELEASE:= 3
PKG_MD5SUM:= 515dee67d15d4393841e2d60e8341947
-PKG_DESCR:= mixes Python and C data types
-PKG_SECTION:= libs
+PKG_DESCR:= mixes python and c data types
+PKG_SECTION:= dev/python
PKG_DEPENDS:= python2
PKG_URL:= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
PKG_SITES:= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 0aeb0cf..ce3a90c 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7.5
PKG_RELEASE:= 12
PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df
PKG_DESCR:= python scripting language (Version 2)
-PKG_SECTION:= lang
+PKG_SECTION:= dev/lang
PKG_BUILDDEP:= libffi python2-host
HOST_BUILDDEP:= libffi-host bzip2-host autotool
PKG_DEPENDS:= libpthread libffi
diff --git a/package/python3/Makefile b/package/python3/Makefile
index 3b01a5e..996f5df 100644
--- a/package/python3/Makefile
+++ b/package/python3/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.4.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 77c22725e14af3d71022cbfdebff4903
PKG_DESCR:= python scripting language (Version 3)
-PKG_SECTION:= lang
+PKG_SECTION:= dev/lang
PKG_DEPENDS:= libpthread libffi
PKG_BUILDDEP:= python3-host libffi
HOST_BUILDDEP:= libffi-host
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index c7b4865..6e8f230 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 9541063d999cf9659ed7fdce71314f31
PKG_DESCR:= cpu and system emulator
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= zlib glib
PKG_BUILDDEP:= gettext-tiny libiconv-tiny
PKG_BUILDDEP+= zlib glib
diff --git a/package/qingy/Makefile b/package/qingy/Makefile
index 560c091..14d1433 100644
--- a/package/qingy/Makefile
+++ b/package/qingy/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.0
PKG_RELEASE:= 3
PKG_MD5SUM:= 1e0912655e240adfd0ce5ced30bbc685
PKG_DESCR:= directfb getty replacement
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= directfb libncurses librt libpthread
PKG_DEPENDS+= libstdcxx
PKG_BUILDDEP:= DirectFB ncurses
diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index 35132dc..40ae1a5 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.99.22.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 03ef24a448be47beba80efa2152f8a28
PKG_DESCR:= routing software package
-PKG_SECTION:= route
+PKG_SECTION:= net/route
PKG_BUILDDEP:= readline ncurses
PKG_URL:= http://www.quagga.net/
PKG_SITES:= http://download.savannah.gnu.org/releases/quagga/
diff --git a/package/raddump/Makefile b/package/raddump/Makefile
index 07be921..e07b054 100755
--- a/package/raddump/Makefile
+++ b/package/raddump/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= raddump
PKG_VERSION:= 0.3.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f8c29c67141ea78bb6ae8b97d5149480
-PKG_DESCR:= interprets captured RADIUS packets
-PKG_SECTION:= ppp
+PKG_DESCR:= interprets captured radius packets
+PKG_SECTION:= net/radius
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 df48e90..42999ad 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= radvd
PKG_VERSION:= 1.10.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 13ef482ed4de334bede07839806a1689
-PKG_DESCR:= routing advertisement daemon for IPv6
-PKG_SECTION:= ipv6
+PKG_DESCR:= routing advertisement daemon for ipv6
+PKG_SECTION:= net/ipv6
PKG_DEPENDS:= libdaemon
PKG_BUILDDEP:= autotool libdaemon
PKG_URL:= http://www.litech.org/radvd/
diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile
index ae19200..47872ec 100644
--- a/package/randrproto/Makefile
+++ b/package/randrproto/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= randrproto
PKG_VERSION:= 1.4.0
PKG_RELEASE:= 1
PKG_MD5SUM:= af44f250b89783eb4967f1dc5b32ef68
-PKG_DESCR:= Xrandr protcol headers
-PKG_SECTION:= devel
+PKG_DESCR:= xrandr protcol headers
+PKG_SECTION:= dev/header
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index 2b1b2c7..2d72de5 100644
--- a/package/rarpd/Makefile
+++ b/package/rarpd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= rarpd
PKG_VERSION:= 1.1
PKG_RELEASE:= 11
PKG_MD5SUM:= 04e2ca849e758d0b88c8281775ec3b58
-PKG_DESCR:= reverse ARP daemon
+PKG_DESCR:= reverse arp daemon
PKG_SECTION:= net/misc
PKG_DEPENDS:= libnet
PKG_BUILDDEP:= libnet
diff --git a/package/rdate/Makefile b/package/rdate/Makefile
index 90ad408..d790859 100644
--- a/package/rdate/Makefile
+++ b/package/rdate/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= rdate
PKG_VERSION:= 20070817
PKG_RELEASE:= 4
PKG_MD5SUM:= 9a6489d7de4311678a3fab001bb503df
-PKG_DESCR:= small rdate and NTP client
-PKG_SECTION:= ntp
+PKG_DESCR:= small ntp client
+PKG_SECTION:= net/ntp
PKG_SITES:= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/rdate/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/rdesktop/Makefile b/package/rdesktop/Makefile
index 0c2c5e6..b629a21 100644
--- a/package/rdesktop/Makefile
+++ b/package/rdesktop/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= rdesktop
PKG_VERSION:= 1.8.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f5382c5c85b0d2cc88b9b1aa9bbf1356
-PKG_DESCR:= client for Windows Terminal Services
-PKG_SECTION:= net
+PKG_DESCR:= client for windows terminal services
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= libsamplerate libopenssl alsa-lib libao
PKG_BUILDDEP:= libiconv-tiny openssl libsamplerate alsa-lib libao
PKG_URL:= http://www.rdesktop.org/
diff --git a/package/readline/Makefile b/package/readline/Makefile
index 6e13cf6..2fd9cc6 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 6.1
PKG_RELEASE:= 2
PKG_MD5SUM:= fc2f7e714fe792db1ce6ddc4c9fb4ef3
PKG_DESCR:= command line editing library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_SITES:= ${MASTER_SITE_GNU:=readline/}
diff --git a/package/reaim/Makefile b/package/reaim/Makefile
index 959a296..90508d6 100644
--- a/package/reaim/Makefile
+++ b/package/reaim/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= reaim
PKG_VERSION:= 0.8
PKG_RELEASE:= 9
PKG_MD5SUM:= 647d2ab72ec454f89294accfb3182c09
-PKG_DESCR:= A transparent AIM / MSN proxy
-PKG_SECTION:= chat
+PKG_DESCR:= transparent aim / msn proxy
+PKG_SECTION:= app/chat
PKG_DEPENDS:= iptables
PKG_URL:= http://reaim.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/}
diff --git a/package/realtek-firmware/Makefile b/package/realtek-firmware/Makefile
index 2fa236c..3483605 100644
--- a/package/realtek-firmware/Makefile
+++ b/package/realtek-firmware/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 85a7d1d1386143fad312a5a82c422380
PKG_DESCR:= firmware for realtek wireless cards
-PKG_SECTION:= wifi
+PKG_SECTION:= sys/firmware
PKG_SITES:= http://www.openadk.org/distfiles/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/recordproto/Makefile b/package/recordproto/Makefile
index 5bc77d8..f8453e4 100644
--- a/package/recordproto/Makefile
+++ b/package/recordproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= recordproto
PKG_VERSION:= 1.14.2
PKG_RELEASE:= 1
-PKG_DESCR:= RECORD extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= record extension headers
+PKG_SECTION:= dev/header
PKG_BUILDDEP:= recordproto-host
PKG_MD5SUM:= 868235e1e150e68916d5a316ebc4ccc4
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile
index 2b8ab95..99db975 100644
--- a/package/renderproto/Makefile
+++ b/package/renderproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= renderproto
PKG_VERSION:= 0.11.1
PKG_RELEASE:= 1
-PKG_DESCR:= X Rendering Extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= x rendering extension headers
+PKG_SECTION:= dev/header
PKG_BUILDDEP:= renderproto-host
PKG_MD5SUM:= 9b103359123e375bb7760f7dbae3dece
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/resourceproto/Makefile b/package/resourceproto/Makefile
index 780eae3..ae50130 100644
--- a/package/resourceproto/Makefile
+++ b/package/resourceproto/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= resourceproto
PKG_VERSION:= 1.2.0
PKG_RELEASE:= 1
PKG_DESCR:= resource extension headers
-PKG_SECTION:= devel
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 33091d5358ec32dd7562a1aa225a70aa
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/rfkill/Makefile b/package/rfkill/Makefile
index a51b231..96154bd 100644
--- a/package/rfkill/Makefile
+++ b/package/rfkill/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= ce834c00c049cd86a04ab115c92ef548
PKG_DESCR:= radio frequency kill utility
-PKG_SECTION:= wifi
+PKG_SECTION:= net/wifi
PKG_URL:= https://www.kernel.org/pub/software/network/rfkill/
PKG_SITES:= https://www.kernel.org/pub/software/network/rfkill/
PKG_BB:= 1
diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile
index 0daf65b..3b9ac24 100644
--- a/package/rng-tools/Makefile
+++ b/package/rng-tools/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= rng-tools
PKG_VERSION:= 4
PKG_RELEASE:= 1
PKG_MD5SUM:= ae89dbfcf08bdfbea19066cfbf599127
-PKG_DESCR:= daemon to use hardware random number generators.
-PKG_SECTION:= crypto
+PKG_DESCR:= daemon to use hardware random number generators
+PKG_SECTION:= app/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 ef78bbc..c449a19 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= rp-pppoe
PKG_VERSION:= 3.10
PKG_RELEASE:= 1
PKG_MD5SUM:= d58a13cc4185bca6121a606ff456dec0
-PKG_DESCR:= PPPoE (PPP over Ethernet) tools
-PKG_SECTION:= ppp
+PKG_DESCR:= ppp over ethernet tools
+PKG_SECTION:= net/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 5defd86..17291a6 100644
--- a/package/rpcbind/Makefile
+++ b/package/rpcbind/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= rpcbind
PKG_VERSION:= 0.2.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 0a5f9c2142af814c55d957aaab3bcc68
-PKG_DESCR:= converts RPC program numbers into universal addresses
+PKG_DESCR:= converts rpc program numbers into universal addresses
PKG_SECTION:= net/misc
PKG_DEPENDS:= libtirpc
PKG_BUILDDEP:= libtirpc
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index 39a4d3b..9e5e8ba 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= rrdcollect
PKG_VERSION:= 0.2.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 138e21fc9f2de0b8b6c89f1506394ef8
-PKG_DESCR:= Round-Robin Database (RRD) collecting daemon
-PKG_SECTION:= admin
+PKG_DESCR:= round-robin database collecting daemon
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= librrd
PKG_BUILDDEP:= rrdtool
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rrdcollect/}
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index d48025c..87291ae 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= rrdtool
PKG_VERSION:= 1.4.8
PKG_RELEASE:= 3
PKG_MD5SUM:= dbe59386db97fd2f2216729facd74ca8
-PKG_DESCR:= Round Robin Database (RRD) management library
-PKG_SECTION:= libs
+PKG_DESCR:= round robin database management library
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libart libfreetype libpng zlib
PKG_DEPENDS+= glib cairo pango
PKG_BUILDDEP:= libxml2 cgilib freetype libart libpng
@@ -23,9 +23,9 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_ARCH_DEPENDS:= !m68k
PKG_SUBPKGS:= LIBRRD RRDCGI RRDTOOL
-PKGSC_RRDCGI:= misc
+PKGSC_RRDCGI:= sys/misc
PKGSD_RRDCGI:= RRD CGI
-PKGSC_RRDTOOL:= misc
+PKGSC_RRDTOOL:= sys/misc
PKGSD_RRDTOOL:= RRD tool
ifeq ($(ADK_STATIC),y)
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index f7c2ff8..197840f 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -20,11 +20,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,RSYNC,rsync,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_STATIC),y)
-TARGET_CFLAGS+= -static
-TARGET_LDFLAGS+= -static
-endif
-
rsync-install:
${INSTALL_DIR} ${IDIR_RSYNC}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/rsync ${IDIR_RSYNC}/usr/bin
diff --git a/package/rt61-firmware/Makefile b/package/rt61-firmware/Makefile
index 21bc8c8..88f3bb6 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:= wifi
+PKG_SECTION:= sys/firmware
PKG_SITES:= http://www.openadk.org/distfiles/
DISTFILES:= RT61_Firmware_V1.2.zip
diff --git a/package/rtmpdump/Makefile b/package/rtmpdump/Makefile
index 3b70a42..6c111c1 100644
--- a/package/rtmpdump/Makefile
+++ b/package/rtmpdump/Makefile
@@ -7,10 +7,10 @@ PKG_NAME:= rtmpdump
PKG_VERSION:= 2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 61509a2ae8987691f1fa28175461be96
-PKG_DESCR:= toolkit for RTMP streams
+PKG_DESCR:= toolkit for rtmp streams
PKG_DEPENDS:= librtmp zlib libopenssl
PKG_BUILDDEP:= openssl zlib
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/video
PKG_URL:= http://rtmpdump.mplayerhq.hu/
PKG_SITES:= http://www.openadk.org/distfiles
PKG_LIBNAME:= librtmp
@@ -19,8 +19,8 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= RTMPDUMP LIBRTMP
-PKGSD_LIBRTMP:= library for RTMP streams
-PKGSC_LIBRTMP:= libs
+PKGSD_LIBRTMP:= library for rtmp streams
+PKGSC_LIBRTMP:= libs/video
include $(TOPDIR)/mk/package.mk
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index 0b43597..0148dde 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 72c3e9ab859bda7cc8aa96c0b508b09f
PKG_DESCR:= console torrent application
-PKG_SECTION:= p2p
+PKG_SECTION:= app/p2p
PKG_DEPENDS:= libncurses libtorrent libcurl libstdcxx
PKG_BUILDDEP:= autotool ncurses libtorrent curl
PKG_URL:= http://libtorrent.rakshasa.no/
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index 304d1c8..c96ec70 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ruby-ldap
PKG_VERSION:= 0.9.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 83240451aa43de447d48035dc2d10dee
-PKG_DESCR:= ruby LDAP extension
-PKG_SECTION:= lang
+PKG_DESCR:= ruby ldap extension
+PKG_SECTION:= dev/lang
PKG_DEPENDS:= ruby libopenldap
PKG_BUILDDEP:= ruby openldap
PKG_URL:= http://ruby-ldap.sourceforge.net/
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 7b1746e..12bffe9 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= ruby
PKG_VERSION:= 2.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= e57fdbb8ed56e70c43f39c79da1654b2
-PKG_DESCR:= interpreter for the ruby language
-PKG_SECTION:= lang
+PKG_DESCR:= ruby scripting language
+PKG_SECTION:= dev/lang
PKG_DEPENDS:= librt libpthread
PKG_BUILDDEP:= ruby-host
HOST_BUILDDEP:= readline-host
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index e6cd524..3eddebc 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= rxvt-unicode
PKG_VERSION:= 9.19
PKG_RELEASE:= 1
PKG_MD5SUM:= 45ad197eb9b5a840c0f65e3a8131921c
-PKG_DESCR:= x-term with unicode support
+PKG_DESCR:= terminal emulator with unicode support
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libx11 fontconfig libxft libxml2 gdk-pixbuf libstdcxx
PKG_BUILDDEP:= libX11 fontconfig libXft libxml2 gdk-pixbuf
diff --git a/package/samba/Makefile b/package/samba/Makefile
index d6c82d2..d705ec8 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= samba
PKG_VERSION:= 3.6.23
PKG_RELEASE:= 6
PKG_MD5SUM:= 2f7aee1dc5d31aefcb364600915b31dc
-PKG_DESCR:= NetBIOS/SMB file and print server
+PKG_DESCR:= smb file and print server
PKG_SECTION:= net/fs
PKG_BUILDDEP:= gettext-tiny util-linux popt
PKG_DEPENDS:= samba-lib libuuid libpopt
@@ -19,16 +19,17 @@ PKG_CFLINE_SAMBA:= select ADK_KERNEL_INOTIFY_USER
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= SAMBA SAMBA_CLIENT SAMBA_PASSWD SAMBA_LIB
-PKGSD_SAMBA_CLIENT:= NetBIOS/SMB client
+PKGSD_SAMBA_CLIENT:= smb client
PKGSS_SAMBA_CLIENT:= libreadline samba-lib
-PKGSD_SAMBA_PASSWD:= SMB password utility
-PKGSD_SAMBA_LIB:= SMB libraries
+PKGSD_SAMBA_PASSWD:= smb password utility
+PKGSD_SAMBA_LIB:= smb libraries
+PKGSC_SAMBA_LIB:= libs/net
PKG_FLAVOURS_SAMBA:= WITH_WINBIND WITH_LDAP
PKGFD_WITH_WINBIND:= enable winbind support
PKGFS_WITH_WINBIND:= libkrb5
PKGFB_WITH_WINBIND:= krb5
-PKGFD_WITH_LDAP:= enable LDAP support
+PKGFD_WITH_LDAP:= enable ldap support
PKGFS_WITH_LDAP:= libopenldap
PKGFB_WITH_LDAP:= openldap
@@ -39,7 +40,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SAMBA_CLIENT},${PKG_SECTION}))
$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SAMBA_PASSWD},${PKG_SECTION}))
-$(eval $(call PKG_template,SAMBA_LIB,samba-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SAMBA_LIB},${PKG_SECTION}))
+$(eval $(call PKG_template,SAMBA_LIB,samba-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SAMBA_LIB},${PKGSC_SAMBA_LIB}))
ifneq ($(ADK_PACKAGE_SAMBA_WITH_WINBIND),)
CONFIGURE_ARGS+= --with-winbind \
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index 5d54f26..acaf4e9 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.22
PKG_RELEASE:= 3
PKG_MD5SUM:= fadf56a60f4776bfb24491f66b617cf5
PKG_DESCR:= scanner access now easy
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= libpthread libusb libusb-compat
PKG_URL:= http://www.sane-project.org/
diff --git a/package/scons/Makefile b/package/scons/Makefile
index 8eab3c6..74ff9c8 100644
--- a/package/scons/Makefile
+++ b/package/scons/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= scons
PKG_VERSION:= 2.3.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 083ce5624d6adcbdaf2526623f456ca9
-PKG_DESCR:= a software construction tool
-PKG_SECTION:= lang
+PKG_DESCR:= software construction tool
+PKG_SECTION:= dev/tools
HOST_BUILDDEP:= python2-host
PKG_URL:= http://www.scons.org
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=scons/}
diff --git a/package/screen/Makefile b/package/screen/Makefile
index 8713239..8a34a3f 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 419a0594e2b25039239af8b90eda7d92
PKG_DESCR:= window manager for the terminal session
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_DEPENDS:= libncurses libelf
PKG_BUILDDEP:= ncurses libelf
PKG_URL:= http://www.gnu.org/software/screen/
diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile
index ca0d534..4f3566b 100644
--- a/package/scrnsaverproto/Makefile
+++ b/package/scrnsaverproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= scrnsaverproto
PKG_VERSION:= 1.2.2
PKG_RELEASE:= 1
-PKG_DESCR:= X11 screensaver headers
-PKG_SECTION:= devel
+PKG_DESCR:= screensaver headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 21704f1bad472d94abd22fea5704bb48
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile
index 6ea1f43..667dc67 100644
--- a/package/scsi-spin/Makefile
+++ b/package/scsi-spin/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= scsi-spin
PKG_VERSION:= 1.0
PKG_RELEASE:= 2
PKG_MD5SUM:= d0c32bfc500e94cc1905d9457a99cdbb
-PKG_DESCR:= Utility to spin down scsi disks
-PKG_SECTION:= misc
+PKG_DESCR:= utility to spin down scsi disks
+PKG_SECTION:= sys/fs
NO_DISTFILES:= 1
@@ -20,8 +20,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-o ${WRKBUILD}/scsi-spin ${WRKBUILD}/scsi-spin.c
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index b3e7a9a..66ae093 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.10
PKG_RELEASE:= 2
PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628
PKG_DESCR:= simple directmedia layer image library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/image
PKG_DEPENDS:= libpng libtiff libjpeg-turbo libsdl libstdcxx
PKG_BUILDDEP:= libpng libtiff libjpeg-turbo sdl
PKG_URL:= http://www.libsdl.org/
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index 7510c02..184ae02 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= sdl
PKG_VERSION:= 1.2.14
PKG_RELEASE:= 3
PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4
-PKG_DESCR:= Simple DirectMedia Layer
-PKG_SECTION:= libs
+PKG_DESCR:= simple directmedia layer
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libusb alsa-lib libpthread libx11 libxext
PKG_BUILDDEP:= sdl-host libusb alsa-lib libX11 libXext
PKG_URL:= http://www.libsdl.org/
diff --git a/package/section.lst b/package/section.lst
index 2238cac..b5f4c6e 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -1,46 +1,59 @@
-boot Boot Loaders
-base Base System and Libraries
-core Basic System commands
-browser Browser / Editor / Pager
-editor Browser / Editor / Pager
-pager Browser / Editor / Pager
-chat IRC / ICQ / JABBER
-comp Computing
-archive Compression and Archivers
-crypto Cryptography
-debug Debugging / Analyzing
-dns DNS / DHCP
-dhcp DNS / DHCP
-firewall Firewall / Routing / Bridging
-route Firewall / Routing / Bridging
-bridge Firewall / Routing / Bridging
-fs Filesystem / Blockdevice utilities
-ipv6 IPv6
-lang Programming / Languages
-libs Libraries
-mail Mail
-misc Misc
-multimedia Multimedia / Audio / Video
-net Networking
-net/fs Network Filesystems
+base/boot Boot Loaders
+base/libs Base Libraries
+base/apps Base System
+base/misc Base Misc
+base/shells Shells
+sys/fs Filesystem / Blockdevice Utilities
+sys/misc System Misc
+sys/serial Serial communications & terminal emulation
+sys/utils System Utilities
+sys/firmware Firmware for Network Devices
+app/archive Compression and Archivers
+app/browser Browser
+app/chat Chat
+app/crypto Cryptography
+app/debug Debugging and Analyzing
+app/editor Editor and Pager
+app/p2p P2P
+net/acct IP Accounting
+net/dns DNS and DHCP
+net/debug Network Analyzing
+net/firewall Firewall
+net/fs Network Filesystems
+net/http HTTP and FTP
+net/ipv6 IPv6
+net/mail Mail
net/misc Networking Misc
+net/ntp NTP
+net/perf Networking Performance
+net/ppp PPP / PPPoE / PPTP
+net/proxy Proxy
+net/radius Radius
+net/route Routing and Bridging
net/security Network Security
-ntp NTP
-p2p P2P
-phone Telephony
-ppp PPP / PPTP / RADIUS
-proxy Proxy
-scm SCM
-serial Serial communications & terminal emulation
-shells Shells
-admin System Administration
-utils Utilities
-www HTTP / FTP
-wifi Wireless
-x11/apps X applications
-x11/drivers X drivers
-x11/server X server
-x11/libs X libraries
-x11/misc X misc
-x11/fonts X fonts
-devel Development (see GCC package)
+net/voip Voice-over-IP
+net/wifi Wireless
+mm/audio Audio
+mm/image Image
+mm/video Video
+x11/apps Xorg applications
+x11/utils Xorg utilities
+x11/drivers Xorg server and drivers
+x11/misc Xorg misc
+x11/fonts Xorg fonts
+x11/libs Xorg libraries
+libs/audio Audio Libraries
+libs/crypto Crypto Libraries
+libs/data XML and JSON Libraries
+libs/db Database Libraries
+libs/fonts Font Libraries
+libs/image Image Libraries
+libs/misc Misc Libraries
+libs/net Networking Libraries
+libs/video Video Libraries
+dev/lang Programming Languages
+dev/perl Perl modules
+dev/python Python modules
+dev/scm Souce Code Management
+dev/tools Programming Tools
+dev/header Header files
diff --git a/package/sed/Makefile b/package/sed/Makefile
index 95e1706..a983519 100644
--- a/package/sed/Makefile
+++ b/package/sed/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.2.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 4111de4faa3b9848a0686b2f260c5056
PKG_DESCR:= stream editor
-PKG_SECTION:= editor
+PKG_SECTION:= app/editor
PKG_URL:= http://www.gnu.org/software/sed/
PKG_SITES:= ${MASTER_SITE_GNU:=sed/}
PKG_BB:= 1
diff --git a/package/ser2net/Makefile b/package/ser2net/Makefile
index 0769022..16ad156 100644
--- a/package/ser2net/Makefile
+++ b/package/ser2net/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 5f83a3e8aec18331cb61069dccdfba47
PKG_DESCR:= allowing network connections to serial ports
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ser2net/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index 07f83db..f7374d9 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= serdisplib
PKG_VERSION:= 1.97.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 2aa91c43d01d2dfc9fbc1116e3063ae1
-PKG_DESCR:= display drivers (serial, parallel, USB)
-PKG_SECTION:= serial
+PKG_DESCR:= display drivers (serial, parallel, usb)
+PKG_SECTION:= sys/serial
PKG_DEPENDS:= libusb-compat
PKG_BUILDDEP:= libgd libusb-compat
PKG_URL:= http://serdisplib.sourceforge.net
diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile
index becb813..2e75720 100644
--- a/package/setpwc/Makefile
+++ b/package/setpwc/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= setpwc
PKG_VERSION:= 1.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 79d5ee468c0076feb3cac473bef661d2
-PKG_DESCR:= Philips (and compatibles) WebCams (PWC) control utility
-PKG_SECTION:= multimedia
+PKG_DESCR:= philips webcam control utility
+PKG_SECTION:= sys/misc
PKG_URL:= http://www.vanheusden.com/setpwc/
PKG_SITES:= http://www.vanheusden.com/setpwc/
@@ -23,7 +23,6 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
TARGET_CPPFLAGS+= -DVERSION=\"${PKG_VERSION}\"
-TARGET_CFLAGS+= -Wall
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index 74e76b1..ba309ef 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:= serial
+PKG_SECTION:= sys/serial
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=setserial/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/setxkbmap/Makefile b/package/setxkbmap/Makefile
index 71c6faf..0ede9cf 100644
--- a/package/setxkbmap/Makefile
+++ b/package/setxkbmap/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 57380d069021c6b7d873bfab803e3105
PKG_DESCR:= set keyboard utility
-PKG_SECTION:= x11/apps
+PKG_SECTION:= x11/utils
PKG_DEPENDS:= libxkbfile
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
index 8d2dc52..72742a3 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:= firewall
+PKG_SECTION:= net/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 96c9fbc..3486aa4 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:= firewall
+PKG_SECTION:= net/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 6375cb2..1c7e81d 100644
--- a/package/siproxd/Makefile
+++ b/package/siproxd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= siproxd
PKG_VERSION:= 0.8.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 1a6f9d13aeb2d650375c9a346ac6cbaf
-PKG_DESCR:= SIP (Session Initiation Protocol) proxy
-PKG_SECTION:= proxy
+PKG_DESCR:= session initiation protocol proxy
+PKG_SECTION:= net/voip
PKG_DEPENDS:= libosip2 libpthread
PKG_BUILDDEP:= autotool libosip2
PKG_URL:= http://siproxd.sourceforge.net
diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile
index d1bd322..61d5675 100644
--- a/package/sipsak/Makefile
+++ b/package/sipsak/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= sipsak
PKG_VERSION:= 0.9.6
PKG_RELEASE:= 2
PKG_MD5SUM:= c4eb8e282902e75f4f040f09ea9d99d5
-PKG_DESCR:= a SIP stress and diagnostics utility
-PKG_SECTION:= net
+PKG_DESCR:= sip stress and diagnostics utility
+PKG_SECTION:= net/voip
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP:= openssl
PKG_URL:= http://sipsak.org/
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index 5a12565..3899f4d 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:= utils
+PKG_SECTION:= sys/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 cfd2a8f..6ad6f33 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= snort
PKG_VERSION:= 2.9.5
PKG_RELEASE:= 1
PKG_MD5SUM:= f5fc0e176afca5989d47509478758fc7
-PKG_DESCR:= flexible Network Intrusion Detection System (NIDS)
+PKG_DESCR:= flexible network intrusion detection system
PKG_SECTION:= net/security
PKG_DEPENDS:= libnet libpcap libpcre libtirpc daq
PKG_BUILDDEP:= libnet libpcap pcre libtirpc daq
diff --git a/package/socat/Makefile b/package/socat/Makefile
index 96a9592..51e3b35 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= socat
PKG_VERSION:= 1.7.2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 2a15dc3362f49d543abdbacc267d0a41
-PKG_DESCR:= A multipurpose relay (SOcket CAT)
+PKG_DESCR:= multipurpose relay
PKG_SECTION:= net/misc
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.dest-unreach.org/socat/
diff --git a/package/sox/Makefile b/package/sox/Makefile
index 9a41f1e..debfcee 100644
--- a/package/sox/Makefile
+++ b/package/sox/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 14.4.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 670307f40763490a2bc0d1f322071e7a
PKG_DESCR:= swiss army knife of sound processing programs
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/audio
PKG_BUILDDEP:= zlib libmad lame alsa-lib libid3tag
PKG_DEPENDS:= zlib libmad liblame alsa-lib libid3tag
PKG_URL:= http://sox.sourceforge.net/
diff --git a/package/speex/Makefile b/package/speex/Makefile
index e4f3176..b561e14 100644
--- a/package/speex/Makefile
+++ b/package/speex/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2rc1
PKG_RELEASE:= 3
PKG_MD5SUM:= c4438b22c08e5811ff10e2b06ee9b9ae
PKG_DESCR:= open source patent-free speech compression codec
-PKG_SECTION:= libs
+PKG_SECTION:= libs/audio
PKG_BUILDDEP:= autotool
PKG_URL:= http://speex.org/
PKG_SITES:= http://downloads.us.xiph.org/releases/speex/
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index f04bcff..37deed9 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= sqlite
PKG_VERSION:= 3.8.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 6d6cc639a4da04fbbdda7b1a1a01b386
-PKG_DESCR:= embeddable SQL database cli
-PKG_SECTION:= misc
+PKG_DESCR:= embeddable sql database cli
+PKG_SECTION:= sys/misc
PKG_BUILDDEP:= ncurses readline
PKG_URL:= http://www.sqlite.org/
PKG_SITES:= http://www.sqlite.org/2013/
@@ -19,8 +19,8 @@ DISTFILES:= sqlite-autoconf-3080002.tar.gz
WRKDIST= ${WRKDIR}/sqlite-autoconf-3080002
PKG_SUBPKGS:= SQLITE_CLI LIBSQLITE
-PKGSD_LIBSQLITE:= sqlite library
-PKGSC_LIBSQLITE:= libs
+PKGSD_LIBSQLITE:= emeddable sql library
+PKGSC_LIBSQLITE:= libs/db
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
diff --git a/package/squashfs/Makefile b/package/squashfs/Makefile
index 8478f6c..66dcf3d 100644
--- a/package/squashfs/Makefile
+++ b/package/squashfs/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 1b7a781fb4cf8938842279bd3e8ee852
PKG_DESCR:= squashfs filesystem utilities
HOST_BUILDDEP:= xz-host
-PKG_SECTION:= fs
+PKG_SECTION:= sys/fs
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=squashfs/}
DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz
diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile
index 31e4fc3..5c3de10 100644
--- a/package/squeezelite/Makefile
+++ b/package/squeezelite/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5
PKG_RELEASE:= 3
PKG_MD5SUM:= 7605af4d64291495645f88575a564475
PKG_DESCR:= headless squeezebox emulator
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/audio
PKG_DEPENDS:= libflac alsa-lib libvorbis libmad
PKG_DEPENDS+= libpthread librt libfaad2
PKG_BUILDDEP:= alsa-lib libmad flac libvorbis mpg123
diff --git a/package/squid/Makefile b/package/squid/Makefile
index c6be547..502f3bd 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.4.5
PKG_RELEASE:= 1
PKG_MD5SUM:= a831efb36cfbaa419f8dc7a43cba72c9
PKG_DESCR:= web and cache proxy
-PKG_SECTION:= proxy
+PKG_SECTION:= net/proxy
PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl
PKG_BUILDDEP:= autotool openssl libtool
PKG_URL:= http://www.squid-cache.org/
diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index d0bf0eb..1ce4e39 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:= socks 4/5 proxy server
-PKG_SECTION:= proxy
+PKG_SECTION:= net/proxy
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index e3d66b5..c7ad1b4 100644
--- a/package/ssltunnel/Makefile
+++ b/package/ssltunnel/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= ssltunnel
PKG_VERSION:= 1.16
PKG_RELEASE:= 1
PKG_MD5SUM:= 4039b50566a33a4077883ea974e476d5
-PKG_DESCR:= PPP over SSL vpn tool
+PKG_DESCR:= ppp over ssl vpn tool
PKG_SECTION:= net/security
PKG_DEPENDS:= libopenssl ppp
PKG_BUILDDEP:= openssl ppp
diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile
index 1e9b00c..09b902c 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:= minimal and secure mail sender
-PKG_SECTION:= mail
+PKG_SECTION:= net/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 fac6fc3..0597dc2 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -8,16 +8,13 @@ PKG_VERSION:= 4.8
PKG_RELEASE:= 8
PKG_MD5SUM:= c575ef43829586801f514fd91bfe7575
PKG_DESCR:= system call trace program
-PKG_SECTION:= debug
+PKG_SECTION:= app/debug
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/}
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_STATIC),y)
-TARGET_CFLAGS+= -static
-endif
ifeq ($(ADK_TARGET_LIB_MUSL),y)
TARGET_CPPFLAGS+= -DMSG_EXCEPT=020000 -D_LARGEFILE64_SOURCE=1
ifeq ($(ADK_LINUX_PPC),y)
diff --git a/package/stress/Makefile b/package/stress/Makefile
index 8bbd341..3218d3b 100644
--- a/package/stress/Makefile
+++ b/package/stress/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.0
PKG_RELEASE:= 1
PKG_MD5SUM:= d693ff044ac7d34f8aaea202cd96f679
PKG_DESCR:= simple tool that imposes certain types of compute stress
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_SITES:= http://weather.ou.edu/~apw/projects/stress/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index 996bddd..9355f6b 100644
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= strongswan
PKG_VERSION:= 5.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f624ab041c306af0f5f57c927e9ea2e4
-PKG_DESCR:= IPsec software
+PKG_DESCR:= ipsec software
PKG_SECTION:= net/security
PKG_DEPENDS:= ip libpthread
PKG_URL:= http://strongswan.org/index.htm
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 34f6f11..82e7522 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.8
PKG_RELEASE:= 3
PKG_MD5SUM:= 17fe81c30fe0f785b2100ebadb3dc580
PKG_DESCR:= revision control program
-PKG_SECTION:= scm
+PKG_SECTION:= dev/scm
PKG_DEPENDS:= zlib apr apr-util libexpat libsqlite neon
PKG_BUILDDEP:= apr-util expat apr zlib libiconv-tiny sqlite neon
PKG_URL:= http://subversion.apache.org/
diff --git a/package/sudo/Makefile b/package/sudo/Makefile
index 58e0059..078566a 100644
--- a/package/sudo/Makefile
+++ b/package/sudo/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.8.10
PKG_RELEASE:= 2
PKG_MD5SUM:= 954d64906c3f6e2436f33445a049c58b
PKG_DESCR:= su do
-PKG_SECTION:= admin
+PKG_SECTION:= sys/misc
PKG_URL:= http://www.courtesan.com/sudo/
PKG_SITES:= http://www.courtesan.com/sudo/dist/
diff --git a/package/swig/Makefile b/package/swig/Makefile
index e70b202..e938160 100644
--- a/package/swig/Makefile
+++ b/package/swig/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.11
PKG_RELEASE:= 2
PKG_MD5SUM:= 291ba57c0acd218da0b0916c280dcbae
PKG_DESCR:= swig utility
-PKG_SECTION:= lang
+PKG_SECTION:= dev/tools
PKG_URL:= http://www.swig.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=swig/}
diff --git a/package/sysfsutils/Makefile b/package/sysfsutils/Makefile
index 4333fc3..dbf4d9d 100644
--- a/package/sysfsutils/Makefile
+++ b/package/sysfsutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.0
PKG_RELEASE:= 3
PKG_MD5SUM:= 14e7dcd0436d2f49aa403f67e1ef7ddc
PKG_DESCR:= utilites built upon sysfs
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_URL:= http://linux-diag.sourceforge.net/Sysfsutils.html
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-diag/sysfsutils/2.1.0/}
PKG_OPTS:= dev
diff --git a/package/syslinux/Makefile b/package/syslinux/Makefile
index aca0909..c0d4391 100644
--- a/package/syslinux/Makefile
+++ b/package/syslinux/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 6.02
PKG_RELEASE:= 1
PKG_MD5SUM:= 6f275813a1b08cf852e55c0a3f8fbc78
PKG_DESCR:= lightweight bootloaders
-PKG_SECTION:= boot
+PKG_SECTION:= base/boot
HOST_BUILDDEP:= nasm-host
PKG_URL:= http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
PKG_SITES:= http://www.kernel.org/pub/linux/utils/boot/syslinux/
diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile
index 8b05dcd..307068d 100644
--- a/package/syslog-ng/Makefile
+++ b/package/syslog-ng/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.5.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= ff3bf223ebafbaa92b69a2d5b729f368
PKG_DESCR:= powerful syslog daemon
-PKG_SECTION:= admin
+PKG_SECTION:= sys/misc
PKG_BUILDDEP:= eventlog
PKG_DEPENDS:= eventlog
PKG_URL:= http://www.balabit.com/
diff --git a/package/sysstat/Makefile b/package/sysstat/Makefile
index ad751e5..b1325ab 100644
--- a/package/sysstat/Makefile
+++ b/package/sysstat/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 7.0.3
PKG_RELEASE:= 3
PKG_MD5SUM:= 732904b006a0224b0a9ce4d312946277
PKG_DESCR:= utilities for system monitoring and performance analysis
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_SITES:= http://perso.orange.fr/sebastien.godard/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/taglib/Makefile b/package/taglib/Makefile
index 296d15c..ed0ac20 100644
--- a/package/taglib/Makefile
+++ b/package/taglib/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.9.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 0d35df96822bbd564c5504cb3c2e4d86
PKG_DESCR:= audio meta-data library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/audio
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= cmake-host zlib
PKG_URL:= http://taglib.github.com/
diff --git a/package/tar/Makefile b/package/tar/Makefile
index e63257f..8a12d12 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.26
PKG_RELEASE:= 1
PKG_MD5SUM:= 0ced6f20b9fa1bea588005b5ad4b52c1
PKG_DESCR:= archiving application
-PKG_SECTION:= archive
+PKG_SECTION:= app/archive
PKG_URL:= http://mirrors.kernel.org/gnu/tar/
PKG_SITES:= http://mirrors.kernel.org/gnu/tar/
PKG_BB:= 1
diff --git a/package/tcl/Makefile b/package/tcl/Makefile
index 9a01a29..65b6687 100644
--- a/package/tcl/Makefile
+++ b/package/tcl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= tcl
PKG_VERSION:= 8.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= aae4b701ee527c6e4e1a6f9c7399882e
-PKG_DESCR:= TCL scripting language
-PKG_SECTION:= lang
+PKG_DESCR:= tcl scripting language
+PKG_SECTION:= dev/lang
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tcl/}
DISTFILES:= tcl${PKG_VERSION}-src.tar.gz
diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile
index e4b570f..b28acf6 100644
--- a/package/tcp_wrappers/Makefile
+++ b/package/tcp_wrappers/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= tcp_wrappers
PKG_VERSION:= 7.6
PKG_RELEASE:= 2
PKG_MD5SUM:= e6fa25f71226d090f34de3f6b122fb5a
-PKG_DESCR:= IP based access control
-PKG_SECTION:= libs
+PKG_DESCR:= ip based access control
+PKG_SECTION:= libs/misc
PKG_URL:= ftp://ftp.porcupine.org/pub/security/index.html
PKG_SITES:= ftp://ftp.porcupine.org/pub/security/
PKG_NOPARALLEL:= 1
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile
index 4cef561..b010a52 100644
--- a/package/tcpdump/Makefile
+++ b/package/tcpdump/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.5.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 973a2513d0076e34aa9da7e15ed98e1b
PKG_DESCR:= tool for network monitoring and data acquisition
-PKG_SECTION:= net
+PKG_SECTION:= net/debug
PKG_DEPENDS:= libpcap
PKG_BUILDDEP:= libpcap
PKG_URL:= http://www.tcpdump.org/
diff --git a/package/tcsh/Makefile b/package/tcsh/Makefile
index 978f57e..ea36422 100644
--- a/package/tcsh/Makefile
+++ b/package/tcsh/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 6.18.01
PKG_RELEASE:= 3
PKG_MD5SUM:= 6eed09dbd4223ab5b6955378450d228a
PKG_DESCR:= alternative csh
-PKG_SECTION:= shells
+PKG_SECTION:= base/shells
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://www.tcsh.org/Welcome
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index 0579435..62ae2d0 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= tinc
PKG_VERSION:= 1.0.23
PKG_RELEASE:= 1
PKG_MD5SUM:= 762c0d47bdf1b33a40b19165d9c2761f
-PKG_DESCR:= VPN tunnel daemon
+PKG_DESCR:= vpn tunnel daemon
PKG_SECTION:= net/security
PKG_DEPENDS:= zlib liblzo libopenssl
PKG_BUILDDEP:= zlib liblzo openssl
diff --git a/package/tinycdb/Makefile b/package/tinycdb/Makefile
index e6bccf5..e487d1b 100644
--- a/package/tinycdb/Makefile
+++ b/package/tinycdb/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= tinycdb
PKG_VERSION:= 0.77
PKG_RELEASE:= 1
PKG_MD5SUM:= c00e5fb96c30356ac3b67b2ab5d5641b
-PKG_DESCR:= CDB implementation
-PKG_SECTION:= libs
+PKG_DESCR:= creating and reading constant data bases
+PKG_SECTION:= libs/db
PKG_URL:= http://www.corpit.ru/mjt/tinycdb/
PKG_SITES:= http://www.corpit.ru/mjt/tinycdb/
PKG_OPTS:= dev devonly
diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile
index 612d60c..33a6150 100644
--- a/package/tinyproxy/Makefile
+++ b/package/tinyproxy/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:= tinyproxy
PKG_VERSION:= 1.8.3
PKG_RELEASE:= 2
PKG_MD5SUM:= eca927f7f6a9ce8394b2b256361978a7
-PKG_DESCR:= lightweight HTTP and HTTPS proxy
+PKG_DESCR:= lightweight http and https proxy
PKG_BUILDDEP:= autotool
-PKG_SECTION:= proxy
+PKG_SECTION:= net/proxy
PKG_URL:= https://www.banu.com/tinyproxy/
PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.8/
diff --git a/package/tinyxml/Makefile b/package/tinyxml/Makefile
index 568cc10..372b2ba 100644
--- a/package/tinyxml/Makefile
+++ b/package/tinyxml/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= tinyxml
PKG_VERSION:= 2.6.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 2a0aaf609c9e670ec9748cd01ed52dae
-PKG_DESCR:= a simple, small, minimal, C++ XML parser
-PKG_SECTION:= libs
+PKG_DESCR:= simple, small, minimal, c++ xml parser
+PKG_SECTION:= libs/data
PKG_URL:= http://sourceforge.net/projects/tinyxml/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tinyxml/}
PKG_OPTS:= dev
diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile
index 3c360f5..6466c5b 100644
--- a/package/tmsnc/Makefile
+++ b/package/tmsnc/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= tmsnc
PKG_VERSION:= 0.3.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 337dae91d4775e03b6681f61db56d2a7
-PKG_DESCR:= textbased MSN client
-PKG_SECTION:= chat
+PKG_DESCR:= textbased msn client
+PKG_SECTION:= app/chat
PKG_URL:= http://tmsnc.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tmsnc/}
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 6e44f7c..9be1843 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= tntnet
PKG_VERSION:= 2.2.1
PKG_RELEASE:= 2
PKG_MD5SUM:= febe799675c1b8b2f7259bad30cf6f23
-PKG_DESCR:= small C++ application server
-PKG_SECTION:= www
+PKG_DESCR:= small c++ application server
+PKG_SECTION:= net/http
PKG_DEPENDS:= cxxtools zlib libpthread libstdcxx
PKG_BUILDDEP:= cxxtools zlib
PKG_URL:= http://www.tntnet.org/
diff --git a/package/tor/Makefile b/package/tor/Makefile
index 7c57f05..637690c 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.4.21
PKG_RELEASE:= 1
PKG_MD5SUM:= bde981d10e8faf1e171ef1ebbb7b398a
PKG_DESCR:= anonymous internet communication system
-PKG_SECTION:= proxy
+PKG_SECTION:= net/proxy
PKG_DEPENDS:= libevent libopenssl zlib libpthread
PKG_BUILDDEP:= libevent openssl zlib
PKG_URL:= https://www.torproject.org/
@@ -31,7 +31,11 @@ CONFIGURE_ENV+= ac_cv_libevent_normal=yes \
tor_cv_null_is_zero=yes \
tor_cv_unaligned_ok=yes
+ifeq ($(ADK_TARGET_USE_SSP),y)
+CONFIGURE_ARGS+= --enable-gcc-hardening
+else
CONFIGURE_ARGS+= --disable-gcc-hardening
+endif
tor-install:
${INSTALL_DIR} ${IDIR_TOR}/usr/bin ${IDIR_TOR}/etc/tor
diff --git a/package/totd/Makefile b/package/totd/Makefile
index 9e2e813..93aa466 100644
--- a/package/totd/Makefile
+++ b/package/totd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= totd
PKG_VERSION:= 1.5.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 7edaedae9f6aca5912dd6c123582cf08
-PKG_DESCR:= Trick or Treat Daemon (a simple DNS-ALG for NAT-PT)
-PKG_SECTION:= dns
+PKG_DESCR:= trick or treat daemon
+PKG_SECTION:= net/dns
PKG_URL:= http://www.dillema.net/software/totd.html
PKG_SITES:= http://www.dillema.net/software/totd/
diff --git a/package/tptest/Makefile b/package/tptest/Makefile
index aa9d1a1..ee4d2e3 100644
--- a/package/tptest/Makefile
+++ b/package/tptest/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 46f941bdab738a2a11ecc2a5f757ec77
PKG_DESCR:= internet bandwidth tester
-PKG_SECTION:= net
+PKG_SECTION:= net/perf
PKG_URL:= http://tptest.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tptest/}
diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile
index 640a7da..62b72a2 100644
--- a/package/traceroute/Makefile
+++ b/package/traceroute/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= traceroute
PKG_VERSION:= 2.0.19
PKG_RELEASE:= 1
PKG_MD5SUM:= dd15d563993020d088ba02e8f987deaf
-PKG_DESCR:= Utility to trace the route of IP packets
-PKG_SECTION:= net
+PKG_DESCR:= utility to trace the route of ip packets
+PKG_SECTION:= net/debug
PKG_URL:= http://traceroute.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=traceroute/}
diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile
index 3af1357..e8fb56a 100644
--- a/package/trafshow/Makefile
+++ b/package/trafshow/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.2.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 0b2f0bb23b7832138b7d841437b9e182
PKG_DESCR:= traffic analyzing tool
-PKG_SECTION:= net
+PKG_SECTION:= net/perf
PKG_BUILDDEP:= libpcap ncurses
PKG_DEPENDS:= libpcap libncurses libpthread
PKG_SITES:= http://openadk.org/distfiles
diff --git a/package/transproxy/Makefile b/package/transproxy/Makefile
index 2db965c..858e927 100644
--- a/package/transproxy/Makefile
+++ b/package/transproxy/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= transproxy
PKG_VERSION:= 1.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 02cc1160a9db9c49a40491f890083044
-PKG_DESCR:= transparent HTTP proxy
-PKG_SECTION:= proxy
+PKG_DESCR:= transparent http proxy
+PKG_SECTION:= net/proxy
PKG_DEPENDS:= iptables
PKG_URL:= http://sourceforge.net/projects/transproxy/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=transproxy/1.6/}
diff --git a/package/tslib/Makefile b/package/tslib/Makefile
index d9f0df2..f1cbff1 100644
--- a/package/tslib/Makefile
+++ b/package/tslib/Makefile
@@ -9,7 +9,7 @@ PKG_VERSION:= 1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 9563faf5cf9f111538b4f45778e7bb24
PKG_DESCR:= touchscreen library
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= libstdcxx
PKG_BUILDDEP:= autotool
PKG_URL:= http://tslib.berlios.de/
diff --git a/package/ttcp/Makefile b/package/ttcp/Makefile
index b091595..c8a82e4 100644
--- a/package/ttcp/Makefile
+++ b/package/ttcp/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ttcp
PKG_VERSION:= 3.8
PKG_RELEASE:= 1
-PKG_DESCR:= A small utility to test TCP connection performance
-PKG_SECTION:= net
+PKG_DESCR:= small utility to test tcp connection performance
+PKG_SECTION:= net/perf
NO_DISTFILES:= 1
@@ -19,8 +19,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-o ${WRKBUILD}/ttcp ${WRKBUILD}/ttcp.c
diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile
index 8fd111b..01d2858 100644
--- a/package/tzdata/Makefile
+++ b/package/tzdata/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= tzdata
PKG_VERSION:= 2013d
PKG_RELEASE:= 3
PKG_MD5SUM:= 65b6818162230fc02f86f293376c73df 4616a9560270f180eeb9a08540636890
-PKG_DESCR:= Timezone data (/usr/share/zoneinfo)
-PKG_SECTION:= utils
+PKG_DESCR:= timezone data (/usr/share/zoneinfo)
+PKG_SECTION:= base/apps
PKG_URL:= http://www.iana.org/time-zones/
PKG_SITES:= http://www.iana.org/time-zones/repository/releases/
PKG_NOPARALLEL:= 1
@@ -18,16 +18,12 @@ DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode${PKG_VERSION}.ta
WRKDIST= ${WRKDIR}
# no use for tzselect, since that is a ksh-script
-PKG_SUBPKGS:= TZDATA ZDUMP ZIC DATE
-PKGSD_ZDUMP:= timezone file dumper
-PKGSD_ZIC:= timezone file compiler
+PKG_SUBPKGS:= TZDATA DATE
PKGSD_DATE:= famous date utility
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,TZDATA,tzdata,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ZDUMP,zdump,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZDUMP},${PKG_SECTION}))
-$(eval $(call PKG_template,ZIC,zic,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZIC},${PKG_SECTION}))
$(eval $(call PKG_template,DATE,date,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DATE},${PKG_SECTION}))
CONFIG_STYLE:= manual
@@ -57,14 +53,6 @@ tzdata-install:
$(IDIR_TZDATA)/etc/localtime; \
fi
-zdump-install:
- ${INSTALL_DIR} ${IDIR_ZDUMP}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/etc/zdump ${IDIR_ZDUMP}/usr/sbin/
-
-zic-install:
- ${INSTALL_DIR} ${IDIR_ZIC}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/etc/zic ${IDIR_ZIC}/usr/sbin/
-
date-install:
${INSTALL_DIR} ${IDIR_DATE}/usr/bin
${INSTALL_BIN} ${WRKINST}/bin/date ${IDIR_DATE}/usr/bin/
diff --git a/package/u-boot-imx6/Makefile b/package/u-boot-imx6/Makefile
index 032c08c..2d63305 100644
--- a/package/u-boot-imx6/Makefile
+++ b/package/u-boot-imx6/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 20140416
PKG_RELEASE:= 1
PKG_MD5SUM:= f2a5f697670c340eef8074f6a5f26476
PKG_DESCR:= bootloader for imx6 (cubox-i)
-PKG_SECTION:= boot
+PKG_SECTION:= base/boot
PKG_URL:= https://github.com/SolidRun/u-boot-imx6.git
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index 361339a..fb0858f 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2014.01
PKG_RELEASE:= 1
PKG_MD5SUM:= e531307578f6d32a7ccb1d04f1e08cbc
PKG_DESCR:= bootloader
-PKG_SECTION:= boot
+PKG_SECTION:= base/boot
PKG_URL:= http://www.denx.de/wiki/U-Boot
PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 0f00747..de0321b 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.4
PKG_RELEASE:= 3
PKG_MD5SUM:= 394c119363dd8b469fb898442a6764b8
PKG_DESCR:= standard c++ library for embedded systems
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://cxx.uclibc.org/
PKG_SITES:= http://cxx.uclibc.org/src/
PKG_NOPARALLEL:= 1
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 95c7bb9..7a76233 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk
include $(TOPDIR)/toolchain/uclibc/Makefile.inc
PKG_NAME:= uClibc
-PKG_DESCR:= embedded C library
-PKG_SECTION:= base
+PKG_DESCR:= embedded c library
+PKG_SECTION:= base/libs
PKG_OPTS:= noremove
PKG_SUBPKGS:= UCLIBC UCLIBC_DEV
diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile
index 07ee482..22d1371 100644
--- a/package/udp-broadcast-relay/Makefile
+++ b/package/udp-broadcast-relay/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= udp-broadcast-relay
PKG_VERSION:= 0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= a32f983b7063d6ac670e6b22be9b9d24
-PKG_DESCR:= listens for packets on a specified UDP broadcast port
+PKG_DESCR:= listens for packets on a specified udp broadcast port
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 463716d..e5e9241 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 7c71ec460dfea5287eba27472c521ebc
PKG_DESCR:= netfilter userspace logging daemon
-PKG_SECTION:= firewall
+PKG_SECTION:= net/firewall
PKG_DEPENDS:= iptables libnetfilter-conntrack libnetfilter-log libnetfilter-acct libmnl
PKG_BUILDDEP:= iptables libnetfilter_conntrack libnetfilter_log libnetfilter_acct libmnl
PKG_BUILDDEP+= autotool
diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile
index e10c894..58613b9 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:= update dynamic dns services
-PKG_SECTION:= dns
+PKG_SECTION:= net/dns
PKG_SITES:= http://savannah.nongnu.org/download/updatedd/
PKG_SUBPKGS:= UPDATEDD UPDATEDD_MOD_CHANGEIP UPDATEDD_MOD_DYNDNS UPDATEDD_MOD_EURODYNDNS
diff --git a/package/urlgrabber/Makefile b/package/urlgrabber/Makefile
index 13df6f9..2a0a274 100644
--- a/package/urlgrabber/Makefile
+++ b/package/urlgrabber/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= urlgrabber
PKG_VERSION:= 3.9.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 00c8359bf71062d0946bacea521f80b4
-PKG_DESCR:= Python module for fetching of files
-PKG_SECTION:= misc
+PKG_DESCR:= python module for fetching of files
+PKG_SECTION:= dev/python
PKG_BUILDDEP:= pycurl
PKG_DEPENDS:= pycurl
PKG_URL:= http://urlgrabber.baseurl.org/
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 7d0daee..2fec94c 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= usbutils
PKG_VERSION:= 006
PKG_RELEASE:= 1
PKG_MD5SUM:= c9aa14ee3d6c991fda183f42cf72a8a8
-PKG_DESCR:= program to list USB devices
-PKG_SECTION:= utils
+PKG_DESCR:= program to list usb devices
+PKG_SECTION:= sys/utils
PKG_DEPENDS:= libusb libusb-compat libpthread zlib librt
PKG_BUILDDEP:= libusb libusb-compat zlib
PKG_SITES:= http://www.kernel.org/pub/linux/utils/usb/usbutils/
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 129584e..accc99c 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= util-linux
PKG_VERSION:= 2.24.2
PKG_RELEASE:= 3
PKG_MD5SUM:= 3f191727a0d28f7204b755cf1b6ea0aa
-PKG_DESCR:= basic Linux utilities
-PKG_SECTION:= core
+PKG_DESCR:= basic utilities
+PKG_SECTION:= base/apps
PKG_BUILDDEP:= ncurses pam
PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.24/
PKG_NOPARALLEL:= 1
@@ -19,29 +19,29 @@ PKG_ARCH_DEPENDS:= !m68k
PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
PKG_SUBPKGS+= LIBUUID LIBBLKID LIBMOUNT SU CFDISK
PKGSD_LIBUUID:= uuid library
-PKGSC_LIBUUID:= libs
+PKGSC_LIBUUID:= libs/misc
PKGSD_LIBBLKID:= blkid library
-PKGSC_LIBBLKID:= libs
+PKGSC_LIBBLKID:= libs/misc
PKGSD_LIBMOUNT:= mount library
-PKGSC_LIBMOUNT:= libs
+PKGSC_LIBMOUNT:= libs/misc
PKGSD_FDISK:= partition table manipulation utility
-PKGSC_FDISK:= fs
+PKGSC_FDISK:= sys/fs
PKGSD_SFDISK:= scriptable partition table manipulation utility
-PKGSC_SFDISK:= fs
+PKGSC_SFDISK:= sys/fs
PKGSD_CFDISK:= partition table manipulation utility
-PKGSC_CFDISK:= fs
+PKGSC_CFDISK:= sys/fs
PKGSD_SU:= switch user utility
-PKGSC_SU:= misc
+PKGSC_SU:= sys/misc
PKGSD_SWAP_UTILS:= swap space management utilities
PKGSS_SWAP_UTILS:= libblkid
-PKGSC_SWAP_UTILS:= fs
+PKGSC_SWAP_UTILS:= sys/fs
PKGSD_LOSETUP:= loop devices management utilities
-PKGSC_LOSETUP:= fs
+PKGSC_LOSETUP:= sys/fs
PKGSD_MOUNT:= mount/umount utilities
PKGSS_MOUNT:= libblkid libmount libuuid libncurses
-PKGSC_MOUNT:= fs
+PKGSC_MOUNT:= sys/fs
PKGSD_MCOOKIE:= generate magic cookies for xauth
-PKGSC_MCOOKIE:= x11/apps
+PKGSC_MCOOKIE:= x11/utils
include ${TOPDIR}/mk/package.mk
diff --git a/package/uvd/Makefile b/package/uvd/Makefile
index 3e48de9..8dd0ff6 100644
--- a/package/uvd/Makefile
+++ b/package/uvd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= uvd
PKG_VERSION:= 0.1
PKG_RELEASE:= 2
PKG_DESCR:= udp server for version information
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_URL:= http://openadk.org/
NO_DISTFILES:= 1
@@ -20,8 +20,6 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-TARGET_CFLAGS+= -Wall
-
do-build:
${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-o ${WRKBUILD}/uvd ${WRKBUILD}/uvd.c
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index 64e5008..814489b 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= v4l-utils
PKG_VERSION:= 1.0.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 2127f2d06be9162b0d346f7037a9e852
-PKG_DESCR:= Video4Linux2 utilities
-PKG_SECTION:= multimedia
+PKG_DESCR:= video4linux utilities
+PKG_SECTION:= mm/video
PKG_BUILDDEP:= libjpeg-turbo
PKG_SITES:= http://linuxtv.org/downloads/v4l-utils/
PKG_LIBNAME:= libv4l
@@ -18,7 +18,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
PKG_LIBC_DEPENDS:= glibc
PKG_SUBPKGS:= V4L_UTILS LIBV4L
-PKGSC_LIBV4L:= libs
+PKGSC_LIBV4L:= libs/video
PKGSD_LIBV4L:= Video4Linux2 libraries
ifeq ($(ADK_STATIC),y)
diff --git a/package/vala/Makefile b/package/vala/Makefile
index b65810f..361347e 100644
--- a/package/vala/Makefile
+++ b/package/vala/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= vala
PKG_VERSION:= 0.24.0
PKG_RELEASE:= 1
PKG_MD5SUM:= beddeff9c06d3c278988b237da0e7401
-PKG_DESCR:= compiler for the GObject type system
-PKG_SECTION:= lang
+PKG_DESCR:= compiler for the gobject type system
+PKG_SECTION:= dev/lang
PKG_BUILDDEP:= glib
HOST_BUILDDEP:= glib-host
PKG_URL:= https://wiki.gnome.org/Vala
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index 9c78dc2..8927428 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.9.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 0947de8112f946b9ce64764af7be6df2
PKG_DESCR:= memory management debugging
-PKG_SECTION:= debug
+PKG_SECTION:= app/debug
PKG_BUILDDEP:= autotool
PKG_URL:= http://valgrind.org/
PKG_SITES:= http://valgrind.org/downloads/
diff --git a/package/vgp/Makefile b/package/vgp/Makefile
index 7228431..2600db1 100755
--- a/package/vgp/Makefile
+++ b/package/vgp/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= vgp
PKG_VERSION:= 0.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= b8c25b5dfcb944f78bbc584be9c230c7
-PKG_DESCR:= daemon working like Cisco HSRP
+PKG_DESCR:= daemon working like cisco hsrp
PKG_SECTION:= net/misc
PKG_URL:= http://vgpd.freaknet.org/
PKG_SITES:= http://vgpd.freaknet.org/files/
diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile
index ae160b7..703bd0b 100644
--- a/package/videoproto/Makefile
+++ b/package/videoproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= videoproto
PKG_VERSION:= 2.3.1
PKG_RELEASE:= 1
-PKG_DESCR:= X11 video protocol headers
-PKG_SECTION:= devel
+PKG_DESCR:= x11 video protocol headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= f1903057310c6b308edf0e982d33714d
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile
index 3d0589a..bbfad12 100644
--- a/package/vilistextum/Makefile
+++ b/package/vilistextum/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.6.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 5ba56ffdc56758da716bb46c3e0f517e
PKG_DESCR:= html to ascii converter
-PKG_SECTION:= mail
+PKG_SECTION:= net/mail
PKG_BUILDDEP:= libiconv-tiny
PKG_SITES:= http://bhaak.dyndns.org/${PKG_NAME}/
diff --git a/package/vim/Makefile b/package/vim/Makefile
index 80994a8..4fe7ad8 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 7.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 607e135c559be642f210094ad023dc65
PKG_DESCR:= very popular text editor
-PKG_SECTION:= editor
+PKG_SECTION:= app/editor
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://www.vim.org/
diff --git a/package/virtinst/Makefile b/package/virtinst/Makefile
index 8c3aba0..ffb5482 100644
--- a/package/virtinst/Makefile
+++ b/package/virtinst/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.600.0
PKG_RELEASE:= 1
PKG_MD5SUM:= d8f6a61d7edbc78129a8b5df2807ad46
PKG_DESCR:= virtual machine installer
-PKG_SECTION:= misc
+PKG_SECTION:= sys/misc
PKG_BUILDDEP:= python2 urlgrabber libxml2 libxslt
PKG_DEPENDS:= python2 urlgrabber libxml2-python libxslt libvirt
PKG_URL:= http://virt-manager.org/
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index a33a1ef..b1934ae 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 7ed67d22f7425011078772bfc62ac222
PKG_DESCR:= popular media player
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/video
PKG_BUILDDEP:= ffmpeg xcb-util libtheora libgcrypt libmad
PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt
PKG_URL:= http://www.videolan.org/vlc/
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile
index d6c36d8..30e11bf 100644
--- a/package/vnc-reflector/Makefile
+++ b/package/vnc-reflector/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= vnc-reflector
PKG_VERSION:= 1.2.4
PKG_RELEASE:= 2
PKG_MD5SUM:= c3f88bc62f228b335c25c07f9744ab0c
-PKG_DESCR:= specialized VNC server which acts as a proxy
-PKG_SECTION:= proxy
+PKG_DESCR:= specialized vnc server which acts as a proxy
+PKG_SECTION:= net/proxy
PKG_DEPENDS:= libjpeg-turbo zlib
PKG_BUILDDEP:= libjpeg-turbo zlib
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vnc-reflector/}
diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile
index 1134673..c33e836 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/misc
+PKG_SECTION:= net/perf
PKG_SITES:= http://humdi.net/vnstat/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index df3b4b0..138e2db 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= vpnc
PKG_VERSION:= 0.5.3
PKG_RELEASE:= 2
PKG_MD5SUM:= 4378f9551d5b077e1770bbe09995afb3
-PKG_DESCR:= client for cisco3000 VPN Concentrator
+PKG_DESCR:= client for cisco3000 vpn concentrator
PKG_SECTION:= net/security
PKG_DEPENDS:= libgcrypt libgpg-error
PKG_BUILDDEP:= libgcrypt libgpg-error
diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile
index 5b37e1f..ea889f2 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:= virtual router redundancy protocol daemon
-PKG_SECTION:= route
+PKG_SECTION:= net/route
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vrrpd/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index a04440b..2dc9164 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= vsftpd
PKG_VERSION:= 3.0.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 8b00c749719089401315bd3c44dddbb2
-PKG_DESCR:= fast and secure FTP server
-PKG_SECTION:= www
+PKG_DESCR:= fast and secure ftp server
+PKG_SECTION:= net/http
PKG_DEPENDS:= libcap
PKG_BUILDDEP:= libcap
PKG_URL:= http://vsftpd.beasts.org/
diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index 6d7edb7..9e4c48c 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= vtun
PKG_VERSION:= 3.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c342ffe77055d4248a38f0b380f28c1b
-PKG_DESCR:= VPN tunnel daemon
-PKG_SECTION:= net/misc
+PKG_DESCR:= vpn tunnel daemon
+PKG_SECTION:= net/security
PKG_DEPENDS:= zlib libopenssl liblzo
PKG_BUILDDEP:= zlib openssl liblzo
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/}
diff --git a/package/w3m/Makefile b/package/w3m/Makefile
index f9957ef..8642e46 100644
--- a/package/w3m/Makefile
+++ b/package/w3m/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.5.3
PKG_RELEASE:= 3
PKG_MD5SUM:= 1b845a983a50b8dec0169ac48479eacc
PKG_DESCR:= console web browser
-PKG_SECTION:= browser
+PKG_SECTION:= app/browser
PKG_DEPENDS:= libgc libncurses
PKG_BUILDDEP:= libgc-host libgc ncurses
PKG_URL:= http://w3m.sourceforge.net/
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index 566ad3a..e6c3df4 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.13
PKG_RELEASE:= 1
PKG_MD5SUM:= 153455f008f1cf8f65f6ad9586a21ff1
PKG_DESCR:= watchdog daemon
-PKG_SECTION:= utils
+PKG_SECTION:= sys/utils
PKG_DEPENDS:= libtirpc
PKG_BUILDDEP:= libtirpc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/}
diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index e084b71..c835a37 100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= wccpd
PKG_VERSION:= 0.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 5f15c274de61dfb88e0dbfc1ccbe6b67
-PKG_DESCR:= WCCP (Web Cache Coordination Protocol) server daemon
-PKG_SECTION:= net/misc
+PKG_DESCR:= web cache coordination protocol server daemon
+PKG_SECTION:= net/proxy
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=wccpd/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile
index e8f39bc..44f17a0 100644
--- a/package/wdfs/Makefile
+++ b/package/wdfs/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= wdfs
PKG_VERSION:= 1.4.2
PKG_RELEASE:= 6
PKG_MD5SUM:= 628bb44194d04c1cf8aacc446ed0a230
-PKG_DESCR:= WebDAV filesystem
+PKG_DESCR:= webdav filesystem
PKG_SECTION:= net/fs
PKG_DEPENDS:= libopenssl fuse-utils neon glib
PKG_BUILDDEP:= openssl fuse neon glib
diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile
index d007e78..94638fb 100644
--- a/package/webkitgtk/Makefile
+++ b/package/webkitgtk/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.2
PKG_RELEASE:= 1
PKG_MD5SUM:= da2b1b0f0863f3f21bdbc0476001589f
PKG_DESCR:= web browser engine
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_DEPENDS:= glib icu4c zlib libwebp libgtk libsoup
PKG_DEPENDS+= libsecret libxt harfbuzz
PKG_DEPENDS+= gst-plugins-base gstreamer
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index af5f90e..9a7d588 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= weechat
PKG_VERSION:= 0.4.2
PKG_RELEASE:= 2
PKG_MD5SUM:= fd584c258aace2aa898f40e1fcf06084
-PKG_DESCR:= lightweight IRC client
-PKG_SECTION:= chat
+PKG_DESCR:= lightweight irc client
+PKG_SECTION:= app/chat
PKG_DEPENDS:= libncurses libgcrypt libz libcurl
PKG_BUILDDEP:= ncurses libiconv-tiny autotool libgcrypt
PKG_BUILDDEP+= zlib curl
diff --git a/package/wget/Makefile b/package/wget/Makefile
index 1757b64..1e6195d 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= wget
PKG_VERSION:= 1.15
PKG_RELEASE:= 2
PKG_MD5SUM:= 506df41295afc6486662cc47470b4618
-PKG_DESCR:= retrieving files using HTTP(S) and FTP
-PKG_SECTION:= www
+PKG_DESCR:= retrieving files using http(s) and ftp
+PKG_SECTION:= net/http
PKG_BUILDDEP:= autotool
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 8b82dfc..bdfde47 100644
--- a/package/wifidog/Makefile
+++ b/package/wifidog/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= wifidog
PKG_VERSION:= 1.1.5
PKG_RELEASE:= 2
PKG_MD5SUM:= abe5f7123179a0f08c493ce59fb3cb31
-PKG_DESCR:= a complete and embeddable captive portal
-PKG_SECTION:= wifi
+PKG_DESCR:= complete and embeddable captive portal
+PKG_SECTION:= net/wifi
PKG_DEPENDS:= iptables
PKG_URL:= http://dev.wifidog.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index fe22d9e..0c0529a 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= wireless-tools
PKG_VERSION:= 29
PKG_RELEASE:= 1
PKG_MD5SUM:= e06c222e186f7cc013fd272d023710cb
-PKG_DESCR:= Linux wireless tools (for older wireless drivers)
-PKG_SECTION:= wifi
+PKG_DESCR:= wireless tools (for older wireless drivers)
+PKG_SECTION:= net/wifi
PKG_SITES:= http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
DISTFILES:= wireless_tools.${PKG_VERSION}.tar.gz
diff --git a/package/wol/Makefile b/package/wol/Makefile
index 16010d6..78cc5a9 100644
--- a/package/wol/Makefile
+++ b/package/wol/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= wol
PKG_VERSION:= 0.7.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c2fa9d7e771134ac8c89d56b8197d4ca
-PKG_DESCR:= program to send magic Wake-on-LAN packets
-PKG_SECTION:= net
+PKG_DESCR:= program to send magic wake-on-lan packets
+PKG_SECTION:= net/misc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ahh/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile
index 5cdf417..4697a44 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:= tc based traffic shaping tool
-PKG_SECTION:= firewall
+PKG_SECTION:= net/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 11f4ee6..52cc753 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= wpa_supplicant
PKG_VERSION:= 2.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 3be2ebfdcced52e00eda0afe2889839d
-PKG_DESCR:= WPA Supplicant with support for WPA and WPA2
-PKG_SECTION:= wifi
+PKG_DESCR:= wpa supplicant
+PKG_SECTION:= net/wifi
PKG_DEPENDS:= libnl
PKG_BUILDDEP:= libnl
PKG_URL:= http://hostap.epitest.fi/wpa_supplicant/
diff --git a/package/wput/Makefile b/package/wput/Makefile
index 183c339..408c6a4 100644
--- a/package/wput/Makefile
+++ b/package/wput/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= wput
PKG_VERSION:= 0.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 92b41efed4db8eb4f3443c23bf7ceecf
-PKG_DESCR:= a wget-like command-line FTP client
-PKG_SECTION:= www
+PKG_DESCR:= wget-like command-line ftp client
+PKG_SECTION:= net/http
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=wput/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile
index b13ce9d..0ddc536 100644
--- a/package/x11vnc/Makefile
+++ b/package/x11vnc/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= x11vnc
PKG_VERSION:= 0.9.13
PKG_RELEASE:= 1
PKG_MD5SUM:= a372ec4fe8211221547b1c108cf56e4c
-PKG_DESCR:= VNC server for X11 displays
+PKG_DESCR:= vnc server for x11 displays
PKG_SECTION:= x11/apps
PKG_BUILDDEP:= libX11 libXtst libjpeg-turbo
PKG_URL:= http://www.karlrunge.com/x11vnc/
diff --git a/package/xauth/Makefile b/package/xauth/Makefile
index a45db0e..c598e52 100644
--- a/package/xauth/Makefile
+++ b/package/xauth/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xauth
PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 63c5fe6f8459ac08088958febc1db122
-PKG_DESCR:= X authority file utility
-PKG_SECTION:= x11/apps
+PKG_DESCR:= authority file utility
+PKG_SECTION:= x11/utils
PKG_DEPENDS:= libx11 libxext libxmu
PKG_BUILDDEP:= libX11 libXext libXmu
PKG_URL:= http://www.x.org
diff --git a/package/xbindkeys/Makefile b/package/xbindkeys/Makefile
index dae001f..940ae38 100644
--- a/package/xbindkeys/Makefile
+++ b/package/xbindkeys/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:= xbindkeys
PKG_VERSION:= 1.8.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 393dd74f85850a4ba0803b5a78bc598b
-PKG_DESCR:= keybindings for X11
+PKG_DESCR:= keybindings for x11
PKG_BUILDDEP:= libX11
-PKG_SECTION:= x11/apps
+PKG_SECTION:= x11/utils
PKG_SITES:= http://www.nongnu.org/xbindkeys/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index abb920e..549528b 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 13.1rc1
PKG_RELEASE:= 1
PKG_MD5SUM:= 1eb727c04cdc8282e9c2cb1f45ceeaae
PKG_DESCR:= software media player
-PKG_SECTION:= multimedia
+PKG_SECTION:= mm/video
PKG_DEPENDS:= boost libffmpeg python2 libstdcxx
PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad libdbus
PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index ce7f81a..2c48765 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xcb-proto
PKG_VERSION:= 1.10
PKG_RELEASE:= 1
-PKG_DESCR:= XML-XCB protocol descriptions
-PKG_SECTION:= devel
+PKG_DESCR:= xml-xcb protocol descriptions
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 2b9dc6442156aba2bfb4133cb9d7cf46
PKG_BUILDDEP:= autotool bzip2-host python2-host xcb-proto-host
PKG_SITES:= http://xcb.freedesktop.org/dist/
diff --git a/package/xcb-util/Makefile b/package/xcb-util/Makefile
index 8361696..ad5b6c4 100644
--- a/package/xcb-util/Makefile
+++ b/package/xcb-util/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xcb-util
PKG_VERSION:= 0.3.6
PKG_RELEASE:= 1
PKG_MD5SUM:= a8f8f710a202079d1ead532abd061672
-PKG_DESCR:= XCB utils
-PKG_SECTION:= x11/apps
+PKG_DESCR:= libraries which sit on top of libxcb
+PKG_SECTION:= x11/libs
PKG_SITES:= http://xcb.freedesktop.org/dist/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile
index 9393b0f..6cfcb3e 100644
--- a/package/xcmiscproto/Makefile
+++ b/package/xcmiscproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xcmiscproto
PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
-PKG_DESCR:= XC-MISC Extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= xc-misc extension headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 9a8da85301db41e8435099ffefb4ac74
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/xconsole/Makefile b/package/xconsole/Makefile
index a5e4b8c..edacac3 100644
--- a/package/xconsole/Makefile
+++ b/package/xconsole/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xconsole
PKG_VERSION:= 1.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= c617acec432901a3c1a2b23b022624cb
-PKG_DESCR:= X console app
-PKG_SECTION:= x11/apps
+PKG_DESCR:= console application
+PKG_SECTION:= x11/utils
PKG_BUILDDEP:= libXaw
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xdm/Makefile b/package/xdm/Makefile
index 71bd2ad..ec8e909 100644
--- a/package/xdm/Makefile
+++ b/package/xdm/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xdm
PKG_VERSION:= 1.1.11
PKG_RELEASE:= 1
PKG_MD5SUM:= aaf8c3d05d4a1e689d2d789c99a6023c
-PKG_DESCR:= X display manager
+PKG_DESCR:= display manager
PKG_SECTION:= x11/apps
PKG_BUILDDEP:= pam
PKG_DEPENDS:= xconsole pam xsm
diff --git a/package/xdpyinfo/Makefile b/package/xdpyinfo/Makefile
index 41016cc..22c6d66 100644
--- a/package/xdpyinfo/Makefile
+++ b/package/xdpyinfo/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xdpyinfo
PKG_VERSION:= 1.3.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 588a84f9762c7e4e2b72508f16005b48
-PKG_DESCR:= X display info utility
-PKG_SECTION:= x11/apps
+PKG_DESCR:= display info utility
+PKG_SECTION:= x11/utils
PKG_DEPENDS:= libxtst
PKG_BUILDDEP:= libXtst
PKG_URL:= http://www.x.org/
diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile
index 858c1df..8058373 100644
--- a/package/xextproto/Makefile
+++ b/package/xextproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xextproto
PKG_VERSION:= 7.3.0
PKG_RELEASE:= 1
-PKG_DESCR:= X Protocol Extensions headers
-PKG_SECTION:= devel
+PKG_DESCR:= x protocol extensions headers
+PKG_SECTION:= dev/header
PKG_BUILDDEP:= xextproto-host
PKG_MD5SUM:= 37b700baa8c8ea7964702d948dd13821
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 41eaf98..f889289 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xf86-input-evdev
PKG_VERSION:= 2.7.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 2d3f7111b8284cec81884023c4bb4a11
-PKG_DESCR:= X11 driver for Event driver
+PKG_DESCR:= x11 driver for evdev
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libudev
PKG_BUILDDEP:= xorg-server eudev
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index ee08e45..e1cf245 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-ati
PKG_VERSION:= 6.14.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 6bb71cff9ad9c5c7b258b2b6c56fdc95
-PKG_DESCR:= x11 driver for ATI VGA chip
+PKG_DESCR:= x11 driver for ati vga chip
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libdrm mesalib libudev libstdcxx
PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib eudev
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index 61335d8..0c661aa 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-cirrus
PKG_VERSION:= 1.4.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 439e3f5e29161f503bcfe23229dc7b17
-PKG_DESCR:= x11 driver for Cirrus VGA chips
+PKG_DESCR:= x11 driver for cirrus vga chips
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libstdcxx
PKG_BUILDDEP:= xorg-server autotool util-macros
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index 358c5c7..b254440 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-fbdev
PKG_VERSION:= 0.4.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 2b5e6dd218243cf96c1a4090596a6bba
-PKG_DESCR:= x11 driver for Linux Framebuffer devices
+PKG_DESCR:= x11 driver for framebuffer devices
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libstdcxx
PKG_BUILDDEP:= xorg-server
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index 56b83f4..0005f98 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-geode
PKG_VERSION:= 2.11.15
PKG_RELEASE:= 1
PKG_MD5SUM:= a38a23055fcabed87dbd5e7c9e32bc05
-PKG_DESCR:= x11 driver for AMD Geode VGA chip
+PKG_DESCR:= x11 driver for amd geode vga chip
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libstdcxx
PKG_BUILDDEP:= xorg-server
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index d499d66..fbddaca 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-intel
PKG_VERSION:= 2.99.911
PKG_RELEASE:= 1
PKG_MD5SUM:= de51db2408a222ef1c52725f5aa2f185
-PKG_DESCR:= x11 driver for Intel VGA chips
+PKG_DESCR:= x11 driver for intel vga chips
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libdrm mesalib libstdcxx
PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index 44097e8..c24d985 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xf86-video-siliconmotion
PKG_VERSION:= 1.7.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 94c44123d8d0a46a7f6bace8508763d8
-PKG_DESCR:= x11 driver for Silicon Motion VGA chips
+PKG_DESCR:= x11 driver for silicon motion vga chips
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libstdcxx
PKG_BUILDDEP:= xorg-server
diff --git a/package/xf86dga/Makefile b/package/xf86dga/Makefile
index ec450e1..6f8a521 100644
--- a/package/xf86dga/Makefile
+++ b/package/xf86dga/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xf86dga
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= ac30b5705f487554c5de0b466e846c31
-PKG_SECTION:= devel
+PKG_SECTION:= dev/header
PKG_BUILDDEP:= libXxf86dga
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile
index 17027dc..483e1c7 100644
--- a/package/xf86dgaproto/Makefile
+++ b/package/xf86dgaproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xf86dgaproto
PKG_VERSION:= 2.1
PKG_RELEASE:= 1
-PKG_DESCR:= XFree86-DGA headers
-PKG_SECTION:= devel
+PKG_DESCR:= xfree86-dga headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 1fe79dc07857ad3e1fb8b8f2bdd70d1b
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/xf86driproto/Makefile b/package/xf86driproto/Makefile
index 2b31bfc..afc53c5 100644
--- a/package/xf86driproto/Makefile
+++ b/package/xf86driproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xf86driproto
PKG_VERSION:= 2.1.0
PKG_RELEASE:= 1
-PKG_DESCR:= X DRI Protocol headers
-PKG_SECTION:= devel
+PKG_DESCR:= x dri protocol headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 309d552732666c3333d7dc63e80d042f
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/xf86vidmodeproto/Makefile b/package/xf86vidmodeproto/Makefile
index e89501b..f0a53e0 100644
--- a/package/xf86vidmodeproto/Makefile
+++ b/package/xf86vidmodeproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xf86vidmodeproto
PKG_VERSION:= 2.3.1
PKG_RELEASE:= 1
-PKG_DESCR:= XFree86-VidModeExtension extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= xfree86-vidmodeextension extension headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 99016d0fe355bae0bb23ce00fb4d4a2c
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index fa9cea0..2ee5bec 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xfsprogs
PKG_VERSION:= 3.1.11
PKG_RELEASE:= 1
PKG_MD5SUM:= de9f1f45026c2f4e0776058d429ff4b6
-PKG_DESCR:= utilities for XFS filesystems
-PKG_SECTION:= fs
+PKG_DESCR:= utilities for xfs filesystems
+PKG_SECTION:= sys/fs
PKG_BUILDDEP:= e2fsprogs util-linux ncurses
PKG_DEPENDS:= libuuid libpthread libblkid librt libncurses
PKG_URL:= http://oss.sgi.com/projects/xfs
diff --git a/package/xineramaproto/Makefile b/package/xineramaproto/Makefile
index 0fbc9a8..325afe5 100644
--- a/package/xineramaproto/Makefile
+++ b/package/xineramaproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xineramaproto
PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
-PKG_DESCR:= Xinerama Extension headers
-PKG_SECTION:= devel
+PKG_DESCR:= xinerama extension headers
+PKG_SECTION:= dev/header
PKG_BUILDDEP:= xineramaproto-host
PKG_MD5SUM:= e0e148b11739e144a546b8a051b17dde
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index 8106806..6990def 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 5
PKG_MD5SUM:= 7ad82221ebd6600a8d33712ec3b62efb
PKG_DESCR:= x window system initializer
-PKG_SECTION:= x11/apps
+PKG_SECTION:= x11/utils
PKG_DEPENDS:= xorg-server mcookie xauth xset xterm libstdcxx
PKG_BUILDDEP:= xorg-server
PKG_URL:= http://xorg.freedesktop.org/
diff --git a/package/xinput/Makefile b/package/xinput/Makefile
index 21d3287..2af38e2 100644
--- a/package/xinput/Makefile
+++ b/package/xinput/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xinput
PKG_VERSION:= 1.6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 03146d20083a8bd2e3806554b36c7c2b
-PKG_DESCR:= X input utility
-PKG_SECTION:= x11/apps
+PKG_DESCR:= input utility
+PKG_SECTION:= x11/utils
PKG_DEPENDS:= libxi libxinerama libxrandr
PKG_BUILDDEP:= libXi libXinerama libXrandr
PKG_URL:= http://xorg.freedesktop.org/
diff --git a/package/xinput_calibrator/Makefile b/package/xinput_calibrator/Makefile
index 330c53f..b433439 100644
--- a/package/xinput_calibrator/Makefile
+++ b/package/xinput_calibrator/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xinput_calibrator
PKG_VERSION:= 0.7.5
PKG_RELEASE:= 2
PKG_MD5SUM:= 20da0a2055a5a75962add8c6b44f60fa
-PKG_DESCR:= X11 input calibration utility
-PKG_SECTION:= x11/apps
+PKG_DESCR:= input calibration utility
+PKG_SECTION:= x11/utils
PKG_DEPENDS:= libstdcxx
PKG_URL:= http://github.com/downloads/tias/xinput_calibrator/
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile
index 16f9e20..75670fe 100644
--- a/package/xkbcomp/Makefile
+++ b/package/xkbcomp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 2
PKG_MD5SUM:= 10e6661a35aa994a9aa73ded0cf70259
PKG_DESCR:= x11 keyboard compiler
-PKG_SECTION:= x11/libs
+PKG_SECTION:= x11/misc
PKG_BUILDDEP:= libxkbfile libX11
PKG_DEPENDS:= libxkbfile libx11
PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index df46bc8..eec7749 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xkeyboard-config
PKG_VERSION:= 2.11
PKG_RELEASE:= 1
PKG_MD5SUM:= e3defd29cc464cc1a1dfa0eebaca53b1
-PKG_DESCR:= X keyboard config
-PKG_SECTION:= x11/libs
+PKG_DESCR:= keyboard config
+PKG_SECTION:= x11/misc
PKG_BUILDDEP:= autotool util-macros xkbcomp
PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/
diff --git a/package/xlsfonts/Makefile b/package/xlsfonts/Makefile
index bfac481..562b3bd 100644
--- a/package/xlsfonts/Makefile
+++ b/package/xlsfonts/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xlsfonts
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 7a6bee1512ccdef52fc519a86684891e
-PKG_DESCR:= list X11 fonts
-PKG_SECTION:= x11/apps
+PKG_DESCR:= list x11 fonts
+PKG_SECTION:= x11/utils
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 6ddb227..40865e4 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.15.1
PKG_RELEASE:= 1
PKG_MD5SUM:= d6e5444fc33ad737b551cc49061ae704
PKG_DESCR:= xorg server
-PKG_SECTION:= x11/server
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile
PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw
PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext
diff --git a/package/xproto/Makefile b/package/xproto/Makefile
index 9358f87..b41a150 100644
--- a/package/xproto/Makefile
+++ b/package/xproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xproto
PKG_VERSION:= 7.0.23
PKG_RELEASE:= 1
-PKG_DESCR:= X Window System Core Protocol headers
-PKG_SECTION:= devel
+PKG_DESCR:= x window system core protocol headers
+PKG_SECTION:= dev/header
PKG_MD5SUM:= 7ab1239930563a352cb3552fd2db4140
PKG_BUILDDEP:= xproto-host
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xrdb/Makefile b/package/xrdb/Makefile
index 286a6f8..3ac0f16 100644
--- a/package/xrdb/Makefile
+++ b/package/xrdb/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xrdb
PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 146c009e7abc52b611db4cac4883488e
-PKG_DESCR:= X resource database management tools
-PKG_SECTION:= x11/apps
+PKG_DESCR:= resource database management tools
+PKG_SECTION:= x11/utils
PKG_DEPENDS:= libx11 libxmu
PKG_BUILDDEP:= libX11 libXmu
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xset/Makefile b/package/xset/Makefile
index 7bf1f76..c7afa21 100644
--- a/package/xset/Makefile
+++ b/package/xset/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xset
PKG_VERSION:= 1.2.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 25bafb9ec4de87f2c44dde5e1dd12dab
-PKG_DESCR:= X set utility
-PKG_SECTION:= x11/apps
+PKG_DESCR:= set utility
+PKG_SECTION:= x11/utils
PKG_BUILDDEP:= libXmu
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xsetroot/Makefile b/package/xsetroot/Makefile
index a1abceb..0856274 100644
--- a/package/xsetroot/Makefile
+++ b/package/xsetroot/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 5097ed5bbe1c621ee12950019f71de02
PKG_DESCR:= set root window
-PKG_SECTION:= x11/apps
+PKG_SECTION:= x11/utils
PKG_DEPENDS:= xbitmaps libx11 libxmu libxcursor
PKG_BUILDDEP:= xbitmaps libXcursor libXmu
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xsm/Makefile b/package/xsm/Makefile
index 373d3cd..d352525 100644
--- a/package/xsm/Makefile
+++ b/package/xsm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xsm
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 6dfc70ae1c13f775f1c646a6d8780076
-PKG_DESCR:= X session manager
-PKG_SECTION:= x11/apps
+PKG_DESCR:= session manager
+PKG_SECTION:= x11/utils
PKG_DEPENDS:= libxaw
PKG_BUILDDEP:= libXaw
PKG_URL:= http://xorg.freedesktop.org/
diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index 6575fae..eb91282 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= xterm
PKG_VERSION:= 303
PKG_RELEASE:= 1
PKG_MD5SUM:= 48f6d49b2b6b6933d501d767cbed9254
-PKG_DESCR:= Terminal Emulator for X Windows
+PKG_DESCR:= terminal emulator
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libxaw libxt libncurses libxft fontconfig
PKG_BUILDDEP:= ncurses libXt libXmu libXaw libXft
diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile
index ea9c6bf..6bce229 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xtrans
PKG_VERSION:= 1.3.3
PKG_RELEASE:= 1
-PKG_DESCR:= X11 network protocol transport library
-PKG_SECTION:= devel
+PKG_DESCR:= network protocol transport library
+PKG_SECTION:= dev/header
PKG_BUILDDEP:= xtrans-host
PKG_MD5SUM:= c83d04cd878f1e51a44d132aa1d5b932
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xvidcore/Makefile b/package/xvidcore/Makefile
index 9c8be64..56efc05 100644
--- a/package/xvidcore/Makefile
+++ b/package/xvidcore/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xvidcore
PKG_VERSION:= 1.3.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 87c8cf7b69ebed93c2d82ea5709d098a
-PKG_DESCR:= Xvid Codec library
-PKG_SECTION:= libs
+PKG_DESCR:= xvid codec library
+PKG_SECTION:= libs/video
PKG_URL:= http://www.xvid.org/
PKG_SITES:= http://downloads.xvid.org/downloads/
PKG_LIBNAME:= libxvid
diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile
index 8b3fe1f..10c3790 100644
--- a/package/xvinfo/Makefile
+++ b/package/xvinfo/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= xvinfo
PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 49f5a19ddff9393aaea4ecaacaedddb3
-PKG_DESCR:= print out X-Video extension adaptor information
-PKG_SECTION:= x11/apps
+PKG_DESCR:= print out x-video extension adaptor information
+PKG_SECTION:= x11/utils
PKG_BUILDDEP:= libXv
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xz/Makefile b/package/xz/Makefile
index f17347c..d4683f9 100644
--- a/package/xz/Makefile
+++ b/package/xz/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 19d924e066b6fff0bc9d1981b4e53196
PKG_DESCR:= compression utility
-PKG_SECTION:= archive
+PKG_SECTION:= app/archive
PKG_URL:= http://tukaani.org/xz/
PKG_SITES:= http://tukaani.org/xz/
PKG_OPTS:= dev
diff --git a/package/yajl/Makefile b/package/yajl/Makefile
index ae66e89..2dd768c 100644
--- a/package/yajl/Makefile
+++ b/package/yajl/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= yajl
PKG_VERSION:= 2.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c953a53344c0e20a892fc042bbe69744
-PKG_DESCR:= small event-driven JSON parser written in ANSI C
-PKG_SECTION:= libs
+PKG_DESCR:= small event-driven json parser written in ansi c
+PKG_SECTION:= libs/data
PKG_BUILDDEP:= cmake-host ruby-host
PKG_URL:= http://lloyd.github.com/yajl/
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/yasm/Makefile b/package/yasm/Makefile
index 1e30f2f..42e18b7 100644
--- a/package/yasm/Makefile
+++ b/package/yasm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= yasm
PKG_VERSION:= 1.2.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 4cfc0686cf5350dd1305c4d905eb55a6
-PKG_DESCR:= modular assembler project
-PKG_SECTION:= lang
+PKG_DESCR:= modular assembler
+PKG_SECTION:= dev/lang
PKG_BUILDDEP:= yasm-host
PKG_URL:= http://www.tortall.net/projects/yasm/
PKG_SITES:= http://www.tortall.net/projects/yasm/releases/
diff --git a/package/zile/Makefile b/package/zile/Makefile
index a5155f8..d457635 100644
--- a/package/zile/Makefile
+++ b/package/zile/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.11
PKG_RELEASE:= 1
PKG_MD5SUM:= 7a460ccec64e3bec2835697b2eae533c
PKG_DESCR:= tiny emacs clone
-PKG_SECTION:= editor
+PKG_SECTION:= app/editor
PKG_DEPENDS:= libgc
PKG_BUILDDEP:= autotool libgc
PKG_URL:= http://www.gnu.org/software/zile/
diff --git a/package/zip/Makefile b/package/zip/Makefile
index 0fd973d..a037de3 100644
--- a/package/zip/Makefile
+++ b/package/zip/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 7b74551e63f8ee6aab6fbc86676c0d37
PKG_DESCR:= zip compression utility
-PKG_SECTION:= archive
+PKG_SECTION:= app/archive
PKG_URL:= http://www.info-zip.org/Zip.html
PKG_SITES:= ftp://ftp.info-zip.org/pub/infozip/src/
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 6fe11ae..d0a991f 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 2ab442d169156f34c379c968f3f482dd
PKG_DESCR:= implementation of the deflate compression method
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= http://www.zlib.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/zlib/}
PKG_OPTS:= dev
diff --git a/package/zsh/Makefile b/package/zsh/Makefile
index d375028..91e3567 100644
--- a/package/zsh/Makefile
+++ b/package/zsh/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= zsh
PKG_VERSION:= 5.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 6fb0e3e52a0f8de5ca63138391b81ce0
-PKG_DESCR:= Z Shell
-PKG_SECTION:= shells
+PKG_DESCR:= z shell
+PKG_SECTION:= base/shells
PKG_URL:= http://www.zsh.org/
PKG_SITES:= ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/