[packages] Various Makefile cleanups.

Thanks to swalker. SVN-Revision: 16438
author: Hauke Mehrtens 2009-06-13 17:01:55 +0000
committer: Hauke Mehrtens 2009-06-13 17:01:55 +0000
commit: 1821a85c5470485c7d0c17174023e0e780530860 (patch)
tree: 92e24b54f223fa69fb25bce28c114c19b04408d6
parent: f2083131e32be667b083faef55e7a9c77f85f184 (diff)
download: archive-1821a85c5470485c7d0c17174023e0e780530860.tar.gz
152 files changed, 88 insertions, 228 deletions
diff --git a/Xorg/app/xine-ui/Makefile b/Xorg/app/xine-ui/Makefile
index a40035327a..4cdf8ce099 100644
--- a/Xorg/app/xine-ui/Makefile
+++ b/Xorg/app/xine-ui/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=0.99.4
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/xine/
+PKG_SOURCE_URL:=@SF/xine
 PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/Xorg/lib/libmatchbox/Makefile b/Xorg/lib/libmatchbox/Makefile
index 6b91928f48..657df27490 100644
--- a/Xorg/lib/libmatchbox/Makefile
+++ b/Xorg/lib/libmatchbox/Makefile
@@ -14,7 +14,6 @@ PKG_VERSION:=1.9
 PKG_SOURCE_URL:=http://matchbox-project.org/sources/libmatchbox/$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=9f73e7515cc4679171a5db180dc1343b
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_FIXUP:=libtool
 
 EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/
diff --git a/Xorg/lib/xine-lib/Makefile b/Xorg/lib/xine-lib/Makefile
index 98591d507e..b27f3d568b 100644
--- a/Xorg/lib/xine-lib/Makefile
+++ b/Xorg/lib/xine-lib/Makefile
@@ -13,7 +13,7 @@ PKG_VERSION:=1.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/xine/
+PKG_SOURCE_URL:=@SF/xine
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/Xorg/wm/fluxbox/Makefile b/Xorg/wm/fluxbox/Makefile
index 6f90e7df3e..bb2a75028d 100644
--- a/Xorg/wm/fluxbox/Makefile
+++ b/Xorg/wm/fluxbox/Makefile
@@ -12,9 +12,8 @@ PKG_NAME:=fluxbox
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/fluxbox/
+PKG_SOURCE_URL:=@SF/fluxbox
 PKG_MD5SUM:=990e276ead0d04421dce4080f485caca
 
 EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index da30a3ca0c..9e27f16b6d 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -10,13 +10,7 @@ PKG_NAME:=binutils
 PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))
 #"))
 PKG_RELEASE:=1
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/binutils/ \
-	ftp://gatekeeper.dec.com/pub/GNU/ \
-		ftp://ftp.uu.net/archive/systems/gnu/ \
-		ftp://ftp.eu.uu.net/pub/gnu/ \
-		ftp://ftp.funet.fi/pub/gnu/prep/ \
-		ftp://ftp.leo.org/pub/comp/os/unix/gnu/
-
+PKG_SOURCE_URL:=@GNU/binutils
 PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2
 PATCH_DIR:=$(TOPDIR)/toolchain/binutils/patches/$(PKG_VERSION)
 PKG_INSTALL:=1
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index 57a3602344..c217c7cf58 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=diffutils
 PKG_VERSION:=2.8.1
 PKG_RELEASE:=1
 PKG_MD5SUM:=71f9c5ae19b60608f6c7f162da86a428
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/diffutils/
+PKG_SOURCE_URL:=@GNU/diffutils
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/devel/make/Makefile b/devel/make/Makefile
index 8541ceb943..9a59c40dcb 100644
--- a/devel/make/Makefile
+++ b/devel/make/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=make
 PKG_VERSION:=3.81
 PKG_RELEASE:=1
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/make/
+PKG_SOURCE_URL:=@GNU/make
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=354853e0b2da90c527e35aabb8d6f1e6
 
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 83dbac55e1..58f60f505a 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=patch
 PKG_VERSION:=2.5.4
 PKG_RELEASE:=1
 PKG_MD5SUM:=ee5ae84d115f051d87fcaaef3b4ae782
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/patch/
+PKG_SOURCE_URL:=@GNU/patch
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/ipv6/dhcp6/Makefile b/ipv6/dhcp6/Makefile
index 82c970c959..31957ef0a9 100644
--- a/ipv6/dhcp6/Makefile
+++ b/ipv6/dhcp6/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE:=dhcpv6-linux-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=@SF/dhcpv6-linux
 PKG_MD5SUM:=86193dfa62137db3ea459543db4f1102
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/ipv6/gw6c/Makefile b/ipv6/gw6c/Makefile
index 5834b58adb..757fe12f66 100644
--- a/ipv6/gw6c/Makefile
+++ b/ipv6/gw6c/Makefile
@@ -9,7 +9,6 @@ PKG_VERSION:=5.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/ipv6/ndisc/Makefile b/ipv6/ndisc/Makefile
index f100678e0a..94778e44a0 100644
--- a/ipv6/ndisc/Makefile
+++ b/ipv6/ndisc/Makefile
@@ -15,8 +15,6 @@ PKG_MD5SUM:=cb8d70564b8d40aae95e19592c6be183
 PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ndisc
diff --git a/ipv6/ptrtd/Makefile b/ipv6/ptrtd/Makefile
index bc1b4e21ea..d77120700f 100644
--- a/ipv6/ptrtd/Makefile
+++ b/ipv6/ptrtd/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://v6web.litech.org/ptrtd/dist/
 PKG_MD5SUM:=bfe026445fdc4fe509a9c70ec4551744
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ptrtd
diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile
index c38f0dafb5..e8f116e01b 100644
--- a/ipv6/radvd/Makefile
+++ b/ipv6/radvd/Makefile
@@ -11,7 +11,6 @@ PKG_NAME:=radvd
 PKG_VERSION:=1.2
 PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \
 		http://download.sourcemage.org/mirror
diff --git a/ipv6/totd/Makefile b/ipv6/totd/Makefile
index 9991728d24..0d2cf9ff77 100644
--- a/ipv6/totd/Makefile
+++ b/ipv6/totd/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.pasta.cs.uit.no/pub/totd/
 PKG_MD5SUM:=7edaedae9f6aca5912dd6c123582cf08
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/totd
diff --git a/lang/eggdrop/Makefile b/lang/eggdrop/Makefile
index affb1051cc..a13339f70b 100644
--- a/lang/eggdrop/Makefile
+++ b/lang/eggdrop/Makefile
@@ -14,10 +14,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=eggdrop$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.eggheads.org/pub/eggdrop/source/1.6
 PKG_MD5SUM:=68e181201483dee398f9904e8652e6ca
-PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 607827094a..e18158909d 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -29,7 +29,7 @@ define Package/erlang/Default
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Erlang/OTP programming language
-  URL:=http://www.erlnag.org/
+  URL:=http://www.erlang.org/
 endef
 
 define Package/erlang/Default/description
diff --git a/lang/numpy/Makefile b/lang/numpy/Makefile
index a99b5f5fb7..550b47bdf2 100644
--- a/lang/numpy/Makefile
+++ b/lang/numpy/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=numpy
 PKG_VERSION:=1.0.4
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.sourceforge.net/numpy/
+PKG_SOURCE_URL:=@SF/numpy
 PKG_MD5SUM:=8f011e9d7697da570efaac61c51725e0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/lang/perl-compress-bzip2/Makefile b/lang/perl-compress-bzip2/Makefile
index cf4aae9423..dfbb121d52 100644
--- a/lang/perl-compress-bzip2/Makefile
+++ b/lang/perl-compress-bzip2/Makefile
@@ -8,7 +8,6 @@ PKG_MD5SUM:=1699fde3e86f2a036f135ae606d456bf
 
 PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY
 PKG_SOURCE:=Compress-Bzip2-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Compress-Bzip2-$(PKG_VERSION)
 
diff --git a/lang/perl-dbi/Makefile b/lang/perl-dbi/Makefile
index 5b594ae280..d69b42956a 100644
--- a/lang/perl-dbi/Makefile
+++ b/lang/perl-dbi/Makefile
@@ -8,7 +8,6 @@ PKG_MD5SUM:=358511d60eb3daba913d49236c469802
 
 PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/
 PKG_SOURCE:=DBI-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/DBI-$(PKG_VERSION)
 
diff --git a/lang/perl-html-parser/Makefile b/lang/perl-html-parser/Makefile
index 1c92d02d60..1a3259c930 100644
--- a/lang/perl-html-parser/Makefile
+++ b/lang/perl-html-parser/Makefile
@@ -8,7 +8,6 @@ PKG_MD5SUM:=bddc432e5ed9df4d4153a62234f04fc2
 
 PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS
 PKG_SOURCE:=HTML-Parser-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Parser-$(PKG_VERSION)
 
diff --git a/lang/perl-html-tagset/Makefile b/lang/perl-html-tagset/Makefile
index 608c1a8c35..48352ee43c 100644
--- a/lang/perl-html-tagset/Makefile
+++ b/lang/perl-html-tagset/Makefile
@@ -8,7 +8,6 @@ PKG_MD5SUM:=d2bfa18fe1904df7f683e96611e87437
 
 PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE
 PKG_SOURCE:=HTML-Tagset-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tagset-$(PKG_VERSION)
 
diff --git a/lang/perl-html-tree/Makefile b/lang/perl-html-tree/Makefile
index 79a1705158..bacc6515a7 100644
--- a/lang/perl-html-tree/Makefile
+++ b/lang/perl-html-tree/Makefile
@@ -8,7 +8,6 @@ PKG_MD5SUM:=6352f50be402301f79b580dd235d7762
 
 PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/P/PE/PETEK
 PKG_SOURCE:=HTML-Tree-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tree-$(PKG_VERSION)
 
diff --git a/lang/perl-lockfile-simple/Makefile b/lang/perl-lockfile-simple/Makefile
index e19401e4c5..412f9719d8 100644
--- a/lang/perl-lockfile-simple/Makefile
+++ b/lang/perl-lockfile-simple/Makefile
@@ -8,7 +8,6 @@ PKG_MD5SUM:=d8966c3fb799aefcaaf80f845057a1fa
 
 PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/J/JV/JV
 PKG_SOURCE:=LockFile-Simple-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/LockFile-Simple-$(PKG_VERSION)
 
diff --git a/lang/perl-uri/Makefile b/lang/perl-uri/Makefile
index f58a127533..d6938bfbd7 100644
--- a/lang/perl-uri/Makefile
+++ b/lang/perl-uri/Makefile
@@ -8,7 +8,6 @@ PKG_MD5SUM:=a97bbdd38b31c6b2672fdc3060fae34b
 
 PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS
 PKG_SOURCE:=URI-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/URI-$(PKG_VERSION)
 
diff --git a/lang/perl-www-curl/Makefile b/lang/perl-www-curl/Makefile
index c139750c4b..d71f3b5940 100644
--- a/lang/perl-www-curl/Makefile
+++ b/lang/perl-www-curl/Makefile
@@ -8,7 +8,6 @@ PKG_MD5SUM:=f34eb29f59a811869a4f77bfc0df2f5d
 
 PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT
 PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Curl-$(PKG_VERSION)
 
diff --git a/lang/perl-www/Makefile b/lang/perl-www/Makefile
index a2a031ace2..a69e9b7195 100644
--- a/lang/perl-www/Makefile
+++ b/lang/perl-www/Makefile
@@ -8,7 +8,6 @@ PKG_MD5SUM:=86c6121170efe55fc0d33cdc967561bc
 
 PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/G/GA/GAAS
 PKG_SOURCE:=libwww-perl-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/libwww-perl-$(PKG_VERSION)
 
diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index e3cedd2af7..52be516fed 100644
--- a/lang/perl/Makefile
+++ b/lang/perl/Makefile
@@ -17,7 +17,6 @@ PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
 		ftp://ftp.gmd.de/mirrors/CPAN/src/5.0 \
 		ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 83040365a6..773e9a8383 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -10,13 +10,11 @@ PKG_NAME:=tcl
 PKG_VERSION:=8.4.19
 PKG_RELEASE:=1
 
-PKG_SOURCE:=tcl8.4.19.tar.gz
-PKG_SOURCE_URL:=http://heanet.dl.sourceforge.net/sourceforge/tcl/tcl8.4.19-src.tar.gz
+PKG_SOURCE:=tcl$(PKG_VERSION)-src.tar.gz
+PKG_SOURCE_URL:=@SF/tcl
 PKG_MD5SUM:=ade2c033a7b545ee108f3fdfeb629fcf
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/argp-standalone/Makefile b/libs/argp-standalone/Makefile
index 369d14b58c..922e58edab 100644
--- a/libs/argp-standalone/Makefile
+++ b/libs/argp-standalone/Makefile
@@ -8,8 +8,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.lysator.liu.se/~nisse/misc/
 PKG_MD5SUM:=720704bac078d067111b32444e24ba69
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/argp-standalone
diff --git a/libs/cgilib/Makefile b/libs/cgilib/Makefile
index 086e0b8442..3c773be630 100644
--- a/libs/cgilib/Makefile
+++ b/libs/cgilib/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.infodrom.org/projects/cgilib/download
 PKG_MD5SUM:=5187ba11b2ec165b6c5b6629087733b0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/cgilib
diff --git a/libs/classpath/Makefile b/libs/classpath/Makefile
index e7561b0deb..34b74eb8ff 100644
--- a/libs/classpath/Makefile
+++ b/libs/classpath/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=0.97.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/classpath/
+PKG_SOURCE_URL:=@GNU/classpath
 PKG_MD5SUM:=6a35347901ace03c31cc49751b338f31
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/fftw3/Makefile b/libs/fftw3/Makefile
index c2ca1dc532..181c804269 100644
--- a/libs/fftw3/Makefile
+++ b/libs/fftw3/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE:=fftw-3.1.2.tar.gz
 PKG_MD5SUM:=08f2e21c9fd02f4be2bd53a62592afa4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fftw-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/libs/flac/Makefile b/libs/flac/Makefile
index b7e58bf901..cf4d725a1a 100644
--- a/libs/flac/Makefile
+++ b/libs/flac/Makefile
@@ -15,15 +15,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/flac
 PKG_MD5SUM:=2bfc127cdda02834d0491ab531a20960
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libflac
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Free Lossless Audio Codec library
-  URL:=ttp://flac.sourceforge.net/
+  URL:=http://flac.sourceforge.net/
 endef
 
 define Build/Configure
diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 4e6ab71dc1..6d639dcca8 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=2.6.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.gnu.org/pub/gnu/gnutls/ \
+PKG_SOURCE_URL:=@GNU/gnutls \
 	ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
 PKG_MD5SUM:=747111ab0d86e7b06a4bb120ba456ad8
 
diff --git a/libs/gsl/Makefile b/libs/gsl/Makefile
index 06854bdd1f..c7bfc3401b 100644
--- a/libs/gsl/Makefile
+++ b/libs/gsl/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=1.9
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/gsl/
+PKG_SOURCE_URL:=@GNU/gsl
 PKG_MD5SUM:=81dca4362ae8d2aa1547b7d010881e43
 
 PKG_FIXUP:=libtool
diff --git a/libs/libaio/Makefile b/libs/libaio/Makefile
index 76107594d1..42f2c86b84 100644
--- a/libs/libaio/Makefile
+++ b/libs/libaio/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/liba/libaio/
 PKG_MD5SUM:=9480e31cce6506091080d59211089bd4
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libaio
@@ -24,6 +22,7 @@ define Package/libaio
   CATEGORY:=Libraries
   DEPENDS:=@LINUX_2_6
   TITLE:=Linux kernel AIO interface access library
+  URL:=http://lse.sourceforge.net/io/aio.html
 endef
 
 define Build/Configure
diff --git a/libs/libcroco/Makefile b/libs/libcroco/Makefile
index 31a44d629a..72917c61cc 100644
--- a/libs/libcroco/Makefile
+++ b/libs/libcroco/Makefile
@@ -20,6 +20,7 @@ define Package/libcroco
   CATEGORY:=Libraries
   TITLE:=Croco css2 parsing libraray.
   DEPENDS:=+glib2 +libxml2
+  URL:=http://www.freespiders.org/projects/libcroco/
 endef
 
 define Package/libcroco/description
diff --git a/libs/libdbi/Makefile b/libs/libdbi/Makefile
index e6d8c83e14..f37b5a2c8d 100644
--- a/libs/libdbi/Makefile
+++ b/libs/libdbi/Makefile
@@ -22,6 +22,7 @@ define Package/libdbi
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= (library)
+  URL:=http://libdbi.sourceforge.net/
 endef
 
 define Package/libdbi/description
diff --git a/libs/libdvdread/Makefile b/libs/libdvdread/Makefile
index 3d4cf2283a..c251ba9ea4 100644
--- a/libs/libdvdread/Makefile
+++ b/libs/libdvdread/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.dtek.chalmers.se/~dvd/dist
 PKG_MD5SUM:=078788c9241ae16763529e1235502337
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libdvdread
diff --git a/libs/libpam/Makefile b/libs/libpam/Makefile
index 0e4a3571c0..91d4d83b36 100644
--- a/libs/libpam/Makefile
+++ b/libs/libpam/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=0.99.6.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=Linux-PAM-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/libs/pam/pre/library/
+PKG_SOURCE_URL:=@KERNEL/linux/libs/pam/pre/library
 PKG_MD5SUM:=0f17f7105faa82a51dfbeb6b08a1ca29
 PKG_INSTALL:=1
 PKG_FIXUP:=libtool
diff --git a/libs/librsync/Makefile b/libs/librsync/Makefile
index 093fb054c2..d340018e5b 100644
--- a/libs/librsync/Makefile
+++ b/libs/librsync/Makefile
@@ -21,6 +21,7 @@ define Package/librsync
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=implementation of the rolling-checksum algorithm
+  URL:=http://librsync.sourceforge.net/
 endef
 
 define Package/librsync/description
diff --git a/libs/libsigc++/Makefile b/libs/libsigc++/Makefile
index 89930217cd..b1c821c5ea 100644
--- a/libs/libsigc++/Makefile
+++ b/libs/libsigc++/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=2.2.3
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/
+PKG_SOURCE_URL:=@GNOME/libsigc++/2.2
 PKG_MD5SUM:=f4574b343eebc4bff66a9e1e5ce6e490
 
 PKG_FIXUP = libtool
diff --git a/libs/libsynce/Makefile b/libs/libsynce/Makefile
index b8ee662ffb..c62fa1c28b 100644
--- a/libs/libsynce/Makefile
+++ b/libs/libsynce/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/synce
 PKG_MD5SUM:=fd473d3deceda7912af4427dede1736f
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 PKG_BUILD_DEPENDS:=libiconv
@@ -26,7 +23,7 @@ define Package/libsynce
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=SynCE library
-  URL:=http://libsynce.sourceforge.net/
+  URL:=http://synce.sourceforge.net/
 endef
 
 define Package/libsynce/description
diff --git a/libs/libtwin/Makefile b/libs/libtwin/Makefile
index f9693e29ec..53144c0587 100644
--- a/libs/libtwin/Makefile
+++ b/libs/libtwin/Makefile
@@ -23,7 +23,7 @@ define Package/libtwin
   CATEGORY:=Libraries
   DEPENDS:=+zlib +libpng +libjpeg @TARGET_ps3
   TITLE:=The tiny windowing system libraries
-  URL:=
+  URL:=http://www.t2-project.org/packages/libtwin.html
 endef
 
 TARGET_CFLAGS += -flax-vector-conversions
diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile
index 2dc6612f16..0db98a5a3b 100644
--- a/libs/libupnp/Makefile
+++ b/libs/libupnp/Makefile
@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libupnp/Default
   SECTION:=libs
   CATEGORY:=Libraries
-  URL:=http://upnp.sourceforge.net/
+  URL:=http://pupnp.sourceforge.net/
 endef
 
 define Package/libupnp
diff --git a/libs/libvncserver/Makefile b/libs/libvncserver/Makefile
index 931ae7f9c0..6cd1d1fe2b 100644
--- a/libs/libvncserver/Makefile
+++ b/libs/libvncserver/Makefile
@@ -25,6 +25,7 @@ define Package/libvncserver
   CATEGORY:=Libraries
   DEPENDS:=+zlib +libiconv
   TITLE:=VNC Server Library
+  URL:=http://libvncserver.sourceforge.net/
 endef
 
 CONFIGURE_ARGS += \
diff --git a/libs/popt/Makefile b/libs/popt/Makefile
index 9520b02a02..2647e24b84 100644
--- a/libs/popt/Makefile
+++ b/libs/popt/Makefile
@@ -21,7 +21,7 @@ define Package/libpopt
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A command line option parsing library
-  URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
+  URL:=http://rpm5.org/files/popt/
 endef
 
 define Build/Configure
diff --git a/libs/pthsem/Makefile b/libs/pthsem/Makefile
index 5800683cbc..a8e79f59ed 100644
--- a/libs/pthsem/Makefile
+++ b/libs/pthsem/Makefile
@@ -10,8 +10,6 @@ PKG_SOURCE_URL:=http://www.auto.tuwien.ac.at/~mkoegler/pth/
 PKG_MD5SUM:=b277716ee1224ca9925176fa29e1f0c5
 PKG_FIXUP:=libtool
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pthsem
diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
index e238af56b4..801e95afd8 100644
--- a/libs/tiff/Makefile
+++ b/libs/tiff/Makefile
@@ -26,6 +26,7 @@ define Package/libtiff
   CATEGORY:=Libraries
   TITLE:=TIFF libraries
   DEPENDS:=+zlib +libjpeg
+  URL:=http://www.remotesensing.org/libtiff/
 endef
 
 TARGET_CFLAGS += $(FPIC)
diff --git a/libs/ustl/Makefile b/libs/ustl/Makefile
index 2665860adb..a4573ab990 100644
--- a/libs/ustl/Makefile
+++ b/libs/ustl/Makefile
@@ -11,7 +11,6 @@ PKG_NAME:=ustl
 PKG_VERSION:=0.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-0.8-0.tar.bz2
 PKG_SOURCE_URL:=@SF/ustl
 PKG_MD5SUM:=dd59483c327f1bd1356273bc5ae4dde0
diff --git a/multimedia/ftpd-topfield/Makefile b/multimedia/ftpd-topfield/Makefile
index 75a8eebb20..9fa8147853 100644
--- a/multimedia/ftpd-topfield/Makefile
+++ b/multimedia/ftpd-topfield/Makefile
@@ -8,9 +8,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/puppy
 PKG_MD5SUM:=4a29f04fd41aaa5890e2f202d936e270
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/multimedia/puppy/Makefile b/multimedia/puppy/Makefile
index df71b44b37..c17434dd4a 100644
--- a/multimedia/puppy/Makefile
+++ b/multimedia/puppy/Makefile
@@ -8,7 +8,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=puppy_$(PKG_VERSION)_src.tar.bz2
 PKG_SOURCE_URL:=@SF/puppy
 PKG_MD5SUM:=a7a53da5b8ba4fdb15e2fc8e1531b82c
-PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/puppy_$(PKG_VERSION)
 
diff --git a/net/airpwn/Makefile b/net/airpwn/Makefile
index e3b578f48a..be1f34936e 100644
--- a/net/airpwn/Makefile
+++ b/net/airpwn/Makefile
@@ -23,6 +23,7 @@ define Package/airpwn
 	CATEGORY:=Network
 	TITLE:=Packet injection pwnage
 	DEPENDS:=+libnet1 +libopenssl +libpcap +libpcre
+	URL:=http://airpwn.sourceforge.net/Airpwn.html
 endef
 
 define Package/airpwn/description
diff --git a/net/apcupsd/Makefile b/net/apcupsd/Makefile
index 65e35005cf..c0c99d17ce 100644
--- a/net/apcupsd/Makefile
+++ b/net/apcupsd/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/apcupsd
 PKG_MD5SUM:=fd8785e7607d20cefa68dc20e44eebc4
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/appweb/Makefile b/net/appweb/Makefile
index 6e1e147f04..bae954d1d0 100644
--- a/net/appweb/Makefile
+++ b/net/appweb/Makefile
@@ -28,8 +28,6 @@ PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz
 #	PKG_VERSION:=default
 #	PKG_MD5SUM:=
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_ARGS += -q --defaults=release --shared --tune=size --without-php \
@@ -42,6 +40,7 @@ define Package/appweb
   CATEGORY:=Network
   TITLE:=Appweb Web Server
   VERSION:=$(PKG_VERSION)
+  URL:=http://www.appwebserver.org/
 endef
 
 define Package/appweb/description
diff --git a/net/bind/Makefile b/net/bind/Makefile
index 1be117644f..5432bf7990 100644
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -24,7 +24,7 @@ define Package/bind/Default
   CATEGORY:=Network
   DEPENDS:=+bind-libs +libopenssl
   TITLE:=bind
-  URL:=http://www.isc.org/sw/bind/
+  URL:=https://www.isc.org/software/bind
   SUBMENU:=DNS
 endef
 
diff --git a/net/bing/Makefile b/net/bing/Makefile
index 9d963e034d..c271e8f950 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE_URL:=http://fgouget.free.fr/bing/
 PKG_MD5SUM:=60aaee55277672d0cc163bf3f0b3d53f
 TAR_OPTIONS += || true
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bing
diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index 84a509191e..45e915a0a1 100644
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=http://get.bitlbee.org/src \
 	http://ftp.snt.utwente.nl/pub/software/bitlbee/src
 PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_BUILD_DEPENDS:=libopenssl glib1 libiconv
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/chillispot/Makefile b/net/chillispot/Makefile
index db08fd3db0..f83a04022c 100644
--- a/net/chillispot/Makefile
+++ b/net/chillispot/Makefile
@@ -24,7 +24,7 @@ define Package/chillispot
   CATEGORY:=Network
   DEPENDS:=+kmod-tun
   TITLE:=Wireless LAN HotSpot controller
-  URL:=http://www.chillispot.org/
+  URL:=http://www.chillispot.info/
 endef
 
 define Package/chillispot/description
diff --git a/net/cutter/Makefile b/net/cutter/Makefile
index 05fc146bf3..e10171b336 100644
--- a/net/cutter/Makefile
+++ b/net/cutter/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.lowth.com/cutter/software/
 PKG_MD5SUM:=50093db9b64277643969ee75b83ebbd1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/cutter
diff --git a/net/dhcp/Makefile b/net/dhcp/Makefile
index 58b8f41280..079e311fca 100644
--- a/net/dhcp/Makefile
+++ b/net/dhcp/Makefile
@@ -21,7 +21,7 @@ define Package/dhcp/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=ISC's DHCP
-  URL:=http://www.isc.org/
+  URL:=https://www.isc.org/software/dhcp
 endef
 
 define Package/dhcp-relay
diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index 2be935ed95..9eba08d88b 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.berlios.de/dhcpcd/
 PKG_MD5SUM:=e9100e53f64ca1f9fb0d392c3a623738
-PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/dircproxy/Makefile b/net/dircproxy/Makefile
index b532a02695..c4e9483461 100644
--- a/net/dircproxy/Makefile
+++ b/net/dircproxy/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=1.2.0-beta2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz
-PKG_SOURCE_URL:=http://dircproxy.securiweb.net/pub/1.2/
+PKG_SOURCE_URL:=http://dircproxy.googlecode.com/files/
 PKG_MD5SUM:=850443437f709276ff21a173bbf98456
 
 include $(INCLUDE_DIR)/package.mk
@@ -22,7 +22,7 @@ define Package/dircproxy
   SECTION:=net
   CATEGORY:=Network
   TITLE:=An IRC proxy server
-  URL:=http://dircproxy.securiweb.net/
+  URL:=http://dircproxy.googlecode.com/
 endef
 
 # uses Build/Configure/Default
diff --git a/net/dsl-qos-queue/Makefile b/net/dsl-qos-queue/Makefile
index b78e2404e3..53277fc3ff 100644
--- a/net/dsl-qos-queue/Makefile
+++ b/net/dsl-qos-queue/Makefile
@@ -24,6 +24,7 @@ define Package/dsl-qos-queue
   CATEGORY:=Network
   DEPENDS:=+iptables +kmod-ipt-queue @!LINUX_2_6_25 @!LINUX_2_6_26 @!LINUX_2_6_27 @!LINUX_2_6_28
   TITLE:=ADSL/ATM Bandwith management
+  URL:=http://www.sonicspike.net/software/
 endef
 
 define Build/Configure
diff --git a/net/ez-ipupdate/Makefile b/net/ez-ipupdate/Makefile
index 96a1ee37cd..d34a39cbda 100644
--- a/net/ez-ipupdate/Makefile
+++ b/net/ez-ipupdate/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/e/ez-ipupdate \
 	http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate
 PKG_MD5SUM:=000211add4c4845ffa4211841bff4fb0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ez-ipupdate
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index c28a62ad4c..6323c934e5 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.eng.oar.net/pub/flow-tools/
 PKG_MD5SUM:=c9e0a8b53c79611b6bffcb9d510a5a38
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_BUILD_DEPENDS:=+zlib
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/fping/Makefile b/net/fping/Makefile
index d6f473176a..93f1bc5072 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.fping.com/download/
 PKG_MD5SUM:=3ad516765514249a40d3c5b6caab812a
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fping
diff --git a/net/fprobe-ulog/Makefile b/net/fprobe-ulog/Makefile
index bdf316c3ed..64c02fb25e 100644
--- a/net/fprobe-ulog/Makefile
+++ b/net/fprobe-ulog/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/fprobe
 PKG_MD5SUM:=cdb2e4edc47e8a3d5479eeabfb979ebc
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fprobe-ulog
diff --git a/net/fprobe/Makefile b/net/fprobe/Makefile
index 300c4fa483..f6be152cc3 100644
--- a/net/fprobe/Makefile
+++ b/net/fprobe/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/fprobe
 PKG_MD5SUM:=65850d0470078269b33eee58cba77ac2
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fprobe
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 63a57bb9e0..95c3fe119e 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/freeradius/Default
   SECTION:=net
   CATEGORY:=Network
-  URL:=http://www.freeradius.org/
+  URL:=http://freeradius.org/
 endef
 
 define Package/freeradius
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 99631374e0..6715929b04 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/freeradius2/Default
   SECTION:=net
   CATEGORY:=Network
-  URL:=http://www.freeradius2.org/
+  URL:=http://freeradius.org/
 endef
 
 define Package/freeradius2
diff --git a/net/frickin/Makefile b/net/frickin/Makefile
index e2e5e3272a..645ab7f183 100644
--- a/net/frickin/Makefile
+++ b/net/frickin/Makefile
@@ -15,15 +15,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/frickin
 PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/frickin
   SECTION:=net
   CATEGORY:=Network
   TITLE:=PPTP (Point-to-Point Tunneling Protocol) proxy
-  URL:=http://frickin.sourceforge.net/
+  URL:=http://sourceforge.net/projects/frickin/
   SUBMENU:=VPN
 endef
 
diff --git a/net/horst/Makefile b/net/horst/Makefile
index c1faa9decd..74c790df5d 100644
--- a/net/horst/Makefile
+++ b/net/horst/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=http://br1.einfach.org/horst_dl/
 PKG_MD5SUM:=7eb6f7ae819722b1fcdd86df98f7884d
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/horst
diff --git a/net/httptunnel/Makefile b/net/httptunnel/Makefile
index 106729a2e1..f676c22ad6 100644
--- a/net/httptunnel/Makefile
+++ b/net/httptunnel/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.nocrew.org/pub/nocrew/unix/
 PKG_MD5SUM:=493cc0f5f21e9955db27ee9cd9a976d5
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/httptunnel
diff --git a/net/imsnif/Makefile b/net/imsnif/Makefile
index d6c21a4f7c..ef9b7d9d20 100644
--- a/net/imsnif/Makefile
+++ b/net/imsnif/Makefile
@@ -10,12 +10,9 @@ PKG_VERSION:=0.04
 PKG_RELEASE:=2
 PKG_MD5SUM:=689c456f8edb77b9b4199a25514ac683
 
-PKG_SOURCE_URL:=http://kent.dl.sourceforge.net/sourceforge/im-snif
+PKG_SOURCE_URL:=@SF/im-snif
 PKG_SOURCE:=$(PKG_NAME)f_$(PKG_VERSION).tgz
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 PKG_UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) -xvf -
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index bac1dc3d66..ed9747adc2 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -22,7 +22,7 @@ define Package/iperf/Default
   CATEGORY:=Network
   DEPENDS:= +uclibcxx
   TITLE:=Internet Protocol bandwidth measuring tool
-  URL:=http://dast.nlanr.net/Projects/Iperf/
+  URL:=http://sourceforge.net/projects/iperf/
 endef
 
 define Package/iperf/Default/description
diff --git a/net/iptraf/Makefile b/net/iptraf/Makefile
index a20959c8e1..135e21a739 100644
--- a/net/iptraf/Makefile
+++ b/net/iptraf/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE_URL:=ftp://iptraf.seul.org/pub/iptraf/ \
 	ftp://the.wiretapped.net/pub/security/network-monitoring/iptraf/
 PKG_MD5SUM:=377371c28ee3c21a76f7024920649ea8
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iptraf
diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index 5394ae82e6..126fe063cc 100644
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://irssi.org/files/
 PKG_MD5SUM:=0d6fc2203832b514eff014fffd574664
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/irssi/Default
diff --git a/net/leafnode/Makefile b/net/leafnode/Makefile
index 7444ead6d9..a7151f2e1a 100644
--- a/net/leafnode/Makefile
+++ b/net/leafnode/Makefile
@@ -10,7 +10,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=leafnode
 PKG_VERSION:=1.11.6
 PKG_RELEASE:=1
-PKG_CAT:=bzcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.dt.e-technik.uni-dortmund.de/~ma/leafnode/
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 05e38eff71..bcc91ea716 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://lftp.cybermirror.org/old/
 PKG_MD5SUM:=3b7f85e73467d56488b32f5d746d6772
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lftp
diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index 051824a817..f198967e33 100644
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linux-igd
 PKG_MD5SUM:=929f5c4878c91d534613b7c7070215d9
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_BUILD_DEPENDS:=iptables libupnp
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/lldpd/Makefile b/net/lldpd/Makefile
index 4238e46626..6f4e800186 100644
--- a/net/lldpd/Makefile
+++ b/net/lldpd/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.luffy.cx/lldpd/
 PKG_MD5SUM:=317e1144ec7d2781ff123ec16845a2fc
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lldpd
@@ -25,7 +22,7 @@ define Package/lldpd
   CATEGORY:=Network
   TITLE:=Link Layer Discovery Protocol damon
   DEPENDS:=@!LINUX_2_4
-  URL:=http://www.bitwizard.nl/lldpd/
+  URL:=https://trac.luffy.cx/lldpd/
 endef
 
 define Package/lldpd/description
diff --git a/net/miax/Makefile b/net/miax/Makefile
index 4b3ceec8f6..f7b7f23961 100644
--- a/net/miax/Makefile
+++ b/net/miax/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=1.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://mesh.dl.sourceforge.net/sourceforge/miax/
+PKG_SOURCE_URL:=@SF/miax
 PKG_MD5SUM:=44f0d2ef46ee2697d890b7b96846adc7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@@ -24,7 +24,7 @@ define Package/miax
   CATEGORY:=Network
   DEPENDS:=+libpthread +bluez-libs
   TITLE:=A console iax (asterisk) client
-  URL:=http://www.eja.it/?l=gpl&testo=miax
+  URL:=http://www.eja.it/?l=en&n=miax
 endef
 
 define Package/miax/description
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index a479b78b0d..462f3c083b 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -23,7 +23,7 @@ define Package/miniupnpd
   CATEGORY:=Network
   DEPENDS:=+iptables
   TITLE:=Lightweight UPnP daemon
-  URL:=http://miniupnp.tuxfamily.org/
+  URL:=http://miniupnp.free.fr/
 endef
 
 define Build/Compile
diff --git a/net/mvprelay/Makefile b/net/mvprelay/Makefile
index 5a96c78bec..432e7ffe9a 100644
--- a/net/mvprelay/Makefile
+++ b/net/mvprelay/Makefile
@@ -21,7 +21,7 @@ define Package/mvprelay
   SECTION:=net
   CATEGORY:=Network
   TITLE:=relays requests from the MVP
-  URL:=http://downloads.openwrt.org/sources/
+  URL:=http://mvpmc.wikispaces.com/mvprelay
 endef
 
 define Package/mvprelay/description
diff --git a/net/nagios/Makefile b/net/nagios/Makefile
index b9907b37ad..734caf6f1c 100644
--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/nagios
 PKG_MD5SUM:=8c3a29e138f2ff8c8abbd3dd8a40c4b6
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nagios
diff --git a/net/net-tools/Makefile b/net/net-tools/Makefile
index d321a647f9..d557140303 100644
--- a/net/net-tools/Makefile
+++ b/net/net-tools/Makefile
@@ -15,8 +15,6 @@ PKG_MD5SUM:=888774accab40217dde927e21979c165
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.tazenda.demon.co.uk/phil/net-tools/
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/net-tools
diff --git a/net/nfs-server/Makefile b/net/nfs-server/Makefile
index b034a606cb..6ca327dd17 100644
--- a/net/nfs-server/Makefile
+++ b/net/nfs-server/Makefile
@@ -22,6 +22,7 @@ define Package/nfs-server
   CATEGORY:=Network
   DEPENDS:=+portmap
   TITLE:=User Space NFS server
+  URL:=http://packages.debian.org/nfs-user-server
 endef
 
 define Package/nfs-server/description
diff --git a/net/nstx/Makefile b/net/nstx/Makefile
index 79a90eee5f..5968490a16 100644
--- a/net/nstx/Makefile
+++ b/net/nstx/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/n/nstx/
 PKG_MD5SUM:=275abd75a856b07a798b1f2360088cf5
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nstx/Default
diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index bfe516f511..52ce60c6b5 100644
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
 PKG_MD5SUM:=8c19ff62ed4f7d64f8e2aa59cb11f364
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=libelf
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile
index d9930ab5d0..ef604315bd 100644
--- a/net/oidentd/Makefile
+++ b/net/oidentd/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ojnk
 PKG_MD5SUM:=c3d9a56255819ef8904b867284386911
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/oidentd
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index c9d2941252..5cd9899939 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -11,7 +11,6 @@ PKG_NAME:=olsrd
 PKG_VERSION:=0.5.6-r4
 PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
 PKG_MD5SUM:=16076660413bcf625ba8772fdb3d607f
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 24621f6a93..f47d74ab40 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
 	ftp://ftp.sunet.se/pub/OpenBSD/OpenNTPD/
 PKG_MD5SUM:=afc34175f38d08867c1403d9008600b3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openntpd
diff --git a/net/openrrcp/Makefile b/net/openrrcp/Makefile
index b9285a7103..dad1f1f9de 100644
--- a/net/openrrcp/Makefile
+++ b/net/openrrcp/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://nording.ru/projects/download/openrrcp/stable
 PKG_MD5SUM:=e3d6097732af812b03dbbbedeced34d2
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 9ff0015ea5..1a045f0d59 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=1.2.1
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/openslp/
+PKG_SOURCE_URL:=@SF/openslp
 PKG_MD5SUM:=ff9999d1b44017281dd00ed2c4d32330
 
 include $(INCLUDE_DIR)/package.mk
@@ -21,6 +21,7 @@ define Package/openslp
   SECTION:=net
   CATEGORY:=Network
   TITLE:=openslp
+  URL:=http://www.openslp.org/
 endef
 
 #CONFIGURE_ARGS += \
diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 84bca8b8db..f8d621b275 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -11,7 +11,6 @@ PKG_NAME:=openssh
 PKG_VERSION:=5.2p1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		ftp://openbsd.wiretapped.net/pub/OpenBSD/OpenSSH/portable/ \
diff --git a/net/parprouted/Makefile b/net/parprouted/Makefile
index 8831749aa0..4a84fe1473 100644
--- a/net/parprouted/Makefile
+++ b/net/parprouted/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.hazard.maks.net/parprouted/
 PKG_MD5SUM:=14133c9cb8dd9c9a90ff37648ae7b31a
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/parprouted
diff --git a/net/pepperspot/Makefile b/net/pepperspot/Makefile
index 25c1f7d3f3..39bf9c2968 100644
--- a/net/pepperspot/Makefile
+++ b/net/pepperspot/Makefile
@@ -23,7 +23,7 @@ define Package/pepperspot
   CATEGORY:=Network
   DEPENDS:=+kmod-tun
   TITLE:=Wireless LAN HotSpot controller
-  URL:=http://www.pepperspot.org/
+  URL:=http://pepperspot.sourceforge.net/
 endef
 
 define Package/pepperspot/description
diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile
index 98cd915a44..240acac1dd 100644
--- a/net/pmacct/Makefile
+++ b/net/pmacct/Makefile
@@ -12,11 +12,9 @@ PKG_VERSION:=0.10.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.ba.cnr.it/~paolo/pmacct/
+PKG_SOURCE_URL:=http://www.pmacct.net/
 PKG_MD5SUM:=0be1ffd9d4bda73575caa3240abbf4cb
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_BUILD_DEPENDS:=libpcap
 
 include $(INCLUDE_DIR)/package.mk
@@ -25,7 +23,7 @@ define Package/pmacct/Default
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=pmacct (accounting and aggregation tools)
-  URL:=http://www.ba.cnr.it/~paolo/pmacct/
+  URL:=http://www.pmacct.net/
 endef
 
 define Package/nfacctd/Default
diff --git a/net/psybnc/Makefile b/net/psybnc/Makefile
index e35ce1f946..f264971357 100644
--- a/net/psybnc/Makefile
+++ b/net/psybnc/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=2.3.2-7
 PKG_RELEASE:=2
 
 PKG_SOURCE:=psyBNC-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.psybnc.info/download/beta/
+PKG_SOURCE_URL:=http://www.psybnc.at/download/beta/
 PKG_MD5SUM:=4b893a92f914813450e0921b2894ad6c
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@@ -24,7 +24,7 @@ define Package/psybnc
   SECTION:=net
   CATEGORY:=Network
   TITLE:=An IRC-Bouncer with many features
-  URL:=http://www.psybnc.info/
+  URL:=http://www.psybnc.at/
 endef
 
 define Package/psybnc/description
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 1346b1041b..c32a86c5a2 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -16,7 +16,6 @@ PKG_SOURCE_URL:=http://www.quagga.net/download/ \
                 http://www.de.quagga.net/download/ \
                 http://www.uk.quagga.net/download/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/rssh/Makefile b/net/rssh/Makefile
index a042ac30e9..31401fbf32 100644
--- a/net/rssh/Makefile
+++ b/net/rssh/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/rssh
 PKG_MD5SUM:=65712f2c06ff5fc6fc783bc8c2e4e1ba
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rssh
diff --git a/net/samba/Makefile b/net/samba/Makefile
index dc290b1f2d..7b239ae9a0 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -12,8 +12,7 @@ PKG_VERSION:=2.0.10
 PKG_RELEASE:=5
 PKG_MD5SUM:=54870482fe036b7e69dd48c90661eec6
 
-PKG_SOURCE_URL:=ftp://se.samba.org/pub/samba/stable \
-	ftp://ftp.easynet.be/samba/stable
+PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/samba/old-versions
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/shat/Makefile b/net/shat/Makefile
index 9bc7e27e5c..7412f53f14 100644
--- a/net/shat/Makefile
+++ b/net/shat/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=0.9.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://world.maxina.de/src/
+PKG_SOURCE_URL:=@SF/shat
 PKG_MD5SUM:=da06846f35838b14d1513523dad84d24
 
 include $(INCLUDE_DIR)/package.mk
@@ -21,7 +21,7 @@ define Package/shat
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Source Hardware Address Translation
-  URL:=http://www.teddy-net.com/cvs/Maxina/128gw/service/arpcatch/shat/
+  URL:=http://sourceforge.net/projects/shat/
 endef
 
 define Package/shat/description
diff --git a/net/slurm/Makefile b/net/slurm/Makefile
index cc6589e24f..2f72362b86 100644
--- a/net/slurm/Makefile
+++ b/net/slurm/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=0.3.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.wormulon.net/files/code/slurm/
+PKG_SOURCE_URL:=http://www.wormulon.net/slurm/
 PKG_MD5SUM:=e68d09202b835c644f7f6b7f070f29a2
 
 include $(INCLUDE_DIR)/package.mk
@@ -22,7 +22,7 @@ define Package/slurm
   CATEGORY:=Network
   DEPENDS:=+libncurses
   TITLE:=A realtime network interface monitor
-  URL:=http://www.wormulon.net/projects/slurm
+  URL:=http://www.wormulon.net/slurm/
 endef
 
 define Package/slurm/description
diff --git a/net/spawn-fcgi/Makefile b/net/spawn-fcgi/Makefile
index 611cfc4614..f8c9a99ec2 100644
--- a/net/spawn-fcgi/Makefile
+++ b/net/spawn-fcgi/Makefile
@@ -24,7 +24,7 @@ define Package/spawn-fcgi
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Tool to spawn fastcgi applications
-  URL:=http://www.lighttpd.net/
+  URL:=http://redmine.lighttpd.net/projects/spawn-fcgi
 endef
 
 define Package/spawn-fcgi/description
diff --git a/net/speedtouch-usb-firmware/Makefile b/net/speedtouch-usb-firmware/Makefile
index 1802a758f5..4e3fe0a07d 100644
--- a/net/speedtouch-usb-firmware/Makefile
+++ b/net/speedtouch-usb-firmware/Makefile
@@ -16,7 +16,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/speedtouch-usb-firmware-$(PKG_VERSION)
 PKG_SOURCE:=SpeedTouch330_firmware_$(PKG_VERSION)$(PKG_RELEASE).zip
 PKG_SOURCE_URL:=http://www.speedtouch.com/download/drivers/USB/
 PKG_MD5SUM:=2551ce46ef785642f2c6768511f70ff3
-PKG_CAT:=unzip
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile
index 6d92121a33..93161e9386 100644
--- a/net/stunnel/Makefile
+++ b/net/stunnel/Makefile
@@ -15,7 +15,7 @@ define Package/stunnel
   CATEGORY:=Network
   DEPENDS:=+libopenssl +libwrap
   TITLE:=SSL TCP Wrapper
-  URL:=http://stunnel.org
+  URL:=http://www.stunnel.org/
 endef
 
 define Package/stunnel/description
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index ebbcc0f816..33119e90cc 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://michael.toren.net/code/tcptraceroute
 PKG_MD5SUM:=65d1001509f971ea986fcbc2dd009643
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tcptraceroute
diff --git a/net/tctool/Makefile b/net/tctool/Makefile
index 47eff62a5f..9fb1d29790 100644
--- a/net/tctool/Makefile
+++ b/net/tctool/Makefile
@@ -7,7 +7,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=http://download2.berlios.de/speedmodem50b
 PKG_MD5SUM:=df38334206d4cad106e58bd71c6f1d9a
-PKG_CAT:=unzip
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/net/tftp-hpa/Makefile b/net/tftp-hpa/Makefile
index b2a9a0cb98..57a253ea3f 100644
--- a/net/tftp-hpa/Makefile
+++ b/net/tftp-hpa/Makefile
@@ -12,11 +12,9 @@ PKG_VERSION:=0.48
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/software/network/tftp
+PKG_SOURCE_URL:=@KERNEL/software/network/tftp
 PKG_MD5SUM:=73dd29dfa9062a174163f6a267e0b5f7
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tftp-hpa/Default
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index 8725f33025..88d51f8140 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tsocks
-PKG_VERSION:=1.8
+PKG_VERSION:=1.8beta5
 PKG_RELEASE:=1
 PKG_MD5SUM:=51caefd77e5d440d0bbd6443db4fc0f8
 
-PKG_SOURCE_URL:=http://ftp1.sourceforge.net/tsocks/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)beta5.tar.gz
+PKG_SOURCE_URL:=@SF/tsocks
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index 9acc1c3142..c8edfcd91d 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_SOURCE_URL:=http://cr.yp.to/ucspi-tcp/
 PKG_MD5SUM:=39b619147db54687c4a583a7a94c9163
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ucspi-tcp
diff --git a/net/udp-broadcast-relay/Makefile b/net/udp-broadcast-relay/Makefile
index 92ca78df62..9265c42718 100644
--- a/net/udp-broadcast-relay/Makefile
+++ b/net/udp-broadcast-relay/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.joachim-breitner.de/udp-broadcast-relay/files/
 PKG_MD5SUM:=a32f983b7063d6ac670e6b22be9b9d24
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/udp-broadcast-relay
diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile
index ef88a8a1dc..0ceff3d1e6 100644
--- a/net/ulogd/Makefile
+++ b/net/ulogd/Makefile
@@ -21,7 +21,7 @@ PKG_MD5SUM:=05b4ed2926b9a22aaeaf642917bbf8ff
 define Package/ulogd/Default
   SECTION:=net
   CATEGORY:=Network
-  URL:=http://gnumonks.org/projects/ulogd
+  URL:=http://www.netfilter.org/projects/ulogd/index.html
 endef
 
 define Package/ulogd
diff --git a/net/updatedd/Makefile b/net/updatedd/Makefile
index b1f921dee9..81d9d1ba6f 100644
--- a/net/updatedd/Makefile
+++ b/net/updatedd/Makefile
@@ -22,7 +22,7 @@ define Package/updatedd
   CATEGORY:=Network
   MENU:=1
   TITLE:=A tool to update dynamic dns services
-  URL:=http://www.philipp-benner.de/updatedd/
+  URL:=http://savannah.nongnu.org/projects/updatedd/
 endef
 
 define Package/updatedd/description
diff --git a/net/veth/Makefile b/net/veth/Makefile
index 2ac948dfca..a5d1bc8810 100644
--- a/net/veth/Makefile
+++ b/net/veth/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.geocities.com/nestorjpg/veth/
 PKG_MD5SUM:=11536388d9c76552a4b736638a458361
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/veth
diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile
index 5366b09177..46ba8a16fe 100644
--- a/net/vncrepeater/Makefile
+++ b/net/vncrepeater/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.rit.edu/~reh5586/openwrt/packages/vncrepeater/src
 PKG_MD5SUM:=5951740a8a103d7d9668558b3639c6c4
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vncrepeater
@@ -24,7 +22,7 @@ define Package/vncrepeater
   CATEGORY:=Network
   DEPENDS:=+uclibcxx
   TITLE:=UltraVNC repeater for Linux
-  URL:=http://ultravnc.sourceforge.net/addons/repeater.html
+  URL:=http://www.uvnc.com/addons/repeater.html
 endef
 
 define Package/vncrepeater/conffiles
diff --git a/net/vrrpd/Makefile b/net/vrrpd/Makefile
index 067eed71f3..6237f81f8d 100644
--- a/net/vrrpd/Makefile
+++ b/net/vrrpd/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/vrrpd
 PKG_MD5SUM:=6d5066ea1a6ced817376ca0f54765447
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vrrpd
diff --git a/net/wavemon/Makefile b/net/wavemon/Makefile
index d60aad2fb0..cad1eca3e0 100644
--- a/net/wavemon/Makefile
+++ b/net/wavemon/Makefile
@@ -23,7 +23,7 @@ define Package/wavemon
   TITLE:=N-curses based wireless network devices monitor
   DEPENDS:= +libncurses
   SUBMENU:=wireless
-  URL:=http://www.janmorgenstern.de/projects-software.html
+  URL:=http://eden-feed.erg.abdn.ac.uk/wavemon/
 endef
 
 define Package/wavemon/description
diff --git a/net/wiviz/Makefile b/net/wiviz/Makefile
index d68ef9f6c3..3ca83298b7 100644
--- a/net/wiviz/Makefile
+++ b/net/wiviz/Makefile
@@ -11,8 +11,6 @@ PKG_NAME:=wiviz
 PKG_VERSION:=1.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wiviz
diff --git a/net/yafc/Makefile b/net/yafc/Makefile
index f64e8a5f2c..680fe34d64 100644
--- a/net/yafc/Makefile
+++ b/net/yafc/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=832d074183a36ee15b47553ed5962fce
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/yafc
diff --git a/net/znc/Makefile b/net/znc/Makefile
index 1c1c7fa3c3..1190c8dae6 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=0.068
 PKG_RELEASE:=1
  
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://kent.dl.sourceforge.net/sourceforge/znc
+PKG_SOURCE_URL:=@SF/znc
 PKG_MD5SUM:=763162d90c67814780de67aa88347c38
  
 include $(INCLUDE_DIR)/package.mk
diff --git a/sound/flite/Makefile b/sound/flite/Makefile
index c5f70d9919..3bf3acab12 100644
--- a/sound/flite/Makefile
+++ b/sound/flite/Makefile
@@ -14,8 +14,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/
 PKG_MD5SUM:=ae0aca1cb7b4801f4372f3a75a9e52b5
  
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/flite
diff --git a/utils/at/Makefile b/utils/at/Makefile
index ac1c34309e..4d7f2455cb 100644
--- a/utils/at/Makefile
+++ b/utils/at/Makefile
@@ -22,6 +22,7 @@ define Package/at
   CATEGORY:=Utilities
   DEPENDS:=+libelf
   TITLE:=Delayed job execution and batch processing
+  URL:=http://packages.ubuntu.com/at
 endef
 
 define Package/at/description
diff --git a/utils/bash/Makefile b/utils/bash/Makefile
index 4f28b06ecd..e8075b7f95 100644
--- a/utils/bash/Makefile
+++ b/utils/bash/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=3.2
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/bash/
+PKG_SOURCE_URL:=@GNU/bash
 PKG_MD5SUM:=00bfa16d58e034e3c2aa27f390390d30
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/bc/Makefile b/utils/bc/Makefile
index 56ed3d700d..29b71aa1a2 100644
--- a/utils/bc/Makefile
+++ b/utils/bc/Makefile
@@ -15,14 +15,12 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=ftp://ftp.debian.org/debian/pool/main/b/bc
 PKG_MD5SUM:=ea7704fc02b359ce92fa4360c802fb23
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bc/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  URL:=http://packages.debian.org/sid/bc
+  URL:=http://packages.debian.org/bc
 endef
 
 define Package/bc
diff --git a/utils/cmdpad/Makefile b/utils/cmdpad/Makefile
index 9bc05927fd..18bdb8b9d6 100644
--- a/utils/cmdpad/Makefile
+++ b/utils/cmdpad/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=0.0.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/cmdpad/
+PKG_SOURCE_URL:=@SF/cmdpad
 PKG_MD5SUM:=6633b2354b7f23f9cd8e2bfb6e735965
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/coreutils/Makefile b/utils/coreutils/Makefile
index 7b3e007b35..e62ef719de 100644
--- a/utils/coreutils/Makefile
+++ b/utils/coreutils/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=7.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/coreutils/
+PKG_SOURCE_URL:=@GNU/coreutils
 PKG_MD5SUM:=427c2914d3eab956f317c9ec6a45e62a
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/crypto-tools/Makefile b/utils/crypto-tools/Makefile
index 2c1bbc64db..577989c091 100644
--- a/utils/crypto-tools/Makefile
+++ b/utils/crypto-tools/Makefile
@@ -25,6 +25,7 @@ define Package/crypto-tools
   CATEGORY:=Utilities
   DEPENDS:=+libopenssl
   TITLE:=OCF-Linux's crypto-tools
+  URL:=http://ocf-linux.sourceforge.net/
 endef
 
 define Build/Configure
diff --git a/utils/daemontools/Makefile b/utils/daemontools/Makefile
index 0437884460..e667ce4806 100644
--- a/utils/daemontools/Makefile
+++ b/utils/daemontools/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_SOURCE_URL:=http://cr.yp.to/daemontools/
 PKG_MD5SUM:=1871af2453d6e464034968a0fbcb2bfc
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 PKG_UNPACK += && mv $(PKG_BUILD_DIR)/../admin/* $(PKG_BUILD_DIR)/.. && rmdir $(PKG_BUILD_DIR)/../admin
diff --git a/utils/dmidecode/Makefile b/utils/dmidecode/Makefile
index 2f439035ac..518acfec30 100644
--- a/utils/dmidecode/Makefile
+++ b/utils/dmidecode/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/dmidecode/
 PKG_MD5SUM:=3c9c4d55a40b78600f3b43bfa64616f9
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dmidecode
diff --git a/utils/fortune-mod/Makefile b/utils/fortune-mod/Makefile
index d5e3dd8d35..e3482c7a0f 100644
--- a/utils/fortune-mod/Makefile
+++ b/utils/fortune-mod/Makefile
@@ -15,15 +15,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://freeware.sgi.com/source/fortune-mod
 PKG_MD5SUM:=383b1de06b35450235732c7ae7b5f0e3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fortune-mod
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=display fortune cookies on demand.
-  URL:=http://freeware.sgi.com/source/fortune-mod
+  URL:=http://packages.debian.org/fortune-mod
 endef
 
 define Package/fortune-mod/description
diff --git a/utils/fxload/Makefile b/utils/fxload/Makefile
index 8e3490cf07..f0ddaaf5fb 100644
--- a/utils/fxload/Makefile
+++ b/utils/fxload/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linux-hotplug
 PKG_MD5SUM:=cafd71a5bff0c57bcd248273b2541c05
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fxload
diff --git a/utils/gzip/Makefile b/utils/gzip/Makefile
index 35ca6083df..50baf8a8b0 100644
--- a/utils/gzip/Makefile
+++ b/utils/gzip/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.gzip.org/
 PKG_MD5SUM:=52eaf713673507d21f7abefee98ba662
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gzip
diff --git a/utils/hd-idle/Makefile b/utils/hd-idle/Makefile
index 0bd5cca15d..922a7d1af5 100644
--- a/utils/hd-idle/Makefile
+++ b/utils/hd-idle/Makefile
@@ -29,6 +29,7 @@ define Package/hd-idle
   CATEGORY:=Utilities
   TITLE:=Another idle-daemon for attached hard drives
   SUBMENU:=disc
+  URL:=http://hd-idle.sourceforge.net/
 endef
 
 define Build/Compile
diff --git a/utils/hplip/Makefile b/utils/hplip/Makefile
index 536017d433..6c17d5aa11 100644
--- a/utils/hplip/Makefile
+++ b/utils/hplip/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/hplip
 PKG_MD5SUM:=2e20dba86abb99a3ca59d05e814ce9a1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS := python
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/i2c-tools/Makefile b/utils/i2c-tools/Makefile
index f063e23393..135bc9ddd1 100644
--- a/utils/i2c-tools/Makefile
+++ b/utils/i2c-tools/Makefile
@@ -22,7 +22,7 @@ define Package/i2c-tools
   CATEGORY:=Utilities
   TITLE:=I2C tools for Linux
   DEPENDS:=@LINUX_2_6
-  URL:=http://www.lm-sensors.org/
+  URL:=http://www.lm-sensors.org/wiki/I2CTools
 endef
 
 define Package/i2c-tools/description
diff --git a/utils/mdadm/Makefile b/utils/mdadm/Makefile
index c55112fef0..bd91de4320 100644
--- a/utils/mdadm/Makefile
+++ b/utils/mdadm/Makefile
@@ -12,10 +12,9 @@ PKG_VERSION:=2.6.7.2
 PKG_RELEASE:=1
 PKG_MD5SUM:=e4badb4a8ded4344ba0fa785883955d8
 
-PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/utils/raid/mdadm
+PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mdadm
diff --git a/utils/mgetty/Makefile b/utils/mgetty/Makefile
index 97f926fa39..8e2aec4b4e 100644
--- a/utils/mgetty/Makefile
+++ b/utils/mgetty/Makefile
@@ -22,6 +22,7 @@ define Package/mgetty
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=A data/fax solution for your analog modem
+  URL:=http://mgetty.greenie.net/
 endef
 
 define Package/mgetty/description
diff --git a/utils/microcom/Makefile b/utils/microcom/Makefile
index 2583d4482b..e1378ec601 100644
--- a/utils/microcom/Makefile
+++ b/utils/microcom/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE:=m102.tar.gz
 PKG_SOURCE_URL:=http://microcom.port5.com/
 PKG_MD5SUM:=c7817035dc41cb02e7cfb565cf9b7401
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_UNPACK:=zcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/mksh/Makefile b/utils/mksh/Makefile
index 6828ab64ce..5b5f63a5c7 100644
--- a/utils/mksh/Makefile
+++ b/utils/mksh/Makefile
@@ -25,6 +25,7 @@ define Package/mksh
   CATEGORY:=Base system
   TITLE:=MirBSD Korn Shell
   DEPENDS:=$(DEP)
+  URL:=http://mirbsd.de/mksh
 endef
 
 define Package/mksh/description
diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile
index 8cba97305f..a9e367fe39 100644
--- a/utils/pciutils/Makefile
+++ b/utils/pciutils/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=3.1.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.kernel.org/pub/software/utils/pciutils/ \
+PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils \
 	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 PKG_MD5SUM:=46387fd7a18c33fbb5311fdb3ab9ea12
 
diff --git a/utils/pcmciautils/Makefile b/utils/pcmciautils/Makefile
index e54fb618f9..3e04b8c8d2 100644
--- a/utils/pcmciautils/Makefile
+++ b/utils/pcmciautils/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=015
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/utils/kernel/pcmcia/
+PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/pcmcia
 PKG_MD5SUM:=9e12435c8b6cf7bf59894e90e480b4aa
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/picocom/Makefile b/utils/picocom/Makefile
index 5dd1645dd4..084675b5de 100644
--- a/utils/picocom/Makefile
+++ b/utils/picocom/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://efault.net/npat/hacks/picocom/dist/
 PKG_MD5SUM:=08fcc5f6bb9e7676a2569386d5ea9f70
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/picocom
diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index 58841d0e47..198fed5bc7 100644
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -30,6 +30,7 @@ define Package/rrdtool/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Round Robin Database (RRD)
+  URL:=http://oss.oetiker.ch/rrdtool/
 endef
 
 define Package/librrd
diff --git a/utils/sdparm/Makefile b/utils/sdparm/Makefile
index 4cc88171c4..1d232daf1e 100644
--- a/utils/sdparm/Makefile
+++ b/utils/sdparm/Makefile
@@ -25,6 +25,7 @@ define Package/sdparm
   TITLE:=Read or modify SCSI or USB disk parameters
   DEPENDS:=+kmod-scsi-generic
   SUBMENU:=disc
+  URL:=http://sg.danny.cz/sg/sdparm.html
 endef
 
 define Package/sdparm/description
diff --git a/utils/setserial/Makefile b/utils/setserial/Makefile
index a0fd6ef285..bf0b96c440 100644
--- a/utils/setserial/Makefile
+++ b/utils/setserial/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/setserial
 PKG_MD5SUM:=c4867d72c41564318e0107745eb7a0f2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/setserial
diff --git a/utils/sg3-utils/Makefile b/utils/sg3-utils/Makefile
index 6f26cf6626..2f640ced67 100644
--- a/utils/sg3-utils/Makefile
+++ b/utils/sg3-utils/Makefile
@@ -22,7 +22,7 @@ define Package/sg3-utils
   CATEGORY:=Utilities
   DEPENDS:=+kmod-usb-storage
   TITLE:=sg3 scsi utilities
-  URL:=http://sg.torque.net/sg/sg3_utils.html
+  URL:=http://sg.danny.cz/sg/sg3_utils.html
 endef
 
 define Package/sg3-utils/description
diff --git a/utils/sysfsutils/Makefile b/utils/sysfsutils/Makefile
index 1555702a63..2d00f1e51e 100644
--- a/utils/sysfsutils/Makefile
+++ b/utils/sysfsutils/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linux-diag
 PKG_MD5SUM:=14e7dcd0436d2f49aa403f67e1ef7ddc
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/sysfsutils
diff --git a/utils/unzip/Makefile b/utils/unzip/Makefile
index ed5b3386f1..165f3daea9 100644
--- a/utils/unzip/Makefile
+++ b/utils/unzip/Makefile
@@ -24,7 +24,7 @@ define Package/unzip
   CATEGORY:=Utilities
   DEPENDS:=
   TITLE:=De-archiver for .zip files
-  URL:=http://infozip.sourceforge.net/Zip.html
+  URL:=http://infozip.sourceforge.net/UnZip.html
   SUBMENU:=compression
 endef
 
diff --git a/utils/usb-modeswitch/Makefile b/utils/usb-modeswitch/Makefile
index 5a20e2cc12..4a955b2a6a 100644
--- a/utils/usb-modeswitch/Makefile
+++ b/utils/usb-modeswitch/Makefile
@@ -13,7 +13,6 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.draisberghof.de/usb_modeswitch
-PKG_CAT:=bzcat
 PKG_MD5SUM:=1301f7b85b3cfe6647a5bc7e59845bae
 
 include $(INCLUDE_DIR)/package.mk
@@ -23,6 +22,7 @@ define Package/usb-modeswitch
   CATEGORY:=Utilities
   DEPENDS:=+libusb
   TITLE:=USB ModeSwitch
+  URL:=http://www.draisberghof.de/usb_modeswitch/
 endef
 
 define Package/usb-modeswitch/description
author	Hauke Mehrtens	2009-06-13 17:01:55 +0000
committer	Hauke Mehrtens	2009-06-13 17:01:55 +0000
commit	1821a85c5470485c7d0c17174023e0e780530860 (patch)
tree	92e24b54f223fa69fb25bce28c114c19b04408d6
parent	f2083131e32be667b083faef55e7a9c77f85f184 (diff)
download	archive-1821a85c5470485c7d0c17174023e0e780530860.tar.gz