From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- Config.in | 7 +- adk/tools/pkgmaker.c | 23 ++++-- mk/build.mk | 6 +- package/6tunnel/Makefile | 4 +- package/Config.in | 86 +++++++++++++++++++ package/DirectFB/Makefile | 4 +- package/ImageMagick/Makefile | 10 +-- package/MesaLib/Makefile | 4 +- package/SDL_gfx/Makefile | 4 +- package/SDL_ttf/Makefile | 4 +- package/adk-helper/Makefile | 2 +- package/adk-test-tools/Makefile | 2 +- package/adkinstall/Makefile | 4 +- package/aiccu/Makefile | 4 +- package/aircrack-ng/Makefile | 2 +- package/alix-switch/Makefile | 4 +- package/alix-temperature/Makefile | 2 +- package/alsa-lib/Makefile | 4 +- package/alsa-utils/Makefile | 2 +- package/ant/Makefile | 4 +- package/apr-util/Makefile | 2 +- package/apr/Makefile | 4 +- package/arpd/Makefile | 4 +- package/arpwatch/Makefile | 2 +- package/asterisk/Makefile | 4 +- package/atftp/Makefile | 6 +- package/atk/Makefile | 4 +- package/autoconf/Makefile | 2 +- package/automake/Makefile | 4 +- package/autossh/Makefile | 2 +- package/autotool/Makefile | 2 +- package/avahi/Makefile | 6 +- package/axtls/Makefile | 6 +- package/b43-firmware/Makefile | 2 +- package/base-files/Makefile | 2 +- package/bash/Makefile | 4 +- package/bc/Makefile | 2 +- package/bcm2835-bootloader/Makefile | 2 +- package/bcm2835-vc/Makefile | 2 +- package/bdftopcf/Makefile | 4 +- package/beecrypt/Makefile | 2 +- package/bigreqsproto/Makefile | 4 +- package/bind/Makefile | 18 ++-- package/binutils/Makefile | 4 +- package/bison/Makefile | 2 +- package/bitlbee/Makefile | 4 +- package/bkeymaps/Makefile | 2 +- package/bluez-firmware/Makefile | 4 +- package/bluez/Makefile | 2 +- package/bogofilter/Makefile | 2 +- package/boost/Makefile | 4 +- package/boot-wrapper-aarch64/Makefile | 2 +- package/brcm-bluetooth/Makefile | 2 +- package/brcmfmac-firmware/Makefile | 2 +- package/bridge-utils/Makefile | 2 +- package/busybox/Makefile | 2 +- package/bwm/Makefile | 4 +- package/bzip2/Makefile | 4 +- package/bzr/Makefile | 4 +- package/ca-certificates/Makefile | 6 +- package/cairo/Makefile | 2 +- package/ccache/Makefile | 4 +- package/ccid/Makefile | 4 +- package/cdrtools/Makefile | 4 +- package/cfgfs/Makefile | 2 +- package/cgilib/Makefile | 4 +- package/check/Makefile | 4 +- package/cherokee/Makefile | 2 +- package/cherrypy/Makefile | 2 +- package/chillispot/Makefile | 4 +- package/cifs-utils/Makefile | 6 +- package/classpath/Makefile | 4 +- package/cmake/Makefile | 2 +- package/collectd/Makefile | 2 +- package/comgt/Makefile | 4 +- package/compositeproto/Makefile | 4 +- package/confuse/Makefile | 2 +- package/conntrack-tools/Makefile | 2 +- package/coreutils/Makefile | 2 +- package/cpio/Makefile | 2 +- package/cpufrequtils/Makefile | 4 +- package/cryptinit/Makefile | 2 +- package/cryptodev-linux/Makefile | 4 +- package/cryptsetup/Makefile | 4 +- package/ctorrent/Makefile | 4 +- package/cups/Makefile | 2 +- package/curl/Makefile | 16 ++-- package/cutter/Makefile | 6 +- package/cvs/Makefile | 2 +- package/cxxtools/Makefile | 4 +- package/cyrus-sasl/Makefile | 4 +- package/damageproto/Makefile | 4 +- package/dansguardian/Makefile | 2 +- package/daq/Makefile | 4 +- package/davfs2/Makefile | 2 +- package/db/Makefile | 2 +- package/dbus-glib/Makefile | 5 +- package/dbus-python/Makefile | 6 +- package/dbus/Makefile | 7 +- package/deco/Makefile | 4 +- package/dhcp-forwarder/Makefile | 4 +- package/dhcp/Makefile | 6 +- package/dialog/Makefile | 2 +- package/diffutils/Makefile | 2 +- package/digitemp/Makefile | 2 +- package/dmidecode/Makefile | 2 +- package/dnsmasq/Makefile | 4 +- package/dosfstools/Makefile | 2 +- package/dovecot/Makefile | 2 +- package/drbd/Makefile | 2 +- package/dri2proto/Makefile | 4 +- package/dri3proto/Makefile | 4 +- package/dropbear/Makefile | 6 +- package/dsniff/Makefile | 2 +- package/e2fsprogs/Makefile | 18 ++-- package/easy-rsa/Makefile | 2 +- package/ebtables/Makefile | 2 +- package/ecj/Makefile | 2 +- package/ed/Makefile | 2 +- package/elinks/Makefile | 2 +- package/esound/Makefile | 6 +- package/ether-wake/Makefile | 7 +- package/ethtool/Makefile | 2 +- package/eudev/Makefile | 8 +- package/eventlog/Makefile | 2 +- package/evieext/Makefile | 4 +- package/evilwm/Makefile | 2 +- package/exmap/Makefile | 2 +- package/expat/Makefile | 4 +- package/ez-ipupdate/Makefile | 4 +- package/faac/Makefile | 4 +- package/faad2/Makefile | 5 +- package/fakeidentd/Makefile | 4 +- package/fastjar/Makefile | 2 +- package/fbset/Makefile | 2 +- package/fbsplash/Makefile | 2 +- package/feh/Makefile | 2 +- package/fetchmail/Makefile | 4 +- package/ffmpeg/Makefile | 18 ++-- package/file/Makefile | 4 +- package/findutils/Makefile | 2 +- package/fixesproto/Makefile | 4 +- package/flac/Makefile | 2 +- package/flex/Makefile | 2 +- package/fltk/Makefile | 2 +- package/fluxbox/Makefile | 2 +- package/font-adobe-100dpi/Makefile | 2 +- package/font-adobe-75dpi/Makefile | 2 +- package/font-bh-100dpi/Makefile | 2 +- package/font-bh-75dpi/Makefile | 2 +- package/font-bh-lucidatypewriter-100dpi/Makefile | 2 +- package/font-bh-lucidatypewriter-75dpi/Makefile | 2 +- package/font-bh-ttf/Makefile | 2 +- package/font-bh-type1/Makefile | 2 +- package/font-bitstream-100dpi/Makefile | 2 +- package/font-bitstream-75dpi/Makefile | 2 +- package/font-bitstream-type1/Makefile | 2 +- package/font-misc-misc/Makefile | 2 +- package/font-util/Makefile | 4 +- package/font-xfree86-type1/Makefile | 2 +- package/fontcacheproto/Makefile | 2 +- package/fontconfig/Makefile | 2 +- package/fontsproto/Makefile | 2 +- package/forked-daapd/Makefile | 4 +- package/fping/Makefile | 2 +- package/fprobe-ulog/Makefile | 4 +- package/fprobe/Makefile | 4 +- package/freeglut/Makefile | 4 +- package/freeradius-client/Makefile | 6 +- package/freeradius-server/Makefile | 4 +- package/freetype/Makefile | 2 +- package/fribidi/Makefile | 2 +- package/frickin/Makefile | 4 +- package/fuse/Makefile | 4 +- package/gatling/Makefile | 2 +- package/gawk/Makefile | 4 +- package/gcc/Makefile | 6 +- package/gcj/Makefile | 4 +- package/gconf/Makefile | 4 +- package/gdb/Makefile | 7 +- package/gdbm/Makefile | 2 +- package/gdbserver/Makefile | 2 +- package/gdk-pixbuf/Makefile | 4 +- package/genext2fs/Makefile | 4 +- package/gettext-tiny/Makefile | 4 +- package/giblib/Makefile | 2 +- package/giflib/Makefile | 4 +- package/git/Makefile | 2 +- package/gkrellm/Makefile | 2 +- package/glib/Makefile | 4 +- package/glibc/Makefile | 7 +- package/glproto/Makefile | 4 +- package/glu/Makefile | 4 +- package/gmediaserver/Makefile | 4 +- package/gmp/Makefile | 4 +- package/gnupg/Makefile | 2 +- package/gnutls/Makefile | 10 +-- package/gperf/Makefile | 2 +- package/gpm/Makefile | 2 +- package/gpsd/Makefile | 4 +- package/grep/Makefile | 2 +- package/grub/Makefile | 6 +- package/gsm/Makefile | 8 +- package/gst-plugins-base/Makefile | 2 +- package/gstreamer/Makefile | 2 +- package/gtk+/Makefile | 6 +- package/gzip/Makefile | 2 +- package/harfbuzz/Makefile | 4 +- package/haserl/Makefile | 4 +- package/hdparm/Makefile | 4 +- package/heimdal/Makefile | 8 +- package/heirloom-cpio/Makefile | 2 +- package/heyu/Makefile | 4 +- package/hostapd/Makefile | 8 +- package/htop/Makefile | 2 +- package/htpdate/Makefile | 4 +- package/httping/Makefile | 4 +- package/huawei/Makefile | 4 +- package/i2c-tools/Makefile | 4 +- package/icecast/Makefile | 2 +- package/icu4c/Makefile | 2 +- package/id3lib/Makefile | 4 +- package/iftop/Makefile | 2 +- package/igmpproxy/Makefile | 2 +- package/imlib2/Makefile | 4 +- package/inputproto/Makefile | 4 +- package/intltool/Makefile | 2 +- package/ipcad/Makefile | 4 +- package/iperf/Makefile | 2 +- package/iproute2/Makefile | 20 ++--- package/ipsec-tools/Makefile | 2 +- package/ipset/Makefile | 2 +- package/iptables/Makefile | 2 +- package/iptraf/Makefile | 2 +- package/ipvsadm/Makefile | 4 +- package/irssi/Makefile | 4 +- package/iw/Makefile | 4 +- package/jack/Makefile | 4 +- package/jamvm/Makefile | 4 +- package/jikes/Makefile | 4 +- package/joe/Makefile | 6 +- package/json-c/Makefile | 4 +- package/json-glib/Makefile | 4 +- package/kbd/Makefile | 2 +- package/kbproto/Makefile | 4 +- package/kexec-tools/Makefile | 4 +- package/kexecinit/Makefile | 2 +- package/keychain/Makefile | 4 +- package/keyutils/Makefile | 2 +- package/kismet/Makefile | 10 +-- package/kmod/Makefile | 2 +- package/knock/Makefile | 2 +- package/krb5/Makefile | 25 ++---- package/l2tpns/Makefile | 2 +- package/lame/Makefile | 8 +- package/less/Makefile | 2 +- package/libICE/Makefile | 2 +- package/libIDL/Makefile | 4 +- package/libSM/Makefile | 2 +- package/libX11/Makefile | 2 +- package/libXScrnSaver/Makefile | 2 +- package/libXau/Makefile | 2 +- package/libXaw/Makefile | 2 +- package/libXcomposite/Makefile | 2 +- package/libXcursor/Makefile | 2 +- package/libXdamage/Makefile | 2 +- package/libXdmcp/Makefile | 2 +- package/libXext/Makefile | 2 +- package/libXfixes/Makefile | 2 +- package/libXfont/Makefile | 2 +- package/libXft/Makefile | 2 +- package/libXi/Makefile | 2 +- package/libXinerama/Makefile | 2 +- package/libXmu/Makefile | 2 +- package/libXp/Makefile | 2 +- package/libXpm/Makefile | 2 +- package/libXrandr/Makefile | 2 +- package/libXrender/Makefile | 2 +- package/libXt/Makefile | 2 +- package/libXtst/Makefile | 2 +- package/libXv/Makefile | 2 +- package/libXxf86dga/Makefile | 2 +- package/libXxf86vm/Makefile | 2 +- package/libaio/Makefile | 4 +- package/libantlr3c/Makefile | 4 +- package/libao/Makefile | 2 +- package/libart/Makefile | 4 +- package/libass/Makefile | 4 +- package/libatomic_ops/Makefile | 2 +- package/libaudiofile/Makefile | 2 +- package/libavl/Makefile | 4 +- package/libbluray/Makefile | 2 +- package/libcap/Makefile | 2 +- package/libcapi20/Makefile | 4 +- package/libcdio/Makefile | 4 +- package/libcec/Makefile | 4 +- package/libcli/Makefile | 4 +- package/libcroco/Makefile | 4 +- package/libdaemon/Makefile | 4 +- package/libdnet/Makefile | 3 +- package/libdrm/Makefile | 4 +- package/libelf/Makefile | 2 +- package/libevent/Makefile | 2 +- package/libffi/Makefile | 4 +- package/libgc/Makefile | 2 +- package/libgcrypt/Makefile | 4 +- package/libgd/Makefile | 4 +- package/libglew/Makefile | 4 +- package/libgpg-error/Makefile | 2 +- package/libgssglue/Makefile | 4 +- package/libhugetlbfs/Makefile | 2 +- package/libiconv-tiny/Makefile | 3 +- package/libid3tag/Makefile | 4 +- package/libjansson/Makefile | 4 +- package/libjasper/Makefile | 4 +- package/libjpeg-turbo/Makefile | 4 +- package/libjson/Makefile | 4 +- package/liblzo/Makefile | 4 +- package/libmad/Makefile | 4 +- package/libmicrohttpd/Makefile | 4 +- package/libmms/Makefile | 2 +- package/libmnl/Makefile | 4 +- package/libmodplug/Makefile | 4 +- package/libmpc/Makefile | 4 +- package/libmpdclient/Makefile | 4 +- package/libmpeg2/Makefile | 4 +- package/libnet/Makefile | 2 +- package/libnetfilter_acct/Makefile | 4 +- package/libnetfilter_conntrack/Makefile | 4 +- package/libnetfilter_cthelper/Makefile | 4 +- package/libnetfilter_cttimeout/Makefile | 2 +- package/libnetfilter_log/Makefile | 4 +- package/libnetfilter_queue/Makefile | 4 +- package/libnettle/Makefile | 2 +- package/libnfnetlink/Makefile | 2 +- package/libnfs/Makefile | 4 +- package/libnfsidmap/Makefile | 4 +- package/libnids/Makefile | 2 +- package/libnl/Makefile | 2 +- package/libnotify/Makefile | 2 +- package/libogg/Makefile | 4 +- package/libosip2/Makefile | 4 +- package/libowfat/Makefile | 2 +- package/libp11/Makefile | 4 +- package/libpcap/Makefile | 4 +- package/libpciaccess/Makefile | 2 +- package/libpng/Makefile | 4 +- package/libpri/Makefile | 4 +- package/libpthread-stubs/Makefile | 4 +- package/libpthread/Makefile | 4 +- package/libqb/Makefile | 2 +- package/librpcsecgss/Makefile | 4 +- package/librsvg/Makefile | 4 +- package/librt/Makefile | 4 +- package/libsamplerate/Makefile | 2 +- package/libsecret/Makefile | 2 +- package/libshout/Makefile | 4 +- package/libsigc++/Makefile | 4 +- package/libsndfile/Makefile | 2 +- package/libsoup/Makefile | 4 +- package/libssh/Makefile | 4 +- package/libssh2/Makefile | 4 +- package/libssp/Makefile | 2 +- package/libstdcxx/Makefile | 4 +- package/libtasn1/Makefile | 4 +- package/libtheora/Makefile | 4 +- package/libthread_db/Makefile | 4 +- package/libtiff/Makefile | 4 +- package/libtirpc/Makefile | 4 +- package/libtool/Makefile | 4 +- package/libtorrent/Makefile | 2 +- package/libunistring/Makefile | 4 +- package/libupnp/Makefile | 5 +- package/libusb-compat/Makefile | 4 +- package/libusb/Makefile | 4 +- package/libvirt/Makefile | 4 +- package/libvorbis/Makefile | 4 +- package/libvorbisidec/Makefile | 4 +- package/libvpx/Makefile | 4 +- package/libwebp/Makefile | 2 +- package/libx264/Makefile | 4 +- package/libxcb/Makefile | 3 +- package/libxkbfile/Makefile | 2 +- package/libxml2/Makefile | 6 +- package/libxshmfence/Makefile | 2 +- package/libxslt/Makefile | 6 +- package/lighttpd/Makefile | 6 +- package/links/Makefile | 2 +- package/linux-atm/Makefile | 6 +- package/llvm/Makefile | 2 +- package/lm_sensors/Makefile | 6 +- package/log4cplus/Makefile | 4 +- package/log4cxx/Makefile | 4 +- package/logrotate/Makefile | 2 +- package/lrzsz/Makefile | 4 +- package/lsof/Makefile | 2 +- package/lsscsi/Makefile | 4 +- package/ltrace/Makefile | 2 +- package/lua/Makefile | 16 +--- package/lvm/Makefile | 4 +- package/lynx/Makefile | 4 +- package/lzma/Makefile | 4 +- package/lzop/Makefile | 3 +- package/m4/Makefile | 2 +- package/macchanger/Makefile | 4 +- package/madplay/Makefile | 4 +- package/mailutils/Makefile | 4 +- package/make/Makefile | 4 +- package/maradns/Makefile | 2 +- package/mc/Makefile | 2 +- package/mdadm/Makefile | 4 +- package/mesa-demos/Makefile | 6 +- package/mgetty/Makefile | 2 +- package/miau/Makefile | 4 +- package/midori/Makefile | 2 +- package/mini_httpd/Makefile | 4 +- package/mini_sendmail/Makefile | 2 +- package/miredo/Makefile | 28 ++++--- package/mkfontdir/Makefile | 2 +- package/mkfontscale/Makefile | 2 +- package/mkimage/Makefile | 2 +- package/mksh/Makefile | 4 +- package/moc/Makefile | 2 +- package/monit/Makefile | 2 +- package/motion/Makefile | 4 +- package/mpc/Makefile | 2 +- package/mpd/Makefile | 2 +- package/mpdbox/Makefile | 4 +- package/mpfr/Makefile | 4 +- package/mpg123/Makefile | 2 +- package/mplayer/Makefile | 2 +- package/mrd6/Makefile | 4 +- package/mt-daapd/Makefile | 4 +- package/mtd-utils/Makefile | 2 +- package/mtd/Makefile | 6 +- package/mtr/Makefile | 4 +- package/musl/Makefile | 4 +- package/mutt/Makefile | 2 +- package/mxml/Makefile | 4 +- package/mysql/Makefile | 4 +- package/nand/Makefile | 6 +- package/nano/Makefile | 2 +- package/nasm/Makefile | 2 +- package/ncurses/Makefile | 2 +- package/ndisc/Makefile | 13 +-- package/neon/Makefile | 4 +- package/net-snmp/Makefile | 10 +-- package/net-tools/Makefile | 4 +- package/netcat/Makefile | 2 +- package/netperf/Makefile | 2 +- package/netstat-nat/Makefile | 4 +- package/nfs-utils/Makefile | 4 +- package/nginx/Makefile | 2 +- package/nmap/Makefile | 2 +- package/nspr/Makefile | 4 +- package/nss/Makefile | 4 +- package/ntfs-3g/Makefile | 2 +- package/ntpclient/Makefile | 4 +- package/nut/Makefile | 2 +- package/obexftp/Makefile | 6 +- package/olsrd/Makefile | 2 +- package/omxplayer/Makefile | 2 +- package/open-iscsi/Makefile | 4 +- package/openafs/Makefile | 2 +- package/openct/Makefile | 4 +- package/openjdk7/Makefile | 5 +- package/openldap/Makefile | 8 +- package/openntpd/Makefile | 4 +- package/openobex/Makefile | 4 +- package/opensc/Makefile | 4 +- package/opensips/Makefile | 4 +- package/openssl-pkcs11/Makefile | 2 +- package/openssl/Makefile | 8 +- package/openswan/Makefile | 2 +- package/openvpn/Makefile | 4 +- package/oprofile/Makefile | 2 +- package/opus/Makefile | 2 +- package/orbit2/Makefile | 4 +- package/owfs/Makefile | 2 +- package/p5-XML-Parser/Makefile | 4 +- package/p54-firmware/Makefile | 4 +- package/p910nd/Makefile | 2 +- package/pam/Makefile | 2 +- package/pango/Makefile | 2 +- package/parprouted/Makefile | 4 +- package/parted/Makefile | 2 +- package/patch/Makefile | 4 +- package/pcc-libs/Makefile | 4 +- package/pcc/Makefile | 4 +- package/pciutils/Makefile | 4 +- package/pcmciautils/Makefile | 4 +- package/pcre/Makefile | 4 +- package/pcrepp/Makefile | 4 +- package/pcsc-lite/Makefile | 2 +- package/pdnsd/Makefile | 4 +- package/perl/Makefile | 4 +- package/php/Makefile | 4 +- package/picocom/Makefile | 2 +- package/pipacs/Makefile | 2 +- package/pkgconf/Makefile | 2 +- package/pm-utils/Makefile | 2 +- package/pmacct/Makefile | 4 +- package/polarssl/Makefile | 4 +- package/polipo/Makefile | 4 +- package/poppler/Makefile | 2 +- package/popt/Makefile | 4 +- package/postfix/Makefile | 2 +- package/postgresql/Makefile | 2 +- package/ppp/Makefile | 4 +- package/pptp/Makefile | 4 +- package/pptpd/Makefile | 4 +- package/presentproto/Makefile | 2 +- package/printproto/Makefile | 4 +- package/privoxy/Makefile | 2 +- package/procmail/Makefile | 2 +- package/procps/Makefile | 3 +- package/ptunnel/Makefile | 2 +- package/pulseaudio/Makefile | 4 +- package/pycurl/Makefile | 4 +- package/pyrex/Makefile | 4 +- package/python2/Makefile | 2 +- package/python3/Makefile | 2 +- package/qemu/Makefile | 2 +- package/qingy/Makefile | 2 +- package/quagga/Makefile | 2 +- package/raddump/Makefile | 4 +- package/radvd/Makefile | 4 +- package/randrproto/Makefile | 4 +- package/rarpd/Makefile | 2 +- package/rdate/Makefile | 4 +- package/rdesktop/Makefile | 4 +- package/readline/Makefile | 2 +- package/reaim/Makefile | 4 +- package/realtek-firmware/Makefile | 2 +- package/recordproto/Makefile | 4 +- package/renderproto/Makefile | 4 +- package/resourceproto/Makefile | 2 +- package/rfkill/Makefile | 2 +- package/rng-tools/Makefile | 4 +- package/rp-pppoe/Makefile | 4 +- package/rpcbind/Makefile | 2 +- package/rrdcollect/Makefile | 4 +- package/rrdtool/Makefile | 8 +- package/rsync/Makefile | 5 -- package/rt61-firmware/Makefile | 2 +- package/rtmpdump/Makefile | 8 +- package/rtorrent/Makefile | 2 +- package/ruby-ldap/Makefile | 4 +- package/ruby/Makefile | 4 +- package/rxvt-unicode/Makefile | 2 +- package/samba/Makefile | 13 +-- package/sane-backends/Makefile | 2 +- package/scons/Makefile | 4 +- package/screen/Makefile | 2 +- package/scrnsaverproto/Makefile | 4 +- package/scsi-spin/Makefile | 6 +- package/sdl-image/Makefile | 2 +- package/sdl/Makefile | 4 +- package/section.lst | 101 +++++++++++++---------- package/sed/Makefile | 2 +- package/ser2net/Makefile | 2 +- package/serdisplib/Makefile | 4 +- package/setpwc/Makefile | 5 +- package/setserial/Makefile | 2 +- package/setxkbmap/Makefile | 2 +- package/shorewall-common/Makefile | 2 +- package/shorewall-shell/Makefile | 2 +- package/siproxd/Makefile | 4 +- package/sipsak/Makefile | 4 +- package/sispmctl/Makefile | 2 +- package/snort/Makefile | 2 +- package/socat/Makefile | 2 +- package/sox/Makefile | 2 +- package/speex/Makefile | 2 +- package/sqlite/Makefile | 8 +- package/squashfs/Makefile | 2 +- package/squeezelite/Makefile | 2 +- package/squid/Makefile | 2 +- package/srelay/Makefile | 2 +- package/ssltunnel/Makefile | 2 +- package/ssmtp/Makefile | 2 +- package/strace/Makefile | 5 +- package/stress/Makefile | 2 +- package/strongswan/Makefile | 2 +- package/subversion/Makefile | 2 +- package/sudo/Makefile | 2 +- package/swig/Makefile | 2 +- package/sysfsutils/Makefile | 2 +- package/syslinux/Makefile | 2 +- package/syslog-ng/Makefile | 2 +- package/sysstat/Makefile | 2 +- package/taglib/Makefile | 2 +- package/tar/Makefile | 2 +- package/tcl/Makefile | 4 +- package/tcp_wrappers/Makefile | 4 +- package/tcpdump/Makefile | 2 +- package/tcsh/Makefile | 2 +- package/tinc/Makefile | 2 +- package/tinycdb/Makefile | 4 +- package/tinyproxy/Makefile | 4 +- package/tinyxml/Makefile | 4 +- package/tmsnc/Makefile | 4 +- package/tntnet/Makefile | 4 +- package/tor/Makefile | 6 +- package/totd/Makefile | 4 +- package/tptest/Makefile | 2 +- package/traceroute/Makefile | 4 +- package/trafshow/Makefile | 2 +- package/transproxy/Makefile | 4 +- package/tslib/Makefile | 2 +- package/ttcp/Makefile | 6 +- package/tzdata/Makefile | 18 +--- package/u-boot-imx6/Makefile | 2 +- package/u-boot/Makefile | 2 +- package/uclibc++/Makefile | 2 +- package/uclibc/Makefile | 4 +- package/udp-broadcast-relay/Makefile | 2 +- package/ulogd/Makefile | 2 +- package/updatedd/Makefile | 2 +- package/urlgrabber/Makefile | 4 +- package/usbutils/Makefile | 4 +- package/util-linux/Makefile | 26 +++--- package/uvd/Makefile | 4 +- package/v4l-utils/Makefile | 6 +- package/vala/Makefile | 4 +- package/valgrind/Makefile | 2 +- package/vgp/Makefile | 2 +- package/videoproto/Makefile | 4 +- package/vilistextum/Makefile | 2 +- package/vim/Makefile | 2 +- package/virtinst/Makefile | 2 +- package/vlc/Makefile | 2 +- package/vnc-reflector/Makefile | 4 +- package/vnstat/Makefile | 2 +- package/vpnc/Makefile | 2 +- package/vrrpd/Makefile | 2 +- package/vsftpd/Makefile | 4 +- package/vtun/Makefile | 4 +- package/w3m/Makefile | 2 +- package/watchdog/Makefile | 2 +- package/wccpd/Makefile | 4 +- package/wdfs/Makefile | 2 +- package/webkitgtk/Makefile | 2 +- package/weechat/Makefile | 4 +- package/wget/Makefile | 4 +- package/wifidog/Makefile | 4 +- package/wireless-tools/Makefile | 4 +- package/wol/Makefile | 4 +- package/wondershaper/Makefile | 2 +- package/wpa_supplicant/Makefile | 4 +- package/wput/Makefile | 4 +- package/x11vnc/Makefile | 2 +- package/xauth/Makefile | 4 +- package/xbindkeys/Makefile | 4 +- package/xbmc/Makefile | 2 +- package/xcb-proto/Makefile | 4 +- package/xcb-util/Makefile | 4 +- package/xcmiscproto/Makefile | 4 +- package/xconsole/Makefile | 4 +- package/xdm/Makefile | 2 +- package/xdpyinfo/Makefile | 4 +- package/xextproto/Makefile | 4 +- package/xf86-input-evdev/Makefile | 2 +- package/xf86-video-ati/Makefile | 2 +- package/xf86-video-cirrus/Makefile | 2 +- package/xf86-video-fbdev/Makefile | 2 +- package/xf86-video-geode/Makefile | 2 +- package/xf86-video-intel/Makefile | 2 +- package/xf86-video-siliconmotion/Makefile | 2 +- package/xf86dga/Makefile | 2 +- package/xf86dgaproto/Makefile | 4 +- package/xf86driproto/Makefile | 4 +- package/xf86vidmodeproto/Makefile | 4 +- package/xfsprogs/Makefile | 4 +- package/xineramaproto/Makefile | 4 +- package/xinit/Makefile | 2 +- package/xinput/Makefile | 4 +- package/xinput_calibrator/Makefile | 4 +- package/xkbcomp/Makefile | 2 +- package/xkeyboard-config/Makefile | 4 +- package/xlsfonts/Makefile | 4 +- package/xorg-server/Makefile | 2 +- package/xproto/Makefile | 4 +- package/xrdb/Makefile | 4 +- package/xset/Makefile | 4 +- package/xsetroot/Makefile | 2 +- package/xsm/Makefile | 4 +- package/xterm/Makefile | 2 +- package/xtrans/Makefile | 4 +- package/xvidcore/Makefile | 4 +- package/xvinfo/Makefile | 4 +- package/xz/Makefile | 2 +- package/yajl/Makefile | 4 +- package/yasm/Makefile | 4 +- package/zile/Makefile | 2 +- package/zip/Makefile | 2 +- package/zlib/Makefile | 2 +- package/zsh/Makefile | 4 +- 698 files changed, 1352 insertions(+), 1320 deletions(-) create mode 100644 package/Config.in diff --git a/Config.in b/Config.in index c42dfbf10..101111940 100644 --- a/Config.in +++ b/Config.in @@ -61,6 +61,10 @@ endmenu menu "Package selection" depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM +source "package/Config.in.auto.global" +source "package/Config.in" + +menu "Package options" config ADK_LEAVE_ETC_ALONE boolean "do not install anything into /etc" default n @@ -101,8 +105,7 @@ config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS Note that without further customisation, turning this option off will almost certainly render the resulting system unusable. -source "package/Config.in.auto.global" -source "package/Config.in.auto" +endmenu endmenu menu "Runtime configuration" diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index 28e74dad1..148e7a756 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -225,17 +225,24 @@ static int hash_str(char *string) { static void iter(const char *key, const char *value, const void *obj) { - FILE *config, *section; + FILE *config, *section, *global; int hash; - char *valuestr, *pkg, *subpkg; + char *valuestr, *pkg, *subpkg, *subsect, *sect, *keystr; char buf[MAXPATH]; char infile[MAXPATH]; char outfile[MAXPATH]; + char configsect[MAXPATH]; + + keystr = strdup(key); + sect = strtok(keystr, "/"); + subsect = strtok(NULL, "/"); + + snprintf(configsect, MAXPATH, "package/Config.in.auto.%s.%s", sect, subsect); valuestr = strdup(value); - config = fopen("package/Config.in.auto", "a"); + config = fopen(configsect, "a"); if (config == NULL) - fatal_error("Can not open file package/Config.in.auto"); + fatal_error("Can not open file Config.in.auto.
."); hash = hash_str(valuestr); snprintf(infile, MAXPATH, "package/pkglist.d/sectionlst.%d", hash); @@ -358,7 +365,7 @@ int main() { p_ptr = NULL; s_ptr = NULL; - unlink("package/Config.in.auto"); + system("rm package/Config.in.auto.*"); unlink(runtime); /* open global sectionfile */ menuglobal = fopen("package/Config.in.auto.global", "w"); @@ -498,8 +505,8 @@ int main() { fclose(section); } } else - fatal_error("Can not find section description for package %s.", - pkgdirp->d_name); + fatal_error("Can not find section description %s for package %s.", + pkg_section, pkgdirp->d_name); fclose(pkg); continue; @@ -702,7 +709,7 @@ int main() { pseudo_name = malloc(MAXLINE); memset(pseudo_name, 0, MAXLINE); strncat(pseudo_name, token, strlen(token)); - while (strlen(pseudo_name) < 20) + while (strlen(pseudo_name) < 23) strncat(pseudo_name, ".", 1); if (snprintf(path, MAXPATH, "package/pkgconfigs.d/%s/Config.in.%s", pkgdirp->d_name, token) < 0) diff --git a/mk/build.mk b/mk/build.mk index ba81b4119..a5d5d1c57 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -402,14 +402,14 @@ endif >> $(TOPDIR)/all.config; \ fi -menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto +menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto.global @if [ ! -f .config ];then \ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ fi @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} -_config: $(CONFIG)/conf .menu package/Config.in.auto +_config: $(CONFIG)/conf .menu package/Config.in.auto.global -@touch .config @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) ${POSTCONFIG} @@ -444,7 +444,7 @@ $(TOPDIR)/adk/tools/pkgmaker: $(TOPDIR)/adk/tools/pkgmaker.c $(TOPDIR)/adk/tools $(TOPDIR)/adk/tools/pkgrebuild: $(TOPDIR)/adk/tools/pkgrebuild.c $(TOPDIR)/adk/tools/strmap.c @$(CC_FOR_BUILD) -g -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c -package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) $(TOPDIR)/adk/tools/pkgmaker $(TOPDIR)/adk/tools/pkgrebuild +package/Config.in.auto.global menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) $(TOPDIR)/adk/tools/pkgmaker $(TOPDIR)/adk/tools/pkgrebuild @echo "Generating menu structure ..." @$(TOPDIR)/adk/tools/pkgmaker @:>.menu diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile index b34909e5b..ea6f97e03 100644 --- a/package/6tunnel/Makefile +++ b/package/6tunnel/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= 6tunnel PKG_VERSION:= 0.11rc2 PKG_RELEASE:= 1 PKG_MD5SUM:= 74e02d4f0704b3083a01feda66033449 -PKG_DESCR:= IPv4/IPv6 tunnel proxy -PKG_SECTION:= ipv6 +PKG_DESCR:= ipv4/ipv6 tunnel proxy +PKG_SECTION:= net/ipv6 PKG_BUILDDEP:= autotool PKG_URL:= http://toxygen.net/6tunnel/ PKG_SITES:= http://toxygen.net/6tunnel/ diff --git a/package/Config.in b/package/Config.in new file mode 100644 index 000000000..19558796e --- /dev/null +++ b/package/Config.in @@ -0,0 +1,86 @@ +menu "Base system" +source package/Config.in.auto.base.boot +source package/Config.in.auto.base.libs +source package/Config.in.auto.base.apps +source package/Config.in.auto.base.shells +source package/Config.in.auto.base.misc +endmenu + +menu "System" +source package/Config.in.auto.sys.fs +source package/Config.in.auto.sys.serial +source package/Config.in.auto.sys.utils +source package/Config.in.auto.sys.firmware +source package/Config.in.auto.sys.misc +endmenu + +menu "Applications" +source package/Config.in.auto.app.archive +source package/Config.in.auto.app.browser +source package/Config.in.auto.app.chat +source package/Config.in.auto.app.crypto +source package/Config.in.auto.app.debug +source package/Config.in.auto.app.editor +source package/Config.in.auto.app.p2p +endmenu + +menu "Networking" +source package/Config.in.auto.net.acct +source package/Config.in.auto.net.dns +source package/Config.in.auto.net.debug +source package/Config.in.auto.net.firewall +source package/Config.in.auto.net.fs +source package/Config.in.auto.net.http +source package/Config.in.auto.net.ipv6 +source package/Config.in.auto.net.mail +source package/Config.in.auto.net.misc +source package/Config.in.auto.net.ntp +source package/Config.in.auto.net.perf +source package/Config.in.auto.net.ppp +source package/Config.in.auto.net.proxy +source package/Config.in.auto.net.radius +source package/Config.in.auto.net.route +source package/Config.in.auto.net.security +source package/Config.in.auto.net.voip +source package/Config.in.auto.net.wifi +endmenu + +menu "Multimedia" +source package/Config.in.auto.mm.audio +source package/Config.in.auto.mm.image +source package/Config.in.auto.mm.video +endmenu + +menu "Xorg" +source package/Config.in.auto.x11.apps +source package/Config.in.auto.x11.utils +source package/Config.in.auto.x11.drivers +source package/Config.in.auto.x11.misc +source package/Config.in.auto.x11.fonts +source package/Config.in.auto.x11.libs +endmenu + +menu "Libraries" +source package/Config.in.auto.libs.audio +source package/Config.in.auto.libs.crypto +source package/Config.in.auto.libs.data +source package/Config.in.auto.libs.db +source package/Config.in.auto.libs.fonts +source package/Config.in.auto.libs.image +source package/Config.in.auto.libs.misc +source package/Config.in.auto.libs.net +source package/Config.in.auto.libs.video +endmenu + +menu "Programming" +source package/Config.in.auto.dev.lang +source package/Config.in.auto.dev.python +source package/Config.in.auto.dev.perl +source package/Config.in.auto.dev.scm +source package/Config.in.auto.dev.tools +endmenu + +menu "Headers" +depends on ADK_PACKAGE_GCC +source package/Config.in.auto.dev.header +endmenu diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 9078bf041..11d5d86f0 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 1.6.3 PKG_RELEASE:= 3 PKG_EXTRAVER:= 1.6-0 PKG_MD5SUM:= 641e8e999c017770da647f9b5b890906 -PKG_DESCR:= Thin graphic library for the Linux framebuffer devices -PKG_SECTION:= libs +PKG_DESCR:= thin graphic library for framebuffer devices +PKG_SECTION:= libs/image PKG_DEPENDS:= libpng libjpeg-turbo libfreetype PKG_BUILDDEP:= libpng libjpeg-turbo freetype PKG_URL:= http://www.directfb.org/ diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 4979c76af..89034988e 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -9,26 +9,26 @@ PKG_EXTRAVER:= 1 PKG_RELEASE:= 3 PKG_MD5SUM:= 8134257e3fbb43cc06fb32a6d725d3d0 PKG_DESCR:= image processing and converting utility -PKG_SECTION:= multimedia +PKG_SECTION:= mm/image PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= libpng libjpeg-turbo libtiff fontconfig libiconv-tiny PKG_BUILDDEP+= pango libtool e2fsprogs PKG_URL:= http://www.imagemagick.org/ PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ -PKG_LIBNAME:= libimagemagic +PKG_LIBNAME:= libimagemagick PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !m68k PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK PKGSD_LIBIMAGEMAGICK:= imagemagick library -PKGSC_LIBIMAGEMAGICK:= libs +PKGSC_LIBIMAGEMAGICK:= libs/image PKGSS_LIBIMAGEMAGICK:= libjpeg-turbo libtiff libpng PKGSD_CONVERT:= image processing and converting utility -PKGSC_CONVERT:= multimedia +PKGSC_CONVERT:= mm/image PKGSS_CONVERT:= libimagemagick PKGSD_DISPLAY:= image display application -PKGSC_DISPLAY:= multimedia +PKGSC_DISPLAY:= mm/image PKGSS_DISPLAY:= libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng libltdl PKGSB_DISPLAY:= libX11 diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index e3db5762f..e34ef6645 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 10.1.0 PKG_SUBVER:= 10.1 PKG_RELEASE:= 3 PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315 -PKG_DESCR:= MESA 3D graphics library -PKG_SECTION:= libs +PKG_DESCR:= 3d graphics library +PKG_SECTION:= libs/video PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat PKG_DEPENDS+= libxml2 libxml2-python libstdcxx PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile index ade1c17ed..c7d3fc579 100644 --- a/package/SDL_gfx/Makefile +++ b/package/SDL_gfx/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= SDL_gfx PKG_VERSION:= 2.0.22 PKG_RELEASE:= 2 PKG_MD5SUM:= 330f291f1f09a1bdf397c9b40d92ca41 -PKG_DESCR:= SDL GFX library -PKG_SECTION:= libs +PKG_DESCR:= sdl graphic library +PKG_SECTION:= libs/video PKG_DEPENDS:= libsdl PKG_BUILDDEP:= sdl PKG_URL:= http://www.ferzkopp.net/joomla/content/view/19/14/ diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile index 659646dfd..66233e3ad 100644 --- a/package/SDL_ttf/Makefile +++ b/package/SDL_ttf/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= SDL_ttf PKG_VERSION:= 2.0.10 PKG_RELEASE:= 2 PKG_MD5SUM:= 814e6e17e8879254208d23b3b7e0354b -PKG_DESCR:= truetype fonts for SDL applications -PKG_SECTION:= libs +PKG_DESCR:= truetype fonts for sdl applications +PKG_SECTION:= libs/fonts PKG_DEPENDS:= libsdl libfreetype PKG_BUILDDEP:= sdl freetype gettext-tiny PKG_URL:= http://www.libsdl.org/projects/SDL_ttf/ diff --git a/package/adk-helper/Makefile b/package/adk-helper/Makefile index d386bd508..4654aa90f 100644 --- a/package/adk-helper/Makefile +++ b/package/adk-helper/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= adk-helper PKG_VERSION:= 1.0 PKG_RELEASE:= 1 PKG_DESCR:= adk helper utilities -PKG_SECTION:= misc +PKG_SECTION:= base/misc PKG_CFLINE_ADK_HELPER:= depends on ADK_HOST_ONLY diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile index efc8713ec..211fd25ff 100644 --- a/package/adk-test-tools/Makefile +++ b/package/adk-test-tools/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= adk-test-tools PKG_VERSION:= 0.1 PKG_RELEASE:= 7 PKG_DESCR:= helper tools and scripts for adk-test-framework -PKG_SECTION:= misc +PKG_SECTION:= base/misc PKG_URL:= http://openadk.org/ NO_DISTFILES:= 1 diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 1ebfa2982..d9f5029d8 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -6,8 +6,8 @@ include ${TOPDIR}/rules.mk PKG_NAME:= adkinstall PKG_VERSION:= 2.0 PKG_RELEASE:= 1 -PKG_DESCR:= ADK disk/flash installer -PKG_SECTION:= base +PKG_DESCR:= adk disk/flash installer +PKG_SECTION:= base/misc PKG_DEPENDS:= mke2fs parted sfdisk dosfstools mksh PKG_SYSTEM_DEPENDS:= mikrotik-rb532 lemote-yeelong diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 155da938f..a98a22b90 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= aiccu PKG_VERSION:= 20070115 PKG_RELEASE:= 11 PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350 -PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility -PKG_SECTION:= ipv6 +PKG_DESCR:= sixxs automatic ipv6 connectivity client utility +PKG_SECTION:= net/ipv6 PKG_DEPENDS:= libpthread PKG_URL:= http://www.sixxs.net/ PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/ diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index 88b679ecc..43c7ee8e5 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.1 PKG_RELEASE:= 2 PKG_MD5SUM:= f7a24ed8fad122c4187d06bfd6f998b4 PKG_DESCR:= set of tools for auditing wireless networks -PKG_SECTION:= wifi +PKG_SECTION:= net/wifi PKG_DEPENDS:= libpthread libopenssl libpcap PKG_BUILDDEP:= openssl libpcap PKG_URL:= http://www.aircrack-ng.org/ diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile index 8beb7837e..6bbfabcb3 100644 --- a/package/alix-switch/Makefile +++ b/package/alix-switch/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= alix-switch PKG_VERSION:= 1.0 PKG_RELEASE:= 4 PKG_DESCR:= daemon listening on button events -PKG_SECTION:= base +PKG_SECTION:= base/misc PKG_URL:= http://openadk.org/ PKG_SYSTEM_DEPENDS:= pcengines-alix2d2 pcengines-alix2d13 @@ -22,8 +22,6 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -TARGET_CFLAGS+= -Wall - do-build: ${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \ -o ${WRKBUILD}/alix-switchd ${WRKBUILD}/alix-switchd.c diff --git a/package/alix-temperature/Makefile b/package/alix-temperature/Makefile index e877241b3..16a666d67 100644 --- a/package/alix-temperature/Makefile +++ b/package/alix-temperature/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= alix-temperature PKG_VERSION:= 1.0 PKG_RELEASE:= 1 PKG_DESCR:= read alix boards i2c thermal sensor -PKG_SECTION:= utils +PKG_SECTION:= sys/utils PKG_DEPENDS:= i2c-tools PKG_SYSTEM_DEPENDS:= pcengines-alix2d2 pcengines-alix2d13 diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index f4f798344..6a09e5413 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= alsa-lib PKG_VERSION:= 1.0.27.2 PKG_RELEASE:= 3 PKG_MD5SUM:= 69129a7c37697f81ac092335e9fa452b -PKG_DESCR:= ALSA sound library -PKG_SECTION:= libs +PKG_DESCR:= sound library +PKG_SECTION:= libs/audio PKG_BUILDDEP:= alsa-lib-host PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/lib/ diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index d0b080624..6a88dff91 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.27.2 PKG_RELEASE:= 2 PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3 PKG_DESCR:= mixer/player utility -PKG_SECTION:= multimedia +PKG_SECTION:= mm/audio PKG_DEPENDS:= alsa-lib libpthread librt PKG_BUILDDEP:= alsa-lib PKG_URL:= http://www.alsa-project.org/ diff --git a/package/ant/Makefile b/package/ant/Makefile index 6c75bc0de..3c83c94b3 100644 --- a/package/ant/Makefile +++ b/package/ant/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= ant PKG_VERSION:= 1.8.4 PKG_RELEASE:= 1 PKG_MD5SUM:= c474fa9d0c35a24037c23b6e476862c1 -PKG_DESCR:= ant utility -PKG_SECTION:= lang +PKG_DESCR:= java code build utility +PKG_SECTION:= dev/tools HOST_BUILDDEP:= gcj-host PKG_SITES:= http://archive.apache.org/dist/ant/source/ diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index e74391535..395d16dda 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 666a5d56098a9debf998510e304c8095 PKG_DESCR:= apache portable runtime utility library -PKG_SECTION:= libs +PKG_SECTION:= libs/misc PKG_DEPENDS:= libexpat apr PKG_BUILDDEP:= expat apr PKG_URL:= http://apr.apache.org/ diff --git a/package/apr/Makefile b/package/apr/Makefile index 4041f401d..34e7536f4 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= apr PKG_VERSION:= 1.4.6 PKG_RELEASE:= 2 PKG_MD5SUM:= 76cc4457fbb71eefdafa27dba8f511fb -PKG_DESCR:= Apache Portable Runtime library -PKG_SECTION:= libs +PKG_DESCR:= apache portable runtime library +PKG_SECTION:= libs/misc PKG_DEPENDS:= libpthread PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ diff --git a/package/arpd/Makefile b/package/arpd/Makefile index bdc603d8d..bb0901382 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= arpd PKG_VERSION:= 0.2 PKG_RELEASE:= 3 PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d -PKG_DESCR:= generates ARP responses for IP address ranges -PKG_SECTION:= route +PKG_DESCR:= generates arp responses for ip address ranges +PKG_SECTION:= net/route PKG_DEPENDS:= libpcap libdnet libevent PKG_BUILDDEP:= libpcap libdnet libevent PKG_URL:= http://niels.xtdnet.nl/honeyd/ diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index c2823f889..95d23483f 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.1a15 PKG_RELEASE:= 1 PKG_MD5SUM:= cebfeb99c4a7c2a6cee2564770415fe7 PKG_DESCR:= ethernet monitor program -PKG_SECTION:= net/security +PKG_SECTION:= net/debug PKG_DEPENDS:= libpcap PKG_BUILDDEP:= libpcap PKG_URL:= http://www-nrg.ee.lbl.gov/ diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 12025b50b..39be1d951 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= asterisk PKG_VERSION:= 1.8.20.1 PKG_RELEASE:= 3 PKG_MD5SUM:= 99204257de80a42c4e287fc93dfe714a -PKG_DESCR:= open source PBX -PKG_SECTION:= phone +PKG_DESCR:= open source pbx +PKG_SECTION:= net/voip PKG_DEPENDS:= libncurses libpthread libopenssl libcurl libstdcxx PKG_BUILDDEP:= ncurses openssl zlib curl popt gtk+ PKG_URL:= http://www.asterisk.org/ diff --git a/package/atftp/Makefile b/package/atftp/Makefile index 0d4f1407f..866878158 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= atftp PKG_VERSION:= 0.7 PKG_RELEASE:= 2 PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82 -PKG_DESCR:= TFTP client -PKG_SECTION:= dhcp +PKG_DESCR:= tftp client +PKG_SECTION:= net/misc PKG_DEPENDS:= libreadline libncurses PKG_BUILDDEP:= readline ncurses PKG_URL:= http://freshmeat.net/projects/atftp/ @@ -19,7 +19,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_LIBC_DEPENDS:= uclibc glibc PKG_SUBPKGS:= ATFTP ATFTPD -PKGSD_ATFTPD:= TFTP server +PKGSD_ATFTPD:= tftp server PKGSS_ATFTPD:= libreadline libncurses include $(TOPDIR)/mk/package.mk diff --git a/package/atk/Makefile b/package/atk/Makefile index 0701c4533..7c54346aa 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= atk PKG_VERSION:= 2.11.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 2b4316e69cbe0a1998ba39cdc8c89692 -PKG_DESCR:= atk library -PKG_SECTION:= libs +PKG_DESCR:= accessibility toolkit library +PKG_SECTION:= libs/misc PKG_BUILDDEP:= glib PKG_URL:= http://www.gnome.org/ PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/2.11/} diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile index d28d04f43..32f2c990b 100644 --- a/package/autoconf/Makefile +++ b/package/autoconf/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.69 PKG_RELEASE:= 1 PKG_MD5SUM:= 50f97f4159805e374639a73e2636f22e PKG_DESCR:= automatically configure software source code packages -PKG_SECTION:= lang +PKG_SECTION:= dev/tools HOST_BUILDDEP:= m4-host PKG_URL:= http://www.gnu.org/software/autoconf/ PKG_SITES:= ${MASTER_SITE_GNU:=autoconf/} diff --git a/package/automake/Makefile b/package/automake/Makefile index 97b92dc39..a77c0af27 100644 --- a/package/automake/Makefile +++ b/package/automake/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 1.14.1 PKG_RELEASE:= 1 PKG_EXTRAVER:= 1.14 PKG_MD5SUM:= 7fc29854c520f56b07aa232a0f880292 -PKG_DESCR:= tool for automatically generating Makefile.in -PKG_SECTION:= lang +PKG_DESCR:= tool for automatically generating makefiles +PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host autoconf-host autoconf HOST_BUILDDEP:= autoconf-host PKG_URL:= http://www.gnu.org/software/automake/ diff --git a/package/autossh/Makefile b/package/autossh/Makefile index 526f4442f..f9b1df527 100644 --- a/package/autossh/Makefile +++ b/package/autossh/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= autossh PKG_VERSION:= 1.4b PKG_RELEASE:= 1 PKG_MD5SUM:= 8f9aa006f6f69e912d3c2f504622d6f7 -PKG_DESCR:= Automatically restart SSH sessions and tunnels +PKG_DESCR:= automatically restart ssh sessions and tunnels PKG_SECTION:= net/security PKG_DEPENDS:= openssh-client PKG_URL:= http://www.harding.motd.ca/autossh/ diff --git a/package/autotool/Makefile b/package/autotool/Makefile index 8d8b8eb52..498ea52c0 100644 --- a/package/autotool/Makefile +++ b/package/autotool/Makefile @@ -8,7 +8,7 @@ PKG_NAME:= autotool PKG_VERSION:= 1.0 PKG_RELEASE:= 2 PKG_DESCR:= autotool infrastructure for host -PKG_SECTION:= devel +PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host pkgconf-host autoconf-host automake-host PKG_BUILDDEP+= libtool-host diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 453555e90..99687297c 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= avahi PKG_VERSION:= 0.6.31 PKG_RELEASE:= 3 PKG_MD5SUM:= 2f22745b8f7368ad5a0a3fddac343f2d -PKG_DESCR:= mDNS daemon -PKG_SECTION:= dhcp +PKG_DESCR:= multicast dns daemon +PKG_SECTION:= net/dns PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= autotool libdaemon expat gdbm glib PKG_BUILDDEP+= gettext-tiny gtk+ dbus @@ -24,7 +24,7 @@ PKGSS_AVAHI_DAEMON:= libavahi libdaemon libexpat libintl libgtk dbus PKGSS_AVAHI_DNSCONFD:= libavahi libdaemon avahi-daemon PKGSD_AVAHI_DNSCONFD:= DNS server from mDNS configuration daemon PKGSD_LIBAVAHI:= DNS-SD over mDNS library -PKGSC_LIBAVAHI:= libs +PKGSC_LIBAVAHI:= libs/misc ifeq ($(ADK_STATIC),y) PKG_OPTS+= libmix diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 11166e6ab..164d79045 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= axtls PKG_VERSION:= 1.4.9 PKG_RELEASE:= 2 PKG_MD5SUM:= 6d519bc3b5f20faa6ef8d423f5062241 -PKG_DESCR:= small embedded webserver with TLS -PKG_SECTION:= www +PKG_DESCR:= small embedded webserver with tls +PKG_SECTION:= net/http PKG_DEPENDS:= libaxtls PKG_URL:= http://axtls.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} @@ -17,7 +17,7 @@ PKG_OPTS:= dev PKG_SUBPKGS:= AXHTTPD LIBAXTLS PKGSD_LIBAXTLS:= small tls library -PKGSC_LIBAXTLS:= libs +PKGSC_LIBAXTLS:= libs/crypto DISTFILES:= axTLS-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/axTLS diff --git a/package/b43-firmware/Makefile b/package/b43-firmware/Makefile index 274e199d4..e4ee5c4ac 100644 --- a/package/b43-firmware/Makefile +++ b/package/b43-firmware/Makefile @@ -8,7 +8,7 @@ PK