aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2009-08-22 00:28:34 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2009-08-22 00:28:34 +0000
commita13d9a603d44e9d2d333d5b2033b95a97545f73b (patch)
treef369b6d8855716c739425d19cebd7b0bd21ad210 /multimedia
parent0074c5fa8cabe431c6868442326d476bb5ef2047 (diff)
downloadports-a13d9a603d44e9d2d333d5b2033b95a97545f73b.tar.gz
ports-a13d9a603d44e9d2d333d5b2033b95a97545f73b.zip
Notes
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/atomicparsley/Makefile2
-rw-r--r--multimedia/avidemux2/Makefile4
-rw-r--r--multimedia/avifile/Makefile3
-rw-r--r--multimedia/beep-media-player/Makefile2
-rw-r--r--multimedia/camserv/Makefile3
-rw-r--r--multimedia/clive1/Makefile3
-rw-r--r--multimedia/dirac/Makefile3
-rw-r--r--multimedia/dumpmpeg/Makefile3
-rw-r--r--multimedia/dv2jpg/Makefile3
-rw-r--r--multimedia/dvbsnoop/Makefile2
-rw-r--r--multimedia/dvd-slideshow/Makefile2
-rw-r--r--multimedia/dvdauthor/Makefile3
-rw-r--r--multimedia/dvdstyler/Makefile3
-rw-r--r--multimedia/emovix/Makefile3
-rw-r--r--multimedia/freevo/Makefile3
-rw-r--r--multimedia/gavl/Makefile2
-rw-r--r--multimedia/gdialog/Makefile3
-rw-r--r--multimedia/gdvrecv/Makefile3
-rw-r--r--multimedia/gmencoder/Makefile3
-rw-r--r--multimedia/gmerlin-avdecoder/Makefile2
-rw-r--r--multimedia/gmimms/Makefile3
-rw-r--r--multimedia/gnome-subtitles/Makefile3
-rw-r--r--multimedia/gopchop/Makefile4
-rw-r--r--multimedia/gpac-libgpac/Makefile3
-rw-r--r--multimedia/gpac-mp4box/Makefile3
-rw-r--r--multimedia/grpplaylist/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-buzztard/Makefile2
-rw-r--r--multimedia/gsubedit/Makefile2
-rw-r--r--multimedia/gxine/Makefile3
-rw-r--r--multimedia/iriverter/Makefile2
-rw-r--r--multimedia/jahshaka/Makefile2
-rw-r--r--multimedia/k9copy-kde4/Makefile3
-rw-r--r--multimedia/k9copy/Makefile3
-rw-r--r--multimedia/kaffeine-mozilla/Makefile2
-rw-r--r--multimedia/kaffeine/Makefile3
-rw-r--r--multimedia/kbtv/Makefile4
-rw-r--r--multimedia/kino/Makefile3
-rw-r--r--multimedia/kmenc15/Makefile3
-rw-r--r--multimedia/ksubeditor/Makefile3
-rw-r--r--multimedia/libdc1394/Makefile2
-rw-r--r--multimedia/libdvdnav/Makefile3
-rw-r--r--multimedia/libfame/Makefile3
-rw-r--r--multimedia/libmovtar/Makefile3
-rw-r--r--multimedia/libmpeg3/Makefile2
-rw-r--r--multimedia/libxine/Makefile2
-rw-r--r--multimedia/libxspf/Makefile3
-rw-r--r--multimedia/linux-xmovie/Makefile2
-rw-r--r--multimedia/lsdvd/Makefile2
-rw-r--r--multimedia/mediainfo/Makefile2
-rw-r--r--multimedia/mjpegtools/Makefile2
-rw-r--r--multimedia/mkxvcd/Makefile3
-rw-r--r--multimedia/mmpython/Makefile2
-rw-r--r--multimedia/motion/Makefile2
-rw-r--r--multimedia/mpgtx/Makefile3
-rw-r--r--multimedia/msdl/Makefile2
-rw-r--r--multimedia/nxtvepg/Makefile2
-rw-r--r--multimedia/openquicktime/Makefile3
-rw-r--r--multimedia/oqtencoder/Makefile3
-rw-r--r--multimedia/oqtplayer/Makefile3
-rw-r--r--multimedia/p5-GStreamer/Makefile3
-rw-r--r--multimedia/projectx/Makefile3
-rw-r--r--multimedia/py-kaa-base/Makefile3
-rw-r--r--multimedia/py-kaa-imlib2/Makefile3
-rw-r--r--multimedia/py-kaa-metadata/Makefile3
-rw-r--r--multimedia/recmpeg/Makefile3
-rw-r--r--multimedia/sabbu/Makefile3
-rw-r--r--multimedia/smplayer-themes/Makefile2
-rw-r--r--multimedia/smplayer/Makefile2
-rw-r--r--multimedia/subtitlecomposer-kde4/Makefile3
-rw-r--r--multimedia/subtitlecomposer/Makefile3
-rw-r--r--multimedia/subtitleripper/Makefile3
-rw-r--r--multimedia/tivodecode/Makefile2
-rw-r--r--multimedia/tovid/Makefile3
-rw-r--r--multimedia/transkode/Makefile2
-rw-r--r--multimedia/tunapie/Makefile2
-rw-r--r--multimedia/xine/Makefile3
-rw-r--r--multimedia/xmms/Makefile2
-rw-r--r--multimedia/xtheater/Makefile2
78 files changed, 82 insertions, 126 deletions
diff --git a/multimedia/atomicparsley/Makefile b/multimedia/atomicparsley/Makefile
index 9082e9852447..9f7c14d80abd 100644
--- a/multimedia/atomicparsley/Makefile
+++ b/multimedia/atomicparsley/Makefile
@@ -9,7 +9,7 @@ PORTNAME= AtomicParsley
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20v${PORTVERSION}
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= baptiste.daroussin@gmail.com
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 08c6dfeb7fe6..125fee9817bf 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 2.4.4
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_BERLIOS} \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= avidemux
+ SF/avidemux/avidemux/${PORTVERSION}
+
DISTNAME= avidemux_${PORTVERSION}
MAINTAINER= amistry@am-productions.biz
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index ed201df2dc51..45096b38aa89 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.7.43
PORTREVISION= 11
PORTEPOCH= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-20050224
DISTNAME= ${PORTNAME}-0.7-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index dd6fd93c95e6..60a8ad9cc1ad 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.9.7.1
PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6
-MASTER_SITES= SF/beepmp
+MASTER_SITES= SF/beepmp/bmp/${PORTVERSION}
DISTNAME= bmp-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index c4c114cf5b7e..8ba0d0be27fd 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.5.1
PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cserv
+MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION}
MAINTAINER= uspoerlein@gmail.com
COMMENT= Camserv is a free program to do streaming video via the web
diff --git a/multimedia/clive1/Makefile b/multimedia/clive1/Makefile
index 38a4a06add9b..90569c577ea8 100644
--- a/multimedia/clive1/Makefile
+++ b/multimedia/clive1/Makefile
@@ -11,7 +11,8 @@ PORTVERSION= 1.0.2
#PORTEPOCH= 0
CATEGORIES= multimedia
MASTER_SITES= http://download.gna.org/clive/1.0.x/ \
- SF
+ SF/${PORTNAME}/${PORTNAME}-1.x/${PORTVERSION}
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= ${PORTNAME}
diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile
index d318b0d98ee3..a4c58747eaca 100644
--- a/multimedia/dirac/Makefile
+++ b/multimedia/dirac/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dirac
PORTVERSION= 1.0.2
PORTREVISION?= 0
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-codec/Dirac-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT?= Open source video codec from the BBC
diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
index 40c84a3a40e5..36db527c04b1 100644
--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -10,8 +10,7 @@ PORTNAME= dumpmpeg
PORTVERSION= 0.6
PORTREVISION= 5
CATEGORIES= multimedia graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Dump frames from mpeg movies
diff --git a/multimedia/dv2jpg/Makefile b/multimedia/dv2jpg/Makefile
index 1e6837c33226..a7ddd0031651 100644
--- a/multimedia/dv2jpg/Makefile
+++ b/multimedia/dv2jpg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dv2jpg
PORTVERSION= 1.1
PORTREVISION= 7
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert Type-2 DV codec-encoded AVI streams to mjpeg-encoded AVI
diff --git a/multimedia/dvbsnoop/Makefile b/multimedia/dvbsnoop/Makefile
index 7de689fc8462..cef7d66d2a4c 100644
--- a/multimedia/dvbsnoop/Makefile
+++ b/multimedia/dvbsnoop/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dvbsnoop
PORTVERSION= 1.4.50
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= fbsd@opal.com
COMMENT= DVB stream analyzer / MPEG analyzer
diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index cfc1ab161a5d..5f0afc3b12cf 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dvd-slideshow
PORTVERSION= 0.8.2
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2
DISTFILES= ${PORTNAME}-${PORTVERSION}-2${EXTRACT_SUFX}
THEMEVERSION= 0.8.0
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 81b86617dfa5..21a512cd84dc 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dvdauthor
PORTVERSION= 0.6.14
PORTREVISION= 3
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pb@FreeBSD.org
COMMENT= Makes a DVD file structure from one or more MPEG2 streams
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 239f5a966140..82abd808e7ce 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -10,8 +10,7 @@ DISTVERSION= 1.5.1_2
PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dvdstyler
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.5.1
DISTNAME= DVDStyler-${DISTVERSION}
MAINTAINER= multimedia@FreeBSD.org
diff --git a/multimedia/emovix/Makefile b/multimedia/emovix/Makefile
index 2be265249fed..5d64d73c61b1 100644
--- a/multimedia/emovix/Makefile
+++ b/multimedia/emovix/Makefile
@@ -8,8 +8,7 @@
PORTNAME= emovix
PORTVERSION= 0.9.0
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= movix
+MASTER_SITES= SF/movix/eMoviX/0.9
MAINTAINER= h.eichmann@gmx.de
COMMENT= A mini linux distro to create bootable video CDs
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index ec49630e240e..2c58ab11b400 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= freevo
PORTVERSION= 1.9.0
CATEGORIES= multimedia
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= freevo
+MASTER_SITES= SF/${PORTNAME}/Freevo%20releases/${PORTVERSION}
MAINTAINER= fbsd@opal.com
COMMENT= Open source digital jukebox
diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index ebcb78233a79..646f20623fb2 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gavl
PORTVERSION= 1.1.1
CATEGORIES= multimedia
-MASTER_SITES= SF/gmerlin
+MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= A library for handling uncompressed video and audio data
diff --git a/multimedia/gdialog/Makefile b/multimedia/gdialog/Makefile
index f1f50e481036..0c34ad7a551b 100644
--- a/multimedia/gdialog/Makefile
+++ b/multimedia/gdialog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gdialog
PORTVERSION= 2.5
CATEGORIES= multimedia java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}-x
+MASTER_SITES= SF/${PORTNAME}-x/${PORTNAME}-090400/${PORTVERSION}
DISTNAME= GDialog-090400-25
MAINTAINER= h.eichmann@gmx.de
diff --git a/multimedia/gdvrecv/Makefile b/multimedia/gdvrecv/Makefile
index 6063fb99768b..417b8cc42bd1 100644
--- a/multimedia/gdvrecv/Makefile
+++ b/multimedia/gdvrecv/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gdvrecv
PORTVERSION= 1.2
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=gdvrecv
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= DV Tools for FreeBSD
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 8f020e0c895c..331b3bf3f954 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gmencoder
PORTVERSION= 0.1.0
PORTREVISION= 11
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= gahr@FreeBSD.org
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 84be7e47cab5..ab064dcf19b4 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gmerlin-avdecoder
PORTVERSION= 1.0.1
CATEGORIES= multimedia
-MASTER_SITES= SF/gmerlin
+MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= General purpose media decoding library
diff --git a/multimedia/gmimms/Makefile b/multimedia/gmimms/Makefile
index f817c277faca..3dc53fe088ea 100644
--- a/multimedia/gmimms/Makefile
+++ b/multimedia/gmimms/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gmimms
DISTVERSION= 0.0.9
PORTREVISION= 2
CATEGORIES= multimedia net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= liu_yinghong@yahoo.com.cn
COMMENT= A frontend to MiMMS (Multimedia Stream ripper)
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index bf243515ce51..23684b10b339 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnome-subtitles
PORTVERSION= 0.8
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Subtitle editor with video preview
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 4fdad0668d75..eaf1066edb52 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -10,9 +10,9 @@ PORTNAME= gopchop
PORTVERSION= 1.0.0
PORTREVISION= 6
CATEGORIES= multimedia
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/GOPchop%20-%20Stable/${PORTVERSION} \
http://outflux.net/unix/software/GOPchop/download/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
DISTNAME= GOPchop-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index 362ce8f98792..19c6931f06c3 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.4.5
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION}
PKGNAMESUFFIX= -libgpac
MAINTAINER= multimedia@FreeBSD.org
diff --git a/multimedia/gpac-mp4box/Makefile b/multimedia/gpac-mp4box/Makefile
index f73169a256d3..f2c30e143573 100644
--- a/multimedia/gpac-mp4box/Makefile
+++ b/multimedia/gpac-mp4box/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mp4box
DISTVERSION= 0.4.5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gpac
+MASTER_SITES= SF/gpac/GPAC/GPAC%20${PORTVERSION}
PKGNAMEPREFIX= gpac-
DISTNAME= gpac-${DISTVERSION}
diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile
index 760ccdc9fdc6..213de5c20a0d 100644
--- a/multimedia/grpplaylist/Makefile
+++ b/multimedia/grpplaylist/Makefile
@@ -8,8 +8,7 @@ PORTNAME= grpplaylist
PORTVERSION= 0.1
PORTREVISION= 6
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= groupplaylist-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/gstreamer-plugins-buzztard/Makefile b/multimedia/gstreamer-plugins-buzztard/Makefile
index d3343662e57e..1524f95a04d3 100644
--- a/multimedia/gstreamer-plugins-buzztard/Makefile
+++ b/multimedia/gstreamer-plugins-buzztard/Makefile
@@ -9,7 +9,7 @@ PORTNAME= buzztard
PORTVERSION= 0.2.0
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20gstreamer%20extensions/${PORTVERSION}
PKGNAMEPREFIX= gstreamer-plugins-
DISTNAME= gst-${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile
index 41b51d7ed951..189ae7ee8949 100644
--- a/multimedia/gsubedit/Makefile
+++ b/multimedia/gsubedit/Makefile
@@ -10,7 +10,7 @@ PORTNAME= GSubEdit
PORTVERSION= 0.4.p1
PORTREVISION= 7
CATEGORIES= multimedia gnome
-MASTER_SITES= SF/${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/0.4pre1
DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/pre/}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 5d3fe5d3393d..bb301d90ea72 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gxine
PORTVERSION= 0.5.904
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= xine
+MASTER_SITES= SF/xine/${PORTNAME}%20%28GTK%20front%20end%29/${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= An alternative GUI for the Xine media player
diff --git a/multimedia/iriverter/Makefile b/multimedia/iriverter/Makefile
index 239c744be9fa..fe103012aee8 100644
--- a/multimedia/iriverter/Makefile
+++ b/multimedia/iriverter/Makefile
@@ -9,7 +9,7 @@ PORTNAME= iriverter
PORTVERSION= 0.16
PORTREVISION= 5
CATEGORIES= multimedia java
-MASTER_SITES= SOURCEFORGE
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Cross-platform frontend to mencoder
diff --git a/multimedia/jahshaka/Makefile b/multimedia/jahshaka/Makefile
index c07fe818408a..6a1b9e320e22 100644
--- a/multimedia/jahshaka/Makefile
+++ b/multimedia/jahshaka/Makefile
@@ -9,7 +9,7 @@ PORTNAME= jahshaka
PORTVERSION= 1.9a9
PORTREVISION= 6
CATEGORIES= multimedia
-MASTER_SITES= SF/${PORTNAME}fx
+MASTER_SITES= SF/${PORTNAME}fx/Jahshaka-source/1.9alpha
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index a960cc4172ca..807ae142eb1b 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -8,8 +8,7 @@ PORTNAME= k9copy
PORTVERSION= 1.0.4
PORTREVISION= 5
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= triosoft@triosoft.com.ua
COMMENT= A DVD-9 to DVD-5 shrinking application for KDE
diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index a960cc4172ca..807ae142eb1b 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -8,8 +8,7 @@ PORTNAME= k9copy
PORTVERSION= 1.0.4
PORTREVISION= 5
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= triosoft@triosoft.com.ua
COMMENT= A DVD-9 to DVD-5 shrinking application for KDE
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index 5ac2f902b262..0fb903817383 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -10,7 +10,7 @@ PORTNAME= kaffeine-mozilla
PORTVERSION= 0.2
PORTREVISION= 10
CATEGORIES= multimedia
-MASTER_SITES= SF/kaffeine
+MASTER_SITES= SF/kaffeine/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Kaffeine Mozilla plugin
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 4f788bfc40e6..12526b115812 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kaffeine
PORTVERSION= 0.8.7
PORTREVISION= 4
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kaffeine
+MASTER_SITES= SF
MAINTAINER= arved@FreeBSD.org
COMMENT= A xine-base multimedia player
diff --git a/multimedia/kbtv/Makefile b/multimedia/kbtv/Makefile
index 1332012376c3..f2d60a6708ba 100644
--- a/multimedia/kbtv/Makefile
+++ b/multimedia/kbtv/Makefile
@@ -9,9 +9,9 @@ PORTNAME= kbtv
DISTVERSION= 1.2.4
PORTREVISION= 5
CATEGORIES= multimedia python kde kld
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://freebsd.ricin.com/ports/distfiles/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
EXTRACT_SUFX= .tbz
MAINTAINER= danny@ricin.com
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 2a09aefc08f9..9c5cc6d2c286 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kino
PORTVERSION= 1.3.3
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pb@FreeBSD.org
COMMENT= A DV non-linear video editor
diff --git a/multimedia/kmenc15/Makefile b/multimedia/kmenc15/Makefile
index a8ed83415009..49490c243e11 100644
--- a/multimedia/kmenc15/Makefile
+++ b/multimedia/kmenc15/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kmenc15
PORTVERSION= 0.04
PORTREVISION= 4
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kmenc15
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE advanced MEncoder frontend, ala, VirtualDub
diff --git a/multimedia/ksubeditor/Makefile b/multimedia/ksubeditor/Makefile
index 168868c27f1d..9b4d46be1b50 100644
--- a/multimedia/ksubeditor/Makefile
+++ b/multimedia/ksubeditor/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.2
PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= multimedia kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME:L}-${PORTVERSION}
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/libdc1394/Makefile b/multimedia/libdc1394/Makefile
index 0191305bcf76..57d4b7d98c2d 100644
--- a/multimedia/libdc1394/Makefile
+++ b/multimedia/libdc1394/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libdc1394
PORTVERSION= 2.1.1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= gslin@gslin.org
COMMENT= 1394-based DC Control Library
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 9e907987945e..6ad7493ad3c6 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libdvdnav
PORTVERSION= 0.1.10
PORTREVISION= 4
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dvd
+MASTER_SITES= SF/dvd/${PORTNAME}/${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= The library for the xine-dvdnav plugin
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index 0e8aa3069d83..caefe24ce86f 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libfame
PORTVERSION= 0.9.1
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fame
+MASTER_SITES= SF/fame/${PORTNAME}/${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= A video encoding library
diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile
index 154d8473f648..0844aa175c3f 100644
--- a/multimedia/libmovtar/Makefile
+++ b/multimedia/libmovtar/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libmovtar
PORTVERSION= 0.1.3
PORTREVISION= 7
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mjpeg
+MASTER_SITES= SF/mjpeg/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Supports reading/writing of MJPEG video in YUV 4:2:2 JPEG
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 423050630cc2..f38f4016d3bb 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libmpeg3
PORTVERSION= 1.8
DISTVERSIONSUFFIX= -src
CATEGORIES= multimedia
-MASTER_SITES= SF/heroines
+MASTER_SITES= SF/heroines/releases/081108
MAINTAINER= ports@FreeBSD.org
COMMENT= Advanced editing and manipulation of MPEG streams
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index e2d5d3d7c8b8..c39ebf17e20f 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xine
PORTVERSION= 1.1.16.3
PORTREVISION= 1
CATEGORIES= multimedia ipv6
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib%20%28${PORTNAME}%20core%29/${PORTVERSION}
PKGNAMEPREFIX= lib
DISTNAME= ${PORTNAME}-lib-${PORTVERSION}
diff --git a/multimedia/libxspf/Makefile b/multimedia/libxspf/Makefile
index d978bfc08d1d..f1f9ae051321 100644
--- a/multimedia/libxspf/Makefile
+++ b/multimedia/libxspf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libxspf
PORTVERSION= 1.2.0
CATEGORIES= multimedia
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=libspiff
+MASTER_SITES= SF/libspiff/Sources/${PORTVERSION}
MAINTAINER= ed@FreeBSD.org
COMMENT= An XSPF parsing library
diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index 8ccba8761c7e..f38c4ea2c3d5 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xmovie
PORTVERSION= 1.9.8.1
PORTREVISION= 3
CATEGORIES= multimedia linux
-MASTER_SITES= SF/heroines
+MASTER_SITES= SF/heroines/releases/021003
PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm
EXTRACT_SUFX=
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 57664eff781c..c370f9cf5942 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -9,7 +9,7 @@ PORTNAME= lsdvd
PORTVERSION= 0.16
PORTREVISION= 4
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20-%20I%20hate%20James%20Blunt
MAINTAINER= pav@FreeBSD.org
COMMENT= Print information about the contents and structure of a DVD
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index dd1dd4046487..f488870c6ccb 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mediainfo
PORTVERSION= 0.7.7.8
DISTVERSIONSUFFIX= _CLI_GNU_FromSource
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/MediaInfo%20-%20Command%20line/${PORTVERSION}
DISTNAME= MediaInfo_${PORTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= freebsd-ports@evilcode.net
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 1ed405f47e36..e962185af495 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mjpegtools
DISTVERSION= 1.9.0rc3
PORTREVISION= 3
CATEGORIES= multimedia
-MASTER_SITES= SF/mjpeg
+MASTER_SITES= SF/mjpeg/OldFiles
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Set of tools to record/playback/edit videos in MPEG format
diff --git a/multimedia/mkxvcd/Makefile b/multimedia/mkxvcd/Makefile
index 94088f060cf3..00e2d83ce6cb 100644
--- a/multimedia/mkxvcd/Makefile
+++ b/multimedia/mkxvcd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mkxvcd
PORTVERSION= 2.0.2
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kvcd4nix
+MASTER_SITES= SF/kvcd4nix/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Makes high quality X/K/S/VCD movies from many formats
diff --git a/multimedia/mmpython/Makefile b/multimedia/mmpython/Makefile
index 59643d8d2e2f..72f953ed9e13 100644
--- a/multimedia/mmpython/Makefile
+++ b/multimedia/mmpython/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mmpython
PORTVERSION= 0.4.10
PORTREVISION= 2
CATEGORIES= multimedia python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 9472d7da3781..149023b9274e 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -8,7 +8,7 @@
PORTNAME= motion
PORTVERSION= 3.2.11.1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%203.2/${PORTVERSION}
PATCH_SITES= http://www.lavrsen.dk/twiki/pub/Motion/FreeBSDPatch/
PATCHFILES= motion-3.2.11.1.port-freebsd.diff.gz
diff --git a/multimedia/mpgtx/Makefile b/multimedia/mpgtx/Makefile
index 6c68e00133ba..09a0c82c5afc 100644
--- a/multimedia/mpgtx/Makefile
+++ b/multimedia/mpgtx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mpgtx
PORTVERSION= 1.3.1
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= A command line MPEG audio/video/system file toolbox
diff --git a/multimedia/msdl/Makefile b/multimedia/msdl/Makefile
index 3ca5a96bc2d8..04afee52eb48 100644
--- a/multimedia/msdl/Makefile
+++ b/multimedia/msdl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= msdl
PORTVERSION= 1.2.4.1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.2.4-r1
DISTNAME= ${PORTNAME}-1.2.4-r1
MAINTAINER= wahjava@gmail.com
diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile
index f5419bbb4de7..7fdc9608dd0b 100644
--- a/multimedia/nxtvepg/Makefile
+++ b/multimedia/nxtvepg/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nxtvepg
PORTVERSION= 2.7.6
PORTREVISION= 2
CATEGORIES= multimedia tcl tk
-MASTER_SITES= SF/${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Viewer for Nextview Electronic TV Programme Guide (needs bktr driver)
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index 485d73a7c944..cb746f2e8502 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openquicktime
PORTVERSION= 1.0
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openquicktime
+MASTER_SITES= SF/${PORTNAME}/OpenQuicktime%20v1/${PORTVERSION}b
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/multimedia/oqtencoder/Makefile b/multimedia/oqtencoder/Makefile
index 78e7123d578c..715c8da183a4 100644
--- a/multimedia/oqtencoder/Makefile
+++ b/multimedia/oqtencoder/Makefile
@@ -9,8 +9,7 @@ PORTNAME= OQTEncoder
PORTVERSION= 0.1
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openquicktime
+MASTER_SITES= SF/openquicktime/OpenQuicktime%20v1/1.0b
DISTNAME= ${PORTNAME:L}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile
index a1c8c8d6b8ca..6f861846148c 100644
--- a/multimedia/oqtplayer/Makefile
+++ b/multimedia/oqtplayer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= OQTPlayer
PORTVERSION= 0.5
PORTREVISION= 8
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openquicktime
+MASTER_SITES= SF/openquicktime/OpenQuicktime%20v1/1.0b
DISTNAME= ${PORTNAME:L}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/multimedia/p5-GStreamer/Makefile b/multimedia/p5-GStreamer/Makefile
index a615fd008af7..43cbf0445169 100644
--- a/multimedia/p5-GStreamer/Makefile
+++ b/multimedia/p5-GStreamer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GStreamer
PORTVERSION= 0.09
PORTREVISION= 2
CATEGORIES= multimedia perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtk2-perl
+MASTER_SITES= SF/gtk2-perl/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= p5-
MAINTAINER= multimedia@FreeBSD.org
diff --git a/multimedia/projectx/Makefile b/multimedia/projectx/Makefile
index 7cdc47fd4d55..6eb7e351eda4 100644
--- a/multimedia/projectx/Makefile
+++ b/multimedia/projectx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= projectx
PORTVERSION= 0.90.4.00
PORTREVISION= 2
CATEGORIES= multimedia java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= project-x
+MASTER_SITES= SF/project-x/project-x/ProjectX_Source_${PORTVERSION}
DISTNAME= ProjectX_Source_${PORTVERSION}
DISTFILES= ProjectX_Source_eng_${PORTVERSION}${EXTRACT_SUFX} \
ProjectX_LanguagePack_${PORTVERSION}${EXTRACT_SUFX}
diff --git a/multimedia/py-kaa-base/Makefile b/multimedia/py-kaa-base/Makefile
index 196ae03cec00..4e0f5cf3ef69 100644
--- a/multimedia/py-kaa-base/Makefile
+++ b/multimedia/py-kaa-base/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kaa-base
PORTVERSION= 0.6.0
PORTREVISION= 1
CATEGORIES= multimedia python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= freevo
+MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= fbsd@opal.com
diff --git a/multimedia/py-kaa-imlib2/Makefile b/multimedia/py-kaa-imlib2/Makefile
index 0d35705ba03f..4edcc00f1718 100644
--- a/multimedia/py-kaa-imlib2/Makefile
+++ b/multimedia/py-kaa-imlib2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kaa-imlib2
PORTVERSION= 0.2.3
PORTREVISION= 2
CATEGORIES= multimedia python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= freevo
+MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= fbsd@opal.com
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile
index bc4aec092a14..745867f93fca 100644
--- a/multimedia/py-kaa-metadata/Makefile
+++ b/multimedia/py-kaa-metadata/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kaa-metadata
PORTVERSION= 0.7.6
PORTREVISION= 1
CATEGORIES= multimedia python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= freevo
+MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= fbsd@opal.com
diff --git a/multimedia/recmpeg/Makefile b/multimedia/recmpeg/Makefile
index 5e8ee45786e3..1a98add52c29 100644
--- a/multimedia/recmpeg/Makefile
+++ b/multimedia/recmpeg/Makefile
@@ -10,8 +10,7 @@ PORTNAME= recmpeg
PORTVERSION= 1.0.5
PORTREVISION= 1
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fame
+MASTER_SITES= SF/fame/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple video encoder
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index b7936a69fe04..f473b0dfde3b 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sabbu
PORTVERSION= 0.3.0
PORTREVISION= 5
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Sabbu%20${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Program used to time subtitles
diff --git a/multimedia/smplayer-themes/Makefile b/multimedia/smplayer-themes/Makefile
index 2b22768cd903..11687628a46b 100644
--- a/multimedia/smplayer-themes/Makefile
+++ b/multimedia/smplayer-themes/Makefile
@@ -8,7 +8,7 @@
PORTNAME= smplayer-themes
PORTVERSION= 0.1.19
CATEGORIES= multimedia audio kde
-MASTER_SITES= SF/smplayer
+MASTER_SITES= SF/smplayer/SMPlayer-themes/${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= Themes for smplayer
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index eadc7b1e9d27..49cf2b9b9299 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= smplayer
DISTVERSION= 0.6.8
CATEGORIES= multimedia audio kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/SMPlayer/${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= A complete front-end based on QT4 for mplayer
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index 96335272249a..3e1985a92a73 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -8,8 +8,7 @@
PORTNAME= subtitlecomposer
PORTVERSION= 0.5.3
CATEGORIES= multimedia kde
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=subcomposer
+MASTER_SITES= SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= Subtitle editor for KDE
diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
index b188651a5cc5..b16bb9dbe801 100644
--- a/multimedia/subtitlecomposer/Makefile
+++ b/multimedia/subtitlecomposer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= subtitlecomposer
PORTVERSION= 0.4.3
PORTREVISION= 2
CATEGORIES= multimedia
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=subcomposer
+MASTER_SITES= SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= Subtitle editor for KDE
diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile
index 52cdbe03897c..13a2c3bad640 100644
--- a/multimedia/subtitleripper/Makefile
+++ b/multimedia/subtitleripper/Makefile
@@ -9,8 +9,7 @@ PORTNAME= subtitleripper
DISTVERSION= 0.3-4
PORTREVISION= 3
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.3-4
EXTRACT_SUFX= .tgz
MAINTAINER= multimedia@FreeBSD.org
diff --git a/multimedia/tivodecode/Makefile b/multimedia/tivodecode/Makefile
index 45524c15b2e2..5b20036f163f 100644
--- a/multimedia/tivodecode/Makefile
+++ b/multimedia/tivodecode/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tivodecode
DISTVERSION= 0.2pre4
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.2pre4
MAINTAINER= mhsin@mhsin.org
COMMENT= Converts .TiVo files to normal MPEG files
diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index 7b9656c3abc4..a78d9253657e 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tovid
PORTVERSION= 0.30
PORTREVISION= 6
CATEGORIES= multimedia python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tovid
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
PATCH_SITES= http://tovid.sourceforge.net/download/patches/
PATCHFILES= tovid-0.30.2.patch.gz
diff --git a/multimedia/transkode/Makefile b/multimedia/transkode/Makefile
index fc0ac17f0422..ac310ec4d64c 100644
--- a/multimedia/transkode/Makefile
+++ b/multimedia/transkode/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.7
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= multimedia audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A KDE/Qt based frontend for various audio transcoding tools
diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile
index 9736fdaaf9e4..7dc7335a252a 100644
--- a/multimedia/tunapie/Makefile
+++ b/multimedia/tunapie/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tunapie
PORTVERSION= 2.1.17
PORTREVISION= 1
CATEGORIES= multimedia audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.1
DISTNAME= ${PORTNAME}-${PORTVERSION:S,.r,rc,}
MAINTAINER= nivit@FreeBSD.org
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 112aaa555f72..a3931c9235fa 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xine
PORTVERSION= 0.99.5
PORTREVISION= 4
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui%20%28skinned%20front%20end%29/${PORTVERSION}
DISTNAME= ${PORTNAME}-ui-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index e0d1748c9b0d..a50144d48edb 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.if defined(WITH_RUSXMMS_PATCHES)
ENC_PATCHLEVEL= 41
DISTFILES+= RusXMMS2-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
+MASTER_SITES+= SF/rusxmms/rusxmms2/csa41%20%28${PORTVERSION}%29:enc
MASTER_SITE_SUBDIR+= rusxmms/:enc
LIB_DEPENDS+= rcc.2:${PORTSDIR}/devel/librcc
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index e34e24ad5ad2..2c56054a0361 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -11,7 +11,7 @@ PORTVERSION= 1.0.0.p1
PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Xtheater/1.0.0-pre1
DISTNAME= Xtheater-${PORTVERSION:S/.p/-pre/}
MAINTAINER= ports@FreeBSD.org