add file type autodetection for the unpack command and nuke PKG_CAT:= in lots of places

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6582 3c298f89-4303-0410-b956-a3cf2f4a3e73

53 files changed, 48 insertions, 63 deletions

diff --git a/include/unpack.mk b/include/unpack.mk
index 7813e3b3d..10e6c25bf 100644
--- a/include/unpack.mk
+++ b/include/unpack.mk
@@ -1,21 +1,58 @@
+ext=$(word $(words $(subst ., ,$(1))),$(subst ., ,$(1)))
+
+# unpacking files with +s may break on some platforms. this typically emits error code 2
+ifneq ($(HOST_OS),Linux)
+  HOST_TAR:=trapret 2 $(TAR)
+else
+  HOST_TAR:=$(TAR)
+endif
+TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
+UNZIP_CMD:=unzip -d $(PKG_BUILD_DIR)/.. $(DL_DIR)/$(PKG_SOURCE)
+
+ifeq ($(PKG_SOURCE),)
+  PKG_UNPACK ?= true
+endif
 ifeq ($(strip $(PKG_UNPACK)),)
-  ifneq ($(HOST_OS),Linux)
-	HOST_TAR:=trapret 2 $(TAR)
-  else
-    HOST_TAR:=$(TAR)
+  ifeq ($(strip $(PKG_CAT)),)
+    # try to autodetect file type
+    EXT:=$(call ext,$(PKG_SOURCE))
+    EXT1:=$(EXT)
+
+    ifeq ($(filter gz tgz,$(EXT)),$(EXT))
+      EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
+      UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) |
+    endif	
+    ifeq ($(filter bzip2 bz2 bz tbz2 tbz,$(EXT)),$(EXT))
+      EXT:=$(call ext,$(PKG_SOURCE:.$(EXT)=))
+      UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) |
+    endif
+    ifeq ($(filter tgz tbz tbz2,$(EXT1)),$(EXT1))
+      $(error FOO: $(filter tgz tbz tbz2,$(EXT1)),$(EXT1))
+      EXT:=tar
+    endif
+    UNPACK ?= cat $(DL_DIR)/$(PKG_SOURCE) |
+    ifeq ($(EXT),tar)
+      PKG_UNPACK:=$(UNPACK) $(TAR_CMD)
+    endif
+    ifeq ($(EXT),cpio)
+      PKG_UNPACK:=$(UNPACK) (cd $(PKG_BUILD_DIR)/..; cpio -i -d)
+    endif
+    ifeq ($(EXT),zip)
+      PKG_UNPACK:=$(UNZIP_CMD)
+    endif
   endif
-  ifneq ($(strip $(PKG_CAT)),)
+ 
+  # compatibility code for packages that set PKG_CAT
+  ifeq ($(strip $(PKG_CAT)$(PKG_UNPACK)),)
     # use existing PKG_CAT
-    PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
+    PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD)
     ifeq ($(PKG_CAT),unzip)
-      PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/.. $(DL_DIR)/$(PKG_SOURCE)
+      PKG_UNPACK:=$(UNZIP_CMD)
     endif
     # replace zcat with $(ZCAT), because some system have it as gzcat
     ifeq ($(PKG_CAT),zcat)
-      PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
+      PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR_CMD)
     endif
-  else
-    # try to autodetect file type
   endif
   ifneq ($(strip $(CRLF_WORKAROUND)),)
     PKG_UNPACK += && find $(PKG_BUILD_DIR) -type f -print0 | xargs -0 perl -pi -e 's!\r$$$$!!g'
diff --git a/package/alsa/Makefile b/package/alsa/Makefile
index a96e4f0f6..8ab903087 100644
--- a/package/alsa/Makefile
+++ b/package/alsa/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/
 PKG_MD5SUM:=4cff99be4b225e96663fbd61cabe3182
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/aodv-uu/Makefile b/package/aodv-uu/Makefile
index 9a3b218b6..64cdb07e1 100644
--- a/package/aodv-uu/Makefile
+++ b/package/aodv-uu/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://core.it.uu.se/core/files/
 PKG_MD5SUM:=05460543054449cb4b170252a7168c65
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/ar7-atm/Makefile b/package/ar7-atm/Makefile
index e30b53fc2..1ff2186fd 100644
--- a/package/ar7-atm/Makefile
+++ b/package/ar7-atm/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_MD5SUM:=90c10702c9c3129e2ad1c01ce3975bf5
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/ar7-net/Makefile b/package/ar7-net/Makefile
index 4b7127f3f..90c6d6565 100644
--- a/package/ar7-net/Makefile
+++ b/package/ar7-net/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_MD5SUM:=ce46849a8f1055cef09c59c6bdb7f86a
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/arptables/Makefile b/package/arptables/Makefile
index 4a27223b7..be6cd8792 100644
--- a/package/arptables/Makefile
+++ b/package/arptables/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables
 PKG_MD5SUM:=283d19292bd99913dc3a42842826c286
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
 
diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index eb33bc3e6..04deb87a2 100644
--- a/package/bridge/Makefile
+++ b/package/bridge/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/bridge
 PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
 
diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 1bf1ee017..579033a77 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -17,7 +17,6 @@ WLC_VERSION:=0.1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_MD5SUM:=a7d8dde3ce474c361143b83e1d9890b1
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index fc5711f6a..304960152 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -16,7 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \
 		http://distfiles.gentoo.org/distfiles/
 PKG_MD5SUM:=5728403bce309cdabcffa414e2e64052
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index 4131fc23f..d1494d1d6 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=@SF/comgt
 PKG_MD5SUM:=db2452680c3d953631299e331daf49ef
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 4451f8113..2b6e7945c 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 PKG_MD5SUM:=57b8643dc394cf2fbd1bced64536c6df
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 591d77856..42955fd99 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
 PKG_MD5SUM:=ca8e53a766faec831882831364568421
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 47e30cb44..83e609eaf 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/e2fsprogs
 PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 41c1e0fcd..907c69313 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables
 PKG_MD5SUM:=f07111fcc1966be669278433c35dcc28
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
 
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 913feba59..5e60e10ae 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=3f4f5d07d12dedc0a3fd23472171fe94
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 90e075182..e81328480 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNU/gmp
 PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index 8e5345645..aa0413e25 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/haserl
 PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/hostap-utils/Makefile b/package/hostap-utils/Makefile
index aa9938748..7ed0fd9f5 100644
--- a/package/hostap-utils/Makefile
+++ b/package/hostap-utils/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=afe041581b8f01666e353bec20917c85
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/hostap/Makefile b/package/hostap/Makefile
index 79875512f..d3d5fb651 100644
--- a/package/hostap/Makefile
+++ b/package/hostap/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index f362912d0..d200822e8 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=d5113247dc6ee17106e6bc7cb89aa507
-PKG_CAT:=zcat
 
 PKG_BUILD_DEPENDS:=madwifi
 
diff --git a/package/hotplug2/Makefile b/package/hotplug2/Makefile
index 3d1729cb5..6c2a0a105 100644
--- a/package/hotplug2/Makefile
+++ b/package/hotplug2/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://isteve.bofh.cz/~isteve/hotplug2
 PKG_MD5SUM:=ea2c01d027b4002e4e6b0ff266f51a51
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 5d3851f9f..e620d1212 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
 PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index f1620d325..a1afe6283 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -7,6 +7,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipsec-tools
 PKG_VERSION:=0.6.6
@@ -15,10 +16,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ipsec-tools
 PKG_MD5SUM:=e908f3cf367e31c7902df5ab16fbe5c3
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 define Package/ipsec-tools
   SECTION:=net
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index c68334331..f3b451d62 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
 PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index c7f73f1cc..822be9976 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -19,7 +19,6 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
 	ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
 	ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
 PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
diff --git a/package/isakmpd/Makefile b/package/isakmpd/Makefile
index 336bdfe5a..615ed5b60 100644
--- a/package/isakmpd/Makefile
+++ b/package/isakmpd/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/i/isakmpd/
 PKG_MD5SUM:=e6d25a9e232fb186e1a48dc06453bd57
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index de0ad37fb..cfca8b1dc 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.xmission.com/~ebiederm/files/kexec/
 PKG_MD5SUM:=b4f7ffcc294d41a6a4c40d6e44b7734d
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index 30ff8899c..47469b61c 100644
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=b569066ac2ba1356c2112b118a7d74d0
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index b2edc1aa3..c9af51dd0 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index a9a58a13a..3fe9dd0c9 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
 PKG_MD5SUM:=84fef49cc39ff2605204246666f65864
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 5c780ed66..530a828a1 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=bf5509fccd3852e22551826063b1b61e
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/nozomi/Makefile b/package/nozomi/Makefile
index b5ed92134..8328198e4 100644
--- a/package/nozomi/Makefile
+++ b/package/nozomi/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=nozomi_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pharscape.org/3G
 PKG_MD5SUM:=90e4d8f389a18b5579f7234a23e32e99
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index 7fc208556..aaf85083e 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.ntfs-3g.org/
 PKG_MD5SUM:=873a8de662849d129fc7c475ad3f5447
-PKG_CAT:=zcat
 
 PKG_BUILD_DEPENDS:=libfuse
 
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index d0e178ef9..9a9661e78 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -18,7 +18,6 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \
 	ftp://ftp.webmonster.de/pub/openssl/source/ \
 	ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
 PKG_MD5SUM:=8ed1853538e1d05a1f5ada61ebf8bffa
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 18ea6af9f..ea23caf0e 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
 PKG_MD5SUM:=70f22e8adc39e07a165f75eccb7cd079
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index e0474c48d..0f1a7f787 100644
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 4293f1d27..20945852c 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
 PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c
-PKG_CAT:=zcat
 
 PKG_BUILD_DEPENDS:=libpcap linux-atm
 
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index eeff66867..eb6652f00 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pptpclient
 PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/pwc/Makefile b/package/pwc/Makefile
index 2540cdee3..e92b98ba8 100644
--- a/package/pwc/Makefile
+++ b/package/pwc/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.saillard.org/linux/pwc/files/
 PKG_MD5SUM:=8763f3d6fd0f9738ef9854de205a126d
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/rt2500/Makefile b/package/rt2500/Makefile
index f7631a863..fb6d59451 100644
--- a/package/rt2500/Makefile
+++ b/package/rt2500/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/rt2400
 PKG_MD5SUM:=83b8b9a091705c08d99268479f3b3b6a
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/rt2570/Makefile b/package/rt2570/Makefile
index ad01632f9..24c247014 100644
--- a/package/rt2570/Makefile
+++ b/package/rt2570/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/rt2400
 PKG_MD5SUM:=f4131d670920a878b4d4a0f5d4d8b93a
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/rt61/Makefile b/package/rt61/Makefile
index 6b2efbe0c..eb25ee515 100644
--- a/package/rt61/Makefile
+++ b/package/rt61/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/rt2400
 PKG_MD5SUM:=3f2600400a3d6d878a5d27d0a2e47eed
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index 201358ca7..0023c009b 100644
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/shfs
 PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile
index 013a77ca7..79b6636d7 100644
--- a/package/spca5xx/Makefile
+++ b/package/spca5xx/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://mxhaard.free.fr/spca50x/Download
 PKG_MD5SUM:=1e3fa004490a07b7b76de03d70b3e8ea
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index 43a788074..421c78c0c 100644
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.strongswan.org/
 PKG_MD5SUM:=57427f5b48123851a73b10d78dd4f8d6
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 9f2e9a34a..4e00d6b77 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -20,7 +20,6 @@ PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
 	ftp://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/ \
 	http://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/
 PKG_MD5SUM:=320ccd2d0f4540d10e021bafa14f8985
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile
index 6b38f8e69..a014d82c0 100644
--- a/package/ueagle-atm/Makefile
+++ b/package/ueagle-atm/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://castet.matthieu.free.fr/eagle/release/
 PKG_MD5SUM:=5da1fceb15168f4c7ad407a3e38ddecb
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 05ad5cfda..e112d0125 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -18,7 +18,6 @@ PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
 	ftp://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
 	http://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/
 PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index d05e69f8f..0f790aa52 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
 PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
-PKG_CAT:=zcat
 TAR_OPTIONS += || true
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index b08a4be9a..fb11085cf 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -15,7 +15,6 @@ PKG_MD5SUM:=bd2436392ad3c6d2513da701a12f2d27
 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/yamonenv/Makefile b/package/yamonenv/Makefile
index b496beba2..7cfe6092d 100644
--- a/package/yamonenv/Makefile
+++ b/package/yamonenv/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)_gruen.4g__$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://meshcube.org/nylon/stable/sources/
 PKG_MD5SUM:=a3e4f24155aa3ba5aa502bc63fdaa6ad
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile
index 19abc4d25..b797c85c5 100644
--- a/package/zd1211/Makefile
+++ b/package/zd1211/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://zd1211.ath.cx/download/
 PKG_MD5SUM:=a5751f0e6f1f368689077fa7758a4932
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)
 
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index d16c79d4f..066a39978 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk