summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/ImageMagick/Makefile6
-rw-r--r--package/MesaLib/Makefile1
-rw-r--r--package/alix-switch/Makefile3
-rw-r--r--package/alix-temperature/Makefile3
-rw-r--r--package/alsa-utils/Makefile4
-rw-r--r--package/apr-util/Makefile3
-rw-r--r--package/avahi/Makefile4
-rw-r--r--package/axtls/Makefile10
-rw-r--r--package/beecrypt/Makefile7
-rw-r--r--package/bind/Makefile10
-rw-r--r--package/binutils/Makefile10
-rw-r--r--package/bison/Makefile4
-rw-r--r--package/bitlbee/Makefile4
-rw-r--r--package/bkeymaps/Makefile2
-rw-r--r--package/bluez-firmware/Makefile2
-rw-r--r--package/bluez/Makefile28
-rw-r--r--package/bogofilter/Makefile2
-rw-r--r--package/boost/Makefile6
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/bwm/Makefile2
-rw-r--r--package/bzip2/Makefile12
-rw-r--r--package/bzr/Makefile2
-rw-r--r--package/ca-certificates/Makefile2
-rw-r--r--package/cairo/Makefile10
-rw-r--r--package/ccid/Makefile4
-rw-r--r--package/cfgfs/Makefile2
-rw-r--r--package/cgilib/Makefile7
-rw-r--r--package/cherokee/Makefile4
-rw-r--r--package/chillispot/Makefile2
-rw-r--r--package/cluster-glue/Makefile2
-rw-r--r--package/cmake/Makefile2
-rw-r--r--package/collectd/Makefile4
-rw-r--r--package/comgt/Makefile2
-rwxr-xr-xpackage/confuse/Makefile8
-rw-r--r--package/conntrack-tools/Makefile4
-rw-r--r--package/cpio/Makefile2
-rw-r--r--package/cpufrequtils/Makefile4
-rw-r--r--package/cryptinit/Makefile2
-rw-r--r--package/cryptodev-linux/Makefile2
-rwxr-xr-xpackage/ctorrent/Makefile4
-rw-r--r--package/curl/Makefile6
-rwxr-xr-xpackage/cutter/Makefile2
-rw-r--r--package/cvs/Makefile2
-rw-r--r--package/dansguardian/Makefile2
-rw-r--r--package/daq/Makefile5
-rw-r--r--package/davfs2/Makefile2
-rw-r--r--package/deco/Makefile2
-rw-r--r--package/dhcp-forwarder/Makefile2
-rw-r--r--package/dialog/Makefile4
-rw-r--r--package/diffutils/Makefile4
-rw-r--r--package/digitemp/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/drbd/Makefile2
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/dsniff/Makefile4
-rw-r--r--package/e2fsprogs/Makefile10
-rw-r--r--package/ebtables/Makefile2
-rw-r--r--package/elinks/Makefile2
-rw-r--r--package/esound/Makefile7
-rw-r--r--package/ether-wake/Makefile2
-rw-r--r--package/ethtool/Makefile4
-rw-r--r--package/evieext/Makefile9
-rw-r--r--package/evilwm/Makefile4
-rw-r--r--package/ez-ipupdate/Makefile12
-rw-r--r--package/fakeidentd/Makefile2
-rw-r--r--package/fbset/Makefile2
-rw-r--r--package/fetchmail/Makefile4
-rw-r--r--package/ffmpeg/Makefile12
-rw-r--r--package/file/Makefile8
-rw-r--r--package/findutils/Makefile8
-rw-r--r--package/flac/Makefile10
-rw-r--r--package/fltk/Makefile8
-rw-r--r--package/fluxbox/Makefile4
-rw-r--r--package/font-adobe-100dpi/Makefile4
-rw-r--r--package/font-adobe-75dpi/Makefile4
-rw-r--r--package/font-bh-100dpi/Makefile4
-rw-r--r--package/font-bh-75dpi/Makefile4
-rw-r--r--package/font-bh-lucidatypewriter-100dpi/Makefile4
-rw-r--r--package/font-bh-lucidatypewriter-75dpi/Makefile4
-rw-r--r--package/font-bh-ttf/Makefile4
-rw-r--r--package/font-bh-type1/Makefile4
-rw-r--r--package/font-bitstream-100dpi/Makefile4
-rw-r--r--package/font-bitstream-75dpi/Makefile4
-rw-r--r--package/font-bitstream-type1/Makefile4
-rw-r--r--package/font-misc-misc/Makefile4
-rw-r--r--package/font-util/Makefile3
-rw-r--r--package/font-xfree86-type1/Makefile4
-rw-r--r--package/fping/Makefile4
-rw-r--r--package/fprobe-ulog/Makefile2
-rw-r--r--package/fprobe/Makefile4
-rw-r--r--package/freeglut/Makefile7
-rw-r--r--package/freeradius-client/Makefile10
-rw-r--r--package/freeradius-server/Makefile2
-rw-r--r--package/fribidi/Makefile5
-rw-r--r--package/frickin/Makefile2
-rw-r--r--package/fuse/Makefile4
-rw-r--r--package/gatling/Makefile2
-rw-r--r--package/gawk/Makefile4
-rw-r--r--package/gcc/Makefile5
-rw-r--r--package/gconf/Makefile4
-rw-r--r--package/gdb/Makefile3
-rw-r--r--package/gdbm/Makefile1
-rw-r--r--package/gdbserver/Makefile4
-rw-r--r--package/gettext-tiny/Makefile3
-rw-r--r--package/giflib/Makefile1
-rw-r--r--package/git/Makefile4
-rw-r--r--package/glibc/Makefile1
-rw-r--r--package/gmediaserver/Makefile2
-rw-r--r--package/gnupg/Makefile4
-rw-r--r--package/gnutls/Makefile18
-rw-r--r--package/gperf/Makefile4
-rw-r--r--package/gpm/Makefile11
-rw-r--r--package/gpsd/Makefile12
-rw-r--r--package/grep/Makefile4
-rw-r--r--package/grub-bin/Makefile2
-rw-r--r--package/grub/Makefile4
-rw-r--r--package/gsm/Makefile14
-rw-r--r--package/harfbuzz/Makefile3
-rw-r--r--package/haserl/Makefile4
-rw-r--r--package/hdparm/Makefile4
-rw-r--r--package/heimdal/Makefile15
-rw-r--r--package/heyu/Makefile2
-rw-r--r--package/htpdate/Makefile4
-rw-r--r--package/httping/Makefile4
-rw-r--r--package/httptunnel/Makefile4
-rw-r--r--package/huawei/Makefile2
-rw-r--r--package/i2c-tools/Makefile4
-rw-r--r--package/icecast/Makefile4
-rw-r--r--package/id3lib/Makefile8
-rw-r--r--package/iftop/Makefile4
-rw-r--r--package/igmpproxy/Makefile4
-rw-r--r--package/imlib2/Makefile5
-rw-r--r--package/installer/Makefile2
-rw-r--r--package/intltool/Makefile4
-rw-r--r--package/ipcad/Makefile4
-rw-r--r--package/iperf/Makefile4
-rw-r--r--package/ipsec-tools/Makefile4
-rw-r--r--package/ipset/Makefile4
-rw-r--r--package/iptables-snmp/Makefile4
-rw-r--r--package/iptraf/Makefile2
-rw-r--r--package/irssi/Makefile4
-rw-r--r--package/iw/Makefile4
-rw-r--r--package/joe/Makefile19
-rw-r--r--package/jpeg/Makefile1
-rw-r--r--package/kexecinit/Makefile2
-rw-r--r--package/keychain/Makefile2
-rw-r--r--package/keyutils/Makefile4
-rw-r--r--package/kismet/Makefile10
-rw-r--r--package/kmod/Makefile3
-rw-r--r--package/knock/Makefile4
-rw-r--r--package/l2tpns/Makefile4
-rw-r--r--package/lame/Makefile9
-rw-r--r--package/less/Makefile2
-rw-r--r--package/libICE/Makefile1
-rw-r--r--package/libIDL/Makefile1
-rw-r--r--package/libSM/Makefile1
-rw-r--r--package/libX11/Makefile1
-rw-r--r--package/libXScrnSaver/Makefile1
-rw-r--r--package/libXau/Makefile1
-rw-r--r--package/libXaw/Makefile1
-rw-r--r--package/libXcomposite/Makefile1
-rw-r--r--package/libXcursor/Makefile1
-rw-r--r--package/libXdamage/Makefile1
-rw-r--r--package/libXdmcp/Makefile1
-rw-r--r--package/libXext/Makefile1
-rw-r--r--package/libXfixes/Makefile1
-rw-r--r--package/libXfont/Makefile1
-rw-r--r--package/libXft/Makefile1
-rw-r--r--package/libXi/Makefile1
-rw-r--r--package/libXinerama/Makefile1
-rw-r--r--package/libXmu/Makefile1
-rw-r--r--package/libXp/Makefile1
-rw-r--r--package/libXpm/Makefile1
-rw-r--r--package/libXrandr/Makefile2
-rw-r--r--package/libXrender/Makefile1
-rw-r--r--package/libXt/Makefile1
-rw-r--r--package/libXtst/Makefile1
-rw-r--r--package/libXv/Makefile1
-rw-r--r--package/libXxf86dga/Makefile1
-rw-r--r--package/libXxf86vm/Makefile1
-rw-r--r--package/libcapi20/Makefile2
-rw-r--r--package/libgcc/Makefile8
-rw-r--r--package/libgd/Makefile1
-rw-r--r--package/liblzo/Makefile1
-rw-r--r--package/libmad/Makefile2
-rw-r--r--package/libpri/Makefile2
-rw-r--r--package/libpthread/Makefile2
-rw-r--r--package/librt/Makefile2
-rw-r--r--package/libssp/Makefile2
-rw-r--r--package/libtool/Makefile4
-rw-r--r--package/libusb/Makefile1
-rw-r--r--package/libxcb/Makefile2
-rw-r--r--package/libxml2/Makefile4
-rw-r--r--package/libxslt/Makefile4
-rw-r--r--package/links/Makefile4
-rw-r--r--package/linux-atm/Makefile6
-rw-r--r--package/llvm/Makefile5
-rw-r--r--package/lm_sensors/Makefile4
-rw-r--r--package/logrotate/Makefile4
-rw-r--r--package/lrzsz/Makefile2
-rw-r--r--package/lsof/Makefile2
-rw-r--r--package/lua/Makefile6
-rw-r--r--package/lvm/Makefile4
-rw-r--r--package/lynx/Makefile4
-rw-r--r--package/lzop/Makefile2
-rwxr-xr-xpackage/macchanger/Makefile4
-rw-r--r--package/madplay/Makefile4
-rw-r--r--package/make/Makefile2
-rw-r--r--package/maradns/Makefile4
-rw-r--r--package/mc/Makefile4
-rw-r--r--package/mdadm/Makefile4
-rw-r--r--package/mgetty/Makefile2
-rw-r--r--package/miau/Makefile4
-rw-r--r--package/miax/Makefile2
-rw-r--r--package/microperl/Makefile2
-rw-r--r--package/mini_sendmail/Makefile2
-rw-r--r--package/miredo/Makefile4
-rw-r--r--package/mkfontdir/Makefile4
-rw-r--r--package/mkfontscale/Makefile4
-rw-r--r--package/mksh/Makefile2
-rw-r--r--package/moc/Makefile4
-rw-r--r--package/motion/Makefile4
-rw-r--r--package/mpc/Makefile4
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mpg123/Makefile4
-rw-r--r--package/mplayer/Makefile4
-rw-r--r--package/mrd6/Makefile7
-rw-r--r--package/mt-daapd/Makefile4
-rw-r--r--package/mtd/Makefile2
-rw-r--r--package/mtr/Makefile4
-rw-r--r--package/musl/Makefile1
-rw-r--r--package/mutt/Makefile4
-rwxr-xr-xpackage/mxml/Makefile6
-rw-r--r--package/nand/Makefile2
-rw-r--r--package/nano/Makefile4
-rw-r--r--package/nasm/Makefile4
-rw-r--r--package/ndisc/Makefile8
-rw-r--r--package/net-snmp/Makefile8
-rw-r--r--package/netcat/Makefile4
-rw-r--r--package/netperf/Makefile4
-rw-r--r--package/netstat-nat/Makefile4
-rw-r--r--package/nfs-utils/Makefile4
-rw-r--r--package/nmap/Makefile4
-rw-r--r--package/nss/Makefile2
-rw-r--r--package/ntfs-3g/Makefile4
-rw-r--r--package/ntpclient/Makefile2
-rw-r--r--package/nut/Makefile4
-rw-r--r--package/obexftp/Makefile22
-rw-r--r--package/open-iscsi/Makefile4
-rw-r--r--package/openct/Makefile4
-rw-r--r--package/openldap/Makefile4
-rw-r--r--package/openntpd/Makefile2
-rw-r--r--package/openobex/Makefile9
-rw-r--r--package/opensc/Makefile4
-rw-r--r--package/openssl-pkcs11/Makefile4
-rw-r--r--package/openssl/Makefile2
-rw-r--r--package/openswan/Makefile4
-rw-r--r--package/openvpn/Makefile6
-rw-r--r--package/oprofile/Makefile4
-rw-r--r--package/osiris/Makefile8
-rw-r--r--package/owfs/Makefile4
-rw-r--r--package/p5-XML-Parser/Makefile4
-rw-r--r--package/p910nd/Makefile2
-rw-r--r--package/pacemaker-mgmt/Makefile17
-rw-r--r--package/pacemaker/Makefile4
-rw-r--r--package/pam/Makefile3
-rw-r--r--package/parprouted/Makefile2
-rw-r--r--package/parted/Makefile4
-rw-r--r--package/patch/Makefile4
-rw-r--r--package/pciutils/Makefile2
-rw-r--r--package/pcmciautils/Makefile4
-rw-r--r--package/pcre/Makefile4
-rw-r--r--package/pcrepp/Makefile7
-rw-r--r--package/pdnsd/Makefile4
-rw-r--r--package/perl/Makefile6
-rw-r--r--package/picocom/Makefile2
-rw-r--r--package/pipacs/Makefile4
-rw-r--r--package/pkg-config/Makefile4
-rw-r--r--package/pm-utils/Makefile4
-rw-r--r--package/pmacct/Makefile8
-rw-r--r--package/poppler/Makefile3
-rw-r--r--package/portsentry/Makefile2
-rw-r--r--package/ppp/Makefile2
-rw-r--r--package/pptp/Makefile2
-rw-r--r--package/pptpd/Makefile4
-rw-r--r--package/privoxy/Makefile4
-rw-r--r--package/procmail/Makefile2
-rw-r--r--package/procps/Makefile4
-rw-r--r--package/proftpd/Makefile4
-rw-r--r--package/ptunnel/Makefile4
-rw-r--r--package/python/Makefile4
-rw-r--r--package/python2/Makefile8
-rw-r--r--package/qemu/Makefile4
-rw-r--r--package/qingy/Makefile4
-rw-r--r--package/quagga/Makefile14
-rwxr-xr-xpackage/raddump/Makefile4
-rw-r--r--package/radvd/Makefile4
-rw-r--r--package/rarpd/Makefile4
-rw-r--r--package/rdate/Makefile4
-rw-r--r--package/rdesktop/Makefile2
-rw-r--r--package/reaim/Makefile4
-rw-r--r--package/resource-agents/Makefile4
-rw-r--r--package/rng-tools/Makefile2
-rw-r--r--package/rp-pppoe/Makefile8
-rw-r--r--package/rpcbind/Makefile4
-rw-r--r--package/rrdcollect/Makefile2
-rw-r--r--package/rrdtool/Makefile8
-rw-r--r--package/rsync/Makefile4
-rw-r--r--package/rtorrent/Makefile2
-rw-r--r--package/ruby/Makefile4
-rw-r--r--package/rxvt-unicode/Makefile4
-rw-r--r--package/samba/Makefile12
-rw-r--r--package/scanlogd/Makefile2
-rw-r--r--package/screen/Makefile4
-rw-r--r--package/scsi-spin/Makefile2
-rw-r--r--package/ser2net/Makefile4
-rw-r--r--package/serdisplib/Makefile2
-rw-r--r--package/setpwc/Makefile2
-rw-r--r--package/setserial/Makefile2
-rw-r--r--package/setxkbmap/Makefile4
-rw-r--r--package/shat/Makefile2
-rw-r--r--package/shorewall-shell/Makefile2
-rw-r--r--package/siproxd/Makefile4
-rw-r--r--package/sipsak/Makefile4
-rw-r--r--package/sispmctl/Makefile4
-rw-r--r--package/snort/Makefile4
-rw-r--r--package/socat/Makefile4
-rw-r--r--package/speex/Makefile6
-rw-r--r--package/sqlite/Makefile21
-rw-r--r--package/squid/Makefile18
-rw-r--r--package/srelay/Makefile2
-rw-r--r--package/ssltunnel/Makefile4
-rw-r--r--package/ssmtp/Makefile2
-rw-r--r--package/strace/Makefile2
-rw-r--r--package/stress/Makefile4
-rw-r--r--package/strongswan/Makefile4
-rw-r--r--package/sudo/Makefile4
-rw-r--r--package/syslinux/Makefile6
-rw-r--r--package/syslog-ng/Makefile4
-rw-r--r--package/sysstat/Makefile4
-rw-r--r--package/taglib/Makefile3
-rw-r--r--package/tar/Makefile4
-rw-r--r--package/tcp_wrappers/Makefile6
-rw-r--r--package/tcpdump/Makefile4
-rw-r--r--package/tcsh/Makefile4
-rw-r--r--package/tinc/Makefile4
-rw-r--r--package/tinycdb/Makefile7
-rw-r--r--package/tinyproxy/Makefile4
-rw-r--r--package/tinyxml/Makefile3
-rw-r--r--package/tmsnc/Makefile4
-rw-r--r--package/tor/Makefile4
-rw-r--r--package/totd/Makefile4
-rw-r--r--package/tptest/Makefile2
-rw-r--r--package/traceroute/Makefile4
-rw-r--r--package/trafshow/Makefile2
-rw-r--r--package/tslib/Makefile5
-rw-r--r--package/ttcp/Makefile2
-rw-r--r--package/twm/Makefile4
-rw-r--r--package/tzdata/Makefile22
-rw-r--r--package/uclibc++/Makefile4
-rw-r--r--package/uclibc/Makefile1
-rw-r--r--package/udev/Makefile7
-rw-r--r--package/udp-broadcast-relay/Makefile2
-rw-r--r--package/ussp-push/Makefile4
-rw-r--r--package/uvd/Makefile2
-rw-r--r--package/v4l-utils/Makefile14
-rw-r--r--package/valgrind/Makefile4
-rwxr-xr-xpackage/vgp/Makefile4
-rw-r--r--package/vilistextum/Makefile4
-rw-r--r--package/vim/Makefile4
-rw-r--r--package/vnc-reflector/Makefile2
-rw-r--r--package/vnstat/Makefile2
-rw-r--r--package/vpnc/Makefile4
-rw-r--r--package/vrrpd/Makefile2
-rw-r--r--package/vsftpd/Makefile4
-rw-r--r--package/vtun/Makefile2
-rw-r--r--package/watchdog/Makefile4
-rw-r--r--package/wccpd/Makefile4
-rw-r--r--package/wdfs/Makefile4
-rw-r--r--package/weechat/Makefile4
-rw-r--r--package/wget/Makefile4
-rw-r--r--package/wifidog/Makefile4
-rw-r--r--package/wireless-tools/Makefile4
-rw-r--r--package/wol/Makefile4
-rw-r--r--package/wondershaper/Makefile2
-rw-r--r--package/wput/Makefile4
-rw-r--r--package/xauth/Makefile4
-rw-r--r--package/xbindkeys/Makefile4
-rw-r--r--package/xbitmaps/Makefile8
-rw-r--r--package/xconsole/Makefile4
-rw-r--r--package/xdm/Makefile4
-rw-r--r--package/xf86-input-evdev/Makefile4
-rw-r--r--package/xf86-input-evtouch/Makefile4
-rw-r--r--package/xf86-input-keyboard/Makefile4
-rw-r--r--package/xf86-input-mouse/Makefile4
-rw-r--r--package/xf86-video-ati/Makefile4
-rw-r--r--package/xf86-video-cirrus/Makefile4
-rw-r--r--package/xf86-video-fbdev/Makefile4
-rw-r--r--package/xf86-video-geode/Makefile4
-rw-r--r--package/xf86-video-intel/Makefile4
-rw-r--r--package/xf86-video-siliconmotion/Makefile4
-rw-r--r--package/xf86dga/Makefile6
-rw-r--r--package/xfsprogs/Makefile2
-rw-r--r--package/xinetd/Makefile4
-rw-r--r--package/xinit/Makefile4
-rw-r--r--package/xinput/Makefile4
-rw-r--r--package/xkbcomp/Makefile4
-rw-r--r--package/xkeyboard-config/Makefile4
-rw-r--r--package/xlsfonts/Makefile4
-rw-r--r--package/xorg-server/Makefile2
-rw-r--r--package/xrdb/Makefile4
-rw-r--r--package/xset/Makefile4
-rw-r--r--package/xsetroot/Makefile4
-rw-r--r--package/xsm/Makefile4
-rw-r--r--package/xterm/Makefile4
-rw-r--r--package/xvidcore/Makefile6
-rw-r--r--package/xvinfo/Makefile4
-rw-r--r--package/xz/Makefile7
-rw-r--r--package/yajl/Makefile3
-rw-r--r--package/zsh/Makefile4
-rw-r--r--tools/adk/pkgmaker.c13
424 files changed, 1020 insertions, 755 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 2ede37e..e2b24a5 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= ImageMagick
PKG_VERSION:= 6.7.6
PKG_EXTRAVER:= 1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 8134257e3fbb43cc06fb32a6d725d3d0
PKG_DESCR:= image processing and converting utility
PKG_SECTION:= multimedia
@@ -15,6 +15,8 @@ PKG_BUILDDEP+= pango
PKG_URL:= http://www.imagemagick.org/
PKG_SITES:= http://image_magick.veidrodis.com/image_magick/
PKG_NEED_CXX:= 1
+PKG_LIBNAME:= libimagemagic
+PKG_OPTS:= dev
PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK
PKGSD_LIBIMAGEMAGICK:= imagemagick library
@@ -33,7 +35,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK}))
+$(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK},${PKG_OPTS}))
$(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
$(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index e69d274..9a8d442 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -15,6 +15,7 @@ PKG_BUILDDEP+= dri2proto glproto expat libXext
PKG_URL:= http://www.mesa3d.org/
PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/
PKG_NEED_CXX:= 1
+PKG_LIBNAME:= mesalib
PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm
diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile
index fb5c4c8..8beb783 100644
--- a/package/alix-switch/Makefile
+++ b/package/alix-switch/Makefile
@@ -10,7 +10,8 @@ PKG_DESCR:= daemon listening on button events
PKG_SECTION:= base
PKG_URL:= http://openadk.org/
-PKG_CFLINE_ALIX_SWITCH:=depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13)
+PKG_SYSTEM_DEPENDS:= pcengines-alix2d2 pcengines-alix2d13
+
NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
diff --git a/package/alix-temperature/Makefile b/package/alix-temperature/Makefile
index 7fb9066..e877241 100644
--- a/package/alix-temperature/Makefile
+++ b/package/alix-temperature/Makefile
@@ -10,7 +10,8 @@ PKG_DESCR:= read alix boards i2c thermal sensor
PKG_SECTION:= utils
PKG_DEPENDS:= i2c-tools
-PKG_CFLINE_ALIX_TEMPERATURE:=depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13)
+PKG_SYSTEM_DEPENDS:= pcengines-alix2d2 pcengines-alix2d13
+
NO_DISTFILES:= 1
include $(TOPDIR)/mk/package.mk
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 16520ec..d1f2a71 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -25,7 +25,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE
CONFIGURE_ARGS+= --disable-xmlto
@@ -35,7 +35,7 @@ else
CONFIGURE_ARGS+= --disable-alsamixer
endif
-post-install:
+alsa-utils-install:
${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin
ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 990464f..3df9a52 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -13,10 +13,11 @@ PKG_DEPENDS:= libexpat apr
PKG_BUILDDEP:= expat apr
PKG_URL:= http://apr.apache.org/
PKG_SITES:= http://apache.mirror.clusters.cc/apr/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --without-berkeley-db \
--with-apr=${STAGING_DIR}/usr \
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index ba5db4f..e5a910f 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -23,6 +23,10 @@ PKGSD_AVAHI_DNSCONFD:= DNS server from mDNS configuration daemon
PKGSD_LIBAVAHI:= DNS-SD over mDNS library
PKGSC_LIBAVAHI:= libs
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DAEMON},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index 6cb716b..11166e6 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -5,13 +5,15 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= axtls
PKG_VERSION:= 1.4.9
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 6d519bc3b5f20faa6ef8d423f5062241
PKG_DESCR:= small embedded webserver with TLS
PKG_SECTION:= www
PKG_DEPENDS:= libaxtls
PKG_URL:= http://axtls.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/}
+PKG_LIBNAME:= libaxtls
+PKG_OPTS:= dev
PKG_SUBPKGS:= AXHTTPD LIBAXTLS
PKGSD_LIBAXTLS:= small tls library
@@ -20,10 +22,14 @@ PKGSC_LIBAXTLS:= libs
DISTFILES:= axTLS-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/axTLS
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAXTLS},${PKGSC_LIBAXTLS}))
+$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAXTLS},${PKGSC_LIBAXTLS},${PKG_OPTS}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile
index 258d070..4a61823 100644
--- a/package/beecrypt/Makefile
+++ b/package/beecrypt/Makefile
@@ -7,15 +7,16 @@ PKG_NAME:= beecrypt
PKG_VERSION:= 4.2.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 8441c014170823f2dff97e33df55af1e
-PKG_DESCR:= cryptography toolkit
-PKG_SECTION:= crypto
+PKG_DESCR:= cryptography toolkit library
+PKG_SECTION:= libs
PKG_URL:= http://beecrypt.sourceforge.net/
PKG_SITES:= http://sourceforge.net/projects/beecrypt/files/beecrypt/$(PKG_VERSION)/
PKG_NEED_CXX:= 1
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 67f6d7a..8c0821a 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= bind
PKG_VERSION:= 9.7.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 207477c4cf95f2db5be0ded8a22669e0
PKG_DESCR:= popular DNS server
PKG_SECTION:= dns
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= openssl libxml2
PKG_URL:= https://www.isc.org/software/bind/
PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
PKG_NEED_CXX:= 1
+PKG_LIBNAME:= libbind
+PKG_OPTS:= dev
PKG_SUBPKGS:= BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG LIBBIND
PKGSD_BIND_NSUPDATE:= nsupdate utility
@@ -40,6 +42,10 @@ PKGSC_LIBBIND:= libs
PKG_FLAVOURS_BIND_SERVER:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -49,7 +55,7 @@ $(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},$
$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_DNSSEC},${PKGSD_BIND_DNSSEC},${PKGSC_BIND_DNSSEC}))
$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_HOST},${PKGSD_BIND_HOST},${PKGSC_BIND_HOST}))
$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_DIG},${PKGSD_BIND_DIG},${PKGSC_BIND_DIG}))
-$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBIND},${PKGSC_LIBBIND}))
+$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBIND},${PKGSC_LIBBIND},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index de0910f..e429001 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -4,9 +4,11 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/binutils/Makefile.inc
+PKG_NAME:= binutils
PKG_DESCR:= binary utilities (nm, objdump, as, ..)
PKG_SECTION:= lang
PKG_DEPENDS:= libbfd
+PKG_OPTS:= dev
PKG_SUBPKGS:= BINUTILS LIBBFD
PKGSD_LIBBFD:= Binary File Descriptor library
@@ -15,10 +17,14 @@ PKGSC_LIBBFD:= libs
PKG_HOST_DEPENDS:= !cygwin
PKG_ARCH_DEPENDS:= !avr32
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD}))
+$(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD},${PKG_OPTS}))
ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
CONFIGURE_ARGS+= --enable-multilib
@@ -41,7 +47,7 @@ pre-build:
libbfd-install:
${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib
- $(CP) ${WRKINST}/usr/lib/*.so ${IDIR_LIBBFD}/usr/lib
+ $(CP) ${WRKINST}/usr/lib/*.so* ${IDIR_LIBBFD}/usr/lib
binutils-install:
${INSTALL_DIR} ${IDIR_BINUTILS}/usr/bin
diff --git a/package/bison/Makefile b/package/bison/Makefile
index a1326ec..5bc18ea 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -14,11 +14,11 @@ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BISON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= M4=m4
-post-install:
+bison-install:
${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison
${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin
${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index 016f1b6..e775489 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://get.bitlbee.org/src/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= minimal
TARGET_CFLAGS+= -fPIC
@@ -40,7 +40,7 @@ post-configure:
@echo 'LFLAGS+=${TARGET_LDFLAGS}' >> \
${WRKBUILD}/Makefile.settings
-post-install:
+bitlbee-install:
${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee ${IDIR_BITLBEE}/usr/sbin
${INSTALL_DATA} ${WRKINST}/etc/bitlbee/* ${IDIR_BITLBEE}/etc/bitlbee
${INSTALL_BIN} ${WRKINST}/usr/sbin/bitlbee ${IDIR_BITLBEE}/usr/sbin
diff --git a/package/bkeymaps/Makefile b/package/bkeymaps/Makefile
index 8d6acb4..1c5f931 100644
--- a/package/bkeymaps/Makefile
+++ b/package/bkeymaps/Makefile
@@ -16,7 +16,7 @@ PKG_DFLT_BKEYMAPS:= y if ADK_TARGET_WITH_INPUT
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BKEYMAPS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BKEYMAPS,bkeymaps,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile
index 56ce5d5..a04cec1 100644
--- a/package/bluez-firmware/Makefile
+++ b/package/bluez-firmware/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:= http://bluez.sourceforge.net/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BLUEZ_FIRMWARE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --libdir=/lib
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 092cd03..d8a0b54 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -5,20 +5,32 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= bluez
PKG_VERSION:= 4.101
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= fb42cb7038c380eb0e2fa208987c96ad
-PKG_DESCR:= bluetooth libraries and applications
+PKG_DESCR:= bluetooth applications
PKG_SECTION:= bluetooth
-PKG_DEPENDS:= kmod-bt libusb glib dbus
-PKG_BUILDDEP:= libusb dbus glib libusb-compat
+PKG_DEPENDS:= kmod-bt libbluetooth
PKG_URL:= http://www.bluez.org/
PKG_SITES:= http://mirror.anl.gov/pub/linux/bluetooth/
+PKG_LIBNAME:= libbluetooth
+PKG_OPTS:= dev
+
+PKG_SUBPKGS:= BLUEZ LIBBLUETOOTH
+PKGSC_LIBBLUETOOTH:= libs
+PKGSD_LIBBLUETOOTH:= bluetooth libraries
+PKGSS_LIBBLUETOOTH:= glib libusb dbus libusb-compat
+PKGSB_LIBBLUETOOTH:= glib libusb dbus libusb-compat
PKG_ARCH_DEPENDS:= !avr32
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBBLUETOOTH,libbluetooth,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBBLUETOOTH},${PKGSD_LIBBLUETOOTH},${PKGSC_LIBBLUETOOTH},${PKG_OPTS}))
ifeq ($(ADK_STATIC),y)
XAKE_FLAGS+= CCLD="$(TARGET_CC) -all-static -pthread"
@@ -37,10 +49,6 @@ CONFIGURE_ARGS+= --enable-tools \
--disable-cups
bluez-install:
-ifneq ($(ADK_STATIC),y)
- ${INSTALL_DIR} ${IDIR_BLUEZ}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_BLUEZ}/usr/lib
-endif
${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin
${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin
@@ -52,4 +60,8 @@ endif
$(INSTALL_DATA) ./files/bluetooth.conf \
$(IDIR_BLUEZ)/etc/dbus-1/system.d
+libbluetooth-install:
+ ${INSTALL_DIR} ${IDIR_LIBBLUETOOTH}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_LIBBLUETOOTH}/usr/lib
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index 43d2575..109675e 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -17,7 +17,7 @@ PKG_NEED_CXX:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= LIBS="-liconv" \
ac_cv_func_memcmp_working=yes
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 6de8a1a..b47de49 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= boost
PKG_VERSION:= 1.54.0
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= efbfbff5a85a9330951f243d0a46e4b9
PKG_DESCR:= boost C++ library
PKG_SECTION:= libs
@@ -139,8 +139,4 @@ boost-install:
${INSTALL_DIR} ${IDIR_BOOST}/usr/lib
${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
-boost-dev-install:
- ${INSTALL_DIR} ${IDIR_BOOST_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_BOOST_DEV}/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index bda0c01..53fc4b0 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -20,7 +20,7 @@ PKGSC_UDHCPD:= net
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BUSYBOX,busybox,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD}))
# This is how to extract the Config.in files from a _built_ busybox source tree:
diff --git a/package/bwm/Makefile b/package/bwm/Makefile
index 119f23c..6f52a13 100644
--- a/package/bwm/Makefile
+++ b/package/bwm/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.orig
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BWM,bwm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index e842e7b..73a41a4 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -12,15 +12,21 @@ PKG_SECTION:= archive
PKG_DEPENDS:= libbz2
PKG_URL:= http://www.bzip.org/
PKG_SITES:= http://www.bzip.org/${PKG_VERSION}/
-PKG_SUBPKGS:= BZIP2 LIBBZ2
+PKG_LIBNAME:= libbz2
+PKG_OPTS:= dev
+PKG_SUBPKGS:= BZIP2 LIBBZ2
PKGSD_LIBBZ2:= bzip2 compression library
PKGSC_LIBBZ2:= libs
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2}))
+$(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2},${PKG_OPTS}))
MAKE_FILE:= Makefile-libbz2_so
CONFIG_STYLE:= manual
@@ -36,6 +42,8 @@ libbz2-install:
${STAGING_DIR}/usr/lib
(cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
$(CP) $(WRKBUILD)/bzlib.h $(STAGING_DIR)/usr/include
+ ${INSTALL_DIR} $(LIBBZ2_DEV)/usr/include
+ $(CP) $(WRKBUILD)/bzlib.h $(LIBBZ2_DEV)/usr/include
bzip2-install:
${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin
diff --git a/package/bzr/Makefile b/package/bzr/Makefile
index c6b3bcb..2875092 100644
--- a/package/bzr/Makefile
+++ b/package/bzr/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= https://launchpad.net/bzr/2.5/2.5.1/+download/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BZR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BZR,bzr,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index bbb8a84..4eeacf7 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -20,7 +20,7 @@ PKGFD_SMALL:= Minimal set of CA certificates
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,CA_CERTIFICATES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},force_etc))
+$(eval $(call PKG_template,CA_CERTIFICATES,ca-certificates,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},force_etc))
CONFIG_STYLE:= manual
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 7483bb7..62c2c3b 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cairo
PKG_VERSION:= 1.10.2
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f
PKG_DESCR:= cairo graphics library
PKG_SECTION:= libs
@@ -27,7 +27,7 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS},${PKG_OPTS}))
+$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
ifeq (,$(filter arm,$(TARGET_ARCH)))
TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS))
@@ -43,10 +43,4 @@ cairo-install:
${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib
${CP} ${WRKINST}/usr/lib/libcairo.so* ${IDIR_CAIRO}/usr/lib
-cairo-dev-install:
- ${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_CAIRO_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ccid/Makefile b/package/ccid/Makefile
index 3d8ca72..55c81fa 100644
--- a/package/ccid/Makefile
+++ b/package/ccid/Makefile
@@ -19,12 +19,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,CCID,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CCID,ccid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --enable-twinserial
-post-install:
+ccid-install:
$(INSTALL_DIR) $(IDIR_CCID)/etc/reader.conf.d
$(INSTALL_DIR) $(IDIR_CCID)/usr/lib/pcsc/drivers
$(INSTALL_DATA) ./files/gemalto.conf \
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 2718277..bea53dc 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -23,7 +23,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile
index 7fd1dc9..88fe759 100644
--- a/package/cgilib/Makefile
+++ b/package/cgilib/Makefile
@@ -5,18 +5,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cgilib
PKG_VERSION:= 0.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2c7053f58dfb06f7a80a112797ed7e86
PKG_DESCR:= Simple CGI Library
PKG_SECTION:= libs
PKG_URL:= http://www.infodrom.org/projects/cgilib/
PKG_SITES:= http://www.infodrom.org/projects/cgilib/download/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CGILIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CGILIB,cgilib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+cgilib-install:
${INSTALL_DIR} ${IDIR_CGILIB}/usr/lib
${CP} ${WRKINST}/usr/lib/libcgi.so* ${IDIR_CGILIB}/usr/lib/
diff --git a/package/cherokee/Makefile b/package/cherokee/Makefile
index 7b74b7f..b849f1b 100644
--- a/package/cherokee/Makefile
+++ b/package/cherokee/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= ef47003355a2e368e4d9596cd070ef23
PKG_DESCR:= small and fast webserver
PKG_SECTION:= www
PKG_URL:= http://www.cherokee-project.com
-PKG_SITES:= http://www.cherokee-project.de/mirrors/cherokee/1.2/1.2.101/
+PKG_SITES:= http://www.cherokee-project.de/mirrors/cherokee/1.2/${PKG_VERSION}/
include $(TOPDIR)/mk/package.mk
@@ -26,8 +26,6 @@ cherokee-install:
$(INSTALL_DIR) $(IDIR_CHEROKEE)/usr/lib/cherokee
$(CP) $(WRKINST)/usr/lib/libcherokee*so* \
$(IDIR_CHEROKEE)/usr/lib
- #$(CP) $(WRKINST)/usr/lib/cherokee/*.so \
- # $(IDIR_CHEROKEE)/usr/lib/cherokee
$(INSTALL_DIR) $(IDIR_CHEROKEE)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/usr/sbin/cherokee{,-worker} \
$(IDIR_CHEROKEE)/usr/sbin
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index 2b5e158..5610580 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -15,7 +15,7 @@ PKG_SITES= http://www.chillispot.info/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CHILLISPOT,chillispot,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
post-install:
${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin ${IDIR_CHILLISPOT}/etc
diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile
index f02b5e8..f4998ef 100644
--- a/package/cluster-glue/Makefile
+++ b/package/cluster-glue/Makefile
@@ -15,7 +15,7 @@ PKG_URL:= http://www.linux-ha.org/wiki/Cluster_Glue
PKG_SITES:= http://openadk.org/distfiles/
PKG_NOPARALLEL:= 1
-PKG_CFLINE_CLUSTER_GLUE:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_LIBC_DEPENDS:= eglibc glibc musl
PKG_ARCH_DEPENDS:= x86 x86_64
include $(TOPDIR)/mk/package.mk
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 204d029..379a762 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= lang
PKG_URL:= http://www.cmake.org/
PKG_SITES:= http://www.cmake.org/files/v2.8/
-PKG_CFLINE_CMAKE:= depends on ADK_NATIVE
+PKG_SYSTEM_DEPENDS:= native
include $(TOPDIR)/mk/package.mk
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index af8ffaf..d37bb30 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -26,7 +26,7 @@ PKGFD_WITH_PING:= enable ping statistic plugin
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifneq (${ADK_PACKAGE_COLLECTD_WITH_CPU},y)
DISABLE_CPU:=--disable-cpu
@@ -121,7 +121,7 @@ CONFIGURE_ARGS+= --disable-aggregation \
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
XAKE_FLAGS+= LIBS='-lm -lltdl'
-post-install:
+collectd-install:
${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc
${INSTALL_DIR} ${IDIR_COLLECTD}/usr/share/collectd
diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index 2a9af5a..cc20411 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}.${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,COMGT,comgt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/confuse/Makefile b/package/confuse/Makefile
index 289bc0d..f558ce6 100755
--- a/package/confuse/Makefile
+++ b/package/confuse/Makefile
@@ -5,18 +5,18 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= confuse
PKG_VERSION:= 2.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 45932fdeeccbb9ef4228f1c1a25e9c8f
PKG_DESCR:= a configuration file parser library
PKG_SECTION:= libs
PKG_URL:= http://www.nongnu.org/confuse/
PKG_SITES:= http://savannah.nongnu.org/download/confuse/
-
-PKG_SUBPKGS:= LIBCONFUSE
+PKG_LIBNAME:= libconfuse
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBCONFUSE,libconfuse,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBCONFUSE,libconfuse,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libconfuse-install:
${INSTALL_DIR} ${IDIR_LIBCONFUSE}/usr/lib
diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile
index aeac0f2..6cd5d41 100644
--- a/package/conntrack-tools/Makefile
+++ b/package/conntrack-tools/Makefile
@@ -22,9 +22,9 @@ include $(TOPDIR)/mk/package.mk
TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc
-$(eval $(call PKG_template,CONNTRACK_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CONNTRACK_TOOLS,conntrack-tools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+conntrack-tools-install:
$(INSTALL_DIR) $(IDIR_CONNTRACK_TOOLS)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/usr/sbin/conntrack{,d} $(IDIR_CONNTRACK_TOOLS)/usr/sbin
diff --git a/package/cpio/Makefile b/package/cpio/Makefile
index 9215765..120c5f0 100644
--- a/package/cpio/Makefile
+++ b/package/cpio/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=cpio/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CPIO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CPIO,cpio,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
post-install:
${INSTALL_DIR} ${IDIR_CPIO}/usr/bin
diff --git a/package/cpufrequtils/Makefile b/package/cpufrequtils/Makefile
index 3e8af55..a3b8d43 100644
--- a/package/cpufrequtils/Makefile
+++ b/package/cpufrequtils/Makefile
@@ -14,12 +14,12 @@ PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,CPUFREQUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CPUFREQUTILS,cpufrequtils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= NLS=no
CONFIG_STYLE:= manual
-post-install:
+cpufrequtils-install:
$(INSTALL_DIR) $(IDIR_CPUFREQUTILS)/usr/lib
$(CP) $(WRKINST)/usr/lib/libcpufreq.so* \
$(IDIR_CPUFREQUTILS)/usr/lib
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index 6ee1ff5..9cb15f9 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -32,7 +32,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CRYPTINIT,cryptinit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile
index 7daada2..d694ac3 100644
--- a/package/cryptodev-linux/Makefile
+++ b/package/cryptodev-linux/Makefile
@@ -17,7 +17,7 @@ PKG_SITES:= http://download.gna.org/cryptodev-linux/
include $(TOPDIR)/mk/package.mk
include ${TOPDIR}/mk/kernel-vars.mk
-$(eval $(call PKG_template,CRYPTODEV_LINUX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CRYPTODEV_LINUX,cryptodev-linux,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index c9ee5e8..470e159 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -16,9 +16,9 @@ PKG_NEED_CXX:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CTORRENT,ctorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+ctorrent-install:
${INSTALL_DIR} ${IDIR_CTORRENT}/usr/bin
${CP} ${WRKINST}/usr/bin/ctorrent ${IDIR_CTORRENT}/usr/bin
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 75fab01..f2fb4d5 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= curl
PKG_VERSION:= 7.28.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= cbdc0a79bdf6e657dd387c3d88d802e3
PKG_DESCR:= a client-side URL transfer tool
PKG_SECTION:= www
@@ -33,6 +33,10 @@ PKGCD_WITH_GNUTLS:= use GnuTLS for crypto
PKGCS_WITH_GNUTLS:= libgnutls ca-certificates libgmp
PKGCB_WITH_GNUTLS:= gnutls
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/cutter/Makefile b/package/cutter/Makefile
index 0a7bc0d..c876678 100755
--- a/package/cutter/Makefile
+++ b/package/cutter/Makefile
@@ -16,7 +16,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CUTTER,cutter,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/cvs/Makefile b/package/cvs/Makefile
index 8c39a3d..fd62d7e 100644
--- a/package/cvs/Makefile
+++ b/package/cvs/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://ftp.gnu.org/non-gnu/cvs/source/stable/${PKG_VERSION}/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,CVS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CVS,cvs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_lib_nsl_main=no
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index 86d8e97..968b111 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -18,7 +18,7 @@ PKG_CXX:= DANSGUARDIAN
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_LINUX_AVR32),y)
LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
diff --git a/package/daq/Makefile b/package/daq/Makefile
index f6bcd05..2ea0318 100644
--- a/package/daq/Makefile
+++ b/package/daq/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= daq
PKG_VERSION:= 2.0.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= a00855a153647df76d47f1ea454f74ae
PKG_DESCR:= daq
PKG_SECTION:= libs
@@ -13,10 +13,11 @@ PKG_DEPENDS:= libpcap
PKG_BUILDDEP:= libpcap
PKG_URL:= http://www.snort.org
PKG_SITES:= http://openadk.org/distfiles/
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
daq-install:
$(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index b3a1dbc..b49a04f 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://www.very-clever.com/download/nongnu/davfs2/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-neon
CONFIGURE_ENV+= LIBS=-liconv
diff --git a/package/deco/Makefile b/package/deco/Makefile
index a8c3086..5aa535a 100644
--- a/package/deco/Makefile
+++ b/package/deco/Makefile
@@ -18,7 +18,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DECO,deco,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index de365f1..a681a07 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DHCP_FORWARDER,dhcp-forwarder,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-dietlibc
XAKE_FLAGS+= cfg_filename="/etc/dhcp-fwd.conf"
diff --git a/package/dialog/Makefile b/package/dialog/Makefile
index 774af32..91e27fe 100644
--- a/package/dialog/Makefile
+++ b/package/dialog/Makefile
@@ -17,11 +17,11 @@ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DIALOG,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DIALOG,dialog,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
MAKE_FILE:= makefile
-post-install:
+dialog-install:
$(INSTALL_DIR) $(IDIR_DIALOG)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/dialog $(IDIR_DIALOG)/usr/bin
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile
index 66fa3c9..91aa25d 100644
--- a/package/diffutils/Makefile
+++ b/package/diffutils/Makefile
@@ -14,11 +14,11 @@ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DIFFUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DIFFUTILS,diffutils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_use_included_regex=no
-post-install:
+diffutils-install:
${INSTALL_DIR} ${IDIR_DIFFUTILS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/diff ${IDIR_DIFFUTILS}/usr/bin
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index c771708..8a7b04b 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -18,7 +18,7 @@ PKG_ARCH_DEPENDS:= !avr32
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DIGITEMP,digitemp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 777dba5..518eaf5 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -23,7 +23,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_DIR)/usr/bin/png-config
TARGET_LDFLAGS+= -liconv -lpng15
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 81fa6e1..4cce72c 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://thekelleys.org.uk/dnsmasq/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DNSMASQ,dnsmasq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index 8f6dee5..9b6c365 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://www.daniel-baumann.ch/software/dosfstools/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DOSFSTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64"
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index 395a2c7..369264c 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -22,7 +22,7 @@ PKGCB_WITH_GNUTLS:= gnutls
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DOVECOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DOVECOT,dovecot,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= RPCGEN='' \
ignore_signed_size=1 \
diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index b8d0cba..9adbaa2 100644
--- a/package/drbd/Makefile
+++ b/package/drbd/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://oss.linbit.com/drbd/8.4/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DRBD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DRBD,drbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= GENETLINK_H=$(STAGING_DIR)/usr/include/linux/genetlink.h
CONFIGURE_ARGS+= --with-distro=generic \
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index a7c2356..530e455 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -23,7 +23,7 @@ PKGFD_WITH_UTMP:= support writing /var/run/utmp
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DROPBEAR,dropbear,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION}))
TARGET_LDFLAGS+= $(ADK_TARGET_ABI_CFLAGS)
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index c5b7328..b11d9af 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -20,7 +20,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-2.4
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DSNIFF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --without-db \
--without-x \
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --without-db \
--with-openssl="${STAGING_TARGET_DIR}/usr"
FAKE_FLAGS+= install_prefix="${WRKINST}"
-post-install:
+dsniff-install:
${INSTALL_DIR} ${IDIR_DSNIFF}/usr/lib ${IDIR_DSNIFF}/usr/sbin
${CP} ${WRKINST}/usr/sbin/* ${IDIR_DSNIFF}/usr/sbin
${CP} ${WRKINST}/usr/lib/* ${IDIR_DSNIFF}/usr/lib
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index a04bd96..3f4f75e 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -5,11 +5,12 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= e2fsprogs
PKG_VERSION:= 1.42.8
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 8ef664b6eb698aa6b733df59b17b9ed4
-PKG_DESCR:= Ext2/3/4 filesystem utilities
+PKG_DESCR:= Ext2/3/4 filesystem utilities (meta-package)
PKG_SECTION:= fs
PKG_DEPENDS:= libcom-err libuuid libblkid libpthread
+PKG_DEPENDS:= e2fsck tune2fs mke2fs resize2fs
PKG_BUILDDEP:= util-linux
PKG_URL:= http://e2fsprogs.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
@@ -17,7 +18,7 @@ PKG_OPTS:= dev
PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF
-PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS E2FSCK_STATIC
+PKG_SUBPKGS:= E2FSPROGS LIBE2FS LIBCOM_ERR LIBSS E2FSCK_STATIC
PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS
PKGSD_LIBE2FS:= e2fsprogs library
PKGSC_LIBE2FS:= libs
@@ -42,10 +43,9 @@ PKGSS_MKE2FS:= libe2fs
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,E2FSPROGS,e2fsprogs,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,E2FSPROGS,e2fsprogs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
-$(eval $(call PKG_template,LIBCOM_ERR_DEV,libcom-err-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR_DEV},${PKGSC_LIBCOM_ERR_DEV}))
$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
$(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
$(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 3f6ad4b..4e16651 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -19,7 +19,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-4
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,EBTABLES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,EBTABLES,ebtables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index f3709cd..c5f10a8 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -20,7 +20,7 @@ PKGFD_WITH_IPV6:= enable IPv6 support
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
diff --git a/package/esound/Makefile b/package/esound/Makefile
index 6a5da17..fe69eab 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= esound
PKG_VERSION:= 0.2.41
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688
PKG_DESCR:= Enlightened Sound Daemon
PKG_SECTION:= multimedia
@@ -13,16 +13,17 @@ PKG_DEPENDS:= libaudiofile
PKG_BUILDDEP:= libaudiofile
PKG_URL:= http://www.tux.org/~ricdude/EsounD.html
PKG_SITES:= ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ESOUND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-alsa \
--disable-arts \
--enable-oss
-post-install:
+esound-install:
${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin ${IDIR_ESOUND}/usr/lib
${INSTALL_BIN} ${WRKINST}/usr/bin/esd ${IDIR_ESOUND}/usr/bin/
$(CP) $(WRKINST)/usr/lib/libesd.so* $(IDIR_ESOUND)/usr/lib/
diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index 335b6f4..cb8d8d6 100644
--- a/package/ether-wake/Makefile
+++ b/package/ether-wake/Makefile
@@ -13,7 +13,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ETHER_WAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ETHER_WAKE,ether-wake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile
index f920293..f6be14f 100644
--- a/package/ethtool/Makefile
+++ b/package/ethtool/Makefile
@@ -13,9 +13,9 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ETHTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+ethtool-install:
${INSTALL_DIR} ${IDIR_ETHTOOL}/usr/sbin
${CP} ${WRKINST}/usr/sbin/ethtool ${IDIR_ETHTOOL}/usr/sbin
diff --git a/package/evieext/Makefile b/package/evieext/Makefile
index 238d50a..14eddbd 100644
--- a/package/evieext/Makefile
+++ b/package/evieext/Makefile
@@ -5,10 +5,15 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= evieext
PKG_VERSION:= 1.1.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 68e61ce53caa495a3ad4085f66010eb8
+PKG_DESCR:= collection of XEVIE extension headers
+PKG_SECTION:= devel
PKG_SITES:= ftp://ftp.x.org/pub/individual/proto/
-PKG_SUBPKGS:=
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,EVIEEXT,evieext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile
index 7f8768b..e2fe27c 100644
--- a/package/evilwm/Makefile
+++ b/package/evilwm/Makefile
@@ -16,13 +16,13 @@ PKG_SITES:= http://www.6809.org.uk/evilwm/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,EVILWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,EVILWM,evilwm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
MAKE_FLAGS+= XROOT="$(STAGING_TARGET_DIR)/usr"
-post-install:
+evilwm-install:
$(INSTALL_DIR) $(IDIR_EVILWM)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/evilwm $(IDIR_EVILWM)/usr/bin
diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile
index bb2fd7b..c2c895b 100644
--- a/package/ez-ipupdate/Makefile
+++ b/package/ez-ipupdate/Makefile
@@ -5,26 +5,24 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ez-ipupdate
PKG_VERSION:= 3.0.11b8
-PKG_RELEASE:= 10
+PKG_RELEASE:= 11
PKG_MD5SUM:= 000211add4c4845ffa4211841bff4fb0
PKG_DESCR:= a client for dynamic DNS services
PKG_SECTION:= dns
PKG_URL:= http://ez-ipupdate.com/
PKG_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/
-PKG_SUBPKGS:= EZIPUPDATE
-
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,EZIPUPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,EZ_IPUPDATE,ez-ipupdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
do-install:
- ${INSTALL_DIR} ${IDIR_EZIPUPDATE}/etc ${IDIR_EZIPUPDATE}/usr/sbin
- install -m0600 ./files/${PKG_NAME}.conf ${IDIR_EZIPUPDATE}/etc/
- ${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_EZIPUPDATE}/usr/sbin/
+ ${INSTALL_DIR} ${IDIR_EZ_IPUPDATE}/etc ${IDIR_EZ_IPUPDATE}/usr/sbin
+ install -m0600 ./files/ez-ipupdate.conf ${IDIR_EZ_IPUPDATE}/etc/
+ ${INSTALL_BIN} ${WRKBUILD}/ez-ipupdate ${IDIR_EZ_IPUPDATE}/usr/sbin/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile
index 876a1c5..de1fc78 100644
--- a/package/fakeidentd/Makefile
+++ b/package/fakeidentd/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FAKEIDENTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FAKEIDENTD,fakeidentd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index 6d3784c..f0b7cb9 100644
--- a/package/fbset/Makefile
+++ b/package/fbset/Makefile
@@ -13,7 +13,7 @@ PKG_SITES:= http://users.telenet.be/geertu/Linux/fbdev/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FBSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index f3af7fe..9333334 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -21,7 +21,7 @@ PKGFB_WITH_SSL:= openssl
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FETCHMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --without-hesiod
@@ -31,7 +31,7 @@ else
CONFIGURE_ARGS+= --without-ssl
endif
-post-install:
+fetchmail-install:
${INSTALL_DIR} ${IDIR_FETCHMAIL}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/fetchmail \
${IDIR_FETCHMAIL}/usr/bin/
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 9c4cea0..03f81b6 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -5,13 +5,15 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ffmpeg
PKG_VERSION:= 2.0.2
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 6c5cfed204d8a108325d1fc439ab734a
PKG_DESCR:= record, convert and stream audio & video
PKG_SECTION:= libs
PKG_FDEPENDS:= libpthread
PKG_URL:= http://www.ffmpeg.org/
PKG_SITES:= http://www.ffmpeg.org/releases/
+PKH_LIBNAME:= libffmpeg
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !avr32 !cris
@@ -29,6 +31,8 @@ PKGSS_FFSERVER:= libffmpeg
PKGSD_FFPROBE:= simple multimedia stream analyzer
PKGSC_FFPROBE:= multimedia
PKGSS_FFPROBE:= libffmpeg
+PKGSD_LIBFFMPEG:= ffmpeg library
+PKGSC_LIBFFMPEG:= libs
PKG_FLAVOURS_LIBFFMPEG:= WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA
PKG_FLAVOURS_LIBFFMPEG+= WITH_XVID WITH_VORBIS WITH_X264
@@ -84,9 +88,13 @@ endif
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBFFMPEG,libffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFFMPEG,libffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKGSD_LIBFFMPEG},${PKGSC_LIBFFMPEG},${PKG_OPTS}))
$(eval $(call PKG_template,FFMPEG,ffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFMPEG},${PKGSC_FFMPEG}))
$(eval $(call PKG_template,FFSERVER,ffserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFSERVER},${PKGSC_FFSERVER}))
$(eval $(call PKG_template,FFPROBE,ffprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFPROBE},${PKGSC_FFPROBE}))
diff --git a/package/file/Makefile b/package/file/Makefile
index 7c3fc84..b96ee1d 100644
--- a/package/file/Makefile
+++ b/package/file/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= file
PKG_VERSION:= 5.11
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 16a407bd66d6c7a832f3a5c0d609c27b
PKG_DESCR:= a file type guesser
PKG_SECTION:= utils
@@ -20,9 +20,13 @@ PKG_SUBPKGS:= FILE LIBMAGIC
PKGSD_LIBMAGIC:= file type guesser library
PKGSC_LIBMAGIC:= libs
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FILE,file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC},${PKG_OPTS}))
pre-configure:
diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 0651d91..46c3e66 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= findutils
PKG_VERSION:= 4.4.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 351cc4adb07d54877fa15f75fb77d39f
PKG_DESCR:= GNU utilities for finding files
PKG_SECTION:= utils
@@ -18,16 +18,18 @@ PKGSD_LOCATE:= Locate utility
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FINDUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FINDUTILS,findutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
CONFIGURE_ENV+= gl_cv_func_wcwidth_works=yes \
ac_cv_func_working_mktime=yes
-post-install:
+findutils-install:
$(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/{find,oldfind,xargs} \
$(IDIR_FINDUTILS)/usr/bin
+
+locate-install:
${INSTALL_DIR} ${IDIR_LOCATE}/usr/{bin,libexec}
${INSTALL_BIN} ${WRKINST}/usr/bin/{locate,updatedb} ${IDIR_LOCATE}/usr/bin/
$(INSTALL_BIN) $(WRKINST)/usr/libexec/{bigram,code,frcode} \
diff --git a/package/flac/Makefile b/package/flac/Makefile
index 274a747..0195cb6 100644
--- a/package/flac/Makefile
+++ b/package/flac/Makefile
@@ -5,25 +5,25 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= flac
PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 153c8b15a54da428d1f0fadc756c22c7
PKG_DESCR:= Free Lossless Audio Codec library
PKG_SECTION:= libs
PKG_URL:= http://flac.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=flac/}
-
-PKG_SUBPKGS:= LIBFLAC
+PKG_LIBNAME:= libflac
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-asm-optimizations \
--disable-xmms-plugin \
--disable-cpplibs \
--disable-ogg
-post-install:
+libflac-install:
${INSTALL_DIR} ${IDIR_LIBFLAC}/usr/lib
${CP} ${WRKINST}/usr/lib/libFLAC.so* ${IDIR_LIBFLAC}/usr/lib/
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index de5cb64..99c130e 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -14,8 +14,9 @@ PKG_URL:= http://www.fltk.org/
PKG_SITES:= http://openadk.org/distfiles/
PKG_NEED_CXX:= 1
PKG_CXX:= LIBFLTK
+PKG_LIBNAME:= libfltk
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBFLTK
PKG_ARCH_DEPENDS:= x86 x86_64 mips arm
PKG_HOST_DEPENDS:= !darwin
@@ -23,9 +24,12 @@ DISTFILES:= ${PKG_NAME}-$(PKG_VERSION)-source.tar.gz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lgcc_s -lm -lc
+endif
+
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp -lssp_nonshared
endif
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index c913d76..ea8ee63 100644
--- a/package/fluxbox/Makefile
+++ b/package/fluxbox/Makefile
@@ -23,7 +23,7 @@ PKGFB_WITH_IMLIB2:= imlib2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FLUXBOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FLUXBOX,fluxbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y)
CONFIGURE_ARGS+= --enable-imlib2
@@ -31,7 +31,7 @@ else
CONFIGURE_ARGS+= --disable-imlib2
endif
-post-install:
+fluxbox-install:
$(INSTALL_DIR) $(IDIR_FLUXBOX)/usr/{bin,share}
$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
$(IDIR_FLUXBOX)/usr/bin
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index e57b4f0..3fa25ff 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -18,9 +18,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_ADOBE_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_ADOBE_100DPI,font-adobe-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-adobe-100dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
$(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index bbdff72..e49b5e4 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -18,9 +18,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_ADOBE_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_ADOBE_75DPI,font-adobe-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-adobe-75dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
$(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index 6aef1e5..43a6180 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_BH_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_100DPI,font-bh-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-bh-100dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_BH_100DPI)/usr/share/fonts/X11/100dpi
$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
$(IDIR_FONT_BH_100DPI)/usr/share/fonts/X11/100dpi
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index 3845bae..7d83e44 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_BH_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_75DPI,font-bh-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-bh-75dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_BH_75DPI)/usr/share/fonts/X11/75dpi
$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
$(IDIR_FONT_BH_75DPI)/usr/share/fonts/X11/75dpi
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index 8c6d08e..7f33f05 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_100DPI,font-bh-lucidatypewriter-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-bh-lucidatypewriter-100dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_BH_LUCIDATYPEWRITER_100DPI)/usr/share/fonts/X11/100dpi
$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
$(IDIR_FONT_BH_LUCIDATYPEWRITER_100DPI)/usr/share/fonts/X11/100dpi
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index 3b7d4b5..50cd9f7 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_75DPI,font-bh-lucidatypewriter-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-bh-lucidatypewriter-75dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_BH_LUCIDATYPEWRITER_75DPI)/usr/share/fonts/X11/75dpi
$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
$(IDIR_FONT_BH_LUCIDATYPEWRITER_75DPI)/usr/share/fonts/X11/75dpi
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index fd25344..dd4ff15 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_BH_TTF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_TTF,font-bh-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-bh-ttf-install:
$(INSTALL_DIR) $(IDIR_FONT_BH_TTF)/usr/share/fonts/X11/TTF
$(CP) ${WRKINST}/usr/share/fonts/X11/TTF/* \
$(IDIR_FONT_BH_TTF)/usr/share/fonts/X11/TTF
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index d9c2ab9..f691550 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_BH_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BH_TYPE1,font-bh-type1,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-bh-type1-install:
$(INSTALL_DIR) $(IDIR_FONT_BH_TYPE1)/usr/share/fonts/X11/Type1
$(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
$(IDIR_FONT_BH_TYPE1)/usr/share/fonts/X11/Type1
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index 87d1922..1c9dfd1 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_BITSTREAM_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BITSTREAM_100DPI,font-bitstream-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-bitstream-100dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_100DPI)/usr/share/fonts/X11/100dpi
$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
$(IDIR_FONT_BITSTREAM_100DPI)/usr/share/fonts/X11/100dpi
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index 7f685c4..64f0e51 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_BITSTREAM_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BITSTREAM_75DPI,font-bitstream-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-bitstream-75dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_75DPI)/usr/share/fonts/X11/75dpi
$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
$(IDIR_FONT_BITSTREAM_75DPI)/usr/share/fonts/X11/75dpi
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index b623298..f82b6c3 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_BITSTREAM_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_BITSTREAM_TYPE1,font-bitstream-type1,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-bitstream-type1-install:
$(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_TYPE1)/usr/share/fonts/X11/Type1
$(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
$(IDIR_FONT_BITSTREAM_TYPE1)/usr/share/fonts/X11/Type1
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index a94bb31..585d4b8 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -17,11 +17,11 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_MISC_MISC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_MISC_MISC,font-misc-misc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= MAPFILES_PATH=${STAGING_TARGET_DIR}/usr/share/fonts/X11/util
-post-install:
+font-misc-misc-install:
$(INSTALL_DIR) $(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc
$(CP) ${WRKINST}/usr/share/fonts/X11/misc/* \
$(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index 60aabeb..fb1d607 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -11,11 +11,10 @@ PKG_DESCR:= font util
PKG_SECTION:= x11/apps
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# XXX: Push the mapping files to a place where we can find them
# again when compiling the actual fonts. This is ugly as hell,
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
index 03e89da..0a8bb2f 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -17,9 +17,9 @@ PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FONT_XFREE86_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FONT_XFREE86_TYPE1,font-xfree86-type1,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+font-xfree86-type1-install:
$(INSTALL_DIR) $(IDIR_FONT_XFREE86_TYPE1)/usr/share/fonts/X11/Type1
$(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
$(IDIR_FONT_XFREE86_TYPE1)/usr/share/fonts/X11/Type1
diff --git a/package/fping/Makefile b/package/fping/Makefile
index 3f0fec5..fc8b845 100644
--- a/package/fping/Makefile
+++ b/package/fping/Makefile
@@ -16,9 +16,9 @@ DISTFILES:= ${PKG_NAME}.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FPING,fping,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+fping-install:
${INSTALL_DIR} ${IDIR_FPING}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/fping ${IDIR_FPING}/usr/sbin/
diff --git a/package/fprobe-ulog/Makefile b/package/fprobe-ulog/Makefile
index 6192723..b87cd7b 100644
--- a/package/fprobe-ulog/Makefile
+++ b/package/fprobe-ulog/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-piddir=/var \
--with-membulk=index8 \
--with-hash=xor8
-post-install:
+fprobe-ulog-install:
${INSTALL_DIR} ${IDIR_FPROBE_ULOG}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/fprobe-ulog \
${IDIR_FPROBE_ULOG}/usr/sbin/
diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile
index 269a6e6..ba361e8 100644
--- a/package/fprobe/Makefile
+++ b/package/fprobe/Makefile
@@ -17,7 +17,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FPROBE,fprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-piddir=/var \
--with-pcap=${STAGING_TARGET_DIR}/usr/include \
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-piddir=/var \
--with-membulk=index8 \
--with-hash=xor8 \
-post-install:
+fprobe-install:
${INSTALL_DIR} ${IDIR_FPROBE}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/fprobe ${IDIR_FPROBE}/usr/sbin/
diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index 76d4e5a..8dbc3f4 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -7,21 +7,22 @@ PKG_NAME:= freeglut
PKG_VERSION:= 2.6.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 39f0f2de89f399529d2b981188082218
-PKG_DESCR:= OpenGL Utility Toolkit
+PKG_DESCR:= OpenGL Utility Toolkit libraries
PKG_SECTION:= libs
PKG_BUILDDEP:= MesaLib
PKG_URL:= http://freeglut.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/}
PKG_NEED_CXX:= 1
+PKG_OPTS:= dev
PKG_HOST_DEPENDS:= !cygwin
PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FREEGLUT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FREEGLUT,freeglut,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}${PKG_OPTS}))
-post-install:
+freeglut-install:
$(INSTALL_DIR) $(IDIR_FREEGLUT)/usr/lib
$(CP) ${WRKINST}/usr/lib/libglut.so* $(IDIR_FREEGLUT)/usr/lib
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
index 6a38be6..1e3885f 100644
--- a/package/freeradius-client/Makefile
+++ b/package/freeradius-client/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= freeradius-client
PKG_VERSION:= 1.1.6
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= edd4d904e802ff66d35532be1475cfa7
PKG_DESCR:= RADIUS client
PKG_SECTION:= ppp
@@ -15,23 +15,25 @@ PKG_URL:= http://www.freeradius.org/
PKG_SITES:= ftp://ftp.freeradius.org/pub/radius/
PKG_SUBPKGS:= FREERADIUS_CLIENT LIBFREERADIUS_CLIENT
-PKG_SECTION_LIB:= libs
+PKGSS_LIBFREERADIUS_CLIENT:= 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_LIB}))
+$(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSS_LIBFREERADIUS_CLIENT}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ENV+= ac_cv_func_uname=no
-post-install:
+freeradius-client-install:
${INSTALL_DIR} ${IDIR_FREERADIUS_CLIENT}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/radiusclient \
${IDIR_FREERADIUS_CLIENT}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/rad{login,status} \
${IDIR_FREERADIUS_CLIENT}/usr/sbin
${CP} ${WRKINST}/etc ${IDIR_FREERADIUS_CLIENT}/
+
+libfreeradius-client-install:
${INSTALL_DIR} ${IDIR_LIBFREERADIUS_CLIENT}/usr/lib
${CP} ${WRKINST}/usr/lib/libfreeradius-client.so* \
${IDIR_LIBFREERADIUS_CLIENT}/usr/lib
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 1ffe0f8..55b0260 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -91,7 +91,7 @@ ${2}-install:
done
endef
-$(eval $(call PKG_template,FREERADIUS_SERVER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_SERVER,freeradius-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_DEMOCERTS},${PKG_SECTION}))
$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_CHAP},${PKG_SECTION}))
$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FREERADIUS_MOD_DETAIL},${PKG_SECTION}))
diff --git a/package/fribidi/Makefile b/package/fribidi/Makefile
index 9ec9569..4f9af41 100644
--- a/package/fribidi/Makefile
+++ b/package/fribidi/Makefile
@@ -5,18 +5,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= fribidi
PKG_VERSION:= 0.19.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 925bafb97afee8a2fc2d0470c072a155
PKG_DESCR:= Unicode Bidirectional Algorithm
PKG_SECTION:= libs
PKG_URL:= http://www.fribidi.org/
PKG_SITES:= http://fribidi.org/download/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FRIBIDI,fribidi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FRIBIDI,fribidi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
fribidi-install:
$(INSTALL_DIR) $(IDIR_FRIBIDI)/usr/lib
diff --git a/package/frickin/Makefile b/package/frickin/Makefile
index d1290aa..3e3be76 100644
--- a/package/frickin/Makefile
+++ b/package/frickin/Makefile
@@ -14,7 +14,7 @@ PKG_NOPARALLEL:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FRICKIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FRICKIN,frickin,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index ddf0fd2..b1160f5 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -19,6 +19,10 @@ PKG_SUBPKGS:= FUSE_UTILS LIBFUSE
PKGSD_LIBFUSE:= FUSE library
PKGSC_LIBFUSE:= libs
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index e6813c2..9991078 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -18,7 +18,7 @@ DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GATLING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GATLING,gatling,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/gawk/Makefile b/package/gawk/Makefile
index fe14294..726fa3f 100644
--- a/package/gawk/Makefile
+++ b/package/gawk/Makefile
@@ -14,11 +14,11 @@ PKG_SITES:= ${MASTER_SITE_GNU:=gawk/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GAWK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GAWK,gawk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-libsigsegv
-post-install:
+gawk-install:
${INSTALL_DIR} ${IDIR_GAWK}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/gawk ${IDIR_GAWK}/usr/bin
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 6c6bdf0..97a3175 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -4,6 +4,7 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gcc/Makefile.inc
+PKG_NAME:= gcc
PKG_DESCR:= GNU C compiler
PKG_SECTION:= lang
PKG_OPTS:= noremove
@@ -19,8 +20,8 @@ WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,GXX,g++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GXX,g++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS:= ''
TARGET_CFLAGS:= ''
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index 84c33ee..dfed455 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -14,12 +14,14 @@ PKG_BUILDDEP:= dbus dbus-glib orbit2
PKG_DEPENDS:= dbus dbus-glib orbit2
PKG_URL:= http://projects.gnome.org/gconf/
PKG_SITES:= ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
+PKG_LIBNAME:= gconf
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !arm !cris
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,GCONF,gconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GCONF,gconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
gconf-install:
$(INSTALL_DIR) $(IDIR_GCONF)/usr/bin
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 62bf91c..1587c2c 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -4,6 +4,7 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gdb/Makefile.inc
+PKG_NAME:= gdb
PKG_DESCR:= GNU debugger
PKG_SECTION:= debug
PKG_DEPENDS:= libthread-db libncurses libiconv libexpat libgcc
@@ -33,7 +34,7 @@ XAKE_FLAGS+= LDFLAGS='${TARGET_LDFLAGS}'
# disable honour cflags stuff
XAKE_FLAGS+= GCC_HONOUR_COPTS:=s
-post-install:
+gdb-install:
${INSTALL_DIR} ${IDIR_GDB}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/
# shipped libbfd conflicts with system wide one
diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile
index b880623..e4ca57b 100644
--- a/package/gdbm/Makefile
+++ b/package/gdbm/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= disk file format database
PKG_SECTION:= libs
PKG_URL:= http://www.gnu.org/software/gdbm/
PKG_SITES:= ${MASTER_SITE_GNU:=gdbm/}
+PKG_LIBNAME:= libgdbm
PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index de762c4..7b0168f 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -4,10 +4,10 @@
include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gdb/Makefile.inc
+PKG_NAME:= gdbserver
PKG_DESCR:= GNU debugger (small server)
PKG_SECTION:= debug
PKG_DEPENDS:= libthread-db
-PKG_SUBPKGS:= GDBSERVER
PKG_ARCH_DEPENDS:= !avr32 !m68k
@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+gdbserver-install:
${INSTALL_DIR} ${IDIR_GDBSERVER}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/gdbserver ${IDIR_GDBSERVER}/usr/bin/
diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile
index 181e5f9..ecd237c 100644
--- a/package/gettext-tiny/Makefile
+++ b/package/gettext-tiny/Makefile
@@ -11,12 +11,13 @@ PKG_DESCR:= Gettext stub and replacement
PKG_SECTION:= libs
PKG_URL:= https://github.com/rofl0r/gettext-tiny
PKG_SITES:= http://ftp.barfooze.de/pub/sabotage/tarballs/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,GETTEXT_TINY,gettext-tiny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GETTEXT_TINY,gettext-tiny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
diff --git a/package/giflib/Makefile b/package/giflib/Makefile
index c6dd83e..1f0857e 100644
--- a/package/giflib/Makefile
+++ b/package/giflib/Makefile
@@ -13,7 +13,6 @@ PKG_URL:= http://sourceforge.net/projects/giflib/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
PKG_OPTS:= dev
-
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/git/Makefile b/package/git/Makefile
index e66be0b..0add558 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://git-core.googlecode.com/files/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GIT,git,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \
NO_INSTALL_HARDLINKS=1 NO_GETTEXT=1 NO_ICONV=1 \
@@ -28,7 +28,7 @@ CONFIGURE_ENV+= ac_cv_c_c99_format=yes \
ac_cv_fread_reads_directories=no \
ac_cv_snprintf_returns_bogus=no
-post-install:
+git-install:
$(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/libexec/git-core
$(INSTALL_DIR) $(IDIR_GIT)/usr/share/git-core/templates
$(CP) $(WRKINST)/usr/share/git-core/templates/* \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index d6f0f21..f7aabf1 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -8,6 +8,7 @@ TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
include $(TOPDIR)/toolchain/glibc/Makefile.inc
+PKG_NAME:= glibc
PKG_DESCR:= GNU C library
PKG_SECTION:= base
PKG_OPTS:= noremove
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index 1cb5ecd..752a64f 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -27,7 +27,7 @@ ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz -lc"
endif
-post-install:
+gmediaserver-install:
${INSTALL_DIR} ${IDIR_GMEDIASERVER}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/bin/gmediaserver \
${IDIR_GMEDIASERVER}/usr/sbin/
diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile
index d28b2b4..a42cd65 100644
--- a/package/gnupg/Makefile
+++ b/package/gnupg/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/gnupg/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GNUPG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GNUPG,gnupg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-asm \
--disable-gnupg-iconv \
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --disable-asm \
--enable-fake-curl \
--disable-regex
-post-install:
+gnupg-install:
${INSTALL_DIR} ${IDIR_GNUPG}/usr/bin/
${INSTALL_DIR} ${IDIR_GNUPG}/usr/share/gnupg
${INSTALL_DATA} ${WRKINST}/usr/share/gnupg/options.skel \
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 8951a14..912912b 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gnutls
PKG_VERSION:= 3.2.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 7c0dd4f77dc70c64d2f385aeb2df4157
PKG_DESCR:= GNU TLS library
PKG_SECTION:= crypto
@@ -13,6 +13,8 @@ PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp
PKG_BUILDDEP:= libgcrypt liblzo libtasn1 zlib ncurses libnettle
PKG_URL:= http://www.gnu.org/software/gnutls/
PKG_SITES:= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/
+PKG_LIBNAME:= libgnutls
+PKG_OPTS:= dev
PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL
PKGSD_GNUTLS_UTILS:= GNU TLS utilities
@@ -28,9 +30,13 @@ PKGFB_WITH_CRYPTODEV:= cryptodev-linux
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS}))
+$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS},${PKG_OPTS}))
$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GNUTLS_UTILS},${PKGSD_GNUTLS_UTILS},${PKGSC_GNUTLS_UTILS}))
$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_EXTRA}))
$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_OPENSSL}))
@@ -46,15 +52,21 @@ CONFIGURE_ARGS+= --disable-rpath \
--without-p11-kit
CONFIGURE_ENV+= ac_cv_prog_AR='$(TARGET_CROSS)ar'
-post-install:
+libgnutls-install:
${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
${CP} ${WRKINST}/usr/lib/libgnutls.so* ${IDIR_LIBGNUTLS}/usr/lib
+
+libgnutls-extra-install:
${INSTALL_DIR} ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
${CP} ${WRKINST}/usr/lib/libgnutlsxx.so* \
${IDIR_LIBGNUTLS_EXTRA}/usr/lib
+
+libgnutls-openssl-install:
${INSTALL_DIR} ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so* \
${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
+
+gnutls-utils-install:
${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin
${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \
${IDIR_GNUTLS_UTILS}/usr/bin
diff --git a/package/gperf/Makefile b/package/gperf/Makefile
index 1a8608e..567613f 100644
--- a/package/gperf/Makefile
+++ b/package/gperf/Makefile
@@ -15,9 +15,9 @@ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GPERF,gperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+gperf-install:
${INSTALL_DIR} ${IDIR_GPERF}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/gperf ${IDIR_GPERF}/usr/bin
diff --git a/package/gpm/Makefile b/package/gpm/Makefile
index acfc364..e664fac 100644
--- a/package/gpm/Makefile
+++ b/package/gpm/Makefile
@@ -5,21 +5,26 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gpm
PKG_VERSION:= 1.20.6
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= b75e794bfb9fe8114d0b083932673b8f
PKG_DESCR:= console mouse support
PKG_SECTION:= misc
PKG_URL:= http://launchpad.net/gpm
PKG_SITES:= http://launchpad.net/gpm/main/${PKG_VERSION}/+download/
PKG_NOPARALLEL:= 1
+PKG_OPTS:= dev
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GPM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GPM,gpm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CPPFLAGS+= -I${WRKSRC}/src/headers
-post-install:
+gpm-install:
${INSTALL_DIR} ${IDIR_GPM}/usr/sbin ${IDIR_GPM}/usr/lib
${INSTALL_BIN} ${WRKINST}/usr/sbin/gpm ${IDIR_GPM}/usr/sbin/
${CP} ${WRKINST}/usr/lib/libgpm.so.* ${IDIR_GPM}/usr/lib/
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 9666a7c..bd15820 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -15,14 +15,15 @@ PKG_SITES:= http://download.berlios.de/gpsd/
PKG_URL:= http://gpsd.berlios.de/
PKG_CXX:= GPSD
PKG_NEED_CXX:= 1
-PKG_CFLINE_GPSD:= depends on !ADK_NATIVE
+
+PKG_ARCH_DEPENDS:= !native
PKG_SUBPKGS:= GPSD GPSD_CLIENTS
PKGSD_GPSD_CLIENTS:= GPS client utilities
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GPSD,gpsd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GPSD_CLIENTS},${PKG_SECTION}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -34,7 +35,10 @@ CONFIGURE_ENV+= EGREP="grep -E" \
CONFIGURE_ARGS+= --disable-dbus
TARGET_CFLAGS+= -fPIC
+ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y)
LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lc
+endif
+
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp -lssp_nonshared
endif
@@ -54,11 +58,13 @@ post-configure:
${WRKBUILD}/libtool
endif
-post-install:
+gpsd-install:
${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin
${CP} ${WRKINST}/usr/lib/libgps.so* ${IDIR_GPSD}/usr/lib
${CP} ${WRKINST}/usr/lib/libgpsd.so* ${IDIR_GPSD}/usr/lib
${CP} ${WRKINST}/usr/sbin/gpsd ${IDIR_GPSD}/usr/sbin
+
+gpsd-clients-install:
${INSTALL_DIR} ${IDIR_GPSD_CLIENTS}/usr/bin
${CP} ${WRKINST}/usr/bin/{cgps,gpxlogger} \
${IDIR_GPSD_CLIENTS}/usr/bin
diff --git a/package/grep/Makefile b/package/grep/Makefile
index 3a834e8..3f2e6b5 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -19,11 +19,11 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,GREP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GREP,grep,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_LDFLAGS+= -liconv
-post-install:
+grep-install:
$(INSTALL_DIR) $(IDIR_GREP)/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/{e,f,}grep $(IDIR_GREP)/bin
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index f9f8957..b767e61 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -22,7 +22,7 @@ PKG_DFLT_GRUB_BIN:= y if !ADK_TOOLCHAIN_ONLY && !ADK_TOOLCHAIN_ARCHIVE
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GRUB_BIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GRUB_BIN,grub-bin,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 706bf62..4b429c7 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -18,7 +18,7 @@ PKG_NOPARALLEL:= 1
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,GRUB,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GRUB,grub,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_STATIC),y)
TARGET_CFLAGS+= -static
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --disable-efiemu \
--disable-grub-mkfont \
--disable-grub-fstest
-post-install:
+grub-install:
${INSTALL_DIR} $(IDIR_GRUB)/usr/{sbin,lib,bin}
${INSTALL_DIR} $(IDIR_GRUB)/etc
${CP} ${WRKINST}/etc/grub.d $(IDIR_GRUB)/etc
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index cac1448..fd97633 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -5,13 +5,15 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= gsm
PKG_VERSION:= 1.0.10
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 4b148480f82e96d274248e13880ec873
PKG_DESCR:= A GSM 06.10 full-rate speech transcoding implementation (library)
PKG_SECTION:= libs
PKG_URL:= http://www-rn.informatik.uni-bremen.de/software/gsm/
PKG_SITES:= http://www-rn.informatik.uni-bremen.de/software/gsm/
PKG_NOPARALLEL:= 1
+PKG_LIBNAME:= libgsm
+PKG_OPTS:= dev
PKG_SUBPKGS:= LIBGSM GSM_UTILS
PKGSD_GSM_UTILS:= A GSM 06.10 full-rate speech transcoding implementation (utilities)
@@ -20,9 +22,13 @@ PKGSC_GSM_UTILS:= misc
WRKDIST= ${WRKDIR}/${PKG_NAME}-1.0-pl10
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GSM_UTILS},${PKGSD_GSM_UTILS},${PKGSC_GSM_UTILS}))
CONFIG_STYLE:= manual
@@ -30,9 +36,11 @@ CONFIG_STYLE:= manual
XAKE_FLAGS+= COPTS="${TARGET_CFLAGS} -fPIC" \
INSTALL_ROOT="${WRKINST}"
-post-install:
+libgsm-install:
${INSTALL_DIR} ${IDIR_LIBGSM}/usr/lib
${CP} ${WRKINST}/usr/lib/libgsm.so* ${IDIR_LIBGSM}/usr/lib
+
+gsm-utils-install:
${INSTALL_DIR} ${IDIR_GSM_UTILS}/usr/bin
${CP} ${WRKINST}/usr/bin/toast ${IDIR_GSM_UTILS}/usr/bin
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index 4444bbc..452b8ea 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= libs
PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/
PKG_DEPENDS:= libstdcxx cairo
PKG_BUILDDEP:= libstdcxx cairo
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
@@ -19,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index 33cc8ad..f2cc4a4 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -14,11 +14,11 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=haserl/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HASERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HASERL,haserl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS+= -DMAX_UPLOAD_KB=8192
-post-install:
+haserl-install:
${INSTALL_DIR} ${IDIR_HASERL}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/haserl ${IDIR_HASERL}/usr/bin/
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index da8933a..85b49f5 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -14,11 +14,11 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=hdparm/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HDPARM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HDPARM,hdparm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-post-install:
+hdparm-install:
${INSTALL_DIR} ${IDIR_HDPARM}/usr/sbin
${INSTALL_BIN} ${WRKINST}/sbin/hdparm ${IDIR_HDPARM}/usr/sbin
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 68f99f7..a39c76b 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= heimdal
PKG_VERSION:= 1.5.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= bb23d9dbdafd395d816f7abc598481a1
PKG_DESCR:= Kerberos 5 server
PKG_SECTION:= crypto
@@ -14,6 +14,8 @@ PKG_DEPENDS:= libheimdal libncurses libcom-err libreadline libopenssl
PKG_URL:= http://www.h5l.org/
PKG_SITES:= http://www.h5l.org/dist/src/
PKG_NOPARALLEL:= 1
+PKG_LIBNAME:= libheimdal
+PKG_OPTS:= dev
PKG_SUBPKGS:= HEIMDAL_SERVER LIBHEIMDAL
PKGSD_LIBHEIMDAL:= Kerberos 5 libraries
@@ -30,10 +32,14 @@ PKGCD_WITH_BDB:= use Berkeley DB as database backend
PKGCS_WITH_BDB:= libdb
PKGCB_WITH_BDB:= db
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBHEIMDAL},${PKGSC_LIBHEIMDAL}))
+$(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBHEIMDAL},${PKGSC_LIBHEIMDAL},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \
@@ -100,7 +106,7 @@ post-extract:
${MAKE} -C ${WRKBUILD}/lib/roken clean
${MAKE} -C ${WRKBUILD} clean
-post-install:
+heimdal-server-install:
ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/openldap/schema
${INSTALL_DATA} ${WRKBUILD}/lib/hdb/hdb.schema \
@@ -129,7 +135,8 @@ endif
${IDIR_HEIMDAL_SERVER}/usr/sbin/
${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin \
${IDIR_HEIMDAL_SERVER}/usr/sbin/
- # heimdal libs
+
+libheimdal-install:
${INSTALL_DIR} ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
${CP} ${WRKINST}/usr/lib/heimdal/libhx509.so* \
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index f94c270..9feaa4a 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -17,7 +17,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HEYU,heyu,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index ef3a52f..ec633c5 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -14,11 +14,11 @@ PKG_SITES:= http://www.vervest.org/htp/archive/c/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HTPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-post-install:
+htpdate-install:
${INSTALL_DIR} ${IDIR_HTPDATE}/usr/sbin
${INSTALL_BIN} ${WRKBUILD}/htpdate ${IDIR_HTPDATE}/usr/sbin/
diff --git a/package/httping/Makefile b/package/httping/Makefile
index c7b8e8b..7714807 100644
--- a/package/httping/Makefile
+++ b/package/httping/Makefile
@@ -17,12 +17,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HTTPING,httping,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
TARGET_CFLAGS+= -D_GNU_SOURCE
-post-install:
+httping-install:
${INSTALL_DIR} ${IDIR_HTTPING}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/httping ${IDIR_HTTPING}/usr/bin/
diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile
index 31ddcda..610d17b 100644
--- a/package/httptunnel/Makefile
+++ b/package/httptunnel/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= http://www.nocrew.org/software/httptunnel/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HTTPTUNNEL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HTTPTUNNEL,httptunnel,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+httptunnel-install:
${INSTALL_DIR} ${IDIR_HTTPTUNNEL}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/hts ${IDIR_HTTPTUNNEL}/usr/bin/
${INSTALL_BIN} ${WRKINST}/usr/bin/htc ${IDIR_HTTPTUNNEL}/usr/bin/
diff --git a/package/huawei/Makefile b/package/huawei/Makefile
index 37d7c2d..4dedad0 100644
--- a/package/huawei/Makefile
+++ b/package/huawei/Makefile
@@ -17,7 +17,7 @@ NO_DISTFILES:= 1
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,HUAWEI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HUAWEI,huawei,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/i2c-tools/Makefile b/package/i2c-tools/Makefile
index 2e59b09..9fad55e 100644
--- a/package/i2c-tools/Makefile
+++ b/package/i2c-tools/Makefile
@@ -16,11 +16,11 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,I2C_TOOLS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,I2C_TOOLS,i2c-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-post-install:
+i2c-tools-install:
$(INSTALL_DIR) $(IDIR_I2C_TOOLS)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/usr/sbin/i2c* \
$(IDIR_I2C_TOOLS)/usr/sbin
diff --git a/package/icecast/Makefile b/package/icecast/Makefile
index 7c8a248..517e437 100644
--- a/package/icecast/Makefile
+++ b/package/icecast/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://downloads.us.xiph.org/releases/icecast/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ICECAST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ICECAST,icecast,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/libxml2
CONFIGURE_ARGS+= --disable-yp \
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --disable-yp \
--with-theora="no" \
--with-xslt-config="${STAGING_TARGET_DIR}/usr/bin/xslt-config"
-post-install:
+icecast-install:
${INSTALL_DIR} ${IDIR_ICECAST}/etc
${CP} ${WRKINST}/etc/icecast.xml ${IDIR_ICECAST}/etc/
${INSTALL_DIR} ${IDIR_ICECAST}/usr/bin
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index bcff710..2cd4521 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -15,15 +15,19 @@ PKG_URL:= http://id3lib.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=id3lib/}
PKG_NEED_CXX:= 1
PKG_CXX:= ID3LIB
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS+= -fPIC
CONFIGURE_ARGS+= --enable-cxx-warnings=no
+ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc -lgcc
+endif
+
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp -fstack-protector
endif
@@ -36,7 +40,7 @@ else
TARGET_LDFLAGS+= -shared
endif
-post-install:
+id3lib-install:
${INSTALL_DIR} ${IDIR_ID3LIB}/usr/lib
${CP} ${WRKINST}/usr/lib/libid3-*.so* ${IDIR_ID3LIB}/usr/lib/
diff --git a/package/iftop/Makefile b/package/iftop/Makefile
index fdee530..cbe15eb 100644
--- a/package/iftop/Makefile
+++ b/package/iftop/Makefile
@@ -16,9 +16,9 @@ PKG_SITES:= http://www.ex-parrot.com/~pdw/iftop/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IFTOP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IFTOP,iftop,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+iftop-install:
${INSTALL_DIR} ${IDIR_IFTOP}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/sbin/iftop ${IDIR_IFTOP}/usr/bin/
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index d59cffe..ca30d80 100644
--- a/package/igmpproxy/Makefile
+++ b/package/igmpproxy/Makefile
@@ -17,11 +17,11 @@ PKG_CFLINE_IGMPPROXY+= select ADK_KERNEL_IP_MROUTE
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IGMPPROXY,igmpproxy,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS+= -std=gnu99
-post-install:
+igmpproxy-install:
${INSTALL_DIR} ${IDIR_IGMPPROXY}/usr/sbin ${IDIR_IGMPPROXY}/etc
${INSTALL_BIN} ${WRKINST}/usr/sbin/igmpproxy ${IDIR_IGMPPROXY}/usr/sbin
${INSTALL_DATA} ${WRKINST}/etc/igmpproxy.conf ${IDIR_IGMPPROXY}/etc
diff --git a/package/imlib2/Makefile b/package/imlib2/Makefile
index 12deefa..c1c4c4e 100644
--- a/package/imlib2/Makefile
+++ b/package/imlib2/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= imlib2
PKG_VERSION:= 1.4.4
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 20d59c7cda06742015baade6f5975415
PKG_DESCR:= Version 2 of an advanced replacement library for libraries like libXpm
PKG_SECTION:= libs
@@ -13,10 +13,11 @@ PKG_DEPENDS:= libfreetype zlib libpng libtiff
PKG_BUILDDEP:= freetype zlib libpng libtiff
PKG_URL:= http://www.enlightenment.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,IMLIB2,imlib2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IMLIB2,imlib2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
diff --git a/package/installer/Makefile b/package/installer/Makefile
index 5866a96..ed850f0 100644
--- a/package/installer/Makefile
+++ b/package/installer/Makefile
@@ -14,7 +14,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,INSTALLER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,INSTALLER,installer,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/intltool/Makefile b/package/intltool/Makefile
index 611a04d..1206583 100644
--- a/package/intltool/Makefile
+++ b/package/intltool/Makefile
@@ -13,11 +13,11 @@ PKG_SITES:= https://launchpad.net/intltool/trunk/0.50.2/+download/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,INTLTOOL,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,INTLTOOL,intltool,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= PERL="/usr/bin/perl"
-post-install:
+intltool-install:
$(INSTALL_DIR) $(IDIR_INTLTOOL)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/intltool* \
$(IDIR_INTLTOOL)/usr/bin
diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile
index d658cc4..5ee22cb 100644
--- a/package/ipcad/Makefile
+++ b/package/ipcad/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipcad/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPCAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IPCAD,ipcad,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-ifst=linux \
--with-psrc=pcap \
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --with-ifst=linux \
pre-build:
touch $(WRKBUILD)/cfglex.c $(WRKBUILD)/cslex.c
-post-install:
+ipcad-install:
${INSTALL_DIR} ${IDIR_IPCAD}/usr/bin ${IDIR_IPCAD}/etc
${INSTALL_DATA} ${WRKINST}/etc/ipcad.conf ${IDIR_IPCAD}/etc/
${INSTALL_BIN} ${WRKINST}/usr/bin/ipcad ${IDIR_IPCAD}/usr/bin/
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 8956a65..3fc3b03 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -19,7 +19,7 @@ PKG_ARCH_DEPENDS:= !avr32
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CXXFLAGS:= $(filter-out -flto,$(TARGET_CXXFLAGS))
@@ -36,7 +36,7 @@ else
CONFIGURE_ENV+= LIBS="-lc -lm -lgcc_s -lpthread"
endif
-post-install:
+iperf-install:
${INSTALL_DIR} ${IDIR_IPERF}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/iperf ${IDIR_IPERF}/usr/bin
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index ec87284..f383328 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -22,7 +22,7 @@ PKGFD_WITH_IPV6:= enable IPv6 support
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPSEC_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --with-kernel-headers="${LINUX_DIR}/include" \
@@ -38,7 +38,7 @@ else
CONFIGURE_ARGS+= --disable-ipv6
endif
-post-install:
+ipsec-tools-install:
${INSTALL_DIR} ${IDIR_IPSEC_TOOLS}/usr/sbin ${IDIR_IPSEC_TOOLS}/usr/lib
${INSTALL_DIR} ${IDIR_IPSEC_TOOLS}/etc
${INSTALL_DATA} ${WRKBUILD}/src/racoon/samples/racoon.conf \
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 1b2d8a6..741f3ab 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -19,14 +19,14 @@ 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,IPSET,ipset,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= PREFIX=/usr
ALL_TARGET:= binaries
INSTALL_TARGET:= binaries_install
-post-install:
+ipset-install:
${INSTALL_DIR} ${IDIR_IPSET}/usr/sbin ${IDIR_IPSET}/usr/lib/ipset
${INSTALL_BIN} ${WRKINST}/usr/sbin/ipset ${IDIR_IPSET}/usr/sbin
${CP} ${WRKINST}/usr/lib/ipset/*.so ${IDIR_IPSET}/usr/lib/ipset/
diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile
index b6ce099..28aa8c8 100644
--- a/package/iptables-snmp/Makefile
+++ b/package/iptables-snmp/Makefile
@@ -15,11 +15,11 @@ PKG_SITES:= http://www.nobiscuit.com/iptables-snmp/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,IPTABLES_SNMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IPTABLES_SNMP,iptables-snmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
FAKE_FLAGS+= INSTALL_PREFIX="${WRKINST}"
-post-install:
+iptables-snmp-install:
${INSTALL_DIR} ${IDIR_IPTABLES_SNMP}/usr/lib
${CP} ${WRKINST}/usr/lib/iptables-snmp.so ${IDIR_IPTABLES_SNMP}/usr/lib
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index 0d6bc1c..2bcffc7 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ftp://iptraf.seul.org/pub/iptraf/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPTRAF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IPTRAF,iptraf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index 32efe95..6323eed 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -22,7 +22,7 @@ PKGFD_WITH_IPV6:= enable IPv6 support
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IRSSI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-perl=no \
--with-gnu-ld \
@@ -43,7 +43,7 @@ else
CONFIGURE_ARGS+= --disable-ssl
endif
-post-install:
+irssi-install:
${INSTALL_DIR} ${IDIR_IRSSI}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/irssi ${IDIR_IRSSI}/usr/bin/
diff --git a/package/iw/Makefile b/package/iw/Makefile
index 9df0fc0..75c4aa5 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -19,12 +19,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IW,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IW,iw,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
TARGET_CFLAGS+= $(TARGET_CPPFLAGS)
-post-install:
+iw-install:
${INSTALL_DIR} ${IDIR_IW}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/iw ${IDIR_IW}/usr/sbin
diff --git a/package/joe/Makefile b/package/joe/Makefile
index 483b388..8a96bda 100644
--- a/package/joe/Makefile
+++ b/package/joe/Makefile
@@ -5,44 +5,35 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= joe
PKG_VERSION:= 3.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 66de1b073e869ba12abbfcde3885c577
PKG_DESCR:= JOE - Joe's Own Editor
PKG_SECTION:= editor
PKG_URL:= http://joe-editor.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
-PKG_FLAVOURS_JOE:= DOC LANGUAGE SYNTAX
-PKGFD_DOC:= Install documentation
+PKG_FLAVOURS_JOE:= LANGUAGE SYNTAX
PKGFD_LANGUAGE:= Install translation files
PKGFD_SYNTAX:= Install syntax highlighting files
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,JOE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,JOE,joe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+joe-install:
${INSTALL_DIR} ${IDIR_JOE}/usr/bin
${INSTALL_DIR} ${IDIR_JOE}/etc/joe
${CP} ${WRKINST}/usr/bin/* ${IDIR_JOE}/usr/bin
${CP} ${WRKINST}/etc/joe/* ${IDIR_JOE}/etc/joe
-
-ifeq (${ADK_PACKAGE_JOE_DOC},y)
- ${INSTALL_DIR} ${IDIR_JOE}/usr/share/doc
- ${INSTALL_DIR} ${IDIR_JOE}/usr/share/man
- ${CP} ${WRKINST}/usr/share/doc/* ${IDIR_JOE}/usr/share/doc
- ${CP} ${WRKINST}/usr/share/man/* ${IDIR_JOE}/usr/share/man
-endif
-
ifeq (${ADK_PACKAGE_JOE_LANGUAGE},y)
${INSTALL_DIR} ${IDIR_JOE}/usr/share/joe/lang
${CP} ${WRKINST}/usr/share/joe/lang/* ${IDIR_JOE}/usr/share/joe/lang
endif
-
ifeq (${ADK_PACKAGE_JOE_SYNTAX},y)
${INSTALL_DIR} ${IDIR_JOE}/usr/share/joe/syntax
${INSTALL_DIR} ${IDIR_JOE}/usr/share/joe/charmaps
${CP} ${WRKINST}/usr/share/joe/syntax/* ${IDIR_JOE}/usr/share/joe/syntax
${CP} ${WRKINST}/usr/share/joe/charmaps/* ${IDIR_JOE}/usr/share/joe/charmaps
endif
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile
index 04eed7b..cd7763c 100644
--- a/package/jpeg/Makefile
+++ b/package/jpeg/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= The Independent JPEG Groups JPEG runtime library
PKG_SECTION:= libs
PKG_URL:= http://www.ijg.org/
PKG_SITES:= http://www.ijg.org/files/
+PKG_LIBNAME:= libjpeg
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz
diff --git a/package/kexecinit/Makefile b/package/kexecinit/Makefile
index ef04259..06aa301 100644
--- a/package/kexecinit/Makefile
+++ b/package/kexecinit/Makefile
@@ -14,7 +14,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,KEXECINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KEXECINIT,kexecinit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/keychain/Makefile b/package/keychain/Makefile
index 81cad89..55450d8 100644
--- a/package/keychain/Makefile
+++ b/package/keychain/Makefile
@@ -16,7 +16,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,KEYCHAIN,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KEYCHAIN,keychain,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/keyutils/Makefile b/package/keyutils/Makefile
index d824afc..e13e8ee 100644
--- a/package/keyutils/Makefile
+++ b/package/keyutils/Makefile
@@ -10,16 +10,16 @@ PKG_MD5SUM:= 4c89b350eab1c361af8cb5343961056a
PKG_DESCR:= set of utilities for managing the key retention facility in the kernel
PKG_SECTION:= libs
PKG_SITES:= http://people.redhat.com/dhowells/keyutils/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,KEYUTILS,keyutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KEYUTILS,keyutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
INSTALL_TARGET:= libinstall
-#INSTALL_STYLE:= manual
keyutils-install:
$(INSTALL_DIR) $(IDIR_KEYUTILS)/usr/lib
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index df26559..b5aa3de 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= kismet
PKG_VERSION:= 2011-01-R1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 1fb1f024a7ca52814b255e2f2faccf3b
PKG_DESCR:= Kismet
PKG_SECTION:= wifi
@@ -32,15 +32,21 @@ CONFIGURE_ARGS+= --sysconfdir=/etc/kismet
pre-build:
(cd ${WRKBUILD} && ${MAKE} dep);
-post-install:
+kismet-install:
${INSTALL_DIR} ${IDIR_KISMET}/usr/bin/
${INSTALL_BIN} ${WRKINST}/usr/bin/kismet ${IDIR_KISMET}/usr/bin/kismet
+
+kismet-client-install:
${INSTALL_DIR} ${IDIR_KISMET_CLIENT}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_client \
${IDIR_KISMET_CLIENT}/usr/bin/
+
+kismet-drone-install:
${INSTALL_DIR} ${IDIR_KISMET_DRONE}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_drone \
${IDIR_KISMET_DRONE}/usr/bin/
+
+kismet-server-install:
${INSTALL_DIR} ${IDIR_KISMET_SERVER}/usr/bin
${INSTALL_DIR} ${IDIR_KISMET_SERVER}/etc/kismet
${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_server \
diff --git a/package/kmod/Makefile b/package/kmod/Makefile
index 1f98e09..2baf63a 100644
--- a/package/kmod/Makefile
+++ b/package/kmod/Makefile
@@ -11,12 +11,13 @@ PKG_DESCR:= kernel module loading library
PKG_SECTION:= libs
PKG_URL:= http://profusion.mobi/index.php
PKG_SITES:= http://packages.profusion.mobi/kmod/
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,KMOD,kmod,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD,kmod,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
kmod-install:
$(INSTALL_DIR) $(IDIR_KMOD)/usr/bin
diff --git a/package/knock/Makefile b/package/knock/Makefile
index 7567fd8..91bd347 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -24,9 +24,11 @@ $(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_K
CONFIGURE_ENV+= ac_cv_lib_pcap_pcap_open_live=yes
-post-install:
+knock-install:
${INSTALL_DIR} ${IDIR_KNOCK}/usr/bin
${CP} ${WRKINST}/usr/bin/knock ${IDIR_KNOCK}/usr/bin/
+
+knockd-install:
${INSTALL_DIR} ${IDIR_KNOCKD}/etc
install -m0600 ${WRKINST}/etc/knockd.conf ${IDIR_KNOCKD}/etc/
${INSTALL_DIR} ${IDIR_KNOCKD}/usr/sbin
diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile
index 852d408..d48ec3e 100644
--- a/package/l2tpns/Makefile
+++ b/package/l2tpns/Makefile
@@ -16,11 +16,11 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=l2tpns/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,L2TPNS,l2tpns,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-post-install:
+l2tpns-install:
${INSTALL_DIR} ${IDIR_L2TPNS}/etc/l2tpns
${CP} ${WRKINST}/etc/l2tpns/* ${IDIR_L2TPNS}/etc/l2tpns/
${INSTALL_DIR} ${IDIR_L2TPNS}/usr/lib/l2tpns
diff --git a/package/lame/Makefile b/package/lame/Makefile
index a754977..1e0a086 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -10,17 +10,24 @@ PKG_MD5SUM:= 8e9866ad6b570c6c95c8cba48060473f
PKG_DESCR:= LAME MP3 encoder
PKG_SECTION:= multimedia
PKG_DEPENDS:= libncurses
+PKG_BUILDDEP:= ncurses
PKG_URL:= http://lame.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/}
+PKG_LIBNAME:= libmp3lame
+PKG_OPTS:= dev
PKG_SUBPKGS:= LAME LIBMP3LAME
PKGSD_LIBMP3LAME:= LAME MP3 encoding library
PKGSC_LIBMP3LAME:= libs
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBMP3LAME,libmp3lame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBMP3LAME},${PKGSC_LIBMP3LAME}))
+$(eval $(call PKG_template,LIBMP3LAME,libmp3lame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBMP3LAME},${PKGSC_LIBMP3LAME},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
diff --git a/package/less/Makefile b/package/less/Makefile
index 308b774..734fc86 100644
--- a/package/less/Makefile
+++ b/package/less/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://www.greenwoodsoftware.com/less/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LESS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LESS,less,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
less-install:
${INSTALL_DIR} ${IDIR_LESS}/usr/bin
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index 1c9f626..aab0331 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= Inter-Client Exchange library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xtrans xproto
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libice
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index aae9668..983d6b8 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:= glib
PKG_BUILDDEP:= glib
PKG_URL:= http://www.gnome.org/
PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
+PKG_LIBNAME:= libidl
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index b10c500..4b9a9ea 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= x11/libs
PKG_DEPENDS:= libuuid
PKG_BUILDDEP:= libICE util-linux
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libsm
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 3a27d72..6b55940 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -13,6 +13,7 @@ PKG_BUILDDEP:= xproto xextproto xtrans libXdmcp libXau xcb-proto
PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto libxcb
PKG_DEPENDS:= libxdmcp libxcb libxau
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libx11
PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile
index 1d36524..57ad707 100644
--- a/package/libXScrnSaver/Makefile
+++ b/package/libXScrnSaver/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= x11/libs
PKG_BUILDDEP:= scrnsaverproto libXext
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxscrnsaver
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index b4633de..ad7ff60 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X11 authorisation library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxau
PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index 65d3f96..7b4b655 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X11 Athena Widget library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXext libXmu libXpm
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxaw
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile
index 4ca0500..f9ad054 100644
--- a/package/libXcomposite/Makefile
+++ b/package/libXcomposite/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X composite library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 compositeproto libXfixes
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxcomposite
PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXcursor/Makefile b/package/libXcursor/Makefile
index 286f5bf..0693852 100644
--- a/package/libXcursor/Makefile
+++ b/package/libXcursor/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= xcursor library
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_BUILDDEP:= libXfixes libXrender
+PKG_LIBNAME:= libxcursor
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile
index c301fc9..4323367 100644
--- a/package/libXdamage/Makefile
+++ b/package/libXdamage/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X Window System client interface to the DAMAGE extension to the X p
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXfixes damageproto
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxdamage
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index 1e27317..3f30ae7 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X11 display manager control protocol library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxdmcp
PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 2713ecb..1d60bab 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X client interface to extensions of the X protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 xextproto
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxext
PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile
index 99c61af..3edab31 100644
--- a/package/libXfixes/Makefile
+++ b/package/libXfixes/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= x11/libs
PKG_BUILDDEP:= fixesproto xextproto xproto libX11
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxfixes
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 52a35c7..b86b8a5 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= x11/libs
PKG_DEPENDS:= libfreetype
PKG_BUILDDEP:= freetype fontcacheproto fontsproto libfontenc xtrans
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxfont
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index 100b9e3..fe2d187 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X FreeType library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXrender fontconfig
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxft
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 132317e..0e204f0 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto xextproto libXext
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxi
PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile
index 2f7e2f8..ffef8c8 100644
--- a/package/libXinerama/Makefile
+++ b/package/libXinerama/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= Xinerama library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xineramaproto
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxinerama
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index 50a8089..02c72fc 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= miscellaneous utility functions for X libraries
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXt libXext
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxmu
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXp/Makefile b/package/libXp/Makefile
index 343b443..443e365 100644
--- a/package/libXp/Makefile
+++ b/package/libXp/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X Print library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXext printproto
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxp
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index 49cd986..22d8935 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= common operation for the XPM pixmap format
PKG_BUILDDEP:= libX11 libXt
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxpm
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXrandr/Makefile b/package/libXrandr/Makefile
index 25ba700..e27fc16 100644
--- a/package/libXrandr/Makefile
+++ b/package/libXrandr/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:= Xrandr library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= randrproto
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxrandr
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index 5cc8414..75c3fbf 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X11 rendering library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= renderproto libX11
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxrender
PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 6d21536..4e4e8a8 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= x11/libs
PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb
PKG_BUILDDEP:= libSM libX11 kbproto
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxt
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile
index 760fdd2..5a9c077 100644
--- a/package/libXtst/Makefile
+++ b/package/libXtst/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= Xtst library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= recordproto libXi
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxtst
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 5210223..ed8473b 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= X11 Xvideo extensions library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 videoproto libXext
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxv
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile
index 9561b34..6ac4edc 100644
--- a/package/libXxf86dga/Makefile
+++ b/package/libXxf86dga/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= client library for the XFree86-DGA extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xf86dgaproto libXext libXaw
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxxf86dga
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile
index 96f25af..c7b0f34 100644
--- a/package/libXxf86vm/Makefile
+++ b/package/libXxf86vm/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= an interface to the XFree86-VidModeExtension extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xf86vidmodeproto libXext
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_LIBNAME:= libxxf86vm
PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
diff --git a/package/libcapi20/Makefile b/package/libcapi20/Makefile
index 6120991..2afe962 100644
--- a/package/libcapi20/Makefile
+++ b/package/libcapi20/Makefile
@@ -19,7 +19,7 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBCAPI20,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBCAPI20,libcapi20,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
pre-install:
${INSTALL_DIR} ${WRKINST}/usr/lib
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 191d1f6..5f303bd 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -34,13 +34,5 @@ else
${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
endif
endif
-ifeq ($(ADK_TARGET_MULTILIB_X86_32),y)
- ${INSTALL_DIR} ${IDIR_LIBGCC}/lib32
- ${CP} ${STAGING_TARGET_DIR_32}/lib/libgcc*.so* ${IDIR_LIBGCC}/lib32
-endif
-ifeq ($(ADK_TARGET_MULTILIB_X86_X32),y)
- ${INSTALL_DIR} ${IDIR_LIBGCC}/libx32
- ${CP} ${STAGING_TARGET_DIR_X32}/lib/libgcc*.so* ${IDIR_LIBGCC}/libx32
-endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index 02eeef9..4e6105e 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:= libjpeg libpng
PKG_BUILDDEP:= libpng jpeg
PKG_URL:= http://www.libgd.org/
PKG_SITES:= http://www.libgd.org/releases/
+PKG_LIBNAME:= libgd
PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index b95d294..37955a7 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= a real-time data compression library
PKG_SECTION:= libs
PKG_URL:= http://www.oberhumer.com/opensource/lzo
PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/
+PKG_LIBNAME:= liblzo
PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 13983d1..41934bd 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -15,7 +15,7 @@ PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBMAD,libmad,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
FPM:=default
ifeq (${ARCH},i386)
diff --git a/package/libpri/Makefile b/package/libpri/Makefile
index 8c0ae28..341b879 100644
--- a/package/libpri/Makefile
+++ b/package/libpri/Makefile
@@ -15,7 +15,7 @@ PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPRI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBPRI,libpri,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index cdc2fe9..764730c 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -27,8 +27,6 @@ PKG_OPTS:= noremove
NO_DISTFILES:= 1
-PKG_SUBPKGS:= LIBPTHREAD
-
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
endif
diff --git a/package/librt/Makefile b/package/librt/Makefile
index 17327a6..f26e2ad 100644
--- a/package/librt/Makefile
+++ b/package/librt/Makefile
@@ -24,8 +24,6 @@ PKG_OPTS:= noremove
NO_DISTFILES:= 1
-PKG_SUBPKGS:= LIBRT
-
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
endif
diff --git a/package/libssp/Makefile b/package/libssp/Makefile
index 4f43bb4..161da53 100644
--- a/package/libssp/Makefile
+++ b/package/libssp/Makefile
@@ -24,8 +24,6 @@ PKG_OPTS:= noremove
NO_DISTFILES:= 1
-PKG_SUBPKGS:= LIBSSP
-
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
endif
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index f9298a0..bfd6c1f 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -17,6 +17,10 @@ PKG_OPTS:= dev
PKG_SUBPKGS:= LIBTOOL LIBLTDL
PKGSC_LIBLTDL:= libs
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index 365aa59..9772b76 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= a library for accessing Linux USB devices
PKG_SECTION:= libs
PKG_URL:= http://libusb.wiki.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusbx/}
+PKG_LIBNAME:= libusb
PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index 91dbe7c..ba6d72c 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -15,7 +15,7 @@ PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXCB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
include $(TOPDIR)/mk/python.mk
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 182469e..6b48226 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -20,6 +20,10 @@ PKGSD_LIBXML2_PYTHON:= XML python bindings
PKGSC_LIBXML2_PYTHON:= libs
PKGSB_LIBXML2_PYTHON:= python2
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index ad2b374..3a34c5a 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -20,6 +20,10 @@ PKG_SUBPKGS:= LIBXSLT XSLTPROC
PKGSD_XSLTPROC:= XSLT processor utility
PKGSC_XSLTPROC:= misc
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/links/Makefile b/package/links/Makefile
index 3182d64..f2cdf6b 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -21,7 +21,7 @@ PKGFB_WITH_DIRECTFB:= DirectFB
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LINKS,links,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --enable-graphics \
--with-fb \
@@ -38,7 +38,7 @@ else
CONFIGURE_ARGS+= --without-directfb
endif
-post-install:
+links-install:
${INSTALL_DIR} ${IDIR_LINKS}/usr/bin
${CP} ${WRKINST}/usr/bin/* ${IDIR_LINKS}/usr/bin
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 525f14b..8e40dcf 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= linux-atm
PKG_VERSION:= 2.5.1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 9560b0e1f410a05b849dfdab465dd758
PKG_DESCR:= ATM library for Linux
PKG_SECTION:= libs
@@ -24,6 +24,10 @@ PKGSC_BR2684CTL:= route
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/llvm/Makefile b/package/llvm/Makefile
index c30fa8b..10a00d7 100644
--- a/package/llvm/Makefile
+++ b/package/llvm/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= lang
PKG_URL:= http://llvm.org/
PKG_SITES:= http://llvm.org/releases/3.3/
-PKG_CFLINE_LLVM:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_LIBC_DEPENDS:= eglibc glibc musl
PKG_HOST_DEPENDS:= !darwin
PKG_ARCH_DEPENDS:= mips x86 x86_64 arm
@@ -45,7 +45,4 @@ do-install:
cp ${WRKBUILD}/BuildTools/BuildTools/Release+Asserts/bin/llvm-config \
$(STAGING_TARGET_DIR)/usr/bin
-llvm-install:
- $(INSTALL_DIR) $(IDIR_LLVM)/usr/bin
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile
index 2751c44..f32cdea 100644
--- a/package/lm_sensors/Makefile
+++ b/package/lm_sensors/Makefile
@@ -23,6 +23,10 @@ PKGSC_LM_SENSORS_DETECT:= misc
PKGSS_LM_SENSORS_DETECT:= perl
PKGSB_LM_SENSORS_DETECT:= perl
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LM_SENSORS,lm-sensors,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile
index 1d0a69a..32ced2e 100644
--- a/package/logrotate/Makefile
+++ b/package/logrotate/Makefile
@@ -15,12 +15,12 @@ PKG_SITES:= https://fedorahosted.org/releases/l/o/logrotate/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LOGROTATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LOGROTATE,logrotate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
TARGET_CFLAGS+= -D_GNU_SOURCE -DVERSION=\"$(PKG_VERSION)\"
-post-install:
+logrotate-install:
${INSTALL_DIR} ${IDIR_LOGROTATE}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/logrotate ${IDIR_LOGROTATE}/usr/sbin
${INSTALL_DIR} ${IDIR_LOGROTATE}/etc/logrotate.d
diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile
index e6cb5ac..cb3680a 100644
--- a/package/lrzsz/Makefile
+++ b/package/lrzsz/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://www.ohse.de/uwe/releases/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LRZSZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LRZSZ,lrzsz,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
diff --git a/package/lsof/Makefile b/package/lsof/Makefile
index c5ede48..54e9c1c 100644
--- a/package/lsof/Makefile
+++ b/package/lsof/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LSOF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LSOF,lsof,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= minimal
CONFIGURE_PROG:= Configure
diff --git a/package/lua/Makefile b/package/lua/Makefile
index e764772..adb63f2 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -34,11 +34,15 @@ MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} -DLUA_USE_LINUX -fPIC"
XAKE_FLAGS+= INSTALL_TOP="${WRKINST}/usr"
ALL_TARGET:= linux
-post-install:
+lua-install:
${INSTALL_DIR} ${IDIR_LUA}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/lua ${IDIR_LUA}/usr/bin/
+
+luac-install:
${INSTALL_DIR} ${IDIR_LUAC}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/luac ${IDIR_LUAC}/usr/bin/
+
+lua-examples-install:
${INSTALL_DIR} ${IDIR_LUA_EXAMPLES}/usr/share/lua/examples
${INSTALL_DATA} ${WRKBUILD}/test/*.lua \
${IDIR_LUA_EXAMPLES}/usr/share/lua/examples/
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 3dc4e38..60927ab 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -24,6 +24,10 @@ PKGSC_LIBDEVMAPPER:= libs
DISTFILES:= LVM2.${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 55f5956..77cb6ef 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -21,7 +21,7 @@ WRKDIST= ${WRKDIR}/lynx2-8-7
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LYNX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/include/openssl
TARGET_CPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+= \
--with-build-cppflags="-I/usr/include/ncurses"
MAKE_FILE:= makefile
-post-install:
+lynx-install:
${INSTALL_DIR} ${IDIR_LYNX}/etc ${IDIR_LYNX}/usr/bin
${CP} ${WRKINST}/etc/lynx.{cfg,lss} ${IDIR_LYNX}/etc
${CP} ${WRKINST}/usr/bin/lynx ${IDIR_LYNX}/usr/bin
diff --git a/package/lzop/Makefile b/package/lzop/Makefile
index 9ffb44d..f939092 100644
--- a/package/lzop/Makefile
+++ b/package/lzop/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://www.lzop.org/download/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LZOP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LZOP,lzop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
lzop-install:
$(INSTALL_DIR) $(IDIR_LZOP)/usr/bin
diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile
index 54c8f3b..e3a250a 100755
--- a/package/macchanger/Makefile
+++ b/package/macchanger/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= ${MASTER_SITE_GNU:=macchanger/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MACCHANGER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MACCHANGER,macchanger,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+macchanger-install:
${INSTALL_DIR} ${IDIR_MACCHANGER}/usr/bin ${IDIR_MACCHANGER}/usr/share
${INSTALL_BIN} ${WRKINST}/usr/bin/macchanger ${IDIR_MACCHANGER}/usr/bin
${CP} ${WRKINST}/usr/share/macchanger ${IDIR_MACCHANGER}/usr/share
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index 614264b..e146ce9 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -19,7 +19,7 @@ PKG_ARCH_DEPENDS:= !m68k
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MADPLAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${CC_FOR_BUILD} \
LIBS="-lz" \
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --disable-debugging \
--without-esd \
--with-alsa
-post-install:
+madplay-install:
${INSTALL_DIR} ${IDIR_MADPLAY}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/madplay ${IDIR_MADPLAY}/usr/bin/
diff --git a/package/make/Makefile b/package/make/Makefile
index ab8a929..3606076 100644
--- a/package/make/Makefile
+++ b/package/make/Makefile
@@ -16,7 +16,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,MAKE,make,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+make-install:
$(INSTALL_DIR) $(IDIR_MAKE)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/make $(IDIR_MAKE)/usr/bin
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index b6bdfe6..401ea71 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -16,7 +16,7 @@ PKG_NOPARALLEL:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MARADNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MARADNS,maradns,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
FAKE_FLAGS+= PREFIX="${WRKINST}/usr" \
@@ -28,7 +28,7 @@ pre-install:
do-configure:
(cd ${WRKBUILD} && ./configure);
-post-install:
+maradns-install:
${INSTALL_DIR} ${IDIR_MARADNS}/etc/maradns
${INSTALL_DIR} ${IDIR_MARADNS}/usr/bin ${IDIR_MARADNS}/usr/sbin
${INSTALL_DATA} ./files/mararc ${IDIR_MARADNS}/etc/mararc
diff --git a/package/mc/Makefile b/package/mc/Makefile
index 4185af1..8bfa219 100644
--- a/package/mc/Makefile
+++ b/package/mc/Makefile
@@ -17,7 +17,7 @@ PKG_NOPARALLEL:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --enable-charset \
--disable-extcharset \
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --enable-charset \
CONFIGURE_ENV+= mc_cv_have_zipinfo=yes \
am_cv_func_iconv=no
-post-install:
+mc-install:
${INSTALL_DIR} ${IDIR_MC}/etc/mc
${INSTALL_DIR} ${IDIR_MC}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/mc ${IDIR_MC}/usr/bin/
diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile
index 52d46e3..522a57f 100644
--- a/package/mdadm/Makefile
+++ b/package/mdadm/Makefile
@@ -14,13 +14,13 @@ PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/raid/mdadm/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MDADM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MDADM,mdadm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= CROSS_COMPILE="${TARGET_CROSS}"
-post-install:
+mdadm-install:
${INSTALL_DIR} ${IDIR_MDADM}/usr/sbin
${INSTALL_BIN} ${WRKINST}/sbin/mdadm ${IDIR_MDADM}/usr/sbin
diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile
index 55655c6..814f0bb 100644
--- a/package/mgetty/Makefile
+++ b/package/mgetty/Makefile
@@ -16,7 +16,7 @@ DISTFILES:= ${PKG_NAME}${PKG_VERSION}-${PKG_XVERSION}.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MGETTY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MGETTY,mgetty,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/miau/Makefile b/package/miau/Makefile
index b63ac5d..fd9a12e 100644
--- a/package/miau/Makefile
+++ b/package/miau/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=miau/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MIAU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MIAU,miau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --enable-automode \
--enable-releasenick \
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --enable-automode \
--enable-privlog \
--enable-onconnect
-post-install:
+miau-install:
${INSTALL_DIR} ${IDIR_MIAU}/usr/bin ${IDIR_MIAU}/etc/miau
${INSTALL_BIN} ${WRKINST}/usr/bin/miau ${IDIR_MIAU}/usr/bin/
${INSTALL_DATA} ./files/miaurc ${IDIR_MIAU}/etc/miau/
diff --git a/package/miax/Makefile b/package/miax/Makefile
index 37e23eb..5819095 100644
--- a/package/miax/Makefile
+++ b/package/miax/Makefile
@@ -21,7 +21,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MIAX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MIAX,miax,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/microperl/Makefile b/package/microperl/Makefile
index 3ca5891..e8253ab 100644
--- a/package/microperl/Makefile
+++ b/package/microperl/Makefile
@@ -19,7 +19,7 @@ WRKDIST= ${WRKDIR}/perl-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MICROPERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MICROPERL,microperl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile
index a9ad777..9c19df7 100644
--- a/package/mini_sendmail/Makefile
+++ b/package/mini_sendmail/Makefile
@@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/mini_sendmail-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MINI_SENDMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MINI_SENDMAIL,mini-sendmail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index 9a70d0f..66fdcde 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --without-Judy \
XAKE_FLAGS+= CXXLINK="\$${LINK}" \
-post-install:
+miredo-install:
${INSTALL_DIR} ${IDIR_MIREDO}/etc/miredo ${IDIR_MIREDO}/usr/sbin
${INSTALL_DIR} ${IDIR_MIREDO}/usr/lib
${INSTALL_DATA} ${WRKINST}/etc/miredo/miredo.conf \
@@ -37,6 +37,8 @@ post-install:
${CP} ${WRKINST}/usr/lib/libtun*.so* ${IDIR_MIREDO}/usr/lib
${CP} ${WRKINST}/usr/lib/libteredo.so* ${IDIR_MIREDO}/usr/lib
${INSTALL_BIN} ${WRKINST}/usr/sbin/miredo ${IDIR_MIREDO}/usr/sbin/
+
+miredo-server-install:
${INSTALL_DIR} ${IDIR_MIREDO_SERVER}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/miredo-server \
${IDIR_MIREDO_SERVER}/usr/sbin/
diff --git a/package/mkfontdir/Makefile b/package/mkfontdir/Makefile
index 1c66d3d..8671e92 100644
--- a/package/mkfontdir/Makefile
+++ b/package/mkfontdir/Makefile
@@ -15,9 +15,9 @@ PKG_OPTS:= noscripts
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,MKFONTDIR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,MKFONTDIR,mkfontdir,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+mkfontdir-install:
$(INSTALL_DIR) $(IDIR_MKFONTDIR)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/mkfontdir \
$(IDIR_MKFONTDIR)/usr/bin
diff --git a/package/mkfontscale/Makefile b/package/mkfontscale/Makefile
index e40bec0..8457ff0 100644
--- a/package/mkfontscale/Makefile
+++ b/package/mkfontscale/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,MKFONTSCALE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MKFONTSCALE,mkfontscale,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+mkfontscale-install:
$(INSTALL_DIR) $(IDIR_MKFONTSCALE)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/mkfontscale \
$(IDIR_MKFONTSCALE)/usr/bin
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index acbf304..1c18044 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -20,7 +20,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MKSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),)
TARGET_CPPFLAGS+= -DMKSH_SMALL=1
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 30b0f12..2b385c9 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MOC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MOC,moc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --without-jack \
--without-oss \
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --without-jack \
--without-ffmpeg \
--without-sndfile
-post-install:
+moc-install:
${INSTALL_DIR} ${IDIR_MOC}/usr/bin
${INSTALL_DIR} ${IDIR_MOC}/usr/lib/moc/decoder_plugins
${CP} ${WRKINST}/usr/lib/moc/decoder_plugins/*.so \
diff --git a/package/motion/Makefile b/package/motion/Makefile
index 78bb0b6..e2974e1 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -19,7 +19,7 @@ PKG_ARCH_DEPENDS:= !m68k
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MOTION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --without-ffmpeg \
--without-jpeg-mmx \
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --without-ffmpeg \
--without-pgsql \
--with-v4l
-post-install:
+motion-install:
${INSTALL_DIR} ${IDIR_MOTION}/etc ${IDIR_MOTION}/usr/bin
$(INSTALL_DATA) ./files/motion.conf ${IDIR_MOTION}/etc
${INSTALL_BIN} ${WRKINST}/usr/bin/motion ${IDIR_MOTION}/usr/bin
diff --git a/package/mpc/Makefile b/package/mpc/Makefile
index 81cdea1..bd5d240 100644
--- a/package/mpc/Makefile
+++ b/package/mpc/Makefile
@@ -18,12 +18,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,MPC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MPC,mpc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-iconv
CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no
-post-install:
+mpc-install:
$(INSTALL_DIR) $(IDIR_MPC)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/mpc \
$(IDIR_MPC)/usr/bin
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 5b211bb..93176ee 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -105,7 +105,7 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE
TARGET_CFLAGS+= -std=gnu99
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index f66d177..f7b69e7 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -20,12 +20,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,MPG123,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MPG123,mpg123,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-shared \
--with-default-audio=alsa
-post-install:
+mpg123-install:
$(INSTALL_DIR) $(IDIR_MPG123)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/mpg123 \
$(IDIR_MPG123)/usr/bin
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index c9757ac..c4a6872 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -32,7 +32,7 @@ PKGFB_WITH_DIRECTFB:= DirectFB
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MPLAYER,mplayer,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
# gcc 4.5 produces internal compiler error with -Os
@@ -150,7 +150,7 @@ CONFIGURE_ARGS:= --prefix=/usr \
XAKE_FLAGS+= AR="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib"
TARGET_LDFLAGS+= -lxvidcore -lX11 -lXext -lvorbis
-post-install:
+mplayer-install:
${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin
${CP} ${WRKINST}/usr/bin/mplayer ${IDIR_MPLAYER}/usr/bin
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 783a03c..909a735 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -20,11 +20,14 @@ WRKBUILD= ${WRKSRC}/src
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MRD6,mrd6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
+ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
LIBRARIES:=-nodefaultlibs -luClibc++
+endif
+
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp -lssp_nonshared
endif
@@ -36,7 +39,7 @@ TARGET_LDFLAGS+= -shared ${LIBRARIES}
endif
XAKE_FLAGS+= EXTRA_FLAGS="${TARGET_CFLAGS}"
-post-install:
+mrd6-install:
${INSTALL_DIR} ${IDIR_MRD6}/usr/sbin ${IDIR_MRD6}/etc
${INSTALL_DIR} ${IDIR_MRD6}/usr/lib/mrd6 ${IDIR_MRD6}/usr/bin
${INSTALL_DATA} ./files/${PKG_NAME}.conf ${IDIR_MRD6}/etc
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index f1cfa62..7303c86 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mt-daapd/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MT_DAAPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MT_DAAPD,mt-daapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# uClibc setpgrp does not take arguments
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --enable-mdns \
--without-static-libs
TARGET_LDFLAGS+= -pthread
-post-install:
+mt-daapd-install:
${INSTALL_DIR} ${IDIR_MT_DAAPD}/etc ${IDIR_MT_DAAPD}/usr/{share,sbin}
${INSTALL_DATA} ${WRKBUILD}/contrib/mt-daapd.conf \
${IDIR_MT_DAAPD}/etc/
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index e7a5e21..d3db1d1 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -16,7 +16,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MTD,mtd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index 26803c3..e0a3d58 100644
--- a/package/mtr/Makefile
+++ b/package/mtr/Makefile
@@ -16,12 +16,12 @@ PKG_SITES:= ftp://ftp.bitwizard.nl/mtr/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MTR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_lib_resolv_res_mkquery=yes
CONFIGURE_ARGS+= --without-gtk
-post-install:
+mtr-install:
${INSTALL_DIR} ${IDIR_MTR}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/mtr ${IDIR_MTR}/usr/sbin/
diff --git a/package/musl/Makefile b/package/musl/Makefile
index b1f4ddb..ad7ec66 100644
--- a/package/musl/Makefile
+++ b/package/musl/Makefile
@@ -4,6 +4,7 @@
include $(TOPDIR)/rules.mk
include $(TOPDIR)/toolchain/musl/Makefile.inc
+PKG_NAME:= musl
PKG_DESCR:= embedded C library
PKG_SECTION:= base
PKG_OPTS:= noremove
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index ec0a841..6d46125 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mutt/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MUTT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MUTT,mutt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --includedir=${WRKBUILD}/. \
--oldincludedir=${WRKBUILD}/. \
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --includedir=${WRKBUILD}/. \
--enable-imap \
--with-ssl
-post-install:
+mutt-install:
${INSTALL_DIR} ${IDIR_MUTT}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/mutt ${IDIR_MUTT}/usr/bin/
ifeq (${ADK_PACKAGE_GPG},y)
diff --git a/package/mxml/Makefile b/package/mxml/Makefile
index c64a58f..afba8d1 100755
--- a/package/mxml/Makefile
+++ b/package/mxml/Makefile
@@ -11,12 +11,12 @@ PKG_DESCR:= lightweight XML library
PKG_SECTION:= libs
PKG_URL:= http://www.minixml.org/
PKG_SITES:= http://ftp.easysw.com/pub/mxml/2.6/
-
-PKG_SUBPKGS:= LIBMXML
+PKG_LIBNAME:= libmxml
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBMXML,libmxml,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMXML,libmxml,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
FAKE_FLAGS+= BUILDROOT=${WRKINST}
diff --git a/package/nand/Makefile b/package/nand/Makefile
index 4680299..da66808 100644
--- a/package/nand/Makefile
+++ b/package/nand/Makefile
@@ -16,7 +16,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NAND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NAND,nand,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/nano/Makefile b/package/nano/Makefile
index af87dd3..42bb647 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -19,7 +19,7 @@ PKGFD_TINY:= tiny nano
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NANO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NANO,nano,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_header_regex_h=no
CONFIGURE_ARGS+= --enable-nanorc \
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --disable-browser \
--enable-multibuffer
endif
-post-install:
+nano-install:
${INSTALL_DIR} ${IDIR_NANO}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/nano ${IDIR_NANO}/usr/bin/
${INSTALL_DIR} ${IDIR_NANO}/etc
diff --git a/package/nasm/Makefile b/package/nasm/Makefile
index 23cbfec..93e50f3 100644
--- a/package/nasm/Makefile
+++ b/package/nasm/Makefile
@@ -14,11 +14,11 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nasm/nasm%20sources/2.07/}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,NASM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
FAKE_FLAGS+= INSTALLROOT=${WRKINST}
-post-install:
+nasm-install:
$(INSTALL_DIR) $(IDIR_NASM)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/nasm \
$(IDIR_NASM)/usr/bin
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile
index 2000067..5e044de 100644
--- a/package/ndisc/Makefile
+++ b/package/ndisc/Makefile
@@ -24,11 +24,15 @@ $(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RE
MAKE_FLAGS+= CC="${TARGET_CC}"
-post-install:
+ndisc6-install:
${INSTALL_DIR} ${IDIR_NDISC6}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/ndisc6 ${IDIR_NDISC6}/usr/bin/
+
+rdisc6-install:
${INSTALL_DIR} ${IDIR_RDISC6}/usr/bin
- ${INSTALL_BIN} ${WRKINST}//usr/bin/rdisc6 ${IDIR_RDISC6}/usr/bin/
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/rdisc6 ${IDIR_RDISC6}/usr/bin/
+
+tcptraceroute6-install:
${INSTALL_DIR} ${IDIR_TCPTRACEROUTE6}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/tcptraceroute6 \
${IDIR_TCPTRACEROUTE6}/usr/bin/
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 191caa5..07c90a0 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:= libelf libnl
PKG_URL:= http://www.net-snmp.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
PKG_NOPARALLEL:= 1
+PKG_LIBNAME:= libnetsnmp
+PKG_OPTS:= dev
PKG_SUBPKGS:= SNMPD SNMP_UTILS LIBNETSNMP
PKGSD_SNMP_UTILS:= SNMP utilities
@@ -25,11 +27,15 @@ PKGSC_LIBNETSNMP:= libs
PKG_FLAVOURS_SNMPD:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SNMP_UTILS},${PKGSD_SNMP_UTILS},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBNETSNMP},${PKGSD_LIBNETSNMP},${PKGSC_LIBNETSNMP}))
+$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBNETSNMP},${PKGSD_LIBNETSNMP},${PKGSC_LIBNETSNMP},${PKG_OPTS}))
SNMP_TRANSPORTS_INCLUDED:= UDP TCP Callback Unix
SNMP_TRANSPORTS_EXCLUDED:= Alias
diff --git a/package/netcat/Makefile b/package/netcat/Makefile
index 3171cbc..843b51a 100644
--- a/package/netcat/Makefile
+++ b/package/netcat/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=netcat/}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,NETCAT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NETCAT,netcat,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+netcat-install:
$(INSTALL_DIR) $(IDIR_NETCAT)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/netcat \
$(IDIR_NETCAT)/usr/bin
diff --git a/package/netperf/Makefile b/package/netperf/Makefile
index 6ee21da..f6095a0 100644
--- a/package/netperf/Makefile
+++ b/package/netperf/Makefile
@@ -14,12 +14,12 @@ PKG_SITES:= ftp://ftp.netperf.org/netperf/archive/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NETPERF,${PKG_NAME},${PKG_VERSION}${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NETPERF,netperf,${PKG_VERSION}${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# uClibc setpgrp does not take arguments
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
-post-install:
+netperf-install:
${INSTALL_DIR} ${IDIR_NETPERF}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/netperf ${IDIR_NETPERF}/usr/bin/
${INSTALL_BIN} ${WRKINST}/usr/bin/netserver ${IDIR_NETPERF}/usr/bin/
diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile
index cc39286..bde8d9a 100644
--- a/package/netstat-nat/Makefile
+++ b/package/netstat-nat/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= http://www.tweegy.nl/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NETSTAT_NAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NETSTAT_NAT,netstat-nat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+netstat-nat-install:
${INSTALL_DIR} ${IDIR_NETSTAT_NAT}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/netstat-nat \
${IDIR_NETSTAT_NAT}/usr/bin/
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 689e69a..897f63a 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -31,7 +31,7 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_NATIVE),)
KRB5INC:= ${STAGING_TARGET_DIR}/usr
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+= --without-tcp-wrappers \
--with-tirpcinclude=${TIRPCINC} \
--disable-uuid
-post-install:
+nfs-utils-install:
${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc
${INSTALL_DIR} ${IDIR_NFS_UTILS}/sbin
${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS}/sbin
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index f55ab4c..6a756a4 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -19,7 +19,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
LIBRARIES+=-lssp -lssp_nonshared
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --without-openssl \
--with-libpcre="${STAGING_TARGET_DIR}/usr"
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
-post-install:
+nmap-install:
${INSTALL_DIR} ${IDIR_NMAP}/usr/share/nmap
${INSTALL_DIR} ${IDIR_NMAP}/usr/bin
for file in mac-prefixes os-db protocols rpc service-probes services; do \
diff --git a/package/nss/Makefile b/package/nss/Makefile
index e3867d0..7f9227b 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIST}/nss
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,NSS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NSS,nss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index 13a6b93..6f65db5 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -17,12 +17,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NTFS_3G,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NTFS_3G,ntfs-3g,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-ldconfig \
--disable-library
-post-install:
+ntfs-3g-install:
${INSTALL_DIR} ${IDIR_NTFS_3G}/bin
${INSTALL_BIN} ${WRKINST}/bin/ntfs-3g ${IDIR_NTFS_3G}/bin
cd ${WRKINST}/bin && ln -sf ntfs-3g mount.ntfs-3g
diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile
index 0bdf8ef..126efca 100644
--- a/package/ntpclient/Makefile
+++ b/package/ntpclient/Makefile
@@ -26,7 +26,7 @@ PKGFC_HOST:= depends on ADK_PACKAGE_NTPCLIENT_STARTUP
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NTPCLIENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NTPCLIENT,ntpclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/nut/Makefile b/package/nut/Makefile
index f3ed908..655b93e 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -27,7 +27,7 @@ PKGFB_WITH_SSL:= openssl
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NUT,nut,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
define DRIVER_template
@@ -93,7 +93,7 @@ ifneq (${ADK_PACKAGE_NUT_WITH_SNMP},)
CONFIGURE_ARGS+= --with-snmp
endif
-post-install:
+nut-install:
${INSTALL_DIR} ${IDIR_NUT}/usr/{s,}bin ${IDIR_NUT}/etc
${INSTALL_DIR} ${IDIR_NUT}/usr/lib
${INSTALL_BIN} ${WRKINST}/usr/sbin/ups{d,mon,sched} \
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index 1527555..5d97977 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -5,30 +5,30 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= obexftp
PKG_VERSION:= 0.23
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= f20762061b68bc921e80be4aebc349eb
PKG_DESCR:= bluetooth ftp application
PKG_SECTION:= bluetooth
-PKG_DEPENDS:= openobex libiconv
+PKG_DEPENDS:= openobex libiconv libobexftp
PKG_BUILDDEP:= openobex libiconv
PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/}
-
-PKG_ARCH_DEPENDS:= !avr32
+PKG_LIBNAME:= libobexftp
+PKG_OPTS:= dev
PKG_SUBPKGS:= OBEXFTP LIBOBEXFTP
-PKGSD_LIBOBEXFTP:= obexftp library
-PKGSC_LIBOBEXFTP:= libs
+
+PKG_ARCH_DEPENDS:= !avr32
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libmix
+PKG_OPTS+= libmix
endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OBEXFTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OBEXFTP,obexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBOBEXFTP,libobexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOBEXFTP},${PKGSC_LIBOBEXFTP},${PKG_OPTS}))
ifeq ($(ADK_STATIC),y)
@@ -43,12 +43,12 @@ CONFIGURE_ARGS+= --disable-perl \
--disable-tcl \
--disable-python
-post-install:
+obexftp-install:
${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin
${CP} ${WRKINST}/usr/bin/obexftp{,d} ${IDIR_OBEXFTP}/usr/bin/
-ifneq ($(ADK_STATIC),y)
+
+libobexftp-install:
${INSTALL_DIR} ${IDIR_LIBOBEXFTP}/usr/lib
${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LIBOBEXFTP}/usr/lib/
-endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/open-iscsi/Makefile b/package/open-iscsi/Makefile
index 5681299..c4d2304 100644
--- a/package/open-iscsi/Makefile
+++ b/package/open-iscsi/Makefile
@@ -21,11 +21,11 @@ include $(TOPDIR)/mk/package.mk
ALL_TARGET:= user
INSTALL_TARGET:= install_user
-$(eval $(call PKG_template,OPEN_ISCSI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPEN_ISCSI,open-iscsi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-post-install:
+open-iscsi-install:
$(INSTALL_DIR) $(IDIR_OPEN_ISCSI)/sbin $(IDIR_OPEN_ISCSI)/etc/iscsi
$(INSTALL_BIN) $(WRKINST)/sbin/* $(IDIR_OPEN_ISCSI)/sbin
$(CP) $(WRKINST)/etc/iscsi/* $(IDIR_OPEN_ISCSI)/etc/iscsi
diff --git a/package/openct/Makefile b/package/openct/Makefile
index 627d902..ebfc80e 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -22,6 +22,10 @@ PKGSC_LIBOPENCT:= libs
PKGSS_LIBOPENCT:= libltdl libusb
PKGSB_LIBOPENCT:= libtool libusb
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENCT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 3ab75f1..64cf8b1 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -30,6 +30,10 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
PKG_FLAVOURS_OPENLDAP_SLAPD:= WITH_IPV6
PKGFD_WITH_IPV6:= enable IPv6 support
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
index 79cf3af..3508134 100644
--- a/package/openntpd/Makefile
+++ b/package/openntpd/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENNTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENNTPD,openntpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
diff --git a/package/openobex/Makefile b/package/openobex/Makefile
index 4ec3d8d..e4e95e9 100644
--- a/package/openobex/Makefile
+++ b/package/openobex/Makefile
@@ -5,25 +5,26 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= openobex
PKG_VERSION:= 1.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 0d83dc86445a46a1b9750107ba7ab65c
PKG_DESCR:= implementation of the Object Exchange (OBEX) protocol
PKG_SECTION:= bluetooth
PKG_BUILDDEP:= bluez
PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart
PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/}
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !avr32
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENOBEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,OPENOBEX,openobex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+openobex-install:
${INSTALL_DIR} ${IDIR_OPENOBEX}/usr/lib
${CP} ${WRKINST}/usr/lib/libopenobex.so* ${IDIR_OPENOBEX}/usr/lib/
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index c07d162..3434aab 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -24,6 +24,10 @@ PKGSC_LIBOPENSC:= libs
PKGSS_LIBOPENSC:= libltdl
PKGSB_LIBOPENSC:= libtool
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENSC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile
index 4c12acd..96e5cd1 100644
--- a/package/openssl-pkcs11/Makefile
+++ b/package/openssl-pkcs11/Makefile
@@ -18,11 +18,11 @@ WRKDIST= ${WRKDIR}/engine_pkcs11-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENSSL_PKCS11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSL_PKCS11,openssl-pkcs11,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr"
-post-install:
+openssl-pkcs11-install:
${INSTALL_DIR} ${IDIR_OPENSSL_PKCS11}/usr/lib/engines
${INSTALL_DATA} ${WRKINST}/usr/lib/engines/engine_pkcs11.so \
${IDIR_OPENSSL_PKCS11}/usr/lib/engines
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index aad1eba..7a70883 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -25,7 +25,7 @@ PKG_FLAVOURS_LIBOPENSSL:= WITH_CRYPTODEV
PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux
ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
+PKG_OPTS+= libmix
endif
include ${TOPDIR}/mk/package.mk
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 22c52ea..ae750a2 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -24,7 +24,7 @@ PKG_ARCH_DEPENDS:= !avr32
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= KERNELSRC="${LINUX_DIR}" \
@@ -36,7 +36,7 @@ XAKE_FLAGS+= KERNELSRC="${LINUX_DIR}" \
BUILDENV="linux"
ALL_TARGET:= programs
-post-install:
+openswan-install:
${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/lib/ipsec
${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/libexec/ipsec
${INSTALL_DIR} ${IDIR_OPENSWAN}/etc/ipsec.d
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 2deb208..9222a54 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -13,9 +13,7 @@ PKG_DEPENDS:= kmod-tun ip
PKG_URL:= http://openvpn.net/
PKG_SITES:= http://swupdate.openvpn.org/community/releases/
-PKG_SUBPKGS:= OPENVPN
PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS SERVER CLIENT
-PKGSS_OPENVPN_EASY_RSA:=openssl-util
PKGFD_SERVER:= deliver server example configuration
PKGFD_CLIENT:= deliver client example configuration
PKGFD_WITH_LZO:= enable LZO compression support
@@ -35,7 +33,7 @@ PKGCB_WITH_POLARSSL:= polarssl
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,OPENVPN,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),)
CONFIGURE_ARGS+= --enable-lzo
@@ -73,7 +71,7 @@ CONFIGURE_ARGS+= --disable-plugins \
--disable-debug \
--enable-iproute2
-post-install:
+openvpn-install:
${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn
${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
ifeq ($(ADK_PACKAGE_OPENVPN_SERVER),y)
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 7a7ef93..e7ed35b 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -20,11 +20,11 @@ PKG_CFLINE_OPROFILE:= select BUSYBOX_EXPR
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,OPROFILE,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPROFILE,oprofile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-kernel-support
-post-install:
+oprofile-install:
$(INSTALL_DIR) $(IDIR_OPROFILE)/usr/{bin,share}
$(INSTALL_BIN) $(WRKINST)/usr/bin/opcontrol $(IDIR_OPROFILE)/usr/bin/
$(INSTALL_BIN) $(WRKINST)/usr/bin/ophelp $(IDIR_OPROFILE)/usr/bin/
diff --git a/package/osiris/Makefile b/package/osiris/Makefile
index 6722f4e..0c52955 100644
--- a/package/osiris/Makefile
+++ b/package/osiris/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://osiris.shmoo.com/data/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OSIRISD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OSIRIS,osiris,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_openssldir="${STAGING_TARGET_DIR}/usr" \
ac_cv_have_accrights_in_msghdr=no \
@@ -31,9 +31,9 @@ TARGET_CFLAGS+= -DOPENSSL_NO_RIPEMD
post-configure:
(cd ${WRKDIST}/src/osirisd/modules && ./genmods.sh);
-post-install:
- ${INSTALL_DIR} ${IDIR_OSIRISD}/usr/sbin
+osiris-install:
+ ${INSTALL_DIR} ${IDIR_OSIRIS}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/osirisd \
- ${IDIR_OSIRISD}/usr/sbin/
+ ${IDIR_OSIRIS}/usr/sbin/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/owfs/Makefile b/package/owfs/Makefile
index c2a4d93..b93e86f 100644
--- a/package/owfs/Makefile
+++ b/package/owfs/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=owfs/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OWFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OWFS,owfs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS+= -ldl -lrt -liconv
CONFIGURE_ARGS+= --enable-owfs \
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-owfs \
--with-fuseinclude=${STAGING_TARGET_DIR}/usr/include \
--with-fuselib=${STAGING_TARGET_DIR}/usr/lib
-post-install:
+owfs-install:
${INSTALL_DIR} ${IDIR_OWFS}/usr/{bin,lib}
${CP} ${WRKINST}/usr/lib/libow*.so* \
${IDIR_OWFS}/usr/lib/
diff --git a/package/p5-XML-Parser/Makefile b/package/p5-XML-Parser/Makefile
index e0c359e..19ad06a 100644
--- a/package/p5-XML-Parser/Makefile
+++ b/package/p5-XML-Parser/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/
DISTFILES:= XML-Parser-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/XML-Parser-${PKG_VERSION}
-PKG_CFLINE_P5_XML_PARSER:=depends on ADK_NATIVE
+PKG_ARCH_DEPENDS:= native
include $(TOPDIR)/mk/package.mk
@@ -30,7 +30,7 @@ include $(TOPDIR)/mk/perl.mk
pre-build:
(cd ${WRKSRC} && perl Makefile.PL EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include)
-post-install:
+p5-xml-parser-install:
$(INSTALL_DIR) $(IDIR_P5_XML_PARSER)$(PERL_SITEDIR)
$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
$(IDIR_P5_XML_PARSER)$(PERL_SITEDIR)
diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile
index eb561bf..7389132 100644
--- a/package/p910nd/Makefile
+++ b/package/p910nd/Makefile
@@ -16,7 +16,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,P910ND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,P910ND,p910nd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile
index d4d79ee..a762af3 100644
--- a/package/pacemaker-mgmt/Makefile
+++ b/package/pacemaker-mgmt/Makefile
@@ -13,14 +13,11 @@ PKG_BUILDDEP:= pacemaker gnutls pam python2
PKG_URL:= http://hg.clusterlabs.org/pacemaker/pygui/
PKG_SITES:= http://openadk.org/distfiles/
-PKG_CFLINE_PACEMAKER_MGMTD:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-
-PKG_SUBPKGS:= PACEMAKER_MGMTD
-PKGSD_PACEMAKER_MGMTD:= Management daemon for Pacemaker GUI
+PKG_LIBC_DEPENDS:= eglibc glibc musl
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PACEMAKER_MGMTD,pacemaker-mgmtd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PACEMAKER_MGMT,pacemaker-mgmt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
include $(TOPDIR)/mk/python.mk
@@ -33,12 +30,12 @@ TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/python2.7 \
-I$(STAGING_DIR)/usr/include/pacemaker \
-I$(STAGING_DIR)/usr/include/heartbeat
-pacemaker-mgmtd-install:
- $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib
+pacemaker-mgmt-install:
+ $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMT)/usr/lib
$(CP) $(WRKINST)/usr/lib/libhbmgmt*so* \
- $(IDIR_PACEMAKER_MGMTD)/usr/lib
- $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat
+ $(IDIR_PACEMAKER_MGMT)/usr/lib
+ $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMT)/usr/lib/heartbeat
$(INSTALL_BIN) $(WRKINST)/usr/lib/heartbeat/mgmtd \
- $(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat
+ $(IDIR_PACEMAKER_MGMT)/usr/lib/heartbeat
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile
index 9168fd6..fcbede4 100644
--- a/package/pacemaker/Makefile
+++ b/package/pacemaker/Makefile
@@ -15,8 +15,8 @@ PKG_DEPENDS+= bash resource-agents pam libgnutls glib libxslt libxml2 libltdl l
PKG_URL:= http://www.clusterlabs.org/
PKG_SITES:= http://openadk.org/distfiles/
-PKG_CFLINE_PACEMAKER:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_ARCH_DEPENDS:= x86
+PKG_LIBC_DEPENDS:= eglibc glibc musl
+PKG_ARCH_DEPENDS:= x86 x86_64
include $(TOPDIR)/mk/package.mk
diff --git a/package/pam/Makefile b/package/pam/Makefile
index 93169d8..bf322e7 100644
--- a/package/pam/Makefile
+++ b/package/pam/Makefile
@@ -11,13 +11,14 @@ PKG_DESCR:= Pluggable Authentication Modules
PKG_BUILDDEP:= flex
PKG_SECTION:= misc
PKG_SITES:= http://openadk.org/distfiles/
+PKG_OPTS:= dev
DISTFILES:= Linux-PAM-$(PKG_VERSION).tar.gz
WRKDIST= ${WRKDIR}/Linux-PAM-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
CONFIGURE_ARGS+= --disable-nis \
diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile
index 62046d2..0188d0f 100644
--- a/package/parprouted/Makefile
+++ b/package/parprouted/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:= http://www.hazard.maks.net/parprouted/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PARPROUTED,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PARPROUTED,parprouted,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/parted/Makefile b/package/parted/Makefile
index 05f56bc..e089845 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -18,11 +18,11 @@ DISTFILES:= ${PKG_NAME}-$(PKG_VERSION).tar.xz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PARTED,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PARTED,parted,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-device-mapper
-post-install:
+parted-install:
${INSTALL_DIR} $(IDIR_PARTED)/usr/sbin $(IDIR_PARTED)/usr/lib
${CP} $(WRKINST)/usr/lib/libparted*so* $(IDIR_PARTED)/usr/lib
${INSTALL_BIN} $(WRKINST)/usr/sbin/parted $(IDIR_PARTED)/usr/sbin
diff --git a/package/patch/Makefile b/package/patch/Makefile
index 909fdbf..0d80e53 100644
--- a/package/patch/Makefile
+++ b/package/patch/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= ${MASTER_SITE_GNU:=patch/}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PATCH,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+patch-install:
$(INSTALL_DIR) $(IDIR_PATCH)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/patch $(IDIR_PATCH)/usr/bin
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index 142a045..ce1e401 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://www.kernel.org/pub/software/utils/pciutils/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PCIUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PCIUTILS,pciutils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile
index 1855f3e..2f5e919 100644
--- a/package/pcmciautils/Makefile
+++ b/package/pcmciautils/Makefile
@@ -17,11 +17,11 @@ PKG_CFLINE_PCMCIAUTILS:=depends on ADK_TARGET_WITH_CARDBUS
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PCMCIAUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PCMCIAUTILS,pcmciautils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE= manual
-post-install:
+pcmciautils-install:
$(INSTALL_DIR) $(IDIR_PCMCIAUTILS)/etc/pcmcia
$(INSTALL_DATA) ./files/config.opts \
$(IDIR_PCMCIAUTILS)/etc/pcmcia
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 339911d..1d3cd13 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -18,6 +18,10 @@ PKG_OPTS:= dev
PKG_SUBPKGS:= LIBPCRE LIBPCRECPP
PKGSD_LIBPCRECPP:= PCRE c++ library
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile
index ae848d3..20b8a51 100644
--- a/package/pcrepp/Makefile
+++ b/package/pcrepp/Makefile
@@ -15,17 +15,18 @@ PKG_DEPENDS:= libpcre
PKG_BUILDDEP:= pcre
PKG_NEED_CXX:= 1
PKG_CXX:= pcrepp
+PKG_OPTS:= dev
-PKG_CFLINE_PCREPP:= depends on ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC
+PKG_LIBC_DEPENDS:= eglibc glibc musl
DISTFILES:= pcre++-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/pcre++-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PCREPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PCREPP,pcrepp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+pcrepp-install:
$(INSTALL_DIR) $(IDIR_PCREPP)/usr/lib
$(CP) $(WRKINST)/usr/lib/libpcre++.so* \
$(IDIR_PCREPP)/usr/lib
diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile
index 8e83586..ae0f25e 100644
--- a/package/pdnsd/Makefile
+++ b/package/pdnsd/Makefile
@@ -22,7 +22,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-par.tar.gz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PDNSD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PDNSD,pdnsd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-target=Linux
@@ -32,7 +32,7 @@ else
CONFIGURE_ARGS+= --disable-ipv6
endif
-post-install:
+pdnsd-install:
$(INSTALL_DIR) $(IDIR_PDNSD)/etc
${INSTALL_DATA} ./files/pdnsd.conf ${IDIR_PDNSD}/etc/
$(INSTALL_DIR) $(IDIR_PDNSD)/usr/sbin
diff --git a/package/perl/Makefile b/package/perl/Makefile
index 7fb8172..7fe7fb3 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -12,18 +12,18 @@ PKG_SECTION:= lang
PKG_URL:= http://www.perl.org/
PKG_SITES:= http://www.cpan.org/src/
-PKG_CFLINE_PERL:= depends on ADK_NATIVE
+PKG_ARCH_DEPENDS:= native
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PERL,perl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
pre-configure:
(cd ${WRKBUILD}; ./Configure -des -Dusethreads -Dcc=gcc -Dprefix=/usr -A ccflags="${TARGET_CFLAGS}");
-post-install:
+perl-install:
${INSTALL_DIR} ${IDIR_PERL}/usr/bin
${INSTALL_DIR} ${IDIR_PERL}/usr/lib/perl5/${PKG_VERSION}
${CP} ${WRKINST}/usr/lib/perl5/${PKG_VERSION}/* \
diff --git a/package/picocom/Makefile b/package/picocom/Makefile
index 34277e6..d602f72 100644
--- a/package/picocom/Makefile
+++ b/package/picocom/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://efault.net/npat/hacks/picocom/dist/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PICOCOM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PICOCOM,picocom,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile
index 81d4176..b859132 100644
--- a/package/pipacs/Makefile
+++ b/package/pipacs/Makefile
@@ -6,14 +6,14 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= pipacs
PKG_VERSION:= 0.1
PKG_RELEASE:= 2
-PKG_DESCR:= an UNIX socket accounting/wiewer program
+PKG_DESCR:= an UNIX socket accounting/viewer program
PKG_SECTION:= net/misc
NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PIPACS,${PKG_NAME},${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PIPACS,pipacs,${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/pkg-config/Makefile b/package/pkg-config/Makefile
index 23229b9..a0f614a 100644
--- a/package/pkg-config/Makefile
+++ b/package/pkg-config/Makefile
@@ -16,12 +16,12 @@ PKG_SITES:= http://pkgconfig.freedesktop.org/releases/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PKG_CONFIG,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PKG_CONFIG,pkg-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-installed-glib \
--with-installed-popt
-post-install:
+pkg-config-install:
$(INSTALL_DIR) $(IDIR_PKG_CONFIG)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/pkg-config \
$(IDIR_PKG_CONFIG)/usr/bin
diff --git a/package/pm-utils/Makefile b/package/pm-utils/Makefile
index 1ac1431..32279ae 100644
--- a/package/pm-utils/Makefile
+++ b/package/pm-utils/Makefile
@@ -16,9 +16,9 @@ PKG_CFLINE_PM_UTILS:= select BUSYBOX_FLOCK
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PM_UTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PM_UTILS,pm-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+pm-utils-install:
$(INSTALL_DIR) $(IDIR_PM_UTILS)/usr/lib
$(CP) $(WRKINST)/usr/lib/pm-utils \
$(IDIR_PM_UTILS)/usr/lib
diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile
index 523218a..ac1e550 100644
--- a/package/pmacct/Makefile
+++ b/package/pmacct/Makefile
@@ -26,15 +26,21 @@ $(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-${PKG_RELE
CONFIGURE_ARGS+= --with-pcap-includes="$(STAGING_TARGET_DIR)/usr/include" \
--with-pcap-libs="$(STAGING_TARGET_DIR)/usr/lib"
-post-install:
+sfacctd-install:
${INSTALL_DIR} $(IDIR_SFACCTD)/usr/sbin
${INSTALL_BIN} $(WRKINST)/usr/sbin/sfacctd $(IDIR_SFACCTD)/usr/sbin/
+
+nfacctd-install:
${INSTALL_DIR} $(IDIR_NFACCTD)/usr/sbin $(IDIR_NFACCTD)/etc
${INSTALL_BIN} $(WRKINST)/usr/sbin/nfacctd $(IDIR_NFACCTD)/usr/sbin/
${INSTALL_DATA} ./files/nfacctd.conf $(IDIR_NFACCTD)/etc
+
+pmacctd-install:
${INSTALL_DIR} $(IDIR_PMACCTD)/usr/sbin $(IDIR_PMACCTD)/etc
${INSTALL_BIN} $(WRKINST)/usr/sbin/pmacctd $(IDIR_PMACCTD)/usr/sbin/
${INSTALL_DATA} ./files/pmacctd.conf $(IDIR_PMACCTD)/etc
+
+pmacct-client-install:
${INSTALL_DIR} $(IDIR_PMACCT_CLIENT)/usr/bin
${INSTALL_BIN} $(WRKINST)/usr/bin/pmacct $(IDIR_PMACCT_CLIENT)/usr/bin/
diff --git a/package/poppler/Makefile b/package/poppler/Makefile
index 7b55189..fe61ae3 100644
--- a/package/poppler/Makefile
+++ b/package/poppler/Makefile
@@ -13,10 +13,11 @@ PKG_BUILDDEP:= fontconfig libstdcxx
PKG_DEPENDS:= fontconfig libstdcxx
PKG_URL:= http://poppler.freedesktop.org/
PKG_SITES:= http://poppler.freedesktop.org/
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,POPPLER,poppler,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,POPPLER,poppler,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64
diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile
index 43898e4..19a46f0 100644
--- a/package/portsentry/Makefile
+++ b/package/portsentry/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}_beta
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PORTSENTRY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PORTSENTRY,portsentry,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 2a71e59..b7aa99f 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -39,7 +39,7 @@ XAKE_FLAGS+= STAGING_TARGET_DIR=${STAGING_TARGET_DIR} \
DESTDIR="${WRKINST}/usr" STRIP='' \
TARGET_AR='${TARGET_CROSS}ar'
-post-install:
+ppp-install:
${INSTALL_DIR} ${IDIR_PPP}/etc/ppp
install -m0600 ./files/etc/ppp/chap-secrets ${IDIR_PPP}/etc/ppp/
${INSTALL_DATA} ./files/etc/ppp/options ${IDIR_PPP}/etc/ppp/
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index d789c80..a2d6fb9 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PPTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPTP,pptp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index 20f7d77..2a2e957 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -15,12 +15,12 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PPTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPTPD,pptpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS+= -fPIC -DSBINDIR='\\\"/usr/sbin\\\"'
FAKE_FLAGS+= INSTALL="install"
-post-install:
+pptpd-install:
${INSTALL_DIR} ${IDIR_PPTPD}/etc/ppp
${INSTALL_DIR} ${IDIR_PPTPD}/usr/sbin
${INSTALL_DATA} ./files/pptpd.conf ${IDIR_PPTPD}/etc/
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index 6281771..6b529c1 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -20,7 +20,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_VARIANT}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PRIVOXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PRIVOXY,privoxy,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS+= -DFEATURE_CONNECTION_KEEP_ALIVE
TARGET_LDFLAGS+= -pthread
@@ -33,7 +33,7 @@ CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes \
MAKE_FLAGS+= SPECIAL_CFLAGS='${TARGET_LDFLAGS}'
MAKE_FILE:= GNUmakefile
-post-install:
+privoxy-install:
${INSTALL_DIR} ${IDIR_PRIVOXY}/usr/sbin ${IDIR_PRIVOXY}/etc/privoxy
${CP} ${WRKINST}/etc/privoxy/* ${IDIR_PRIVOXY}/etc/privoxy
${INSTALL_BIN} ${WRKINST}/usr/sbin/privoxy ${IDIR_PRIVOXY}/usr/sbin/
diff --git a/package/procmail/Makefile b/package/procmail/Makefile
index 8841add..253c40a 100644
--- a/package/procmail/Makefile
+++ b/package/procmail/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://www.procmail.org/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PROCMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PROCMAIL,procmail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/procps/Makefile b/package/procps/Makefile
index a93c6df..7076547 100644
--- a/package/procps/Makefile
+++ b/package/procps/Makefile
@@ -16,11 +16,11 @@ PKG_SITES:= http://procps.sourceforge.net/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PROCPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PROCPS,procps,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-post-install:
+procps-install:
${INSTALL_DIR} ${IDIR_PROCPS}/{bin,sbin,usr/bin}
${INSTALL_BIN} ${WRKINST}/usr/bin/uptime ${IDIR_PROCPS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/tload ${IDIR_PROCPS}/usr/bin
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
index fbae31c..9796c0a 100644
--- a/package/proftpd/Makefile
+++ b/package/proftpd/Makefile
@@ -18,13 +18,13 @@ PKGFD_WITH_FTPUSERS:= install /etc/ftpusers along with proftpd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PROFTPD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PROFTPD,proftpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-cap
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes \
ac_cv_func_setgrent_void=yes
-post-install:
+proftpd-install:
$(INSTALL_DIR) $(IDIR_PROFTPD)/etc
$(INSTALL_DATA) ./files/proftpd.conf $(IDIR_PROFTPD)/etc/
$(INSTALL_DIR) $(IDIR_PROFTPD)/usr/{s,}bin
diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile
index 214be62..f4186c6 100644
--- a/package/ptunnel/Makefile
+++ b/package/ptunnel/Makefile
@@ -16,13 +16,13 @@ PKG_SITES:= http://www.cti.ecp.fr/~beauxir5/ptunnel/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PTUNNEL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PTUNNEL,ptunnel,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" \
ac_cv_linux_vers=2 \
td_cv_buggygetaddrinfo="no"
-post-install:
+ptunnel-install:
${INSTALL_DIR} ${IDIR_PTUNNEL}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/ptunnel ${IDIR_PTUNNEL}/usr/sbin/
diff --git a/package/python/Makefile b/package/python/Makefile
index 993dcb0..9a869aa 100644
--- a/package/python/Makefile
+++ b/package/python/Makefile
@@ -20,7 +20,7 @@ WRKDIST= ${WRKDIR}/Python-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PYTHON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PYTHON,python,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# disable honour cflags stuff
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
@@ -50,7 +50,7 @@ post-extract:
pre-configure:
$(SED) "s#@@CPU_ARCH@@#$(CPU_ARCH)#" ${WRKBUILD}/configure
-post-install:
+python-install:
${INSTALL_DIR} ${IDIR_PYTHON}/usr/bin ${IDIR_PYTHON}/usr/lib
${INSTALL_DIR} ${IDIR_PYTHON}/usr/lib/python3.2
${INSTALL_DIR} ${IDIR_PYTHON}/usr/include/python3.2m
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 0759209..c020e64 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -26,9 +26,9 @@ PKGSS_PYTHON2_BZIP2:= bzip2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PYTHON2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,PYTHON2_BZIP2,${PKG_NAME}-bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_BZIP2},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,PYTHON2_READLINE,${PKG_NAME}-readline,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_READLINE},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,PYTHON2,python2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,PYTHON2_BZIP2,python2-bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_BZIP2},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,PYTHON2_READLINE,python2-readline,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_READLINE},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
ifeq ($(ADK_HOST_CYGWIN),y)
EXE:= .exe
@@ -72,7 +72,7 @@ pre-configure:
$(SED) "s#@@CPU_ARCH@@#$(CPU_ARCH)#" ${WRKBUILD}/configure
$(SED) "s#@@STAGING_DIR@@#$(STAGING_DIR)#" ${WRKBUILD}/setup.py
-post-install:
+python2-install:
${INSTALL_DIR} ${IDIR_PYTHON2}/usr/bin ${IDIR_PYTHON2}/usr/lib
${INSTALL_DIR} ${IDIR_PYTHON2}/usr/lib/python2.7
${INSTALL_DIR} ${IDIR_PYTHON2}/usr/include/python2.7
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index cbf28d9..b46c8ec 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -20,7 +20,7 @@ PKG_ARCH_DEPENDS:= native x86 x86_64
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIG_STYLE:= minimal
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \
--bindir=/usr/bin
TARGET_LDFLAGS+= -pthread -lm -lrt
-post-install:
+qemu-install:
$(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu
$(INSTALL_DIR) $(IDIR_QEMU)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/qemu* \
diff --git a/package/qingy/Makefile b/package/qingy/Makefile
index e073365..f0739a9 100644
--- a/package/qingy/Makefile
+++ b/package/qingy/Makefile
@@ -19,7 +19,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,QINGY,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,QINGY,qingy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-screen-savers \
--disable-optimizations \
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-screen-savers \
--disable-x-support \
--disable-crypto
-post-install:
+qingy-install:
$(INSTALL_DIR) $(IDIR_QINGY)/etc/qingy/sessions
${INSTALL_BIN} ./files/{pre,post}_GUI.sh ${IDIR_QINGY}/etc/qingy/
${INSTALL_DATA} ./files/{settings,welcomes} ${IDIR_QINGY}/etc/qingy/
diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index f90edde..99de25b 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -51,7 +51,7 @@ else
CONFIGURE_ARGS+= --disable-ipv6
endif
-post-install:
+quagga-install:
${INSTALL_DIR} ${IDIR_QUAGGA}/usr/{lib,sbin}
${CP} ${WRKINST}/usr/lib/libzebra.so.* ${IDIR_QUAGGA}/usr/lib/
${INSTALL_BIN} ${WRKINST}/usr/sbin/zebra \
@@ -59,19 +59,31 @@ post-install:
# avoid /etc being set to 0750
${INSTALL_DIR} ${IDIR_QUAGGA}/etc/quagga/
chmod 0750 ${IDIR_QUAGGA}/etc/quagga/
+
+quagga-bgpd-install:
${INSTALL_DIR} ${IDIR_QUAGGA_BGPD}/usr/sbin
${CP} ${WRKINST}/usr/sbin/bgpd ${IDIR_QUAGGA_BGPD}/usr/sbin/
+
+quagga-ospfd-install:
${INSTALL_DIR} ${IDIR_QUAGGA_OSPFD}/usr/{lib,sbin}
${CP} ${WRKINST}/usr/lib/libospf.so.* ${IDIR_QUAGGA_OSPFD}/usr/lib/
${CP} ${WRKINST}/usr/sbin/ospfd ${IDIR_QUAGGA_OSPFD}/usr/sbin/
+
+quagga-ospf6d-install:
ifneq (${ADK_PACKAGE_QUAGGA_WITH_IPV6},)
${INSTALL_DIR} ${IDIR_QUAGGA_OSPF6D}/usr/sbin
${CP} ${WRKINST}/usr/sbin/ospf6d ${IDIR_QUAGGA_OSPF6D}/usr/sbin/
endif
+
+quagga-ripngd-install:
${INSTALL_DIR} ${IDIR_QUAGGA_RIPNGD}/usr/sbin
${CP} ${WRKINST}/usr/sbin/ripngd ${IDIR_QUAGGA_RIPNGD}/usr/sbin/
+
+quagga-ripd-install:
${INSTALL_DIR} ${IDIR_QUAGGA_RIPD}/usr/sbin
${CP} ${WRKINST}/usr/sbin/ripd ${IDIR_QUAGGA_RIPD}/usr/sbin/
+
+quagga-vtysh-install:
${INSTALL_DIR} ${IDIR_QUAGGA_VTYSH}/usr/bin
${CP} ${WRKINST}/usr/bin/vtysh ${IDIR_QUAGGA_VTYSH}/usr/bin/
diff --git a/package/raddump/Makefile b/package/raddump/Makefile
index c43d6cc..7deb594 100755
--- a/package/raddump/Makefile
+++ b/package/raddump/Makefile
@@ -16,9 +16,9 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=raddump/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RADDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RADDUMP,raddump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+raddump-install:
${INSTALL_DIR} ${IDIR_RADDUMP}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/raddump ${IDIR_RADDUMP}/usr/bin
diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index d9e0a48..4cb7d2c 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -18,13 +18,13 @@ PKG_HOST_DEPENDS:= !freebsd
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RADVD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RADVD,radvd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-configfile=/etc/radvd.conf \
--with-logfile=/var/log/radvd.log \
--with-pidfile=/var/run/radvd.pid
-post-install:
+radvd-install:
${INSTALL_DIR} ${IDIR_RADVD}/etc ${IDIR_RADVD}/usr/sbin
${INSTALL_DATA} ./files/radvd.conf ${IDIR_RADVD}/etc/
${INSTALL_BIN} ${WRKINST}/usr/sbin/radvd ${IDIR_RADVD}/usr/sbin/
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index 16e7a78..2f9bed5 100644
--- a/package/rarpd/Makefile
+++ b/package/rarpd/Makefile
@@ -15,13 +15,13 @@ PKG_SITES:= ftp://ftp.dementia.org/pub/net-tools/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RARPD,rarpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-libnet="${STAGING_TARGET_DIR}/usr" \
--with-pcap="${STAGING_TARGET_DIR}/usr"
TARGET_CPPFLAGS+= -DNEW_LIBNET_INTERFACE
-post-install:
+rarpd-install:
${INSTALL_DIR} ${IDIR_RARPD}/usr/sbin
${INSTALL_BIN} ${WRKINST}/sbin/rarpd ${IDIR_RARPD}/usr/sbin/
diff --git a/package/rdate/Makefile b/package/rdate/Makefile
index 1dd3731..1408571 100644
--- a/package/rdate/Makefile
+++ b/package/rdate/Makefile
@@ -15,12 +15,12 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RDATE,rdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
MAKE_FILE= GNUmakefile
-post-install:
+rdate-install:
${INSTALL_DIR} ${IDIR_RDATE}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/rdate ${IDIR_RDATE}/usr/sbin
diff --git a/package/rdesktop/Makefile b/package/rdesktop/Makefile
index 410f737..971183f 100644
--- a/package/rdesktop/Makefile
+++ b/package/rdesktop/Makefile
@@ -19,7 +19,7 @@ $(eval $(call PKG_template,RDESKTOP,rdesktop,$(PKG_VERSION)-${PKG_RELEASE},${PKG
CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr"
-post-install:
+rdesktop-install:
$(INSTALL_DIR) $(IDIR_RDESKTOP)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/rdesktop \
$(IDIR_RDESKTOP)/usr/bin
diff --git a/package/reaim/Makefile b/package/reaim/Makefile
index 2c33a91..13bd710 100644
--- a/package/reaim/Makefile
+++ b/package/reaim/Makefile
@@ -15,11 +15,11 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,REAIM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,REAIM,reaim,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-post-install:
+reaim-install:
${INSTALL_DIR} ${IDIR_REAIM}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/reaim ${IDIR_REAIM}/usr/sbin/
diff --git a/package/resource-agents/Makefile b/package/resource-agents/Makefile
index 6575293..bed24d4 100644
--- a/package/resource-agents/Makefile
+++ b/package/resource-agents/Makefile
@@ -13,8 +13,8 @@ PKG_BUILDDEP:= glib cluster-glue
PKG_URL:= https://github.com/ClusterLabs/resource-agents
PKG_SITES:= http://openadk.org/distfiles/
-PKG_CFLINE_RESOURCE_AGENTS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_ARCH_DEPENDS:= x86
+PKG_LIBC_DEPENDS:= eglibc glibc musl
+PKG_ARCH_DEPENDS:= x86 x86_64
include $(TOPDIR)/mk/package.mk
diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile
index d02dd04..465f406 100644
--- a/package/rng-tools/Makefile
+++ b/package/rng-tools/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= crypto
PKG_URL:= http://gkernel.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/}
-PKG_CFLINE_RNG_TOOLS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_LIBC_DEPENDS:= eglibc glibc musl
include $(TOPDIR)/mk/package.mk
diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index 403564b..3c64eef 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ENV+= ac_cv_func_setvbuf_reversed=no \
ac_cv_linux_kernel_pppoe=yes \
ac_cv_pack_bitfields_reversed=yes
-post-install:
+pppoe-client-install:
${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/ppp \
${IDIR_PPPOE_CLIENT}/usr/sbin
${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe.conf \
@@ -42,15 +42,21 @@ post-install:
${CP} ${WRKINST}/usr/sbin/pppoe-stop ${IDIR_PPPOE_CLIENT}/usr/sbin/
${CP} ${WRKINST}/usr/sbin/pppoe-status ${IDIR_PPPOE_CLIENT}/usr/sbin/
${CP} ${WRKINST}/usr/sbin/pppoe-setup ${IDIR_PPPOE_CLIENT}/usr/sbin/
+
+pppoe-relay-install:
${INSTALL_DIR} ${IDIR_PPPOE_RELAY}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-relay \
${IDIR_PPPOE_RELAY}/usr/sbin/
+
+pppoe-server-install:
${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/etc/ppp \
${IDIR_PPPOE_SERVER}/usr/sbin
${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe-server-options \
${IDIR_PPPOE_SERVER}/etc/ppp/
${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-server \
${IDIR_PPPOE_SERVER}/usr/sbin/
+
+pppoe-sniff-install:
${INSTALL_DIR} ${IDIR_PPPOE_SNIFF}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-sniff \
${IDIR_PPPOE_SNIFF}/usr/sbin/
diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile
index f87c21f..db4930d 100644
--- a/package/rpcbind/Makefile
+++ b/package/rpcbind/Makefile
@@ -18,12 +18,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,RPCBIND,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RPCBIND,rpcbind,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/tirpc
CONFIGURE_ARGS+= --disable-libwrap
-post-install:
+rpcbind-install:
$(INSTALL_DIR) $(IDIR_RPCBIND)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/rpcbind \
$(IDIR_RPCBIND)/usr/bin
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index 3eb9820..c437d53 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --enable-exec \
--without-libpcre
TARGET_CPPFLAGS+= -DSOCKET_COMM
-post-install:
+rrdcollect-install:
${INSTALL_DIR} ${IDIR_RRDCOLLECT}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/rrdcollect \
${IDIR_RRDCOLLECT}/usr/sbin/
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index 0368cef..b1a5251 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -15,6 +15,8 @@ PKG_BUILDDEP:= libxml2 cgilib freetype libart libpng
PKG_BUILDDEP+= glib cairo pango
PKG_URL:= http://oss.oetiker.ch/
PKG_SITES:= http://oss.oetiker.ch/rrdtool/pub/
+PKG_LIBNAME:= librrd
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
@@ -24,9 +26,13 @@ PKGSD_RRDCGI:= RRD CGI
PKGSC_RRDTOOL:= misc
PKGSD_RRDTOOL:= RRD tool
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDCGI}))
$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDTOOL}))
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index 939a46f..1baf977 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -16,14 +16,14 @@ PKG_SITES:= http://rsync.samba.org/ftp/rsync/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RSYNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RSYNC,rsync,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_STATIC),y)
TARGET_CFLAGS+= -static
TARGET_LDFLAGS+= -static
endif
-post-install:
+rsync-install:
${INSTALL_DIR} ${IDIR_RSYNC}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/rsync ${IDIR_RSYNC}/usr/bin
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index 9b453e2..a065947 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
TARGET_LDFLAGS+= -lpthread
-$(eval $(call PKG_template,RTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
rtorrent-install:
${INSTALL_DIR} ${IDIR_RTORRENT}/usr/bin
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index d8d5f06..79e4e3a 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -21,7 +21,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-p${PKG_EXTRAVER}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RUBY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
MAKE_FILE:= GNUmakefile
XAKE_FLAGS+= optflags='' debugflags='' dldflags="$(TARGET_LDFLAGS)"
@@ -40,7 +40,7 @@ pre-configure:
$(MAKE) -C ${WRKBUILD} install-nodoc
$(MAKE) -C ${WRKBUILD} clean
-post-install:
+ruby-install:
${INSTALL_DIR} ${IDIR_RUBY}/usr/lib/ruby
${INSTALL_DIR} ${IDIR_RUBY}/usr/bin
${CP} ${WRKINST}/usr/lib/libruby.so* ${IDIR_RUBY}/usr/lib
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index 37f0e11..2d2d147 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -21,13 +21,13 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,RXVT_UNICODE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RXVT_UNICODE,rxvt-unicode,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-perl \
--disable-utmp \
--disable-afterimage
-post-install:
+rxvt-unicode-install:
$(INSTALL_DIR) $(IDIR_RXVT_UNICODE)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/urxvt \
$(IDIR_RXVT_UNICODE)/usr/bin
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 9626c1c..98a10bb 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= afe9c7c590f3093555cd6e870d2532e1
PKG_DESCR:= NetBIOS/SMB file and print server
PKG_SECTION:= net/fs
-PKG_BUILDDEP:= gettext-tiny util-linux
-PKG_DEPENDS:= samba-lib libuuid
+PKG_BUILDDEP:= gettext-tiny util-linux popt
+PKG_DEPENDS:= samba-lib libuuid libpopt
PKG_URL:= http://www.samba.org/
PKG_SITES:= http://samba.org/samba/ftp/stable/
@@ -55,7 +55,7 @@ CONFIGURE_ARGS+= --libdir=/usr/lib/samba \
--without-cluster-support \
--without-sendfile-support
-post-install:
+samba-install:
${INSTALL_DIR} ${IDIR_SAMBA}/etc/samba ${IDIR_SAMBA}/usr/sbin
${INSTALL_DIR} ${IDIR_SAMBA}/usr/lib/samba/{charset,vfs}
${INSTALL_DATA} ${WRKINST}/usr/lib/samba/charset/CP850.so \
@@ -66,12 +66,18 @@ post-install:
${IDIR_SAMBA}/usr/lib/samba
${CP} ${WRKINST}/usr/lib/samba/vfs/*.so* ${IDIR_SAMBA}/usr/lib/samba/vfs
${INSTALL_DATA} ${WRKINST}/usr/lib/samba/*.dat ${IDIR_SAMBA}/usr/lib/samba
+
+samba-passwd-install:
${INSTALL_DIR} ${IDIR_SAMBA_PASSWD}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/smbpasswd \
${IDIR_SAMBA_PASSWD}/usr/bin
+
+samba-client-install:
${INSTALL_DIR} ${IDIR_SAMBA_CLIENT}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/smbclient \
${IDIR_SAMBA_CLIENT}/usr/bin
+
+samba-lib-install:
${INSTALL_DIR} ${IDIR_SAMBA_LIB}/usr/lib/samba
$(CP) ${WRKINST}/usr/lib/samba/{libtalloc,libtdb,libtevent}.* \
${IDIR_SAMBA_LIB}/usr/lib/samba
diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index 8222529..3121307 100644
--- a/package/scanlogd/Makefile
+++ b/package/scanlogd/Makefile
@@ -18,7 +18,7 @@ PKG_ARCH_DEPENDS:= !arm
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SCANLOGD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SCANLOGD,scanlogd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/screen/Makefile b/package/screen/Makefile
index 22a1bd6..2448778 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=screen/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SCREEN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= $(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes)
CONFIGURE_ARGS+= --with-sys-screenrc=/etc/screenrc
@@ -29,7 +29,7 @@ pre-build:
echo '#undef UTHOST' >> ${WRKBUILD}/config.h
echo '#undef BUGGYGETLOGIN' >> ${WRKBUILD}/config.h
-post-install:
+screen-install:
${INSTALL_DIR} ${IDIR_SCREEN}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/screen ${IDIR_SCREEN}/usr/bin/
diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile
index a46dd81..4d12300 100644
--- a/package/scsi-spin/Makefile
+++ b/package/scsi-spin/Makefile
@@ -14,7 +14,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SCSI_SPIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SCSI_SPIN,scsi-spin,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/ser2net/Makefile b/package/ser2net/Makefile
index 3be9a24..e4d55a0 100644
--- a/package/ser2net/Makefile
+++ b/package/ser2net/Makefile
@@ -13,11 +13,11 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ser2net/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SER2NET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SER2NET,ser2net,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_lib_nsl_main=no
-post-install:
+ser2net-install:
${INSTALL_DIR} ${IDIR_SER2NET}/etc ${IDIR_SER2NET}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/ser2net ${IDIR_SER2NET}/usr/sbin
${INSTALL_DATA} ${WRKBUILD}/ser2net.conf ${IDIR_SER2NET}/etc
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index ec32edf..f7f16c5 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=serdisplib/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SERDISPLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SERDISPLIB,serdisplib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile
index 18ef414..becb813 100644
--- a/package/setpwc/Makefile
+++ b/package/setpwc/Makefile
@@ -16,7 +16,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SETPWC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SETPWC,setpwc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index 7056550..288f4bc 100644
--- a/package/setserial/Makefile
+++ b/package/setserial/Makefile
@@ -13,7 +13,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=setserial/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SETSERIAL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SETSERIAL,setserial,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
TARGET_CPPFLAGS+= -DFIOQSIZE=1
diff --git a/package/setxkbmap/Makefile b/package/setxkbmap/Makefile
index 34e9d3e..6c49411 100644
--- a/package/setxkbmap/Makefile
+++ b/package/setxkbmap/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,SETXKBMAP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SETXKBMAP,setxkbmap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+setxkbmap-install:
$(INSTALL_DIR) $(IDIR_SETXKBMAP)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/setxkbmap \
$(IDIR_SETXKBMAP)/usr/bin
diff --git a/package/shat/Makefile b/package/shat/Makefile
index 6afe710..a28087c 100644
--- a/package/shat/Makefile
+++ b/package/shat/Makefile
@@ -13,7 +13,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=shat/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SHAT,shat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/shorewall-shell/Makefile b/package/shorewall-shell/Makefile
index 574458f..96c9fbc 100644
--- a/package/shorewall-shell/Makefile
+++ b/package/shorewall-shell/Makefile
@@ -16,7 +16,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SHOREWALL_SHELL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SHOREWALL_SHELL,shorewall-shell,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile
index 40eb3e5..34c835f 100644
--- a/package/siproxd/Makefile
+++ b/package/siproxd/Makefile
@@ -16,9 +16,9 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=siproxd/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SIPROXD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SIPROXD,siproxd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+siproxd-install:
${INSTALL_DIR} ${IDIR_SIPROXD}/usr/sbin ${IDIR_SIPROXD}/etc
${INSTALL_DATA} ${WRKINST}/etc/siproxd.conf.example \
${IDIR_SIPROXD}/etc/siproxd.conf
diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile
index 1ebf3a1..d1bd322 100644
--- a/package/sipsak/Makefile
+++ b/package/sipsak/Makefile
@@ -18,11 +18,11 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-1.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SIPSAK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SIPSAK,sipsak,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-gnutls
-post-install:
+sipsak-install:
${INSTALL_DIR} ${IDIR_SIPSAK}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/sipsak ${IDIR_SIPSAK}/usr/bin/
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index d01da09..7fffc4c 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -18,9 +18,9 @@ PKG_ARCH_DEPENDS:= !avr32
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SISPMCTL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SISPMCTL,sispmctl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+sispmctl-install:
${INSTALL_DIR} ${IDIR_SISPMCTL}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/sispmctl ${IDIR_SISPMCTL}/usr/bin
diff --git a/package/snort/Makefile b/package/snort/Makefile
index acf778e..089daab 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -17,7 +17,7 @@ PKG_NOPARALLEL:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SNORT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc
TARGET_LDFLAGS+= -ltirpc
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --disable-static-daq \
--with-dnet-includes="${STAGING_TARGET_DIR}/usr/include" \
--with-dnet-libraries="${STAGING_TARGET_DIR}/usr/lib"
-post-install:
+snort-install:
${INSTALL_DIR} ${IDIR_SNORT}/usr/bin
${INSTALL_DIR} ${IDIR_SNORT}/etc/snort
${INSTALL_DATA} ${WRKBUILD}/etc/snort.conf ${IDIR_SNORT}/etc/snort
diff --git a/package/socat/Makefile b/package/socat/Makefile
index bb896c9..de459c7 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://www.dest-unreach.org/socat/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SOCAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= sc_cv_termios_ispeed="no" \
sc_cv_sys_crdly_shift=9 \
@@ -25,7 +25,7 @@ CONFIGURE_ENV+= sc_cv_termios_ispeed="no" \
CONFIGURE_ARGS+= --disable-libwrap \
--disable-readline
-post-install:
+socat-install:
${INSTALL_DIR} ${IDIR_SOCAT}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/socat ${IDIR_SOCAT}/usr/bin/
diff --git a/package/speex/Makefile b/package/speex/Makefile
index db3b2bc..331a29b 100644
--- a/package/speex/Makefile
+++ b/package/speex/Makefile
@@ -11,12 +11,12 @@ PKG_DESCR:= an open source patent-free speech compression codec
PKG_SECTION:= libs
PKG_URL:= http://speex.org/
PKG_SITES:= http://downloads.us.xiph.org/releases/speex/
-
-PKG_SUBPKGS:= LIBSPEEX
+PKG_LIBNAME:= libspeex
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSPEEX,libspeex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSPEEX,libspeex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --without-ogg --disable-oggtest --enable-fixed-point
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index 06800ca..5eaa4b3 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -12,17 +12,23 @@ PKG_SECTION:= db
PKG_BUILDDEP:= ncurses readline
PKG_URL:= http://www.sqlite.org/
PKG_SITES:= http://www.sqlite.org/2013/
+PKG_LIBNAME:= libsqlite
+PKG_OPTS:= dev
DISTFILES:= sqlite-autoconf-3080002.tar.gz
WRKDIST= ${WRKDIR}/sqlite-autoconf-3080002
-PKG_SUBPKGS:= SQLITE_CLI LIBSQLITE LIBSQLITE_DEV
+PKG_SUBPKGS:= SQLITE_CLI LIBSQLITE
PKGSD_LIBSQLITE:= sqlite library
+PKGSC_LIBSQLITE:= libs
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSQLITE},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSQLITE_DEV,libsqlite-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSQLITE},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSQLITE},${PKGSC_LIBSQLITE},${PKG_OPTS}))
$(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -44,13 +50,4 @@ sqlite-cli-install:
${INSTALL_DIR} ${IDIR_SQLITE_CLI}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/sqlite3 ${IDIR_SQLITE_CLI}/usr/bin
-libsqlite-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBSQLITE_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBSQLITE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DIR} ${IDIR_LIBSQLITE_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_LIBSQLITE_DEV}/usr/include
-
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/squid/Makefile b/package/squid/Makefile
index c9a0694..12a9fb9 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -79,15 +79,15 @@ ${2}-install:
$${IDIR_${1}}/usr/lib/squid/
endef
-$(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_LDAP,${PKG_NAME}-mod-basic-auth-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_FILE,${PKG_NAME}-mod-digest-auth-file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,${PKG_NAME}-mod-external-acl-file-userip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKE,${PKG_NAME}-mod-ntlm-auth-fake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID,squid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,squid-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,squid-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,squid-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_LDAP,squid-mod-basic-auth-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_FILE,squid-mod-digest-auth-file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,squid-mod-external-acl-file-userip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKE,squid-mod-ntlm-auth-fake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,basic_getpwnam_auth))
$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,basic_ldap_auth))
diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index 561b1d6..5b46b32 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -13,7 +13,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SRELAY,srelay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index 83b8b2c..615d67e 100644
--- a/package/ssltunnel/Makefile
+++ b/package/ssltunnel/Makefile
@@ -15,12 +15,12 @@ PKG_SITES:= http://www.hsc.fr/ressources/outils/ssltunnel/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SSLTUNNEL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SSLTUNNEL,ssltunnel,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}"
XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include"
-post-install:
+ssltunnel-install:
${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/bin
${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/sbin
${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/libexec
diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile
index 99cf8ac..7b44005 100644
--- a/package/ssmtp/Makefile
+++ b/package/ssmtp/Makefile
@@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SSMTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SSMTP,ssmtp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
diff --git a/package/strace/Makefile b/package/strace/Makefile
index c6880fa..a098773 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -16,7 +16,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_STATIC),y)
TARGET_CFLAGS+= -static
diff --git a/package/stress/Makefile b/package/stress/Makefile
index 5b710bf..f60c8c6 100644
--- a/package/stress/Makefile
+++ b/package/stress/Makefile
@@ -13,11 +13,11 @@ PKG_SITES:= http://weather.ou.edu/~apw/projects/stress/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,STRESS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,STRESS,stress,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-static
-post-install:
+stress-install:
${INSTALL_DIR} ${IDIR_STRESS}/usr/bin/
${INSTALL_BIN} ${WRKINST}/usr/bin/stress ${IDIR_STRESS}/usr/bin/
diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index 9f3f52e..902882f 100644
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -35,7 +35,7 @@ endif
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,STRONGSWAN,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,STRONGSWAN,strongswan,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq (${ADK_PACKAGE_STRONGSWAN_WITH_OPENSSL},y)
CONFIGURE_ARGS+= --enable-openssl \
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --disable-tools \
TARGET_LDFLAGS+= -Wl,-rpath -Wl,/usr/lib/ipsec
-post-install:
+strongswan-install:
$(INSTALL_DIR) $(IDIR_STRONGSWAN)/etc
$(INSTALL_DIR) $(IDIR_STRONGSWAN)/usr/sbin
$(INSTALL_DIR) $(IDIR_STRONGSWAN)/usr/libexec/ipsec
diff --git a/package/sudo/Makefile b/package/sudo/Makefile
index 2dc7ecd..bc1ba13 100644
--- a/package/sudo/Makefile
+++ b/package/sudo/Makefile
@@ -14,13 +14,13 @@ PKG_SITES:= http://www.courtesan.com/sudo/dist/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,SUDO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SUDO,sudo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --without-pam \
--with-env-editor \
--with-timedir=/var/run
-post-install:
+sudo-install:
$(INSTALL_DIR) $(IDIR_SUDO)/usr/bin
$(INSTALL_DIR) $(IDIR_SUDO)/usr/sbin
$(INSTALL_DIR) $(IDIR_SUDO)/etc
diff --git a/package/syslinux/Makefile b/package/syslinux/Makefile
index b7effc0..b84c0b9 100644
--- a/package/syslinux/Makefile
+++ b/package/syslinux/Makefile
@@ -13,18 +13,18 @@ PKG_BUILDDEP:= nasm
PKG_URL:= http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
PKG_SITES:= http://www.kernel.org/pub/linux/utils/boot/syslinux/
-PKG_CFLINE_SYSLINUX:= depends on ADK_NATIVE
+PKG_ARCH_DEPENDS:= native
PKG_HOST_DEPENDS:= !darwin !netbsd !openbsd !cygwin !freebsd
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,SYSLINUX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SYSLINUX,syslinux,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
FAKE_FLAGS+= INSTALLROOT=${WRKINST}
TARGET_CFLAGS+= -std=c99
-post-install:
+syslinux-install:
$(INSTALL_DIR) $(IDIR_SYSLINUX)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/syslinux \
$(IDIR_SYSLINUX)/usr/bin
diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile
index bdc808e..a3a7ad2 100644
--- a/package/syslog-ng/Makefile
+++ b/package/syslog-ng/Makefile
@@ -16,14 +16,14 @@ PKG_SITES:= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SYSLOG_NG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --enable-full-dynamic \
--enable-tcp-wrapper
CONFIGURE_ENV+= ac_cv_path_libol_config=${STAGING_TARGET_DIR}/usr/bin
CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no
-post-install:
+syslog-ng-install:
${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/sbin \
${IDIR_SYSLOG_NG}/etc/syslog-ng
${INSTALL_BIN} ${WRKINST}/usr/sbin/syslog-ng \
diff --git a/package/sysstat/Makefile b/package/sysstat/Makefile
index e1c5fab..919d067 100644
--- a/package/sysstat/Makefile
+++ b/package/sysstat/Makefile
@@ -13,14 +13,14 @@ PKG_SITES:= http://perso.orange.fr/sebastien.godard/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SYSSTAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SYSSTAT,sysstat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
do-configure:
${CP} ./files/CONFIG ${WRKBUILD}/build/
-post-install:
+sysstat-install:
${INSTALL_DIR} ${IDIR_SYSSTAT}/usr/lib/sa
${INSTALL_BIN} ${WRKINST}/usr/lib/sa/sa1 ${IDIR_SYSSTAT}/usr/lib/sa
${INSTALL_BIN} ${WRKINST}/usr/lib/sa/sa2 ${IDIR_SYSSTAT}/usr/lib/sa
diff --git a/package/taglib/Makefile b/package/taglib/Makefile
index d02f3e8..493cf5a 100644
--- a/package/taglib/Makefile
+++ b/package/taglib/Makefile
@@ -13,10 +13,11 @@ PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib
PKG_URL:= http://taglib.github.com/
PKG_SITES:= http://openadk.org/distfiles/
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TAGLIB,taglib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TAGLIB,taglib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
diff --git a/package/tar/Makefile b/package/tar/Makefile
index a7e4d32..8b60180 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -15,12 +15,12 @@ PKG_SITES:= http://mirrors.kernel.org/gnu/tar/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TAR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TAR,tar,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= gl_cv_func_mbrtowc_incomplete_state=no \
gl_cv_func_wcrtomb_retval=no
-post-install:
+tar-install:
${INSTALL_DIR} ${IDIR_TAR}/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/tar ${IDIR_TAR}/bin
diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile
index 0f7516b..15bee1a 100644
--- a/package/tcp_wrappers/Makefile
+++ b/package/tcp_wrappers/Makefile
@@ -12,15 +12,15 @@ PKG_SECTION:= libs
PKG_URL:= ftp://ftp.porcupine.org/pub/security/index.html
PKG_SITES:= ftp://ftp.porcupine.org/pub/security/
PKG_NOPARALLEL:= 1
-
-PKG_SUBPKGS:= LIBWRAP
+PKG_LIBNAME:= libwrap
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBWRAP,libwrap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBWRAP,libwrap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile
index 5992718..e4eead0 100644
--- a/package/tcpdump/Makefile
+++ b/package/tcpdump/Makefile
@@ -20,7 +20,7 @@ PKGFD_WITH_CHROOT:= enable chrooting to /var/lib/tcpdump
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TCPDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TCPDUMP,tcpdump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${CC_FOR_BUILD} \
ac_cv_linux_vers=2 \
@@ -39,7 +39,7 @@ XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \
XAKE_FLAGS+= GCC_HONOUR_COPTS=s
-post-install:
+tcpdump-install:
${INSTALL_DIR} ${IDIR_TCPDUMP}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/tcpdump ${IDIR_TCPDUMP}/usr/sbin/
ifneq (${ADK_PACKAGE_TCPDUMP_WITH_CHROOT},)
diff --git a/package/tcsh/Makefile b/package/tcsh/Makefile
index a6d3631..3cc6a23 100644
--- a/package/tcsh/Makefile
+++ b/package/tcsh/Makefile
@@ -16,11 +16,11 @@ PKG_SITES:= ftp://ftp.astron.com/pub/tcsh/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TCSH,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TCSH,tcsh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
-post-install:
+tcsh-install:
$(INSTALL_DIR) $(IDIR_TCSH)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/tcsh $(IDIR_TCSH)/usr/bin
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index cad495f..9e5d8b0 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -16,13 +16,13 @@ PKG_SITES:= http://www.tinc-vpn.org/packages/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TINC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TINC,tinc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-kernel=${LINUX_DIR} \
--with-zlib=${STAGING_TARGET_DIR}/usr/ \
--with-lzo-include=${STAGING_TARGET_DIR}/usr/include/lzo
-post-install:
+tinc-install:
${INSTALL_DIR} ${IDIR_TINC}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/tincd ${IDIR_TINC}/usr/sbin/
diff --git a/package/tinycdb/Makefile b/package/tinycdb/Makefile
index 79fa6d4..32a52c1 100644
--- a/package/tinycdb/Makefile
+++ b/package/tinycdb/Makefile
@@ -11,18 +11,19 @@ PKG_DESCR:= CDB implementation
PKG_SECTION:= db
PKG_URL:= http://www.corpit.ru/mjt/tinycdb/
PKG_SITES:= http://www.corpit.ru/mjt/tinycdb/
+PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TINYCDB,tinycdb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TINYCDB,tinycdb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
tinycdb-install:
- $(INSTALL_DIR) $(IDIR_TINYCDB)/usr/lib
+ $(INSTALL_DIR) $(IDIR_TINYCDB_DEV)/usr/lib
$(INSTALL_BIN) $(WRKINST)/usr/lib/libcdb.a \
- $(IDIR_TINYCDB)/usr/lib
+ $(IDIR_TINYCDB_DEV)/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile
index 925ac1b..1de352f 100644
--- a/package/tinyproxy/Makefile
+++ b/package/tinyproxy/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.6/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TINYPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TINYPROXY,tinyproxy,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_header_libintl_h=no \
ac_cv_lib_nsl_gethostbyaddr=no \
@@ -30,7 +30,7 @@ ifneq (${ADK_COMPILE_TINYPROXY_WITH_FILTER},y)
CONFIGURE_ARGS+= --disable-filter
endif
-post-install:
+tinyproxy-install:
${INSTALL_DIR} ${IDIR_TINYPROXY}/usr/sbin \
${IDIR_TINYPROXY}/etc/tinyproxy \
${IDIR_TINYPROXY}/usr/share/tinyproxy
diff --git a/package/tinyxml/Makefile b/package/tinyxml/Makefile
index 3875bf2..0af10f7 100644
--- a/package/tinyxml/Makefile
+++ b/package/tinyxml/Makefile
@@ -11,13 +11,14 @@ PKG_DESCR:= a simple, small, minimal, C++ XML parser
PKG_SECTION:= libs
PKG_URL:= http://sourceforge.net/projects/tinyxml/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tinyxml/}
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}_2_6_2.zip
WRKDIST= ${WRKDIR}/tinyxml
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TINYXML,tinyxml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TINYXML,tinyxml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile
index decd64e..12f902c 100644
--- a/package/tmsnc/Makefile
+++ b/package/tmsnc/Makefile
@@ -14,13 +14,13 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tmsnc/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TMSNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TMSNC,tmsnc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-libiconv-prefix=${STAGING_TARGET_DIR}/usr \
--with-openssl=${STAGING_TARGET_DIR}/usr \
--with-ncurses=${STAGING_TARGET_DIR}
-post-install:
+tmsnc-install:
${INSTALL_DIR} ${IDIR_TMSNC}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/tmsnc ${IDIR_TMSNC}/usr/bin
diff --git a/package/tor/Makefile b/package/tor/Makefile
index cfbce34..197b8d8 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://tor.eff.org/dist/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_libevent_normal=yes \
ac_cv_libevent_linker_option="" \
@@ -29,7 +29,7 @@ CONFIGURE_ENV+= ac_cv_libevent_normal=yes \
CONFIGURE_ARGS+= --disable-gcc-hardening
-post-install:
+tor-install:
${INSTALL_DIR} ${IDIR_TOR}/usr/bin ${IDIR_TOR}/etc/tor
${INSTALL_DATA} ./files/torrc ${IDIR_TOR}/etc/tor/
${CP} ${WRKINST}/usr/bin/tor ${IDIR_TOR}/usr/bin/
diff --git a/package/totd/Makefile b/package/totd/Makefile
index 207b2d2..402675b 100644
--- a/package/totd/Makefile
+++ b/package/totd/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= http://www.dillema.net/software/totd/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TOTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TOTD,totd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+totd-install:
$(INSTALL_DIR) $(IDIR_TOTD)/{usr/sbin,etc}
${INSTALL_DATA} ./files/totd.conf ${IDIR_TOTD}/etc
$(INSTALL_BIN) $(WRKINST)/usr/sbin/totd $(IDIR_TOTD)/usr/sbin
diff --git a/package/tptest/Makefile b/package/tptest/Makefile
index 2dad849..68ae674 100644
--- a/package/tptest/Makefile
+++ b/package/tptest/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tptest/}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TPTEST,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TPTEST,tptest,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile
index c3aea84..31ee8bd 100644
--- a/package/traceroute/Makefile
+++ b/package/traceroute/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=traceroute/}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TRACEROUTE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TRACEROUTE,traceroute,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
@@ -24,7 +24,7 @@ MAKE_FLAGS+= CC="${TARGET_CC}" \
CFLAGS="${TARGET_CFLAGS}" \
LDFLAGS="${TARGET_LDFLAGS} -L${WRKSRC}/libsupp"
-post-install:
+traceroute-install:
$(INSTALL_DIR) $(IDIR_TRACEROUTE)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/traceroute \
$(IDIR_TRACEROUTE)/usr/bin/
diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile
index 5cdc7c7..2e60ec0 100644
--- a/package/trafshow/Makefile
+++ b/package/trafshow/Makefile
@@ -22,7 +22,7 @@ $(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${PKG
TARGET_CPPFLAGS+= -DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS
-post-install:
+trafshow-install:
${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/trafshow ${IDIR_TRAFSHOW}/usr/bin/
diff --git a/package/tslib/Makefile b/package/tslib/Makefile
index e32eb30..86b842e 100644
--- a/package/tslib/Makefile
+++ b/package/tslib/Makefile
@@ -12,12 +12,13 @@ PKG_SECTION:= libs
PKG_URL:= http://tslib.berlios.de/
PKG_SITES:= http://download.berlios.de/tslib/
PKG_NEED_CXX:= 1
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TSLIB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TSLIB,tslib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-ucb1x00 \
--disable-corgi \
@@ -33,7 +34,7 @@ pre-build:
pre-install:
$(INSTALL_DIR) $(WRKINST)/etc
-post-install:
+tslib-install:
$(INSTALL_DIR) $(IDIR_TSLIB)/etc
$(INSTALL_DIR) $(IDIR_TSLIB)/usr/lib/ts
$(INSTALL_DIR) $(IDIR_TSLIB)/usr/bin
diff --git a/package/ttcp/Makefile b/package/ttcp/Makefile
index db76431..b091595 100644
--- a/package/ttcp/Makefile
+++ b/package/ttcp/Makefile
@@ -13,7 +13,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TTCP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TTCP,ttcp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/twm/Makefile b/package/twm/Makefile
index 92456c6..d24a87a 100644
--- a/package/twm/Makefile
+++ b/package/twm/Makefile
@@ -19,9 +19,9 @@ PKG_ARCH_DEPENDS:= !cris !avr32 !m68k
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TWM,twm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+twm-install:
$(INSTALL_DIR) $(IDIR_TWM)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/twm \
$(IDIR_TWM)/usr/bin/
diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile
index 7bc3f5b..dc03802 100644
--- a/package/tzdata/Makefile
+++ b/package/tzdata/Makefile
@@ -25,7 +25,7 @@ PKGSD_DATE:= famous date utility
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TZDATA,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TZDATA,tzdata,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,ZDUMP,zdump,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZDUMP},${PKG_SECTION}))
$(eval $(call PKG_template,ZIC,zic,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ZIC},${PKG_SECTION}))
$(eval $(call PKG_template,DATE,date,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DATE},${PKG_SECTION}))
@@ -38,15 +38,9 @@ XAKE_FLAGS+= TOPDIR="${WRKINST}" TZDIR="${WRKINST}/usr/share/zoneinfo" cc="${TA
ALL_TARGET:= ALL
INSTALL_TARGET:= INSTALL
-post-install:
+tzdata-install:
$(INSTALL_DIR) $(IDIR_TZDATA)/usr/share $(IDIR_TZDATA)/etc
$(CP) $(WRKINST)/usr/share/zoneinfo $(IDIR_TZDATA)/usr/share
- ${INSTALL_DIR} ${IDIR_ZDUMP}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/etc/zdump ${IDIR_ZDUMP}/usr/sbin/
- ${INSTALL_DIR} ${IDIR_ZIC}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/etc/zic ${IDIR_ZIC}/usr/sbin/
- ${INSTALL_DIR} ${IDIR_DATE}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/bin/date ${IDIR_DATE}/usr/bin/
tz=; cd $(IDIR_TZDATA)/usr/share/zoneinfo || exit 1; \
for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
test -s "$$f" || continue; \
@@ -59,4 +53,16 @@ post-install:
$(IDIR_TZDATA)/etc/localtime; \
fi
+zdump-install:
+ ${INSTALL_DIR} ${IDIR_ZDUMP}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/etc/zdump ${IDIR_ZDUMP}/usr/sbin/
+
+zic-install:
+ ${INSTALL_DIR} ${IDIR_ZIC}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/etc/zic ${IDIR_ZIC}/usr/sbin/
+
+date-install:
+ ${INSTALL_DIR} ${IDIR_DATE}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/bin/date ${IDIR_DATE}/usr/bin/
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index dfb93f1..13c153e 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -13,6 +13,8 @@ PKG_URL:= http://cxx.uclibc.org/
PKG_SITES:= http://cxx.uclibc.org/src/
PKG_NEED_CXX:= 1
PKG_NOPARALLEL:= 1
+PKG_LIBNAME:= uclibc++
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -20,7 +22,7 @@ PKG_LIBC_DEPENDS:= uclibc
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,UCLIBCXX,uclibc++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,UCLIBCXX,uclibc++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 26ab231..cc6acf7 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -4,6 +4,7 @@
include $(TOPDIR)/rules.mk
include $(TOPDIR)/toolchain/uClibc/Makefile.inc
+PKG_NAME:= uclibc
PKG_DESCR:= embedded C library
PKG_SECTION:= base
PKG_OPTS:= noremove
diff --git a/package/udev/Makefile b/package/udev/Makefile
index b7e76d7..5a1a519 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -12,21 +12,22 @@ PKG_SECTION:= utils
PKG_BUILDDEP:= usbutils glib kmod
PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/kernel/hotplug/}
+PKG_OPTS:= dev
-PKG_CFLINE_UDEV:= depends on ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC
+PKG_LIBC_DEPENDS:= eglibc glibc musl
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,UDEV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_LDFLAGS+= -lrt
CONFIGURE_ARGS+= --disable-logging \
--with-pci-ids-path=/usr/share/pci.ids \
--disable-introspection
-post-install:
+udev-install:
${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
${INSTALL_DIR} ${IDIR_UDEV}/usr/lib ${IDIR_UDEV}/usr/libexec/udev
$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_UDEV)/usr/lib
diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile
index 0c370e8..393009d 100644
--- a/package/udp-broadcast-relay/Makefile
+++ b/package/udp-broadcast-relay/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://www.joachim-breitner.de/udp-broadcast-relay/files/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,UDP_BROADCAST_RELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,UDP_BROADCAST_RELAY,udp-broadcast-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile
index e3731e4..85cde12 100644
--- a/package/ussp-push/Makefile
+++ b/package/ussp-push/Makefile
@@ -17,12 +17,12 @@ PKG_ARCH_DEPENDS:= !avr32
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,USSP_PUSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
MAKE_FLAGS+= OBEXINC="${TARGET_CPPFLAGS}" \
OBEXLIB="${TARGET_LDFLAGS} -lopenobex -lbluetooth"
-post-install:
+ussp-push-install:
${INSTALL_DIR} ${IDIR_USSP_PUSH}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/ussp-push ${IDIR_USSP_PUSH}/usr/bin/
diff --git a/package/uvd/Makefile b/package/uvd/Makefile
index da5aea9..e782d9f 100644
--- a/package/uvd/Makefile
+++ b/package/uvd/Makefile
@@ -14,7 +14,7 @@ NO_DISTFILES:= 1
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,UVD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,UVD,uvd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index 17bed15..2aa1615 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -5,22 +5,30 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= v4l-utils
PKG_VERSION:= 0.9.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f4d24bb9f0307345d5a8fc4febcb993d
PKG_DESCR:= Video4Linux2 utilities
PKG_SECTION:= multimedia
PKG_BUILDDEP:= jpeg
PKG_SITES:= http://linuxtv.org/downloads/v4l-utils/
+PKG_LIBNAME:= libv4l
+PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_LIBC_DEPENDS:= eglibc glibc
+PKG_LIBC_DEPENDS:= eglibc glibc musl
PKG_SUBPKGS:= V4L_UTILS LIBV4L
+PKGSC_LIBV4L:= libs
+PKGSD_LIBV4L:= Video4Linux2 libraries
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,V4L_UTILS,v4l-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBV4L,libv4l,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBV4L,libv4l,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBV4L},${PKGSC_LIBV4L},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-qv4l2
TARGET_CPPFLAGS+= -DLINUX_I2C_DEV_H
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index 580647b..f936dcb 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -18,14 +18,14 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,VALGRIND,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VALGRIND,valgrind,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_file__proc_self_fd=yes \
ac_cv_file__proc_self_exe=yes \
ac_cv_file__proc_self_maps=yes
CONFIGURE_ARGS+= --disable-tls
-post-install:
+valgrind-install:
$(INSTALL_DIR) $(IDIR_VALGRIND)/usr/bin
$(INSTALL_DIR) $(IDIR_VALGRIND)/usr/lib/valgrind
$(INSTALL_BIN) $(WRKINST)/usr/bin/valgrind $(IDIR_VALGRIND)/usr/bin/
diff --git a/package/vgp/Makefile b/package/vgp/Makefile
index 5b13407..7a42680 100755
--- a/package/vgp/Makefile
+++ b/package/vgp/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= http://vgpd.freaknet.org/files/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VGP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VGP,vgp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+vgp-install:
${INSTALL_DIR} ${IDIR_VGP}/usr/bin/
${INSTALL_BIN} ${WRKINST}/usr/bin/vgpd ${IDIR_VGP}/usr/bin/
diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile
index 4899b35..f6454ca 100644
--- a/package/vilistextum/Makefile
+++ b/package/vilistextum/Makefile
@@ -15,9 +15,9 @@ PKG_SITES:= http://bhaak.dyndns.org/${PKG_NAME}/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VILISTEXTUM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VILISTEXTUM,vilistextum,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+vilistextum-install:
${INSTALL_DIR} ${IDIR_VILISTEXTUM}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/vilistextum \
${IDIR_VILISTEXTUM}/usr/bin/
diff --git a/package/vim/Makefile b/package/vim/Makefile
index a96c799..f78e1e8 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIST}/src
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VIM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VIM,vim,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS+= -lgcc
CONFIGURE_ENV+= vim_cv_toupper_broken=no \
@@ -57,7 +57,7 @@ XAKE_FLAGS+= prefix=/usr \
DESTDIR=${WRKINST} \
STRIP=:
-post-install:
+vim-install:
${INSTALL_DIR} ${IDIR_VIM}/usr/bin
${INSTALL_DIR} ${IDIR_VIM}/usr/share/vim
${CP} ${WRKINST}/usr/bin/{ex,vim,view} ${IDIR_VIM}/usr/bin
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile
index 2392c9b..33b54fc 100644
--- a/package/vnc-reflector/Makefile
+++ b/package/vnc-reflector/Makefile
@@ -18,7 +18,7 @@ WRKDIST= ${WRKDIR}/vnc_reflector
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VNC_REFLECTOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VNC_REFLECTOR,vnc-reflector,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile
index 5cd4349..caf65f0 100644
--- a/package/vnstat/Makefile
+++ b/package/vnstat/Makefile
@@ -13,7 +13,7 @@ PKG_SITES:= http://humdi.net/vnstat/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VNSTAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VNSTAT,vnstat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index 0c4fd12..1005473 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://www.unix-ag.uni-kl.de/~massar/vpnc/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VPNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VPNC,vpnc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= CC="${TARGET_CC}" \
@@ -24,7 +24,7 @@ XAKE_FLAGS+= CC="${TARGET_CC}" \
OS="Linux" \
PREFIX=/usr
-post-install:
+vpnc-install:
${CP} ${WRKINST}/* ${IDIR_VPNC}/
${CP} files/vpnc-route ${IDIR_VPNC}/etc/vpnc/
${CP} files/vpnc-script ${IDIR_VPNC}/etc/vpnc/
diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile
index 2c9aba5..a8de509 100644
--- a/package/vrrpd/Makefile
+++ b/package/vrrpd/Makefile
@@ -13,7 +13,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vrrpd/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VRRPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VRRPD,vrrpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index a275f1a..8c986c7 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -14,12 +14,12 @@ PKG_SITES:= http://security.appspot.com/downloads/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VSFTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VSFTPD,vsftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
ALL_TARGET:= vsftpd
-post-install:
+vsftpd-install:
${INSTALL_DIR} ${IDIR_VSFTPD}/etc ${IDIR_VSFTPD}/usr/sbin
${INSTALL_DATA} ./files/vsftpd.conf ${IDIR_VSFTPD}/etc/vsftpd.conf
${INSTALL_BIN} ${WRKINST}/usr/sbin/vsftpd ${IDIR_VSFTPD}/usr/sbin
diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index 9b4cd08..581bd49 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -17,7 +17,7 @@ PKG_HOST_DEPENDS:= !freebsd
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VTUN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,VTUN,vtun,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index 47d812d..2f67c40 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -13,12 +13,12 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc
TARGET_LDFLAGS+= -ltirpc
-post-install:
+watchdog-install:
${INSTALL_DIR} ${IDIR_WATCHDOG}/sbin ${IDIR_WATCHDOG}/etc/
${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/
${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \
diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index 88c2efb..fd64ef4 100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -13,12 +13,12 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=wccpd/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WCCPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WCCPD,wccpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# uClibc setpgrp does not take arguments
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
-post-install:
+wccpd-install:
${INSTALL_DIR} ${IDIR_WCCPD}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/wccpd ${IDIR_WCCPD}/usr/sbin/
diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile
index f973ad8..11f6a49 100644
--- a/package/wdfs/Makefile
+++ b/package/wdfs/Makefile
@@ -17,9 +17,9 @@ include ${TOPDIR}/mk/package.mk
TARGET_LDFLAGS+= -lpthread
-$(eval $(call PKG_template,WDFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WDFS,wdfs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+wdfs-install:
${INSTALL_DIR} ${IDIR_WDFS}/usr/bin
${CP} ${WRKINST}/usr/bin/wdfs ${IDIR_WDFS}/usr/bin
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index e3d2276..beab504 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= http://www.weechat.org/files/src/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WEECHAT,weechat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_LDFLAGS+= -liconv
CONFIGURE_ARGS+= --with-debug=0 \
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --with-debug=0 \
--disable-ruby \
--with-libiconv-prefix='${STAGING_TARGET_DIR}/usr'
-post-install:
+weechat-install:
${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/weechat-curses \
${IDIR_WEECHAT}/usr/bin/weechat
diff --git a/package/wget/Makefile b/package/wget/Makefile
index d9ab531..b03019b 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -23,7 +23,7 @@ PKGCB_WITH_GNUTLS:= gnutls
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WGET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WGET,wget,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq (${ADK_PACKAGE_WGET_WITHOUT_SSL},y)
CONFIGURE_ARGS+= --with-ssl=no
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --with-ssl=gnutls \
--with-libgnutls-prefix="$(STAGING_DIR)/usr"
endif
-post-install:
+wget-install:
${INSTALL_DIR} ${IDIR_WGET}/etc ${IDIR_WGET}/usr/bin
${INSTALL_DATA} ${WRKINST}/etc/wgetrc ${IDIR_WGET}/etc/
${INSTALL_BIN} ${WRKINST}/usr/bin/wget ${IDIR_WGET}/usr/bin
diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile
index d726a07..2b38090 100644
--- a/package/wifidog/Makefile
+++ b/package/wifidog/Makefile
@@ -15,13 +15,13 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WIFIDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WIFIDOG,wifidog,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes \
ac_cv_lib_nsl_main=no \
ac_cv_func_setvbuf_reversed=no
-post-install:
+wifidog-install:
${INSTALL_DIR} ${IDIR_WIFIDOG}/usr/{bin,lib} ${IDIR_WIFIDOG}/etc
${INSTALL_DATA} ./files/wifidog.conf ${IDIR_WIFIDOG}/etc/
${INSTALL_BIN} ${WRKBUILD}/scripts/init.d/wifidog \
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index 7e07fd1..fe22d9e 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/wireless_tools.29
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WIRELESS_TOOLS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
MAKE_FLAGS+= CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS} -I."
@@ -26,7 +26,7 @@ FAKE_FLAGS:= INSTALL_DIR="${WRKINST}/usr/sbin" \
INSTALL_INC="${WRKINST}/usr/include"
INSTALL_TARGET:= install-iwmulticall install-hdr install-dynamic
-post-install:
+wireless-tools-install:
${INSTALL_DIR} ${IDIR_WIRELESS_TOOLS}/usr/sbin
${INSTALL_DIR} ${IDIR_WIRELESS_TOOLS}/usr/lib
${INSTALL_DATA} ${WRKINST}/usr/lib/libiw.so.* \
diff --git a/package/wol/Makefile b/package/wol/Makefile
index 5df4c6b..bf7e85c 100644
--- a/package/wol/Makefile
+++ b/package/wol/Makefile
@@ -13,13 +13,13 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ahh/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WOL,wol,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= ac_cv_func_mmap_fixed_mapped=yes \
jm_cv_func_working_malloc=yes \
ac_cv_func_alloca_works=yes
-post-install:
+wol-install:
${INSTALL_DIR} ${IDIR_WOL}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/wol ${IDIR_WOL}/usr/bin/
diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile
index 126479d..b851e04 100644
--- a/package/wondershaper/Makefile
+++ b/package/wondershaper/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://lartc.org/wondershaper/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WONDERSHAPER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WONDERSHAPER,wondershaper,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/wput/Makefile b/package/wput/Makefile
index 0528177..183c339 100644
--- a/package/wput/Makefile
+++ b/package/wput/Makefile
@@ -15,12 +15,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WPUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,WPUT,wput,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-g-switch \
--without-ssl
-post-install:
+wput-install:
${INSTALL_DIR} ${IDIR_WPUT}/usr/bin
${INSTALL_BIN} ${WRKBUILD}/wput ${IDIR_WPUT}/usr/bin
diff --git a/package/xauth/Makefile b/package/xauth/Makefile
index b21b797..0a5bdf4 100644
--- a/package/xauth/Makefile
+++ b/package/xauth/Makefile
@@ -16,9 +16,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XAUTH,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XAUTH,xauth,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xauth-install:
$(INSTALL_DIR) $(IDIR_XAUTH)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/xauth $(IDIR_XAUTH)/usr/bin
diff --git a/package/xbindkeys/Makefile b/package/xbindkeys/Makefile
index c027c8f..6ed5aaa 100644
--- a/package/xbindkeys/Makefile
+++ b/package/xbindkeys/Makefile
@@ -14,14 +14,14 @@ PKG_SITES:= http://www.nongnu.org/xbindkeys/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XBINDKEYS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XBINDKEYS,xbindkeys,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-guile \
--disable-tk
CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes
TARGET_LDFLAGS+= -lX11
-post-install:
+xbindkeys-install:
$(INSTALL_DIR) $(IDIR_XBINDKEYS)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/xbindkeys \
$(IDIR_XBINDKEYS)/usr/bin
diff --git a/package/xbitmaps/Makefile b/package/xbitmaps/Makefile
index 2027eb5..39ac7e0 100644
--- a/package/xbitmaps/Makefile
+++ b/package/xbitmaps/Makefile
@@ -10,16 +10,10 @@ PKG_MD5SUM:= 288bbe310db67280a9e2e5ebc5602595
PKG_DESCR:= prerequiste for xsetroot
PKG_SECTION:= x11/libs
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XBITMAPS,xbitmaps,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
- ${INSTALL_DIR} ${IDIR_XBITMAPS}/usr/include
- ${CP} ${WRKINST}/usr/include/X11 ${IDIR_XBITMAPS}/usr/include
- ${INSTALL_DIR} ${IDIR_XBITMAPS}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xbitmaps.pc \
- ${IDIR_XBITMAPS}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xconsole/Makefile b/package/xconsole/Makefile
index 5019984..1ca79e4 100644
--- a/package/xconsole/Makefile
+++ b/package/xconsole/Makefile
@@ -15,9 +15,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XCONSOLE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XCONSOLE,xconsole,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xconsole-install:
$(INSTALL_DIR) $(IDIR_XCONSOLE)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/xconsole \
$(IDIR_XCONSOLE)/usr/bin
diff --git a/package/xdm/Makefile b/package/xdm/Makefile
index 84d7b0f..10d96a1 100644
--- a/package/xdm/Makefile
+++ b/package/xdm/Makefile
@@ -16,13 +16,13 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XDM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XDM,xdm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-random-device=/dev/urandom \
--with-utmp-file=/dev/null \
--with-wtmp-file=/dev/null
-post-install:
+xdm-install:
$(INSTALL_DIR) $(IDIR_XDM)/usr/lib/X11
$(CP) $(WRKINST)/usr/lib/X11/* \
$(IDIR_XDM)/usr/lib/X11
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index a2004d3..58c998e 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -19,9 +19,9 @@ PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_INPUT_EVDEV,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_INPUT_EVDEV,xf86-input-evdev,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xf86-input-evdev-install:
${INSTALL_DIR} ${IDIR_XF86_INPUT_EVDEV}/usr/lib/xorg/modules/input
${CP} ${WRKINST}/usr/lib/xorg/modules/input/evdev_drv.so \
${IDIR_XF86_INPUT_EVDEV}/usr/lib/xorg/modules/input/
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
index 13cfa6d..e097c77 100644
--- a/package/xf86-input-evtouch/Makefile
+++ b/package/xf86-input-evtouch/Makefile
@@ -21,9 +21,9 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_INPUT_EVTOUCH,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_INPUT_EVTOUCH,xf86-input-evtouch,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xf86-input-evtouch-install:
${INSTALL_DIR} ${IDIR_XF86_INPUT_EVTOUCH}/usr/lib/xorg/modules/input
${CP} ${WRKINST}/usr/lib/xorg/modules/input/evtouch_drv.so \
${IDIR_XF86_INPUT_EVTOUCH}/usr/lib/xorg/modules/input/
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index 20371d2..ee6a72c 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -19,9 +19,9 @@ PKG_CFLINE_XF86_INPUT_KEYBOARD:= depends on ADK_TARGET_WITH_INPUT
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_INPUT_KEYBOARD,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_INPUT_KEYBOARD,xf86-input-keyboard,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xf86-input-keyboard-install:
${INSTALL_DIR} ${IDIR_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input
${CP} ${WRKINST}/usr/lib/xorg/modules/input/kbd_drv.so \
${IDIR_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input/
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index b2ad6b4..b738e2d 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -19,9 +19,9 @@ PKG_CFLINE_XF86_INPUT_MOUSE:= depends on ADK_TARGET_WITH_INPUT
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_INPUT_MOUSE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_INPUT_MOUSE,xf86-input-mouse,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xf86-input-mouse-install:
${INSTALL_DIR} ${IDIR_XF86_INPUT_MOUSE}/usr/lib/xorg/modules/input
${CP} ${WRKINST}/usr/lib/xorg/modules/input/mouse_drv.so \
${IDIR_XF86_INPUT_MOUSE}/usr/lib/xorg/modules/input/
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index d73772a..592616a 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -19,11 +19,11 @@ PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_VIDEO_ATI,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_VIDEO_ATI,xf86-video-ati,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --enable-dri
-post-install:
+xf86-video-ati-install:
${INSTALL_DIR} ${IDIR_XF86_VIDEO_ATI}/usr/lib/xorg/modules/drivers
${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \
${IDIR_XF86_VIDEO_ATI}/usr/lib/xorg/modules/drivers/
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index 4a0fd7c..fa8d08c 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -19,9 +19,9 @@ PKG_CFLINE_XF86_VIDEO_CIRRUS:=depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_VIDEO_CIRRUS,xf86-video-cirrus,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xf86-video-cirrus-install:
${INSTALL_DIR} ${IDIR_XF86_VIDEO_CIRRUS}/usr/lib/xorg/modules/drivers
${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/cirrus_*.so \
${IDIR_XF86_VIDEO_CIRRUS}/usr/lib/xorg/modules/drivers/
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index f778611..74407d4 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -19,9 +19,9 @@ PKG_CFLINE_XF86_VIDEO_FBDEV:= depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_VIDEO_FBDEV,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_VIDEO_FBDEV,xf86-video-fbdev,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xf86-video-fbdev-install:
${INSTALL_DIR} ${IDIR_XF86_VIDEO_FBDEV}/usr/lib/xorg/modules/drivers
${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/fbdev_*.so \
${IDIR_XF86_VIDEO_FBDEV}/usr/lib/xorg/modules/drivers/
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index 44272fa..f2c34cd 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -19,9 +19,9 @@ PKG_CFLINE_XF86_VIDEO_GEODE:= depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_VIDEO_GEODE,xf86-video-geode,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xf86-video-geode-install:
${INSTALL_DIR} ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers
${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/geode_drv.so \
${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers/
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index cf5e342..e49d2e8 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -19,11 +19,11 @@ PKG_CFLINE_XF86_VIDEO_INTEL:=depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_VIDEO_INTEL,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_VIDEO_INTEL,xf86-video-intel,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --enable-dri
-post-install:
+xf86-video-intel-install:
${INSTALL_DIR} ${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers
${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \
${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers/
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index 79f8ac7..ad3e50e 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -19,9 +19,9 @@ PKG_CFLINE_XF86_VIDEO_SILICONMOTION:=depends on ADK_TARGET_WITH_VGA
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XF86_VIDEO_SILICONMOTION,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_VIDEO_SILICONMOTION,xf86-video-siliconmotion,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xf86-video-siliconmotion-install:
${INSTALL_DIR} ${IDIR_XF86_VIDEO_SILICONMOTION}/usr/lib/xorg/modules/drivers
${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/siliconmotion_*.so \
${IDIR_XF86_VIDEO_SILICONMOTION}/usr/lib/xorg/modules/drivers/
diff --git a/package/xf86dga/Makefile b/package/xf86dga/Makefile
index 7755817..731fb50 100644
--- a/package/xf86dga/Makefile
+++ b/package/xf86dga/Makefile
@@ -7,9 +7,13 @@ PKG_NAME:= xf86dga
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
PKG_MD5SUM:= ac30b5705f487554c5de0b466e846c31
+PKG_SECTION:= devel
PKG_BUILDDEP:= libXxf86dga
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_SUBPKGS:=
+PKG_OPTS:= dev devonly
include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86DGA,xf86dga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index e9cde9a..42fd4ef 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -20,7 +20,7 @@ PKG_TARGET_DEPENDS:= !atmel-ngw100
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,XFSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XFSPROGS,xfsprogs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
INSTALL_STYLE:= manual
TARGET_LDFLAGS+= -lrt
diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index 625800e..af603f7 100644
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://www.xinetd.org/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XINETD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --without-libwrap \
--with-loadavg
@@ -22,7 +22,7 @@ ALL_TARGET:= build
TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc
TARGET_LDFLAGS+= -ltirpc
-post-install:
+xinetd-install:
${INSTALL_DIR} ${IDIR_XINETD}/etc/xinetd.d ${IDIR_XINETD}/usr/sbin
${INSTALL_DATA} ./files/xinetd.conf ${IDIR_XINETD}/etc/xinetd.conf
${INSTALL_BIN} ${WRKINST}/usr/sbin/xinetd ${IDIR_XINETD}/usr/sbin/
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index 0d054a1..a623b18 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -19,12 +19,12 @@ PKG_ARCH_DEPENDS:= !cris !avr32 !m68k
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XINIT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XINIT,xinit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS:= --without-launchd
XAKE_FLAGS+= RAWCPP="$(TARGET_CROSS)cpp"
-post-install:
+xinit-install:
$(INSTALL_DIR) $(IDIR_XINIT)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/{xinit,startx} \
$(IDIR_XINIT)/usr/bin/
diff --git a/package/xinput/Makefile b/package/xinput/Makefile
index be4ba8d..76b8928 100644
--- a/package/xinput/Makefile
+++ b/package/xinput/Makefile
@@ -16,9 +16,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XINPUT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XINPUT,xinput,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xinput-install:
$(INSTALL_DIR) $(IDIR_XINPUT)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/xinput \
$(IDIR_XINPUT)/usr/bin
diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile
index 9039f73..45b1e2f 100644
--- a/package/xkbcomp/Makefile
+++ b/package/xkbcomp/Makefile
@@ -15,9 +15,9 @@ PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XKBCOMP,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xkbcomp-install:
${INSTALL_DIR} ${IDIR_XKBCOMP}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/xkbcomp ${IDIR_XKBCOMP}/usr/bin
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index e3d5f2b..68a89e3 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XKEYBOARD_CONFIG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XKEYBOARD_CONFIG,xkeyboard-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xkeyboard-config-install:
${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
${CP} ${WRKINST}/usr/share/X11/xkb/* \
${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
diff --git a/package/xlsfonts/Makefile b/package/xlsfonts/Makefile
index dcdd2cd..935452b 100644
--- a/package/xlsfonts/Makefile
+++ b/package/xlsfonts/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= http://xorg.freedesktop.org/releases/individual/app/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,XLSFONTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,XLSFONTS,xlsfonts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+xlsfonts-install:
${INSTALL_DIR} ${IDIR_XLSFONTS}/usr/bin
${CP} ${WRKINST}/usr/bin/xlsfonts \
${IDIR_XLSFONTS}/usr/bin
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index df2ebc3..c37014d 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -41,7 +41,7 @@ PKGCB_WITH_CRYPTO:= openssl
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y)
CONFIGURE_ARGS+= --with-sha1=libgcrypt
diff --git a/package/xrdb/Makefile b/package/xrdb/Makefile
index e663a6a..313ddb5 100644
--- a/package/xrdb/Makefile
+++ b/package/xrdb/Makefile
@@ -15,9 +15,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XRDB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XRDB,xrdb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xrdb-install:
$(INSTALL_DIR) $(IDIR_XRDB)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/xrdb \
$(IDIR_XRDB)/usr/bin
diff --git a/package/xset/Makefile b/package/xset/Makefile
index f563a4b..3f0e975 100644
--- a/package/xset/Makefile
+++ b/package/xset/Makefile
@@ -15,9 +15,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XSET,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XSET,xset,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xset-install:
$(INSTALL_DIR) $(IDIR_XSET)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/xset \
$(IDIR_XSET)/usr/bin
diff --git a/package/xsetroot/Makefile b/package/xsetroot/Makefile
index 7476cb5..8f0135c 100644
--- a/package/xsetroot/Makefile
+++ b/package/xsetroot/Makefile
@@ -15,9 +15,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XSETROOT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XSETROOT,xsetroot,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xsetroot-install:
$(INSTALL_DIR) $(IDIR_XSETROOT)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/xsetroot \
$(IDIR_XSETROOT)/usr/bin
diff --git a/package/xsm/Makefile b/package/xsm/Makefile
index 72da544..e8efee7 100644
--- a/package/xsm/Makefile
+++ b/package/xsm/Makefile
@@ -16,9 +16,9 @@ PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XSM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XSM,xsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xsm-install:
$(INSTALL_DIR) $(IDIR_XSM)/usr/lib/X11
$(CP) $(WRKINST)/usr/lib/X11/* \
$(IDIR_XSM)/usr/lib/X11
diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index c80cc8b..edb7d0a 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -18,11 +18,11 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XTERM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XTERM,xterm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-app-defaults=/usr/lib/X11/app-defaults
-post-install:
+xterm-install:
$(INSTALL_DIR) $(IDIR_XTERM)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/{koi8rxterm,resize,uxterm,xterm} \
$(IDIR_XTERM)/usr/bin/
diff --git a/package/xvidcore/Makefile b/package/xvidcore/Makefile
index e17bbe8..f745bf1 100644
--- a/package/xvidcore/Makefile
+++ b/package/xvidcore/Makefile
@@ -11,14 +11,14 @@ PKG_DESCR:= Xvid Codec library
PKG_SECTION:= libs
PKG_URL:= http://www.xvid.org/
PKG_SITES:= http://downloads.xvid.org/downloads/
-
-PKG_SUBPKGS:= LIBXVID
+PKG_LIBNAME:= libxvid
+PKG_OPTS:= dev
WRKDIST= $(WRKDIR)/$(PKG_NAME)/build/generic
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXVID,libxvid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXVID,libxvid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
libxvid-install:
$(INSTALL_DIR) $(IDIR_LIBXVID)/usr/lib
diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile
index 30a7964..0ffc44a 100644
--- a/package/xvinfo/Makefile
+++ b/package/xvinfo/Makefile
@@ -17,9 +17,9 @@ PKG_ARCH_DEPENDS:= !cris
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XVINFO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XVINFO,xvinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+xvinfo-install:
$(INSTALL_DIR) $(IDIR_XVINFO)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/xvinfo \
$(IDIR_XVINFO)/usr/bin
diff --git a/package/xz/Makefile b/package/xz/Makefile
index 3b83853..663e552 100644
--- a/package/xz/Makefile
+++ b/package/xz/Makefile
@@ -7,16 +7,17 @@ PKG_NAME:= xz
PKG_VERSION:= 5.0.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 60044a5701997e4e0904257197208ea9
-PKG_DESCR:= lzma compression utility
+PKG_DESCR:= xz compression utility
PKG_SECTION:= archive
PKG_URL:= http://tukaani.org/xz/
PKG_SITES:= http://tukaani.org/xz/
+PKG_OPTS:= dev
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,XZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-post-install:
+xz-install:
${INSTALL_DIR} ${IDIR_XZ}/usr/bin ${IDIR_XZ}/usr/lib
${CP} ${WRKINST}/usr/bin/* ${IDIR_XZ}/usr/bin
${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_XZ}/usr/lib
diff --git a/package/yajl/Makefile b/package/yajl/Makefile
index 4de6655..4b8394e 100644
--- a/package/yajl/Makefile
+++ b/package/yajl/Makefile
@@ -11,10 +11,11 @@ PKG_DESCR:= a small event-driven JSON parser written in ANSI C
PKG_SECTION:= libs
PKG_URL:= http://lloyd.github.com/yajl/
PKG_SITES:= http://openadk.org/distfiles/
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
diff --git a/package/zsh/Makefile b/package/zsh/Makefile
index cca1e71..6c55617 100644
--- a/package/zsh/Makefile
+++ b/package/zsh/Makefile
@@ -14,9 +14,9 @@ PKG_SITES:= ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,ZSH,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ZSH,zsh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+zsh-install:
$(INSTALL_DIR) $(IDIR_ZSH)/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/zsh $(IDIR_ZSH)/bin
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c
index 498709d..19bbbc0 100644
--- a/tools/adk/pkgmaker.c
+++ b/tools/adk/pkgmaker.c
@@ -462,7 +462,7 @@ int main() {
continue;
if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0)
continue;
- if ((parse_var(buf, "PKG_LIBNAME", pkg_libname, &pkg_libname)) == 0)
+ if ((parse_var(buf, "PKG_LIBNAME", pkg_libname, &pkg_libname)) == 0)
continue;
if ((parse_var(buf, "PKG_OPTS", pkg_opts, &pkg_opts)) == 0)
continue;
@@ -495,6 +495,11 @@ int main() {
}
}
+ /* when PKG_LIBNAME exist use this instead of PKG_NAME, but only for !libmix */
+ if (pkg_libname != NULL)
+ if (strstr(pkg_opts, "libmix") == NULL)
+ pkg_name = strdup(pkg_libname);
+
/* end of package Makefile parsing */
if (fclose(pkg) != 0)
perror("Failed to close file stream for Makefile");
@@ -502,6 +507,8 @@ int main() {
#if 0
if (pkg_name != NULL)
fprintf(stderr, "Package name is %s\n", pkg_name);
+ if (pkg_libname != NULL)
+ fprintf(stderr, "Package library name is %s\n", pkg_libname);
if (pkg_section != NULL)
fprintf(stderr, "Package section is %s\n", pkg_section);
if (pkg_descr != NULL)
@@ -559,7 +566,7 @@ int main() {
}
fprintf(cfg, "\n");
} else {
- fprintf(cfg, "ADK_PACKAGE_%s\n", toupperstr(pkgdirp->d_name));
+ fprintf(cfg, "ADK_PACKAGE_%s\n", toupperstr(pkg_name));
}
}
fprintf(cfg, "\tdefault n\n");
@@ -575,7 +582,7 @@ int main() {
if (pkg_subpkgs != NULL)
packages = tolowerstr(pkg_subpkgs);
else
- packages = strdup(pkgdirp->d_name);
+ packages = strdup(pkg_name);
token = strtok_r(packages, " ", &p_ptr);
while (token != NULL) {