[packages] Various Makefile cleanups.

Thanks to swalker. git-svn-id: svn://svn.openwrt.org/openwrt/packages@16438 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-13 17:01:55 +00:00 · 2009-06-13 17:01:55 +00:00 · 83c14e180d
commit 83c14e180d
parent 9ee38db48e
152 changed files with 88 additions and 228 deletions
--- 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
--- 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/
--- 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
--- 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"
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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

--- 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
--- 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
--- 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
--- 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

--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 += \
--- 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
--- 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
--- 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)
--- 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
--- 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

--- 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)

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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/
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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 += \
--- 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/ \
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More