From d279b5d1fe744cac44da7cd1b51f9ba6a2cc4647 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 22 Oct 2013 19:29:20 +0200 Subject: fix libmix packages, while checking all packages make some style cleanup --- package/ImageMagick/Makefile | 6 +++-- package/MesaLib/Makefile | 1 + package/alix-switch/Makefile | 3 ++- package/alix-temperature/Makefile | 3 ++- package/alsa-utils/Makefile | 4 ++-- package/apr-util/Makefile | 3 ++- package/avahi/Makefile | 4 ++++ package/axtls/Makefile | 10 +++++++-- package/beecrypt/Makefile | 7 +++--- package/bind/Makefile | 10 +++++++-- package/binutils/Makefile | 10 +++++++-- package/bison/Makefile | 4 ++-- package/bitlbee/Makefile | 4 ++-- package/bkeymaps/Makefile | 2 +- package/bluez-firmware/Makefile | 2 +- package/bluez/Makefile | 28 +++++++++++++++++------- package/bogofilter/Makefile | 2 +- package/boost/Makefile | 6 +---- package/busybox/Makefile | 2 +- package/bwm/Makefile | 2 +- package/bzip2/Makefile | 12 ++++++++-- package/bzr/Makefile | 2 +- package/ca-certificates/Makefile | 2 +- package/cairo/Makefile | 10 ++------- package/ccid/Makefile | 4 ++-- package/cfgfs/Makefile | 2 +- package/cgilib/Makefile | 7 +++--- package/cherokee/Makefile | 4 +--- package/chillispot/Makefile | 2 +- package/cluster-glue/Makefile | 2 +- package/cmake/Makefile | 2 +- package/collectd/Makefile | 4 ++-- package/comgt/Makefile | 2 +- package/confuse/Makefile | 8 +++---- package/conntrack-tools/Makefile | 4 ++-- package/cpio/Makefile | 2 +- package/cpufrequtils/Makefile | 4 ++-- package/cryptinit/Makefile | 2 +- package/cryptodev-linux/Makefile | 2 +- package/ctorrent/Makefile | 4 ++-- package/curl/Makefile | 6 ++++- package/cutter/Makefile | 2 +- package/cvs/Makefile | 2 +- package/dansguardian/Makefile | 2 +- package/daq/Makefile | 5 +++-- package/davfs2/Makefile | 2 +- package/deco/Makefile | 2 +- package/dhcp-forwarder/Makefile | 2 +- package/dialog/Makefile | 4 ++-- package/diffutils/Makefile | 4 ++-- package/digitemp/Makefile | 2 +- package/dillo/Makefile | 2 +- package/dnsmasq/Makefile | 2 +- package/dosfstools/Makefile | 2 +- package/dovecot/Makefile | 2 +- package/drbd/Makefile | 2 +- package/dropbear/Makefile | 2 +- package/dsniff/Makefile | 4 ++-- package/e2fsprogs/Makefile | 10 ++++----- package/ebtables/Makefile | 2 +- package/elinks/Makefile | 2 +- package/esound/Makefile | 7 +++--- package/ether-wake/Makefile | 2 +- package/ethtool/Makefile | 4 ++-- package/evieext/Makefile | 9 ++++++-- package/evilwm/Makefile | 4 ++-- package/ez-ipupdate/Makefile | 12 +++++----- package/fakeidentd/Makefile | 2 +- package/fbset/Makefile | 2 +- package/fetchmail/Makefile | 4 ++-- package/ffmpeg/Makefile | 12 ++++++++-- package/file/Makefile | 8 +++++-- package/findutils/Makefile | 8 ++++--- package/flac/Makefile | 10 ++++----- package/fltk/Makefile | 8 +++++-- package/fluxbox/Makefile | 4 ++-- package/font-adobe-100dpi/Makefile | 4 ++-- package/font-adobe-75dpi/Makefile | 4 ++-- package/font-bh-100dpi/Makefile | 4 ++-- package/font-bh-75dpi/Makefile | 4 ++-- package/font-bh-lucidatypewriter-100dpi/Makefile | 4 ++-- package/font-bh-lucidatypewriter-75dpi/Makefile | 4 ++-- package/font-bh-ttf/Makefile | 4 ++-- package/font-bh-type1/Makefile | 4 ++-- package/font-bitstream-100dpi/Makefile | 4 ++-- package/font-bitstream-75dpi/Makefile | 4 ++-- package/font-bitstream-type1/Makefile | 4 ++-- package/font-misc-misc/Makefile | 4 ++-- package/font-util/Makefile | 3 +-- package/font-xfree86-type1/Makefile | 4 ++-- package/fping/Makefile | 4 ++-- package/fprobe-ulog/Makefile | 2 +- package/fprobe/Makefile | 4 ++-- package/freeglut/Makefile | 7 +++--- package/freeradius-client/Makefile | 10 +++++---- package/freeradius-server/Makefile | 2 +- package/fribidi/Makefile | 5 +++-- package/frickin/Makefile | 2 +- package/fuse/Makefile | 4 ++++ package/gatling/Makefile | 2 +- package/gawk/Makefile | 4 ++-- package/gcc/Makefile | 5 +++-- package/gconf/Makefile | 4 +++- package/gdb/Makefile | 3 ++- package/gdbm/Makefile | 1 + package/gdbserver/Makefile | 4 ++-- package/gettext-tiny/Makefile | 3 ++- package/giflib/Makefile | 1 - package/git/Makefile | 4 ++-- package/glibc/Makefile | 1 + package/gmediaserver/Makefile | 2 +- package/gnupg/Makefile | 4 ++-- package/gnutls/Makefile | 18 ++++++++++++--- package/gperf/Makefile | 4 ++-- package/gpm/Makefile | 11 +++++++--- package/gpsd/Makefile | 12 +++++++--- package/grep/Makefile | 4 ++-- package/grub-bin/Makefile | 2 +- package/grub/Makefile | 4 ++-- package/gsm/Makefile | 14 +++++++++--- package/harfbuzz/Makefile | 3 ++- package/haserl/Makefile | 4 ++-- package/hdparm/Makefile | 4 ++-- package/heimdal/Makefile | 15 +++++++++---- package/heyu/Makefile | 2 +- package/htpdate/Makefile | 4 ++-- package/httping/Makefile | 4 ++-- package/httptunnel/Makefile | 4 ++-- package/huawei/Makefile | 2 +- package/i2c-tools/Makefile | 4 ++-- package/icecast/Makefile | 4 ++-- package/id3lib/Makefile | 8 +++++-- package/iftop/Makefile | 4 ++-- package/igmpproxy/Makefile | 4 ++-- package/imlib2/Makefile | 5 +++-- package/installer/Makefile | 2 +- package/intltool/Makefile | 4 ++-- package/ipcad/Makefile | 4 ++-- package/iperf/Makefile | 4 ++-- package/ipsec-tools/Makefile | 4 ++-- package/ipset/Makefile | 4 ++-- package/iptables-snmp/Makefile | 4 ++-- package/iptraf/Makefile | 2 +- package/irssi/Makefile | 4 ++-- package/iw/Makefile | 4 ++-- package/joe/Makefile | 19 +++++----------- package/jpeg/Makefile | 1 + package/kexecinit/Makefile | 2 +- package/keychain/Makefile | 2 +- package/keyutils/Makefile | 4 ++-- package/kismet/Makefile | 10 +++++++-- package/kmod/Makefile | 3 ++- package/knock/Makefile | 4 +++- package/l2tpns/Makefile | 4 ++-- package/lame/Makefile | 9 +++++++- package/less/Makefile | 2 +- package/libICE/Makefile | 1 + package/libIDL/Makefile | 1 + package/libSM/Makefile | 1 + package/libX11/Makefile | 1 + package/libXScrnSaver/Makefile | 1 + package/libXau/Makefile | 1 + package/libXaw/Makefile | 1 + package/libXcomposite/Makefile | 1 + package/libXcursor/Makefile | 1 + package/libXdamage/Makefile | 1 + package/libXdmcp/Makefile | 1 + package/libXext/Makefile | 1 + package/libXfixes/Makefile | 1 + package/libXfont/Makefile | 1 + package/libXft/Makefile | 1 + package/libXi/Makefile | 1 + package/libXinerama/Makefile | 1 + package/libXmu/Makefile | 1 + package/libXp/Makefile | 1 + package/libXpm/Makefile | 1 + package/libXrandr/Makefile | 2 ++ package/libXrender/Makefile | 1 + package/libXt/Makefile | 1 + package/libXtst/Makefile | 1 + package/libXv/Makefile | 1 + package/libXxf86dga/Makefile | 1 + package/libXxf86vm/Makefile | 1 + package/libcapi20/Makefile | 2 +- package/libgcc/Makefile | 8 ------- package/libgd/Makefile | 1 + package/liblzo/Makefile | 1 + package/libmad/Makefile | 2 +- package/libpri/Makefile | 2 +- package/libpthread/Makefile | 2 -- package/librt/Makefile | 2 -- package/libssp/Makefile | 2 -- package/libtool/Makefile | 4 ++++ package/libusb/Makefile | 1 + package/libxcb/Makefile | 2 +- package/libxml2/Makefile | 4 ++++ package/libxslt/Makefile | 4 ++++ package/links/Makefile | 4 ++-- package/linux-atm/Makefile | 6 ++++- package/llvm/Makefile | 5 +---- package/lm_sensors/Makefile | 4 ++++ package/logrotate/Makefile | 4 ++-- package/lrzsz/Makefile | 2 +- package/lsof/Makefile | 2 +- package/lua/Makefile | 6 ++++- package/lvm/Makefile | 4 ++++ package/lynx/Makefile | 4 ++-- package/lzop/Makefile | 2 +- package/macchanger/Makefile | 4 ++-- package/madplay/Makefile | 4 ++-- package/make/Makefile | 2 +- package/maradns/Makefile | 4 ++-- package/mc/Makefile | 4 ++-- package/mdadm/Makefile | 4 ++-- package/mgetty/Makefile | 2 +- package/miau/Makefile | 4 ++-- package/miax/Makefile | 2 +- package/microperl/Makefile | 2 +- package/mini_sendmail/Makefile | 2 +- package/miredo/Makefile | 4 +++- package/mkfontdir/Makefile | 4 ++-- package/mkfontscale/Makefile | 4 ++-- package/mksh/Makefile | 2 +- package/moc/Makefile | 4 ++-- package/motion/Makefile | 4 ++-- package/mpc/Makefile | 4 ++-- package/mpd/Makefile | 2 +- package/mpg123/Makefile | 4 ++-- package/mplayer/Makefile | 4 ++-- package/mrd6/Makefile | 7 ++++-- package/mt-daapd/Makefile | 4 ++-- package/mtd/Makefile | 2 +- package/mtr/Makefile | 4 ++-- package/musl/Makefile | 1 + package/mutt/Makefile | 4 ++-- package/mxml/Makefile | 6 ++--- package/nand/Makefile | 2 +- package/nano/Makefile | 4 ++-- package/nasm/Makefile | 4 ++-- package/ndisc/Makefile | 8 +++++-- package/net-snmp/Makefile | 8 ++++++- package/netcat/Makefile | 4 ++-- package/netperf/Makefile | 4 ++-- package/netstat-nat/Makefile | 4 ++-- package/nfs-utils/Makefile | 4 ++-- package/nmap/Makefile | 4 ++-- package/nss/Makefile | 2 +- package/ntfs-3g/Makefile | 4 ++-- package/ntpclient/Makefile | 2 +- package/nut/Makefile | 4 ++-- package/obexftp/Makefile | 22 +++++++++---------- package/open-iscsi/Makefile | 4 ++-- package/openct/Makefile | 4 ++++ package/openldap/Makefile | 4 ++++ package/openntpd/Makefile | 2 +- package/openobex/Makefile | 9 ++++---- package/opensc/Makefile | 4 ++++ package/openssl-pkcs11/Makefile | 4 ++-- package/openssl/Makefile | 2 +- package/openswan/Makefile | 4 ++-- package/openvpn/Makefile | 6 ++--- package/oprofile/Makefile | 4 ++-- package/osiris/Makefile | 8 +++---- package/owfs/Makefile | 4 ++-- package/p5-XML-Parser/Makefile | 4 ++-- package/p910nd/Makefile | 2 +- package/pacemaker-mgmt/Makefile | 17 ++++++-------- package/pacemaker/Makefile | 4 ++-- package/pam/Makefile | 3 ++- package/parprouted/Makefile | 2 +- package/parted/Makefile | 4 ++-- package/patch/Makefile | 4 ++-- package/pciutils/Makefile | 2 +- package/pcmciautils/Makefile | 4 ++-- package/pcre/Makefile | 4 ++++ package/pcrepp/Makefile | 7 +++--- package/pdnsd/Makefile | 4 ++-- package/perl/Makefile | 6 ++--- package/picocom/Makefile | 2 +- package/pipacs/Makefile | 4 ++-- package/pkg-config/Makefile | 4 ++-- package/pm-utils/Makefile | 4 ++-- package/pmacct/Makefile | 8 ++++++- package/poppler/Makefile | 3 ++- package/portsentry/Makefile | 2 +- package/ppp/Makefile | 2 +- package/pptp/Makefile | 2 +- package/pptpd/Makefile | 4 ++-- package/privoxy/Makefile | 4 ++-- package/procmail/Makefile | 2 +- package/procps/Makefile | 4 ++-- package/proftpd/Makefile | 4 ++-- package/ptunnel/Makefile | 4 ++-- package/python/Makefile | 4 ++-- package/python2/Makefile | 8 +++---- package/qemu/Makefile | 4 ++-- package/qingy/Makefile | 4 ++-- package/quagga/Makefile | 14 +++++++++++- package/raddump/Makefile | 4 ++-- package/radvd/Makefile | 4 ++-- package/rarpd/Makefile | 4 ++-- package/rdate/Makefile | 4 ++-- package/rdesktop/Makefile | 2 +- package/reaim/Makefile | 4 ++-- package/resource-agents/Makefile | 4 ++-- package/rng-tools/Makefile | 2 +- package/rp-pppoe/Makefile | 8 ++++++- package/rpcbind/Makefile | 4 ++-- package/rrdcollect/Makefile | 2 +- package/rrdtool/Makefile | 8 ++++++- package/rsync/Makefile | 4 ++-- package/rtorrent/Makefile | 2 +- package/ruby/Makefile | 4 ++-- package/rxvt-unicode/Makefile | 4 ++-- package/samba/Makefile | 12 +++++++--- package/scanlogd/Makefile | 2 +- package/screen/Makefile | 4 ++-- package/scsi-spin/Makefile | 2 +- package/ser2net/Makefile | 4 ++-- package/serdisplib/Makefile | 2 +- package/setpwc/Makefile | 2 +- package/setserial/Makefile | 2 +- package/setxkbmap/Makefile | 4 ++-- package/shat/Makefile | 2 +- package/shorewall-shell/Makefile | 2 +- package/siproxd/Makefile | 4 ++-- package/sipsak/Makefile | 4 ++-- package/sispmctl/Makefile | 4 ++-- package/snort/Makefile | 4 ++-- package/socat/Makefile | 4 ++-- package/speex/Makefile | 6 ++--- package/sqlite/Makefile | 21 ++++++++---------- package/squid/Makefile | 18 +++++++-------- package/srelay/Makefile | 2 +- package/ssltunnel/Makefile | 4 ++-- package/ssmtp/Makefile | 2 +- package/strace/Makefile | 2 +- package/stress/Makefile | 4 ++-- package/strongswan/Makefile | 4 ++-- package/sudo/Makefile | 4 ++-- package/syslinux/Makefile | 6 ++--- package/syslog-ng/Makefile | 4 ++-- package/sysstat/Makefile | 4 ++-- package/taglib/Makefile | 3 ++- package/tar/Makefile | 4 ++-- package/tcp_wrappers/Makefile | 6 ++--- package/tcpdump/Makefile | 4 ++-- package/tcsh/Makefile | 4 ++-- package/tinc/Makefile | 4 ++-- package/tinycdb/Makefile | 7 +++--- package/tinyproxy/Makefile | 4 ++-- package/tinyxml/Makefile | 3 ++- package/tmsnc/Makefile | 4 ++-- package/tor/Makefile | 4 ++-- package/totd/Makefile | 4 ++-- package/tptest/Makefile | 2 +- package/traceroute/Makefile | 4 ++-- package/trafshow/Makefile | 2 +- package/tslib/Makefile | 5 +++-- package/ttcp/Makefile | 2 +- package/twm/Makefile | 4 ++-- package/tzdata/Makefile | 22 ++++++++++++------- package/uclibc++/Makefile | 4 +++- package/uclibc/Makefile | 1 + package/udev/Makefile | 7 +++--- package/udp-broadcast-relay/Makefile | 2 +- package/ussp-push/Makefile | 4 ++-- package/uvd/Makefile | 2 +- package/v4l-utils/Makefile | 14 +++++++++--- package/valgrind/Makefile | 4 ++-- package/vgp/Makefile | 4 ++-- package/vilistextum/Makefile | 4 ++-- package/vim/Makefile | 4 ++-- package/vnc-reflector/Makefile | 2 +- package/vnstat/Makefile | 2 +- package/vpnc/Makefile | 4 ++-- package/vrrpd/Makefile | 2 +- package/vsftpd/Makefile | 4 ++-- package/vtun/Makefile | 2 +- package/watchdog/Makefile | 4 ++-- package/wccpd/Makefile | 4 ++-- package/wdfs/Makefile | 4 ++-- package/weechat/Makefile | 4 ++-- package/wget/Makefile | 4 ++-- package/wifidog/Makefile | 4 ++-- package/wireless-tools/Makefile | 4 ++-- package/wol/Makefile | 4 ++-- package/wondershaper/Makefile | 2 +- package/wput/Makefile | 4 ++-- package/xauth/Makefile | 4 ++-- package/xbindkeys/Makefile | 4 ++-- package/xbitmaps/Makefile | 8 +------ package/xconsole/Makefile | 4 ++-- package/xdm/Makefile | 4 ++-- package/xf86-input-evdev/Makefile | 4 ++-- package/xf86-input-evtouch/Makefile | 4 ++-- package/xf86-input-keyboard/Makefile | 4 ++-- package/xf86-input-mouse/Makefile | 4 ++-- package/xf86-video-ati/Makefile | 4 ++-- package/xf86-video-cirrus/Makefile | 4 ++-- package/xf86-video-fbdev/Makefile | 4 ++-- package/xf86-video-geode/Makefile | 4 ++-- package/xf86-video-intel/Makefile | 4 ++-- package/xf86-video-siliconmotion/Makefile | 4 ++-- package/xf86dga/Makefile | 6 ++++- package/xfsprogs/Makefile | 2 +- package/xinetd/Makefile | 4 ++-- package/xinit/Makefile | 4 ++-- package/xinput/Makefile | 4 ++-- package/xkbcomp/Makefile | 4 ++-- package/xkeyboard-config/Makefile | 4 ++-- package/xlsfonts/Makefile | 4 ++-- package/xorg-server/Makefile | 2 +- package/xrdb/Makefile | 4 ++-- package/xset/Makefile | 4 ++-- package/xsetroot/Makefile | 4 ++-- package/xsm/Makefile | 4 ++-- package/xterm/Makefile | 4 ++-- package/xvidcore/Makefile | 6 ++--- package/xvinfo/Makefile | 4 ++-- package/xz/Makefile | 7 +++--- package/yajl/Makefile | 3 ++- package/zsh/Makefile | 4 ++-- tools/adk/pkgmaker.c | 13 ++++++++--- 424 files changed, 1020 insertions(+), 755 deletions(-) diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 2ede37ebc..e2b24a587 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 e69d274cf..9a8d4420a 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 fb5c4c862..8beb7837e 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 7fb906635..e877241b3 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 16520ec54..d1f2a7144 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 990464f50..3df9a52bf 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 ba5db4f04..e5a910fac 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 6cb716b3c..11166e6ab 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 258d070ba..4a6182384 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 67f6d7a03..8c0821a89 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 de0910fca..e429001bf 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 a1326ece7..5bc18eae0 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 016f1b6e7..e77548913 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 8d6acb498..1c5f93155 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 56ce5d5ed..a04cec163 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 092cd03ac..d8a0b540f 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 43d257564..109675e43 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 6de8a1abf..b47de4936 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 bda0c0165..53fc4b08b 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 119f23c11..6f52a137c 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 e842e7bc4..73a41a443 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 c6b3bcb5a..2875092ab 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 bbb8a84da..4eeacf740 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 7483bb7e2..62c2c3b32 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 3d8ca72e8..55c81fa12 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 271827704..bea53dc64 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 7fd1dc97a..88fe75938 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 7b74b7fa0..b849f1b3e 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 2b5e15872..561058088 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 f02b5e8d0..f4998efc2 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 204d02903..379a762c9 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 af8ffaf3d..d37bb30ea 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 2a9af5a95..cc2041150 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 289bc0d0c..f558ce612 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 aeac0f2d2..6cd5d4175 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 9215765e3..120c5f0b3 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 3e8af5585..a3b8d4385 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 6ee1ff5bb..9cb15f95f 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 7daada275..d694ac3a2 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 c9ee5e875..470e159ca 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 75fab01fa..f2fb4d573 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 0a7bc0d94..c87667822 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 8c39a3de4..fd62d7e27 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 86d8e979a..968b1114a 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 f6bcd0501..2ea031810 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 b3a1dbcda..b49a04fb0 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 a8c3086dd..5aa535a9d 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 de365f1bf..a681a07a7 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 774af32ad..91e27fe65 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 66fa3c9f6..91aa25df7 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 c771708c4..8a7b04b55 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