diff -ruN /usr/ports/audio/streamtuner/Makefile streamtuner/Makefile
--- /usr/ports/audio/streamtuner/Makefile	Tue Dec 30 07:22:51 2003
+++ streamtuner/Makefile	Thu Jan 29 12:49:58 2004
@@ -2,16 +2,13 @@
 # Date created:			02 Apr 2002
 # Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 #
-# $FreeBSD: ports/audio/streamtuner/Makefile,v 1.9 2003/12/29 18:23:45 pav Exp $
+# $FreeBSD$
 #
 
 PORTNAME=		streamtuner
 PORTVERSION=		0.10.2
 CATEGORIES=		audio www
-MASTER_SITES=		${MASTER_SITE_SAVANNAH} \
-			${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}.pkg/${PORTVERSION} \
-			pav
+MASTER_SITES=		http://streamtuner.sourceforge.net/streamtuner/
 
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		A GTK+ stream directory browser
diff -ruN /usr/ports/audio/streamtuner-live365/Makefile streamtuner-live365/Makefile
--- /usr/ports/audio/streamtuner-live365/Makefile	Tue Nov 18 05:00:39 2003
+++ streamtuner-live365/Makefile	Thu Jan 29 12:50:21 2004
@@ -2,14 +2,13 @@
 # Date created:			18 Jul 2002
 # Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 #
-# $FreeBSD: ports/audio/streamtuner-live365/Makefile,v 1.3 2003/11/17 09:01:35 krion Exp $
+# $FreeBSD$
 #
 
 PORTNAME=		live365
 PORTVERSION=		0.3.2
 CATEGORIES=		audio www
-MASTER_SITES=		${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	streamtuner/${PKGNAMEPREFIX}${PORTNAME}.pkg/${PORTVERSION}
+MASTER_SITES=		http://streamtuner.sourceforge.net/streamtuner/
 PKGNAMEPREFIX=		streamtuner-
 DISTNAME=		${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
diff -ruN /usr/ports/audio/streamtuner-local/Makefile streamtuner-local/Makefile
--- /usr/ports/audio/streamtuner-local/Makefile	Sat Oct  4 04:58:04 2003
+++ streamtuner-local/Makefile	Thu Jan 29 12:50:43 2004
@@ -2,14 +2,13 @@
 # Date created:			18 Jul 2002
 # Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 #
-# $FreeBSD: ports/audio/streamtuner-local/Makefile,v 1.4 2003/10/03 11:04:54 edwin Exp $
+# $FreeBSD$
 #
 
 PORTNAME=		local
 PORTVERSION=		0.2.1
 CATEGORIES=		audio www
-MASTER_SITES=		${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	streamtuner/${PKGNAMEPREFIX}${PORTNAME}.pkg/${PORTVERSION}
+MASTER_SITES=		http://streamtuner.sourceforge.net/streamtuner/
 PKGNAMEPREFIX=		streamtuner-
 DISTNAME=		${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
diff -ruN /usr/ports/audio/streamtuner-python/Makefile streamtuner-python/Makefile
--- /usr/ports/audio/streamtuner-python/Makefile	Sat Oct  4 04:58:04 2003
+++ streamtuner-python/Makefile	Thu Jan 29 12:51:00 2004
@@ -2,14 +2,13 @@
 # Date created:			03 Mar 2002
 # Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 #
-# $FreeBSD: ports/audio/streamtuner-python/Makefile,v 1.3 2003/10/03 11:04:54 edwin Exp $
+# $FreeBSD$
 #
 
 PORTNAME=		python
 PORTVERSION=		0.0.2
 CATEGORIES=		audio www
-MASTER_SITES=		${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	streamtuner/${PKGNAMEPREFIX}${PORTNAME}.pkg/${PORTVERSION}
+MASTER_SITES=		http://streamtuner.sourceforge.net/streamtuner/
 PKGNAMEPREFIX=		streamtuner-
 DISTNAME=		${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}