summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Config.in21
-rw-r--r--mk/build.mk4
-rw-r--r--mk/package.mk1
-rw-r--r--package/6tunnel/Makefile2
-rw-r--r--package/Config.in723
-rw-r--r--package/MesaLib/Makefile4
-rw-r--r--package/aiccu/Makefile2
-rw-r--r--package/aircrack-ng/Makefile2
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/arpd/Makefile2
-rw-r--r--package/arpwatch/Makefile2
-rw-r--r--package/asterisk/Makefile2
-rw-r--r--package/atftp/Makefile2
-rw-r--r--package/aufs2-util/Makefile2
-rw-r--r--package/autoconf/Makefile2
-rw-r--r--package/automake/Makefile2
-rw-r--r--package/autossh/Makefile2
-rw-r--r--package/avahi/Makefile2
-rw-r--r--package/axtls/Makefile2
-rw-r--r--package/b43-firmware/Makefile2
-rw-r--r--package/bind/Makefile2
-rw-r--r--package/binutils/Makefile2
-rw-r--r--package/bison/Makefile2
-rw-r--r--package/bitlbee/Makefile2
-rw-r--r--package/bridge-utils/Makefile2
-rw-r--r--package/busybox/Makefile4
-rw-r--r--package/busybox/patches/001-ipkg.patch484
-rw-r--r--package/busybox/patches/002-find-empty.patch61
-rw-r--r--package/busybox/patches/patch-include_libbb_h25
-rw-r--r--package/busybox/patches/patch-include_platform_h33
-rw-r--r--package/bzip2/Makefile2
-rw-r--r--package/ca-certificates/Makefile2
-rw-r--r--package/ccid/Makefile2
-rw-r--r--package/chillispot/Makefile2
-rw-r--r--package/collectd/Makefile2
-rw-r--r--package/comgt/Makefile2
-rw-r--r--package/coreutils/Makefile3
-rw-r--r--package/cpio/Makefile2
-rw-r--r--package/cryptsetup/Makefile6
-rw-r--r--package/cryptsetup/patches/patch-lib_setup_c17
-rwxr-xr-xpackage/ctorrent/Makefile2
-rw-r--r--package/cups/Makefile2
-rw-r--r--package/curl/Makefile2
-rwxr-xr-xpackage/cutter/Makefile2
-rw-r--r--package/cxxtools/Makefile2
-rw-r--r--package/dansguardian/Makefile2
-rw-r--r--package/davfs2/Makefile2
-rw-r--r--package/dbus/Makefile2
-rw-r--r--package/depmaker4
-rw-r--r--package/dhcp-forwarder/Makefile2
-rw-r--r--package/dhcp/Makefile2
-rw-r--r--package/diffutils/Makefile2
-rw-r--r--package/dillo/Makefile2
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dosfstools/Makefile2
-rw-r--r--package/dovecot/Makefile2
-rw-r--r--package/dri2proto/Makefile2
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/e2fsprogs/Makefile2
-rw-r--r--package/ebtables/Makefile2
-rw-r--r--package/elinks/Makefile2
-rw-r--r--package/esound/Makefile2
-rw-r--r--package/evilwm/Makefile2
-rw-r--r--package/exmap/Makefile5
-rw-r--r--package/ez-ipupdate/Makefile2
-rw-r--r--package/fakeidentd/Makefile2
-rw-r--r--package/fetchmail/Makefile2
-rw-r--r--package/ffmpeg/Makefile2
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/flex/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/Makefile2
-rw-r--r--package/font-xfree86-type1/Makefile2
-rw-r--r--package/freeradius-client/Makefile6
-rw-r--r--package/freeradius-server/Makefile2
-rw-r--r--package/frickin/Makefile2
-rw-r--r--package/fuse/Makefile2
-rw-r--r--package/gatling/Makefile2
-rw-r--r--package/gawk/Makefile2
-rw-r--r--package/gcc/Makefile2
-rw-r--r--package/gdb/Makefile2
-rw-r--r--package/gdbserver/Makefile2
-rw-r--r--package/gkrellmd/Makefile2
-rw-r--r--package/glproto/Makefile3
-rw-r--r--package/gmediaserver/Makefile2
-rw-r--r--package/gnupg/Makefile2
-rw-r--r--package/gnutls/Makefile9
-rw-r--r--package/gperf/Makefile2
-rw-r--r--package/gpm/Makefile2
-rw-r--r--package/gpsd/Makefile2
-rw-r--r--package/grep/Makefile2
-rw-r--r--package/haserl/Makefile2
-rw-r--r--package/hdparm/Makefile2
-rw-r--r--package/heimdal/Makefile2
-rw-r--r--package/heyu/Makefile2
-rw-r--r--package/hostapd/Makefile2
-rw-r--r--package/htpdate/Makefile2
-rw-r--r--package/httptunnel/Makefile2
-rw-r--r--package/icecast/Makefile2
-rw-r--r--package/igmpproxy/Makefile2
-rw-r--r--package/iproute2/Makefile2
-rw-r--r--package/ipsec-tools/Makefile2
-rw-r--r--package/ipset/Makefile5
-rw-r--r--package/iptables-snmp/Makefile2
-rw-r--r--package/iptables/Makefile2
-rw-r--r--package/irssi/Makefile2
-rw-r--r--package/iw/Makefile2
-rw-r--r--package/jamvm/Makefile2
-rw-r--r--package/kismet/Makefile2
-rw-r--r--package/knock/Makefile2
-rw-r--r--package/krb5/Makefile2
-rw-r--r--package/l2tpns/Makefile2
-rw-r--r--package/lame/Makefile2
-rw-r--r--package/less/Makefile2
-rw-r--r--package/libICE/Makefile2
-rw-r--r--package/libSM/Makefile2
-rw-r--r--package/libX11/Makefile2
-rw-r--r--package/libXau/Makefile2
-rw-r--r--package/libXaw/Makefile2
-rw-r--r--package/libXdmcp/Makefile2
-rw-r--r--package/libXext/Makefile2
-rw-r--r--package/libXfont/Makefile2
-rw-r--r--package/libXft/Makefile2
-rw-r--r--package/libXi/Makefile2
-rw-r--r--package/libXmu/Makefile2
-rw-r--r--package/libXpm/Makefile2
-rw-r--r--package/libXrender/Makefile2
-rw-r--r--package/libXt/Makefile2
-rw-r--r--package/libXv/Makefile2
-rw-r--r--package/libXxf86dga/Makefile2
-rw-r--r--package/libfontenc/Makefile2
-rw-r--r--package/libpciaccess/Makefile2
-rw-r--r--package/libpthread-stubs/Makefile3
-rw-r--r--package/libtool/Makefile2
-rw-r--r--package/libvirt/Makefile2
-rw-r--r--package/libxkbfile/Makefile2
-rw-r--r--package/lighttpd/Makefile2
-rw-r--r--package/links/Makefile2
-rw-r--r--package/linux-atm/Makefile2
-rw-r--r--package/lrzsz/Makefile2
-rw-r--r--package/lua/Makefile2
-rw-r--r--package/lvm/Makefile2
-rw-r--r--package/lynx/Makefile2
-rw-r--r--package/m4/Makefile2
-rwxr-xr-xpackage/macchanger/Makefile2
-rw-r--r--package/madplay/Makefile2
-rw-r--r--package/make/Makefile2
-rw-r--r--package/maradns/Makefile2
-rw-r--r--package/mdadm/Makefile2
-rw-r--r--package/miau/Makefile2
-rw-r--r--package/microperl/Makefile2
-rw-r--r--package/mini_httpd/Makefile2
-rw-r--r--package/mini_sendmail/Makefile2
-rw-r--r--package/miredo/Makefile2
-rw-r--r--package/moc/Makefile2
-rw-r--r--package/mpd/Makefile4
-rw-r--r--package/mpg123/Makefile2
-rw-r--r--package/mplayer/Makefile2
-rw-r--r--package/mrd6/Makefile2
-rw-r--r--package/mt-daapd/Makefile2
-rw-r--r--package/mtd/Makefile2
-rw-r--r--package/mutt/Makefile2
-rw-r--r--package/mysql/Makefile2
-rw-r--r--package/nand/Makefile2
-rw-r--r--package/nano/Makefile2
-rw-r--r--package/ncurses/Makefile4
-rw-r--r--package/ndisc/Makefile2
-rw-r--r--package/net-snmp/Makefile2
-rw-r--r--package/netstat-nat/Makefile2
-rw-r--r--package/nfs-utils/Makefile3
-rw-r--r--package/ntpclient/Makefile2
-rw-r--r--package/nut/Makefile2
-rw-r--r--package/olsrd/Makefile2
-rw-r--r--package/openct/Makefile2
-rw-r--r--package/openldap/Makefile4
-rw-r--r--package/openntpd/Makefile2
-rw-r--r--package/opensips/Makefile2
-rw-r--r--package/openssh/Makefile2
-rw-r--r--package/openssl/Makefile17
-rw-r--r--package/openswan/Makefile2
-rw-r--r--package/openvpn/Makefile2
-rw-r--r--package/oprofile/Makefile2
-rw-r--r--package/p54-firmware/Makefile2
-rw-r--r--package/p910nd/Makefile2
-rw-r--r--package/palantir/Makefile2
-rw-r--r--package/parprouted/Makefile2
-rw-r--r--package/parted/Makefile2
-rw-r--r--package/patch/Makefile2
-rw-r--r--package/pciutils/Makefile2
-rw-r--r--package/pcsc-lite/Makefile2
-rw-r--r--package/pdnsd/Makefile2
-rw-r--r--package/perl/Makefile2
-rw-r--r--package/php/Makefile2
-rw-r--r--package/picocom/Makefile2
-rw-r--r--package/pipacs/Makefile2
-rw-r--r--package/pixman/Makefile2
-rw-r--r--package/pkg-config/Makefile2
-rw-r--r--package/pkgmaker90
-rw-r--r--package/pmacct/Makefile2
-rw-r--r--package/portmap/Makefile2
-rw-r--r--package/portsentry/Makefile2
-rw-r--r--package/postgresql/Makefile2
-rw-r--r--package/ppp/Makefile2
-rw-r--r--package/pptp/Makefile2
-rw-r--r--package/pptpd/Makefile2
-rw-r--r--package/privoxy/Makefile2
-rw-r--r--package/procmail/Makefile2
-rw-r--r--package/proftpd/Makefile2
-rw-r--r--package/ptunnel/Makefile2
-rw-r--r--package/qingy/Makefile2
-rw-r--r--package/quagga/Makefile2
-rwxr-xr-xpackage/raddump/Makefile2
-rw-r--r--package/radvd/Makefile2
-rw-r--r--package/rarpd/Makefile2
-rw-r--r--package/rdate/Makefile2
-rw-r--r--package/reaim/Makefile2
-rw-r--r--package/rng-tools/Makefile2
-rw-r--r--package/rp-pppoe/Makefile2
-rw-r--r--package/rpcbind/Makefile2
-rw-r--r--package/rrs/Makefile2
-rw-r--r--package/rsync/Makefile2
-rw-r--r--package/rt61-firmware/Makefile2
-rw-r--r--package/rtorrent/Makefile2
-rw-r--r--package/rtsp/Makefile2
-rw-r--r--package/ruby/Makefile2
-rw-r--r--package/rxvt-unicode/Makefile6
-rw-r--r--package/samba/Makefile2
-rw-r--r--package/scanlogd/Makefile2
-rw-r--r--package/sdl-image/Makefile4
-rw-r--r--package/sdl/Makefile4
-rw-r--r--package/sections.lst53
-rw-r--r--package/serdisplib/Makefile2
-rw-r--r--package/setpwc/Makefile2
-rw-r--r--package/setserial/Makefile2
-rw-r--r--package/shat/Makefile2
-rw-r--r--package/shorewall-common/Makefile2
-rw-r--r--package/shorewall-shell/Makefile2
-rw-r--r--package/siproxd/Makefile2
-rw-r--r--package/sispmctl/Makefile2
-rw-r--r--package/snort/Makefile2
-rw-r--r--package/socat/Makefile2
-rw-r--r--package/sqlite/Makefile2
-rw-r--r--package/squid/Makefile2
-rw-r--r--package/srelay/Makefile2
-rw-r--r--package/ssltunnel/Makefile2
-rw-r--r--package/ssmtp/Makefile2
-rw-r--r--package/strace/Makefile2
-rw-r--r--package/tar/Makefile2
-rw-r--r--package/tcp_wrappers/Makefile2
-rw-r--r--package/tinc/Makefile2
-rw-r--r--package/tinyproxy/Makefile2
-rw-r--r--package/tmsnc/Makefile2
-rw-r--r--package/tntnet/Makefile2
-rw-r--r--package/tor/Makefile2
-rw-r--r--package/tptest/Makefile2
-rw-r--r--package/traceroute/Makefile2
-rw-r--r--package/twm/Makefile2
-rw-r--r--package/uclibc/Makefile4
-rw-r--r--package/udev/Makefile2
-rw-r--r--package/udp-broadcast-relay/Makefile2
-rw-r--r--package/ulogd/Makefile2
-rw-r--r--package/updatedd/Makefile2
-rw-r--r--package/usbutils/Makefile2
-rw-r--r--package/util-linux-ng/Makefile5
-rw-r--r--package/valgrind/Makefile2
-rwxr-xr-xpackage/vgp/Makefile2
-rw-r--r--package/vilistextum/Makefile2
-rw-r--r--package/vim/Makefile2
-rw-r--r--package/vnc-reflector/Makefile2
-rw-r--r--package/vnstat/Makefile2
-rw-r--r--package/vpnc/Makefile2
-rw-r--r--package/vrrpd/Makefile2
-rw-r--r--package/vsftpd/Makefile2
-rw-r--r--package/vtun/Makefile2
-rw-r--r--package/watchdog/Makefile2
-rw-r--r--package/wccpd/Makefile2
-rw-r--r--package/wdfs/Makefile2
-rw-r--r--package/wget/Makefile2
-rw-r--r--package/wifidog/Makefile2
-rw-r--r--package/wireless-tools/Makefile2
-rw-r--r--package/wondershaper/Makefile2
-rw-r--r--package/wpa_supplicant/Makefile2
-rw-r--r--package/wput/Makefile2
-rw-r--r--package/xauth/Makefile2
-rw-r--r--package/xcb-proto/Makefile2
-rw-r--r--package/xf86-input-evtouch/Makefile2
-rw-r--r--package/xf86-input-keyboard/Makefile2
-rw-r--r--package/xf86-input-mouse/Makefile2
-rw-r--r--package/xf86-video-cirrus/Makefile2
-rw-r--r--package/xf86-video-fbdev/Makefile2
-rw-r--r--package/xf86-video-geode/Makefile2
-rw-r--r--package/xf86-video-intel/Makefile2
-rw-r--r--package/xf86-video-siliconmotion/Makefile2
-rw-r--r--package/xf86driproto/Makefile4
-rw-r--r--package/xf86vidmodeproto/Makefile1
-rw-r--r--package/xfsprogs/Makefile2
-rw-r--r--package/xinetd/Makefile2
-rw-r--r--package/xinit/Makefile2
-rw-r--r--package/xkbcomp/Makefile2
-rw-r--r--package/xkeyboard-config/Makefile2
-rw-r--r--package/xlsfonts/Makefile2
-rw-r--r--package/xorg-server/Makefile2
-rw-r--r--package/xterm/Makefile2
-rw-r--r--package/xtrans/Makefile2
-rw-r--r--package/xvinfo/Makefile2
-rw-r--r--package/xz/Makefile2
-rw-r--r--package/zlib/Makefile4
320 files changed, 780 insertions, 1418 deletions
diff --git a/.gitignore b/.gitignore
index c8089da0e..21e9fb33e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,8 @@ config/*.o
config/lxdialog/*.o
make.log
dl/
+package/Config.in.auto*
+package/pkgconfigs.d/
package/*/info.mk
package/*/Config.in
package/*/Config.in.lib
diff --git a/Config.in b/Config.in
index 6bb7f7225..c4423f08f 100644
--- a/Config.in
+++ b/Config.in
@@ -177,4 +177,23 @@ config ADK_RUNTIME_TIMEZONE
endmenu
-source "package/Config.in"
+menu "Package selection"
+config ADK_ENABLE_IPV6
+ prompt "enable IPv6 globally"
+ boolean
+ default y
+ # FIXME: selecting stuff here is ugly, better fix package flavours to
+ # support a symbol-value-based default (i.e., "default y if IPV6")
+ select ADK_PACKAGE_NFS_UTILS_WITH_TIRPC if ADK_PACKAGE_NFS_UTILS != n
+ help
+ This enables IPv6 support in all related applications. Basically this
+ just means passing --enable-ipv6 to the configure script, but the
+ exception proves the rule. ;)
+
+source "package/Config.in.auto.global"
+source "package/Config.in.auto"
+endmenu
+
+menu "Kernel configuration"
+source "target/linux/Config.in"
+endmenu
diff --git a/mk/build.mk b/mk/build.mk
index a4559afef..9b9c6ec8d 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -175,7 +175,7 @@ newpackage:
$(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile
$(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile
@echo "Edit package/$(PKG)/Makefile to complete"
- @echo "Do not forget to add package to package/Config.in"
+ @echo "choose PKG_SECTION to add it to an existent submenu"
#############################################################
#
@@ -483,10 +483,12 @@ bulkallmod:
done <${TOPDIR}/target/bulk.lst
menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile)
+ @echo "Generating menu structure ..."
mksh $(TOPDIR)/package/pkgmaker
@:>.menu
dep:
+ @echo "Generating dependencies ..."
mksh $(TOPDIR)/package/depmaker
.PHONY: menu dep
diff --git a/mk/package.mk b/mk/package.mk
index 4baa73bf0..acc387a48 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -143,6 +143,7 @@ ALL_PKGOPTS+= $(1)
PKGNAME_$(1)= $(2)
PKGDEPS_$(1)= $(4)
PKGDESC_$(1)= $(5)
+PKGSECT_$(1)= $(6)
IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index cb519c51c..f6a8934b7 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11rc2
PKG_RELEASE:= 1
PKG_MD5SUM:= 74e02d4f0704b3083a01feda66033449
PKG_DESCR:= IPv4/IPv6 tunnel proxy
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_DEPENDS:= kmod-ipv6
PKG_URL:= http://toxygen.net/6tunnel/
PKG_SITES:= http://toxygen.net/6tunnel/
diff --git a/package/Config.in b/package/Config.in
deleted file mode 100644
index dd70babe0..000000000
--- a/package/Config.in
+++ /dev/null
@@ -1,723 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-menu "Package selection"
-
-config ADK_ENABLE_IPV6
- prompt "enable IPv6 globally"
- boolean
- default y
- # FIXME: selecting stuff here is ugly, better fix package flavours to
- # support a symbol-value-based default (i.e., "default y if IPV6")
- select ADK_PACKAGE_NFS_UTILS_WITH_TIRPC if ADK_PACKAGE_NFS_UTILS != n
- help
- This enables IPv6 support in all related applications. Basically this
- just means passing --enable-ipv6 to the configure script, but the
- exception proves the rule. ;)
-
-menu "Basesystem"
-source "package/alix-switch/Config.in"
-source "package/adkinstall/Config.in"
-source "package/base-files/Config.in"
-source "package/base-files/Config.in.manual"
-source "package/busybox/Config.in.manual"
-source "package/cfgfs/Config.in"
-source "package/cryptinit/Config.in"
-source "package/uclibc/Config.in.manual"
-source "package/glibc/Config.in.manual"
-source "package/eglibc/Config.in.manual"
-source "package/libc/Config.in.manual"
-source "package/grub/Config.in"
-source "package/grub-bin/Config.in"
-source "package/rpm/Config.in"
-source "package/uvd/Config.in"
-endmenu
-
-menu "Bluetooth"
-source "package/bluez-firmware/Config.in"
-source "package/bluez/Config.in"
-source "package/miax/Config.in"
-source "package/obexftp/Config.in"
-source "package/ussp-push/Config.in"
-endmenu
-
-menu "Browser / Editor / Pager"
-source "package/elinks/Config.in"
-source "package/less/Config.in"
-source "package/links/Config.in"
-source "package/lynx/Config.in"
-source "package/nano/Config.in"
-source "package/vim/Config.in"
-endmenu
-
-menu "Compression and Archivers"
-source "package/bzip2/Config.in"
-source "package/cpio/Config.in"
-source "package/tar/Config.in"
-source "package/xz/Config.in"
-endmenu
-
-menu "Cryptography"
-source "package/ccid/Config.in"
-source "package/cryptsetup/Config.in"
-source "package/gnupg/Config.in"
-source "package/gnutls/Config.in"
-source "package/heimdal/Config.in"
-source "package/krb5/Config.in"
-source "package/openct/Config.in"
-source "package/opensc/Config.in"
-source "package/openssl/Config.in"
-source "package/openssl-pkcs11/Config.in"
-source "package/pcsc-lite/Config.in"
-source "package/rng-tools/Config.in"
-endmenu
-
-menu "Debugging / Analyzing"
-source "package/exmap/Config.in"
-source "package/gdb/Config.in"
-source "package/gdbserver/Config.in"
-source "package/oprofile/Config.in"
-source "package/strace/Config.in"
-source "package/valgrind/Config.in"
-endmenu
-
-menu "DNS / DHCP"
-source "package/atftp/Config.in"
-source "package/avahi/Config.in"
-source "package/bind/Config.in"
-source "package/dhcp/Config.in"
-source "package/dhcp-forwarder/Config.in"
-source "package/dnsmasq/Config.in"
-source "package/ez-ipupdate/Config.in"
-source "package/maradns/Config.in"
-source "package/pdnsd/Config.in"
-source "package/updatedd/Config.in"
-endmenu
-
-menu "Filesystem / Blockdevice utilities"
-source "package/aufs2-util/Config.in"
-source "package/dosfstools/Config.in"
-source "package/e2fsprogs/Config.in"
-source "package/fuse/Config.in"
-source "package/mdadm/Config.in"
-source "package/mtd/Config.in"
-source "package/nand/Config.in"
-source "package/lvm/Config.in"
-source "package/parted/Config.in"
-source "package/util-linux-ng/Config.in"
-source "package/wdfs/Config.in"
-source "package/xfsprogs/Config.in"
-endmenu
-
-menu "Firewall / Routing / Bridging"
-source "package/arpd/Config.in"
-source "package/bridge-utils/Config.in"
-source "package/linux-atm/Config.in"
-source "package/conntrack-tools/Config.in"
-source "package/cutter/Config.in"
-source "package/ebtables/Config.in"
-source "package/ether-wake/Config.in"
-source "package/iproute2/Config.in"
-source "package/ipset/Config.in"
-source "package/iptables/Config.in"
-source "package/knock/Config.in"
-source "package/macchanger/Config.in"
-source "package/netstat-nat/Config.in"
-source "package/quagga/Config.in"
-source "package/ulogd/Config.in"
-source "package/shorewall-common/Config.in"
-source "package/shorewall-shell/Config.in"
-source "package/wol/Config.in"
-source "package/wondershaper/Config.in"
-source "package/vrrpd/Config.in"
-endmenu
-
-menu "HTTP / FTP"
-source "package/curl/Config.in"
-source "package/gatling/Config.in"
-source "package/lighttpd/Config.in"
-source "package/mini_httpd/Config.in"
-source "package/proftpd/Config.in"
-source "package/tntnet/Config.in"
-source "package/vsftpd/Config.in"
-source "package/wget/Config.in"
-source "package/wput/Config.in"
-endmenu
-
-menu "IPv6"
-source "package/6tunnel/Config.in"
-source "package/aiccu/Config.in"
-source "package/miredo/Config.in"
-source "package/mrd6/Config.in"
-source "package/ndisc/Config.in"
-source "package/radvd/Config.in"
-endmenu
-
-menu "IRC / ICQ / JABBER"
-source "package/bitlbee/Config.in"
-source "package/irssi/Config.in"
-source "package/miau/Config.in"
-source "package/reaim/Config.in"
-source "package/tmsnc/Config.in"
-endmenu
-
-menu "Libraries"
-source "package/alsa-lib/Config.in"
-source "package/apr/Config.in"
-source "package/apr-util/Config.in"
-source "package/atk/Config.in"
-source "package/avahi/Config.in.lib"
-source "package/axtls/Config.in.lib"
-source "package/bind/Config.in.lib"
-source "package/cairo/Config.in"
-source "package/cgilib/Config.in"
-source "package/curl/Config.in.lib"
-source "package/cxxtools/Config.in"
-source "package/dbus/Config.in"
-source "package/dbus-glib/Config.in"
-source "package/dbus-glib/Config.in.lib"
-source "package/DirectFB/Config.in"
-source "package/DirectFB/Config.in.lib"
-source "package/e2fsprogs/Config.in.lib"
-source "package/fltk/Config.in"
-source "package/fltk/Config.in.lib"
-source "package/fontconfig/Config.in"
-source "package/freeglut/Config.in"
-source "package/gettext/Config.in"
-source "package/glib/Config.in"
-source "package/gtk+/Config.in"
-source "package/heimdal/Config.in.lib"
-source "package/id3lib/Config.in"
-source "package/imlib2/Config.in"
-source "package/libao/Config.in"
-source "package/libao/Config.in.lib"
-source "package/libaudiofile/Config.in"
-source "package/libaudiofile/Config.in.lib"
-source "package/libart/Config.in"
-source "package/libart/Config.in.lib"
-source "package/linux-atm/Config.in.lib"
-source "package/libcli/Config.in"
-source "package/libcli/Config.in.lib"
-source "package/libdaemon/Config.in"
-source "package/libdaemon/Config.in.lib"
-source "package/libdb/Config.in"
-source "package/libdb/Config.in.lib"
-source "package/libdnet/Config.in"
-source "package/libdnet/Config.in.lib"
-source "package/libelf/Config.in"
-source "package/libelf/Config.in.lib"
-source "package/libevent/Config.in"
-source "package/libevent/Config.in.lib"
-source "package/libffi/Config.in"
-source "package/libffi/Config.in.lib"
-source "package/freeradius-client/Config.in.lib"
-source "package/expat/Config.in"
-source "package/expat/Config.in.lib"
-source "package/faad2/Config.in"
-source "package/faad2/Config.in.lib"
-source "package/flac/Config.in"
-source "package/flac/Config.in.lib"
-source "package/freetype/Config.in"
-source "package/freetype/Config.in.lib"
-source "package/libgcrypt/Config.in"
-source "package/libgcrypt/Config.in.lib"
-source "package/libgd/Config.in"
-source "package/libgd/Config.in.lib"
-source "package/gdbm/Config.in"
-source "package/gdbm/Config.in.lib"
-source "package/libgssglue/Config.in"
-source "package/libgssglue/Config.in.lib"
-source "package/gmp/Config.in"
-source "package/gmp/Config.in.lib"
-source "package/gnutls/Config.in.lib"
-source "package/libgpg-error/Config.in"
-source "package/libgpg-error/Config.in.lib"
-source "package/gsm/Config.in"
-source "package/gsm/Config.in.lib"
-source "package/libiconv/Config.in"
-source "package/libiconv/Config.in.lib"
-source "package/libid3tag/Config.in"
-source "package/libid3tag/Config.in.lib"
-source "package/libIDL/Config.in"
-source "package/libIDL/Config.in.lib"
-source "package/jpeg/Config.in"
-source "package/jpeg/Config.in.lib"
-source "package/krb5/Config.in.lib"
-source "package/lame/Config.in.lib"
-source "package/mpfr/Config.in"
-source "package/mysql/Config.in"
-source "package/mysql/Config.in.lib"
-source "package/libnotify/Config.in"
-source "package/libnotify/Config.in.lib"
-source "package/nspr/Config.in"
-source "package/nss/Config.in"
-source "package/libtool/Config.in.lib"
-source "package/openldap/Config.in.lib"
-source "package/liblzo/Config.in"
-source "package/liblzo/Config.in.lib"
-source "package/libmad/Config.in"
-source "package/libmad/Config.in.lib"
-source "package/libmms/Config.in"
-source "package/libmms/Config.in.lib"
-source "package/ncurses/Config.in"
-source "package/ncurses/Config.in.lib"
-source "package/neon/Config.in"
-source "package/libnet/Config.in"
-source "package/libnet/Config.in.lib"
-source "package/libnetfilter_conntrack/Config.in"
-source "package/libnetfilter_conntrack/Config.in.lib"
-source "package/libnetfilter_log/Config.in"
-source "package/libnetfilter_log/Config.in.lib"
-source "package/libnetfilter_queue/Config.in"
-source "package/libnetfilter_queue/Config.in.lib"
-source "package/libnfsidmap/Config.in"
-source "package/libnfnetlink/Config.in"
-source "package/libnfnetlink/Config.in.lib"
-source "package/libnids/Config.in"
-source "package/libnids/Config.in.lib"
-source "package/libnl/Config.in"
-source "package/libnl/Config.in.lib"
-source "package/libogg/Config.in"
-source "package/libogg/Config.in.lib"
-source "package/libol/Config.in"
-source "package/libol/Config.in.lib"
-source "package/opencdk/Config.in"
-source "package/opencdk/Config.in.lib"
-source "package/obexftp/Config.in.lib"
-source "package/openobex/Config.in"
-source "package/libosip2/Config.in"
-source "package/libosip2/Config.in.lib"
-source "package/libp11/Config.in"
-source "package/libp11/Config.in.lib"
-source "package/libpcap/Config.in"
-source "package/libpcap/Config.in.lib"
-source "package/libpri/Config.in"
-source "package/libpri/Config.in.lib"
-source "package/lvm/Config.in.lib"
-source "package/pango/Config.in"
-source "package/pcre/Config.in"
-source "package/pcre/Config.in.lib"
-source "package/libpng/Config.in"
-source "package/libpng/Config.in.lib"
-source "package/popt/Config.in"
-source "package/popt/Config.in.lib"
-source "package/postgresql/Config.in"
-source "package/postgresql/Config.in.lib"
-source "package/libpthread/Config.in"
-source "package/libpthread/Config.in.lib"
-source "package/libthread_db/Config.in"
-source "package/libthread_db/Config.in.lib"
-source "package/readline/Config.in"
-source "package/readline/Config.in.lib"
-source "package/cyrus-sasl/Config.in"
-source "package/cyrus-sasl/Config.in.lib"
-source "package/sdl/Config.in"
-source "package/sdl/Config.in.lib"
-source "package/sdl-image/Config.in"
-source "package/sdl-image/Config.in.lib"
-source "package/net-snmp/Config.in.lib"
-source "package/speex/Config.in"
-source "package/speex/Config.in.lib"
-source "package/openssl/Config.in.lib"
-source "package/sqlite/Config.in.lib"
-source "package/librpcsecgss/Config.in"
-source "package/librpcsecgss/Config.in.lib"
-source "package/libshout/Config.in"
-source "package/libshout/Config.in.lib"
-source "package/libsigc++/Config.in"
-source "package/libsigc++/Config.in.lib"
-source "package/libstdcxx/Config.in"
-source "package/libstdcxx/Config.in.lib"
-source "package/libtasn1/Config.in"
-source "package/libtasn1/Config.in.lib"
-source "package/libtiff/Config.in"
-source "package/libtiff/Config.in.lib"
-source "package/libtirpc/Config.in"
-source "package/libtirpc/Config.in.lib"
-source "package/libtorrent/Config.in"
-source "package/libtorrent/Config.in.lib"
-source "package/libupnp/Config.in"
-source "package/libupnp/Config.in.lib"
-source "package/libusb/Config.in"
-source "package/libusb/Config.in.lib"
-source "package/libusb-compat/Config.in"
-source "package/libusb-compat/Config.in.lib"
-source "package/libvirt/Config.in"
-source "package/libvirt/Config.in.lib"
-source "package/libvorbis/Config.in"
-source "package/libvorbis/Config.in.lib"
-source "package/libvorbisidec/Config.in"
-source "package/libvorbisidec/Config.in.lib"
-source "package/tcp_wrappers/Config.in"
-source "package/tslib/Config.in"
-source "package/libxml2/Config.in"
-source "package/libxml2/Config.in.lib"
-source "package/libxslt/Config.in"
-source "package/libxslt/Config.in.lib"
-source "package/lua/Config.in.lib"
-source "package/uclibc++/Config.in.manual"
-source "package/zlib/Config.in"
-endmenu
-
-menu "Mail"
-source "package/bogofilter/Config.in"
-source "package/dovecot/Config.in"
-source "package/fetchmail/Config.in"
-source "package/mini_sendmail/Config.in"
-source "package/mutt/Config.in"
-source "package/procmail/Config.in"
-source "package/ssmtp/Config.in"
-source "package/vilistextum/Config.in"
-endmenu
-
-menu "Misc"
-source "package/collectd/Config.in"
-source "package/deco/Config.in"
-source "package/dialog/Config.in"
-source "package/digitemp/Config.in"
-source "package/gpm/Config.in"
-source "package/gpsd/Config.in"
-source "package/logrotate/Config.in"
-source "package/mc/Config.in"
-source "package/mgetty/Config.in"
-source "package/monit/Config.in"
-source "package/motion/Config.in"
-source "package/osiris/Config.in"
-source "package/rrdtool/Config.in"
-source "package/rrdcollect/Config.in"
-source "package/sane-backends/Config.in"
-source "package/screen/Config.in"
-source "package/scsi-spin/Config.in"
-source "package/ser2net/Config.in"
-source "package/sqlite/Config.in"
-source "package/syslog-ng/Config.in"
-endmenu
-
-menu "Multimedia"
-source "package/alsa-utils/Config.in"
-source "package/esound/Config.in"
-source "package/ffmpeg/Config.in"
-source "package/gmediaserver/Config.in"
-source "package/icecast/Config.in"
-source "package/lame/Config.in"
-source "package/madplay/Config.in"
-source "package/mpg123/Config.in"
-source "package/moc/Config.in"
-source "package/mpd/Config.in"
-source "package/mplayer/Config.in"
-source "package/mt-daapd/Config.in"
-source "package/palantir/Config.in"
-source "package/setpwc/Config.in"
-endmenu
-
-menu "Network - Analyze / Debugging / Monitoring"
-source "package/bwm/Config.in"
-source "package/dsniff/Config.in"
-source "package/ethtool/Config.in"
-source "package/fping/Config.in"
-source "package/fprobe/Config.in"
-source "package/fprobe-ulog/Config.in"
-source "package/httping/Config.in"
-source "package/iftop/Config.in"
-source "package/ipcad/Config.in"
-source "package/iperf/Config.in"
-source "package/iptraf/Config.in"
-source "package/mtr/Config.in"
-source "package/netperf/Config.in"
-source "package/nmap/Config.in"
-source "package/sipsak/Config.in"
-source "package/tcpdump/Config.in"
-source "package/tptest/Config.in"
-source "package/traceroute/Config.in"
-source "package/trafshow/Config.in"
-source "package/ttcp/Config.in"
-endmenu
-
-menu "Networking Misc"
-source "package/cups/Config.in"
-source "package/fakeidentd/Config.in"
-source "package/gkrellmd/Config.in"
-source "package/net-snmp/Config.in"
-# intentionally inserted here, as it depends on the above
-source "package/iptables-snmp/Config.in"
-source "package/nut/Config.in"
-source "package/openldap/Config.in"
-source "package/p910nd/Config.in"
-source "package/pipacs/Config.in"
-#source "package/pmacct/Config.in"
-source "package/portmap/Config.in"
-source "package/rarpd/Config.in"
-source "package/rpcbind/Config.in"
-source "package/rrs/Config.in"
-source "package/rsync/Config.in"
-source "package/shat/Config.in"
-source "package/socat/Config.in"
-source "package/udp-broadcast-relay/Config.in"
-source "package/vgp/Config.in"
-source "package/vnstat/Config.in"
-source "package/vtun/Config.in"
-source "package/wccpd/Config.in"
-source "package/xinetd/Config.in"
-endmenu
-
-menu "Network Filesystems"
-source "package/davfs2/Config.in"
-source "package/davfs2/Config.in.kernel"
-source "package/nfs-utils/Config.in"
-source "package/samba/Config.in"
-endmenu
-
-menu "Network Security"
-source "package/arpwatch/Config.in"
-source "package/autossh/Config.in"
-source "package/axtls/Config.in"
-source "package/ca-certificates/Config.in"
-source "package/dropbear/Config.in"
-source "package/httptunnel/Config.in"
-source "package/ipsec-tools/Config.in"
-source "package/l2tpns/Config.in"
-source "package/openssh/Config.in"
-source "package/openssh/Config.in.kerberos"
-source "package/openswan/Config.in"
-source "package/openvpn/Config.in"
-source "package/portsentry/Config.in"
-source "package/ptunnel/Config.in"
-source "package/scanlogd/Config.in"
-source "package/snort/Config.in"
-source "package/ssltunnel/Config.in"
-source "package/tinc/Config.in"
-source "package/vpnc/Config.in"
-endmenu
-
-menu "NTP"
-source "package/htpdate/Config.in"
-source "package/ntpclient/Config.in"
-source "package/openntpd/Config.in"
-source "package/rdate/Config.in"
-endmenu
-
-menu "P2P"
-source "package/ctorrent/Config.in"
-source "package/rtorrent/Config.in"
-endmenu
-
-menu "PPP / PPTP / RADIUS"
-source "package/freeradius-client/Config.in"
-source "package/freeradius-server/Config.in"
-source "package/ppp/Config.in"
-source "package/pptp/Config.in"
-source "package/pptpd/Config.in"
-source "package/rp-pppoe/Config.in"
-source "package/raddump/Config.in"
-endmenu
-
-menu "Proxy"
-source "package/dansguardian/Config.in"
-source "package/frickin/Config.in"
-source "package/igmpproxy/Config.in"
-source "package/parprouted/Config.in"
-source "package/privoxy/Config.in"
-source "package/siproxd/Config.in"
-source "package/squid/Config.in"
-source "package/srelay/Config.in"
-source "package/tinyproxy/Config.in"
-source "package/tor/Config.in"
-source "package/vnc-reflector/Config.in"
-endmenu
-
-menu "Programming / Languages"
-source "package/autoconf/Config.in"
-source "package/automake/Config.in"
-source "package/binutils/Config.in"
-source "package/bison/Config.in"
-source "package/diffutils/Config.in"
-source "package/flex/Config.in"
-source "package/gawk/Config.in"
-source "package/gcc/Config.in"
-source "package/gperf/Config.in"
-source "package/haserl/Config.in"
-source "package/jamvm/Config.in"
-source "package/libtool/Config.in"
-source "package/lua/Config.in"
-source "package/m4/Config.in"
-source "package/make/Config.in"
-source "package/microperl/Config.in"
-source "package/perl/Config.in"
-source "package/php/Config.in"
-source "package/pkg-config/Config.in"
-source "package/python/Config.in"
-source "package/python2/Config.in"
-source "package/ruby/Config.in"
-source "package/tcl/Config.in"
-endmenu
-
-menu "SCM"
-#source "package/bzr/Config.in"
-source "package/cvs/Config.in"
-source "package/git/Config.in"
-source "package/subversion/Config.in"
-endmenu
-
-menu "Shells"
-source "package/bash/Config.in"
-source "package/mksh/Config.in"
-source "package/tcsh/Config.in"
-source "package/zsh/Config.in"
-endmenu
-
-menu "Serial communications & terminal emulation"
-source "package/heyu/Config.in"
-source "package/lrzsz/Config.in"
-source "package/picocom/Config.in"
-source "package/serdisplib/Config.in"
-source "package/setserial/Config.in"
-endmenu
-
-menu "Telephony"
-source "package/asterisk/Config.in"
-source "package/opensips/Config.in"
-endmenu
-
-menu "Utilities"
-source "package/bc/Config.in"
-source "package/comgt/Config.in"
-source "package/coreutils/Config.in"
-source "package/cpufrequtils/Config.in"
-source "package/fbset/Config.in"
-source "package/file/Config.in"
-source "package/findutils/Config.in"
-source "package/grep/Config.in"
-source "package/hdparm/Config.in"
-source "package/usbutils/Config.in"
-source "package/patch/Config.in"
-source "package/pciutils/Config.in"
-source "package/pcmciautils/Config.in"
-source "package/procps/Config.in"
-source "package/sispmctl/Config.in"
-source "package/stress/Config.in"
-source "package/sysfsutils/Config.in"
-source "package/sysstat/Config.in"
-source "package/udev/Config.in"
-source "package/watchdog/Config.in"
-endmenu
-
-menu "Wireless"
-source "package/aircrack-ng/Config.in"
-source "package/b43-firmware/Config.in"
-source "package/chillispot/Config.in"
-source "package/hostapd/Config.in"
-source "package/iw/Config.in"
-source "package/kismet/Config.in"
-source "package/olsrd/Config.in"
-source "package/p54-firmware/Config.in"
-source "package/rt61-firmware/Config.in"
-source "package/wifidog/Config.in"
-source "package/wireless-tools/Config.in"
-source "package/wpa_supplicant/Config.in"
-endmenu
-
-menu "X server and drivers"
-source "package/xorg-server/Config.in"
-source "package/xf86-video-cirrus/Config.in"
-source "package/xf86-video-geode/Config.in"
-source "package/xf86-video-fbdev/Config.in"
-source "package/xf86-video-intel/Config.in"
-source "package/xf86-video-siliconmotion/Config.in"
-source "package/xf86-input-mouse/Config.in"
-source "package/xf86-input-keyboard/Config.in"
-source "package/xf86-input-evtouch/Config.in"
-endmenu
-
-menu "X applications"
-source "package/dillo/Config.in"
-source "package/evilwm/Config.in"
-source "package/firefox/Config.in"
-source "package/fluxbox/Config.in"
-source "package/font-util/Config.in"
-source "package/qingy/Config.in"
-source "package/rxvt-unicode/Config.in"
-source "package/twm/Config.in"
-source "package/xauth/Config.in"
-source "package/xinit/Config.in"
-source "package/xlsfonts/Config.in"
-source "package/xterm/Config.in"
-source "package/xvinfo/Config.in"
-endmenu
-
-menu "X fonts"
-source "package/font-adobe-75dpi/Config.in"
-source "package/font-adobe-100dpi/Config.in"
-source "package/font-bitstream-75dpi/Config.in"
-source "package/font-bitstream-100dpi/Config.in"
-source "package/font-bitstream-type1/Config.in"
-source "package/font-bh-lucidatypewriter-75dpi/Config.in"
-source "package/font-bh-lucidatypewriter-100dpi/Config.in"
-source "package/font-bh-75dpi/Config.in"
-source "package/font-bh-100dpi/Config.in"
-source "package/font-bh-type1/Config.in"
-source "package/font-bh-ttf/Config.in"
-source "package/font-misc-misc/Config.in"
-source "package/font-xfree86-type1/Config.in"
-endmenu
-
-menu "X libraries"
-source "package/libdrm/Config.in"
-source "package/libdrm/Config.in.lib"
-source "package/libICE/Config.in"
-source "package/libICE/Config.in.lib"
-source "package/libSM/Config.in"
-source "package/libSM/Config.in.lib"
-source "package/libX11/Config.in"
-source "package/libX11/Config.in.lib"
-source "package/libXv/Config.in"
-source "package/libXv/Config.in.lib"
-source "package/libXdmcp/Config.in"
-source "package/libXdmcp/Config.in.lib"
-source "package/libXext/Config.in"
-source "package/libXext/Config.in.lib"
-source "package/libXfont/Config.in"
-source "package/libXfont/Config.in.lib"
-source "package/libfontenc/Config.in"
-source "package/libfontenc/Config.in.lib"
-source "package/libpciaccess/Config.in"
-source "package/libpciaccess/Config.in.lib"
-source "package/libxkbfile/Config.in"
-source "package/libxkbfile/Config.in.lib"
-source "package/libXau/Config.in"
-source "package/libXau/Config.in.lib"
-source "package/libXaw/Config.in"
-source "package/libXaw/Config.in.lib"
-source "package/libXdamage/Config.in"
-source "package/libXdamage/Config.in.lib"
-source "package/libXfixes/Config.in"
-source "package/libXfixes/Config.in.lib"
-source "package/libXi/Config.in"
-source "package/libXi/Config.in.lib"
-source "package/libXmu/Config.in"
-source "package/libXmu/Config.in.lib"
-source "package/libXpm/Config.in"
-source "package/libXpm/Config.in.lib"
-source "package/libXrender/Config.in"
-source "package/libXrender/Config.in.lib"
-source "package/libXScrnSaver/Config.in"
-source "package/libXScrnSaver/Config.in.lib"
-source "package/libXt/Config.in"
-source "package/libXt/Config.in.lib"
-source "package/libXft/Config.in"
-source "package/libXft/Config.in.lib"
-source "package/libXxf86dga/Config.in"
-source "package/libXxf86dga/Config.in.lib"
-source "package/libXxf86vm/Config.in"
-source "package/libXxf86vm/Config.in.lib"
-source "package/MesaLib/Config.in"
-source "package/MesaLib/Config.in.lib"
-source "package/pixman/Config.in"
-source "package/xkbcomp/Config.in"
-source "package/xkeyboard-config/Config.in"
-endmenu
-endmenu
-
-menu "Kernel configuration"
-source "target/linux/Config.in"
-source "package/rtsp/Config.in"
-endmenu
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index b45ecdffc..ccf122e29 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -16,9 +16,9 @@ PKG_URL:= http://www.mesa3d.org/
PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/
PKG_DESCR_GLXINFO:= Display various GLX information
-PKG_SECT_GLXINFO:= x11
+PKG_SECT_GLXINFO:= x11/apps
PKG_DESCR_GLXGEARS:= Nice little OpenGL demo application
-PKG_SECT_GLXGEARS:= x11
+PKG_SECT_GLXGEARS:= x11/apps
WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION}
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 50b2f005b..5a82ff0de 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 20070115
PKG_RELEASE:= 8
PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350
PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_DEPENDS:= kmod-ipv6 libpthread
PKG_URL:= http://www.sixxs.net
PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index 918bcd22b..76982536f 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f7a24ed8fad122c4187d06bfd6f998b4
PKG_DESCR:= set of tools for auditing wireless networks
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= libpthread libopenssl libpcap
PKG_BUILDDEP+= openssl libpcap
PKG_URL:= http://www.aircrack-ng.org
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8cdcc79d3..8013ee5aa 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.22
PKG_RELEASE:= 3
PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d
PKG_DESCR:= ALSA mixer utility
-PKG_SECTION:= utils
+PKG_SECTION:= multimedia
PKG_DEPENDS:= alsa-lib libpthread
PKG_BUILDDEP+= alsa-lib
ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index 3d0f31f07..249f4b8eb 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d
PKG_DESCR:= Generates ARP responses for IP address ranges
-PKG_SECTION:= net
+PKG_SECTION:= route
PKG_DEPENDS:= libpcap libdnet libevent
PKG_BUILDDEP+= libpcap libdnet libevent
PKG_URL:= http://niels.xtdnet.nl/honeyd/
diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile
index bdad7803c..83584fb1e 100644
--- a/package/arpwatch/Makefile
+++ b/package/arpwatch/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1a15
PKG_RELEASE:= 1
PKG_MD5SUM:= cebfeb99c4a7c2a6cee2564770415fe7
PKG_DESCR:= Ethernet monitor program
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libpcap
PKG_BUILDDEP+= libpcap
PKG_URL:= http://www-nrg.ee.lbl.gov
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 1e08d99b0..6cc6cfa52 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.2.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 861f57ba43bfe05dc645e0679a260e41
PKG_DESCR:= Open Source PBX
-PKG_SECTION:= net
+PKG_SECTION:= phone
PKG_MULTI:= 1
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= libncurses libpthread libopenssl libcurl
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 81939a111..e009111fa 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82
PKG_DESCR:= TFTP client
-PKG_SECTION:= net
+PKG_SECTION:= dhcp
PKG_DEPENDS:= libreadline libncurses
PKG_BUILDDEP+= readline ncurses
PKG_URL:= http://freshmeat.net/projects/atftp
diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index 89a9f0d28..d757e9c98 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= aufs2-util
PKG_VERSION:= 130809
PKG_RELEASE:= 1
PKG_DESCR:= aufs2 utilities
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_URL:= http://aufs.sf.net/
PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd !netbsd
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index 3e40e7a15..7526535dd 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.65
PKG_RELEASE:= 1
PKG_MD5SUM:= 46cfb40e0babf4c64f8325f03da81c9b
PKG_DESCR:= GNU autoconf
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/autoconf/
PKG_SITES:= ${MASTER_SITE_GNU:=autoconf/}
PKG_OPTS:= noscripts
diff --git a/package/automake/Makefile b/package/automake/Makefile
index 645d44f3f..58fbb1969 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.10
PKG_RELEASE:= 3
PKG_MD5SUM:= 452163c32d061c53a7acc0e8c1b689ba
PKG_DESCR:= GNU automake
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_DEPENDS:= microperl
PKG_URL:= http://www.gnu.org/software/automake/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/autossh/Makefile b/package/autossh/Makefile
index d1bb28b24..8f7a776b2 100644
--- a/package/autossh/Makefile
+++ b/package/autossh/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4b
PKG_RELEASE:= 1
PKG_MD5SUM:= 8f9aa006f6f69e912d3c2f504622d6f7
PKG_DESCR:= Automatically restart SSH sessions and tunnels
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= openssh-client
PKG_URL:= http://www.harding.motd.ca/autossh
PKG_SITES:= http://www.harding.motd.ca/autossh/
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index ec3cd6fa1..07a54221d 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.25
PKG_RELEASE:= 1
PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e
PKG_DESCR:= mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
-PKG_SECTION:= net
+PKG_SECTION:= dhcp
PKG_DEPENDS:= libavahi libdaemon libexpat gettext
PKG_BUILDDEP+= libdaemon expat gdbm glib gettext
PKG_URL:= http://avahi.org
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index 38261392f..0b2e60d97 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 03471b5a5874e2ce86025f24b3fa0958
PKG_DESCR:= small embedded webserver
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libaxtls
PKG_URL:= http://axtls.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/}
diff --git a/package/b43-firmware/Makefile b/package/b43-firmware/Makefile
index efd88cc92..311644bd8 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:= sys
+PKG_SECTION:= wifi
PKG_SITES:= http://openadk.org/distfiles/
include ${TOPDIR}/mk/package.mk
diff --git a/package/bind/Makefile b/package/bind/Makefile
index eb6eb46da..9186bddcd 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 9.7.0
PKG_RELEASE:= 1
PKG_MD5SUM:= c245b5d1aa0a4f53d9538faa1efe2c3f
PKG_DESCR:= popular DNS server
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_DEPENDS:= libopenssl libbind libxml2
PKG_BUILDDEP+= openssl libxml2
PKG_URL:= https://www.isc.org/software/bind
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 3d54ff6ea..8bcda8249 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/binutils/Makefile.inc
PKG_DESCR:= binary utilities (nm, objdump, ar, as, ..)
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_HOST_DEPENDS:= !cygwin
include ${TOPDIR}/mk/package.mk
diff --git a/package/bison/Makefile b/package/bison/Makefile
index 4c36f5892..b3642d177 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c58aa1da418dc9704070872489e89bf5
PKG_DESCR:= GNU parser generator
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/bison
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index a0fbdab1a..223fdd654 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 26b9bfc5446bdf0e932e8074d117be67
PKG_DESCR:= IRC gateway to IM chat networks
-PKG_SECTION:= net
+PKG_SECTION:= chat
PKG_DEPENDS:= glib libiconv libopenssl
PKG_BUILDDEP+= glib libiconv openssl
PKG_URL:= http://www.bitlbee.org
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index b80a1c2ea..1eca25805 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 0182fcac3a2b307113bbec34e5f1c673
PKG_DESCR:= Ethernet bridging tools
-PKG_SECTION:= net
+PKG_SECTION:= bridge
PKG_DEPENDS:= kmod-bridge
PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/}
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index f14b8db53..0485fa800 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
-PKG_VERSION:= 1.16.2
+PKG_VERSION:= 1.17.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 2ba980f720a5bdce4ec05423519acc35
+PKG_MD5SUM:= 2908d1d1ca83ff12bc0b05f0d2a3335c
PKG_DESCR:= Core utilities for embedded Linux systems
PKG_SECTION:= base
PKG_URL:= http://www.busybox.net/
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index fb740df91..80f3564db 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,7 +1,7 @@
-diff -Nur busybox-1.16.1.orig/archival/Config.in busybox-1.16.1/archival/Config.in
---- busybox-1.16.1.orig/archival/Config.in 2010-03-28 19:43:35.000000000 +0200
-+++ busybox-1.16.1/archival/Config.in 2010-06-29 17:31:21.805863709 +0200
-@@ -187,6 +187,14 @@
+diff -Nur busybox-1.17.0.orig/archival/Config.src busybox-1.17.0/archival/Config.src
+--- busybox-1.17.0.orig/archival/Config.src 2010-06-25 01:32:35.000000000 +0200
++++ busybox-1.17.0/archival/Config.src 2010-07-08 12:04:28.571001869 +0200
+@@ -202,6 +202,14 @@
are actually slower than gzip at equivalent compression ratios
and take up 3.2K of code.
@@ -15,10 +15,10 @@ diff -Nur busybox-1.16.1.orig/archival/Config.in busybox-1.16.1/archival/Config.
+
config RPM2CPIO
bool "rpm2cpio"
- default n
-diff -Nur busybox-1.16.1.orig/archival/ipkg.c busybox-1.16.1/archival/ipkg.c
---- busybox-1.16.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/ipkg.c 2010-06-29 17:31:21.827118101 +0200
+ default y
+diff -Nur busybox-1.17.0.orig/archival/ipkg.c busybox-1.17.0/archival/ipkg.c
+--- busybox-1.17.0.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/ipkg.c 2010-07-08 12:01:56.199003930 +0200
@@ -0,0 +1,28 @@
+/* ipkg.c - the itsy package management system
+
@@ -48,20 +48,20 @@ diff -Nur busybox-1.16.1.orig/archival/ipkg.c busybox-1.16.1/archival/ipkg.c
+{
+ return ipkg_op(argc, argv);
+}
-diff -Nur busybox-1.16.1.orig/archival/Kbuild busybox-1.16.1/archival/Kbuild
---- busybox-1.16.1.orig/archival/Kbuild 2010-03-20 03:58:07.000000000 +0100
-+++ busybox-1.16.1/archival/Kbuild 2010-06-29 17:31:21.865866986 +0200
-@@ -16,6 +16,7 @@
- lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o
- lib-$(CONFIG_GUNZIP) += bbunzip.o
+diff -Nur busybox-1.17.0.orig/archival/Kbuild.src busybox-1.17.0/archival/Kbuild.src
+--- busybox-1.17.0.orig/archival/Kbuild.src 2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0/archival/Kbuild.src 2010-07-08 12:02:53.135001644 +0200
+@@ -23,6 +23,7 @@
+ lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o
lib-$(CONFIG_GZIP) += gzip.o bbunzip.o
+ lib-$(CONFIG_BZIP2) += bzip2.o bbunzip.o
+lib-$(CONFIG_IPKG) += ipkg.o
- lib-$(CONFIG_LZOP) += lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o bbunzip.o
- lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o
- lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
-diff -Nur busybox-1.16.1.orig/archival/libipkg/args.c busybox-1.16.1/archival/libipkg/args.c
---- busybox-1.16.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/args.c 2010-06-29 17:31:21.905863813 +0200
+
+ lib-$(CONFIG_UNXZ) += bbunzip.o
+ lib-$(CONFIG_UNLZMA) += bbunzip.o
+diff -Nur busybox-1.17.0.orig/archival/libipkg/args.c busybox-1.17.0/archival/libipkg/args.c
+--- busybox-1.17.0.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/args.c 2010-07-08 12:01:56.199003930 +0200
@@ -0,0 +1,242 @@
+/* args.c - parse command-line args
+
@@ -305,9 +305,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/args.c busybox-1.16.1/archival/li
+{
+ bb_error_msg("version %s\n", IPKG_VERSION);
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/args.h busybox-1.16.1/archival/libipkg/args.h
---- busybox-1.16.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/args.h 2010-06-29 17:31:21.945866019 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/args.h busybox-1.17.0/archival/libipkg/args.h
+--- busybox-1.17.0.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/args.h 2010-07-08 12:01:56.199003930 +0200
@@ -0,0 +1,72 @@
+/* args.h - parse command-line args
+
@@ -381,9 +381,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/args.h busybox-1.16.1/archival/li
+void args_usage(const char *complaint);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.c busybox-1.16.1/archival/libipkg/conffile.c
---- busybox-1.16.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/conffile.c 2010-06-29 17:31:21.987118040 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.c busybox-1.17.0/archival/libipkg/conffile.c
+--- busybox-1.17.0.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/conffile.c 2010-07-08 12:01:56.199003930 +0200
@@ -0,0 +1,65 @@
+/* conffile.c - the itsy package management system
+
@@ -450,9 +450,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.c busybox-1.16.1/archiva
+
+ return ret;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.h busybox-1.16.1/archival/libipkg/conffile.h
---- busybox-1.16.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/conffile.h 2010-06-29 17:31:22.018368070 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.h busybox-1.17.0/archival/libipkg/conffile.h
+--- busybox-1.17.0.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/conffile.h 2010-07-08 12:01:56.203011424 +0200
@@ -0,0 +1,30 @@
+/* conffile.h - the itsy package management system
+
@@ -484,9 +484,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.h busybox-1.16.1/archiva
+
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.c busybox-1.16.1/archival/libipkg/conffile_list.c
---- busybox-1.16.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/conffile_list.c 2010-06-29 17:31:22.055873481 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.c busybox-1.17.0/archival/libipkg/conffile_list.c
+--- busybox-1.17.0.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/conffile_list.c 2010-07-08 12:01:56.203011424 +0200
@@ -0,0 +1,47 @@
+/* conffile_list.c - the itsy package management system
+
@@ -535,9 +535,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.c busybox-1.16.1/ar
+ return nv_pair_list_pop(list);
+}
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.h busybox-1.16.1/archival/libipkg/conffile_list.h
---- busybox-1.16.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/conffile_list.h 2010-06-29 17:31:22.089612450 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.h busybox-1.17.0/archival/libipkg/conffile_list.h
+--- busybox-1.17.0.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/conffile_list.h 2010-07-08 12:01:56.203011424 +0200
@@ -0,0 +1,36 @@
+/* conffile_list.h - the itsy package management system
+
@@ -575,9 +575,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.h busybox-1.16.1/ar
+
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.c busybox-1.16.1/archival/libipkg/file_util.c
---- busybox-1.16.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/file_util.c 2010-06-29 17:31:22.137606321 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.c busybox-1.17.0/archival/libipkg/file_util.c
+--- busybox-1.17.0.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/file_util.c 2010-07-08 12:01:56.203011424 +0200
@@ -0,0 +1,186 @@
+/* file_util.c - convenience routines for common stat operations
+
@@ -765,9 +765,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.c busybox-1.16.1/archiv
+ return hash_file(file_name, HASH_MD5);
+}
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.h busybox-1.16.1/archival/libipkg/file_util.h
---- busybox-1.16.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/file_util.h 2010-06-29 17:31:22.220596553 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.h busybox-1.17.0/archival/libipkg/file_util.h
+--- busybox-1.17.0.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/file_util.h 2010-07-08 12:01:56.203011424 +0200
@@ -0,0 +1,29 @@
+/* file_util.h - convenience routines for common file operations
+
@@ -798,9 +798,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.h busybox-1.16.1/archiv
+uint8_t *file_md5sum_alloc(const char *file_name);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.c busybox-1.16.1/archival/libipkg/hash_table.c
---- busybox-1.16.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/hash_table.c 2010-06-29 17:31:22.257056261 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.c busybox-1.17.0/archival/libipkg/hash_table.c
+--- busybox-1.17.0.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/hash_table.c 2010-07-08 12:01:56.203011424 +0200
@@ -0,0 +1,155 @@
+/* hash.c - hash tables for ipkg
+
@@ -957,9 +957,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.c busybox-1.16.1/archi
+ }
+}
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.h busybox-1.16.1/archival/libipkg/hash_table.h
---- busybox-1.16.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/hash_table.h 2010-06-29 17:31:22.305858166 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.h busybox-1.17.0/archival/libipkg/hash_table.h
+--- busybox-1.17.0.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/hash_table.h 2010-07-08 12:01:56.203011424 +0200
@@ -0,0 +1,44 @@
+/* hash.h - hash tables for ipkg
+
@@ -1005,9 +1005,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.h busybox-1.16.1/archi
+void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
+
+#endif /* _HASH_TABLE_H_ */
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.16.1/archival/libipkg/ipkg_cmd.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_cmd.c 2010-06-29 19:19:50.699618181 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.0/archival/libipkg/ipkg_cmd.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_cmd.c 2010-07-08 12:01:56.206999641 +0200
@@ -0,0 +1,1366 @@
+/* ipkg_cmd.c - the itsy package management system
+
@@ -2375,9 +2375,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.16.1/archiva
+}
+
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.16.1/archival/libipkg/ipkg_cmd.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_cmd.h 2010-06-29 17:31:22.398358961 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.0/archival/libipkg/ipkg_cmd.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_cmd.h 2010-07-08 12:01:56.206999641 +0200
@@ -0,0 +1,41 @@
+/* ipkg_cmd.h - the itsy package management system
+
@@ -2420,9 +2420,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.16.1/archiva
+int pkg_mark_provides(pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.c busybox-1.16.1/archival/libipkg/ipkg_conf.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_conf.c 2010-06-29 17:31:22.425857952 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c busybox-1.17.0/archival/libipkg/ipkg_conf.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_conf.c 2010-07-08 12:01:56.211000430 +0200
@@ -0,0 +1,711 @@
+/* ipkg_conf.c - the itsy package management system
+
@@ -3135,9 +3135,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.c busybox-1.16.1/archiv
+ sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
+ return root_filename;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.h busybox-1.16.1/archival/libipkg/ipkg_conf.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_conf.h 2010-06-29 17:31:22.458368131 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h busybox-1.17.0/archival/libipkg/ipkg_conf.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_conf.h 2010-07-08 12:01:56.211000430 +0200
@@ -0,0 +1,107 @@
+/* ipkg_conf.h - the itsy package management system
+
@@ -3246,9 +3246,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.h busybox-1.16.1/archiv
+char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.c busybox-1.16.1/archival/libipkg/ipkg_configure.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_configure.c 2010-06-29 17:31:22.488368061 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c busybox-1.17.0/archival/libipkg/ipkg_configure.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_configure.c 2010-07-08 12:01:56.211000430 +0200
@@ -0,0 +1,40 @@
+/* ipkg_configure.c - the itsy package management system
+
@@ -3290,9 +3290,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.c busybox-1.16.1/a
+ return 0;
+}
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.h busybox-1.16.1/archival/libipkg/ipkg_configure.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_configure.h 2010-06-29 17:31:22.527882534 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h busybox-1.17.0/archival/libipkg/ipkg_configure.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_configure.h 2010-07-08 12:01:56.211000430 +0200
@@ -0,0 +1,25 @@
+/* ipkg_configure.h - the itsy package management system
+
@@ -3319,9 +3319,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.h busybox-1.16.1/a
+int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.c busybox-1.16.1/archival/libipkg/ipkg_download.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_download.c 2010-06-29 17:31:22.569385415 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.c busybox-1.17.0/archival/libipkg/ipkg_download.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_download.c 2010-07-08 12:01:56.211000430 +0200
@@ -0,0 +1,195 @@
+/* ipkg_download.c - the itsy package management system
+
@@ -3518,9 +3518,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.c busybox-1.16.1/ar
+ }
+ return 0;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.h busybox-1.16.1/archival/libipkg/ipkg_download.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_download.h 2010-06-29 17:31:22.608368046 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.h busybox-1.17.0/archival/libipkg/ipkg_download.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_download.h 2010-07-08 12:01:56.211000430 +0200
@@ -0,0 +1,30 @@
+/* ipkg_download.h - the itsy package management system
+
@@ -3552,9 +3552,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.h busybox-1.16.1/ar
+int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg.h busybox-1.16.1/archival/libipkg/ipkg.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg.h 2010-06-29 17:31:22.647281522 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg.h busybox-1.17.0/archival/libipkg/ipkg.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg.h 2010-07-08 12:01:56.211000430 +0200
@@ -0,0 +1,68 @@
+/* ipkg.h - the itsy package management system
+
@@ -3624,9 +3624,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg.h busybox-1.16.1/archival/li
+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_includes.h busybox-1.16.1/archival/libipkg/ipkg_includes.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_includes.h 2010-06-29 17:32:10.339618090 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h busybox-1.17.0/archival/libipkg/ipkg_includes.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_includes.h 2010-07-08 12:01:56.214999822 +0200
@@ -0,0 +1,81 @@
+#ifndef IPKG_INCLUDES_H
+#define IPKG_INCLUDES_H
@@ -3709,9 +3709,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_includes.h busybox-1.16.1/ar
+#include <sys/mount.h>
+
+#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.c busybox-1.16.1/archival/libipkg/ipkg_install.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_install.c 2010-06-29 17:31:22.727172508 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.c busybox-1.17.0/archival/libipkg/ipkg_install.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_install.c 2010-07-08 12:01:56.219000332 +0200
@@ -0,0 +1,1982 @@
+/* ipkg_install.c - the itsy package management system
+
@@ -5695,9 +5695,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.c busybox-1.16.1/arc
+}
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.h busybox-1.16.1/archival/libipkg/ipkg_install.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_install.h 2010-06-29 17:31:22.768368136 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.h busybox-1.17.0/archival/libipkg/ipkg_install.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_install.h 2010-07-08 12:01:56.219000332 +0200
@@ -0,0 +1,35 @@
+/* ipkg_install.h - the itsy package management system
+
@@ -5734,9 +5734,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.h busybox-1.16.1/arc
+int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.c busybox-1.16.1/archival/libipkg/ipkg_message.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_message.c 2010-06-29 17:31:22.798368009 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.c busybox-1.17.0/archival/libipkg/ipkg_message.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_message.c 2010-07-08 12:01:56.219000332 +0200
@@ -0,0 +1,35 @@
+/* ipkg_message.c - the itsy package management system
+
@@ -5773,9 +5773,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.c busybox-1.16.1/arc
+ ipkg_cb_message(conf,level,ts);
+ }
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.h busybox-1.16.1/archival/libipkg/ipkg_message.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_message.h 2010-06-29 17:31:22.839937503 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.h busybox-1.17.0/archival/libipkg/ipkg_message.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_message.h 2010-07-08 12:01:56.219000332 +0200
@@ -0,0 +1,32 @@
+/* ipkg_message.h - the itsy package management system
+
@@ -5809,9 +5809,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.h busybox-1.16.1/arc
+extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
+
+#endif /* _IPKG_MESSAGE_H_ */
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.c busybox-1.16.1/archival/libipkg/ipkg_remove.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_remove.c 2010-06-29 17:31:22.876628032 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c busybox-1.17.0/archival/libipkg/ipkg_remove.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_remove.c 2010-07-08 12:01:56.219000332 +0200
@@ -0,0 +1,385 @@
+/* ipkg_remove.c - the itsy package management system
+
@@ -6198,9 +6198,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.c busybox-1.16.1/arch
+
+ return 0;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.h busybox-1.16.1/archival/libipkg/ipkg_remove.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_remove.h 2010-06-29 17:31:22.918368225 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.h busybox-1.17.0/archival/libipkg/ipkg_remove.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_remove.h 2010-07-08 12:01:56.223000282 +0200
@@ -0,0 +1,33 @@
+/* ipkg_remove.h - the itsy package management system
+
@@ -6235,9 +6235,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.h busybox-1.16.1/arch
+
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.16.1/archival/libipkg/ipkg_upgrade.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_upgrade.c 2010-06-29 17:31:22.976264794 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.0/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_upgrade.c 2010-07-08 12:01:56.223000282 +0200
@@ -0,0 +1,79 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6318,9 +6318,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.16.1/arc
+ new->state_flag |= SF_USER;
+ return ipkg_install_pkg(conf, new,1);
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.16.1/archival/libipkg/ipkg_upgrade.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_upgrade.h 2010-06-29 17:31:23.015873328 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.0/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_upgrade.h 2010-07-08 12:01:56.223000282 +0200
@@ -0,0 +1,18 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6340,9 +6340,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.16.1/arc
+#include "ipkg.h"
+
+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.c busybox-1.16.1/archival/libipkg/ipkg_utils.c
---- busybox-1.16.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_utils.c 2010-06-29 17:31:23.067592883 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_utils.c busybox-1.17.0/archival/libipkg/ipkg_utils.c
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_utils.c 2010-07-08 12:01:56.227000792 +0200
@@ -0,0 +1,185 @@
+/* ipkg_utils.c - the itsy package management system
+
@@ -6529,9 +6529,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.c busybox-1.16.1/archi
+}
+
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.h busybox-1.16.1/archival/libipkg/ipkg_utils.h
---- busybox-1.16.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/ipkg_utils.h 2010-06-29 17:31:23.105873432 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_utils.h busybox-1.17.0/archival/libipkg/ipkg_utils.h
+--- busybox-1.17.0.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/ipkg_utils.h 2010-07-08 12:01:56.227000792 +0200
@@ -0,0 +1,29 @@
+/* ipkg_utils.h - the itsy package management system
+
@@ -6562,9 +6562,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.h busybox-1.16.1/archi
+int line_is_blank(const char *line);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/Kbuild busybox-1.16.1/archival/libipkg/Kbuild
---- busybox-1.16.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/Kbuild 2010-06-29 17:31:23.145868229 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/Kbuild busybox-1.17.0/archival/libipkg/Kbuild
+--- busybox-1.17.0.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/Kbuild 2010-07-08 12:01:56.227000792 +0200
@@ -0,0 +1,60 @@
+# Makefile for busybox
+#
@@ -6626,9 +6626,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/Kbuild busybox-1.16.1/archival/li
+IPKG_ARCH:=$(TARGET_ARCH)
+endif
+CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.c busybox-1.16.1/archival/libipkg/libipkg.c
---- busybox-1.16.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/libipkg.c 2010-06-29 19:58:50.069617923 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.c busybox-1.17.0/archival/libipkg/libipkg.c
+--- busybox-1.17.0.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/libipkg.c 2010-07-08 12:01:56.231000184 +0200
@@ -0,0 +1,550 @@
+/* ipkglib.c - the itsy package management system
+
@@ -7180,9 +7180,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.c busybox-1.16.1/archival
+
+ return err;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.h busybox-1.16.1/archival/libipkg/libipkg.h
---- busybox-1.16.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/libipkg.h 2010-06-29 17:31:24.283460019 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.h busybox-1.17.0/archival/libipkg/libipkg.h
+--- busybox-1.17.0.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/libipkg.h 2010-07-08 12:01:56.231000184 +0200
@@ -0,0 +1,78 @@
+/* ipkglib.h - the itsy package management system
+
@@ -7262,9 +7262,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.h busybox-1.16.1/archival
+extern void free_error_list(struct errlist **errors);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.c busybox-1.16.1/archival/libipkg/nv_pair.c
---- busybox-1.16.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/nv_pair.c 2010-06-29 17:31:24.316180264 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair.c busybox-1.17.0/archival/libipkg/nv_pair.c
+--- busybox-1.17.0.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/nv_pair.c 2010-07-08 12:01:56.231000184 +0200
@@ -0,0 +1,40 @@
+/* nv_pair.c - the itsy package management system
+
@@ -7306,9 +7306,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.c busybox-1.16.1/archival
+}
+
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.h busybox-1.16.1/archival/libipkg/nv_pair.h
---- busybox-1.16.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/nv_pair.h 2010-06-29 17:31:24.358376170 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair.h busybox-1.17.0/archival/libipkg/nv_pair.h
+--- busybox-1.17.0.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/nv_pair.h 2010-07-08 12:01:56.231000184 +0200
@@ -0,0 +1,32 @@
+/* nv_pair.h - the itsy package management system
+
@@ -7342,9 +7342,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.h busybox-1.16.1/archival
+
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.c busybox-1.16.1/archival/libipkg/nv_pair_list.c
---- busybox-1.16.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/nv_pair_list.c 2010-06-29 17:31:24.395873641 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.c busybox-1.17.0/archival/libipkg/nv_pair_list.c
+--- busybox-1.17.0.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/nv_pair_list.c 2010-07-08 12:01:56.231000184 +0200
@@ -0,0 +1,98 @@
+/* nv_pair_list.c - the itsy package management system
+
@@ -7444,9 +7444,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.c busybox-1.16.1/arc
+ }
+ return NULL;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.h busybox-1.16.1/archival/libipkg/nv_pair_list.h
---- busybox-1.16.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/nv_pair_list.h 2010-06-29 17:31:24.439618049 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.h busybox-1.17.0/archival/libipkg/nv_pair_list.h
+--- busybox-1.17.0.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/nv_pair_list.h 2010-07-08 12:01:56.235001811 +0200
@@ -0,0 +1,60 @@
+/* nv_pair_list.h - the itsy package management system
+
@@ -7508,9 +7508,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.h busybox-1.16.1/arc
+
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.c busybox-1.16.1/archival/libipkg/pkg.c
---- busybox-1.16.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg.c 2010-06-29 17:31:24.502860549 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.c busybox-1.17.0/archival/libipkg/pkg.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg.c 2010-07-08 12:01:56.239000923 +0200
@@ -0,0 +1,1757 @@
+/* pkg.c - the itsy package management system
+
@@ -9269,9 +9269,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.c busybox-1.16.1/archival/lib
+ }
+ return 0;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.c busybox-1.16.1/archival/libipkg/pkg_depends.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_depends.c 2010-06-29 17:31:24.548368104 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.c busybox-1.17.0/archival/libipkg/pkg_depends.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_depends.c 2010-07-08 12:01:56.239000923 +0200
@@ -0,0 +1,1032 @@
+/* pkg_depends.c - the itsy package management system
+
@@ -10305,9 +10305,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.c busybox-1.16.1/arch
+
+ return 0;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.h busybox-1.16.1/archival/libipkg/pkg_depends.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_depends.h 2010-06-29 17:31:24.588368223 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.h busybox-1.17.0/archival/libipkg/pkg_depends.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_depends.h 2010-07-08 12:01:56.239000923 +0200
@@ -0,0 +1,105 @@
+/* pkg_depends.h - the itsy package management system
+
@@ -10414,9 +10414,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.h busybox-1.16.1/arch
+int pkg_dependence_satisfied(depend_t *depend);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.c busybox-1.16.1/archival/libipkg/pkg_dest.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_dest.c 2010-06-29 17:31:24.625873289 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.c busybox-1.17.0/archival/libipkg/pkg_dest.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_dest.c 2010-07-08 12:01:56.239000923 +0200
@@ -0,0 +1,92 @@
+/* pkg_dest.c - the itsy package management system
+
@@ -10510,9 +10510,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.c busybox-1.16.1/archiva
+
+ dest->root_dir = NULL;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.h busybox-1.16.1/archival/libipkg/pkg_dest.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_dest.h 2010-06-29 17:31:24.669618111 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.h busybox-1.17.0/archival/libipkg/pkg_dest.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_dest.h 2010-07-08 12:01:56.239000923 +0200
@@ -0,0 +1,38 @@
+/* pkg_dest.h - the itsy package management system
+
@@ -10552,9 +10552,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.h busybox-1.16.1/archiva
+
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.16.1/archival/libipkg/pkg_dest_list.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_dest_list.c 2010-06-29 17:31:24.715868178 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.0/archival/libipkg/pkg_dest_list.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_dest_list.c 2010-07-08 12:01:56.243001712 +0200
@@ -0,0 +1,85 @@
+/* pkg_dest_list.c - the itsy package management system
+
@@ -10641,9 +10641,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.16.1/ar
+{
+ return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.16.1/archival/libipkg/pkg_dest_list.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_dest_list.h 2010-06-29 17:31:24.760275316 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.0/archival/libipkg/pkg_dest_list.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_dest_list.h 2010-07-08 12:01:56.243001712 +0200
@@ -0,0 +1,50 @@
+/* pkg_dest_list.h - the itsy package management system
+
@@ -10695,9 +10695,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.16.1/ar
+
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.c busybox-1.16.1/archival/libipkg/pkg_extract.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_extract.c 2010-06-29 17:31:24.818364193 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.c busybox-1.17.0/archival/libipkg/pkg_extract.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_extract.c 2010-07-08 12:01:56.243001712 +0200
@@ -0,0 +1,255 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -10954,9 +10954,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.c busybox-1.16.1/arch
+
+ return 0;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.h busybox-1.16.1/archival/libipkg/pkg_extract.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_extract.h 2010-06-29 17:31:24.858368110 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.h busybox-1.17.0/archival/libipkg/pkg_extract.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_extract.h 2010-07-08 12:01:56.243001712 +0200
@@ -0,0 +1,32 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -10990,9 +10990,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.h busybox-1.16.1/arch
+int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.h busybox-1.16.1/archival/libipkg/pkg.h
---- busybox-1.16.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg.h 2010-06-29 17:31:24.897965989 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.h busybox-1.17.0/archival/libipkg/pkg.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg.h 2010-07-08 12:01:56.243001712 +0200
@@ -0,0 +1,229 @@
+/* pkg.h - the itsy package management system
+
@@ -11223,9 +11223,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.h busybox-1.16.1/archival/lib
+int pkg_write_changed_filelists(ipkg_conf_t *conf);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.c busybox-1.16.1/archival/libipkg/pkg_hash.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_hash.c 2010-06-29 17:31:24.956062867 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_hash.c busybox-1.17.0/archival/libipkg/pkg_hash.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_hash.c 2010-07-08 12:01:56.243001712 +0200
@@ -0,0 +1,623 @@
+/* ipkg_hash.c - the itsy package management system
+
@@ -11850,9 +11850,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.c busybox-1.16.1/archiva
+}
+
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.h busybox-1.16.1/archival/libipkg/pkg_hash.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_hash.h 2010-06-29 17:31:25.005861391 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_hash.h busybox-1.17.0/archival/libipkg/pkg_hash.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_hash.h 2010-07-08 12:01:56.327000396 +0200
@@ -0,0 +1,61 @@
+/* pkg_hash.h - the itsy package management system
+
@@ -11915,9 +11915,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.h busybox-1.16.1/archiva
+
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.c busybox-1.16.1/archival/libipkg/pkg_parse.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_parse.c 2010-06-29 17:31:25.059133294 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.c busybox-1.17.0/archival/libipkg/pkg_parse.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_parse.c 2010-07-08 12:01:56.343005785 +0200
@@ -0,0 +1,368 @@
+/* pkg_parse.c - the itsy package management system
+
@@ -12287,9 +12287,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.c busybox-1.16.1/archiv
+
+ return 0;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.h busybox-1.16.1/archival/libipkg/pkg_parse.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_parse.h 2010-06-29 17:31:25.098367969 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.h busybox-1.17.0/archival/libipkg/pkg_parse.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_parse.h 2010-07-08 12:01:56.343005785 +0200
@@ -0,0 +1,31 @@
+/* pkg_parse.h - the itsy package management system
+
@@ -12322,9 +12322,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.h busybox-1.16.1/archiv
+int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.c busybox-1.16.1/archival/libipkg/pkg_src.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_src.c 2010-06-29 17:31:25.135873346 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src.c busybox-1.17.0/archival/libipkg/pkg_src.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_src.c 2010-07-08 12:01:56.343005785 +0200
@@ -0,0 +1,43 @@
+/* pkg_src.c - the itsy package management system
+
@@ -12369,9 +12369,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.c busybox-1.16.1/archival
+}
+
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.h busybox-1.16.1/archival/libipkg/pkg_src.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_src.h 2010-06-29 17:31:25.195873136 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src.h busybox-1.17.0/archival/libipkg/pkg_src.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_src.h 2010-07-08 12:01:56.343005785 +0200
@@ -0,0 +1,34 @@
+/* pkg_src.h - the itsy package management system
+
@@ -12407,9 +12407,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.h busybox-1.16.1/archival
+void pkg_src_deinit(pkg_src_t *src);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.c busybox-1.16.1/archival/libipkg/pkg_src_list.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_src_list.c 2010-06-29 17:31:25.238287396 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.c busybox-1.17.0/archival/libipkg/pkg_src_list.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_src_list.c 2010-07-08 12:01:56.359001397 +0200
@@ -0,0 +1,75 @@
+/* pkg_src_list.c - the itsy package management system
+
@@ -12486,9 +12486,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.c busybox-1.16.1/arc
+{
+ return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.h busybox-1.16.1/archival/libipkg/pkg_src_list.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_src_list.h 2010-06-29 17:31:25.278367968 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.h busybox-1.17.0/archival/libipkg/pkg_src_list.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_src_list.h 2010-07-08 12:01:56.359001397 +0200
@@ -0,0 +1,57 @@
+/* pkg_src_list.h - the itsy package management system
+
@@ -12547,9 +12547,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.h busybox-1.16.1/arc
+
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.c busybox-1.16.1/archival/libipkg/pkg_vec.c
---- busybox-1.16.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_vec.c 2010-06-29 17:31:25.319617983 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.c busybox-1.17.0/archival/libipkg/pkg_vec.c
+--- busybox-1.17.0.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_vec.c 2010-07-08 12:01:56.367001298 +0200
@@ -0,0 +1,231 @@
+/* pkg_vec.c - the itsy package management system
+
@@ -12782,9 +12782,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.c busybox-1.16.1/archival
+ qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
+}
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.h busybox-1.16.1/archival/libipkg/pkg_vec.h
---- busybox-1.16.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/pkg_vec.h 2010-06-29 17:31:25.358368186 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.h busybox-1.17.0/archival/libipkg/pkg_vec.h
+--- busybox-1.17.0.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/pkg_vec.h 2010-07-08 12:01:56.367001298 +0200
@@ -0,0 +1,62 @@
+/* pkg_vec.h - the itsy package management system
+
@@ -12848,9 +12848,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.h busybox-1.16.1/archival
+void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.16.1/archival/libipkg/sprintf_alloc.h
---- busybox-1.16.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/sprintf_alloc.h 2010-06-29 17:31:25.395865857 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.0/archival/libipkg/sprintf_alloc.h
+--- busybox-1.17.0.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/sprintf_alloc.h 2010-07-08 12:01:56.375003713 +0200
@@ -0,0 +1,25 @@
+/* sprintf_alloca.c -- like sprintf with memory allocation
+
@@ -12877,9 +12877,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.16.1/ar
+#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args)
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.c busybox-1.16.1/archival/libipkg/str_list.c
---- busybox-1.16.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/str_list.c 2010-06-29 17:31:25.437577685 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.c busybox-1.17.0/archival/libipkg/str_list.c
+--- busybox-1.17.0.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/str_list.c 2010-07-08 12:01:56.375003713 +0200
@@ -0,0 +1,76 @@
+/* str_list.c - the itsy package management system
+
@@ -12957,9 +12957,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.c busybox-1.16.1/archiva
+ (void *)target_str,
+ (void_list_cmp_t)strcmp);
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.h busybox-1.16.1/archival/libipkg/str_list.h
---- busybox-1.16.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/str_list.h 2010-06-29 17:31:25.487410851 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.h busybox-1.17.0/archival/libipkg/str_list.h
+--- busybox-1.17.0.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/str_list.h 2010-07-08 12:01:56.375003713 +0200
@@ -0,0 +1,51 @@
+/* str_list.h - the itsy package management system
+
@@ -13012,9 +13012,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.h busybox-1.16.1/archiva
+char *str_list_remove_elt(str_list_t *list, const char *target_str);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.c busybox-1.16.1/archival/libipkg/str_util.c
---- busybox-1.16.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/str_util.c 2010-06-29 17:31:25.540714295 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.c busybox-1.17.0/archival/libipkg/str_util.c
+--- busybox-1.17.0.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/str_util.c 2010-07-08 12:01:56.375003713 +0200
@@ -0,0 +1,69 @@
+/* str_utils.c - the itsy package management system
+
@@ -13085,9 +13085,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.c busybox-1.16.1/archiva
+ return str ? strdup(str) : NULL;
+}
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.h busybox-1.16.1/archival/libipkg/str_util.h
---- busybox-1.16.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/str_util.h 2010-06-29 17:31:25.578749246 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.h busybox-1.17.0/archival/libipkg/str_util.h
+--- busybox-1.17.0.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/str_util.h 2010-07-08 12:01:56.391000442 +0200
@@ -0,0 +1,27 @@
+/* str_utils.h - the itsy package management system
+
@@ -13116,9 +13116,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.h busybox-1.16.1/archiva
+char *str_dup_safe(const char *str);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/user.c busybox-1.16.1/archival/libipkg/user.c
---- busybox-1.16.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/user.c 2010-06-29 17:31:25.628536327 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/user.c busybox-1.17.0/archival/libipkg/user.c
+--- busybox-1.17.0.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/user.c 2010-07-08 12:01:56.391000442 +0200
@@ -0,0 +1,49 @@
+/* user.c - the itsy package management system
+
@@ -13169,9 +13169,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/user.c busybox-1.16.1/archival/li
+
+ return response;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/user.h busybox-1.16.1/archival/libipkg/user.h
---- busybox-1.16.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/user.h 2010-06-29 17:31:25.678337891 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/user.h busybox-1.17.0/archival/libipkg/user.h
+--- busybox-1.17.0.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/user.h 2010-07-08 12:01:56.391000442 +0200
@@ -0,0 +1,23 @@
+/* user.c - the itsy package management system
+
@@ -13196,9 +13196,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/user.h busybox-1.16.1/archival/li
+
+char *get_user_response(const char *format, ...);
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.c busybox-1.16.1/archival/libipkg/void_list.c
---- busybox-1.16.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/void_list.c 2010-06-29 17:31:25.715873105 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.c busybox-1.17.0/archival/libipkg/void_list.c
+--- busybox-1.17.0.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/void_list.c 2010-07-08 12:01:56.407001361 +0200
@@ -0,0 +1,194 @@
+/* void_list.c - the itsy package management system
+
@@ -13394,9 +13394,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.c busybox-1.16.1/archiv
+ else
+ return NULL;
+}
-diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.h busybox-1.16.1/archival/libipkg/void_list.h
---- busybox-1.16.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/void_list.h 2010-06-29 17:31:25.758368030 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.h busybox-1.17.0/archival/libipkg/void_list.h
+--- busybox-1.17.0.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/void_list.h 2010-07-08 12:01:56.407001361 +0200
@@ -0,0 +1,59 @@
+/* void_list.h - the itsy package management system
+
@@ -13457,9 +13457,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.h busybox-1.16.1/archiv
+void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
+
+#endif
-diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.c busybox-1.16.1/archival/libipkg/xsystem.c
---- busybox-1.16.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/xsystem.c 2010-06-29 17:31:25.799781135 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.c busybox-1.17.0/archival/libipkg/xsystem.c
+--- busybox-1.17.0.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/xsystem.c 2010-07-08 12:01:56.407001361 +0200
@@ -0,0 +1,64 @@
+/* xsystem.c - system(3) with error messages
+
@@ -13525,9 +13525,9 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.c busybox-1.16.1/archival
+ return -1;
+}
+
-diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.h busybox-1.16.1/archival/libipkg/xsystem.h
---- busybox-1.16.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.16.1/archival/libipkg/xsystem.h 2010-06-29 17:31:25.855865061 +0200
+diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.h busybox-1.17.0/archival/libipkg/xsystem.h
+--- busybox-1.17.0.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.0/archival/libipkg/xsystem.h 2010-07-08 12:01:56.407001361 +0200
@@ -0,0 +1,34 @@
+/* xsystem.h - system(3) with error messages
+
@@ -13563,10 +13563,10 @@ diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.h busybox-1.16.1/archival
+
+#endif
+
-diff -Nur busybox-1.16.1.orig/archival/libunarchive/Kbuild busybox-1.16.1/archival/libunarchive/Kbuild
---- busybox-1.16.1.orig/archival/libunarchive/Kbuild 2010-03-20 03:58:07.000000000 +0100
-+++ busybox-1.16.1/archival/libunarchive/Kbuild 2010-06-29 17:31:25.898368046 +0200
-@@ -40,6 +40,7 @@
+diff -Nur busybox-1.17.0.orig/archival/libunarchive/Kbuild.src busybox-1.17.0/archival/libunarchive/Kbuild.src
+--- busybox-1.17.0.orig/archival/libunarchive/Kbuild.src 2010-07-06 02:15:46.000000000 +0200
++++ busybox-1.17.0/archival/libunarchive/Kbuild.src 2010-07-08 12:03:29.499017277 +0200
+@@ -43,6 +43,7 @@
lib-$(CONFIG_DPKG) += $(DPKG_FILES)
lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES)
lib-$(CONFIG_GUNZIP) += decompress_unzip.o
@@ -13574,10 +13574,10 @@ diff -Nur busybox-1.16.1.orig/archival/libunarchive/Kbuild busybox-1.16.1/archiv
lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o
lib-$(CONFIG_RPM) += open_transformer.o decompress_unzip.o get_header_cpio.o
lib-$(CONFIG_TAR) += get_header_tar.o
-diff -Nur busybox-1.16.1.orig/include/applets.h busybox-1.16.1/include/applets.h
---- busybox-1.16.1.orig/include/applets.h 2010-03-28 19:43:35.000000000 +0200
-+++ busybox-1.16.1/include/applets.h 2010-06-29 17:31:25.938368064 +0200
-@@ -214,6 +214,7 @@
+diff -Nur busybox-1.17.0.orig/include/applets.src.h busybox-1.17.0/include/applets.src.h
+--- busybox-1.17.0.orig/include/applets.src.h 2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0/include/applets.src.h 2010-07-08 12:04:57.087012849 +0200
+@@ -209,6 +209,7 @@
IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP))
IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
IF_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
@@ -13585,10 +13585,10 @@ diff -Nur busybox-1.16.1.orig/include/applets.h busybox-1.16.1/include/applets.h
IF_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_DROP))
IF_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_DROP))
IF_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_DROP))
-diff -Nur busybox-1.16.1.orig/include/unarchive.h busybox-1.16.1/include/unarchive.h
---- busybox-1.16.1.orig/include/unarchive.h 2010-03-28 19:43:35.000000000 +0200
-+++ busybox-1.16.1/include/unarchive.h 2010-06-29 17:31:25.978368044 +0200
-@@ -53,7 +53,7 @@
+diff -Nur busybox-1.17.0.orig/include/unarchive.h busybox-1.17.0/include/unarchive.h
+--- busybox-1.17.0.orig/include/unarchive.h 2010-07-03 13:18:17.000000000 +0200
++++ busybox-1.17.0/include/unarchive.h 2010-07-08 12:01:56.422999486 +0200
+@@ -76,7 +76,7 @@
off_t offset;
/* Archiver specific. Can make it a union if it ever gets big */
@@ -13597,7 +13597,7 @@ diff -Nur busybox-1.16.1.orig/include/unarchive.h busybox-1.16.1/include/unarchi
smallint tar__end;
# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
char* tar__longname;
-@@ -65,7 +65,7 @@
+@@ -95,7 +95,7 @@
struct hardlinks_t *cpio__hardlinks_to_create;
struct hardlinks_t *cpio__created_hardlinks;
#endif
@@ -13606,10 +13606,10 @@ diff -Nur busybox-1.16.1.orig/include/unarchive.h busybox-1.16.1/include/unarchi
/* Temporary storage */
char *dpkg__buffer;
/* How to process any sub archive, e.g. get_header_tar_gz */
-diff -Nur busybox-1.16.1.orig/include/usage.h busybox-1.16.1/include/usage.h
---- busybox-1.16.1.orig/include/usage.h 2010-03-28 19:44:04.000000000 +0200
-+++ busybox-1.16.1/include/usage.h 2010-06-29 17:31:26.018367985 +0200
-@@ -1592,6 +1592,82 @@
+diff -Nur busybox-1.17.0.orig/include/usage.src.h busybox-1.17.0/include/usage.src.h
+--- busybox-1.17.0.orig/include/usage.src.h 2010-07-03 13:18:17.000000000 +0200
++++ busybox-1.17.0/include/usage.src.h 2010-07-08 12:07:04.099000968 +0200
+@@ -1556,6 +1556,82 @@
"$ ls -la /tmp/busybox*\n" \
"-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
@@ -13692,10 +13692,10 @@ diff -Nur busybox-1.16.1.orig/include/usage.h busybox-1.16.1/include/usage.h
#define halt_trivial_usage \
"[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
#define halt_full_usage "\n\n" \
-diff -Nur busybox-1.16.1.orig/Makefile busybox-1.16.1/Makefile
---- busybox-1.16.1.orig/Makefile 2010-03-28 19:44:09.000000000 +0200
-+++ busybox-1.16.1/Makefile 2010-06-29 17:31:26.058368031 +0200
-@@ -454,6 +454,7 @@
+diff -Nur busybox-1.17.0.orig/Makefile busybox-1.17.0/Makefile
+--- busybox-1.17.0.orig/Makefile 2010-07-06 04:16:45.000000000 +0200
++++ busybox-1.17.0/Makefile 2010-07-08 12:01:56.455000212 +0200
+@@ -459,6 +459,7 @@
libs-y := \
archival/ \
diff --git a/package/busybox/patches/002-find-empty.patch b/package/busybox/patches/002-find-empty.patch
index 776196ce4..f8c1f98cf 100644
--- a/package/busybox/patches/002-find-empty.patch
+++ b/package/busybox/patches/002-find-empty.patch
@@ -1,25 +1,22 @@
-diff -Nur busybox-1.15.2.orig/findutils/Config.in busybox-1.15.2/findutils/Config.in
---- busybox-1.15.2.orig/findutils/Config.in 2009-09-26 15:14:57.000000000 +0200
-+++ busybox-1.15.2/findutils/Config.in 2009-11-28 12:41:31.000000000 +0100
-@@ -81,6 +81,14 @@
- help
- Support the 'find -inum' option for searching by inode number.
-
-+config FEATURE_FIND_EMPTY
-+ bool "Enable -empty option matching empty files and directories"
-+ default y
-+ depends on FIND
-+ help
-+ Support the 'find -empty' option for searching empty files
-+ and directories.
-+
- config FEATURE_FIND_EXEC
- bool "Enable -exec: execute commands"
- default y
-diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
---- busybox-1.15.2.orig/findutils/find.c 2009-10-08 03:04:40.000000000 +0200
-+++ busybox-1.15.2/findutils/find.c 2009-11-28 12:48:36.000000000 +0100
-@@ -93,6 +93,7 @@
+diff -Nur busybox-1.17.0.orig/findutils/find.c busybox-1.17.0/findutils/find.c
+--- busybox-1.17.0.orig/findutils/find.c 2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0/findutils/find.c 2010-07-08 12:33:55.759015289 +0200
+@@ -133,6 +133,14 @@
+ //config: help
+ //config: Support the 'find -inum' option for searching by inode number.
+ //config:
++//config:config FEATURE_FIND_EMPTY
++//config: bool "Enable -empty option matching empty files and directories"
++//config: default y
++//config: depends on FIND
++//config: help
++//config: Support the 'find -empty' option for searching empty files
++//config: and directories.
++//config:
+ //config:config FEATURE_FIND_EXEC
+ //config: bool "Enable -exec: execute commands"
+ //config: default y
+@@ -270,6 +278,7 @@
IF_FEATURE_FIND_CONTEXT(ACTS(context, security_context_t context;))
IF_FEATURE_FIND_PAREN( ACTS(paren, action ***subexpr;))
IF_FEATURE_FIND_PRUNE( ACTS(prune))
@@ -27,7 +24,7 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
IF_FEATURE_FIND_DELETE( ACTS(delete))
IF_FEATURE_FIND_EXEC( ACTS(exec, char **exec_argv; unsigned *subst_count; int exec_argc;))
IF_FEATURE_FIND_GROUP( ACTS(group, gid_t gid;))
-@@ -333,6 +334,34 @@
+@@ -519,6 +528,34 @@
return exec_actions(ap->subexpr, fileName, statbuf);
}
#endif
@@ -62,7 +59,7 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
#if ENABLE_FEATURE_FIND_SIZE
ACTF(size)
{
-@@ -476,6 +505,7 @@
+@@ -686,6 +723,7 @@
IF_FEATURE_FIND_PRINT0( PARM_print0 ,)
IF_FEATURE_FIND_DEPTH( PARM_depth ,)
IF_FEATURE_FIND_PRUNE( PARM_prune ,)
@@ -70,7 +67,7 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
IF_FEATURE_FIND_DELETE( PARM_delete ,)
IF_FEATURE_FIND_EXEC( PARM_exec ,)
IF_FEATURE_FIND_PAREN( PARM_char_brace,)
-@@ -509,6 +539,7 @@
+@@ -720,6 +758,7 @@
IF_FEATURE_FIND_PRINT0( "-print0\0" )
IF_FEATURE_FIND_DEPTH( "-depth\0" )
IF_FEATURE_FIND_PRUNE( "-prune\0" )
@@ -78,7 +75,7 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
IF_FEATURE_FIND_DELETE( "-delete\0" )
IF_FEATURE_FIND_EXEC( "-exec\0" )
IF_FEATURE_FIND_PAREN( "(\0" )
-@@ -627,6 +658,12 @@
+@@ -839,6 +878,12 @@
(void) ALLOC_ACTION(prune);
}
#endif
@@ -91,15 +88,3 @@ diff -Nur busybox-1.15.2.orig/findutils/find.c busybox-1.15.2/findutils/find.c
#if ENABLE_FEATURE_FIND_DELETE
else if (parm == PARM_delete) {
G.need_print = 0;
-diff -Nur busybox-1.15.2.orig/include/usage.h busybox-1.15.2/include/usage.h
---- busybox-1.15.2.orig/include/usage.h 2009-10-08 02:59:09.000000000 +0200
-+++ busybox-1.15.2/include/usage.h 2009-11-28 12:42:43.000000000 +0100
-@@ -1239,6 +1239,8 @@
- "\n -group NAME File belongs to group NAME (numeric group ID allowed)") \
- IF_FEATURE_FIND_DEPTH( \
- "\n -depth Process directory name after traversing it") \
-+ IF_FEATURE_FIND_EMPTY( \
-+ "\n -empty File or directory is empty") \
- IF_FEATURE_FIND_SIZE( \
- "\n -size N[bck] File size is N (c:bytes,k:kbytes,b:512 bytes(def.))." \
- "\n +/-N: file size is bigger/smaller than N") \
diff --git a/package/busybox/patches/patch-include_libbb_h b/package/busybox/patches/patch-include_libbb_h
index 0087dbde5..4f08ed4e5 100644
--- a/package/busybox/patches/patch-include_libbb_h
+++ b/package/busybox/patches/patch-include_libbb_h
@@ -1,18 +1,23 @@
---- busybox-1.15.2.orig/include/libbb.h Thu Oct 8 03:04:16 2009
-+++ busybox-1.15.2/include/libbb.h Sat Dec 19 12:42:57 2009
-@@ -48,6 +48,7 @@
- #define PATH_MAX 256
- #endif
-
+diff -Nur busybox-1.17.0.orig/include/libbb.h busybox-1.17.0/include/libbb.h
+--- busybox-1.17.0.orig/include/libbb.h 2010-07-04 15:32:24.000000000 +0200
++++ busybox-1.17.0/include/libbb.h 2010-07-08 12:27:04.531002165 +0200
+@@ -40,6 +40,9 @@
+ /* Try to pull in PATH_MAX */
+ #include <limits.h>
+ #include <sys/param.h>
++
+#if !(defined __APPLE__ || defined __FreeBSD__ || defined __MirBSD__ )
++
#ifdef HAVE_MNTENT_H
#include <mntent.h>
#endif
-@@ -61,6 +62,7 @@
- #include <selinux/context.h>
+@@ -52,6 +55,9 @@
#include <selinux/flask.h>
#include <selinux/av_permissions.h>
-+#endif
#endif
-
++
++#endif
++
#if ENABLE_LOCALE_SUPPORT
+ # include <locale.h>
+ #else
diff --git a/package/busybox/patches/patch-include_platform_h b/package/busybox/patches/patch-include_platform_h
index 7c5539efe..307c588ec 100644
--- a/package/busybox/patches/patch-include_platform_h
+++ b/package/busybox/patches/patch-include_platform_h
@@ -1,15 +1,16 @@
---- busybox-1.15.2.orig/include/platform.h Sat Sep 26 15:14:33 2009
-+++ busybox-1.15.2/include/platform.h Sat Dec 19 12:53:00 2009
-@@ -7,6 +7,8 @@
- #ifndef BB_PLATFORM_H
- #define BB_PLATFORM_H 1
+diff -Nur busybox-1.17.0.orig/include/platform.h busybox-1.17.0/include/platform.h
+--- busybox-1.17.0.orig/include/platform.h 2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0/include/platform.h 2010-07-08 12:15:16.099001527 +0200
+@@ -20,6 +20,8 @@
+ #define HAVE_STRSIGNAL 1
+ #define HAVE_VASPRINTF 1
+#include <sys/param.h>
+
/* Convenience macros to test the version of gcc. */
#undef __GNUC_PREREQ
#if defined __GNUC__ && defined __GNUC_MINOR__
-@@ -133,7 +135,7 @@ char *strchrnul(const char *s, int c);
+@@ -161,7 +163,7 @@
# define bswap_32 __bswap32
# define bswap_16 __bswap16
# define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN)
@@ -18,16 +19,7 @@
# include <byteswap.h>
# include <endian.h>
#endif
-@@ -190,7 +192,7 @@ char *strchrnul(const char *s, int c);
-
- /* ---- Networking ------------------------------------------ */
-
--#ifndef __APPLE__
-+#if !(defined __APPLE__ || defined BSD)
- # include <arpa/inet.h>
- # if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED)
- typedef int socklen_t;
-@@ -202,7 +204,7 @@ typedef int socklen_t;
+@@ -230,7 +232,7 @@
/* ---- Compiler dependent settings ------------------------- */
#if (defined __digital__ && defined __unix__) \
@@ -36,12 +28,3 @@
# undef HAVE_MNTENT_H
# undef HAVE_SYS_STATFS_H
#else
-@@ -231,7 +233,7 @@ typedef int socklen_t;
- # define HAVE_FEATURES_H
- # include <stdint.h>
- # define HAVE_STDINT_H
--#elif !defined __APPLE__
-+#elif !(defined __APPLE__ || defined BSD)
- /* Largest integral types. */
- # if BB_BIG_ENDIAN
- /* Looks BROKEN! */
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index c954587af..fc15ee0ab 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 3c15a0c8d1d3ee1c46a1634d00617b1a
PKG_DESCR:= bzip2 compression utility
-PKG_SECTION:= utils
+PKG_SECTION:= archive
PKG_URL:= http://www.bzip.org
PKG_SITES:= http://www.bzip.org/1.0.5/
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index 90754fbc7..56ee67f15 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 20090814
PKG_RELEASE:= 2
PKG_MD5SUM:= 307052c985bec7f9a00eb84293eef779
PKG_DESCR:= Collection of common CA certificates
-PKG_SECTION:= shells
+PKG_SECTION:= net/security
PKG_DEPENDS:= openssl-util libopenssl
PKG_URL:= http://packages.debian.org/sid/ca-certificates
PKG_SITES:= http://ftp.debian.org/debian/pool/main/c/ca-certificates/
diff --git a/package/ccid/Makefile b/package/ccid/Makefile
index 98d36a3cd..bd3223d77 100644
--- a/package/ccid/Makefile
+++ b/package/ccid/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.12
PKG_RELEASE:= 1
PKG_MD5SUM:= 7fcdbacacd955659286f988fa9b6e0be
PKG_DESCR:= a generic USB CCID and ICCD driver
-PKG_SECTION:= security
+PKG_SECTION:= crypto
PKG_BUILDDEP+= pcsc-lite
PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html
PKG_SITES:= https://alioth.debian.org/frs/download.php/3281/
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index b4baec4fc..d7bbad374 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b
PKG_DESCR:= Wireless LAN Access Point Controller
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= kmod-tun
PKG_URL:= http://www.chillispot.info
PKG_SITES= http://www.chillispot.info/download/
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 1dbb26fc5..07f54226e 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.10.0
PKG_RELEASE:= 1
PKG_MD5SUM:= c473cf8e9f22f5a9f7ef4c5be1b0c436
PKG_DESCR:= System statistics collection daemon
-PKG_SECTION:= console
+PKG_SECTION:= misc
PKG_DEPENDS:= libpthread
PKG_URL:= http://collectd.org
PKG_SITES:= http://collectd.org/files/
diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index 8f2c25db7..2a9af5a95 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.32
PKG_RELEASE:= 2
PKG_MD5SUM:= db2452680c3d953631299e331daf49ef
PKG_DESCR:= 3G/GPRS datacard control tool
-PKG_SECTION:= console
+PKG_SECTION:= utils
PKG_URL:= http://sourceforge.net/projects/comgt
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=comgt/}
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile
index 70a8f3180..bd7a621af 100644
--- a/package/coreutils/Makefile
+++ b/package/coreutils/Makefile
@@ -13,11 +13,12 @@ PKG_URL:= http://www.gnu.org/software/coreutils/
PKG_SITES:= http://ftp.gnu.org/gnu/coreutils/
PKG_DESCR_TSORT:= topological sort utility
+PKG_SECTION_TSORT:= misc
include $(TOPDIR)/mk/package.mk
#$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TSORT},${PKG_SECTION}))
+$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TSORT},${PKG_SECTION_TSORT}))
post-install:
$(INSTALL_DIR) $(IDIR_TSORT)/usr/bin
diff --git a/package/cpio/Makefile b/package/cpio/Makefile
index ed6b0b43f..d6a31c061 100644
--- a/package/cpio/Makefile
+++ b/package/cpio/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.11
PKG_RELEASE:= 1
PKG_MD5SUM:= 1112bb6c45863468b5496ba128792f6c
PKG_DESCR:= copies files into or out of a cpio archive
-PKG_SECTION:= net
+PKG_SECTION:= archive
PKG_URL:= http://www.gnu.org/software/cpio/
PKG_SITES:= ${MASTER_SITE_GNU:=cpio/}
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index f4efcccf5..3daa946da 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,16 +4,16 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cryptsetup
-PKG_VERSION:= 1.0.7
+PKG_VERSION:= 1.1.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 5eea2a77391a8a1a651b31cbaef59e22
+PKG_MD5SUM:= 318a64470861ea5b92a52f2014f1e7c1
PKG_DESCR:= LUKS cryptsetup tools
PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt \
kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc \
kmod-crypto-sha256 kmod-blk-dev-dm
PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm
-PKG_URL:= http://cryptsetup.googlecode.com
+PKG_URL:= http://cryptsetup.googlecode.com/
PKG_SITES:= http://cryptsetup.googlecode.com/files/
PKG_TARGET_DEPENDS:= !foxboard
diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c
deleted file mode 100644
index 97b356f68..000000000
--- a/package/cryptsetup/patches/patch-lib_setup_c
+++ /dev/null
@@ -1,17 +0,0 @@
-already added in svn upstream
---- cryptsetup-1.0.7.orig/lib/setup.c 2009-07-22 13:12:44.000000000 +0200
-+++ cryptsetup-1.0.7/lib/setup.c 2009-08-22 15:10:32.000000000 +0200
-@@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st
- start:
- mk=NULL;
-
-- if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
-+ if(options->passphrase) {
-+ passwordLen = strlen(options->passphrase);
-+ password = safe_alloc(passwordLen + 1);
-+ strncpy(password, options->passphrase, passwordLen + 1);
-+ tries = 0;
-+ } else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
- tries--;
- else
- tries = 0;
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index aad41b850..c21c89d66 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= openssl
PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6
PKG_DESCR:= console-based BitTorrent client
-PKG_SECTION:= net
+PKG_SECTION:= p2p
PKG_URL:= http://www.rahul.net/dholmes/ctorrent
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dtorrent/}
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 13ed31d70..24fcfa408 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= zlib
PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b
PKG_DESCR:= Common Unix Printing System
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= zlib libpthread
PKG_BUILDDEP+= zlib
PKG_URL:= http://www.cups.org
diff --git a/package/curl/Makefile b/package/curl/Makefile
index a7ddfb1d8..0801155ec 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 7.20.1
PKG_RELEASE:= 1
PKG_MD5SUM:= d7df0507db48546661b155b612cac19c
PKG_DESCR:= a client-side URL transfer tool
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_DEPENDS:= libcurl
PKG_BUILDDEP+= openssl zlib
PKG_URL:= http://curl.haxx.se
diff --git a/package/cutter/Makefile b/package/cutter/Makefile
index 91317e914..0cf8a1c74 100755
--- a/package/cutter/Makefile
+++ b/package/cutter/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.03
PKG_RELEASE:= 1
PKG_MD5SUM:= 50093db9b64277643969ee75b83ebbd1
PKG_DESCR:= Abort TCP/IP connections routed over a firewall
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://www.lowth.com/cutter/software/
PKG_SITES:= http://www.lowth.com/cutter/software/
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 7a3e3f142..a21312e41 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af
PKG_DESCR:= a collection of general-purpose C++ classes
-PKG_SECTION:= net
+PKG_SECTION:= libs
PKG_DEPENDS:= libiconv
PKG_BUILDDEP+= libiconv
PKG_URL:= http://www.tntnet.org
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index f48f2d2ad..4d69720f9 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.10.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a
PKG_DESCR:= web content filter proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_CXX:= DANSGUARDIAN
PKG_DEPENDS:= libpcre zlib
PKG_BUILDDEP+= pcre zlib
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index c4db42838..b21ad8fca 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.6
PKG_RELEASE:= 1
PKG_MD5SUM:= c9e8aeb15daeba4b6283b40bb640e908
PKG_DESCR:= WebDAV filesystem
-PKG_SECTION:= admin
+PKG_SECTION:= net/fs
PKG_BUILDDEP+= libiconv neon
ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
PKG_BUILDDEP+= fuse
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 66121441a..0dc44e852 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.24
PKG_RELEASE:= 1
PKG_MD5SUM:= 565346cecd9cfecf1463540c6086cc2c
PKG_DESCR:= DBUS library
-PKG_SECTION:= net
+PKG_SECTION:= libs
PKG_DEPENDS:= libexpat
PKG_BUILDDEP+= expat
PKG_URL:= http://dbus.freedesktop.org
diff --git a/package/depmaker b/package/depmaker
index 67dcb498d..da3923554 100644
--- a/package/depmaker
+++ b/package/depmaker
@@ -34,5 +34,5 @@ for dn in */Makefile; do
done
print -r -- $x
done >Depends.mk
-#pbar=done
-#print -u2 "$pbar"
+pbar=done
+print -u2 "$pbar"
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index 5589b62cc..c95d620f6 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8
PKG_RELEASE:= 1
PKG_MD5SUM:= fb3670dee9f71af1e55ac5dcd64e213e
PKG_DESCR:= DHCP relay agent
-PKG_SECTION:= net
+PKG_SECTION:= dhcp
PKG_URL:= http://www.nongnu.org/dhcp-fwd
PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ \
http://ftp.cc.uoc.gr/mirrors/nongnu.org/dhcp-fwd/
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index 1b12e3a5c..d3769845e 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.1.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 38a74c89d8913b9b5f33737047623c18
PKG_DESCR:= ISC DHCP server
-PKG_SECTION:= net
+PKG_SECTION:= dhcp
PKG_URL:= https://www.isc.org/software/dhcp
PKG_SITES:= ftp://ftp.isc.org/isc/dhcp/
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile
index 1253b59b9..66fa3c9f6 100644
--- a/package/diffutils/Makefile
+++ b/package/diffutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.8.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 71f9c5ae19b60608f6c7f162da86a428
PKG_DESCR:= show differences between two files
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/diffutils/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index f9c3dbf82..9c6334f70 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2
PKG_RELEASE:= 1
PKG_MD5SUM:= f8bcd62093f178bed81e46cc54e73f42
PKG_DESCR:= small graphical web browser
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= libfltk libxi libiconv libpng zlib libjpeg
PKG_DEPENDS+= libstdcxx
PKG_BUILDDEP+= fltk libXi libiconv jpeg libpng zlib
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 84e1c889f..57cc71bab 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.55
PKG_RELEASE:= 1
PKG_MD5SUM:= b093d7c6bc7f97ae6fd35d048529232a
PKG_DESCR:= A lightweight DNS and DHCP server
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_URL:= http://thekelleys.org.uk/dnsmasq
PKG_SITES:= http://thekelleys.org.uk/dnsmasq/
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index 8fcf39a54..269f26cc4 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.9
PKG_RELEASE:= 1
PKG_MD5SUM:= bd273cf8aa6341c0b52cbac72050bcf4
PKG_DESCR:= Utilities to create and check MS-DOS FAT filesystems
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools
PKG_SITES:= http://www.daniel-baumann.ch/software/dosfstools/
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index a8a6c3420..9bab810f5 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.10
PKG_RELEASE:= 1
PKG_MD5SUM:= b7d0081b17ff6afae85e8dc14157fa57
PKG_DESCR:= A minimal and secure imap server
-PKG_SECTION:= net
+PKG_SECTION:= mail
PKG_URL:= http://www.dovecot.org
PKG_SITES:= http://www.dovecot.org/releases/1.2/
diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile
index 7ec9aba54..8d1241c55 100644
--- a/package/dri2proto/Makefile
+++ b/package/dri2proto/Makefile
@@ -7,8 +7,6 @@ PKG_NAME:= dri2proto
PKG_VERSION:= 2.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 2087269416782cff56f9b22d1449c192
-PKG_DESCR:= DRI2 proto headers
-PKG_URL:= add project url
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
include $(TOPDIR)/mk/package.mk
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 48e39f5ae..8d720680a 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.52
PKG_RELEASE:= 3
PKG_MD5SUM:= 1c69ec674481d7745452f68f2ea5597e
PKG_DESCR:= SSH 2 server/client designed for embedded systems
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_URL:= http://matt.ucc.asn.au/dropbear
PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 65714b2a5..24bd81a07 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.41.12
PKG_RELEASE:= 1
PKG_MD5SUM:= 1b24a21fc0c2381ef420961cbfec733f
PKG_DESCR:= Ext2/3/4 filesystem utilities
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_DEPENDS:= libcom-err libuuid libblkid libpthread
PKG_URL:= http://e2fsprogs.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 7dafb0ff1..35339bb74 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 0e0c20adf2bba6d91dbd0b74a1a38c33
PKG_DESCR:= ethernet bridging firewall tool
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://ebtables.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ebtables/}
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index a555a5db6..80de78b54 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11.7
PKG_RELEASE:= 3
PKG_MD5SUM:= 145c510cae41c204d0f23dce4bdd23ab
PKG_DESCR:= advanced text web browser
-PKG_SECTION:= text
+PKG_SECTION:= browser
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
PKG_URL:= http://elinks.or.cz/
diff --git a/package/esound/Makefile b/package/esound/Makefile
index 3b327bd10..c0d31c270 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.41
PKG_RELEASE:= 2
PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688
PKG_DESCR:= Enlightened Sound Daemon
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libaudiofile
PKG_BUILDDEP+= libaudiofile
PKG_URL:= http://www.tux.org/~ricdude/EsounD.html
diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile
index 95b1a422a..f98696aef 100644
--- a/package/evilwm/Makefile
+++ b/package/evilwm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8fd9256c635cce2289b648a01d54202c
PKG_DESCR:= A minimalist window manager for the X Window System
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= libx11 libxext
PKG_BUILDDEP+= libX11 libXext
PKG_URL:= http://www.6809.org.uk/evilwm/
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 56149598a..e34a8a070 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 55aec784e214037e61400287a55b5426
PKG_DESCR:= memory analysing client tool
-PKG_SECTION:= utils
+PKG_SECTION:= debug
PKG_DEPENDS:= kmod-exmap libreadline glib
PKG_BUILDDEP+= glib readline
PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/
@@ -19,13 +19,14 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION}
PKG_DESCR_EXMAPD:= memory analysing daemon
PKG_DESCR_EXMAPSERVER:= memory analysing server
PKG_DESCR_KMOD_EXMAP:= memory analysing kernel module
+PKG_SECTION_KMOD_EXMAP:=kernel
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPD},${PKG_SECTION}))
$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPSERVER},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD_EXMAP},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD_EXMAP},${PKG_SECTION_KMOD_EXMAP}))
CONFIGURE_ARGS+= --disable-doc
CONFIGURE_ENV+= LIBS="-lncurses"
diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile
index 73888a990..3bf09fc18 100644
--- a/package/ez-ipupdate/Makefile
+++ b/package/ez-ipupdate/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.11b8
PKG_RELEASE:= 10
PKG_MD5SUM:= 000211add4c4845ffa4211841bff4fb0
PKG_DESCR:= a client for dynamic DNS services
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_URL:= http://ez-ipupdate.com
PKG_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ \
http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate/
diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile
index a5a6aa027..d7180e6b0 100644
--- a/package/fakeidentd/Makefile
+++ b/package/fakeidentd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5
PKG_RELEASE:= 1
PKG_MD5SUM:= ebf398bd1843a1fd8c71f5fcf4a6e4f7
PKG_DESCR:= A static, secure identd
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= http://distfiles.gentoo.org/distfiles/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index 7014a7e01..3d06db9cb 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 6.3.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 72c20ad2b9629f1a109668b05a84d823
PKG_DESCR:= fetch mail from a POP or IMAP server
-PKG_SECTION:= text
+PKG_SECTION:= mail
ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
PKG_BUILDDEP+= openssl
endif
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 669c168ba..e9234fa68 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6
PKG_RELEASE:= 1
PKG_MD5SUM:= d6142a9a5821d6a6262a6edb903faa24
PKG_DESCR:= solution to record, convert and stream audio and video
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libfaad2
PKG_BUILDDEP+= faad2
PKG_URL:= http://www.ffmpeg.org
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index a5acfd29a..422bcb298 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.6.6
PKG_RELEASE:= 1
PKG_MD5SUM:= c9a071b31bb90d05edfb93117d0a7537
PKG_DESCR:= graphical webbrowser
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk+ libnotify libidl
PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
PKG_DEPENDS+= libxdamage libxfixes
diff --git a/package/flex/Makefile b/package/flex/Makefile
index 824371592..d026b2458 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.35
PKG_RELEASE:= 1
PKG_MD5SUM:= 201d3f38758d95436cbc64903386de0b
PKG_DESCR:= fast lexical analyzer
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_URL:= http://flex.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index f583e1edd..7ad664321 100644
--- a/package/fluxbox/Makefile
+++ b/package/fluxbox/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= e0be927617be4ffc1ddc79513f4eb0f9
PKG_DESCR:= Fluxbox is an X11 window manager featuring tabs and an iconbar
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= libstdcxx
PKG_BUILDDEP:= libXpm
ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y)
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index 1e97fa654..47ce19f35 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 93bd04e2fb348a0c48e13ab3933f2381
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_DEPENDS:= font-util
PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index a59275335..3e12e5fd2 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= d22283daba10129643800d73f5496aab
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_DEPENDS:= font-util
PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index 3accee27e..fc0b6c227 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= d9383b2ddda241a464343b7b4de370a9
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index 04e6f1a25..645aac5b4 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 200b38e879dcbf922ca2a9f71ad44657
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index be19a95d1..8df46f86f 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8fa38b7845c10ff83d6077a1e238b15b
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index cfb5b1892..271fe18ad 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f36b68aabef2d57258131ce6136c6f50
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index 12582a873..e36e8710e 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= baea1bb10808857e595f13c6be9cbfbe
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index 122a0a9a4..3cba71409 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 000da66f92370ac59e3df1b6719fdd9a
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index 56869767b..a65b12d9d 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 823c3c2a1a2307bdca5961145e3db37d
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index 07b3edfd5..40f4cec26 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f8e982bcaaed199fdac03e9fc12b2952
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index a6618b5e0..97e8ada96 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 08722299c09753a5540a0752ec5b5fc7
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index 2487a68c8..3baa548a4 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 047eae4d061f17d96213c4e78f7abccb
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index b3faf7f7e..efc6bd188 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 171ebfd3733aeae3af91ad57d126d29d
PKG_DESCR:= font util
-PKG_SECTION:= libs
+PKG_SECTION:= x11/apps
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
index 74f1a8aef..2a08c9b10 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 785f2b6e8d6d0dafec08b8d4c54ae2e3
PKG_DESCR:= X fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
index 17d7db7ee..d40360831 100644
--- a/package/freeradius-client/Makefile
+++ b/package/freeradius-client/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.6
PKG_RELEASE:= 1
PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7
PKG_DESCR:= RADIUS client
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
PKG_URL:= http://www.freeradius.org
@@ -16,10 +16,12 @@ PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/ \
http://freeradius.portal-to-web.de/ \
ftp://ftp.uk.freeradius.org/pub/radius/
+PKG_SECTION_LIB:= libs
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FREERADIUS_CLIENT,freeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB}))
CONFIGURE_ENV+= ac_cv_func_uname=no
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index b202f44fd..92313ca39 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.8
PKG_RELEASE:= 1
PKG_MD5SUM:= aa2ae711387af144df7c351b28b8789c
PKG_DESCR:= a flexible RADIUS server
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_MULTI:= 1
PKG_DEPENDS:= libltdl libopenssl libpthread
PKG_BUILDDEP+= libtool openssl
diff --git a/package/frickin/Makefile b/package/frickin/Makefile
index 0c16037a8..b157448de 100644
--- a/package/frickin/Makefile
+++ b/package/frickin/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3
PKG_RELEASE:= 9
PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f
PKG_DESCR:= PPTP proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index f2682d4aa..06d20ec6d 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 4879f06570d2225667534c37fea04213
PKG_DESCR:= Filesystem in Userspace (utilities)
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_DEPENDS:= kmod-fuse-fs
PKG_URL:= http://fuse.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index 38a1afcb8..cae136e1b 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11
PKG_RELEASE:= 1
PKG_MD5SUM:= a0fb49ccb6b910bdbd7e76a9960394e3
PKG_DESCR:= small non-forking webserver
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_DEPENDS:= libiconv
PKG_BUILDDEP+= libowfat libiconv
PKG_URL:= http://www.fefe.de/gatling/
diff --git a/package/gawk/Makefile b/package/gawk/Makefile
index a4d1bbb03..29bd9d162 100644
--- a/package/gawk/Makefile
+++ b/package/gawk/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.7
PKG_RELEASE:= 1
PKG_MD5SUM:= a38d5dec19320ace01f1d16c8beb1363
PKG_DESCR:= GNU awk
-PKG_SECTION:= utils
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/gawk/
PKG_SITES:= ${MASTER_SITE_GNU:=gawk/}
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index b77895f5b..77e346308 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gcc/Makefile.inc
PKG_DESCR:= GNU compiler collection
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_OPTS:= noremove
PKG_DEPENDS:= libgmp mpfr
PKG_BUILDDEP+= gmp mpfr
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 1438ac0b7..07371ea3e 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_DESCR:= GNU debugger
-PKG_SECTION:= comp
+PKG_SECTION:= debug
PKG_DEPENDS:= libthread-db libncurses libiconv libexpat
PKG_BUILDDEP+= ncurses readline libiconv expat
PKG_TARGET_DEPENDS:= !foxboard !ag241
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index a524b79bf..a11971547 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_DESCR:= GNU debugger (small server)
-PKG_SECTION:= comp
+PKG_SECTION:= debug
PKG_DEPENDS:= libthread-db
PKG_TARGET_DEPENDS:= !foxboard
diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile
index 3718147cc..5ef0ed431 100644
--- a/package/gkrellmd/Makefile
+++ b/package/gkrellmd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.3.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 600f4daa395112ed19a3633deb0829ff
PKG_DESCR:= The GNU Krell Monitors Server
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= glib libpthread
PKG_BUILDDEP+= glib
PKG_URL:= http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html
diff --git a/package/glproto/Makefile b/package/glproto/Makefile
index 286dadff2..b9b5ce58d 100644
--- a/package/glproto/Makefile
+++ b/package/glproto/Makefile
@@ -7,10 +7,7 @@ PKG_NAME:= glproto
PKG_VERSION:= 1.4.11
PKG_RELEASE:= 1
PKG_MD5SUM:= 78e7c4dc7dcb74b1869fee7897e00f59
-PKG_DESCR:= GL proto headers
-PKG_URL:= add project url
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index 11b830abe..53ae8367f 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.13.0
PKG_RELEASE:= 1
PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3
PKG_DESCR:= An UPnP music media server
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= id3lib libupnp
PKG_BUILDDEP+= id3lib libupnp
PKG_URL:= http://www.gnu.org/software/gmediaserver
diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile
index 950b1ffbe..3f30ef3c2 100644
--- a/package/gnupg/Makefile
+++ b/package/gnupg/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 991faf66d3352ac1452acc393c430b23
PKG_DESCR:= Gnu Privacy Guard
-PKG_SECTION:= text
+PKG_SECTION:= crypto
PKG_DEPENDS:= libreadline libiconv
PKG_BUILDDEP+= readline libiconv
PKG_URL:= http://www.gnupg.org
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 4745d1594..95f5c6e4d 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.8.5
PKG_RELEASE:= 1
PKG_MD5SUM:= e3b2788b79bfc82acbe717e3c54d4e92
PKG_DESCR:= GNU TLS library
-PKG_SECTION:= libs
+PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt libtasn1 zlib
PKG_BUILDDEP+= libgcrypt liblzo libtasn1 opencdk zlib ncurses
PKG_URL:= http://www.gnu.org/software/gnutls
@@ -18,13 +18,14 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
PKG_DESCR_GNUTLS_UTILS:= GNU TLS utilities
PKG_DEPENDS_GNUTLS_UTILS:= libgnutls libgnutls-extra
+PKG_SECTION_LIB:= libs
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB}))
$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_GNUTLS_UTILS},${PKG_DESCR_GNUTLS_UTILS},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB}))
+$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_LIB}))
CONFIGURE_ARGS+= --without-libopencdk-prefix \
--disable-camellia \
diff --git a/package/gperf/Makefile b/package/gperf/Makefile
index eb6045495..be2b4b4ce 100644
--- a/package/gperf/Makefile
+++ b/package/gperf/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= c1f1db32fb6598d6a93e6e88796a8632
PKG_DESCR:= perfect hash function generator
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/gperf/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/gpm/Makefile b/package/gpm/Makefile
index 2b2866ef0..1233f7401 100644
--- a/package/gpm/Makefile
+++ b/package/gpm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.20.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 3915bdd6bf947ef867752a30b4be2387
PKG_DESCR:= console mouse support
-PKG_SECTION:= text
+PKG_SECTION:= misc
PKG_URL:= http://unix.schottelius.org/gpm
PKG_SITES:= http://unix.schottelius.org/gpm/archives/
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 155934308..a1ce89161 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.92
PKG_RELEASE:= 1
PKG_MD5SUM:= 50b60d9f6dd51e001f4dfbaeb825c988
PKG_DESCR:= An interface daemon for GPS receivers
-PKG_SECTION:= net
+PKG_SECTION:= misc
PKG_DEPENDS:= libpthread
PKG_BUILDDEP+= ncurses
PKG_CXX:= GPSD
diff --git a/package/grep/Makefile b/package/grep/Makefile
index f54894811..d608bd8be 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.4
PKG_RELEASE:= 2
PKG_MD5SUM:= 92258031d98d4f12dfc6a6d24057e672
PKG_DESCR:= global search for a regular expression and print out matched lines
-PKG_SECTION:= text
+PKG_SECTION:= utils
PKG_URL:= http://www.gnu.org/software/grep/
PKG_SITES:= ftp://ftp.gnu.org/gnu/grep/
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index 8a44ad07f..956c20c67 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8.0
PKG_RELEASE:= 1
PKG_MD5SUM:= bd9195d086566f56634c0bcbbbcbebea
PKG_DESCR:= a CGI wrapper to embed shell scripts in HTML documents
-PKG_SECTION:= web
+PKG_SECTION:= lang
PKG_URL:= http://haserl.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=haserl/}
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index bf8ff399f..da8933aea 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 9.15
PKG_RELEASE:= 1
PKG_MD5SUM:= 0524dd10ad986285ff4eeb3507f7471c
PKG_DESCR:= get/set ATA drive parameters
-PKG_SECTION:= misc
+PKG_SECTION:= utils
PKG_URL:= http://sourceforge.net/projects/hdparm
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=hdparm/}
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 96e1e2406..6065af49f 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e
PKG_DESCR:= Kerberos 5 server
-PKG_SECTION:= net
+PKG_SECTION:= crypto
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= libheimdal libheimdal-client libncurses libcom-err
PKG_BUILDDEP+= openssl ncurses e2fsprogs
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index 78ab5e17e..d52aa0a22 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 9c7624b61ea39bbfa70336dc703cd5f1
PKG_DESCR:= X10 home automation control using the CM11A
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_DEPENDS:= setserial
PKG_URL:= http://heyu.tanj.com
PKG_SITES:= http://heyu.tanj.com/download/
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 644e89a23..426dac2e5 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.2
PKG_RELEASE:= 1
PKG_MD5SUM:= f47689c62ee8c1c59989b402d4f130c3
PKG_DESCR:= an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= libnl libopenssl
PKG_BUILDDEP+= libnl openssl
PKG_URL:= http://hostap.epitest.fi
diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index 39fcc7c9b..b39f97a8c 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= a3da5ad8965345eb734695c765010acf
PKG_DESCR:= an HTP (Hypertext Time Protocol) implementation
-PKG_SECTION:= net
+PKG_SECTION:= ntp
PKG_URL:= http://www.vervest.org/htp/
PKG_SITES:= http://www.clevervest.com/htp/archive/c/
diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile
index 8df81f557..134a207a1 100644
--- a/package/httptunnel/Makefile
+++ b/package/httptunnel/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 2a710f377c82ab4eb201458f7b9f99c5
PKG_DESCR:= http tunneling software
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_URL:= http://www.nocrew.org/software/httptunnel
PKG_SITES:= http://www.nocrew.org/software/httptunnel/
diff --git a/package/icecast/Makefile b/package/icecast/Makefile
index b76210189..24e5c6633 100644
--- a/package/icecast/Makefile
+++ b/package/icecast/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_BUILDDEP+= curl libvorbis libxml2 libxslt
PKG_MD5SUM:= ff516b3ccd2bcc31e68f460cd316093f
PKG_DESCR:= A streaming media server
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libcurl libvorbis libpthread libxml2 libxslt
PKG_URL:= http://www.icecast.org/
PKG_SITES:= http://downloads.us.xiph.org/releases/icecast/
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index d5a7db20f..32797780f 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:= a simple dynamic Multicast Routing Daemon
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_URL:= http://sourceforge.net/projects/igmpproxy/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/}
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 38902bf07..aaf17a1a5 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.6.34
PKG_RELEASE:= 1
PKG_MD5SUM:= 5c5742bdac05a1688f266512e685b83c
PKG_DESCR:= iproute2 routing control utility
-PKG_SECTION:= net
+PKG_SECTION:= route
ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),)
PKG_BUILDDEP+= linux-atm
endif
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 3bee75f27..7a3649ae5 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 72861f005746ee27984b2ee715ecc629
PKG_DESCR:= IPsec management tools
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
PKG_URL:= http://ipsec-tools.sourceforge.net
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 0dfca4d14..c6eaec68e 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -8,16 +8,17 @@ PKG_VERSION:= 3.0
PKG_RELEASE:= 2
PKG_MD5SUM:= 92bb09883dd8a77ec5cfbff1c8932b15
PKG_DESCR:= Netfilter ip sets administration utility
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://ipset.netfilter.org
PKG_SITES:= http://ipset.netfilter.org/
+PKG_SECTION_KMOD_IPSET:=kernel
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION_KMOD_IPSET}))
CONFIG_STYLE:= manual
diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile
index cebcfc057..eb5d1bc8c 100644
--- a/package/iptables-snmp/Makefile
+++ b/package/iptables-snmp/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= net-snmp
PKG_MD5SUM:= 8370d2f0c899461a053da491400119d1
PKG_DESCR:= iptables support for net-snmp
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://www.nobiscuit.com/iptables-snmp/
PKG_SITES:= http://www.nobiscuit.com/iptables-snmp/
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 10d1928bf..d22f847a5 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 697ed89f37af4473a5f6349ba2700f2d
PKG_DESCR:= The netfilter firewalling software
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack
PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-nf-nat
PKG_DEPENDS+= kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index d67820445..5875f0c49 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8.13
PKG_RELEASE:= 1
PKG_MD5SUM:= 0d6fc2203832b514eff014fffd574664
PKG_DESCR:= IRC text client
-PKG_SECTION:= text
+PKG_SECTION:= chat
PKG_DEPENDS:= glib libncurses
PKG_BUILDDEP+= glib ncurses
ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
diff --git a/package/iw/Makefile b/package/iw/Makefile
index 4d55ffd28..69b8a2852 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.19
PKG_RELEASE:= 1
PKG_MD5SUM:= 3b88743f9c6ce8a7e2f5fd7d18fdea42
PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211)
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= libnl
PKG_BUILDDEP+= libnl
PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 6f7262dc5..a459673eb 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176
PKG_DESCR:= A Java Virtual Machine (JVM) implementation
-PKG_SECTION:= misc
+PKG_SECTION:= lang
PKG_DEPENDS:= libffi zlib
PKG_BUILDDEP+= libffi zlib
PKG_URL:= http://jamvm.sourceforge.net
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index 0ece2d1d3..bca614414 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= kismet
PKG_VERSION:= 2010-01-R1
PKG_RELEASE:= 1
PKG_DESCR:= Kismet
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_BUILDDEP+= libpcap ncurses
PKG_DEPENDS:= libpcap libncurses
PKG_MD5SUM:= a6d6edcf65d5bb2cb5de6472bcc16f19
diff --git a/package/knock/Makefile b/package/knock/Makefile
index cbfeb9093..75c8055b5 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= ca09d61458974cff90a700aba6120891
PKG_DESCR:= A port-knocking client
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://www.zeroflux.org/projects/knock
PKG_BUILDDEP+= libpcap
PKG_SITES:= http://www.zeroflux.org/proj/knock/files/
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index e7f3b1f22..7d3834990 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.8.1
PKG_RELEASE:= 1
PKG_MD5SUM:= e29a78b108c4687f7e7937110d1d0415
PKG_DESCR:= MIT kerberos server
-PKG_SECTION:= net
+PKG_SECTION:= crypto
PKG_DEPENDS:= libkrb5 libncurses libss libcom-err
PKG_BUILDDEP+= ncurses e2fsprogs
PKG_URL:= http://web.mit.edu/kerberos
diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile
index 677eca10e..caae33207 100644
--- a/package/l2tpns/Makefile
+++ b/package/l2tpns/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.21
PKG_RELEASE:= 1
PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c
PKG_DESCR:= A layer 2 tunneling protocol network server (LNS)
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libcli
PKG_BUILDDEP+= libcli
PKG_URL:= http://l2tpns.sourceforge.net/
diff --git a/package/lame/Makefile b/package/lame/Makefile
index 1488591ad..baaa3b966 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 398-2
PKG_RELEASE:= 1
PKG_MD5SUM:= 719dae0ee675d0c16e0e89952930ed35
PKG_DESCR:= LAME MP3 encoder
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libncurses
PKG_URL:= http://lame.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/}
diff --git a/package/less/Makefile b/package/less/Makefile
index 4b5d28bbb..bf3976e3f 100644
--- a/package/less/Makefile
+++ b/package/less/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 429
PKG_RELEASE:= 1
PKG_MD5SUM:= 206f2f13b9b0a35e45df660fcb6af31d
PKG_DESCR:= A text mode pager
-PKG_SECTION:= text
+PKG_SECTION:= pager
PKG_DEPENDS:= libncurses
PKG_BUILDDEP+= ncurses
PKG_URL:= http://www.greenwoodsoftware.com/less
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index 13fd7b39d..2f15c75be 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 4a8f09f15fc92196b91d61e2dc9afcea
PKG_DESCR:= Inter-Client Exchange library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= xtrans xproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index dfedcaa23..26dc4559a 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libICE
PKG_MD5SUM:= 1ee90d479298e48df7bb86a7ccbe00c9
PKG_DESCR:= X11 Session Management library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_DEPENDS:= libuuid
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 866579cbf..e878ab1f5 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.2
PKG_RELEASE:= 1
PKG_MD5SUM:= b68aebbfcac1174c4c95d260e9369766
PKG_DESCR:= X11 client-side library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index bb57992d0..0f00fe064 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 1a421d9376f43596fe068ce209a70b84
PKG_DESCR:= X11 authorisation library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index ae62712ce..3e05c8868 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libXext libXmu libXpm
PKG_MD5SUM:= 67662e6b2dceb2907159215c83364c5a
PKG_DESCR:= X11 Athena Widget library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index b525949b6..330990163 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= c3f1bce1affc7dfbc222145e00e1310e
PKG_DESCR:= X11 display manager control protocol library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 42e972aaf..0352e419f 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libX11
PKG_MD5SUM:= 6b61b3f657befded8ae66e04085c413e
PKG_DESCR:= X client interface to extensions of the X protocol
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 49cd7e94d..5f31218e2 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= bf134b9f79a7fc6507577bf5b6d4f412
PKG_DESCR:= X font Library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_DEPENDS:= libfreetype
PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc xtrans
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index c9e990ab2..637ba46b1 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 0a1e129b1d8b2d3905dc02a64255b781
PKG_DESCR:= X FreeType library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= libXrender
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 42222d9d3..3e4d50f51 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 1c038312e4f9b61fe72e52d0f59a01d5
PKG_DESCR:= X Window System client interface to the XINPUT extension to the X protocol.
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= xproto xextproto libXext
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index c208c65e6..0a776b0ef 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= f49e3587cdc299707da0786a681f9c05
PKG_DESCR:= miscellaneous utility functions for X libraries
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= libXt
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index 05170d5bd..1bdb466f0 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.5.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 2d81d6633e67ac5562e2fbee126b2897
PKG_DESCR:= common operation for the XPM pixmap format
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index 4fcfcd89e..4d7ea648a 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 1791473c18a83a333a048b72d719fc55
PKG_DESCR:= X11 rendering library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= renderproto
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 8f42e9c2d..b60390b9b 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 28f627c7a5ca08c2413ce91d21c177d8
PKG_DESCR:= X Toolkit Intrinsics
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= libSM
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 13172660e..24cf35b75 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libX11 videoproto libXext
PKG_MD5SUM:= 6ee98790de6b3cd470074e60057d5c5c
PKG_DESCR:= X11 Xvideo extensions
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile
index 15209dd30..959635986 100644
--- a/package/libXxf86dga/Makefile
+++ b/package/libXxf86dga/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= ecb81708157e1a1eeaba0e124f0ade08
PKG_DESCR:= client library for the XFree86-DGA extension
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= xf86dgaproto libXext libXaw
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile
index 3b2238bb1..c9d2a5505 100644
--- a/package/libfontenc/Makefile
+++ b/package/libfontenc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 0fa1988d08021225d18ced519a30d2b1
PKG_DESCR:= helps to deal with different encodings of fonts
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP+= xproto zlib
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index 3b4e9a2b0..1e06f6940 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 8f7ea197384e5ddd1c355f55e639f677
PKG_DESCR:= X.org libpciaccess library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/
include $(TOPDIR)/mk/package.mk
diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile
index b66060aa9..028d40d3f 100644
--- a/package/libpthread-stubs/Makefile
+++ b/package/libpthread-stubs/Makefile
@@ -7,11 +7,8 @@ PKG_NAME:= libpthread-stubs
PKG_VERSION:= 0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 774eabaf33440d534efe108ef9130a7d
-PKG_DESCR:= weak aliases for pthread functions
-PKG_SECTION:= libs
PKG_URL:= http://xcb.freedesktop.org/
PKG_SITES:= http://xcb.freedesktop.org/dist/
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index cddcf93e0..d043decca 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.8
PKG_RELEASE:= 1
PKG_MD5SUM:= cad2a7188242bc8dbab0645532ae3d6f
PKG_DESCR:= a generic dynamic object loading library
-PKG_SECTION:= libs
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/libtool
PKG_SITES:= ${MASTER_SITE_GNU:=libtool/}
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 52244a2ed..d28f0cd5c 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.4
PKG_RELEASE:= 2
PKG_MD5SUM:= 1645975662a326969d2f42d5c04574aa
PKG_DESCR:= virtualization API
-PKG_SECTION:= utils
+PKG_SECTION:= libs
PKG_DEPENDS:= libxml2 libgnutls python
PKG_BUILDDEP+= libxml2 gnutls python
PKG_URL:= http://www.libvirt.org/
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile
index bad308103..87e792291 100644
--- a/package/libxkbfile/Makefile
+++ b/package/libxkbfile/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
PKG_MD5SUM:= a1384a9a48430397aff236f97e26ed05
PKG_DESCR:= X11 keyboard configuration extension library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_BUILDDEP+= kbproto libX11
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 0c6954ba2..2a422f5ed 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.25
PKG_RELEASE:= 1
PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704
PKG_DESCR:= a flexible and lightweight web server
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_DEPENDS:= libxml2 libsqlite libpcre
PKG_BUILDDEP+= pcre libxml2 sqlite
ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
diff --git a/package/links/Makefile b/package/links/Makefile
index 1c2c02baa..a7b1b944e 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= openssl libpng jpeg gpm
PKG_MD5SUM:= c9937f9ed0061f264973182f871fb667
PKG_DESCR:= web browser with console graphic support
-PKG_SECTION:= net
+PKG_SECTION:= browser
PKG_DEPENDS:= libpng libjpeg libtiff gpm libopenssl
PKG_URL:= http://links.twibright.com
PKG_SITES:= http://links.twibright.com/download/
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 227459d18..6bee2916a 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.1
PKG_RELEASE:= 2
PKG_MD5SUM:= 9560b0e1f410a05b849dfdab465dd758
PKG_DESCR:= ATM library and tools for Linux
-PKG_SECTION:= libs
+PKG_SECTION:= route
PKG_URL:= http://linux-atm.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-atm/}
PKG_NOPARALLEL:= 1
diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile
index ba6d107e2..e6cb5acf3 100644
--- a/package/lrzsz/Makefile
+++ b/package/lrzsz/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.12.20
PKG_RELEASE:= 1
PKG_MD5SUM:= b5ce6a74abc9b9eb2af94dffdfd372a4
PKG_DESCR:= X-Modem, Y-modem, Z-modem protocol handlers
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_URL:= http://www.ohse.de/uwe/software/lrzsz.html
PKG_SITES:= http://www.ohse.de/uwe/releases/
diff --git a/package/lua/Makefile b/package/lua/Makefile
index bafdadb50..c21483754 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= d0870f2de55d59c1c8419f36e8fac150
PKG_DESCR:= LUA programming language
-PKG_SECTION:= admin
+PKG_SECTION:= lang
PKG_URL:= http://www.lua.org
PKG_SITES:= http://www.lua.org/ftp/ \
http://ftp.gwdg.de/pub/languages/lua/ \
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 55cd4058b..bd0a702f3 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.02.62
PKG_RELEASE:= 1
PKG_MD5SUM:= 72e3d66dc42aaf67dca475196a113528
PKG_DESCR:= logical volume management
-PKG_SECTION:= misc
+PKG_SECTION:= fs
PKG_DEPENDS:= libdevmapper libncurses
PKG_URL:= http://sourceware.org/lvm2/
PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 16d56d031..ab9215be6 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION= 2.8.7
PKG_RELEASE= 1
PKG_MD5SUM= 124253e635f7c76bdffc47b9d036c812
PKG_DESCR:= Standard text browser
-PKG_SECTION:= text
+PKG_SECTION:= browser
PKG_DEPENDS:= libncurses libopenssl zlib
PKG_BUILDDEP+= ncurses openssl zlib
PKG_URL:= http://lynx.isc.org/
diff --git a/package/m4/Makefile b/package/m4/Makefile
index 2f762d7fe..5fe318cc1 100644
--- a/package/m4/Makefile
+++ b/package/m4/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.13
PKG_RELEASE:= 1
PKG_MD5SUM:= e9e36108b5f9855a82ca4a07ebc0fd2e
PKG_DESCR:= macro processor
-PKG_SECTION:= comp
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/m4/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile
index 723c932b4..54c8f3b8f 100755
--- a/package/macchanger/Makefile
+++ b/package/macchanger/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 79b7cdaeca3d8ebafa764c4b0dd03ab7
PKG_DESCR:= utility for viewing/manipulating the MAC address
-PKG_SECTION:= sys
+PKG_SECTION:= admin
PKG_URL:= http://www.alobbs.com/macchanger
PKG_SITES:= ${MASTER_SITE_GNU:=macchanger/}
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index c052d6155..852865e20 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libid3tag libmad
PKG_MD5SUM:= 6814b47ceaa99880c754c5195aa1aac1
PKG_DESCR:= MPEG audio player in fixed point
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libid3tag libmad
PKG_URL:= http://www.underbit.com/products/mad
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \
diff --git a/package/make/Makefile b/package/make/Makefile
index 5d546c0af..ab8a92976 100644
--- a/package/make/Makefile
+++ b/package/make/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.81
PKG_RELEASE:= 1
PKG_MD5SUM:= a4e9494ac6dc3f6b0c5ff75c5d52abba
PKG_DESCR:= GNU make
-PKG_SECTION:= misc
+PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/make
PKG_SITES:= ${MASTER_SITE_GNU:=make/}
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index 235bd1ebd..f940c458f 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.03
PKG_RELEASE:= 1
PKG_MD5SUM:= 9e715104234cc9bf01e2afaad27eb787
PKG_DESCR:= small and secure DNS server
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.maradns.org
diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile
index 217279c9a..b65095475 100644
--- a/package/mdadm/Makefile
+++ b/package/mdadm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8bfeea282d21b5ef8e825122fb359457
PKG_DESCR:= tool for managing Linux Software RAID arrays
-PKG_SECTION:= utils
+PKG_SECTION:= fs
PKG_URL:= http://neil.brown.name/blog/mdadm
PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/raid/mdadm/}
diff --git a/package/miau/Makefile b/package/miau/Makefile
index 3d7f474bc..ef7f42d66 100644
--- a/package/miau/Makefile
+++ b/package/miau/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 76f794889d47ad277c25e9c5bbddefa4
PKG_DESCR:= miau is an IRC-bouncer/proxy
-PKG_SECTION:= net
+PKG_SECTION:= chat
PKG_URL:= http://miau.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=miau/}
diff --git a/package/microperl/Makefile b/package/microperl/Makefile
index 82e54df34..03626aef2 100644
--- a/package/microperl/Makefile
+++ b/package/microperl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.10.0
PKG_RELEASE:= 3
PKG_MD5SUM:= d2c39b002ebfd2c3c5dba589365c5a71
PKG_DESCR:= Perl without operating-specific functions
-PKG_SECTION:= net
+PKG_SECTION:= lang
PKG_URL:= www.perl.org
PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ \
ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0/ \
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index 569fd98d7..c0221a7bd 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.19
PKG_RELEASE:= 10
PKG_MD5SUM:= 7c68293ad265ecfe2edea917912f6f1f
PKG_DESCR:= A small HTTP server
-PKG_SECTION:= net
+PKG_SECTION:= www
ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),)
PKG_DEPENDS:= libopenssl
PKG_BUILDDEP+= openssl
diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile
index 96aa19382..d52b4f45b 100644
--- a/package/mini_sendmail/Makefile
+++ b/package/mini_sendmail/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.6
PKG_RELEASE:= 1
PKG_MD5SUM:= fb1585d2ad81c519a26d83bfd783dee8
PKG_DESCR:= A small sendmail-compatible mail forwarder
-PKG_SECTION:= net
+PKG_SECTION:= mail
PKG_URL:= http://www.acme.com/software/mini_sendmail
PKG_SITES:= http://www.acme.com/software/mini_sendmail/
diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index a9ac0ca8e..fafce8646 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.6
PKG_RELEASE:= 1
PKG_MD5SUM:= bf49c1ddc068746760787d0cf76e40de
PKG_DESCR:= A Teredo client and relay daemon
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
ifeq (${ADK_COMPILE_MIREDO_WITH_UCLIBCXX},y)
PKG_BUILDDEP+= uclibc++
endif
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 77cd7cf7c..ed7579e52 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.0-alpha4
PKG_RELEASE:= 1
PKG_MD5SUM:= 2dd0cb6481d77fda09c58ec3154a21c0
PKG_DESCR:= console music player
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libmad libvorbis libcurl libflac ffmpeg libiconv
PKG_DEPENDS+= libncurses libid3tag
PKG_BUILDDEP+= ncurses libvorbis curl libmad flac ffmpeg libiconv
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 114102998..16de1b05f 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.15.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 3ee746cb9193acfd0e1bd7a8c54af1a6
PKG_DESCR:= A music player daemon
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= glib libstdcxx
PKG_BUILDDEP+= glib
ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),)
@@ -66,7 +66,7 @@ PKGFS_WITH_OGG:= libvorbis libogg
PKGFD_WITH_TREMOR:= enable fixpoint Vorbis/OGG support
PKGFS_WITH_TREMOR:= libvorbisidec
PKGFD_WITH_FLAC:= enable FLAC support
-PKGFD_WITH_FLAC:= libflac
+PKGFS_WITH_FLAC:= libflac
PKGFD_WITH_WAV:= enable WAVE support
PKGFS_WITH_WAV:= libaudiofile
PKGFD_WITH_MMS:= enable MMS support
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index c8a239116..2f6facdc3 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.12.1
PKG_RELEASE:= 2
PKG_MD5SUM:= e7d810a75d22954169f1530a436aca4c
PKG_DESCR:= mp3 console player
-PKG_SECTION:= sound
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libpthread alsa-lib libltdl
PKG_BUILDDEP+= alsa-lib
PKG_URL:= http://www.mpg123.de/
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index a83e0d4ab..cbdf7808f 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0-31425
PKG_RELEASE:= 1
PKG_MD5SUM:= e65b88e7a5c1c2f98c98e565357b9663
PKG_DESCR:= popular video player
-PKG_SECTION:= video
+PKG_SECTION:= multimedia
PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses
PKG_DEPENDS+= libogg libpng libpthread libvorbis
PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index db10ad609..14f8bef91 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b
PKG_DESCR:= IPv6 multicast routing daemon
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_CXX:= MRD6
PKG_DEPENDS:= kmod-ipv6
PKG_SITES:= http://www.openadk.org/distfiles/
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index ce223bc89..6f0e22f08 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8117141e8a88bfab54fe98b6bbd5cb3a
PKG_DESCR:= a multi-threaded DAAP daemon
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libgdbm libid3tag libpthread
PKG_BUILDDEP+= gdbm libid3tag
PKG_URL:= http://www.fireflymediaserver.org
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index 800d69f3e..7a186a35e 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= mtd
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_DESCR:= MTD utility
-PKG_SECTION:= base
+PKG_SECTION:= fs
PKG_TARGET_DEPENDS:= ag241 foxboard
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index f68fc657e..110db512c 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.20
PKG_RELEASE:= 1
PKG_MD5SUM:= 027cdd9959203de0c3c64149a7ee351c
PKG_DESCR:= Mail text client
-PKG_SECTION:= text
+PKG_SECTION:= mail
PKG_DEPENDS:= libncurses libopenssl
PKG_BUILDDEP+= ncurses openssl
PKG_URL:= http://www.mutt.org
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index b1a9eb3ac..c0cce1027 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.1.41
PKG_RELEASE:= 1
PKG_MD5SUM:= b5d39e8789174753f3c782959729e68c
PKG_DESCR:= MySQL client library
-PKG_SECTION:= libs
+PKG_SECTION:= db
PKG_DEPENDS:= libncurses zlib
PKG_BUILDDEP+= ncurses zlib readline
PKG_URL:= http://www.mysql.com
diff --git a/package/nand/Makefile b/package/nand/Makefile
index 0cd95f45b..33f9ddcf0 100644
--- a/package/nand/Makefile
+++ b/package/nand/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= nand
PKG_VERSION:= 1.0
PKG_RELEASE:= 3
PKG_DESCR:= NAND utility
-PKG_SECTION:= base
+PKG_SECTION:= fs
PKG_TARGET_DEPENDS:= routerboard
diff --git a/package/nano/Makefile b/package/nano/Makefile
index 2efed2730..fc374ed18 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 6304308afb1f7ef4a5e93eb99206632a
PKG_DESCR:= An enhanced clone of the Pico text editor
-PKG_SECTION:= admin
+PKG_SECTION:= editor
PKG_DEPENDS:= libncurses
PKG_BUILDDEP+= ncurses
PKG_URL:= http://www.nano-editor.org
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 50b1eaaa5..ef16a6e69 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -11,11 +11,13 @@ PKG_DESCR:= a terminal handling library and common terminal definitions
PKG_SECTION:= libs
PKG_URL:= http://www.gnu.org/software/ncurses/
PKG_SITES:= ${MASTER_SITE_GNU:=ncurses/}
+PKG_DESCR_LIB_DEV:= development files for libncurses
+PKG_SECTION_LIB_DEV:= devel
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
SUB_INSTALLS-y:=
SUB_INSTALLS-m:=
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile
index e191474b2..bf60a60cc 100644
--- a/package/ndisc/Makefile
+++ b/package/ndisc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.8
PKG_RELEASE:= 1
PKG_MD5SUM:= cb8d70564b8d40aae95e19592c6be183
PKG_DESCR:= ICMPv6 Neighbour Discovery tools
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_URL:= http://www.remlab.net
PKG_SITES:= http://www.remlab.net/files/ndisc6/
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 4b454fb69..cc4a8b5d6 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 5b2551e7bd024fbbee84dca22a5f13a1
PKG_DESCR:= SNMP Agent
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libnetsnmp libelf
PKG_BUILDDEP+= libelf
PKG_NOPARALLEL:= 1
diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile
index 2fa7d5543..cc3928618 100644
--- a/package/netstat-nat/Makefile
+++ b/package/netstat-nat/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 45e8d0f47623f619c22a6b894cd03cbc
PKG_DESCR:= a netstat variant for NAT connections
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://www.tweegy.nl/projects/netstat-nat/index.html
PKG_SITES:= http://www.tweegy.nl/download/
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 97781670c..941d3ac9f 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -8,8 +8,9 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 2
PKG_MD5SUM:= c3ccd16c147befd49fe4541a506dd177
PKG_DESCR:= Utilities for NFS kernel server implementation
-PKG_SECTION:= net
+PKG_SECTION:= net/fs
PKG_DEPENDS:= kmod-nfsd portmap
+
ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss
endif
diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile
index 51ab9839a..e52c40bb4 100644
--- a/package/ntpclient/Makefile
+++ b/package/ntpclient/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2007_365
PKG_RELEASE:= 2
PKG_MD5SUM:= cb98711f11769cdd22fc592844cef414
PKG_DESCR:= NTP client for setting system time from NTP servers
-PKG_SECTION:= net
+PKG_SECTION:= 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 46a1063da..a239af2cc 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66
PKG_DESCR:= Network UPS Tools
-PKG_SECTION:= sys
+PKG_SECTION:= net/misc
ifneq (${ADK_PACKAGE_NUT_SSL},)
PKG_BUILDDEP+= openssl
endif
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index 04923eaff..566a30f19 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.5.6-r2
PKG_RELEASE:= 1
PKG_MD5SUM:= acf15dbd0af521a6826541b567c6473a
PKG_DESCR:= Optimized Link State Routing protocol
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_MULTI:= 1
PKG_URL:= http://www.olsr.org
PKG_SITES:= http://www.olsr.org/releases/0.5/
diff --git a/package/openct/Makefile b/package/openct/Makefile
index 48a23bac1..a3626e7bc 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libtool libusb
PKG_MD5SUM:= d8d8c63269985303a303a218c4b953d7
PKG_DESCR:= drivers for several smart card readers
-PKG_SECTION:= libs
+PKG_SECTION:= crypto
PKG_DEPENDS:= libltdl libusb
PKG_URL:= http://www.opensc-project.org/openct
PKG_SITES:= http://www.opensc-project.org/files/openct/
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index c1bf15e36..22bcc26f6 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -16,10 +16,10 @@ PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
PKG_DESCR_1:= OpenLDAP utilities
PKG_DEPENDS_1:= libopenldap
-PKG_SECTION_1:= net
+PKG_SECTION_1:= net/misc
PKG_DESCR_2:= OpenLDAP server daemon
PKG_DEPENDS_2:= libopenldap
-PKG_SECTION_2:= net
+PKG_SECTION_2:= net/misc
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
index 328559f3a..c2ddc7bac 100644
--- a/package/openntpd/Makefile
+++ b/package/openntpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.9p1
PKG_RELEASE:= 18
PKG_MD5SUM:= afc34175f38d08867c1403d9008600b3
PKG_DESCR:= NTP server daemon
-PKG_SECTION:= net
+PKG_SECTION:= ntp
PKG_URL:= http://www.openntpd.org
PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenNTPD/ \
diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index 77e9ed905..a1cd0089e 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= e7e59910183ca8a213c76a7a80789ea1
PKG_DESCR:= a high-performance, configurable, free SIP server
-PKG_SECTION:= net
+PKG_SECTION:= phone
PKG_MULTI:= 1
PKG_VARIANT:= tls
PKG_DEPENDS:= libopenssl
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 572b69929..4e30924c3 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.5p1
PKG_RELEASE:= 2
PKG_MD5SUM:= 88633408f4cb1eb11ec7e2ec58b519eb
PKG_DESCR:= OpenSSH server
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= zlib libopenssl libpthread
PKG_BUILDDEP+= zlib openssl
ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y)
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 1f77db9f8..70d8e9e2d 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -4,25 +4,27 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= openssl
-PKG_VERSION:= 1.0.0
+PKG_VERSION:= 1.0.0a
PKG_RELEASE:= 1
-PKG_MD5SUM:= 89eaa86e25b2845f920ec00ae4c864ed
+PKG_MD5SUM:= e3873edfffc783624cfbdb65e2249cbd
PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP+= zlib
-PKG_URL:= http://www.openssl.org
-PKG_SITES:= http://www.openssl.org/source/ \
+PKG_URL:= http://www.openssl.org/
+PKG_SITES:= http://www.openssl.org/source/
PKG_DESCR_UTIL:= OpenSSL (Secure Socket Layer) command line tool
-PKG_SECTION_UTIL:= admin
+PKG_SECTION_UTIL:= crypto
PKG_DEPENDS_UTIL:= libopenssl
PKG_DEPENDS_DEV:= libopenssl
+PKG_DESCR_LIB_DEV:= development files for openssl
+PKG_SECTION_LIB_DEV:= devel
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DEV},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DEV},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTIL},${PKG_DESCR_UTIL},${PKG_SECTION_UTIL}))
SUB_INSTALLS-y:=
@@ -37,9 +39,6 @@ FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST}
OPENSSL_OPTIONS = shared no-ec no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
-#post-extract:
-# @find ${WRKBUILD} -name *.rej -exec rm {} \;
-
do-configure:
(cd $(WRKBUILD); \
PATH=$(TARGET_PATH) \
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 6c8a62c98..a85dd29a2 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.6.26
PKG_RELEASE:= 1
PKG_MD5SUM:= ac514a8c09d871407b16848c67d0d806
PKG_DESCR:= IPSec software
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= ip libgmp
PKG_BUILDDEP+= gmp
PKG_URL:= http://www.openswan.org
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 173876f73..bc98c1089 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.1.1
PKG_RELEASE:= 2
PKG_MD5SUM:= b273ed2b5ec8616fb9834cde8634bce7
PKG_DESCR:= Open Source VPN solution using SSL
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= kmod-tun libopenssl
PKG_BUILDDEP+= openssl
ifeq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),y)
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 9acd481af..c54ef06e1 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 82b059379895cf125261d7d773465915
PKG_DESCR:= system-wide profiles
-PKG_SECTION:= utils
+PKG_SECTION:= debug
PKG_DEPENDS:= libpopt
PKG_BUILDDEP+= popt
PKG_URL:= http://oprofile.sourceforge.net
diff --git a/package/p54-firmware/Makefile b/package/p54-firmware/Makefile
index b845174a6..120f14d2e 100644
--- a/package/p54-firmware/Makefile
+++ b/package/p54-firmware/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8e8ab005a4f8f0123bcdc51bc25b47f6
PKG_DESCR:= firmware for USB prism54 wireless cards (isl3887)
-PKG_SECTION:= sys
+PKG_SECTION:= wifi
PKG_SITES:= http://daemonizer.de/prism54/prism54-fw/fw-usb/
DISTFILES:= 2.13.24.0.lm87.arm
diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile
index 433f7dbe7..0de71ee63 100644
--- a/package/p910nd/Makefile
+++ b/package/p910nd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7
PKG_RELEASE:= 10
PKG_MD5SUM:= 7bf752532d26c9106f8039db95df3a6b
PKG_DESCR:= A small non-spooling printer server
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://www.etherboot.org/p910nd
PKG_SITES:= http://www.etherboot.org/p910nd/
diff --git a/package/palantir/Makefile b/package/palantir/Makefile
index c6286f70d..210dcdfc7 100644
--- a/package/palantir/Makefile
+++ b/package/palantir/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 3a5b1fb340857f6d8e357bf39b77583e
PKG_DESCR:= A multichannel interactive streaming solution
-PKG_SECTION:= net
+PKG_SECTION:= multimedia
PKG_DEPENDS:= libjpeg libpthread
PKG_BUILDDEP+= jpeg
PKG_URL:= http://www.fastpath.it/products/palantir
diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile
index 8771625ad..600d7994d 100644
--- a/package/parprouted/Makefile
+++ b/package/parprouted/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 570f5deaf09600df8f80f589de79ecdb
PKG_DESCR:= a proxy ARP daemon
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.hazard.maks.net/parprouted
PKG_SITES:= http://www.hazard.maks.net/parprouted/
diff --git a/package/parted/Makefile b/package/parted/Makefile
index b54746dda..3d237277b 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.9.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d
PKG_DESCR:= GNU parted
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_DEPENDS:= libuuid libreadline libdevmapper libpthread
PKG_BUILDDEP+= e2fsprogs lvm readline
PKG_URL:= http://www.gnu.org/software/parted/index.shtml
diff --git a/package/patch/Makefile b/package/patch/Makefile
index b5bf8b955..975da3970 100644
--- a/package/patch/Makefile
+++ b/package/patch/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.5.9
PKG_RELEASE:= 1
PKG_MD5SUM:= dacfb618082f8d3a2194601193cf8716
PKG_DESCR:= GNU patch
-PKG_SECTION:= misc
+PKG_SECTION:= utils
PKG_URL:= http://www.gnu.org/software/patch
PKG_SITES:= ${MASTER_SITE_GNU:=patch/}
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index 816c58356..688d83c3a 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= d07da501bb11e6af40acd036536c2e9a
PKG_DESCR:= PCI Utilities
-PKG_SECTION:= sys
+PKG_SECTION:= utils
PKG_DEPENDS:= zlib
PKG_BUILDDEP+= zlib
PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils
diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile
index b81a64d27..e055ccd70 100644
--- a/package/pcsc-lite/Makefile
+++ b/package/pcsc-lite/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= fc3fd0e83090ecc81e5b32700fa246c2
PKG_DESCR:= middleware for smartcards
-PKG_SECTION:= security
+PKG_SECTION:= crypto
PKG_BUILDDEP+= libusb libusb-compat
PKG_DEPENDS:= libusb libusb-compat libpthread ccid
PKG_URL:= http://pcsclite.alioth.debian.org/
diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile
index 61db9b39c..65b21be52 100644
--- a/package/pdnsd/Makefile
+++ b/package/pdnsd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.7
PKG_RELEASE:= 3
PKG_MD5SUM:= 114b3b21b09b43cbfcccdde726b84c12
PKG_DESCR:= Proxy DNS server with permanent caching
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_DEPENDS:= libpthread
PKG_URL:= http://www.phys.uu.nl/~rombouts/pdnsd.html
PKG_SITES:= http://www.phys.uu.nl/~rombouts/pdnsd/releases/
diff --git a/package/perl/Makefile b/package/perl/Makefile
index 3c997da78..f666c76fc 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.10.0
PKG_RELEASE:= 1
PKG_MD5SUM:= d2c39b002ebfd2c3c5dba589365c5a71
PKG_DESCR:= Perl without operating-specific functions
-PKG_SECTION:= net
+PKG_SECTION:= lang
PKG_URL:= www.perl.org
PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ \
ftp://ftp.mpi-sb.mpg.de/pub/perl/CPAN/src/5.0/ \
diff --git a/package/php/Makefile b/package/php/Makefile
index 485affd63..2ceac7f85 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.3.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 4480d7c6d6b4a86de7b8ec8f0c2d1871
PKG_DESCR:= PHP CLI
-PKG_SECTION:= net
+PKG_SECTION:= lang
PKG_MULTI:= 1
PKG_DEPENDS:= libopenssl zlib
PKG_BUILDDEP+= openssl zlib
diff --git a/package/picocom/Makefile b/package/picocom/Makefile
index 8fc72b85c..9b33eaf52 100644
--- a/package/picocom/Makefile
+++ b/package/picocom/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 08fcc5f6bb9e7676a2569386d5ea9f70
PKG_DESCR:= minimal dumb-terminal emulation program
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_URL:= http://efault.net/npat/hacks/picocom
PKG_SITES:= http://efault.net/npat/hacks/picocom/dist/
diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile
index 06348bafd..612771db5 100644
--- a/package/pipacs/Makefile
+++ b/package/pipacs/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= pipacs
PKG_RELEASE:= 2
PKG_DESCR:= an UNIX socket accounting/wiewer program
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
NO_DISTFILES:= 1
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index 247baab73..d79684b2d 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.16.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 02bd3669f53c404c19980d5efb6f86fb
PKG_DESCR:= Pixel manipulation library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= http://www.cairographics.org/releases/
ifeq ($(ADK_STATIC),y)
diff --git a/package/pkg-config/Makefile b/package/pkg-config/Makefile
index a421bf482..7fc7e0af9 100644
--- a/package/pkg-config/Makefile
+++ b/package/pkg-config/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.25
PKG_RELEASE:= 1
PKG_MD5SUM:= a3270bab3f4b69b7dc6dbdacbcae9745
PKG_DESCR:= a helper tool used when compiling applications and libraries.
-PKG_SECTION:= libs
+PKG_SECTION:= lang
PKG_BUILDDEP+= glib popt
PKG_DEPENDS:= glib libpopt
PKG_URL:= http://pkg-config.freedesktop.org/wiki/
diff --git a/package/pkgmaker b/package/pkgmaker
index 3ec2dd4d8..169b05643 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -12,7 +12,7 @@ GMAKE="$GMAKE --no-print-directory"
typeset -L$x_cols pbar
# check for trailing whitespace
-grep -H '[[:space:]]$' */Makefile && print "Found trailing whitespace, please fix"
+#grep -H '[[:space:]]$' */Makefile && print "Found trailing whitespace, please fix"
# build a cache of “ipkg package name” → “package conf option” for
# use with dependency resolution
@@ -43,12 +43,14 @@ for dn in */Makefile; do
done
# build Config.in files and resolve dependencies
+rm -f package_sections
+rm -rf pkgconfigs.d
+mkdir pkgconfigs.d
for dn in */Makefile; do
dn=${dn%/*}
- # skip if we take care of this one manually
- [[ $dn != "base-files" ]] && [[ -s $dn/Config.in.manual ]] && continue
pbar="Pass 2: $dn ..."
print -nu2 "$pbar\r"
+ mkdir pkgconfigs.d/$dn
cd $dn
# PKG_NAME: package name (directory, free-format)
@@ -65,9 +67,9 @@ for dn in */Makefile; do
# CFLINE_*: one free-format Config.in line per subpackage option
# PKGFD_*: flavour description, per package flavour option
# PKG_{HOST,TARGET}_DEPENDS: add host or target dependencies
- eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_CHOICES PKG_DESCR PKG_URL PKG_MULTI PKG_CXX \
+ eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_CHOICES PKG_DESCR PKG_SECTION PKG_URL PKG_MULTI PKG_CXX \
ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \
- PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \
+ PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} PKGSECT_\${x} CFLINE_\${x}) \
\$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x}) \
\$(foreach x,\${PKG_FLAVOURS},PKGFS_\${x}) \
\$(foreach x,\${PKG_CHOICES},PKGCD_\${x}) \
@@ -78,8 +80,13 @@ for dn in */Makefile; do
typeset -u dnu=${dn//-/_}
dnu=${dnu//+/X}
- ( # fd 4 = Config.in; fd 5 = Config.in.lib
- g5=0
+ echo "pkgconfigs.d/$dn/Config.in ${PKG_SECTION:=none}" >>../package_sections
+ echo "$dn/Config.in.manual ${PKG_SECTION:=none}" >>../package_sections
+
+ # skip if we take care of this one manually
+ [[ $dn != "base-files" ]] && [[ -s Config.in.manual ]] && { cd ..; continue; }
+
+ exec 4>../pkgconfigs.d/$dn/Config.in
# Handle master package (directory)
print -u4 "config ADK_COMPILE_$dnu"
@@ -172,20 +179,15 @@ for dn in */Makefile; do
eval sppn=\$PKGNAME_$spcu # sppn: subpackage (ipkg) name
eval desc=\$PKGDESC_$spcu # desc: subpackage description
: ${desc:=$PKG_DESCR} # take from main pkg if empty
+ eval sect=\$PKGSECT_$spcu # sect: subpackage section
+ : ${sect:=$PKG_SECTION} # take from main pkg if empty
eval deps=\$PKGDEPS_$spcu # deps: subpackage dependencies
eval dflt=\$PKGDFLT_$spcu # dflt: config 'default' opt.
eval xline=\$CFLINE_$spcu # xline: one free-format line
- if [[ $spcu = LIB* ]]; then
- h=5 # divert to Config.in.lib
- (( g5++ )) && print -u5 # been here before
- elif [[ $spcu = KMOD* ]]; then
- h=6
- (( g6++ )) && print -u6
- else
- h=4 # divert to Config.in
- print -u4
- fi
+ echo "pkgconfigs.d/$dn/Config.in.$sppn $sect" >>../package_sections
+ exec 4>../pkgconfigs.d/$dn/Config.in.$sppn
+ h=4
print -u$h config ADK_PACKAGE_$spcu
spnf=$sppn # spnf: subpackage name, filled
@@ -273,7 +275,7 @@ EOF
typeset -u pfcs=${pfcs#!}
print
print config ADK_PACKAGE_${dnu}_$pfco
- print "\tbool \"${pfd:-$PKG_NAME -> $pfcd}\""
+ print "\tbool \"$pfcd\""
print "\\tselect ADK_PACKAGE_${pfcs}"
done >&4
[[ -n $PKG_CHOICES ]] && cat >&4 <<EOF
@@ -297,7 +299,55 @@ EOF
print \\thelp
print "\t flavour ADK_PACKAGE_${dnu}_$pfcu for $PKG_NAME"
done >&4
-
- ) 4>Config.in 5>Config.in.lib 6>Config.in.kmod
cd ..
done
+
+# return good if given file exists and is non-empty
+function non_empty_file() {
+ [[ -f "$1" ]] || return 1
+ [[ -n "$(cat "$1")" ]] || return 1
+ return 0
+}
+
+# print the verbose section name for a given section tag
+function lookup_section_string() {
+ str="$(grep ^$1\ sections.lst | cut -d ' ' -f '2-')"
+ [[ -n $str ]] && { echo $str; return; }
+ echo $1
+}
+
+# print the first prompt's first word's value in a given Config.in file
+function get_first_prompt() {
+ prompt="$(grep -m 1 "prompt " $1 | sed -n 's/.*"\([^ \.]*\)[ \.].*"/\1/p')"
+ [[ -n $prompt ]] && echo $prompt
+}
+
+# prepare Config.in list for sorting
+while read config_in section; do
+ pbar="Pass 3: $config_in ..."
+ print -nu2 "$pbar\r"
+
+ non_empty_file $config_in || continue
+ prompt="$(get_first_prompt $config_in)"
+ [[ -n $prompt ]] || continue
+ echo "$prompt $config_in $(lookup_section_string $section)"
+done <package_sections >package_section_list
+
+# create the Config.in.auto from the sorted list from above
+cursec=""
+sort -k 3 -k 1 -f package_section_list | while read name file section; do
+ pbar="Pass 4: $name ..."
+ print -nu2 "$pbar\r"
+
+ if [[ $cursec != $section ]]; then
+ [[ -n $cursec ]] && print "endmenu\n"
+
+ print "menu \"$section\""
+ cursec="$section"
+ fi
+ print "source \"package/$file\""
+ print -u3 "source \"package/${file%.*}\""
+done >Config.in.auto 3>Config.in.auto.pre
+print "endmenu\n" >>Config.in.auto
+grep pkgconfigs.d Config.in.auto.pre | sort | uniq > Config.in.auto.global
+rm -f package_sections package_section_list Config.in.auto.pre
diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile
index c48e92d81..cb92cbe8f 100644
--- a/package/pmacct/Makefile
+++ b/package/pmacct/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.11.6
PKG_RELEASE:= 1
PKG_MD5SUM:= e0f3bcba9a73b7a70bbf5a303cd22f77
PKG_DESCR:= IP accounting daemons
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libpcap
PKG_BUILDDEP+= libpcap
ifneq ($(ADK_COMPILE_PMACCT_MYSQL),)
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index 229143a6e..28f3e4b7f 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= ac108ab68bf0f34477f8317791aaf1ff
PKG_DESCR:= RPC portmapper
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
PKG_DEPENDS:= libwrap
PKG_BUILDDEP+= tcp_wrappers
diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile
index baab74672..ef2d0d797 100644
--- a/package/portsentry/Makefile
+++ b/package/portsentry/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 3ebd3618ba9abfea2525e236bd44cebd
PKG_DESCR:= Software for protection against port scans
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_URL:= http://sourceforge.net/projects/sentrytools
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sentrytools/}
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 4419a3c61..56e293b18 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 8.4.4
PKG_RELEASE:= 1
PKG_MD5SUM:= ae7f305eb9388b187e8f07dee0cec55c
PKG_DESCR:= PostgreSQL database library
-PKG_SECTION:= libs
+PKG_SECTION:= db
PKG_BUILDDEP+= zlib
PKG_URL:= http://www.postgresql.org
PKG_SITES:= ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ \
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index cd28e86db..a04d5b798 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.4.5
PKG_RELEASE:= 4
PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57
PKG_DESCR:= Point-to-Point Protocol software
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_MULTI:= 1
PKG_DEPENDS:= kmod-ppp
PKG_URL:= http://ppp.samba.org
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 6c1700a15..c68d50958 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.0
PKG_RELEASE:= 3
PKG_MD5SUM:= 9a706327fb9827541d7c86d48ceb9631
PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) client
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= ppp kmod-net-ipgre
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/}
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index fdd823144..8930056c4 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.4
PKG_RELEASE:= 1
PKG_MD5SUM:= b38df9c431041922c997c1148bedf591
PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) server
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= ppp kmod-crypto kmod-mppe kmod-ppp
PKG_URL:= http://www.poptop.org
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/}
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index 013392066..bfc137378 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_VARIANT:= beta
PKG_MD5SUM:= 6571dc9524e945e79c2af62fefe7b107
PKG_DESCR:= web proxy with advanced filtering capabilities
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libpthread libpcre
PKG_BUILDDEP+= pcre
PKG_URL:= http://www.privoxy.org
diff --git a/package/procmail/Makefile b/package/procmail/Makefile
index f8c3d2542..dfea50341 100644
--- a/package/procmail/Makefile
+++ b/package/procmail/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.22
PKG_RELEASE:= 1
PKG_MD5SUM:= 1678ea99b973eb77eda4ecf6acae53f1
PKG_DESCR:= Mail processing tools
-PKG_SECTION:= text
+PKG_SECTION:= mail
PKG_URL:= http://www.procmail.org
PKG_SITES:= http://www.procmail.org/
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
index 840cde048..20f2e09c3 100644
--- a/package/proftpd/Makefile
+++ b/package/proftpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 97ad29f31f4fe633a9f8d021bab2df20
PKG_DESCR:= An advanced and very configurable FTP server
-PKG_SECTION:= utils
+PKG_SECTION:= www
PKG_NOPARALLEL:= 1
PKG_URL:= http://www.proftpd.org/
PKG_SITES:= ftp://ftp.proftpd.org/distrib/source/
diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile
index 4018ffac8..85f30e5f7 100644
--- a/package/ptunnel/Makefile
+++ b/package/ptunnel/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.61
PKG_RELEASE:= 1
PKG_MD5SUM:= b45f73875f2af48f101816672f83a5fe
PKG_DESCR:= Tunnel TCP connections over ICMP packets
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libpcap libpthread
PKG_BUILDDEP+= libpcap
PKG_URL:= http://www.cti.ecp.fr/~beauxir5/ptunnel/
diff --git a/package/qingy/Makefile b/package/qingy/Makefile
index 9e91ad4d5..f1016d8a8 100644
--- a/package/qingy/Makefile
+++ b/package/qingy/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 34f40172a71e9a6c2c77ddce11d2a63a
PKG_DESCR:= a DirectFB getty replacement
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= directfb libxscrnsaver
PKG_BUILDDEP+= DirectFB libXScrnSaver
PKG_URL:= http://qingy.sourceforge.net/
diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index 1c6e43862..4af29f7e1 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= readline ncurses
PKG_MD5SUM:= 8975414c76a295f4855a417af0b5ddce
PKG_DESCR:= A routing software package
-PKG_SECTION:= net
+PKG_SECTION:= route
PKG_MULTI:= 1
PKG_URL:= http://www.quagga.net
PKG_SITES:= http://www.quagga.net/download/ \
diff --git a/package/raddump/Makefile b/package/raddump/Makefile
index d681a2f7c..19819b202 100755
--- a/package/raddump/Makefile
+++ b/package/raddump/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.3.1
PKG_RELEASE:= 1
PKG_MD5SUM:= f8c29c67141ea78bb6ae8b97d5149480
PKG_DESCR:= interprets captured RADIUS packets
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= libpcap libopenssl
PKG_BUILDDEP+= openssl libpcap
PKG_URL:= http://sourceforge.net/projects/raddump
diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index 9ac4deffc..3f52ff986 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 78598b60ed9d64920739189c3dc0934d
PKG_DESCR:= Routing Advertisement Daemon for IPv6
-PKG_SECTION:= net
+PKG_SECTION:= ipv6
PKG_DEPENDS:= kmod-ipv6
PKG_URL:= http://www.litech.org/radvd
PKG_SITES:= http://v6web.litech.org/radvd/dist/ \
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index a4faf0e57..58eed4598 100644
--- a/package/rarpd/Makefile
+++ b/package/rarpd/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 11
PKG_BUILDDEP+= libnet
PKG_MD5SUM:= 04e2ca849e758d0b88c8281775ec3b58
PKG_DESCR:= Reverse ARP Daemon
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libnet
PKG_SITES:= ftp://ftp.dementia.org/pub/net-tools/
diff --git a/package/rdate/Makefile b/package/rdate/Makefile
index fa5bde688..13bf70d98 100644
--- a/package/rdate/Makefile
+++ b/package/rdate/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION= 20070817
PKG_RELEASE= 2
PKG_MD5SUM= 9a6489d7de4311678a3fab001bb503df
PKG_DESCR:= A small rdate and NTP client
-PKG_SECTION:= net
+PKG_SECTION:= ntp
PKG_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/rdate/}
WRKDIST= ${WRKDIR}/${PKG_NAME}
diff --git a/package/reaim/Makefile b/package/reaim/Makefile
index 2d0633235..b06011ddd 100644
--- a/package/reaim/Makefile
+++ b/package/reaim/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8
PKG_RELEASE:= 9
PKG_MD5SUM:= 647d2ab72ec454f89294accfb3182c09
PKG_DESCR:= A transparent AIM / MSN proxy
-PKG_SECTION:= net
+PKG_SECTION:= chat
PKG_DEPENDS:= iptables
PKG_URL:= http://reaim.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/}
diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile
index 126de7f48..dc56c66f9 100644
--- a/package/rng-tools/Makefile
+++ b/package/rng-tools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2
PKG_RELEASE:= 2
PKG_MD5SUM:= 63d503191eabed630324c104cc024475
PKG_DESCR:= Daemon to use hardware random number generators.
-PKG_SECTION:= utils
+PKG_SECTION:= crypto
PKG_URL:= http://gkernel.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/}
diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index a507e4a39..29b480f29 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.10
PKG_RELEASE:= 1
PKG_MD5SUM:= d58a13cc4185bca6121a606ff456dec0
PKG_DESCR:= PPPoE (PPP over Ethernet) tools
-PKG_SECTION:= net
+PKG_SECTION:= ppp
PKG_DEPENDS:= ppp
PKG_URL:= http://www.roaringpenguin.com
PKG_SITES:= http://www.roaringpenguin.com/files/download/
diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile
index ee939d08d..a25bb0281 100644
--- a/package/rpcbind/Makefile
+++ b/package/rpcbind/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 1a77ddb1aaea8099ab19c351eeb26316
PKG_DESCR:= converts RPC program numbers into universal addresses
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libtirpc
PKG_BUILDDEP+= libtirpc
PKG_URL:= http://sourceforge.net/projects/rpcbind/
diff --git a/package/rrs/Makefile b/package/rrs/Makefile
index 077943b5a..cd5144daf 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.70
PKG_RELEASE:= 2
PKG_MD5SUM:= b400d03c0e39e3e78a7327ba78f789f0
PKG_DESCR:= A reverse (connecting) remote shell, with SSL support.
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_CXX:= RRS
PKG_BUILDDEP+= zlib
ifneq ($(ADK_PACKAGE_RRS),)
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index edc2bf47e..b0ce107d9 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.7
PKG_RELEASE:= 1
PKG_MD5SUM:= b53525900817cf1ba7ad3a516ab5bfe9
PKG_DESCR:= utility that provides fast incremental file transfer
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libpopt
PKG_BUILDDEP+= popt
PKG_URL:= http://rsync.samba.org
diff --git a/package/rt61-firmware/Makefile b/package/rt61-firmware/Makefile
index 650dd9f30..ea33868f0 100644
--- a/package/rt61-firmware/Makefile
+++ b/package/rt61-firmware/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1
PKG_RELEASE:= 1
PKG_MD5SUM:= d4c690c93b470bc9a681297c2adc6281
PKG_DESCR:= firmware for rt61/rt2601 wireless cards
-PKG_SECTION:= sys
+PKG_SECTION:= wifi
PKG_SITES:= http://www.ralinktech.com.tw/data/
DISTFILES:= RT61_Firmware_V1.2.zip
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index e7829d172..85f828290 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8.5
PKG_RELEASE:= 1
PKG_MD5SUM:= e701095e1824b7e512a17000f4c0a783
PKG_DESCR:= console torrent application
-PKG_SECTION:= net
+PKG_SECTION:= p2p
PKG_DEPENDS:= libncurses libtorrent libcurl
PKG_BUILDDEP+= ncurses libtorrent curl
PKG_URL:= http://libtorrent.rakshasa.no
diff --git a/package/rtsp/Makefile b/package/rtsp/Makefile
index 994852f04..666db5d0f 100644
--- a/package/rtsp/Makefile
+++ b/package/rtsp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 92bb09883dd8a77ec5cfbff1c8932b15
PKG_DESCR:= Netfilter connection tracking for RTSP
-PKG_SECTION:= net
+PKG_SECTION:= kernel
PKG_URL:= http://github.com/maru-sama/rtsp-linux-v2.6
NO_DISTFILES:= 1
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 2fd190fde..93317e851 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.9
PKG_RELEASE:= 1
PKG_MD5SUM:= 9fc5941bda150ac0a33b299e1e53654c
PKG_DESCR:= interpreter for the ruby language
-PKG_SECTION:= net
+PKG_SECTION:= lang
PKG_NOPARALLEL:= 1
PKG_URL:= http://www.ruby-lang.org
PKG_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index 297b8018c..b56e219e6 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -8,9 +8,9 @@ PKG_VERSION:= 9.07
PKG_RELEASE:= 1
PKG_MD5SUM:= 49bb52c99e002bf85eb41d8385d903b5
PKG_DESCR:= x-term with unicode support
-PKG_SECTION:= x11
-PKG_DEPENDS:= libx11 fontconfig libxft libxml2 libexpat
-PKG_BUILDDEP+= libX11 fontconfig libXft libxml2 expat
+PKG_SECTION:= x11/apps
+PKG_DEPENDS:= libx11 fontconfig libxft libxml2
+PKG_BUILDDEP+= libX11 fontconfig libXft libxml2
PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html
PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 5ca099bc1..f3addd17f 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.5.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 7c8d2a34b649380d5df838c3e030dbec
PKG_DESCR:= NetBIOS/SMB file and print server
-PKG_SECTION:= net
+PKG_SECTION:= net/fs
PKG_URL:= http://www.samba.org
PKG_SITES:= http://samba.org/samba/ftp/stable/
diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index b21bfa94e..29bfad43b 100644
--- a/package/scanlogd/Makefile
+++ b/package/scanlogd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.6
PKG_RELEASE:= 8
PKG_MD5SUM:= 7b8187ea718ebe47f22805b921b909ab
PKG_DESCR:= Portscan logger
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libpcap libnet libnids
PKG_BUILDDEP+= libpcap libnids libnet
PKG_URL:= http://www.openwall.com/scanlogd
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index ce8cf9cc9..f3980c7f3 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -13,6 +13,8 @@ PKG_DEPENDS:= libpng libtiff libjpeg libsdl
PKG_BUILDDEP:= libpng libtiff jpeg sdl
PKG_URL:= http://www.libsdl.org
PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/
+PKG_DESCR_LIB_DEV:= development files for sdlimage
+PKG_SECTION_LIB_DEV:= devel
DISTFILES:= SDL_image-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION}
@@ -20,7 +22,7 @@ WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
SUB_INSTALLS-y:=
SUB_INSTALLS-m:=
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index fa0e0be8d..483022ec7 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -13,6 +13,8 @@ PKG_DEPENDS:= libusb alsa-lib libpthread tslib
PKG_BUILDDEP+= libusb alsa-lib tslib
PKG_URL:= http://www.libsdl.org
PKG_SITES:= http://www.libsdl.org/release/
+PKG_DESCR_LIB_DEV:= development files for libsdl
+PKG_SECTION_LIB_DEV:= devel
DISTFILES:= SDL-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION}
@@ -20,7 +22,7 @@ WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
SUB_INSTALLS-y:=
SUB_INSTALLS-m:=
diff --git a/package/sections.lst b/package/sections.lst
new file mode 100644
index 000000000..05fe0cb58
--- /dev/null
+++ b/package/sections.lst
@@ -0,0 +1,53 @@
+admin System Administration
+archive Compression and Archivers
+base Base System
+bluetooth Bluetooth
+browser Browser / Editor / Pager
+editor Browser / Editor / Pager
+pager Browser / Editor / Pager
+chat IRC / ICQ / JABBER
+comp Computing
+console Console Utilities
+crypto Cryptography
+db Databases
+debug Debugging / Analyzing
+devel Development / Headers
+dns DNS / DHCP
+dhcp DNS / DHCP
+firewall Firewall / Routing / Bridging
+kernel External Kernel Modules
+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
+net Networking
+net/fs Network Filesystems
+net/misc Networking Misc
+net/security Network Security
+none Unclassified
+ntp NTP
+p2p P2P
+phone Telephony
+ppp PPP / PPTP / RADIUS
+proxy Proxy
+scm SCM
+serial Serial communications & terminal emulation
+shells Shells
+sound Sound
+sys System
+text Text
+utils Utilities
+video Video
+web World Wide Web
+www HTTP / FTP
+wifi Wireless
+x11/apps X applications
+x11/drivers X server and drivers
+x11/server X server and drivers
+x11/libs X libraries
+x11/fonts X fonts
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index 85d680f8b..3107667f4 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.97.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 2aa91c43d01d2dfc9fbc1116e3063ae1
PKG_DESCR:= display drivers (serial, parallel, USB)
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_BUILDDEP+= libgd libusb
PKG_URL:= http://serdisplib.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=serdisplib/}
diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile
index 4814b9aec..981234027 100644
--- a/package/setpwc/Makefile
+++ b/package/setpwc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 1bc721cdfcbac24027e2afc93685d29f
PKG_DESCR:= Philips (and compatibles) WebCams (PWC) control utility
-PKG_SECTION:= admin
+PKG_SECTION:= multimedia
PKG_URL:= http://www.vanheusden.com/setpwc/
PKG_SITES:= http://www.vanheusden.com/setpwc/
diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index e95c9e6b5..2411332e7 100644
--- a/package/setserial/Makefile
+++ b/package/setserial/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.17
PKG_RELEASE:= 2
PKG_MD5SUM:= c4867d72c41564318e0107745eb7a0f2
PKG_DESCR:= configuration utility for serial ports
-PKG_SECTION:= misc
+PKG_SECTION:= serial
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=setserial/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/shat/Makefile b/package/shat/Makefile
index 164280e51..6afe7107c 100644
--- a/package/shat/Makefile
+++ b/package/shat/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.9.7
PKG_RELEASE:= 1
PKG_MD5SUM:= da06846f35838b14d1513523dad84d24
PKG_DESCR:= Source Hardware Address Translation - a tool for nomadic routing
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=shat/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
index 7d6c48bf4..8d2dc52fc 100644
--- a/package/shorewall-common/Makefile
+++ b/package/shorewall-common/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.0.7
PKG_RELEASE:= 2
PKG_MD5SUM:= 2df43356b1fdbc91920d48c5595aa101
PKG_DESCR:= high-level netfilter configuration tool
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_DEPENDS:= iptables
PKG_URL:= http://www.shorewall.net
PKG_SITES:= http://www1.shorewall.net/pub/shorewall/4.0/shorewall-${PKG_VERSION}/
diff --git a/package/shorewall-shell/Makefile b/package/shorewall-shell/Makefile
index 21971a807..574458fdb 100644
--- a/package/shorewall-shell/Makefile
+++ b/package/shorewall-shell/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.0.14.1
PKG_RELEASE:= 1
PKG_MD5SUM:= ab61c2f3db82382351f432f783980fa7
PKG_DESCR:= shell compiler for shorewall
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://www.shorewall.net
PKG_SITES:= http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.14/
diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile
index 3fbf8040e..a5c56b84b 100644
--- a/package/siproxd/Makefile
+++ b/package/siproxd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 45e5a44803181e2bf3361d562060c904
PKG_DESCR:= a SIP (Session Initiation Protocol) proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libosip2 libpthread
PKG_BUILDDEP+= libosip2
PKG_URL:= http://siproxd.sourceforge.net
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index 8c6600089..fc2d67823 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 2457f76cd129f880634f3381be0aeb76
PKG_DESCR:= control application for power sockets
-PKG_SECTION:= misc
+PKG_SECTION:= utils
PKG_DEPENDS:= libusb libusb-compat
PKG_BUILDDEP+= libusb libusb-compat
PKG_URL:= http://sispmctl.sourceforge.net
diff --git a/package/snort/Makefile b/package/snort/Makefile
index 4f9cee83e..aa14d88c2 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.8.5.2
PKG_RELEASE:= 1
PKG_MD5SUM:= e6a8bc5aa1ebe4d2100533d7709c4a9e
PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS)
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= libnet libpcap libpcre
PKG_BUILDDEP+= libnet libpcap pcre
diff --git a/package/socat/Makefile b/package/socat/Makefile
index b264096f4..93dda9a99 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.0.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 82967132b5a8ca4d07e54370fdcb2662
PKG_DESCR:= A multipurpose relay (SOcket CAT)
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= libpthread libopenssl
PKG_BUILDDEP+= openssl
PKG_URL:= http://www.dest-unreach.org/socat
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index 97d0a7535..69cf2a222 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.6.20
PKG_RELEASE:= 1
PKG_MD5SUM:= 0faf8fc8ccff5297513c6532b2b4ce23
PKG_DESCR:= Self-contained, embeddable, zero-configuration SQL database
-PKG_SECTION:= libs
+PKG_SECTION:= db
PKG_BUILDDEP+= ncurses readline
PKG_URL:= http://www.sqlite.org
PKG_SITES:= http://www.sqlite.org/
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 1c4ffa115..624260b13 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.4
PKG_RELEASE:= 2
PKG_MD5SUM:= c70ef1198e6a6c1ae80bc57cd3592e36
PKG_DESCR:= squid web and cache proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libopenssl libpthread
PKG_BUILDDEP+= openssl
PKG_URL:= http://www.squid-cache.org
diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index bdda82b64..561b1d6f6 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.7p3
PKG_RELEASE:= 1
PKG_MD5SUM:= 214ca8bc476c5e0eab54adb01972be6a
PKG_DESCR:= A socks 4/5 proxy server
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index 93825ae73..7f497bc26 100644
--- a/package/ssltunnel/Makefile
+++ b/package/ssltunnel/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.16
PKG_RELEASE:= 1
PKG_MD5SUM:= 4039b50566a33a4077883ea974e476d5
PKG_DESCR:= A PPP over SSL vpn tool
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libopenssl ppp
PKG_BUILDDEP+= openssl ppp
PKG_SITES:= http://www.hsc.fr/ressources/outils/ssltunnel/download/
diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile
index dc3ea501e..99cf8ac6b 100644
--- a/package/ssmtp/Makefile
+++ b/package/ssmtp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.61
PKG_RELEASE:= 1
PKG_MD5SUM:= 957e6fff08625fe34f4fc33d0925bbc9
PKG_DESCR:= A minimal and secure mail sender
-PKG_SECTION:= net
+PKG_SECTION:= mail
PKG_SITES:= http://ftp.debian.org/debian/pool/main/s/ssmtp/
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 1e4c0ec21..8a0bfb694 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.5.20
PKG_RELEASE:= 1
PKG_MD5SUM:= 64dfe10d9db0c1e34030891695ffca4b
PKG_DESCR:= System call trace program
-PKG_SECTION:= misc
+PKG_SECTION:= debug
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/tar/Makefile b/package/tar/Makefile
index 380f8853e..b6a0813c0 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.22
PKG_RELEASE:= 1
PKG_MD5SUM:= efafad1b256e3de410f4fce5335d9c9d
PKG_DESCR:= GNU tar
-PKG_SECTION:= utils
+PKG_SECTION:= archive
PKG_URL:= http://mirrors.kernel.org/gnu/tar
PKG_SITES:= ftp://ftp.informatik.rwth-aachen.de/pub/gnu/tar/ \
http://mirrors.kernel.org/gnu/tar/
diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile
index 35fbf56dd..d04433f08 100644
--- a/package/tcp_wrappers/Makefile
+++ b/package/tcp_wrappers/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 7.6
PKG_RELEASE:= 1
PKG_MD5SUM:= e6fa25f71226d090f34de3f6b122fb5a
PKG_DESCR:= IP based access control
-PKG_SECTION:= net
+PKG_SECTION:= libs
PKG_NOPARALLEL:= 1
PKG_SITES:= ftp://ftp.porcupine.org/pub/security/
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index 29b443a4a..895593f68 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.11
PKG_RELEASE:= 1
PKG_MD5SUM:= ee0b1a3366c6e379cae34be6fa5dcb15
PKG_DESCR:= VPN tunnel daemon
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= zlib liblzo libopenssl kmod-tun
PKG_BUILDDEP+= zlib liblzo openssl
PKG_URL:= http://www.tinc-vpn.org
diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile
index 88f003d9e..d384eab1e 100644
--- a/package/tinyproxy/Makefile
+++ b/package/tinyproxy/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.5
PKG_RELEASE:= 2
PKG_MD5SUM:= 2b2862ba33d2939e4572688d442ba415
PKG_DESCR:= Tinyproxy is a lightweight HTTP and HTTPS proxy.
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_URL:= https://www.banu.com/tinyproxy
PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.6/
diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile
index 7d22319dd..73be4f1bd 100644
--- a/package/tmsnc/Makefile
+++ b/package/tmsnc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.3.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 337dae91d4775e03b6681f61db56d2a7
PKG_DESCR:= a textbased MSN client
-PKG_SECTION:= net
+PKG_SECTION:= chat
PKG_URL:= http://tmsnc.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tmsnc/}
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 183f4da2b..9f9f37277 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.6.4
PKG_RELEASE:= 1
PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996
PKG_DESCR:= small C++ application server
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_DEPENDS:= cxxtools zlib libiconv libpthread
PKG_BUILDDEP+= cxxtools zlib libiconv
ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
diff --git a/package/tor/Makefile b/package/tor/Makefile
index b6e1fc093..41dde662c 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.1.24
PKG_RELEASE:= 1
PKG_MD5SUM:= cb5629b2709ada82d34c22fef3ed77a9
PKG_DESCR:= An anonymous Internet communication system
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libevent libopenssl zlib libpthread
PKG_BUILDDEP+= libevent openssl zlib
PKG_URL:= http://tor.eff.org
diff --git a/package/tptest/Makefile b/package/tptest/Makefile
index 436fce42c..2dad849ed 100644
--- a/package/tptest/Makefile
+++ b/package/tptest/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 46f941bdab738a2a11ecc2a5f757ec77
PKG_DESCR:= Internet bandwidth tester
-PKG_SECTION:= utils
+PKG_SECTION:= net
PKG_URL:= http://tptest.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tptest/}
diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile
index fbec99543..a393f7a30 100644
--- a/package/traceroute/Makefile
+++ b/package/traceroute/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.11
PKG_RELEASE:= 1
PKG_MD5SUM:= d400573042d41559fc3e5260275300d8
PKG_DESCR:= Utility to trace the route of IP packets
-PKG_SECTION:= utils
+PKG_SECTION:= net
PKG_URL:= http://traceroute.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=traceroute/}
diff --git a/package/twm/Makefile b/package/twm/Makefile
index fbf6518c7..97380e066 100644
--- a/package/twm/Makefile
+++ b/package/twm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 109979bd39d48bd761e7939b30006a48
PKG_DESCR:= X.Org twm application
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_URL:= http://xorg.freedesktop.org
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 823508ca2..ba9f9b379 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -7,13 +7,15 @@ include $(TOPDIR)/toolchain/uClibc/Makefile.inc
PKG_DESCR:= embedded C library
PKG_SECTION:= base
PKG_OPTS:= noremove
+PKG_DESCR_LIB_DEV:= development files for uclibc
+PKG_SECTION_LIB_DEV:= devel
NO_DISTFILES:= 1
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV},${PKG_OPTS}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/udev/Makefile b/package/udev/Makefile
index d3c33b962..609106ac3 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 151
PKG_RELEASE:= 1
PKG_MD5SUM:= aeae0e6273dcbec246c3c1b9868ebed1
PKG_DESCR:= Dynamic device management subsystem
-PKG_SECTION:= base
+PKG_SECTION:= utils
PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/kernel/hotplug/}
diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile
index d2d4bd86b..4ba2052f9 100644
--- a/package/udp-broadcast-relay/Makefile
+++ b/package/udp-broadcast-relay/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.3
PKG_RELEASE:= 1
PKG_MD5SUM:= a32f983b7063d6ac670e6b22be9b9d24
PKG_DESCR:= listens for packets on a specified UDP broadcast port
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://www.joachim-breitner.de/udp-broadcast-relay
PKG_SITES:= http://www.joachim-breitner.de/udp-broadcast-relay/files/
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index f962410b7..f59d19f7b 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.0.0beta3
PKG_RELEASE:= 1
PKG_MD5SUM:= be8137d3b7ae70ebbce7ca8852b9e901
PKG_DESCR:= Netfilter userspace logging daemon
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_MULTI:= 1
PKG_NOPARALLEL:= 1
PKG_DEPENDS:= iptables libnetfilter-conntrack libnetfilter-log
diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile
index 6859dd6df..a8779fcd2 100644
--- a/package/updatedd/Makefile
+++ b/package/updatedd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 95655596eb6e0e381d60a458f6a45fee
PKG_DESCR:= A tool to update dynamic dns services.
-PKG_SECTION:= net
+PKG_SECTION:= dns
PKG_MULTI:= 1
PKG_SITES:= http://savannah.nongnu.org/download/updatedd/
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 4112edd70..fd79c90bb 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.86
PKG_RELEASE:= 1
PKG_MD5SUM:= 34979f675d2bcb3e1b45012fa830a53f
PKG_DESCR:= A program to list USB devices
-PKG_SECTION:= misc
+PKG_SECTION:= utils
PKG_DEPENDS:= libusb libusb-compat libpthread
PKG_BUILDDEP+= libusb libusb-compat
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-usb/}
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index 37cd6ae39..12c1c64b1 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.17.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 4c810430e86d53b6ea5e7ae279b39186
PKG_DESCR:= Linux utilities
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_BUILDDEP+= e2fsprogs ncurses
PKG_URL:= http://userweb.kernel.org/~kzak/util-linux-ng
PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.17/}
@@ -20,6 +20,7 @@ PKG_DEPENDS_SWAP:= libblkid
PKG_DESCR_LOOP:= Loop devices setup and control utility
PKG_DEPENDS_LOOP:= kmod-blk-dev-loop
PKG_DESCR_MCOOKIE:= Generate magic cookies for xauth
+PKG_SECT_MCOOKIE:= x11/apps
include ${TOPDIR}/mk/package.mk
@@ -27,7 +28,7 @@ $(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
$(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SFDISK},${PKG_SECTION}))
$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SWAP},${PKG_DESCR_SWAP},${PKG_SECTION}))
$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LOOP},${PKG_DESCR_LOOP},${PKG_SECTION}))
-$(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_MCOOKIE},${PKG_SECTION}))
+$(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_MCOOKIE},${PKG_SECT_MCOOKIE}))
CONFIGURE_ARGS+= --disable-use-tty-group \
--disable-schedutils \
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index a7dfe2886..24e99390d 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.5.0
PKG_RELEASE:= 1
PKG_MD5SUM:= f03522a4687cf76c676c9494fcc0a517
PKG_DESCR:= memory management debugging
-PKG_SECTION:= utils
+PKG_SECTION:= debug
PKG_URL:= http://valgrind.org
PKG_SITES:= http://valgrind.org/downloads/
diff --git a/package/vgp/Makefile b/package/vgp/Makefile
index c7ed0759b..9420bc8bb 100755
--- a/package/vgp/Makefile
+++ b/package/vgp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= b8c25b5dfcb944f78bbc584be9c230c7
PKG_DESCR:= vgp is a daemon working like Cisco HSRP
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://vgpd.freaknet.org
PKG_SITES:= http://vgpd.freaknet.org/files/
diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile
index 0beb9ce2d..01202e94b 100644
--- a/package/vilistextum/Makefile
+++ b/package/vilistextum/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= libiconv
PKG_MD5SUM:= 5ba56ffdc56758da716bb46c3e0f517e
PKG_DESCR:= html to ascii converter
-PKG_SECTION:= text
+PKG_SECTION:= mail
PKG_DEPENDS:= libiconv
PKG_SITES:= http://bhaak.dyndns.org/${PKG_NAME}/
diff --git a/package/vim/Makefile b/package/vim/Makefile
index e27c76ff7..f3ad2cc3d 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE= 1
PKG_BUILDDEP+= ncurses
PKG_MD5SUM= f0901284b338e448bfd79ccca0041254
PKG_DESCR:= The text editor
-PKG_SECTION:= text
+PKG_SECTION:= editor
PKG_DEPENDS:= libncurses
PKG_URL:= http://www.vim.org
PKG_SITES= ftp://ftp.vim.org/pub/vim/unix/
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile
index 48158a886..7cdc7ba14 100644
--- a/package/vnc-reflector/Makefile
+++ b/package/vnc-reflector/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.4
PKG_RELEASE:= 1
PKG_MD5SUM:= c3f88bc62f228b335c25c07f9744ab0c
PKG_DESCR:= specialized VNC server which acts as a proxy
-PKG_SECTION:= net
+PKG_SECTION:= proxy
PKG_DEPENDS:= libjpeg zlib
PKG_BUILDDEP+= jpeg zlib
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vnc-reflector/}
diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile
index 59f88090f..5cd4349ae 100644
--- a/package/vnstat/Makefile
+++ b/package/vnstat/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 9184f79b5e60499bc059f670032291e5
PKG_DESCR:= Console-based network traffic monitor
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= http://humdi.net/vnstat/
include ${TOPDIR}/mk/package.mk
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index 24a54787c..72fa69459 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.5.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 4378f9551d5b077e1770bbe09995afb3
PKG_DESCR:= client for cisco3000 VPN Concentrator.
-PKG_SECTION:= net
+PKG_SECTION:= net/security
PKG_DEPENDS:= libgcrypt libgpg-error kmod-tun
PKG_BUILDDEP+= libgcrypt libgpg-error
PKG_URL:= http://www.unix-ag.uni-kl.de/~massar/vpnc/
diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile
index cda12887f..2c9aba55c 100644
--- a/package/vrrpd/Makefile
+++ b/package/vrrpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0
PKG_RELEASE:= 9
PKG_MD5SUM:= 6d5066ea1a6ced817376ca0f54765447
PKG_DESCR:= An implementation of the Virtual Router Redundancy Protocol
-PKG_SECTION:= net
+PKG_SECTION:= route
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vrrpd/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index c295af14e..20a71844b 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.2.0
PKG_RELEASE:= 1
PKG_MD5SUM:= e4eb190af270ae65d57a84274a38ec31
PKG_DESCR:= a fast and secure FTP server
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_URL:= http://vsftpd.beasts.org
PKG_SITES:= ftp://vsftpd.beasts.org/users/cevans/
diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index 194c94893..781e54be1 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c342ffe77055d4248a38f0b380f28c1b
PKG_DESCR:= A VPN tunnel daemon
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_DEPENDS:= zlib libopenssl liblzo kmod-tun
PKG_BUILDDEP+= zlib openssl liblzo
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/}
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index 14abf0ca3..b1813a044 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 5.7
PKG_RELEASE:= 1
PKG_MD5SUM:= 31766450ecfc9aff70fe966c0b9df06d
PKG_DESCR:= watchdog daemon
-PKG_SECTION:= sys
+PKG_SECTION:= utils
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index 9763248f2..88c2efb9e 100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.2
PKG_RELEASE:= 2
PKG_MD5SUM:= 5f15c274de61dfb88e0dbfc1ccbe6b67
PKG_DESCR:= A WCCP (Web Cache Coordination Protocol) server daemon
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=wccpd/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile
index bdc8ae8d4..25169868a 100644
--- a/package/wdfs/Makefile
+++ b/package/wdfs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION= 1.4.2
PKG_RELEASE= 2
PKG_MD5SUM= 628bb44194d04c1cf8aacc446ed0a230
PKG_DESCR:= WebDAV filesystem
-PKG_SECTION:= net
+PKG_SECTION:= fs
PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse-fs neon glib
PKG_BUILDDEP+= openssl fuse neon glib
PKG_SITES= http://noedler.de/projekte/wdfs/
diff --git a/package/wget/Makefile b/package/wget/Makefile
index 3eb0e2556..174db870f 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.12
PKG_RELEASE:= 1
PKG_MD5SUM:= 141461b9c04e454dc8933c9d1f2abf83
PKG_DESCR:= retrieving files using HTTP, HTTPS and FTP
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_URL:= http://www.gnu.org/software/wget/
PKG_SITES:= ${MASTER_SITE_GNU:=wget/}
diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile
index 9acd5624b..629982ef8 100644
--- a/package/wifidog/Makefile
+++ b/package/wifidog/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.5
PKG_RELEASE:= 1
PKG_MD5SUM:= abe5f7123179a0f08c493ce59fb3cb31
PKG_DESCR:= a complete and embeddable captive portal
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= iptables
PKG_URL:= http://dev.wifidog.org
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index ca9a84809..7e07fd1cf 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 29
PKG_RELEASE:= 1
PKG_MD5SUM:= e06c222e186f7cc013fd272d023710cb
PKG_DESCR:= Linux wireless tools (for older wireless drivers)
-PKG_SECTION:= base
+PKG_SECTION:= wifi
PKG_SITES:= http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
DISTFILES:= wireless_tools.${PKG_VERSION}.tar.gz
diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile
index 2e8fe6bb2..1a7d78847 100644
--- a/package/wondershaper/Makefile
+++ b/package/wondershaper/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1a
PKG_RELEASE:= 7
PKG_MD5SUM:= bbc5a3a4485ab286e337ce8550e7b990
PKG_DESCR:= WonderShaper is a tc based traffic shaping tool.
-PKG_SECTION:= net
+PKG_SECTION:= firewall
PKG_URL:= http://lartc.org/wondershaper
PKG_SITES:= http://lartc.org/wondershaper/
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 905875078..b46e31db6 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.7.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 0e2cb7e4c35667351d8b7ec28c783e6a
PKG_DESCR:= WPA Supplicant with support for WPA and WPA2
-PKG_SECTION:= net
+PKG_SECTION:= wifi
PKG_DEPENDS:= libnl
PKG_BUILDDEP+= libnl
ifeq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL},y)
diff --git a/package/wput/Makefile b/package/wput/Makefile
index fd9bc0ce9..74fdb1677 100644
--- a/package/wput/Makefile
+++ b/package/wput/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.6.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 92b41efed4db8eb4f3443c23bf7ceecf
PKG_DESCR:= a wget-like command-line FTP client
-PKG_SECTION:= net
+PKG_SECTION:= www
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=wput/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
diff --git a/package/xauth/Makefile b/package/xauth/Makefile
index a12c62f34..26ebb1426 100644
--- a/package/xauth/Makefile
+++ b/package/xauth/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.4
PKG_RELEASE:= 1
PKG_MD5SUM:= 2eb3cc3e4421e1b747c4ac16aac20cda
PKG_DESCR:= X authority file utility
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= libx11 libxext libxmu
PKG_BUILDDEP+= libX11 libXext libXmu
PKG_URL:= http://www.x.org
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 52f2a67ac..67bcf625e 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -7,8 +7,6 @@ PKG_NAME:= xcb-proto
PKG_VERSION:= 1.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 8d29695e8faf5fcdce568c66eaeaa5ee
-PKG_DESCR:= XCB headers
-PKG_URL:= http://xcb.freedesktop.org/
PKG_SITES:= http://xcb.freedesktop.org/dist/
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
index 6dbab29d9..487ade6c2 100644
--- a/package/xf86-input-evtouch/Makefile
+++ b/package/xf86-input-evtouch/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.8.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 4d8e092356d8353002f60a4907046c13
PKG_DESCR:= X11 driver for touchscreen
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server kmod-input-evdev
PKG_BUILDDEP+= xorg-server
PKG_SITES:= http://www.conan.de/touchscreen/
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index f09e4edde..085ddffd1 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.0
PKG_RELEASE:= 1
PKG_MD5SUM:= fc836be5364d80604cb11f4daacceb23
PKG_DESCR:= X11 driver for keyboard
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_BUILDDEP+= xorg-server
PKG_DEPENDS:= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 1313c46b1..d926a190a 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.0
PKG_RELEASE:= 1
PKG_MD5SUM:= a662883fd9709c3dad7fb113ad8d2908
PKG_DESCR:= X11 driver for mouse
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index 22e4b24e3..742a62df6 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= xorg-server
PKG_MD5SUM:= c63a29917c48d0c317445991fc36d09a
PKG_DESCR:= X11 driver for Cirrus VGA chips
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index ba05cf808..7da4c871e 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c297e40b93b3636a72189cfac43d1a87
PKG_DESCR:= X11 driver for Linux Framebuffer devices
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index 837c76954..7cb85e12f 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.11.6
PKG_RELEASE:= 1
PKG_MD5SUM:= a673c0f88037d12fbb96d9fefc82785b
PKG_DESCR:= X11 driver for AMD Geode VGA chip
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index b0f4350a8..d1a70117e 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.9.1
PKG_RELEASE:= 1
PKG_MD5SUM:= b1926dc68cc10209fc2200729fb6162b
PKG_DESCR:= X11 driver for Intel VGA chip
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libdrm
PKG_BUILDDEP+= xorg-server libdrm
PKG_SITES:= http://www.x.org/releases/X11R7.5/src/driver/
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index b9847902b..e372928ff 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 39da891cd368960443613e7a61398216
PKG_DESCR:= X11 driver for Silicon Motion VGA chips
-PKG_SECTION:= x11
+PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
diff --git a/package/xf86driproto/Makefile b/package/xf86driproto/Makefile
index 30430b43c..27e3dca18 100644
--- a/package/xf86driproto/Makefile
+++ b/package/xf86driproto/Makefile
@@ -7,11 +7,7 @@ PKG_NAME:= xf86driproto
PKG_VERSION:= 2.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 309d552732666c3333d7dc63e80d042f
-PKG_DESCR:= DRI protocol headers
-PKG_SECTION:= libs
-PKG_URL:= add project url
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86vidmodeproto/Makefile b/package/xf86vidmodeproto/Makefile
index 9ab665f50..2f1d5a8c3 100644
--- a/package/xf86vidmodeproto/Makefile
+++ b/package/xf86vidmodeproto/Makefile
@@ -7,7 +7,6 @@ PKG_NAME:= xf86vidmodeproto
PKG_VERSION:= 2.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 934b400f2f8d1bcab20bb056e0910291
-PKG_DESCR:= videomode proto headers
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/proto/
include $(TOPDIR)/mk/package.mk
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 3a305cb9e..51b6231c8 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.1.1
PKG_RELEASE:= 1
PKG_MD5SUM:= c2308b46ee707597ac50aae418d321b8
PKG_DESCR:= Utilities to create and check XFS filesystems
-PKG_SECTION:= admin
+PKG_SECTION:= fs
PKG_DEPENDS:= libuuid libpthread
PKG_BUILDDEP+= e2fsprogs
PKG_URL:= http://oss.sgi.com/projects/xfs
diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index 7147efbdb..868678b4d 100644
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.3.14
PKG_RELEASE:= 1
PKG_MD5SUM:= 567382d7972613090215c6c54f9b82d9
PKG_DESCR:= a powerful and secure superserver
-PKG_SECTION:= net
+PKG_SECTION:= net/misc
PKG_URL:= http://www.xinetd.org
PKG_SITES:= http://www.xinetd.org/
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index 9574024d9..fbdf6554d 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 7ad82221ebd6600a8d33712ec3b62efb
PKG_DESCR:= X Window System initializer
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= xorg-server mcookie xauth
PKG_BUILDDEP+= xorg-server
PKG_URL:= http://xorg.freedesktop.org
diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile
index a52d74957..0b7d94bc8 100644
--- a/package/xkbcomp/Makefile
+++ b/package/xkbcomp/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
PKG_MD5SUM:= 10e6661a35aa994a9aa73ded0cf70259
PKG_DESCR:= x11 keyboard compiler
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/
include $(TOPDIR)/mk/package.mk
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index 702f8b4e5..6e597b926 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_BUILDDEP+= xkbcomp
PKG_MD5SUM:= c024a6e2a5b8c4ce3d9d1f1286466163
PKG_DESCR:= X keyboard config
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= http://xlibs.freedesktop.org/xkbdesc/
include $(TOPDIR)/mk/package.mk
diff --git a/package/xlsfonts/Makefile b/package/xlsfonts/Makefile
index d76e6c722..dcdd2cdea 100644
--- a/package/xlsfonts/Makefile
+++ b/package/xlsfonts/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 7a6bee1512ccdef52fc519a86684891e
PKG_DESCR:= List X11 fonts
-PKG_SECTION:= libs
+PKG_SECTION:= x11/apps
PKG_URL:= http://www.x.org/
PKG_SITES:= http://xorg.freedesktop.org/releases/individual/app/
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 6659e04db..cf009036e 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.6
PKG_RELEASE:= 1
PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2
PKG_DESCR:= Xorg server
-PKG_SECTION:= x11
+PKG_SECTION:= x11/server
PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \
libfontenc xkeyboard-config xkbcomp libxau libxaw \
libxmu libxpm libxrender libxt libxxf86dga libxext \
diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index 1e75a7345..f46431c45 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 259
PKG_RELEASE:= 1
PKG_MD5SUM:= 22037e1b794d749072310cb142800f05
PKG_DESCR:= Terminal Emulator for X Windows
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= xorg-server libxaw
PKG_URL:= http://invisible-island.net/xterm/xterm.html
PKG_SITES:= ftp://invisible-island.net/xterm/
diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile
index 7928210f4..90b8190c7 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.5
PKG_RELEASE:= 1
PKG_MD5SUM:= b2f47d49faf1f24e8294b624b21b9b93
PKG_DESCR:= X transport library
-PKG_SECTION:= x11
+PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile
index ceebddd9f..59315974b 100644
--- a/package/xvinfo/Makefile
+++ b/package/xvinfo/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
PKG_MD5SUM:= cc00d609136ecc0b6b571dc42740a675
PKG_DESCR:= Print out X-Video extension adaptor information
-PKG_SECTION:= x11
+PKG_SECTION:= x11/apps
PKG_DEPENDS:= xorg-server
KG_BUILDDEP+= xorg-server
PKG_URL:= http://xorg.freedesktop.org/
diff --git a/package/xz/Makefile b/package/xz/Makefile
index 58d3379cb..05e762ad2 100644
--- a/package/xz/Makefile
+++ b/package/xz/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.999.9beta
PKG_RELEASE:= 1
PKG_MD5SUM:= f2073579b6da2fe35d453adee1aaf1b2
PKG_DESCR:= lzma compression utility
-PKG_SECTION:= net
+PKG_SECTION:= archive
PKG_URL:= http://tukaani.org/xz/
PKG_SITES:= http://tukaani.org/xz/
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index e58fadffd..ed7000c15 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -13,6 +13,8 @@ PKG_URL:= http://www.zlib.net
PKG_SITES:= http://www.zlib.net/ \
${MASTER_SITE_SOURCEFORGE:=zlib/}
+PKG_DESCR_LIB_DEV:= development files for zlib
+PKG_SECTION_LIB_DEV:= devel
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
ifeq ($(ADK_STATIC),y)
@@ -22,7 +24,7 @@ endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
SUB_INSTALLS-y:=
SUB_INSTALLS-m:=