16 files changed, 102 insertions, 114 deletions

diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile
index e383b9e72cf8..15cde94d34d3 100644
--- a/audio/akode-plugins-jack/Makefile
+++ b/audio/akode-plugins-jack/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	akode-plugins-${PORTNAMESUFX}
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 PORTEPOCH=	1
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.kde-apps.org/content/
-MASTER_SITE_SUBDIR=lofi
-DISTNAME=	'download.php?content=30375'
+MASTER_SITES=	${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=distfiles
+DISTNAME=   30375-akode-${PORTVERSION}.tar.bz2
 EXTRACT_SUFX=	# none
 
 MAINTAINER=	kde@FreeBSD.org
@@ -22,15 +21,14 @@ LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
-FETCH_CMD=	/usr/bin/fetch
-
 PLUGIN=		jack_sink
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
 USE_AUTOTOOLS=  libtool:15
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/akode-2.0
+WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
@@ -45,7 +43,7 @@ IGNORE= Jack not available
 
 post-patch:
 	@${SETENV} TZ=UTC \
-	${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+	${TOUCH} -t 200607222217.01 ${WRKSRC}/akode/lib/akode_export.h.in
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
diff --git a/audio/akode-plugins-jack/distinfo b/audio/akode-plugins-jack/distinfo
index 015b86f2bc51..2dd6d912909d 100644
--- a/audio/akode-plugins-jack/distinfo
+++ b/audio/akode-plugins-jack/distinfo
@@ -1,3 +1,3 @@
-MD5 (download.php?content=30375) = 04f79cda65c8e9966fa462eaaaa282dc
-SHA256 (download.php?content=30375) = bc9985329ec2a47d5f85c9a30288ddf2f69d4ca5dc7897b4536bd994a6a0b19f
-SIZE (download.php?content=30375) = 650094
+MD5 (30375-akode-2.0.1.tar.bz2) = 94a10e7729b20b669bc5c7721f62e162
+SHA256 (30375-akode-2.0.1.tar.bz2) = a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
+SIZE (30375-akode-2.0.1.tar.bz2) = 460964
diff --git a/audio/akode-plugins-mpc/Makefile b/audio/akode-plugins-mpc/Makefile
index f37fcf8c48d6..21ded33fa9d4 100644
--- a/audio/akode-plugins-mpc/Makefile
+++ b/audio/akode-plugins-mpc/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	akode-plugins-${PORTNAMESUFX}
-PORTVERSION=	2.0
-PORTEPOCH=	1
-CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.kde-apps.org/content/
-MASTER_SITE_SUBDIR=lofi
-DISTNAME=	'download.php?content=30375'
+PORTNAME=   akode-plugins-${PORTNAMESUFX}
+PORTVERSION=    2.0.1
+PORTEPOCH=  1
+CATEGORIES= audio kde
+MASTER_SITES=   ${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=distfiles
+DISTNAME=   30375-akode-${PORTVERSION}.tar.bz2
+												
 EXTRACT_SUFX=	# none
 
 MAINTAINER=	kde@FreeBSD.org
@@ -20,15 +20,14 @@ COMMENT=	Musepack decoder plugin for akode
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
-FETCH_CMD=	/usr/bin/fetch
-
 PLUGIN=		mpc_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
 USE_AUTOTOOLS=  libtool:15
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/akode-2.0
+WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
@@ -37,7 +36,7 @@ CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 
 post-patch:
 	@${SETENV} TZ=UTC \
-	${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+	${TOUCH} -t 200607222217.01 ${WRKSRC}/akode/lib/akode_export.h.in
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
diff --git a/audio/akode-plugins-mpc/distinfo b/audio/akode-plugins-mpc/distinfo
index 015b86f2bc51..2dd6d912909d 100644
--- a/audio/akode-plugins-mpc/distinfo
+++ b/audio/akode-plugins-mpc/distinfo
@@ -1,3 +1,3 @@
-MD5 (download.php?content=30375) = 04f79cda65c8e9966fa462eaaaa282dc
-SHA256 (download.php?content=30375) = bc9985329ec2a47d5f85c9a30288ddf2f69d4ca5dc7897b4536bd994a6a0b19f
-SIZE (download.php?content=30375) = 650094
+MD5 (30375-akode-2.0.1.tar.bz2) = 94a10e7729b20b669bc5c7721f62e162
+SHA256 (30375-akode-2.0.1.tar.bz2) = a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
+SIZE (30375-akode-2.0.1.tar.bz2) = 460964
diff --git a/audio/akode-plugins-mpeg/Makefile b/audio/akode-plugins-mpeg/Makefile
index e4fffa3e29cc..95eaaeb6cead 100644
--- a/audio/akode-plugins-mpeg/Makefile
+++ b/audio/akode-plugins-mpeg/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	akode-plugins-${PORTNAMESUFX}
-PORTVERSION=	2.0
-PORTEPOCH=	1
-CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.kde-apps.org/content/
-MASTER_SITE_SUBDIR=lofi
-DISTNAME=	'download.php?content=30375'
+PORTNAME=   akode-plugins-${PORTNAMESUFX}
+PORTVERSION=    2.0.1
+PORTEPOCH=  1
+CATEGORIES= audio kde
+MASTER_SITES=   ${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=distfiles
+DISTNAME=   30375-akode-${PORTVERSION}.tar.bz2
+												
 EXTRACT_SUFX=	# none
 
 MAINTAINER=	kde@FreeBSD.org
@@ -22,15 +22,14 @@ LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
-FETCH_CMD=	/usr/bin/fetch
-
 PLUGIN=		mpeg_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
 USE_AUTOTOOLS=  libtool:15
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/akode-2.0
+WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
@@ -39,7 +38,7 @@ CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 
 post-patch:
 	@${SETENV} TZ=UTC \
-	${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+	${TOUCH} -t 200607222217.01 ${WRKSRC}/akode/lib/akode_export.h.in
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
diff --git a/audio/akode-plugins-mpeg/distinfo b/audio/akode-plugins-mpeg/distinfo
index 015b86f2bc51..2dd6d912909d 100644
--- a/audio/akode-plugins-mpeg/distinfo
+++ b/audio/akode-plugins-mpeg/distinfo
@@ -1,3 +1,3 @@
-MD5 (download.php?content=30375) = 04f79cda65c8e9966fa462eaaaa282dc
-SHA256 (download.php?content=30375) = bc9985329ec2a47d5f85c9a30288ddf2f69d4ca5dc7897b4536bd994a6a0b19f
-SIZE (download.php?content=30375) = 650094
+MD5 (30375-akode-2.0.1.tar.bz2) = 94a10e7729b20b669bc5c7721f62e162
+SHA256 (30375-akode-2.0.1.tar.bz2) = a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
+SIZE (30375-akode-2.0.1.tar.bz2) = 460964
diff --git a/audio/akode-plugins-oss/Makefile b/audio/akode-plugins-oss/Makefile
index 8e60b53815a1..1e182dc3edd2 100644
--- a/audio/akode-plugins-oss/Makefile
+++ b/audio/akode-plugins-oss/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	akode-plugins-${PORTNAMESUFX}
-PORTVERSION=	2.0
-PORTEPOCH=	1
-CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.kde-apps.org/content/
-MASTER_SITE_SUBDIR=lofi
-DISTNAME=	'download.php?content=30375'
+PORTNAME=   akode-plugins-${PORTNAMESUFX}
+PORTVERSION=    2.0.1
+PORTEPOCH=  1
+CATEGORIES= audio kde
+MASTER_SITES=   ${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=distfiles
+DISTNAME=   30375-akode-${PORTVERSION}.tar.bz2
+
 EXTRACT_SUFX=	# none
 
 MAINTAINER=	kde@FreeBSD.org
@@ -20,15 +20,14 @@ COMMENT=	OSS output plugin for akode
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
-FETCH_CMD=	/usr/bin/fetch
-
 PLUGIN=		oss_sink
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
 USE_AUTOTOOLS=  libtool:15
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/akode-2.0
+WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
@@ -37,7 +36,7 @@ CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 
 post-patch:
 	@${SETENV} TZ=UTC \
-	${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+	${TOUCH} -t 200607222217.01 ${WRKSRC}/akode/lib/akode_export.h.in
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
diff --git a/audio/akode-plugins-oss/distinfo b/audio/akode-plugins-oss/distinfo
index 015b86f2bc51..2dd6d912909d 100644
--- a/audio/akode-plugins-oss/distinfo
+++ b/audio/akode-plugins-oss/distinfo
@@ -1,3 +1,3 @@
-MD5 (download.php?content=30375) = 04f79cda65c8e9966fa462eaaaa282dc
-SHA256 (download.php?content=30375) = bc9985329ec2a47d5f85c9a30288ddf2f69d4ca5dc7897b4536bd994a6a0b19f
-SIZE (download.php?content=30375) = 650094
+MD5 (30375-akode-2.0.1.tar.bz2) = 94a10e7729b20b669bc5c7721f62e162
+SHA256 (30375-akode-2.0.1.tar.bz2) = a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
+SIZE (30375-akode-2.0.1.tar.bz2) = 460964
diff --git a/audio/akode-plugins-polypaudio/Makefile b/audio/akode-plugins-polypaudio/Makefile
index 5d094cc68854..c7082f309c5d 100644
--- a/audio/akode-plugins-polypaudio/Makefile
+++ b/audio/akode-plugins-polypaudio/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	akode-plugins-${PORTNAMESUFX}
-PORTVERSION=	2.0
-PORTEPOCH=	1
-CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.kde-apps.org/content/
-MASTER_SITE_SUBDIR=lofi
-DISTNAME=	'download.php?content=30375'
+PORTNAME=   akode-plugins-${PORTNAMESUFX}
+PORTVERSION=    2.0.1
+PORTEPOCH=  1
+CATEGORIES= audio kde
+MASTER_SITES=   ${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=distfiles
+DISTNAME=   30375-akode-${PORTVERSION}.tar.bz2
 EXTRACT_SUFX=	# none
 
 MAINTAINER=	kde@FreeBSD.org
@@ -22,15 +21,14 @@ LIB_DEPENDS=	polyp-simple:${PORTSDIR}/audio/polypaudio
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
-FETCH_CMD=	/usr/bin/fetch
-
 PLUGIN=		polyp_sink
 PORTNAMESUFX=	polypaudio
 
 USE_AUTOTOOLS=	libltdl
 USE_AUTOTOOLS=  libtool:15
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/akode-2.0
+WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
@@ -39,7 +37,7 @@ CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 
 post-patch:
 	@${SETENV} TZ=UTC \
-	${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+	${TOUCH} -t 200607222217.01 ${WRKSRC}/akode/lib/akode_export.h.in
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
diff --git a/audio/akode-plugins-polypaudio/distinfo b/audio/akode-plugins-polypaudio/distinfo
index 015b86f2bc51..2dd6d912909d 100644
--- a/audio/akode-plugins-polypaudio/distinfo
+++ b/audio/akode-plugins-polypaudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (download.php?content=30375) = 04f79cda65c8e9966fa462eaaaa282dc
-SHA256 (download.php?content=30375) = bc9985329ec2a47d5f85c9a30288ddf2f69d4ca5dc7897b4536bd994a6a0b19f
-SIZE (download.php?content=30375) = 650094
+MD5 (30375-akode-2.0.1.tar.bz2) = 94a10e7729b20b669bc5c7721f62e162
+SHA256 (30375-akode-2.0.1.tar.bz2) = a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
+SIZE (30375-akode-2.0.1.tar.bz2) = 460964
diff --git a/audio/akode-plugins-resampler/Makefile b/audio/akode-plugins-resampler/Makefile
index 4cba7f0f881e..3fdce8d9258b 100644
--- a/audio/akode-plugins-resampler/Makefile
+++ b/audio/akode-plugins-resampler/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	akode-plugins-${PORTNAMESUFX}
-PORTVERSION=	2.0
-PORTEPOCH=	1
-CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.kde-apps.org/content/
-MASTER_SITE_SUBDIR=lofi
-DISTNAME=	'download.php?content=30375'
+PORTNAME=   akode-plugins-${PORTNAMESUFX}
+PORTVERSION=    2.0.1
+PORTEPOCH=  1
+CATEGORIES= audio kde
+MASTER_SITES=   ${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=distfiles
+DISTNAME=   30375-akode-${PORTVERSION}.tar.bz2
 EXTRACT_SUFX=   # none
 
 MAINTAINER=	kde@FreeBSD.org
@@ -22,15 +21,14 @@ LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
-FETCH_CMD=	/usr/bin/fetch
-
 PLUGIN=		src_resampler
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
 USE_AUTOTOOLS=  libtool:15
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/akode-2.0
+WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
@@ -39,7 +37,7 @@ CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 
 post-patch:
 	@${SETENV} TZ=UTC \
-	${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+	${TOUCH} -t 200607222217.01 ${WRKSRC}/akode/lib/akode_export.h.in
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
diff --git a/audio/akode-plugins-resampler/distinfo b/audio/akode-plugins-resampler/distinfo
index 015b86f2bc51..2dd6d912909d 100644
--- a/audio/akode-plugins-resampler/distinfo
+++ b/audio/akode-plugins-resampler/distinfo
@@ -1,3 +1,3 @@
-MD5 (download.php?content=30375) = 04f79cda65c8e9966fa462eaaaa282dc
-SHA256 (download.php?content=30375) = bc9985329ec2a47d5f85c9a30288ddf2f69d4ca5dc7897b4536bd994a6a0b19f
-SIZE (download.php?content=30375) = 650094
+MD5 (30375-akode-2.0.1.tar.bz2) = 94a10e7729b20b669bc5c7721f62e162
+SHA256 (30375-akode-2.0.1.tar.bz2) = a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
+SIZE (30375-akode-2.0.1.tar.bz2) = 460964
diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile
index 04628be35c2b..4b752f3ba13a 100644
--- a/audio/akode-plugins-xiph/Makefile
+++ b/audio/akode-plugins-xiph/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	akode-plugins-${PORTNAMESUFX}
-PORTVERSION=	2.0
-PORTEPOCH=	1
-CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.kde-apps.org/content/
-MASTER_SITE_SUBDIR=lofi
-DISTNAME=	'download.php?content=30375'
+PORTNAME=   akode-plugins-${PORTNAMESUFX}
+PORTVERSION=    2.0.1
+PORTEPOCH=  1
+CATEGORIES= audio kde
+MASTER_SITES=   ${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=distfiles
+DISTNAME=   30375-akode-${PORTVERSION}.tar.bz2
 EXTRACT_SUFX=   # none
 
 MAINTAINER=	kde@FreeBSD.org
@@ -25,15 +24,14 @@ LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
-FETCH_CMD=	/usr/bin/fetch
-
 PLUGIN=		xiph_decoder
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
 USE_AUTOTOOLS=	libltdl
 USE_AUTOTOOLS=  libtool:15
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/akode-2.0
+WRKSRC=		${WRKDIR}/akode-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV+=	LDFLAGS=-L${WRKSRC}/akode/lib/.libs
@@ -42,7 +40,7 @@ CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 
 post-patch:
 	@${SETENV} TZ=UTC \
-	${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+	${TOUCH} -t 200607222217.01 ${WRKSRC}/akode/lib/akode_export.h.in
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
diff --git a/audio/akode-plugins-xiph/distinfo b/audio/akode-plugins-xiph/distinfo
index 015b86f2bc51..2dd6d912909d 100644
--- a/audio/akode-plugins-xiph/distinfo
+++ b/audio/akode-plugins-xiph/distinfo
@@ -1,3 +1,3 @@
-MD5 (download.php?content=30375) = 04f79cda65c8e9966fa462eaaaa282dc
-SHA256 (download.php?content=30375) = bc9985329ec2a47d5f85c9a30288ddf2f69d4ca5dc7897b4536bd994a6a0b19f
-SIZE (download.php?content=30375) = 650094
+MD5 (30375-akode-2.0.1.tar.bz2) = 94a10e7729b20b669bc5c7721f62e162
+SHA256 (30375-akode-2.0.1.tar.bz2) = a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
+SIZE (30375-akode-2.0.1.tar.bz2) = 460964
diff --git a/audio/akode/Makefile b/audio/akode/Makefile
index b75c7e1259e1..6974a3bc6cd6 100644
--- a/audio/akode/Makefile
+++ b/audio/akode/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	akode
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 PORTEPOCH=	1
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.kde-apps.org/content/
-MASTER_SITE_SUBDIR=lofi
-DISTNAME=	'download.php?content=30375'
+MASTER_SITES=	${MASTER_SITE_GENTOO}
+MASTER_SITE_SUBDIR=distfiles
+DISTNAME=	30375-${PORTNAME}-${PORTVERSION}.tar.bz2
 EXTRACT_SUFX=	# none
 
 MAINTAINER=	kde@FreeBSD.org
@@ -20,8 +19,6 @@ COMMENT=	Default KDE audio backend
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
-FETCH_CMD=	/usr/bin/fetch
-
 OPTIONS=	JACK "Jack output plugin" off \
 		MPC "Monkey's Audio decoder plugin" on \
 		MPEG "MPEG Audio (including mp3) plugin" on \
@@ -32,8 +29,9 @@ OPTIONS=	JACK "Jack output plugin" off \
 
 USE_AUTOTOOLS=	libltdl
 USE_AUTOTOOLS=  libtool:15
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-2.0
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	MACHINE_ARCH=${MACHINE_ARCH}
 
@@ -73,7 +71,8 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_xiph_decoder.so:${PORTSDIR}/audio/akode-
 .endif
 
 post-patch:
-	@${SETENV} TZ=UTC ${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+	@${SETENV} TZ=UTC \
+	${TOUCH} -t 200607222217.01 ${WRKSRC}/akode/lib/akode_export.h.in
 	${REINPLACE_CMD} -e 's|akodeplay_LDFLAGS =.*|akodeplay_LDFLAGS = \
 	$$(all_libraries) ${PTHREAD_LIBS}|g' \
 		${WRKSRC}/akode/akodeplay/Makefile.in
diff --git a/audio/akode/distinfo b/audio/akode/distinfo
index 015b86f2bc51..2dd6d912909d 100644
--- a/audio/akode/distinfo
+++ b/audio/akode/distinfo
@@ -1,3 +1,3 @@
-MD5 (download.php?content=30375) = 04f79cda65c8e9966fa462eaaaa282dc
-SHA256 (download.php?content=30375) = bc9985329ec2a47d5f85c9a30288ddf2f69d4ca5dc7897b4536bd994a6a0b19f
-SIZE (download.php?content=30375) = 650094
+MD5 (30375-akode-2.0.1.tar.bz2) = 94a10e7729b20b669bc5c7721f62e162
+SHA256 (30375-akode-2.0.1.tar.bz2) = a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
+SIZE (30375-akode-2.0.1.tar.bz2) = 460964