resolve merge conflict

35 files changed, 29 insertions, 59 deletions

diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index 5cc43e359..b34909e5b 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -10,7 +10,6 @@ PKG_MD5SUM:=		74e02d4f0704b3083a01feda66033449
 PKG_DESCR:=		IPv4/IPv6 tunnel proxy
 PKG_SECTION:=		ipv6
 PKG_BUILDDEP:=		autotool
-PKG_DEPENDS:=		kmod-ipv6
 PKG_URL:=		http://toxygen.net/6tunnel/
 PKG_SITES:=		http://toxygen.net/6tunnel/
 
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 407c3a65c..155da938f 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		11
 PKG_MD5SUM:=		c9bcc83644ed788e22a7c3f3d4021350
 PKG_DESCR:=		SixXS Automatic IPv6 Connectivity Client Utility
 PKG_SECTION:=		ipv6
-PKG_DEPENDS:=		kmod-ipv6 kmod-tun libpthread
+PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.sixxs.net/
 PKG_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 
diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile
index f19ca1a4e..33d9067f7 100644
--- a/package/bluez-firmware/Makefile
+++ b/package/bluez-firmware/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		1cc3cefad872e937e05de5a0a2b390dd
 PKG_DESCR:=		firmware for BCM2033
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		kmod-bt bluez
+PKG_DEPENDS:=		bluez
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://bluez.sourceforge.net/download/
 
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index b4bc70410..e2bdec773 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		5d37e581107b3d6f91b81194a5006407
 PKG_DESCR:=		bluetooth applications
 PKG_SECTION:=		wifi
-PKG_DEPENDS:=		kmod-bt glib dbus libreadline
+PKG_DEPENDS:=		glib dbus libreadline
 PKG_BUILDDEP:=		autotool glib dbus readline
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 678648059..9fec7c28a 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -10,7 +10,6 @@ PKG_MD5SUM:=		ec7b381160b340648dede58c31bb2238
 PKG_DESCR:=		ethernet bridging tools
 PKG_SECTION:=		bridge
 PKG_BUILDDEP:=		autotool
-PKG_DEPENDS:=		kmod-bridge kmod-ipv6
 PKG_URL:=		http://www.linuxfoundation.org/en/Net:Bridge
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bridge/}
 
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index fb430112c..aa5c08470 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -7,10 +7,9 @@ PKG_NAME:=		chillispot
 PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		9d2597756af3fa14d7331b4a3651fc9b
-PKG_DESCR:=		Wireless LAN Access Point Controller
+PKG_DESCR:=		wireless LAN access point controller
 PKG_SECTION:=		wifi
 PKG_BUILDDEP:=		autotool
-PKG_DEPENDS:=		kmod-tun
 PKG_URL:=		http://www.chillispot.info/
 PKG_SITES=		http://www.chillispot.info/download/
 
diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index 3befb43a3..c58a8ecd6 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -9,7 +9,6 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		93697dbc043cb4d5c66e15e281f872e5
 PKG_DESCR:=		CIFS network filesystem utilities
 PKG_SECTION:=		net/fs
-PKG_DEPENDS:=		kmod-cifs kmod-nls-utf8
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		https://wiki.samba.org/index.php/LinuxCIFS_utils
 PKG_SITES:=		ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile
index db0069b8b..4dc988f24 100644
--- a/package/cryptodev-linux/Makefile
+++ b/package/cryptodev-linux/Makefile
@@ -10,7 +10,6 @@ PKG_MD5SUM:=		eade38998313c25fd7934719cdf8a2ea
 PKG_DESCR:=		cryptodev-linux kernel module
 PKG_SECTION:=		crypto
 PKG_BUILDDEP:=		openssl
-PKG_DEPENDS:=		kmod-crypto-manager2
 PKG_URL:=		http://home.gna.org/cryptodev-linux/
 PKG_SITES:=		http://download.gna.org/cryptodev-linux/
 
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index 0d53188af..2e9d42f78 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -10,8 +10,7 @@ PKG_MD5SUM:=		a7aeb549a543eeac433eadfb6bc67837
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt
-PKG_DEPENDS+=		kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc
-PKG_DEPENDS+=		kmod-crypto-sha256 kmod-blk-dev-dm
+PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt
 PKG_BUILDDEP:=		libgcrypt popt e2fsprogs lvm
 PKG_URL:=		http://cryptsetup.googlecode.com/
 PKG_SITES:=		http://cryptsetup.googlecode.com/files/
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index e24333e15..7555a0134 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c75f9d7d260e7364362b89beba2b3186
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		net/fs
-PKG_DEPENDS:=		fuse-utils kmod-fuse-fs neon
+PKG_DEPENDS:=		fuse-utils neon
 PKG_BUILDDEP:=		libiconv-tiny neon fuse
 PKG_URL:=		http://savannah.nongnu.org/projects/davfs2/
 PKG_SITES:=		http://download.savannah.gnu.org/releases/davfs2/
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 8d55c6900..15f7ee2fc 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		33cae22ca50311446400daf8a6255c6a
 PKG_DESCR:=		filesystem in userspace utility
 PKG_SECTION:=		fs
-PKG_DEPENDS:=		kmod-fuse-fs libfuse
+PKG_DEPENDS:=		libfuse
 PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://fuse.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 8543dd91e..c74245a6f 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -16,7 +16,6 @@ PKG_SITES:=		http://www.kernel.org/pub/linux/utils/net/iproute2/
 
 PKG_SUBPKGS:=		IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS
 PKGSD_TC:=		iproute2 traffic control utility
-PKGSS_TC:=		kmod-sched
 PKGSB_TC:=		iptables
 PKGSD_TC_ATM:=		iproute2 traffic control ATM support library
 PKGSS_TC_ATM:=		tc libatm
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 93e8500d0..477619c78 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -9,11 +9,6 @@ PKG_RELEASE:=		5
 PKG_MD5SUM:=		536d048c8e8eeebcd9757d0863ebb0c0
 PKG_DESCR:=		netfilter firewalling software
 PKG_SECTION:=		firewall
-PKG_DEPENDS:=		kmod-ip-nf-iptables kmod-nf-conntrack
-PKG_DEPENDS+=		kmod-nf-conntrack-ipv4 kmod-full-nat
-PKG_DEPENDS+=		kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject
-PKG_DEPENDS+=		kmod-ip-nf-filter kmod-ip-nf-match-state
-PKG_DEPENDS+=		kmod-netfilter-xt-target-tcpmss
 PKG_BUILDDEP:=		autotool libnetfilter_conntrack
 PKG_URL:=		http://www.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/iptables/files/
@@ -24,7 +19,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 PKG_SUBPKGS:=		IPTABLES IP6TABLES
 PKGSD_IPTABLES:=	iptables for IPv4
 PKGSD_IP6TABLES:=	iptables for IPv6
-PKGSS_IP6TABLES:=	iptables kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 kmod-ip6-nf-filter kmod-ip6-nf-target-reject
+PKGSS_IP6TABLES:=	iptables
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/ipvsadm/Makefile b/package/ipvsadm/Makefile
index ac7fda27a..918a3a493 100644
--- a/package/ipvsadm/Makefile
+++ b/package/ipvsadm/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		eac3ba3f62cd4dea2da353aeddd353a8
 PKG_DESCR:=		IPVS admin utility
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libpopt kmod-ip-vs
+PKG_DEPENDS:=		libpopt
 PKG_BUILDDEP:=		popt
 PKG_URL:=		http://www.linuxvirtualserver.org/
 PKG_SITES:=		http://www.linuxvirtualserver.org/software/kernel-2.6/
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 486e2a08b..a22b89c6a 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -29,9 +29,9 @@ $(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${PKG
 AUTOTOOL_STYLE:=	autoreconf
 
 ifeq (${ADK_PACKAGE_LIBTIRPC_WITH_GSS},y)
-CONFIGURE_ARGS+=	--enable-gss
+CONFIGURE_ARGS+=	--enable-gssapi
 else
-CONFIGURE_ARGS+=	--disable-gss
+CONFIGURE_ARGS+=	--disable-gssapi
 endif
 
 ifeq (${ADK_PACKAGE_LIBTIRPC_WITH_IPV6},y)
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 0e6b22af2..b5a1ecf0f 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -11,8 +11,7 @@ PKG_DESCR:=		virtualization API
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		libxml2 gnutls python2 libpcap parted eudev
 PKG_DEPENDS:=		libxml2 libgnutls python2 libpcap libreadline
-PKG_DEPENDS+=		dmidecode kmod-netfilter-xt-target-checksum
-PKG_DEPENDS+=		dnsmasq qemu libnl libudev
+PKG_DEPENDS+=		dmidecode dnsmasq qemu libnl libudev
 PKG_URL:=		http://www.libvirt.org/
 PKG_SITES:=		http://libvirt.org/sources/
 PKG_OPTS:=		dev
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 44e08a2fb..3e8a80a38 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -9,7 +9,6 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		93ada53bb414b9d622f80a717bc2694b
 PKG_DESCR:=		IPv6 multicast routing daemon
 PKG_SECTION:=		ipv6
-PKG_DEPENDS:=		kmod-ipv6
 PKG_SITES:=		http://www.openadk.org/distfiles/
 PKG_NEED_CXX:=		1
 PKG_CXX:=		MRD6
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index ac45e4f86..1bc5f7b69 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -15,10 +15,8 @@ PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
 PKG_SUBPKGS:=		NFS_UTILS NFS_UTILS_CLIENT NFS_UTILS_SERVER
-PKGSS_NFS_UTILS_CLIENT:=kmod-nfs-fs kmod-sunrpc
 PKGSD_NFS_UTILS_CLIENT:=client utilities
 PKGSN_NFS_UTILS_CLIENT:=nfs-utils
-PKGSS_NFS_UTILS_SERVER:=kmod-nfsd kmod-sunrpc
 PKGSD_NFS_UTILS_SERVER:=server daemons and utilities
 PKGSN_NFS_UTILS_SERVER:=nfs-utils
 
@@ -26,7 +24,7 @@ PKG_CHOICES_NFS_UTILS:=	V3 V4
 PKGCD_V3:=		NFS version 3
 PKGCD_V4:=		NFS version 4
 PKGCB_V4:=		libevent libnfsidmap krb5 libgssglue librpcsecgss
-PKGCS_V4:=		libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss
+PKGCS_V4:=		libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index cbe0cef79..2e733cbec 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -9,7 +9,6 @@ PKG_RELEASE:=		4
 PKG_MD5SUM:=		f11d563816249d730a00498983485f3a
 PKG_DESCR:=		ntfs filesystem driver using fuse
 PKG_SECTION:=		fs
-PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://tuxera.com
 PKG_SITES:=		http://tuxera.com/opensource/
 
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 1c981f30b..40ea4161a 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -9,12 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		da2e8b02ecc30a408cc5766767fef84f
 PKG_DESCR:=		IPsec software
 PKG_SECTION:=		net/security
-PKG_DEPENDS:=		ip libgmp libpthread kmod-net-key kmod-xfrm-user
-PKG_DEPENDS+=		kmod-inet-ah kmod-inet-esp
-PKG_DEPENDS+=		kmod-inet-xfrm-mode-tunnel kmod-inet-xfrm-mode-transport
-PKG_DEPENDS+=		kmod-crypto-sha1 kmod-crypto-md5
-PKG_DEPENDS+=		kmod-crypto-null kmod-crypto-des kmod-crypto-aes
-PKG_DEPENDS+=		kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc
+PKG_DEPENDS:=		ip libgmp libpthread
 PKG_BUILDDEP:=		gmp
 PKG_URL:=		http://www.openswan.org/
 PKG_SITES:=		http://www.openswan.org/download/
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index c209e6cd5..8fddc804c 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		547a024ac81acf458edeb19f32cf1088
 PKG_DESCR:=		VPN solution using SSL/TLS
 PKG_SECTION:=		net/security
 PKG_BUILDDEP:=		autotool
-PKG_DEPENDS:=		kmod-tun ip
+PKG_DEPENDS:=		ip
 PKG_URL:=		http://openvpn.net/
 PKG_SITES:=		http://swupdate.openvpn.org/community/releases/
 
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 1bce40812..4b741ff6d 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		4
 PKG_MD5SUM:=		00aec1287da2dfffda17a9b1c0a01868
 PKG_DESCR:=		system-wide profiles
 PKG_SECTION:=		debug
-PKG_DEPENDS:=		libpopt kmod-oprofile libbfd libstdcxx
+PKG_DEPENDS:=		libpopt libbfd libstdcxx
 PKG_BUILDDEP:=		popt binutils gcc
 PKG_URL:=		http://oprofile.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=oprofile/}
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 44ac4bb98..0930e93c7 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -9,7 +9,6 @@ PKG_RELEASE:=		7
 PKG_MD5SUM:=		4621bc56167b6953ec4071043fe0ec57
 PKG_DESCR:=		Point-to-Point Protocol software
 PKG_SECTION:=		ppp
-PKG_DEPENDS:=		kmod-ppp
 PKG_BUILDDEP:=		libpcap
 PKG_URL:=		http://ppp.samba.org/
 PKG_SITES:=		ftp://ftp.samba.org/pub/ppp/
@@ -19,7 +18,6 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_SUBPKGS:=		PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS
 PKG_SUBPKGS+=		PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS
 PKGSD_PPP_MOD_PPPOE:=	PPP over Ethernet support
-PKGSS_PPP_MOD_PPPOE:=	kmod-pppoe
 PKGSN_PPP_MOD_PPPOE:=	ppp
 PKGSD_PPP_MOD_PPPUMTS:=	PPP UMTS support
 PKGSS_PPP_MOD_PPPUMTS:=	comgt
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index ab0e63562..7cc36912b 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		4efce9f263e2c3f38d79d9df222476de
 PKG_DESCR:=		Point-to-Point Tunneling Protocol (PPTP) client
 PKG_SECTION:=		ppp
-PKG_DEPENDS:=		ppp kmod-net-ipgre
+PKG_DEPENDS:=		ppp
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=pptpclient/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index ad91ee1e2..5934d24e6 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		b38df9c431041922c997c1148bedf591
 PKG_DESCR:=		Point-to-Point Tunneling Protocol (PPTP) server
 PKG_SECTION:=		ppp
-PKG_DEPENDS:=		ppp kmod-crypto kmod-ppp-mppe kmod-ppp kmod-net-ipgre
+PKG_DEPENDS:=		ppp
 PKG_URL:=		http://www.poptop.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=poptop/}
 
diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index fa811ffbc..df48e909b 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		13ef482ed4de334bede07839806a1689
 PKG_DESCR:=		routing advertisement daemon for IPv6
 PKG_SECTION:=		ipv6
-PKG_DEPENDS:=		kmod-ipv6 libdaemon
+PKG_DEPENDS:=		libdaemon
 PKG_BUILDDEP:=		autotool libdaemon
 PKG_URL:=		http://www.litech.org/radvd/
 PKG_SITES:=		http://v6web.litech.org/radvd/dist/
diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index 1052ff7b1..996bddd06 100644
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -9,12 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		f624ab041c306af0f5f57c927e9ea2e4
 PKG_DESCR:=		IPsec software
 PKG_SECTION:=		net/security
-PKG_DEPENDS:=		ip libpthread kmod-net-key kmod-xfrm-user
-PKG_DEPENDS+=		kmod-inet-ah kmod-inet-esp
-PKG_DEPENDS+=		kmod-inet-xfrm-mode-tunnel kmod-inet-xfrm-mode-transport
-PKG_DEPENDS+=		kmod-crypto-sha1 kmod-crypto-md5
-PKG_DEPENDS+=		kmod-crypto-null kmod-crypto-des kmod-crypto-aes
-PKG_DEPENDS+=		kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc
+PKG_DEPENDS:=		ip libpthread
 PKG_URL:=		http://strongswan.org/index.htm
 PKG_SITES:=		http://download.strongswan.org/
 
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index 6c1d15433..0579435f3 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		762c0d47bdf1b33a40b19165d9c2761f
 PKG_DESCR:=		VPN tunnel daemon
 PKG_SECTION:=		net/security
-PKG_DEPENDS:=		zlib liblzo libopenssl kmod-tun
+PKG_DEPENDS:=		zlib liblzo libopenssl
 PKG_BUILDDEP:=		zlib liblzo openssl
 PKG_URL:=		http://www.tinc-vpn.org/
 PKG_SITES:=		http://www.tinc-vpn.org/packages/
diff --git a/package/transproxy/Makefile b/package/transproxy/Makefile
index 1fa705257..2db965c71 100644
--- a/package/transproxy/Makefile
+++ b/package/transproxy/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		02cc1160a9db9c49a40491f890083044
 PKG_DESCR:=		transparent HTTP proxy
 PKG_SECTION:=		proxy
-PKG_DEPENDS:=		iptables kmod-ip-nf-target-redirect
+PKG_DEPENDS:=		iptables
 PKG_URL:=		http://sourceforge.net/projects/transproxy/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=transproxy/1.6/}
 
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index e037c09d3..957bc6468 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -36,7 +36,6 @@ PKGSD_SWAP_UTILS:=	swap space management utilities
 PKGSS_SWAP_UTILS:=	libblkid
 PKGSC_SWAP_UTILS:=	fs
 PKGSD_LOSETUP:=		loop devices management utilities
-PKGSS_LOSETUP:=		kmod-blk-dev-loop
 PKGSC_LOSETUP:=		fs
 PKGSD_MOUNT:=		mount/umount utilities
 PKGSS_MOUNT:=		libblkid libmount libuuid libncurses
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index 1b3a6ac6c..df3b4b07e 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:=		vpnc
 PKG_VERSION:=		0.5.3
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		4378f9551d5b077e1770bbe09995afb3
-PKG_DESCR:=		client for cisco3000 VPN Concentrator.
+PKG_DESCR:=		client for cisco3000 VPN Concentrator
 PKG_SECTION:=		net/security
-PKG_DEPENDS:=		libgcrypt libgpg-error kmod-tun
+PKG_DEPENDS:=		libgcrypt libgpg-error
 PKG_BUILDDEP:=		libgcrypt libgpg-error
 PKG_URL:=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
 PKG_SITES:=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index f9bfff23f..6d7edb7c9 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:=		vtun
 PKG_VERSION:=		3.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c342ffe77055d4248a38f0b380f28c1b
-PKG_DESCR:=		A VPN tunnel daemon
+PKG_DESCR:=		VPN tunnel daemon
 PKG_SECTION:=		net/misc
-PKG_DEPENDS:=		zlib libopenssl liblzo kmod-tun
+PKG_DEPENDS:=		zlib libopenssl liblzo
 PKG_BUILDDEP:=		zlib openssl liblzo
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vtun/}
 
diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile
index f64573774..e8f39bce2 100644
--- a/package/wdfs/Makefile
+++ b/package/wdfs/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		6
 PKG_MD5SUM:=		628bb44194d04c1cf8aacc446ed0a230
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		net/fs
-PKG_DEPENDS:=		libopenssl fuse-utils kmod-fuse-fs neon glib
+PKG_DEPENDS:=		libopenssl fuse-utils neon glib
 PKG_BUILDDEP:=		openssl fuse neon glib
 PKG_SITES:=		http://noedler.de/projekte/wdfs/
 
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index b8311198a..fae25b9f6 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		2d3f7111b8284cec81884023c4bb4a11
 PKG_DESCR:=		X11 driver for Event driver
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		xorg-server kmod-input-evdev libudev
+PKG_DEPENDS:=		xorg-server libudev
 PKG_BUILDDEP:=		xorg-server eudev
 PKG_SITES:=		${MASTER_SITE_XORG}
 
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
index 9e9da4f1c..9abb28db2 100644
--- a/package/xf86-input-evtouch/Makefile
+++ b/package/xf86-input-evtouch/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		4d8e092356d8353002f60a4907046c13
 PKG_DESCR:=		X11 driver for touchscreen
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		xorg-server kmod-input-evdev
+PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://www.conan.de/touchscreen/
 PKG_NEED_CXX:=		1