summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/6tunnel/Makefile2
-rw-r--r--package/Config.in3
-rw-r--r--package/aiccu/Makefile2
-rw-r--r--package/aircrack-ng/Makefile2
-rw-r--r--package/alsa-lib/Makefile2
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/apr-util/Makefile2
-rw-r--r--package/apr/Makefile2
-rw-r--r--package/arpd/Makefile2
-rw-r--r--package/arpwatch/Makefile2
-rw-r--r--package/asterisk/Makefile22
-rw-r--r--package/atftp/Makefile4
-rw-r--r--package/autossh/Makefile2
-rw-r--r--package/avahi/Makefile6
-rw-r--r--package/axtls/Makefile4
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/bash/Makefile2
-rw-r--r--package/bc/Makefile4
-rw-r--r--package/bind/Makefile18
-rw-r--r--package/binutils/Makefile2
-rw-r--r--package/bitlbee/Makefile2
-rw-r--r--package/bluez-firmware/Makefile2
-rw-r--r--package/bluez/Makefile2
-rw-r--r--package/bogofilter/Makefile2
-rw-r--r--package/bridge-utils/Makefile2
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/bwm/Makefile2
-rw-r--r--package/cbtt/Makefile4
-rw-r--r--package/cfgfs/Makefile2
-rw-r--r--package/cgilib/Makefile2
-rw-r--r--package/chillispot/Makefile2
-rw-r--r--package/collectd/Makefile2
-rw-r--r--package/comgt/Makefile2
-rw-r--r--package/cryptsetup/Makefile2
-rwxr-xr-xpackage/ctorrent/Makefile2
-rw-r--r--package/cups/Makefile2
-rw-r--r--package/curl/Makefile4
-rwxr-xr-xpackage/cutter/Makefile2
-rw-r--r--package/cxxtools/Makefile2
-rw-r--r--package/cyrus-sasl/Makefile2
-rw-r--r--package/davfs2/Makefile2
-rw-r--r--package/dbus/Makefile2
-rw-r--r--package/deco/Makefile2
-rw-r--r--package/device-mapper/Makefile2
-rw-r--r--package/dhcp-forwarder/Makefile2
-rw-r--r--package/dhcp/Makefile4
-rw-r--r--package/dhcp6/Makefile2
-rw-r--r--package/digitemp/Makefile2
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dosfstools/Makefile2
-rw-r--r--package/dovecot/Makefile2
-rw-r--r--package/dropbear/Makefile13
-rw-r--r--package/dsniff/Makefile2
-rw-r--r--package/e2fsprogs/Makefile6
-rw-r--r--package/elinks/Makefile2
-rw-r--r--package/em28xx/Makefile2
-rw-r--r--package/esound/Makefile2
-rw-r--r--package/ether-wake/Makefile2
-rw-r--r--package/ethtool/Makefile2
-rw-r--r--package/exmap/Makefile8
-rw-r--r--package/expat/Makefile2
-rw-r--r--package/ez-ipupdate/Makefile2
-rw-r--r--package/faad2/Makefile2
-rw-r--r--package/fakeidentd/Makefile2
-rw-r--r--package/fbset/Makefile2
-rw-r--r--package/fetchmail/Makefile2
-rw-r--r--package/ffmpeg/Makefile2
-rw-r--r--package/file/Makefile2
-rw-r--r--package/flac/Makefile2
-rw-r--r--package/fping/Makefile2
-rw-r--r--package/fprobe-ulog/Makefile2
-rw-r--r--package/fprobe/Makefile2
-rw-r--r--package/freeradius/Makefile44
-rw-r--r--package/freetype/Makefile2
-rw-r--r--package/frickin/Makefile2
-rw-r--r--package/fuse/Makefile2
-rw-r--r--package/gatling/Makefile2
-rw-r--r--package/gcc/Makefile2
-rw-r--r--package/gdb/Makefile2
-rw-r--r--package/gdbserver/Makefile2
-rw-r--r--package/gettext/Makefile2
-rw-r--r--package/gkrellmd/Makefile2
-rw-r--r--package/glib/Makefile2
-rw-r--r--package/glib2/Makefile2
-rw-r--r--package/glibc/Makefile2
-rw-r--r--package/gmediaserver/Makefile2
-rw-r--r--package/gmp/Makefile2
-rw-r--r--package/gnutls/Makefile10
-rw-r--r--package/gpg/Makefile2
-rw-r--r--package/gpm/Makefile2
-rw-r--r--package/gpsd/Makefile4
-rw-r--r--package/gsm/Makefile4
-rw-r--r--package/haserl/Makefile2
-rw-r--r--package/hdparm/Makefile2
-rw-r--r--package/heimdal/Makefile6
-rw-r--r--package/heyu/Makefile2
-rw-r--r--package/hostapd/Makefile4
-rw-r--r--package/htpdate/Makefile2
-rw-r--r--package/httping/Makefile2
-rw-r--r--package/httptunnel/Makefile2
-rw-r--r--package/icecast/Makefile2
-rw-r--r--package/id3lib/Makefile2
-rw-r--r--package/iftop/Makefile2
-rw-r--r--package/igmpproxy/Makefile2
-rw-r--r--package/ipcad/Makefile2
-rw-r--r--package/iperf/Makefile2
-rw-r--r--package/iproute2/Makefile4
-rw-r--r--package/ipsec-tools/Makefile2
-rw-r--r--package/ipset/Makefile2
-rw-r--r--package/iptables-snmp/Makefile2
-rw-r--r--package/iptables/Makefile6
-rw-r--r--package/iptraf/Makefile2
-rw-r--r--package/irssi/Makefile2
-rw-r--r--package/iw/Makefile2
-rw-r--r--package/jamvm/Makefile2
-rw-r--r--package/jpeg/Makefile2
-rw-r--r--package/kismet/Makefile8
-rw-r--r--package/knock/Makefile4
-rw-r--r--package/krb5/Makefile4
-rw-r--r--package/l2tpns/Makefile2
-rw-r--r--package/lame/Makefile4
-rw-r--r--package/less/Makefile2
-rw-r--r--package/libICE/Makefile2
-rw-r--r--package/libSM/Makefile2
-rw-r--r--package/libX11/Makefile2
-rw-r--r--package/libXau/Makefile2
-rw-r--r--package/libXaw/Makefile2
-rw-r--r--package/libXdmcp/Makefile2
-rw-r--r--package/libXext/Makefile2
-rw-r--r--package/libXfont/Makefile2
-rw-r--r--package/libXmu/Makefile2
-rw-r--r--package/libXpm/Makefile2
-rw-r--r--package/libXt/Makefile2
-rw-r--r--package/libXxf86dga/Makefile2
-rw-r--r--package/libao/Makefile2
-rw-r--r--package/libart/Makefile2
-rw-r--r--package/libaudiofile/Makefile2
-rwxr-xr-xpackage/libcli/Makefile2
-rw-r--r--package/libdaemon/Makefile2
-rw-r--r--package/libdb/Makefile2
-rw-r--r--package/libdnet/Makefile2
-rw-r--r--package/libelf/Makefile2
-rw-r--r--package/libevent/Makefile2
-rw-r--r--package/libffi/Makefile2
-rw-r--r--package/libfontenc/Makefile2
-rw-r--r--package/libgcrypt/Makefile2
-rw-r--r--package/libgd/Makefile2
-rw-r--r--package/libgdbm/Makefile2
-rw-r--r--package/libgpg-error/Makefile2
-rw-r--r--package/libgssglue/Makefile2
-rw-r--r--package/libiconv/Makefile2
-rw-r--r--package/libid3tag/Makefile2
-rw-r--r--package/liblzo/Makefile2
-rw-r--r--package/libmad/Makefile2
-rw-r--r--package/libnet/Makefile2
-rw-r--r--package/libnfsidmap/Makefile2
-rw-r--r--package/libnids/Makefile2
-rw-r--r--package/libnl/Makefile2
-rw-r--r--package/libogg/Makefile2
-rw-r--r--package/libol/Makefile2
-rw-r--r--package/libosip2/Makefile2
-rw-r--r--package/libowfat/Makefile2
-rw-r--r--package/libp11/Makefile2
-rw-r--r--package/libpcap/Makefile2
-rw-r--r--package/libpciaccess/Makefile2
-rw-r--r--package/libpng/Makefile2
-rw-r--r--package/libpri/Makefile2
-rw-r--r--package/libpthread/Makefile2
-rw-r--r--package/librpcsecgss/Makefile2
-rw-r--r--package/libshout/Makefile2
-rw-r--r--package/libsigc++/Makefile2
-rw-r--r--package/libstdcxx/Makefile2
-rw-r--r--package/libtasn1/Makefile2
-rw-r--r--package/libthread_db/Makefile2
-rw-r--r--package/libtiff/Makefile2
-rw-r--r--package/libtirpc/Makefile2
-rw-r--r--package/libtool/Makefile2
-rw-r--r--package/libtorrent/Makefile2
-rw-r--r--package/libupnp/Makefile2
-rw-r--r--package/libusb/Makefile2
-rw-r--r--package/libvorbis/Makefile4
-rw-r--r--package/libvorbisidec/Makefile2
-rw-r--r--package/libxkbfile/Makefile2
-rw-r--r--package/libxml2/Makefile2
-rw-r--r--package/libxslt/Makefile2
-rw-r--r--package/lighttpd/Makefile34
-rw-r--r--package/links/Makefile2
-rw-r--r--package/linux-atm/Makefile4
-rw-r--r--package/logrotate/Makefile2
-rw-r--r--package/lrzsz/Makefile2
-rw-r--r--package/ltp/Makefile2
-rw-r--r--package/lua/Makefile8
-rw-r--r--package/lvm/Makefile2
-rw-r--r--package/lynx/Makefile2
-rw-r--r--package/mac80211/Makefile6
-rwxr-xr-xpackage/macchanger/Makefile2
-rw-r--r--package/madplay/Makefile2
-rw-r--r--package/maradns/Makefile2
-rw-r--r--package/mc/Makefile2
-rw-r--r--package/mgetty/Makefile2
-rw-r--r--package/miau/Makefile2
-rw-r--r--package/miax/Makefile2
-rw-r--r--package/microperl/Makefile2
-rw-r--r--package/mini_httpd/Makefile6
-rw-r--r--package/mini_sendmail/Makefile2
-rw-r--r--package/miredo/Makefile4
-rw-r--r--package/mksh/Makefile2
-rw-r--r--package/moc/Makefile2
-rw-r--r--package/monit/Makefile2
-rw-r--r--package/motion/Makefile2
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mpfr/Makefile2
-rw-r--r--package/mplayer/Makefile2
-rw-r--r--package/mrd6/Makefile2
-rw-r--r--package/mt-daapd/Makefile2
-rw-r--r--package/mtr/Makefile2
-rw-r--r--package/mutt/Makefile2
-rw-r--r--package/mysql/Makefile2
-rw-r--r--package/nano/Makefile2
-rw-r--r--package/ncurses/Makefile2
-rw-r--r--package/ndisc/Makefile6
-rw-r--r--package/neon/Makefile2
-rw-r--r--package/net-snmp/Makefile6
-rw-r--r--package/netperf/Makefile2
-rw-r--r--package/netstat-nat/Makefile2
-rw-r--r--package/nfs-utils/Makefile2
-rw-r--r--package/nmap/Makefile2
-rw-r--r--package/nocatsplash/Makefile2
-rw-r--r--package/ntfs-3g/Makefile2
-rw-r--r--package/ntpclient/Makefile2
-rw-r--r--package/nut/Makefile2
-rw-r--r--package/obexftp/Makefile2
-rw-r--r--package/olsrd/Makefile10
-rw-r--r--package/opencdk/Makefile2
-rw-r--r--package/openct/Makefile2
-rw-r--r--package/openldap/Makefile6
-rw-r--r--package/openntpd/Makefile2
-rw-r--r--package/openobex/Makefile2
-rw-r--r--package/opensc/Makefile2
-rw-r--r--package/opensips/Makefile46
-rw-r--r--package/openssh/Makefile10
-rw-r--r--package/openssl-pkcs11/Makefile2
-rw-r--r--package/openssl/Makefile6
-rw-r--r--package/openswan/Makefile2
-rw-r--r--package/openvpn/Makefile4
-rw-r--r--package/oprofile/Makefile2
-rw-r--r--package/osiris/Makefile2
-rw-r--r--package/owfs/Makefile2
-rw-r--r--package/p910nd/Makefile2
-rw-r--r--package/palantir/Makefile2
-rw-r--r--package/parprouted/Makefile2
-rw-r--r--package/pciutils/Makefile2
-rw-r--r--package/pcre/Makefile2
-rw-r--r--package/php/Config.in1
-rw-r--r--package/php/Makefile30
-rw-r--r--package/picocom/Makefile2
-rw-r--r--package/pipacs/Makefile2
-rw-r--r--package/pixman/Makefile2
-rw-r--r--package/pmacct/Makefile22
-rw-r--r--package/popt/Makefile2
-rw-r--r--package/portmap/Makefile2
-rw-r--r--package/portsentry/Makefile2
-rw-r--r--package/postgresql/Makefile2
-rw-r--r--package/ppp/Makefile16
-rw-r--r--package/pptp/Makefile2
-rw-r--r--package/pptpd/Makefile2
-rw-r--r--package/privoxy/Makefile2
-rw-r--r--package/procmail/Makefile2
-rw-r--r--package/procps/Makefile2
-rw-r--r--package/ptunnel/Makefile2
-rw-r--r--package/quagga/Makefile14
-rwxr-xr-xpackage/raddump/Makefile2
-rw-r--r--package/radiusclient-ng/Makefile4
-rw-r--r--package/radvd/Makefile2
-rw-r--r--package/rarpd/Makefile2
-rw-r--r--package/rdate/Makefile2
-rw-r--r--package/readline/Makefile2
-rw-r--r--package/reaim/Makefile2
-rw-r--r--package/rp-pppoe/Makefile8
-rw-r--r--package/rrdcollect/Makefile4
-rw-r--r--package/rrdtool/Makefile6
-rw-r--r--package/rrs/Makefile4
-rw-r--r--package/rsync/Makefile2
-rw-r--r--package/rtorrent/Makefile2
-rw-r--r--package/ruby/Makefile2
-rw-r--r--package/samba/Makefile6
-rw-r--r--package/sane-backends/Makefile120
-rw-r--r--package/scanlogd/Makefile2
-rw-r--r--package/scdp/Makefile2
-rw-r--r--package/screen/Makefile2
-rw-r--r--package/scsi-spin/Makefile2
-rw-r--r--package/ser2net/Makefile2
-rw-r--r--package/serdisplib/Makefile2
-rw-r--r--package/setpwc/Makefile2
-rw-r--r--package/setserial/Makefile2
-rw-r--r--package/shat/Makefile2
-rw-r--r--package/shorewall-common/Makefile2
-rw-r--r--package/shorewall-shell/Makefile2
-rw-r--r--package/siproxd/Makefile2
-rw-r--r--package/sipsak/Makefile2
-rw-r--r--package/sispmctl/Makefile2
-rw-r--r--package/slurm/Makefile2
-rw-r--r--package/snort-wireless/Makefile2
-rw-r--r--package/snort/Makefile2
-rw-r--r--package/socat/Makefile2
-rw-r--r--package/speex/Makefile2
-rw-r--r--package/sqlite/Makefile4
-rw-r--r--package/squid/Makefile24
-rw-r--r--package/srelay/Makefile2
-rw-r--r--package/ssltunnel/Makefile2
-rw-r--r--package/ssmtp/Makefile2
-rw-r--r--package/strace/Makefile2
-rw-r--r--package/stress/Makefile2
-rw-r--r--package/strongswan/Makefile2
-rw-r--r--package/subversion/Makefile2
-rw-r--r--package/swconfig/Makefile2
-rw-r--r--package/syslog-ng/Makefile2
-rw-r--r--package/sysstat/Makefile2
-rw-r--r--package/tar/Makefile2
-rw-r--r--package/tcl/Makefile2
-rw-r--r--package/tcp_wrappers/Makefile2
-rw-r--r--package/tcpdump/Makefile2
-rw-r--r--package/tinc/Makefile2
-rw-r--r--package/tinyproxy/Makefile2
-rw-r--r--package/tmsnc/Makefile2
-rw-r--r--package/tntnet/Makefile2
-rw-r--r--package/tor/Makefile2
-rw-r--r--package/trafshow/Makefile2
-rw-r--r--package/ttcp/Makefile2
-rw-r--r--package/uclibc++/Makefile2
-rw-r--r--package/uclibc/Makefile2
-rw-r--r--package/udev/Makefile2
-rw-r--r--package/udp-broadcast-relay/Makefile2
-rw-r--r--package/ulogd/Makefile12
-rw-r--r--package/updatedd/Makefile20
-rw-r--r--package/usbutils/Makefile2
-rw-r--r--package/ussp-push/Makefile2
-rw-r--r--package/ustl/Makefile2
-rw-r--r--package/util-linux/Makefile6
-rw-r--r--package/valgrind/Makefile2
-rwxr-xr-xpackage/vgp/Makefile2
-rw-r--r--package/vilistextum/Makefile2
-rw-r--r--package/vim/Makefile2
-rw-r--r--package/vnc-reflector/Makefile2
-rw-r--r--package/vnstat/Makefile2
-rw-r--r--package/vpnc/Makefile2
-rw-r--r--package/vrrpd/Makefile2
-rw-r--r--package/vsftpd/Makefile2
-rw-r--r--package/vtun/Makefile2
-rw-r--r--package/watchdog/Makefile2
-rw-r--r--package/wccpd/Makefile2
-rw-r--r--package/wdfs/Makefile2
-rw-r--r--package/weechat/Makefile2
-rw-r--r--package/wifidog/Makefile2
-rw-r--r--package/wireless-firmware/Makefile2
-rw-r--r--package/wireless-tools/Makefile2
-rw-r--r--package/wol/Makefile2
-rw-r--r--package/wondershaper/Makefile2
-rw-r--r--package/wpa_supplicant/Makefile2
-rw-r--r--package/wput/Makefile2
-rw-r--r--package/xfsprogs/Makefile2
-rw-r--r--package/xinetd/Makefile2
-rw-r--r--package/xorg-server/Makefile2
-rw-r--r--package/zlib/Makefile2
-rw-r--r--package/zsh/Makefile2
365 files changed, 634 insertions, 645 deletions
diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index d66c2bd..039c790 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/$(PKG_NAME)-0.11
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_path_STRIP=$(STRIP) \
diff --git a/package/Config.in b/package/Config.in
index 2f2dad1..2cec836 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -5,9 +5,6 @@
menu "Package selection"
-comment "Package categories"
-
-
menu "Applications"
menu "Basesystem"
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 948f8ea..1f5d6b5 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/$(PKG_NAME)
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-$(PKG_RELEASE)))
TCFLAGS+= -D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \
-D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\"
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index 8245d5a..1e6a3c3 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://download.aircrack-ng.org/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-$(PKG_RELEASE)))
BUILD_STYLE= auto
INSTALL_STYLE= auto
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 74c857a..e57470e 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-python
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 6359b9e..9471970 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-alsamixer
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 64c7c33..8a3de3b 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://apache.mirror.clusters.cc/apr/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,APR_UTIL,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,APR_UTIL,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --without-berkeley-db
diff --git a/package/apr/Makefile b/package/apr/Makefile
index 7903f4c..8dbddd9 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NA
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=no
diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index 7ac0c03..ecf7118 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ARPD,arpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ARPD,arpd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-libdnet=${STAGING_DIR}/usr \
diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile
index a32974c..9519710 100644
--- a/package/arpwatch/Makefile
+++ b/package/arpwatch/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.ee.lbl.gov/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,ARPWATCH,arpwatch,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ARPWATCH,arpwatch,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 87e1873..dcda8b7 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -13,17 +13,17 @@ MASTER_SITES:= http://downloads.digium.com/pub/telephony/asterisk/releases/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,ASTERISK,asterisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ASTERISK,asterisk,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-$(PKG_RELEASE)))
SUB_INSTALLS-y:=
SUB_INSTALLS-m:=
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index ac49f07..5c71f73 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES:= ftp://ftp.mamalinux.com/pub/atftp/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE)))
MAKE_FLAGS+= CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline"
CONFIGURE_STYLE= gnu
diff --git a/package/autossh/Makefile b/package/autossh/Makefile
index 0363f88..97e18dd 100644
--- a/package/autossh/Makefile
+++ b/package/autossh/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,AUTOSSH,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,AUTOSSH,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
TCFLAGS+= -Wall -DSSH_PATH=\\\"/usr/bin/ssh\\\"\ \
-DVER=\\\"$(PKG_VERSION)\\\"\"
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index f950db2..3397dc1 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES:= http://avahi.org/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE}))
TCFLAGS+= -DNDEBUG
CONFIGURE_STYLE= gnu
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index 2ac2611..530ef0b 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -15,8 +15,8 @@ WRKDIST= ${WRKDIR}/axTLS
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,AXHTTPD,axhttpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,AXHTTPD,axhttpd,$(PKG_VERSION)-$(PKG_RELEASE)))
BUILD_STYLE= auto
XAKE_FLAGS+= STRIP='' \
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8d07473..6f503b2 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -22,7 +22,7 @@ ICONTROL_ADDON_BASE_FILES= "Package: base-files-${PKG_ID}"
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE}))
do-install:
$(CP) ./files/* $(IDIR_BASE_FILES)
diff --git a/package/bash/Makefile b/package/bash/Makefile
index 3b348d7..46a5eba 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://ftp.gnu.org/gnu/bash/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BASH,bash,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BASH,bash,$(PKG_VERSION)-$(PKG_RELEASE)))
XAKE_FLAGS+= LIBS_FOR_BUILD=''
CONFIGURE_STYLE= gnu
diff --git a/package/bc/Makefile b/package/bc/Makefile
index f48912f..63f91c2 100644
--- a/package/bc/Makefile
+++ b/package/bc/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES:= http://ftp.gnu.org/pub/gnu/bc/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/bind/Makefile b/package/bind/Makefile
index e186966..6e66800 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -13,15 +13,15 @@ MASTER_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,BIND_TOOLS,bind-tools,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_TOOLS,bind-tools,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}"
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 10f71c8..9409ab0 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -7,7 +7,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/binutils/Makefile.inc
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BINUTILS,binutils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BINUTILS,binutils,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-werror
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index 7e08a34..364c084 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES:= http://get.bitlbee.org/src/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE}))
ifeq ($(ADK_IPV6),y)
IPV6+= --ipv6=1
else
diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile
index 1d0b5b5..fd8c9d3 100644
--- a/package/bluez-firmware/Makefile
+++ b/package/bluez-firmware/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://bluez.sourceforge.net/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --libdir=/lib
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 7e9c4b8..ff067cf 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-tools \
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index d9f015c..5962fb3 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_c_bigendian=no \
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 724d016..f636363 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-linux-headers=${LINUX_DIR}
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 107009c..cf0a9ba 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.busybox.net/downloads/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
#rebuild:
# @rm $(WRKBUILD)/.configure_done
diff --git a/package/bwm/Makefile b/package/bwm/Makefile
index 9d5fa7d..ebd8de3 100644
--- a/package/bwm/Makefile
+++ b/package/bwm/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.orig
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/bwm.c -o ${WRKBUILD}/bwm
diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile
index a7119ff..ec6ee34 100644
--- a/package/cbtt/Makefile
+++ b/package/cbtt/Makefile
@@ -15,8 +15,8 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}80-${PKG_VERSION}-src
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
TLDFLAGS+= -shared -L. -L${STAGING_DIR}/usr/lib/mysql \
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 4a521a1..d990791 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -13,7 +13,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile
index dc0dc93..163aad5 100644
--- a/package/cgilib/Makefile
+++ b/package/cgilib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.infodrom.org/projects/cgilib/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CGILIB,cgilib,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,CGILIB,cgilib,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE= auto
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index 9ad16b8..3672492 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.chillispot.info/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 75518ff..529e8cf 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://verplant.org/collectd/files/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE}))
ifneq (${ADK_PACKAGE_COLLECTD_CPU},y)
DISABLE_CPU:=--disable-cpu
diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index c9304dd..d9cd54f 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}.${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
ALL_TARGET= comgt
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index f825097..18bf007 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://cryptsetup.googlecode.com/files/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CRYPTSETUP,cryptsetup,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,CRYPTSETUP,cryptsetup,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-static
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index 964ae55..c9cf607 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -19,7 +19,7 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND}))
+$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 4d045c7..9bb75ff 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES:= http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_func_sigset=no \
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 1d6f485..192a3f2 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -19,8 +19,8 @@ MASTER_SITES:= http://curl.haxx.se/download/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-thread \
diff --git a/package/cutter/Makefile b/package/cutter/Makefile
index 68af7df..e83cc41 100755
--- a/package/cutter/Makefile
+++ b/package/cutter/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://www.lowth.com/cutter/software/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${TARGET_CC} ${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 42c2042..8458b77 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tntnet.org/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE}))
ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 56a1d38..64322c7 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-sample \
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index bb09a8b..4e90b1a 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-neon
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 09219b3..ec8b297 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://dbus.freedesktop.org/releases/dbus/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-tests \
diff --git a/package/deco/Makefile b/package/deco/Makefile
index 0a7bb26..b6717db 100644
--- a/package/deco/Makefile
+++ b/package/deco/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/device-mapper/Makefile b/package/device-mapper/Makefile
index 1d97db9..38b738c 100644
--- a/package/device-mapper/Makefile
+++ b/package/device-mapper/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}.${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE}))
ifeq ($(DEBUG),1)
CONFIGURE_ARGS+= --enable-debug
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index 880e1a3..e0aa1dc 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -14,7 +14,7 @@ MASTER_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},${ARCH}))
+$(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull="yes"
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index c2e49a0..de038d8 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES:= ftp://ftp.isc.org/isc/dhcp/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE}))
do-configure:
(cd ${WRKBUILD} ; \
diff --git a/package/dhcp6/Makefile b/package/dhcp6/Makefile
index 3aa5ddc..58f305b 100644
--- a/package/dhcp6/Makefile
+++ b/package/dhcp6/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DHCP6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DHCP6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${MAKE} CC="${TARGET_CC}" STAGING_DIR=${STAGING_DIR} -C ${WRKBUILD}/server
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index 841fa06..7cd2691 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.digitemp.com/software/linux/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
ALL_TARGET= ds2490
BUILD_STYLE= auto
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 11c9669..ba09c4e 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://thekelleys.org.uk/dnsmasq/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
INSTALL_STYLE= manual
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index 36ce418..efda070 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.daniel-baumann.ch/software/dosfstools/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
INSTALL_STYLE= auto
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index 3e31c2f..794af70 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.dovecot.org/releases/1.1/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DOVECOT,dovecot,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DOVECOT,dovecot,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ignore_signed_size=1 \
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 63b3e54..a717738 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES:= http://matt.ucc.asn.au/dropbear/releases/ \
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-pam \
@@ -42,14 +42,6 @@ do-build:
cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} \
PROGRAMS=dropbearconvert
-# evaluate startup options according to menuconfig selection
-DROPBEAR-OPTS-y = -g
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_NOTHING) =
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_PASSWORD_FOR_ROOT) = -g
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_PASSWORD) = -s
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_ROOT) = -w
-DROPBEAR-OPTS-$(ADK_RUNTIME_SSH_DISABLE_ROOT_AND_PASSWORD) = -w -s
-
do-install:
# main package
$(INSTALL_DIR) $(IDIR_DROPBEAR)/etc/init.d
@@ -63,7 +55,6 @@ do-install:
ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
$(INSTALL_DATA) ./files/dropbear.init \
$(IDIR_DROPBEAR)/etc/init.d/dropbear
- $(SED) "s/@OPTIONS@/$(DROPBEAR-OPTS-y)/g" $(IDIR_DROPBEAR)/CONTROL/postinst
# subpackage dropbearconvert
$(INSTALL_DIR) $(IDIR_DBCONVERT)/usr/bin
$(INSTALL_BIN) $(WRKBUILD)/dropbearconvert \
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index 0b28d8e..352160d 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-2.4
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-db \
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index e628585..2677e32 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-elf-shlibs \
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index c2a8e48..1221158 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://elinks.or.cz/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes
diff --git a/package/em28xx/Makefile b/package/em28xx/Makefile
index 887bcda..6a1048b 100644
--- a/package/em28xx/Makefile
+++ b/package/em28xx/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
+$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
CONFIGURE_STYLE:= manual
BUILD_STYLE:= manual
diff --git a/package/esound/Makefile b/package/esound/Makefile
index f97d58b..119532e 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index 2eb244d..5a4aeac 100644
--- a/package/ether-wake/Makefile
+++ b/package/ether-wake/Makefile
@@ -12,7 +12,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ETHER_WAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ETHER_WAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${TARGET_CC} ${TARGET_CFLAGS} -o ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/${PKG_NAME}.c
diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile
index 6e809f2..b68ec17 100644
--- a/package/ethtool/Makefile
+++ b/package/ethtool/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 78f0cf1..c515e45 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -16,10 +16,10 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
+$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-doc
diff --git a/package/expat/Makefile b/package/expat/Makefile
index bebaaa6..fbc0441 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile
index c7afd48..02cf176 100644
--- a/package/ez-ipupdate/Makefile
+++ b/package/ez-ipupdate/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES:= http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ \
include ${TOPDIR}/mk/package.mk
-${eval ${call PKG_template,EZIPUPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}}}
+${eval ${call PKG_template,EZIPUPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}}}
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/faad2/Makefile b/package/faad2/Makefile
index bedaaf8..c4052b2 100644
--- a/package/faad2/Makefile
+++ b/package/faad2/Makefile
@@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/faad2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= autotool gnu
CONFIGURE_ARGS+= --without-mpeg4ip \
diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile
index 75760a2..f3341ed 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},${ARCH}))
+$(eval $(call PKG_template,FAKEIDENTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${TARGET_CC} -o ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/identd.c
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index a53d606..0fd9bf9 100644
--- a/package/fbset/Makefile
+++ b/package/fbset/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://users.telenet.be/geertu/Linux/fbdev/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index 388afec..7e90d1a 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FETCHMAIL,fetchmail,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_c_bigendian=no \
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 58b0292..e79d1cd 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FFMPEG,ffmpeg,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FFMPEG,ffmpeg,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= manual
BUILD_STYLE:= auto
diff --git a/package/file/Makefile b/package/file/Makefile
index c4704c7..a3a6c17 100644
--- a/package/file/Makefile
+++ b/package/file/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/flac/Makefile b/package/flac/Makefile
index 3f3d001..223fd62 100644
--- a/package/flac/Makefile
+++ b/package/flac/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=flac/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-asm-optimizations \
diff --git a/package/fping/Makefile b/package/fping/Makefile
index ce14b95..7b794d5 100644
--- a/package/fping/Makefile
+++ b/package/fping/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://fping.sourceforge.net/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
diff --git a/package/fprobe-ulog/Makefile b/package/fprobe-ulog/Makefile
index f553204..574f873 100644
--- a/package/fprobe-ulog/Makefile
+++ b/package/fprobe-ulog/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FPROBE_ULOG,fprobe-ulog,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FPROBE_ULOG,fprobe-ulog,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-piddir=/var \
diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile
index a2cb19b..959c9a1 100644
--- a/package/fprobe/Makefile
+++ b/package/fprobe/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=fprobe/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-piddir=/var \
diff --git a/package/freeradius/Makefile b/package/freeradius/Makefile
index fa9d232..f6fece1 100644
--- a/package/freeradius/Makefile
+++ b/package/freeradius/Makefile
@@ -66,28 +66,28 @@ ${2}-install:
done
endef
-$(eval $(call PKG_template,FREERADIUS,freeradius,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP,freeradius-mod-eap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_GTC,freeradius-mod-eap-gtc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MD5,freeradius-mod-eap-md5,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MSCHAPV2,freeradius-mod-eap-mschapv2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_PEAP,freeradius-mod-eap-peap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TLS,freeradius-mod-eap-tls,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TTLS,freeradius-mod-eap-ttls,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FREERADIUS,freeradius,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_EAP,freeradius-mod-eap,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_EAP_GTC,freeradius-mod-eap-gtc,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MD5,freeradius-mod-eap-md5,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MSCHAPV2,freeradius-mod-eap-mschapv2,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_EAP_PEAP,freeradius-mod-eap-peap,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TLS,freeradius-mod-eap-tls,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TTLS,freeradius-mod-eap-ttls,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_CHAP,rlm_chap,))
$(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,))
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 0b8664e..6d14697 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/freetype-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/frickin/Makefile b/package/frickin/Makefile
index f8a9774..1b4fe10 100644
--- a/package/frickin/Makefile
+++ b/package/frickin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FRICKIN,frickin,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FRICKIN,frickin,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 2a8c89e..e3cf2d1 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-lib \
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index cac5c6e..0030131 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GATLING,gatling,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GATLING,gatling,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
MAKE_FILE= GNUmakefile
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 01eec05..0f04070 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -7,7 +7,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gcc/Makefile.inc
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-languages=c \
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index dc4b736..2167ce7 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -7,7 +7,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/gdb/Makefile.inc
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE}))
TCPPFLAGS+= -L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib
TLDFLAGS+= -L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index e4879a4..3d40060 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -9,7 +9,7 @@ include ${TOPDIR}/mk/package.mk
WRKSRC= ${WRKDIST}/gdb/gdbserver
-$(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index dd50230..7a85f5a 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-java \
diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile
index badc29b..6273f63 100644
--- a/package/gkrellmd/Makefile
+++ b/package/gkrellmd/Makefile
@@ -16,7 +16,7 @@ WRKDIST=${WRKDIR}/gkrellm-${PKG_VERSION}/server
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GKRELLMD,gkrellmd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GKRELLMD,gkrellmd,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
MAKE_FLAGS+= GLIB12_INCLUDE="-I${STAGING_DIR}/usr/include/glib-1.2 -I${STAGING_DIR}/usr/lib/glib/include" \
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 2cf78d0..659998f 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES:= ftp://ftp.gtk.org/pub/gtk/v1.2/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GLIB1,glib1,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GLIB1,glib1,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= glib_cv_sizeof_gmutex=24 \
diff --git a/package/glib2/Makefile b/package/glib2/Makefile
index ed13a26..424d403 100644
--- a/package/glib2/Makefile
+++ b/package/glib2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.18/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GLIB2,glib2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GLIB2,glib2,${PKG_VERSION}-${PKG_RELEASE}))
TCPPFLAGS+= -I'${STAGING_DIR}/usr/include'
CONFIGURE_STYLE= gnu
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index b1ba2f9..88bdd27 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -10,7 +10,7 @@ NO_DISTFILES:= 1
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-$(PKG_RELEASE)))
do-extract:
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index 8fda749..5ca8b48 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://savannah.nongnu.org/download/gmediaserver/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -lz" \
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index a467fa7..d2cb4fe 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 1a46a3b..6fb845b 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -14,11 +14,11 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=gnutls/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-libopencdk-prefix \
diff --git a/package/gpg/Makefile b/package/gpg/Makefile
index 2fa4ea5..2f32d09 100644
--- a/package/gpg/Makefile
+++ b/package/gpg/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GPG,gpg,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GPG,gpg,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_c_bigendian=no \
diff --git a/package/gpm/Makefile b/package/gpm/Makefile
index 0c0fd2a..0575095 100644
--- a/package/gpm/Makefile
+++ b/package/gpm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://unix.schottelius.org/gpm/archives/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GPM,gpm,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GPM,gpm,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
TCFLAGS+= -I${WRKSRC}/src/headers
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 15e4d13..655a0b6 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES:= http://download.berlios.de/gpsd/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,GPSD,gpsd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,GPSD,gpsd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-x \
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index 27dad9e..c0ceafe 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -14,8 +14,8 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-1.0-pl10
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE}))
XAKE_FLAGS+= COPTS="${TARGET_CFLAGS}" \
INSTALL_ROOT="${WRKINST}"
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index f1ed015..f4f796e 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=haserl/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HASERL,haserl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,HASERL,haserl,${PKG_VERSION}-${PKG_RELEASE}))
TCFLAGS+= -DMAX_UPLOAD_KB=8192
CONFIGURE_STYLE= gnu
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index b77f02e..c9b476d 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=hdparm/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HDPARM,hdparm,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,HDPARM,hdparm,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 40a750f..1f1c10c 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES:= http://www.h5l.org/dist/src/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,HEIMDAL_LIBS,heimdal-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,HEIMDAL_LIBS,heimdal-libs,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION)-$(PKG_RELEASE)))
PKG_DEPENDS:= heimdal-libs, heimdal-client-libs, libncurses,
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index 8202d29..a87affd 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://heyu.tanj.com/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-build:
(cd ${WRKBUILD} && ${BASH} ./Configure);
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index b5e9577..f33a61f 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -15,8 +15,8 @@ WRKSRC= ${WRKDIST}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
#MAKE_FLAGS+= OPTFLAGS="${TARGET_CFLAGS}"
diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index f0e9f77..2f2e32c 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.clevervest.com/htp/archive/c/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
diff --git a/package/httping/Makefile b/package/httping/Makefile
index 4a1f76c..eadc97d 100644
--- a/package/httping/Makefile
+++ b/package/httping/Makefile
@@ -20,7 +20,7 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${MAKE} -C ${WRKBUILD} -f ${WRKBUILD}/Makefile${SSL_ENABLE} \
diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile
index a848f93..145018c 100644
--- a/package/httptunnel/Makefile
+++ b/package/httptunnel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.nocrew.org/software/httptunnel/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,HTTPTUNNEL,httptunnel,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,HTTPTUNNEL,httptunnel,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/icecast/Makefile b/package/icecast/Makefile
index 77ff8f4..76ece30 100644
--- a/package/icecast/Makefile
+++ b/package/icecast/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.us.xiph.org/releases/icecast/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ICECAST,icecast,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ICECAST,icecast,${PKG_VERSION}-${PKG_RELEASE}))
TCPPFLAGS+= -I${STAGING_DIR}/usr/include/libxml2
CONFIGURE_STYLE= autotool gnu
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index bb821c4..edd6d22 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -20,7 +20,7 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND}))
+$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-cxx-warnings=no
diff --git a/package/iftop/Makefile b/package/iftop/Makefile
index 9981b1a..87d732a 100644
--- a/package/iftop/Makefile
+++ b/package/iftop/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.ex-parrot.com/~pdw/iftop/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IFTOP,iftop,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IFTOP,iftop,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index a52cc81..90ff811 100644
--- a/package/igmpproxy/Makefile
+++ b/package/igmpproxy/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${MAKE} CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS}" -C ${WRKBUILD}/src
diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile
index 11cef05..ca240dd 100644
--- a/package/ipcad/Makefile
+++ b/package/ipcad/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipcad/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPCAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IPCAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-ifst=linux \
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 358e547..0406801 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index f688ccb..58650bf 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES:= http://developer.osdl.org/dev/iproute2/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE}))
do-configure:
${SED} "s:-O2:${TARGET_CFLAGS}:g" ${WRKBUILD}/Makefile
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 657bb83..5fe7101 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-kernel-headers="${LINUX_DIR}/include" \
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index c299bd8..9828f77 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
XAKE_FLAGS+= KERNEL_DIR=${LINUX_DIR} PREFIX=/usr LD=$(TARGET_CROSS)ld
BUILD_STYLE= auto
diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile
index 3f8deec..319a2b8 100644
--- a/package/iptables-snmp/Makefile
+++ b/package/iptables-snmp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.nobiscuit.com/iptables-snmp/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPTABLES_SNMP,iptables-snmp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IPTABLES_SNMP,iptables-snmp,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index ba7de8f..150d5d6 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -18,10 +18,10 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
include ${LINUX_DIR}/.config
-$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE}))
ifeq ($(ADK_IPV6),y)
-$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE}))
endif
CONFIGURE_STYLE:= gnu
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index 3ee0796..808c25c 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ftp://iptraf.seul.org/pub/iptraf/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IPTRAF,iptraf,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IPTRAF,iptraf,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${MAKE} -C ${WRKBUILD}/src \
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index e7d8eb5..3c77111 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -15,7 +15,7 @@ PKG_DEPENDS:= glib2, libncurses
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-perl=no \
diff --git a/package/iw/Makefile b/package/iw/Makefile
index 997abeb..deafcbf 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,IW,iw,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,IW,iw,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index eb066fe..945f303 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/}
include ${TOPDIR}/mk/package.mk
-${eval ${call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}}}
+${eval ${call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}}}
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-ffi
diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile
index 731222e..a5a94ea 100644
--- a/package/jpeg/Makefile
+++ b/package/jpeg/Makefile
@@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index 76d0b82..5638908 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES:= http://www.kismetwireless.net/code/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE}))
ifeq ($(ADK_COMPILE_KISMET_WITH_UCLIBCXX),y)
TCFLAGS+= -fno-builtin -fno-rtti -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++
diff --git a/package/knock/Makefile b/package/knock/Makefile
index 13e57d4..349e787 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES:= http://www.zeroflux.org/proj/knock/files/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE}))
TCXXFLAGS+= ${TCPPFLAGS} ${TCFLAGS}
CONFIGURE_STYLE= gnu
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 062568d..049bf44 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -16,8 +16,8 @@ WRKSRC= ${WRKDIST}/src
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-krb4 --disable-static --without-tcl
diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile
index f78b3c4..5a18d3b 100644
--- a/package/l2tpns/Makefile
+++ b/package/l2tpns/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=l2tpns/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
BUILD_FLAGS= auto
INSTALL_STYLE= auto
diff --git a/package/lame/Makefile b/package/lame/Makefile
index f60c0ea..1509f62 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/less/Makefile b/package/less/Makefile
index 59f6439..b98db64 100644
--- a/package/less/Makefile
+++ b/package/less/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.greenwoodsoftware.com/less/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LESS,less,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LESS,less,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-regex
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index 8a0b79c..2a48ee4 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index 25b4364..6dc5345 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 2709dd1..14b4770 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-xlocale \
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index af0d669..e3ed45a 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index cb757b3..c554441 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index 1cb6245..06872b3 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 27ba0ca..18aeedd 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-malloc0returnsnull
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 8f0d925..ec1c61d 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index c75f945..135c5da 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
#CONFIGURE_ARGS+= --disable-malloc0returnsnull
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index 27dd66e..33ce075 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 0253f29..fab8059 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-malloc0returnsnull \
diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile
index a8e4e52..afc5103 100644
--- a/package/libXxf86dga/Makefile
+++ b/package/libXxf86dga/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-malloc0returnsnull
diff --git a/package/libao/Makefile b/package/libao/Makefile
index 1cb4494..17e8344 100644
--- a/package/libao/Makefile
+++ b/package/libao/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.xiph.org/releases/ao/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-esd \
diff --git a/package/libart/Makefile b/package/libart/Makefile
index a579a73..70f281a 100644
--- a/package/libart/Makefile
+++ b/package/libart/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}_lgpl-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile
index 2290776..11b3d6b 100644
--- a/package/libaudiofile/Makefile
+++ b/package/libaudiofile/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.freewrt.org/distfiles/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBAUDIOFILE,libaudiofile,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_linux_vers=2
diff --git a/package/libcli/Makefile b/package/libcli/Makefile
index e4d4234..025ed48 100755
--- a/package/libcli/Makefile
+++ b/package/libcli/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libcli/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
INSTALL_STYLE= auto
diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile
index cf61b83..92d26cf 100644
--- a/package/libdaemon/Makefile
+++ b/package/libdaemon/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://0pointer.de/lennart/projects/libdaemon/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
diff --git a/package/libdb/Makefile b/package/libdb/Makefile
index 01bb310..5b812c1 100644
--- a/package/libdb/Makefile
+++ b/package/libdb/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/db-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBDB,libdb,${PKG_VERSION}-${PKG_RELEASE}))
ifeq ($(DEBUG),1)
PKG_CONFIGURE:= --enable-debug
diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile
index 8b25414..f7e5389 100644
--- a/package/libdnet/Makefile
+++ b/package/libdnet/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no
diff --git a/package/libelf/Makefile b/package/libelf/Makefile
index 920747e..8bf7192 100644
--- a/package/libelf/Makefile
+++ b/package/libelf/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.mr511.de/software/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= mr_cv_target_elf=yes \
diff --git a/package/libevent/Makefile b/package/libevent/Makefile
index 37cc0cc..0093aa7 100644
--- a/package/libevent/Makefile
+++ b/package/libevent/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.monkey.org/~provos/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index 83c03b2..8cc13b5 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ftp://sourceware.org/pub/libffi/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= autotool gnu
BUILD_STYLE= auto
diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile
index 0a750a3..cf4008a 100644
--- a/package/libfontenc/Makefile
+++ b/package/libfontenc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index 7894668..fd7c283 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-asm \
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index adc3b78..43ae0a9 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.libgd.org/releases/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_DIR}/usr/bin/libpng12-config"
diff --git a/package/libgdbm/Makefile b/package/libgdbm/Makefile
index 2677c9a..91c3d60 100644
--- a/package/libgdbm/Makefile
+++ b/package/libgdbm/Makefile
@@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/gdbm-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index d6cd2ee..9881e22 100644
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile
index de69e7d..55533f6 100644
--- a/package/libgssglue/Makefile
+++ b/package/libgssglue/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index 5017828..a845669 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=libiconv/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile
index 0d1032c..8712868 100644
--- a/package/libid3tag/Makefile
+++ b/package/libid3tag/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBID3TAG,libid3tag,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBID3TAG,libid3tag,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-debugging \
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index 6b8325d..e78dd5f 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://www.oberhumer.com/opensource/lzo/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-static
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 5524216..3828fa0 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBMAD,libmad,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBMAD,libmad,${PKG_VERSION}-${PKG_RELEASE}))
FPM:=default
ifeq (${ARCH},i386)
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index bc3a13b..9eb7a3e 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -19,7 +19,7 @@ ifeq (${ARCH},mips)
ENDIAN:=big
endif
-$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_libnet_have_pf_packet=yes \
diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile
index 2a104e9..e9cb63f 100644
--- a/package/libnfsidmap/Makefile
+++ b/package/libnfsidmap/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBNFSIDMAP,libnfsidmap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBNFSIDMAP,libnfsidmap,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index eb0f92e..99aa712 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.packetfactory.net/projects/libnids/dist/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-libnet="${STAGING_DIR}/usr" \
diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index 8e66802..6c4b7cb 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://downloads.openwrt.org/sources/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/libogg/Makefile b/package/libogg/Makefile
index 575cdeb..2d8f567 100644
--- a/package/libogg/Makefile
+++ b/package/libogg/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.xiph.org/releases/ogg/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOGG,libogg,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBOGG,libogg,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libol/Makefile b/package/libol/Makefile
index 0c17eb8..1188273 100644
--- a/package/libol/Makefile
+++ b/package/libol/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.balabit.com/downloads/files/libol/0.3/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOL,libol,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBOL,libol,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile
index 201102c..1377f64 100644
--- a/package/libosip2/Makefile
+++ b/package/libosip2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=osip/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOSIP2,libosip2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBOSIP2,libosip2,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-trace \
diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile
index cb288b8..0d05d70 100644
--- a/package/libowfat/Makefile
+++ b/package/libowfat/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOWFAT,libowfat,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBOWFAT,libowfat,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE= auto
INSTALL_STYLE= auto
diff --git a/package/libp11/Makefile b/package/libp11/Makefile
index 5d6b853..6a3deed 100644
--- a/package/libp11/Makefile
+++ b/package/libp11/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.opensc-project.org/files/libp11/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBP11,libp11,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBP11,libp11,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 528d1c6..d89bf36 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tcpdump.org/release/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_linux_vers=26
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index e0abce8..9668bd1 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= autotool gnu
BUILD_STYLE= auto
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 0e3b3a7..6b0a332 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libpri/Makefile b/package/libpri/Makefile
index ab26198..f3b7cc8 100644
--- a/package/libpri/Makefile
+++ b/package/libpri/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.asterisk-support.de/mirror/libpri/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPRI,libpri,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBPRI,libpri,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CC='${TARGET_CC}'
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index 483fcc1..d337a44 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -16,7 +16,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE}))
do-install:
${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib
diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile
index 17a6404..dcda319 100644
--- a/package/librpcsecgss/Makefile
+++ b/package/librpcsecgss/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= autotool gnu
BUILD_STYLE= auto
diff --git a/package/libshout/Makefile b/package/libshout/Makefile
index 97ff7ad..b0c9e75 100644
--- a/package/libshout/Makefile
+++ b/package/libshout/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.us.xiph.org/releases/libshout/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSHOUT,libshout,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBSHOUT,libshout,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-speex=no \
diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile
index 95cec59..7a10a62 100644
--- a/package/libsigc++/Makefile
+++ b/package/libsigc++/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSIGCXX,libsigc++,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBSIGCXX,libsigc++,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index e497354..4e9a1c5 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -11,7 +11,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSTDCXX,libstdcxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBSTDCXX,libstdcxx,${PKG_VERSION}-${PKG_RELEASE}))
do-install:
${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
index dbb3b7e..159b59d 100644
--- a/package/libtasn1/Makefile
+++ b/package/libtasn1/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES:= ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index 4741ce3..f7a1e7a 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -16,7 +16,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBTHREAD_DB,libthread-db,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBTHREAD_DB,libthread-db,${PKG_VERSION}-${PKG_RELEASE}))
do-install:
${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib
diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile
index 7f50c2e..db6190d 100644
--- a/package/libtiff/Makefile
+++ b/package/libtiff/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/tiff-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-cxx
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index c9ec417..1b81fdb 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= autotool gnu
ifneq (${ADK_COMPILE_NFS_UTILS_WITH_KERBEROS},y)
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 4a23de1..fb1e5d2 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=libtool/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 8dc335c..d5bfd3e 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://libtorrent.rakshasa.no/downloads/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-aligned
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 09e458f..5ce55ee 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= autotool gnu
CONFIGURE_ARGS+= --disable-samples
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index ba6fe0a..c46ff79 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=libusb/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBUSB,libusb,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBUSB,libusb,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_c_bigendian=no
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index ea4f4f5..a86c24d 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES:= http://downloads.xiph.org/releases/vorbis/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= LIBS="-lm -logg"
diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile
index 89158db..abf7b63 100644
--- a/package/libvorbisidec/Makefile
+++ b/package/libvorbisidec/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)+$(PKG_VARIANT)
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBVORBISIDEC,libvorbisidec,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBVORBISIDEC,libvorbisidec,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile
index ddc8cd2..8888db2 100644
--- a/package/libxkbfile/Makefile
+++ b/package/libxkbfile/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXKBFILE,libxkbfile,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBXKBFILE,libxkbfile,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 3a8afc3..6d12d11 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://xmlsoft.org/sources/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-c14n \
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 39fa934..ded1a2d 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://xmlsoft.org/sources/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_DIR}/usr" \
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 7cd2f6c..3971cea 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -23,23 +23,23 @@ ${2}-install:
endef
-$(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_ACCESSLOG,lighttpd-mod-accesslog,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_ACCESSLOG,lighttpd-mod-accesslog,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION)-$(PKG_RELEASE)))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_ACCESSLOG,accesslog))
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias))
diff --git a/package/links/Makefile b/package/links/Makefile
index fb6070b..d2e8b5e 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://links.twibright.com/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LINKS,links,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LINKS,links,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-graphics \
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 32b6665..0d9eac1 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES:= http://ftp.debian.org/debian/pool/main/l/linux-atm/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LINUX_ATM,linux-atm,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LINUX_ATM,linux-atm,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile
index 52eed53..4d0ab1a 100644
--- a/package/logrotate/Makefile
+++ b/package/logrotate/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://ftp.debian.org/debian/pool/main/l/logrotate/
include ${TOPDIR}/mk/package.mk
-${eval ${call PKG_template,LOGROTATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}}}
+${eval ${call PKG_template,LOGROTATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}}}
TCFLAGS+= -D_GNU_SOURCE -DLinux -DVERSION=\"$(VERSION)\"
ALL_TARGET= logrotate
diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile
index 60cac54..6866002 100644
--- a/package/lrzsz/Makefile
+++ b/package/lrzsz/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.ohse.de/uwe/releases/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LRZSZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LRZSZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --without-libiconv-prefix \
diff --git a/package/ltp/Makefile b/package/ltp/Makefile
index f803bfe..5a0da8e 100644
--- a/package/ltp/Makefile
+++ b/package/ltp/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LTP,ltp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LTP,ltp,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/lua/Makefile b/package/lua/Makefile
index 45973bc..62c4850 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -16,10 +16,10 @@ MASTER_SITES:= http://www.lua.org/ftp/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBLUA,liblua,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBLUA,liblua,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${MAKE} -C ${WRKBUILD} \
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 334ca35..134c34b 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LVM,lvm,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LVM,lvm,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-user="" --with-group="" \
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 7ac1ab7..aee2812 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/lynx2-8-7
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
TCPPFLAGS+= -DLYNX_VERSION=\"${PKG_VERSION}-OpenADK-${PKG_RELEASE}\"
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index e69f0fd..df5ea86 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -16,9 +16,9 @@ WRKDIST= ${WRKDIR}/compat-wireless-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
-$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
-$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
+$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
+$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
+$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
BUILD_STYLE:= auto
INSTALL_STYLE:= manual
diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile
index 42c4e75..5518fb6 100755
--- a/package/macchanger/Makefile
+++ b/package/macchanger/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=macchanger/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MACCHANGER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MACCHANGER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
INSTALL_STYLE:= auto
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index 1ab4b8c..fa56645 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${HOST_CC} \
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index af70f4f..631d848 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MARADNS,maradns,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MARADNS,maradns,${PKG_VERSION}-${PKG_RELEASE}))
#CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/mc/Makefile b/package/mc/Makefile
index 63b8d7c..28f7155 100644
--- a/package/mc/Makefile
+++ b/package/mc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-charset \
diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile
index 298f1e9..9513e95 100644
--- a/package/mgetty/Makefile
+++ b/package/mgetty/Makefile
@@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}${PKG_VERSION}-${PKG_XVERSION}.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MGETTY,mgetty,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MGETTY,mgetty,${PKG_VERSION}-${PKG_RELEASE}))
pre-configure:
cp ${WRKBUILD}/policy.h-dist ${WRKBUILD}/policy.h
diff --git a/package/miau/Makefile b/package/miau/Makefile
index 55543a0..c384b74 100644
--- a/package/miau/Makefile
+++ b/package/miau/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=miau/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MIAU,miau,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MIAU,miau,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \
diff --git a/package/miax/Makefile b/package/miax/Makefile
index 11e0089..37d13ab 100644
--- a/package/miax/Makefile
+++ b/package/miax/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MIAX,miax,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MIAX,miax,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CC="${TARGET_CC}" \
diff --git a/package/microperl/Makefile b/package/microperl/Makefile
index 6896db6..32d6a92 100644
--- a/package/microperl/Makefile
+++ b/package/microperl/Makefile
@@ -18,7 +18,7 @@ WRKDIST= ${WRKDIR}/perl-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MICROPERL,microperl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MICROPERL,microperl,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CC="${TARGET_CC}" OPTIMIZE="${TCFLAGS}"
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index 5799b39..b85a155 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -15,9 +15,9 @@ WRKDIST= ${WRKDIR}/mini_httpd-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
# with OpenSSL
diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile
index 0187ab4..25c93d0 100644
--- a/package/mini_sendmail/Makefile
+++ b/package/mini_sendmail/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/mini_sendmail-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MINI_SENDMAIL,mini-sendmail,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MINI_SENDMAIL,mini-sendmail,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= OFLAGS="${TARGET_CFLAGS}"
diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index 3bdcb31..144c052 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -14,8 +14,8 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-chroot \
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index 03a47b8..b141d06 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE}))
ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),)
TCPPFLAGS+= -DMKSH_SMALL=1
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 9cdfa24..4ee7c2f 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MOC,moc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MOC,moc,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --without-jack \
diff --git a/package/monit/Makefile b/package/monit/Makefile
index 7b41c53..7a6f2df 100644
--- a/package/monit/Makefile
+++ b/package/monit/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tildeslash.com/monit/dist/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE}))
PKG_DEPENDS:= libpthread,
diff --git a/package/motion/Makefile b/package/motion/Makefile
index 302cb8a..3b0671f 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=motion/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MOTION,motion,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --without-ffmpeg \
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index cc4a6d0..65baca7 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index eb457b4..cc22902 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -7,7 +7,7 @@ include ${TOPDIR}/rules.mk
include ${TOPDIR}/toolchain/mpfr/Makefile.inc
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 73167c9..5dee245 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MPLAYER,mplayer,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MPLAYER,mplayer,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 009f365..4221004 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -15,7 +15,7 @@ WRKBUILD= ${WRKSRC}/src
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index a9160bb..ce48d73 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mt-daapd/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MT_DAAPD,mt-daapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MT_DAAPD,mt-daapd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index eac1e3d..0d90da8 100644
--- a/package/mtr/Makefile
+++ b/package/mtr/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.bitwizard.nl/mtr/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE+= gnu
CONFIGURE_ENV+= ac_cv_lib_resolv_res_mkquery=yes
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index 5d3a4b0..7be0d56 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=mutt/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MUTT,mutt,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MUTT,mutt,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_c_bigendian=no \
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 0f80c9e..60ea57c 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.0/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \
diff --git a/package/nano/Makefile b/package/nano/Makefile
index 7c9d9a9..1da3974 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.nano-editor.org/dist/v2.0/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NANO,nano,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,NANO,nano,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_header_regex_h=no
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 6303076..89b3918 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=ncurses/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_linux_vers=2
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile
index 23ca866..d56bf80 100644
--- a/package/ndisc/Makefile
+++ b/package/ndisc/Makefile
@@ -14,9 +14,9 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/neon/Makefile b/package/neon/Makefile
index ffd9da5..a619644 100644
--- a/package/neon/Makefile
+++ b/package/neon/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://webdav.org/neon/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NEON,neon,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,NEON,neon,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-ssl=openssl \
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 03ba155..391dde5 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -68,9 +68,9 @@ SNMP_TRANSPORTS_EXCLUDED= TCP TCPv6 UDPv6 Unix
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_header_pcap_h=no
diff --git a/package/netperf/Makefile b/package/netperf/Makefile
index 6563c60..9a741ea 100644
--- a/package/netperf/Makefile
+++ b/package/netperf/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ftp://ftp.netperf.org/netperf/archive/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NETPERF,netperf,${PKG_VERSION}${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,NETPERF,netperf,${PKG_VERSION}${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= TARGET_NETPERF_HOME="/etc/netperf.conf" \
diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile
index a357847..16f960f 100644
--- a/package/netstat-nat/Makefile
+++ b/package/netstat-nat/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tweegy.nl/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NETSTAT_NAT,netstat-nat,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,NETSTAT_NAT,netstat-nat,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index cfbd439..6d4c901 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE}))
PKG_DEPENDS:= portmap,
CONFIGURE_STYLE= autotool gnu
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 9379371..053347a 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -21,7 +21,7 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND}))
+$(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
TCPPFLAGS+= -DNOLUA
ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y)
diff --git a/package/nocatsplash/Makefile b/package/nocatsplash/Makefile
index 600e421..fea6af4 100644
--- a/package/nocatsplash/Makefile
+++ b/package/nocatsplash/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/NoCatSplash-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NOCATSPLASH,nocatsplash,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,NOCATSPLASH,nocatsplash,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-firewall=iptables \
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index d180eef..70e4900 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -16,7 +16,7 @@ WRKDIST= ${WRKDIR}/ntfs-3g-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,KMOD_FS_NTFS_3G,kmod-fs-ntfs-3g,${KERNEL_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
+$(eval $(call PKG_template,KMOD_FS_NTFS_3G,kmod-fs-ntfs-3g,${KERNEL_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE})))
CONFIGURE_ARGS+= --disable-ldconfig \
--disable-library
diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile
index 2cde140..4de911b 100644
--- a/package/ntpclient/Makefile
+++ b/package/ntpclient/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-2007
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NTPCLIENT,ntpclient,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,NTPCLIENT,ntpclient,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TCFLAGS}'
diff --git a/package/nut/Makefile b/package/nut/Makefile
index 0d18379..158ee47 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.networkupstools.org/source/2.0/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,NUT,nut,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,NUT,nut,${PKG_VERSION}-${PKG_RELEASE}))
define DRIVER_template
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index b8fa2f3..e8034f7 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OBEXFTP,obexftp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OBEXFTP,obexftp,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= OPENOBEX_CFLAGS="-I${STAGING_DIR}/usr/include" \
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index 51e5124..2fc229e 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -23,11 +23,11 @@ ${2}-install:
endef
-$(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_mod_template,OLSRD_MOD_DYN_GW,dyn_gw))
$(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo))
diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile
index 833b0bb..c045506 100644
--- a/package/opencdk/Makefile
+++ b/package/opencdk/Makefile
@@ -19,7 +19,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOPENCDK,libopencdk,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBOPENCDK,libopencdk,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-libgcrypt-prefix='${STAGING_DIR}/usr'
diff --git a/package/openct/Makefile b/package/openct/Makefile
index ebb0857..3e371af 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.opensc-project.org/files/openct/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENCT,openct,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OPENCT,openct,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 358794f..267b61d 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -34,9 +34,9 @@ PKG_CONFIGURE_OPTIONS+= \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBOPENLDAP,libopenldap,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE}))
pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
index a068f83..75ad3c2 100644
--- a/package/openntpd/Makefile
+++ b/package/openntpd/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENNTPD,openntpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OPENNTPD,openntpd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-privsep-user=ntp \
diff --git a/package/openobex/Makefile b/package/openobex/Makefile
index 0aa3675..b1c94ee 100644
--- a/package/openobex/Makefile
+++ b/package/openobex/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENOBEX,openobex,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OPENOBEX,openobex,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= PKG_CONFIG=""
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index a1d9e24..66e1b66 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.opensc-project.org/files/opensc/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENSC,opensc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OPENSC,opensc,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index 76d68f4..e9504f4 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -27,29 +27,29 @@ ${2}-install:
endef
-$(eval $(call PKG_template,OPENSIPS,opensips,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_ACCOUNTING,opensips-mod-acc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_AUTH,opensips-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_AUTH_DB,opensips-mod-auth-db,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_AVPOPS,opensips-mod-avpops,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_DISPATCHER,opensips-mod-dispatcher,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_DIVERSION,opensips-mod-diversion,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_FLATSTORE,opensips-mod-flatstore,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_GFLAGS,opensips-mod-gflags,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_GROUP,opensips-mod-group,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_MEDIAPROXY,opensips-mod-mediaproxy,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_MSILO,opensips-mod-msilo,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_NATHELPER,opensips-mod-nathelper,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_OPTIONS,opensips-mod-options,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_PDT,opensips-mod-pdt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_PERMISSIONS,opensips-mod-permissions,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_PIKE,opensips-mod-pike,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_SMS,opensips-mod-sms,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_UAC,opensips-mod-uac,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_UAC_REDIRECT,opensips-mod-uac-redirect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_URI,opensips-mod-uri,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_URI_DB,opensips-mod-uri-db,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENSIPS_MOD_XLOG,opensips-mod-xlog,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OPENSIPS,opensips,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_ACCOUNTING,opensips-mod-acc,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_AUTH,opensips-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_AUTH_DB,opensips-mod-auth-db,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_AVPOPS,opensips-mod-avpops,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_DISPATCHER,opensips-mod-dispatcher,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_DIVERSION,opensips-mod-diversion,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_FLATSTORE,opensips-mod-flatstore,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_GFLAGS,opensips-mod-gflags,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_GROUP,opensips-mod-group,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_MEDIAPROXY,opensips-mod-mediaproxy,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_MSILO,opensips-mod-msilo,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_NATHELPER,opensips-mod-nathelper,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_OPTIONS,opensips-mod-options,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_PDT,opensips-mod-pdt,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_PERMISSIONS,opensips-mod-permissions,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_PIKE,opensips-mod-pike,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_SMS,opensips-mod-sms,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_UAC,opensips-mod-uac,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_UAC_REDIRECT,opensips-mod-uac-redirect,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_URI,opensips-mod-uri,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_URI_DB,opensips-mod-uri-db,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENSIPS_MOD_XLOG,opensips-mod-xlog,$(PKG_VERSION)-$(PKG_RELEASE)))
$(eval $(call PKG_mod_template,OPENSIPS_MOD_ACCOUNTING,acc))
$(eval $(call PKG_mod_template,OPENSIPS_MOD_AUTH,auth))
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index a46d3bb..c0099db 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -16,11 +16,11 @@ MASTER_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE}))
PKG_DEPENDS:= zlib, libopenssl,
diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile
index 37d4ffe..6f7036f 100644
--- a/package/openssl-pkcs11/Makefile
+++ b/package/openssl-pkcs11/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/engine_pkcs11-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENSSL_PKCS11,openssl-pkcs11,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OPENSSL_PKCS11,openssl-pkcs11,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= cross_compiling=yes
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 09cde2a..868daa6 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -18,9 +18,9 @@ MASTER_SITES:= http://www.openssl.org/source/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,CA_CERTS,ca-certificates,${PKG_VERSION}-${CACERT_VER},${ARCH}))
+$(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CA_CERTS,ca-certificates,${PKG_VERSION}-${CACERT_VER}))
BUILD_STYLE:= manual
INSTALL_STYLE:= auto confprog
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 372b52a..4758e85 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://www.openswan.org/download/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE}))
FLAGS:= ${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS}
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 0624b76..879882a 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -15,8 +15,8 @@ MASTER_SITES:= http://openvpn.net/release/ \
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,OPENVPN_EASY_RSA,openvpn-easy-rsa,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,OPENVPN_EASY_RSA,openvpn-easy-rsa,$(PKG_VERSION)-$(PKG_RELEASE)))
PKG_DEPEND:="kmod-tun"
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 04fb15f..9c3db7c 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,OPROFILE,oprofile,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,OPROFILE,oprofile,$(PKG_VERSION)-$(PKG_RELEASE)))
TLDFLAGS+= -shared
CONFIGURE_STYLE= gnu
diff --git a/package/osiris/Makefile b/package/osiris/Makefile
index 0cae63a..62a372a 100644
--- a/package/osiris/Makefile
+++ b/package/osiris/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://osiris.shmoo.com/data/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OSIRISD,osirisd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OSIRISD,osirisd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_openssldir="${STAGING_DIR}/usr" \
diff --git a/package/owfs/Makefile b/package/owfs/Makefile
index 6281d0f..fbb317e 100644
--- a/package/owfs/Makefile
+++ b/package/owfs/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=owfs/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,OWFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,OWFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= BUILD_CC=${TARGET_CC} \
diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile
index c6a4800..dbcbe36 100644
--- a/package/p910nd/Makefile
+++ b/package/p910nd/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,P910ND,p910nd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,P910ND,p910nd,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} \
diff --git a/package/palantir/Makefile b/package/palantir/Makefile
index a7e3e84..23bcb9e 100644
--- a/package/palantir/Makefile
+++ b/package/palantir/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PALANTIR,palantir,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PALANTIR,palantir,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
mkdir -p ${WRKINST}/usr
diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile
index dcd33c8..86d52f3 100644
--- a/package/parprouted/Makefile
+++ b/package/parprouted/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.hazard.maks.net/parprouted/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PARPROUTED,parprouted,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PARPROUTED,parprouted,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CC="${TARGET_CC}" \
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index b4ccef1..5746722 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://www.kernel.org/pub/software/utils/pciutils/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PCIUTILS,pciutils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PCIUTILS,pciutils,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CC="${TARGET_CC}" \
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 2a24199..eac615b 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-utf8
diff --git a/package/php/Config.in b/package/php/Config.in
index c62e58a..422ede8 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -9,6 +9,7 @@ choice
prompt "PHP Mode"
default ADK_PACKAGE_PHP_FASTCGI
depends on ADK_COMPILE_PHP
+
config ADK_PACKAGE_PHP_FASTCGI
prompt "PHP built for FastCGI"
bool
diff --git a/package/php/Makefile b/package/php/Makefile
index 4cee9d2..21bc36c 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES:= http://de.php.net/distributions/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE}))
define PKG_mod_template
@@ -118,19 +118,19 @@ else
PKG_CONFIGURE_OPTS+= --disable-xml
endif
-$(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_PCRE,php-mod-pcre,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_SQLITE,php-mod-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PHP_MOD_XML,php-mod-xml,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_PCRE,php-mod-pcre,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_SQLITE,php-mod-sqlite,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_XML,php-mod-xml,$(PKG_VERSION)-$(PKG_RELEASE)))
$(eval $(call PKG_mod_template,PHP_MOD_CURL,curl))
$(eval $(call PKG_mod_template,PHP_MOD_FTP,ftp))
diff --git a/package/picocom/Makefile b/package/picocom/Makefile
index 0d2aae0..912b23b 100644
--- a/package/picocom/Makefile
+++ b/package/picocom/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://efault.net/npat/hacks/picocom/dist/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PICOCOM,picocom,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PICOCOM,picocom,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
ALL_TARGET:= picocom
diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile
index 0abb877..827e3a6 100644
--- a/package/pipacs/Makefile
+++ b/package/pipacs/Makefile
@@ -12,7 +12,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PIPACS,pipacs,${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PIPACS,pipacs,${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CFLAGS="${TCFLAGS} ${TCPPFLAGS}" \
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index a7d2bae..2980f65 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.cairographics.org/releases/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile
index 98e1bfb..8fc8e86 100644
--- a/package/pmacct/Makefile
+++ b/package/pmacct/Makefile
@@ -125,17 +125,17 @@ $$(IPKG_$(1)): $(WRKBUILD)/$(2)
endef
-$(eval $(call PKG_template,NFACCTD_BASIC,nfacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,NFACCTD_MYSQL,nfacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,NFACCTD_PGSQL,nfacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,NFACCTD_SQLITE,nfacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,NFACCTD_CUSTOM,nfacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PMACCTD_BASIC,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PMACCTD_MYSQL,pmacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PMACCTD_PGSQL,pmacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PMACCTD_SQLITE,pmacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PMACCTD_CUSTOM,pmacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,NFACCTD_BASIC,nfacctd,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,NFACCTD_MYSQL,nfacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,NFACCTD_PGSQL,nfacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,NFACCTD_SQLITE,nfacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,NFACCTD_CUSTOM,nfacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PMACCTD_BASIC,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PMACCTD_MYSQL,pmacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PMACCTD_PGSQL,pmacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PMACCTD_SQLITE,pmacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PMACCTD_CUSTOM,pmacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-$(PKG_RELEASE)))
$(eval $(call PKG_build,PMACCT_CLIENT,nfacctd-basic,pmacctd-basic,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_build,PMACCT_BASIC,nfacctd-basic,pmacctd-basic,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 872a00f..059b73f 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://rpm5.org/files/popt/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index 6873258..f5f0196 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PORTMAP,portmap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PORTMAP,portmap,${PKG_VERSION}-${PKG_RELEASE}))
ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
MAKE_FLAGS+= WRAP_LIB='-L${STAGING_DIR}/usr/lib -lwrap'
diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile
index 6fd4335..71707ba 100644
--- a/package/portsentry/Makefile
+++ b/package/portsentry/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}_beta
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PORTSENTRY,portsentry,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PORTSENTRY,portsentry,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
ALL_TARGET:= linux
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 4b44b6f..2ec836b 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES:= ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PK
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
PKG_CONFIGURE_ARGS:=\
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 44864dc..adf408a 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -13,14 +13,14 @@ MASTER_SITES:= ftp://ftp.samba.org/pub/ppp/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PPP,ppp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PPP,ppp,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE}))
ifeq ($(ADK_IPV6),y)
IPV6+=HAVE_INET6="1"
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 5c76fbb..41ac824 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PPTP,pptp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PPTP,pptp,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CC="${TARGET_CC}" \
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index bc6a6e6..095f370 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PPTPD,pptpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PPTPD,pptpd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index 980e83c..ccebd96 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-stable
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PRIVOXY,privoxy,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PRIVOXY,privoxy,${PKG_VERSION}-${PKG_RELEASE}))
TLDFLAGS+= -pthread
CONFIGURE_STYLE:= gnu
diff --git a/package/procmail/Makefile b/package/procmail/Makefile
index 96a2062..60dc5ce 100644
--- a/package/procmail/Makefile
+++ b/package/procmail/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.procmail.org/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PROCMAIL,procmail,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PROCMAIL,procmail,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${MAKE} -C ${WRKBUILD}/src -f ../Makefile.new \
diff --git a/package/procps/Makefile b/package/procps/Makefile
index 071a141..8b44d3e 100644
--- a/package/procps/Makefile
+++ b/package/procps/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://procps.sourceforge.net/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PROCPS,procps,${PKG_VERSION}-${PKG_RELEASE},${ARCH},libncurses))
+$(eval $(call PKG_template,PROCPS,procps,${PKG_VERSION}-${PKG_RELEASE},libncurses))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile
index db1a833..162d11d 100644
--- a/package/ptunnel/Makefile
+++ b/package/ptunnel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.cti.ecp.fr/~beauxir5/ptunnel/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PTUNNEL,ptunnel,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PTUNNEL,ptunnel,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" \
diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index 7a037b5..2ac084c 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -15,15 +15,15 @@ MASTER_SITES:= http://www.quagga.net/download/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,QUAGGA,quagga,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,QUAGGA,quagga,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE}))
ifeq ($(ADK_IPV6),y)
-$(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE}))
endif
-$(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --localstatedir=/var/run/quagga \
diff --git a/package/raddump/Makefile b/package/raddump/Makefile
index 3eee547..8585ef9 100755
--- a/package/raddump/Makefile
+++ b/package/raddump/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=raddump/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RADDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,RADDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= ac_cv_c_bigendian=no \
diff --git a/package/radiusclient-ng/Makefile b/package/radiusclient-ng/Makefile
index 695c41b..3a6ee6c 100644
--- a/package/radiusclient-ng/Makefile
+++ b/package/radiusclient-ng/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES:= http://download.berlios.de/radiusclient-ng/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RADIUSCLIENT_NG,radiusclient-ng,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBRADIUSCLIENT_NG,libradiusclient-ng,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,RADIUSCLIENT_NG,radiusclient-ng,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBRADIUSCLIENT_NG,libradiusclient-ng,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= ac_cv_func_getdomainname=yes
diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index 2d031e0..318e52a 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -16,7 +16,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RADVD,radvd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,RADVD,radvd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-configfile=/etc/radvd.conf \
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index c32eb13..2bf981a 100644
--- a/package/rarpd/Makefile
+++ b/package/rarpd/Makefile
@@ -18,7 +18,7 @@ EXTRA_CFLAGS= -DNEW_LIBNET_INTERFACE
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RARPD,rarpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,RARPD,rarpd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-libnet="${STAGING_DIR}/usr" \
diff --git a/package/rdate/Makefile b/package/rdate/Makefile
index 4c409c8..8d16e94 100644
--- a/package/rdate/Makefile
+++ b/package/rdate/Makefile
@@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RDATE,rdate,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,RDATE,rdate,${PKG_VERSION}-${PKG_RELEASE}))
MAKE_FILE= GNUmakefile
BUILD_STYLE= auto
diff --git a/package/readline/Makefile b/package/readline/Makefile
index 43f6f12..87795c8 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=readline/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-curses
diff --git a/package/reaim/Makefile b/package/reaim/Makefile
index 991ea17..37cdda6 100644
--- a/package/reaim/Makefile
+++ b/package/reaim/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,REAIM,reaim,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,REAIM,reaim,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index 322d1b7..ec8d5ce 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES:= http://www.roaringpenguin.com/files/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,PPPOE_CLIENT,pppoe-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPPOE_SERVER,pppoe-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,PPPOE_SNIFF,pppoe-sniff,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,PPPOE_CLIENT,pppoe-client,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPPOE_SERVER,pppoe-server,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPPOE_SNIFF,pppoe-sniff,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_func_setvbuf_reversed=no \
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index 68372b9..49ca85d 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -17,8 +17,8 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= LIBS="${RRDTOOL_LIBS} -lz" ac_cv_func_malloc_0_nonnull=yes
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index ba9edbe..7fbf1d2 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES:= http://oss.oetiker.ch/rrdtool/pub/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= rd_cv_ieee_works=yes
diff --git a/package/rrs/Makefile b/package/rrs/Makefile
index 283ca4c..54b4619 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -22,8 +22,8 @@ endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND}))
-$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND_NOSSL}))
+$(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
+$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND_NOSSL}))
ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y)
PKG_CFLAGS=-fno-builtin -fno-rtti -nostdinc++
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index 075c8bb..9452066 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://rsync.samba.org/ftp/rsync/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RSYNC,rsync,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,RSYNC,rsync,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index 215c994..a3798ce 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://libtorrent.rakshasa.no/downloads/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= autotool gnu
CONFIGURE_ARGS+= --enable-aligned
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index f3dcde4..f3c3f58 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES:= http://ftp.ruby-lang.org/pub/ruby/stable/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 11be304..7e9fcb4 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -15,9 +15,9 @@ WRKSRC= ${WRKDIST}/source
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
TLDFLAGS+= -Wl,-rpath -Wl,/usr/lib/samba
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index cef662e..99dd34e 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -30,66 +30,66 @@ endif
endef
-$(eval $(call PKG_template,SANE_BACKENDS,sane-backends,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_NET,sane-backend-net,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_ABATON,sane-backend-abaton,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_AGFAFOCUS,sane-backend-agfafocus,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_APPLE,sane-backend-apple,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_ARTEC_EPLUS48U,sane-backend-artec-eplus48u,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_ARTEC,sane-backend-artec,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_AS6E,sane-backend-as6e,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_AVISION,sane-backend-avision,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_BH,sane-backend-bh,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_CANON630U,sane-backend-canon630u,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_CANON,sane-backend-canon,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_COOLSCAN2,sane-backend-coolscan2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_COOLSCAN,sane-backend-coolscan,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_DC25,sane-backend-dc25,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_DMC,sane-backend-dmc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_EPSON,sane-backend-epson,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_FUJITSU,sane-backend-fujitsu,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_GENESYS,sane-backend-genesys,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_GT68XX,sane-backend-gt68xx,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_HP3500,sane-backend-hp3500,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_HP4200,sane-backend-hp4200,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_HP5400,sane-backend-hp5400,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_HP,sane-backend-hp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_IBM,sane-backend-ibm,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_LEO,sane-backend-leo,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_LEXMARK,sane-backend-lexmark,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_MA1509,sane-backend-ma1509,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_MATSUSHITA,sane-backend-matsushita,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_MICROTEK2,sane-backend-microtek2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_MICROTEK,sane-backend-microtek,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_MUSTEK,sane-backend-mustek,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB2,sane-backend-mustek-usb2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB,sane-backend-mustek-usb,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_NEC,sane-backend-nec,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_NIASH,sane-backend-niash,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_PIE,sane-backend-pie,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_PIXMA,sane-backend-pixma,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK_PP,sane-backend-plustek-pp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK,sane-backend-plustek,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_QCAM,sane-backend-qcam,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_RICOH,sane-backend-ricoh,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_S9036,sane-backend-s9036,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_SCEPTRE,sane-backend-sceptre,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_SHARP,sane-backend-sharp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_SM3600,sane-backend-sm3600,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_SM3840,sane-backend-sm3840,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_SNAPSCAN,sane-backend-snapscan,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_SP15C,sane-backend-sp15c,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_ST400,sane-backend-st400,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_STV680,sane-backend-stv680,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_TAMARACK,sane-backend-tamarack,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_TECO1,sane-backend-teco1,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_TECO2,sane-backend-teco2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_TECO3,sane-backend-teco3,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_TEST,sane-backend-test,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_U12,sane-backend-u12,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_UMAX1220U,sane-backend-umax1220u,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_UMAX_PP,sane-backend-umax-pp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SANE_BACKEND_UMAX,sane-backend-umax,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SANE_BACKENDS,sane-backends,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_NET,sane-backend-net,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_ABATON,sane-backend-abaton,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_AGFAFOCUS,sane-backend-agfafocus,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_APPLE,sane-backend-apple,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_ARTEC_EPLUS48U,sane-backend-artec-eplus48u,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_ARTEC,sane-backend-artec,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_AS6E,sane-backend-as6e,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_AVISION,sane-backend-avision,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_BH,sane-backend-bh,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_CANON630U,sane-backend-canon630u,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_CANON,sane-backend-canon,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_COOLSCAN2,sane-backend-coolscan2,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_COOLSCAN,sane-backend-coolscan,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_DC25,sane-backend-dc25,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_DMC,sane-backend-dmc,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_EPSON,sane-backend-epson,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_FUJITSU,sane-backend-fujitsu,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_GENESYS,sane-backend-genesys,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_GT68XX,sane-backend-gt68xx,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_HP3500,sane-backend-hp3500,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_HP4200,sane-backend-hp4200,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_HP5400,sane-backend-hp5400,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_HP,sane-backend-hp,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_IBM,sane-backend-ibm,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_LEO,sane-backend-leo,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_LEXMARK,sane-backend-lexmark,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_MA1509,sane-backend-ma1509,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_MATSUSHITA,sane-backend-matsushita,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_MICROTEK2,sane-backend-microtek2,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_MICROTEK,sane-backend-microtek,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_MUSTEK,sane-backend-mustek,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB2,sane-backend-mustek-usb2,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB,sane-backend-mustek-usb,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_NEC,sane-backend-nec,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_NIASH,sane-backend-niash,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_PIE,sane-backend-pie,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_PIXMA,sane-backend-pixma,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK_PP,sane-backend-plustek-pp,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK,sane-backend-plustek,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_QCAM,sane-backend-qcam,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_RICOH,sane-backend-ricoh,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_S9036,sane-backend-s9036,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_SCEPTRE,sane-backend-sceptre,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_SHARP,sane-backend-sharp,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_SM3600,sane-backend-sm3600,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_SM3840,sane-backend-sm3840,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_SNAPSCAN,sane-backend-snapscan,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_SP15C,sane-backend-sp15c,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_ST400,sane-backend-st400,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_STV680,sane-backend-stv680,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_TAMARACK,sane-backend-tamarack,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_TECO1,sane-backend-teco1,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_TECO2,sane-backend-teco2,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_TECO3,sane-backend-teco3,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_TEST,sane-backend-test,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_U12,sane-backend-u12,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_UMAX1220U,sane-backend-umax1220u,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_UMAX_PP,sane-backend-umax-pp,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SANE_BACKEND_UMAX,sane-backend-umax,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_mod_template,SANE_BACKEND_NET,net))
$(eval $(call PKG_mod_template,SANE_BACKEND_ABATON,abaton))
diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index 6747a82..4963d45 100644
--- a/package/scanlogd/Makefile
+++ b/package/scanlogd/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES:= http://www.openwall.com/scanlogd/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SCANLOGD,scanlogd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SCANLOGD,scanlogd,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CC="${TARGET_CC}" LD="${TARGET_CC}" CFLAGS="-c ${TARGET_CFLAGS}" \
diff --git a/package/scdp/Makefile b/package/scdp/Makefile
index 7fcd2fc..36241cb 100644
--- a/package/scdp/Makefile
+++ b/package/scdp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=scdp/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SCDP,scdp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SCDP,scdp,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_path_libnet_config=${STAGING_DIR}/usr/bin
diff --git a/package/screen/Makefile b/package/screen/Makefile
index e553a6d..d43971e 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_GNU:=screen/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= $(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes)
diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile
index 1cba620..7644e3b 100644
--- a/package/scsi-spin/Makefile
+++ b/package/scsi-spin/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/scsi-spin
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SCSI_SPIN,scsi-spin,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SCSI_SPIN,scsi-spin,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${TARGET_CC} ${TCFLAGS} -o ${WRKBUILD}/scsi-spin files/scsi-spin.c
diff --git a/package/ser2net/Makefile b/package/ser2net/Makefile
index 7b0ca8a..b659910 100644
--- a/package/ser2net/Makefile
+++ b/package/ser2net/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ser2net/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SER2NET,ser2net,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SER2NET,ser2net,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index 785be76..b502d7b 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=serdisplib/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SERDISPLIB,serdisplib,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SERDISPLIB,serdisplib,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-libusb
diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile
index ab7983d..1548631 100644
--- a/package/setpwc/Makefile
+++ b/package/setpwc/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SETPWC,setpwc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SETPWC,setpwc,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${TARGET_CC} ${TCFLAGS} -DVERSION=\"${PKG_VERSION}\" -o ${WRKBUILD}/setpwc ${WRKBUILD}/setpwc.c
diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index 6f9c495..8049eed 100644
--- a/package/setserial/Makefile
+++ b/package/setserial/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=setserial/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SETSERIAL,setserial,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SETSERIAL,setserial,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/shat/Makefile b/package/shat/Makefile
index c0b4c20..ff1f418 100644
--- a/package/shat/Makefile
+++ b/package/shat/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=shat/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SHAT,shat,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SHAT,shat,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${MAKE} -C ${WRKBUILD}/src \
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
index 6b02af3..d2e234d 100644
--- a/package/shorewall-common/Makefile
+++ b/package/shorewall-common/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-install:
PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
diff --git a/package/shorewall-shell/Makefile b/package/shorewall-shell/Makefile
index 233d259..c81a768 100644
--- a/package/shorewall-shell/Makefile
+++ b/package/shorewall-shell/Makefile
@@ -14,7 +14,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},${ARCH}))
+$(eval $(call PKG_template,SHOREWALL_SHELL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
do-install:
PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile
index d05316b..425bfd4 100644
--- a/package/siproxd/Makefile
+++ b/package/siproxd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=siproxd/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SIPROXD,siproxd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SIPROXD,siproxd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile
index 84a7af1..8db0a1e 100644
--- a/package/sipsak/Makefile
+++ b/package/sipsak/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://download.berlios.de/sipsak/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SIPSAK,sipsak,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SIPSAK,sipsak,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index c20f156..868940d 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=sispmctl/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SISPMCTL,sispmctl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SISPMCTL,sispmctl,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/slurm/Makefile b/package/slurm/Makefile
index e256061..f9e4db1 100644
--- a/package/slurm/Makefile
+++ b/package/slurm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.wormulon.net/files/slurm/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SLURM,slurm,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SLURM,slurm,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= LIBS="-lncurses" \
diff --git a/package/snort-wireless/Makefile b/package/snort-wireless/Makefile
index 965ece7..84f2c01 100644
--- a/package/snort-wireless/Makefile
+++ b/package/snort-wireless/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.snort-wireless.org/files/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,SNORT_WIRELESS,snort-wireless,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SNORT_WIRELESS,snort-wireless,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-flexresp \
diff --git a/package/snort/Makefile b/package/snort/Makefile
index a81c7ac..bf1aee9 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.snort.org/dl/current/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-flexresp \
diff --git a/package/socat/Makefile b/package/socat/Makefile
index 47a4075..3e41d86 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.dest-unreach.org/socat/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= sc_cv_termios_ispeed="no" \
diff --git a/package/speex/Makefile b/package/speex/Makefile
index 76eb037..bcba360 100644
--- a/package/speex/Makefile
+++ b/package/speex/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://downloads.us.xiph.org/releases/speex/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSPEEX,libspeex,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBSPEEX,libspeex,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --without-ogg --disable-oggtest --enable-fixed-point
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index 5c1a8ce..bf73504 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES:= http://www.sqlite.org/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= config_BUILD_CC="${HOSTCC}" \
diff --git a/package/squid/Makefile b/package/squid/Makefile
index fb1ac63..3c13422 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -70,18 +70,18 @@ endef
#endef
-$(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,${PKG_NAME}-mod-basic-auth-winbind,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,${PKG_NAME}-mod-external-acl-winbind-group,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,${PKG_NAME}-mod-ntlm-auth-smb-auth,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,${PKG_NAME}-mod-ntlm-auth-winbind-auth,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,${PKG_NAME}-mod-basic-auth-winbind,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,${PKG_NAME}-mod-external-acl-winbind-group,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,${PKG_NAME}-mod-ntlm-auth-smb-auth,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,${PKG_NAME}-mod-ntlm-auth-winbind-auth,${PKG_VERSION}-${PKG_RELEASE}))
#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth}}
#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap}}
diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index edf96cb..db3d013 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SRELAY,srelay,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SRELAY,srelay,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-thread
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index b475ec8..18cdee1 100644
--- a/package/ssltunnel/Makefile
+++ b/package/ssltunnel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.hsc.fr/ressources/outils/ssltunnel/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SSLTUNNEL,ssltunnel,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SSLTUNNEL,ssltunnel,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}"
diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile
index 54db35b..219d1d2 100644
--- a/package/ssmtp/Makefile
+++ b/package/ssmtp/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SSMTP,ssmtp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SSMTP,ssmtp,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 6bd719c..f92795c 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -14,7 +14,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/stress/Makefile b/package/stress/Makefile
index 2844ab2..5f13c48 100644
--- a/package/stress/Makefile
+++ b/package/stress/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://weather.ou.edu/~apw/projects/stress/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,STRESS,stress,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,STRESS,stress,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index fd224b0..85b0c51 100644
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://download.strongswan.org/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,STRONGSWAN,strongswan,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,STRONGSWAN,strongswan,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 4cdd8ca..8580756 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://subversion.tigris.org/downloads/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SUBVERSION,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SUBVERSION,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr/bin/apr-config
diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index 0657c54..105c612 100644
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -13,7 +13,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SWCONFIG,swconfig,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SWCONFIG,swconfig,${PKG_VERSION}-${PKG_RELEASE}))
#XAKE_FLAGS:= LIBS="$(STAGING_DIR)/usr/lib/libnl.a -lm"
XAKE_FLAGS:= LIBS="-lnl -lm" CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include"
diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile
index 4a81417..f7dee9f 100644
--- a/package/syslog-ng/Makefile
+++ b/package/syslog-ng/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-full-dynamic \
diff --git a/package/sysstat/Makefile b/package/sysstat/Makefile
index 99f57eb..33d842b 100644
--- a/package/sysstat/Makefile
+++ b/package/sysstat/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://perso.orange.fr/sebastien.godard/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SYSSTAT,sysstat,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SYSSTAT,sysstat,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/tar/Makefile b/package/tar/Makefile
index 75f8eb4..333e8a0 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES:= ftp://ftp.informatik.rwth-aachen.de/pub/gnu/tar/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TAR,tar,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TAR,tar,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/tcl/Makefile b/package/tcl/Makefile
index 03bbb59..41748d8 100644
--- a/package/tcl/Makefile
+++ b/package/tcl/Makefile
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIST}/unix
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TCL,tcl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TCL,tcl,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= tcl_cv_strstr_unbroken=ok \
diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile
index af215d5..ce3c80c 100644
--- a/package/tcp_wrappers/Makefile
+++ b/package/tcp_wrappers/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LIBWRAP,libwrap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBWRAP,libwrap,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
ALL_TARGET:= tidy all
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile
index 2295f73..332c9c8 100644
--- a/package/tcpdump/Makefile
+++ b/package/tcpdump/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES:= http://www.tcpdump.org/release/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TCPDUMP,tcpdump,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TCPDUMP,tcpdump,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${HOSTCC} \
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index aa454bf..eaec789 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES:= http://www.tinc-vpn.org/packages/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TINC,tinc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TINC,tinc,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-kernel=${LINUX_DIR} \
diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile
index cab1655..6b2a65d 100644
--- a/package/tinyproxy/Makefile
+++ b/package/tinyproxy/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= https://www.banu.com/pub/tinyproxy/1.6/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TINYPROXY,tinyproxy,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TINYPROXY,tinyproxy,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile
index 212ca62..6758e35 100644
--- a/package/tmsnc/Makefile
+++ b/package/tmsnc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=tmsnc/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TMSNC,tmsnc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TMSNC,tmsnc,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index d53b995..58f987b 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://www.tntnet.org/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE}))
ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
diff --git a/package/tor/Makefile b/package/tor/Makefile
index ad47ccf..1918577 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES:= http://tor.eff.org/dist/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_libevent_normal=yes \
diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile
index 0921883..f90dace 100644
--- a/package/trafshow/Makefile
+++ b/package/trafshow/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/trafshow-5.2.3
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE}))
TCFLAGS+= -DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS -I$(STAGING_DIR)/usr/include
TLDFLAGS+= -pthread
diff --git a/package/ttcp/Makefile b/package/ttcp/Makefile
index 75b355c..beba73e 100644
--- a/package/ttcp/Makefile
+++ b/package/ttcp/Makefile
@@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/ttcp
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TTCP,ttcp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,TTCP,ttcp,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${TARGET_CC} ${TCFLAGS} -o ${WRKBUILD}/ttcp ttcp.c
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 95e616c..6747a0d 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,UCLIBCXX,uclibc++,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,UCLIBCXX,uclibc++,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= TOPDIR="${WRKBUILD}/" \
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 73b3fe8..8771456 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -10,7 +10,7 @@ NO_DISTFILES:=1
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-$(PKG_RELEASE)))
# do nothing, uClibc is already build in toolchain directory
do-install:
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 47eae99..f9757a0 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -20,7 +20,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile
index 75befbd..ff2399c 100644
--- a/package/udp-broadcast-relay/Makefile
+++ b/package/udp-broadcast-relay/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://www.joachim-breitner.de/udp-broadcast-relay/files/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,UDP_BROADCAST_RELAY,udp-broadcast-relay,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,UDP_BROADCAST_RELAY,udp-broadcast-relay,${PKG_VERSION}-${PKG_RELEASE}))
do-build:
${TARGET_CC} ${WRKBUILD}/main.c -o ${WRKBUILD}/${PKG_NAME}
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index 2135669..b0d4dfb 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -17,12 +17,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ULOGD,ulogd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ULOGD,ulogd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ULOGD_MOD_MYSQL,ulogd-mod-mysql,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE}))
SUB_INSTALLS-y:=
SUB_INSTALLS-m:=
diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile
index c6c1b55..e51d78e 100644
--- a/package/updatedd/Makefile
+++ b/package/updatedd/Makefile
@@ -19,16 +19,16 @@ ${INSTALL_DIR} ${IDIR_${1}}/usr/lib/updatedd
${INSTALL_BIN} ${WRKINST}/usr/lib/updatedd/lib${2}.so ${IDIR_${1}}/usr/lib/updatedd/
endef
-$(eval $(call PKG_template,UPDATEDD,updatedd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,UPDATEDD_MOD_CHANGEIP,updatedd-mod-changeip,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,UPDATEDD_MOD_DYNDNS,updatedd-mod-dyndns,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,UPDATEDD_MOD_EURODYNDNS,updatedd-mod-eurodyndns,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,UPDATEDD_MOD_HN,updatedd-mod-hn,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,UPDATEDD_MOD_NOIP,updatedd-mod-noip,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,UPDATEDD_MOD_ODS,updatedd-mod-ods,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,UPDATEDD_MOD_OVH,updatedd-mod-ovh,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,UPDATEDD_MOD_REGFISH,updatedd-mod-regfish,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,UPDATEDD,updatedd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,UPDATEDD_MOD_CHANGEIP,updatedd-mod-changeip,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,UPDATEDD_MOD_DYNDNS,updatedd-mod-dyndns,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,UPDATEDD_MOD_EURODYNDNS,updatedd-mod-eurodyndns,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,UPDATEDD_MOD_HN,updatedd-mod-hn,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,UPDATEDD_MOD_NOIP,updatedd-mod-noip,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,UPDATEDD_MOD_ODS,updatedd-mod-ods,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,UPDATEDD_MOD_OVH,updatedd-mod-ovh,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,UPDATEDD_MOD_REGFISH,updatedd-mod-regfish,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 3f839fd..052b491 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-usb/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,LSUSB,lsusb,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LSUSB,lsusb,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile
index 092e137..32ffb97 100644
--- a/package/ussp-push/Makefile
+++ b/package/ussp-push/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://xmailserver.org/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/ustl/Makefile b/package/ustl/Makefile
index 0a6cae1..f1c3027 100644
--- a/package/ustl/Makefile
+++ b/package/ustl/Makefile
@@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-0.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,USTL,ustl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,USTL,ustl,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 8ea246a..fd0600e 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -17,9 +17,9 @@ MASTER_SITES:= ftp://ftp.kernel.org/pub/linux/utils/util-linux/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index 23977c0..83be5f7 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://valgrind.org/downloads/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,VALGRIND,valgrind,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,VALGRIND,valgrind,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-tls
diff --git a/package/vgp/Makefile b/package/vgp/Makefile
index 4e7d3bb..27cd719 100755
--- a/package/vgp/Makefile
+++ b/package/vgp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://vgpd.freaknet.org/files/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VGP,vgp,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,VGP,vgp,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
INSTALL_STYLE:= auto
diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile
index 160d03a..955db3b 100644
--- a/package/vilistextum/Makefile
+++ b/package/vilistextum/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://bhaak.dyndns.org/${PKG_NAME}/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VILISTEXTUM,vilistextum,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,VILISTEXTUM,vilistextum,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/vim/Makefile b/package/vim/Makefile
index 2f54059..de5074b 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIST}/src
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VIM,vim,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,VIM,vim,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= vim_cv_toupper_broken=no \
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile
index 434fe03..bfce815 100644
--- a/package/vnc-reflector/Makefile
+++ b/package/vnc-reflector/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/vnc_reflector
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VNC_REFLECTOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,VNC_REFLECTOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
TCPPFLAGS+= -I.
diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile
index 7c78f2f..e551562 100644
--- a/package/vnstat/Makefile
+++ b/package/vnstat/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://humdi.net/vnstat/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VNSTAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,VNSTAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS}
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index 8936a9f..e4eab95 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -16,7 +16,7 @@ PKG_DEPENDS:= libgcrypt libgpg-error kmod-tun
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VPNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,VPNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
XAKE_FLAGS+= CC="${TARGET_CC}" \
diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile
index 2cdab21..695333b 100644
--- a/package/vrrpd/Makefile
+++ b/package/vrrpd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=vrrpd/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VRRPD,vrrpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,VRRPD,vrrpd,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS:= CC="${TARGET_CC}" \
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index 02918cf..8f3e691 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ftp://vsftpd.beasts.org/users/cevans/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VSFTPD,vsftpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,VSFTPD,vsftpd,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS}
diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index f1482a0..a61fe61 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,VTUN,vtun,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,VTUN,vtun,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index bce8e41..a29bc79 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \
diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index fef79b4..47ac046 100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=wccpd/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WCCPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WCCPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile
index a6858dd..82be38c 100644
--- a/package/wdfs/Makefile
+++ b/package/wdfs/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://noedler.de/projekte/wdfs/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WDFS,wdfs,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WDFS,wdfs,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 1e1a502..96a820f 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -29,7 +29,7 @@ else
PKG_DEPEND+= liblua
endif
-$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPEND}))
+$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= ${ENABLE_TLS} \
diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile
index b46e273..591f714 100644
--- a/package/wifidog/Makefile
+++ b/package/wifidog/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WIFIDOG,wifidog,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WIFIDOG,wifidog,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \
diff --git a/package/wireless-firmware/Makefile b/package/wireless-firmware/Makefile
index e865468..a941bdc 100644
--- a/package/wireless-firmware/Makefile
+++ b/package/wireless-firmware/Makefile
@@ -15,7 +15,7 @@ WRKDIST= ${WRKDIR}/RT61_Firmware_V1.2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WIRELESS_FIRMWARE_RT61,wireless-firmware-rt61,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WIRELESS_FIRMWARE_RT61,wireless-firmware-rt61,${PKG_VERSION}-${PKG_RELEASE}))
INSTALL_STYLE= manual
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index ed02573..e16ef25 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/wireless_tools.29
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS} -I."
diff --git a/package/wol/Makefile b/package/wol/Makefile
index 1a44341..0bb138c 100644
--- a/package/wol/Makefile
+++ b/package/wol/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=ahh/}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WOL,wol,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WOL,wol,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= ac_cv_func_malloc_0_nonnull=yes \
diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile
index 13617cf..12fd46e 100644
--- a/package/wondershaper/Makefile
+++ b/package/wondershaper/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= http://lartc.org/wondershaper/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WONDERSHAPER,wondershaper,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WONDERSHAPER,wondershaper,${PKG_VERSION}-${PKG_RELEASE}))
do-install:
${INSTALL_DIR} ${IDIR_WONDERSHAPER}/usr/sbin/
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 9d12820..ddc2901 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIST}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RELEASE}))
BUILD_STYLE:= auto
MAKE_FLAGS+= CPPFLAGS='${TCPPFLAGS}' \
diff --git a/package/wput/Makefile b/package/wput/Makefile
index aa65e20..04477ed 100644
--- a/package/wput/Makefile
+++ b/package/wput/Makefile
@@ -17,7 +17,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,WPUT,wput,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,WPUT,wput,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-g-switch
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index d4e38aa..3b25cbb 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,XFSPROGS,xfsprogs,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,XFSPROGS,xfsprogs,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= autoconf gnu
CONFIGURE_ARGS+= --enable-gettext=no \
diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index 434d0bd..349d194 100644
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES:= http://www.xinetd.org/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --without-libwrap \
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 6a56e65..fb35bb8 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-xinerama \
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 642888f..c63f92b 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -15,7 +15,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE}))
CONFIGURE_STYLE= manual
BUILD_STYLE= auto
diff --git a/package/zsh/Makefile b/package/zsh/Makefile
index 5daebbf..7e5a665 100644
--- a/package/zsh/Makefile
+++ b/package/zsh/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES:= ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,ZSH,zsh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ZSH,zsh,$(PKG_VERSION)-$(PKG_RELEASE)))
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto