aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/py-papi/Makefile2
-rw-r--r--arabic/ae_fonts_mono/Makefile3
-rw-r--r--arabic/ae_fonts_ttf/Makefile3
-rw-r--r--arabic/kacst_fonts/Makefile2
-rw-r--r--arabic/libitl/Makefile3
-rw-r--r--archivers/advancecomp/Makefile3
-rw-r--r--archivers/arc/Makefile3
-rw-r--r--archivers/arj/Makefile2
-rw-r--r--archivers/jzip.org/Makefile3
-rw-r--r--archivers/libcomprex/Makefile3
-rw-r--r--archivers/libdynamite/Makefile3
-rw-r--r--archivers/liborange/Makefile3
-rw-r--r--archivers/libpar2/Makefile3
-rw-r--r--archivers/librtfcomp/Makefile3
-rw-r--r--archivers/par2cmdline/Makefile3
-rw-r--r--archivers/parchive/Makefile3
-rw-r--r--archivers/ppmd-7z/Makefile2
-rw-r--r--archivers/rox-archive/Makefile3
-rw-r--r--archivers/ruby-zip/Makefile3
-rw-r--r--archivers/sectar/Makefile3
-rw-r--r--archivers/tardy/Makefile3
-rw-r--r--archivers/torrentzip/Makefile3
-rw-r--r--archivers/unshield/Makefile3
-rw-r--r--archivers/unzip/Makefile3
-rw-r--r--archivers/xarchive/Makefile2
-rw-r--r--archivers/zip/Makefile3
-rw-r--r--astro/accrete/Makefile3
-rw-r--r--astro/celestia/Makefile2
-rw-r--r--astro/gaia/Makefile3
-rw-r--r--astro/gkrellmoon2/Makefile3
-rw-r--r--astro/glunarclock/Makefile3
-rw-r--r--astro/jday/Makefile3
-rw-r--r--astro/libnova/Makefile2
-rw-r--r--astro/libroadnav/Makefile3
-rw-r--r--astro/openuniverse/Makefile2
-rw-r--r--astro/orsa/Makefile2
-rw-r--r--astro/pp3/Makefile3
-rw-r--r--astro/ptiger/Makefile3
-rw-r--r--astro/qlandkartegt/Makefile2
-rw-r--r--astro/roadmap/Makefile4
-rw-r--r--astro/roadnav/Makefile2
-rw-r--r--astro/sky2000/Makefile3
-rw-r--r--astro/stellarium/Makefile2
-rw-r--r--astro/tclgeomap/Makefile2
-rw-r--r--astro/xeartk/Makefile3
-rw-r--r--astro/xphoon/Makefile2
-rw-r--r--audio/Maaate/Makefile3
-rw-r--r--audio/ample/Makefile3
-rw-r--r--audio/aqualung/Makefile2
-rw-r--r--audio/atunes/Makefile2
-rw-r--r--audio/audacity-devel/Makefile2
-rw-r--r--audio/aumix/Makefile5
-rw-r--r--audio/bebocd/Makefile2
-rw-r--r--audio/blop/Makefile3
-rw-r--r--audio/cantus_3/Makefile2
-rw-r--r--audio/ccaudio/Makefile3
-rw-r--r--audio/cddb-bundle/Makefile3
-rw-r--r--audio/cheesetracker/Makefile2
-rw-r--r--audio/cmp3/Makefile3
-rw-r--r--audio/dcd/Makefile2
-rw-r--r--audio/drumpiler/Makefile3
-rw-r--r--audio/dssi/Makefile3
-rw-r--r--audio/dvda-author/Makefile3
-rw-r--r--audio/easytag-devel/Makefile3
-rw-r--r--audio/easytag/Makefile3
-rw-r--r--audio/epos-devel/Makefile3
-rw-r--r--audio/espeak/Makefile2
-rw-r--r--audio/etktab/Makefile3
-rw-r--r--audio/extace/Makefile2
-rw-r--r--audio/flac/Makefile3
-rw-r--r--audio/flac123/Makefile2
-rw-r--r--audio/fluidsynth-dssi/Makefile3
-rw-r--r--audio/gdam/Makefile3
-rw-r--r--audio/gervill/Makefile2
-rw-r--r--audio/glurp/Makefile3
-rw-r--r--audio/gnapster/Makefile2
-rw-r--r--audio/gnuitar/Makefile3
-rw-r--r--audio/gnustep-cdplayer/Makefile3
-rw-r--r--audio/gqmpeg-devel/Makefile3
-rw-r--r--audio/gqmpeg/Makefile3
-rw-r--r--audio/gqradio/Makefile2
-rw-r--r--audio/gsi/Makefile3
-rw-r--r--audio/gspeakers/Makefile2
-rw-r--r--audio/gtkpod/Makefile3
-rw-r--r--audio/hexter/Makefile3
-rw-r--r--audio/hydrogen/Makefile2
-rw-r--r--audio/icegenerator/Makefile2
-rw-r--r--audio/id3v2/Makefile3
-rw-r--r--audio/ifp-line/Makefile3
-rw-r--r--audio/jack-keyboard/Makefile3
-rw-r--r--audio/jack-rack/Makefile2
-rw-r--r--audio/jack-smf-utils/Makefile3
-rw-r--r--audio/jamin/Makefile3
-rw-r--r--audio/jid3lib/Makefile3
-rw-r--r--audio/jmusic/Makefile2
-rw-r--r--audio/jxm/Makefile3
-rw-r--r--audio/kexis/Makefile2
-rw-r--r--audio/ksmp3play/Makefile2
-rw-r--r--audio/lame/Makefile4
-rw-r--r--audio/libaiff/Makefile2
-rw-r--r--audio/libcdaudio/Makefile3
-rw-r--r--audio/libcddb-doc/Makefile3
-rw-r--r--audio/libcddb/Makefile3
-rw-r--r--audio/libgpod/Makefile2
-rw-r--r--audio/libid3tag/Makefile4
-rw-r--r--audio/liblo/Makefile3
-rw-r--r--audio/libmad/Makefile4
-rw-r--r--audio/libmodplug/Makefile3
-rw-r--r--audio/libmp3splt/Makefile3
-rw-r--r--audio/libmtp/Makefile3
-rw-r--r--audio/libnoise/Makefile2
-rw-r--r--audio/libsidplay2/Makefile3
-rw-r--r--audio/madman/Makefile3
-rw-r--r--audio/madplay/Makefile4
-rw-r--r--audio/mctoolame-decoder/Makefile3
-rw-r--r--audio/mctoolame-encoder/Makefile3
-rw-r--r--audio/midimountain/Makefile4
-rw-r--r--audio/mixxx/Makefile3
-rw-r--r--audio/mp3_check/Makefile3
-rw-r--r--audio/mp3asm/Makefile3
-rw-r--r--audio/mp3blaster/Makefile3
-rw-r--r--audio/mp3ck/Makefile3
-rw-r--r--audio/mp3gain/Makefile3
-rw-r--r--audio/mp3mover/Makefile3
-rw-r--r--audio/mp3towav-bundle/Makefile3
-rw-r--r--audio/mp3wrap/Makefile3
-rw-r--r--audio/mpc/Makefile2
-rw-r--r--audio/mpdcon/Makefile3
-rw-r--r--audio/mpdscribble/Makefile2
-rw-r--r--audio/mpg123/Makefile2
-rw-r--r--audio/mpg321/Makefile3
-rw-r--r--audio/mpiosh/Makefile2
-rw-r--r--audio/mumble/Makefile2
-rw-r--r--audio/musicbox-tag-editor/Makefile2
-rw-r--r--audio/musicpd/Makefile2
-rw-r--r--audio/napster/Makefile3
-rw-r--r--audio/nas/Makefile2
-rw-r--r--audio/ncmpc/Makefile2
-rw-r--r--audio/nosefart/Makefile3
-rw-r--r--audio/opencore-amr/Makefile2
-rw-r--r--audio/opmixer/Makefile2
-rw-r--r--audio/osalp/Makefile2
-rw-r--r--audio/p5-tagged/Makefile6
-rw-r--r--audio/playmidi/Makefile3
-rw-r--r--audio/pocketsphinx/Makefile3
-rw-r--r--audio/py-apetag/Makefile2
-rw-r--r--audio/py-cddb/Makefile3
-rw-r--r--audio/py-id3/Makefile3
-rw-r--r--audio/py-karaoke/Makefile3
-rw-r--r--audio/q-audio/Makefile2
-rw-r--r--audio/qjackctl/Makefile3
-rw-r--r--audio/qsynth/Makefile3
-rw-r--r--audio/raop_play/Makefile3
-rw-r--r--audio/rawrec/Makefile7
-rw-r--r--audio/rezound/Makefile3
-rw-r--r--audio/rio500/Makefile3
-rw-r--r--audio/ripperx/Makefile1
-rw-r--r--audio/ruby-audiofile/Makefile3
-rw-r--r--audio/sidplay2/Makefile3
-rw-r--r--audio/slimserver-slimscrobbler/Makefile3
-rw-r--r--audio/solfege/Makefile2
-rw-r--r--audio/sphinx/Makefile3
-rw-r--r--audio/sphinx3/Makefile3
-rw-r--r--audio/sphinxbase/Makefile3
-rw-r--r--audio/spiralsynthmodular/Makefile3
-rw-r--r--audio/streamripper/Makefile3
-rw-r--r--audio/tap-plugins/Makefile3
-rw-r--r--audio/timidity++/Makefile3
-rw-r--r--audio/toolame/Makefile3
-rw-r--r--audio/tse3/Makefile2
-rw-r--r--audio/tta/Makefile2
-rw-r--r--audio/tuxguitar/Makefile5
-rw-r--r--audio/twolame/Makefile4
-rw-r--r--audio/ufmcontrol-i18n/Makefile3
-rw-r--r--audio/umix/Makefile3
-rw-r--r--audio/umodplayer/Makefile2
-rw-r--r--audio/wmalbum/Makefile3
-rw-r--r--audio/xmms-a52dec/Makefile3
-rw-r--r--audio/xmms-curses/Makefile2
-rw-r--r--audio/xmms-defx/Makefile3
-rw-r--r--audio/xmms-efxmms/Makefile3
-rw-r--r--audio/xmms-eq/Makefile3
-rw-r--r--audio/xmms-flac/Makefile2
-rw-r--r--audio/xmms-fxt/Makefile3
-rw-r--r--audio/xmms-jack/Makefile2
-rw-r--r--audio/xmms-osssurround/Makefile3
-rw-r--r--audio/xmms-tfmx/Makefile3
-rw-r--r--audio/xmms-volnorm/Makefile3
-rw-r--r--audio/xmms2/Makefile2
-rw-r--r--audio/xmp/Makefile3
-rw-r--r--audio/xoscope/Makefile3
-rw-r--r--audio/xsynth-dssi/Makefile3
-rw-r--r--audio/yammi/Makefile3
-rw-r--r--audio/yamt/Makefile4
-rw-r--r--audio/zynaddsubfx/Makefile3
195 files changed, 210 insertions, 333 deletions
diff --git a/accessibility/py-papi/Makefile b/accessibility/py-papi/Makefile
index 132d05ee7824..67150ce3822f 100644
--- a/accessibility/py-papi/Makefile
+++ b/accessibility/py-papi/Makefile
@@ -8,7 +8,7 @@
PORTNAME= papi
PORTVERSION= 0.0.9
CATEGORIES= accessibility devel python
-MASTER_SITES= SF/ocemp
+MASTER_SITES= SF/ocemp/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mva@FreeBSD.org
diff --git a/arabic/ae_fonts_mono/Makefile b/arabic/ae_fonts_mono/Makefile
index bf617bb26405..8015ff362b2c 100644
--- a/arabic/ae_fonts_mono/Makefile
+++ b/arabic/ae_fonts_mono/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ae_fonts_mono
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= arabic
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= arabeyes
+MASTER_SITES= SF/arabeyes/Fonts/ae_fonts
DISTNAME= ae_fonts_mono
MAINTAINER= ports@FreeBSD.org
diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile
index b7a9e76b8b29..68e2309edd05 100644
--- a/arabic/ae_fonts_ttf/Makefile
+++ b/arabic/ae_fonts_ttf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ae_fonts1_ttf
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= arabic x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= arabeyes
+MASTER_SITES= SF/arabeyes/Fonts/ae_fonts
DISTNAME= ae_fonts1_ttf_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/arabic/kacst_fonts/Makefile b/arabic/kacst_fonts/Makefile
index a7047fd27964..97211a836edd 100644
--- a/arabic/kacst_fonts/Makefile
+++ b/arabic/kacst_fonts/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kacst_fonts
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= arabic
-MASTER_SITES= SF/arabeyes
+MASTER_SITES= SF/arabeyes/Fonts/${PORTNAME}
DISTNAME= kacst_fonts_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/arabic/libitl/Makefile b/arabic/libitl/Makefile
index f8bce950b81a..30e2a4278a0d 100644
--- a/arabic/libitl/Makefile
+++ b/arabic/libitl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libitl
PORTVERSION= 0.6.3
CATEGORIES= arabic
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= arabeyes
+MASTER_SITES= SF/arabeyes/ITL%20Library%20%28${PORTNAME}%29/lib-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An API abstraction to common Islamic calculations
diff --git a/archivers/advancecomp/Makefile b/archivers/advancecomp/Makefile
index ad983196328e..66d764218965 100644
--- a/archivers/advancecomp/Makefile
+++ b/archivers/advancecomp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= advancecomp
PORTVERSION= 1.15
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= advancemame
+MASTER_SITES= SF/advancemame/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Recompression utilities for .ZIP, .PNG, .MNG and .GZ files
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 75fb85cf41fe..a2b54df2f120 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= arc
PORTVERSION= 5.21o
PORTREVISION= 1
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ache@FreeBSD.org
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index a11af22169f2..da2c6d9fc0c3 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -9,7 +9,7 @@ PORTNAME= arj
PORTVERSION= 3.10.22
PORTREVISION= 1
CATEGORIES= archivers
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.78_3.10%20build%2022
MAINTAINER= garga@FreeBSD.org
COMMENT= Open-source ARJ
diff --git a/archivers/jzip.org/Makefile b/archivers/jzip.org/Makefile
index 08824f5f1311..d68becd262a8 100644
--- a/archivers/jzip.org/Makefile
+++ b/archivers/jzip.org/Makefile
@@ -10,8 +10,7 @@ PORTNAME= jzip.org
PORTVERSION= 0.2.0
PORTREVISION= 2
CATEGORIES= archivers java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jzipdotorg
+MASTER_SITES= SF/jzipdotorg/jzipdotorg/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}.src
MAINTAINER= ports@FreeBSD.org
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index f0bd6afdf877..00a80d5565e1 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libcomprex
PORTVERSION= 0.3.3
PORTREVISION= 7
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnupdate
+MASTER_SITES= SF/gnupdate/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Transparently handles automatic compression and decompression of files
diff --git a/archivers/libdynamite/Makefile b/archivers/libdynamite/Makefile
index 693501480550..ddc9c70c7e79 100644
--- a/archivers/libdynamite/Makefile
+++ b/archivers/libdynamite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libdynamite
PORTVERSION= 0.1.1
CATEGORIES= archivers
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= synce
+MASTER_SITES= SF/synce/Dynamite/${PORTVERSION}
MAINTAINER= avl@FreeBSD.org
COMMENT= Decompress data compressed with PKWARE Data Compression Library
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index f467762f16d3..b3a85af31abd 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -8,8 +8,7 @@
PORTNAME= liborange
PORTVERSION= 0.4
CATEGORIES= archivers
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= synce
+MASTER_SITES= SF/synce/Orange/${PORTVERSION}
MAINTAINER= avl@FreeBSD.org
COMMENT= Library to extract CAB files from self-extracting installers
diff --git a/archivers/libpar2/Makefile b/archivers/libpar2/Makefile
index a76ea8079b85..407d746626e6 100644
--- a/archivers/libpar2/Makefile
+++ b/archivers/libpar2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libpar2
PORTVERSION= 0.2
PORTREVISION= 2
CATEGORIES= archivers
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= parchive
+MASTER_SITES= SF/parchive/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= toxic@doobie.com
diff --git a/archivers/librtfcomp/Makefile b/archivers/librtfcomp/Makefile
index 13f57282c2e8..12682f44d4dd 100644
--- a/archivers/librtfcomp/Makefile
+++ b/archivers/librtfcomp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= librtfcomp
PORTVERSION= 1.1
CATEGORIES?= archivers
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= synce
+MASTER_SITES= SF/synce/SynCE/0.10.0
MAINTAINER= avl@FreeBSD.org
COMMENT?= LZRTF compression library
diff --git a/archivers/par2cmdline/Makefile b/archivers/par2cmdline/Makefile
index 68c838313212..e15fc1e52a9d 100644
--- a/archivers/par2cmdline/Makefile
+++ b/archivers/par2cmdline/Makefile
@@ -9,8 +9,7 @@ PORTNAME= par2cmdline
PORTVERSION= 0.4
PORTREVISION= 2
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= parchive
+MASTER_SITES= SF/parchive/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ganael.laplanche@martymac.com
diff --git a/archivers/parchive/Makefile b/archivers/parchive/Makefile
index b3be790762e7..5cf19e22f5ff 100644
--- a/archivers/parchive/Makefile
+++ b/archivers/parchive/Makefile
@@ -8,8 +8,7 @@
PORTNAME= parchive
PORTVERSION= 1.1
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/par/${PORTVERSION}
DISTNAME= par-v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/archivers/ppmd-7z/Makefile b/archivers/ppmd-7z/Makefile
index e052e1d8f735..17e20e637d25 100644
--- a/archivers/ppmd-7z/Makefile
+++ b/archivers/ppmd-7z/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ppmd
PORTVERSION= 4.65
CATEGORIES= archivers
-MASTER_SITES= SF/p7zip
+MASTER_SITES= SF/p7zip/p7zip/${PORTVERSION}
PKGNAMESUFFIX= -7z
DISTNAME= p7zip_${DISTVERSION}_src_all
diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile
index 0455dec30f92..3a23350227b9 100644
--- a/archivers/rox-archive/Makefile
+++ b/archivers/rox-archive/Makefile
@@ -8,8 +8,7 @@
PORTNAME= rox-archive
PORTVERSION= 2.2
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rox
+MASTER_SITES= SF/rox/Archive/${PORTVERSION}
DISTNAME= archive-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
diff --git a/archivers/ruby-zip/Makefile b/archivers/ruby-zip/Makefile
index d7489791234f..c47c862c8c09 100644
--- a/archivers/ruby-zip/Makefile
+++ b/archivers/ruby-zip/Makefile
@@ -8,8 +8,7 @@
PORTNAME= zip
PORTVERSION= 0.9.1
CATEGORIES= archivers ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ruby${PORTNAME}
+MASTER_SITES= SF/ruby${PORTNAME}/ruby${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ruby${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/archivers/sectar/Makefile b/archivers/sectar/Makefile
index b234ee46ef0e..f9def78315ce 100644
--- a/archivers/sectar/Makefile
+++ b/archivers/sectar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sectar
PORTVERSION= 1.02
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= star
+MASTER_SITES= SF/star/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A program to create encrypted tar archives
diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile
index ff199f4546e1..d4aa9bb0da4d 100644
--- a/archivers/tardy/Makefile
+++ b/archivers/tardy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tardy
PORTVERSION= 1.17
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Manipulate the file headers in tar archive files in various ways
diff --git a/archivers/torrentzip/Makefile b/archivers/torrentzip/Makefile
index 64a0d956222f..5a95a19634e1 100644
--- a/archivers/torrentzip/Makefile
+++ b/archivers/torrentzip/Makefile
@@ -9,8 +9,7 @@ PORTNAME= torrentzip
PORTVERSION= 0.2
PORTREVISION= 2
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= trrntzip
+MASTER_SITES= SF/trrntzip/trrntzip/TorrentZip%20v${PORTVERSION}
DISTNAME= trrntzip_v${PORTVERSION:S/.//}_src
MAINTAINER= swhetzel@gmail.com
diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile
index 521bf67432a4..b1dd062c48fd 100644
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@@ -8,8 +8,7 @@
PORTNAME= unshield
PORTVERSION= 0.5.1
CATEGORIES= archivers
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=synce
+MASTER_SITES= SF/synce/Unshield/${PORTVERSION}
MAINTAINER= sunpoet@sunpoet.net
COMMENT= Extract data from InstallShield CAB files
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 1f9bdcde46a2..d3ac72614119 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -9,8 +9,7 @@ PORTNAME= unzip
PORTVERSION= 5.52
PORTREVISION= 5
CATEGORIES?= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= infozip
+MASTER_SITES= SF/infozip/UnZip%205.x%20and%20earlier/${PORTVERSION}
DISTNAME= ${PORTNAME}552
MAINTAINER?= ache@FreeBSD.org
diff --git a/archivers/xarchive/Makefile b/archivers/xarchive/Makefile
index f32cd6b3cbc7..4634ab9db835 100644
--- a/archivers/xarchive/Makefile
+++ b/archivers/xarchive/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xarchive
PORTVERSION= 0.2.8.6
PORTREVISION= 4
CATEGORIES= archivers
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.2.8-6
DISTNAME= ${PORTNAME}-0.2.8-6
MAINTAINER= mark@mkproductions.org
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index be255dcbbf9f..c0c9a895d361 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -8,8 +8,7 @@
PORTNAME= zip
PORTVERSION= 3.0
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= infozip
+MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION}
DISTFILES= ${PORTNAME}30${EXTRACT_SUFX}
USE_ZIP= yes
diff --git a/astro/accrete/Makefile b/astro/accrete/Makefile
index 52e24d423219..a4f78e8148d6 100644
--- a/astro/accrete/Makefile
+++ b/astro/accrete/Makefile
@@ -7,8 +7,7 @@
PORTNAME= accrete
PORTVERSION= 1.0
CATEGORIES= astro
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= chuck@pkix.net
COMMENT= Accrete is a physical simulation of solar system planet formation
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 58f6e55a6c63..2b23a0a6b365 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -8,7 +8,7 @@
PORTNAME= celestia
PORTVERSION= 1.6.0
CATEGORIES= astro
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Celestia-source/${PORTVERSION}
PKGNAMESUFFIX= -${CELESTIA_UI}
MAINTAINER= danfe@FreeBSD.org
diff --git a/astro/gaia/Makefile b/astro/gaia/Makefile
index aed0060862ce..80f42055518a 100644
--- a/astro/gaia/Makefile
+++ b/astro/gaia/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gaia
PORTVERSION= 0.1.2
PORTREVISION= 6
CATEGORIES= astro
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gaia-clean
+MASTER_SITES= SF/${PORTNAME}-clean/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Display geographic maps with optional GPS tracking support
diff --git a/astro/gkrellmoon2/Makefile b/astro/gkrellmoon2/Makefile
index 2928d9bc41cc..2281c733b882 100644
--- a/astro/gkrellmoon2/Makefile
+++ b/astro/gkrellmoon2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gkrellmoon2
PORTVERSION= 0.6
PORTREVISION= 6
CATEGORIES= astro
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gkrellmoon
+MASTER_SITES= SF/gkrellmoon/gkrellmoon/${PORTVERSION}
DISTNAME= gkrellmoon-${PORTVERSION}
MAINTAINER= w@wrzask.pl
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index a95c924355bd..f5739600fbbb 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -10,8 +10,7 @@ PORTNAME= glunarclock
PORTVERSION= 0.32.4
PORTREVISION= 8
CATEGORIES= astro gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME applet that displays the current phase of the Moon
diff --git a/astro/jday/Makefile b/astro/jday/Makefile
index 151aba42e900..f641f00c80b5 100644
--- a/astro/jday/Makefile
+++ b/astro/jday/Makefile
@@ -7,8 +7,7 @@
PORTNAME= jday
PORTVERSION= 2.4
CATEGORIES= astro
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Astronomical julian date calculator
diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile
index 60fa99fe5b54..03d9f7eb949b 100644
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libnova
PORTVERSION= 0.13.0
CATEGORIES= astro
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V%20${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
COMMENT= Astronomical Calculation Library
diff --git a/astro/libroadnav/Makefile b/astro/libroadnav/Makefile
index 83f60cb42c6f..67c6bbaee3b4 100644
--- a/astro/libroadnav/Makefile
+++ b/astro/libroadnav/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libroadnav
PORTVERSION= 0.19
PORTREVISION= 1
CATEGORIES= astro geography
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=roadnav
+MASTER_SITES= SF/roadnav/LibRoadnav/${PORTVERSION}
MAINTAINER= bahamasfranks@gmail.com
COMMENT= Helper library for Roadnav: A 3D GPS Mapping program
diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile
index b9a00295cba2..91f4921e55fa 100644
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@@ -9,7 +9,7 @@ PORTNAME= openuniverse
DISTVERSION= 1.0beta3
PORTREVISION= 6
CATEGORIES= astro
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0beta3
MAINTAINER= ports@FreeBSD.org
COMMENT= OpenGL Solar System simulator for X Window System
diff --git a/astro/orsa/Makefile b/astro/orsa/Makefile
index 50ddf612eaf9..5047b8ce8fc3 100644
--- a/astro/orsa/Makefile
+++ b/astro/orsa/Makefile
@@ -10,7 +10,7 @@ PORTNAME= orsa
PORTVERSION= 0.7.0
PORTREVISION= 11
CATEGORIES= astro
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Orbit Reconstruction, Simulation and Analysis
diff --git a/astro/pp3/Makefile b/astro/pp3/Makefile
index b20a6d103a18..6b05f691b6ab 100644
--- a/astro/pp3/Makefile
+++ b/astro/pp3/Makefile
@@ -10,8 +10,7 @@ PORTNAME= pp3
PORTVERSION= 1.3.3
PORTREVISION= 1
CATEGORIES= astro
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/PP3/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Creates celestial charts
diff --git a/astro/ptiger/Makefile b/astro/ptiger/Makefile
index 9fc79540c6bf..9744df479275 100644
--- a/astro/ptiger/Makefile
+++ b/astro/ptiger/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ptiger
PORTVERSION= 2.2
PORTREVISION= 3
CATEGORIES= astro tk
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tkgeomap
+MASTER_SITES= SF/tkgeomap/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Displays U.S. Census Burea populated places on a map
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index 50027acde808..0b3752c79681 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qlandkartegt
PORTVERSION= 0.14.1
CATEGORIES= astro
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION}
MAINTAINER= freebsd@levsha.org.ua
COMMENT= The ultimate outdoor aficionado's tool
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
index 4c427a4617d4..b2e7a9698bf8 100644
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 1.0.6
PORTREVISION= 5
CATEGORIES= astro geography
MASTER_SITES= http://roadmap.digitalomaha.net/roadmap/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF/${PORTNAME}/OldFiles
+
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/:S/./_/g}_src
MAINTAINER= ports@FreeBSD.org
diff --git a/astro/roadnav/Makefile b/astro/roadnav/Makefile
index e2ef7e55b5d8..7a42964e34c2 100644
--- a/astro/roadnav/Makefile
+++ b/astro/roadnav/Makefile
@@ -10,7 +10,7 @@ PORTNAME= roadnav
PORTVERSION= 0.19
PORTREVISION= 1
CATEGORIES= astro geography
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Roadnav/${PORTVERSION}
MAINTAINER= bahamasfranks@gmail.com
COMMENT= A 3D GPS Mapping program
diff --git a/astro/sky2000/Makefile b/astro/sky2000/Makefile
index 25f283387fb8..bb3068f8442a 100644
--- a/astro/sky2000/Makefile
+++ b/astro/sky2000/Makefile
@@ -9,8 +9,7 @@
PORTNAME= sky2000
PORTVERSION= 0.2
CATEGORIES= astro
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nova
+MASTER_SITES= SF/nova/catalogs/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A binary representation of the Sky2000 star catalog
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 4f4170a4e2f6..c067e320efa8 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -9,7 +9,7 @@ PORTNAME= stellarium
PORTVERSION= 0.10.2
PORTREVISION= 1
CATEGORIES= astro
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Stellarium-sources/${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= A 3D photo-realistic sky renderer
diff --git a/astro/tclgeomap/Makefile b/astro/tclgeomap/Makefile
index b7cd45748431..4a3b5eaa96c3 100644
--- a/astro/tclgeomap/Makefile
+++ b/astro/tclgeomap/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tclgeomap
PORTVERSION= 2.11.5
PORTREVISION= 1
CATEGORIES= astro tcl
-MASTER_SITES= SF/tkgeomap
+MASTER_SITES= SF/tkgeomap/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Read, manipulate and display geo data
diff --git a/astro/xeartk/Makefile b/astro/xeartk/Makefile
index bf033ccd72ac..898ea31c73ac 100644
--- a/astro/xeartk/Makefile
+++ b/astro/xeartk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xeartk
PORTVERSION= 2.2
PORTREVISION= 3
CATEGORIES= astro tk
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tkgeomap
+MASTER_SITES= SF/tkgeomap/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Small demo for tkgeomap
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index 3ddf5db6e2df..5c7766cb784c 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xphoon
PORTVERSION= 2000.06.13
PORTREVISION= 2
CATEGORIES= astro
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/20000613
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index 0f95ea0749f9..01c46e3e6c83 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -10,8 +10,7 @@ PORTNAME= Maaate
PORTVERSION= 0.3.1
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/M/m/}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= MPEG audio analysis toolkit
diff --git a/audio/ample/Makefile b/audio/ample/Makefile
index e5aadecbd0ec..05144a4054d6 100644
--- a/audio/ample/Makefile
+++ b/audio/ample/Makefile
@@ -9,8 +9,7 @@
PORTNAME= ample
PORTVERSION= 0.5.7
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Allows you to listen to your own MP3's away from home
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 97957421718e..cd5224796ac2 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aqualung
DISTVERSION= 0.9beta10
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.9beta10
MAINTAINER= jsa@wickedmachine.net
COMMENT= Music player with rich features
diff --git a/audio/atunes/Makefile b/audio/atunes/Makefile
index 5658b4720fd5..8b0b76e48a83 100644
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@@ -8,7 +8,7 @@
PORTNAME= atunes
PORTVERSION= 1.13.2
CATEGORIES= audio java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
DISTNAME= aTunes_${PORTVERSION}
MAINTAINER= lme@FreeBSD.org
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index f35729f2d580..0d3f3b378634 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -8,7 +8,7 @@ PORTNAME= audacity
PORTVERSION= 1.3.7
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}-fullsrc-${PORTVERSION}
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 53f4e48d2894..dcbb93314eab 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -9,10 +9,11 @@ PORTNAME= aumix
PORTVERSION= 2.8
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://jpj.net/~trevor/aumix/ \
+
http://jpj.net/~trevor/aumix/old/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= unix4all@gulic.org
COMMENT= Audio mixer for X11, terminal, or command line
diff --git a/audio/bebocd/Makefile b/audio/bebocd/Makefile
index e400cc7d5328..7a73031fc16a 100644
--- a/audio/bebocd/Makefile
+++ b/audio/bebocd/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bebocd
PORTVERSION= 0.4
PORTREVISION= 9
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK2 CD Player
diff --git a/audio/blop/Makefile b/audio/blop/Makefile
index 2df2b8653ab4..66b9a36b6062 100644
--- a/audio/blop/Makefile
+++ b/audio/blop/Makefile
@@ -8,8 +8,7 @@ PORTNAME= blop
PORTVERSION= 0.2.8
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.2
MAINTAINER= ports@FreeBSD.org
COMMENT= Bandlimited oscillator plugins for LADSPA-aware audio applications
diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index feb457150955..6d67cf66296b 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 3.0.2
PORTREVISION= 3
DISTVERSIONSUFFIX= -testing.src
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Testing%20%28unstable%29/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for tagging and renaming MP3 and OGG/Vorbis files
diff --git a/audio/ccaudio/Makefile b/audio/ccaudio/Makefile
index 5879dc930253..5417eb9b6ea9 100644
--- a/audio/ccaudio/Makefile
+++ b/audio/ccaudio/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ccaudio
PORTVERSION= 1.2.0
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnutelephony
+MASTER_SITES= SF/gnutelephony/production/1.2.16
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ class framework for manipulating audio files
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index eb6cb32aa074..cbbada35b026 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cddb
PORTVERSION= 0.2
PORTREVISION= 2
CATEGORIES= audio gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gsburn
+MASTER_SITES= SF/gsburn/${PORTNAME}.bundle/${PORTNAME}.bundle-${PORTVERSION}
PKGNAMESUFFIX= -bundle${PKGNAMESUFFIX2}
DISTNAME= cddb.bundle-${PORTVERSION}
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index cb7d42604978..ea86fa51b962 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -10,7 +10,7 @@ PORTNAME= cheesetracker
PORTVERSION= 0.9.15.4
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An Impulse Tracker clone
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index e8982fdcb891..b7d23813a4c9 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cmp3
PORTVERSION= 2.0.p6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.0-pre6
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/dcd/Makefile b/audio/dcd/Makefile
index 792f3eee9844..ba47a3ad7f9d 100644
--- a/audio/dcd/Makefile
+++ b/audio/dcd/Makefile
@@ -9,7 +9,7 @@ PORTNAME= dcd
PORTVERSION= 0.99.2
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF/dcdplayer
+MASTER_SITES= SF/${PORTNAME}player/${PORTNAME}player/${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A simple, programmable, intelligent CD player
diff --git a/audio/drumpiler/Makefile b/audio/drumpiler/Makefile
index 604b302eeb3e..f53c0e8ddcbf 100644
--- a/audio/drumpiler/Makefile
+++ b/audio/drumpiler/Makefile
@@ -10,8 +10,7 @@ PORTNAME= drumpiler
PORTVERSION= 0.9.0
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Drum machine compiler
diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 9f93b6074831..896e2c5a9e2b 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dssi
PORTVERSION= 1.0.0
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dssi
+MASTER_SITES= SF
MAINTAINER= trasz@FreeBSD.org
COMMENT= API for audio processing plugins
diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile
index 3bad75893c48..7e645403888d 100644
--- a/audio/dvda-author/Makefile
+++ b/audio/dvda-author/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 09.05
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= dvd-audio
+MASTER_SITES= SF/dvd-audio/${PORTNAME}-core/${PORTNAME}-${PORTVERSION}-core
DISTNAME= ${PORTNAME}-${PORTVERSION}-7
MAINTAINER= martin.dieringer@gmx.de
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 43713c74da66..a3a931c5201a 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= easytag
PORTVERSION= 2.1.6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20unstable%20%28gtk%202%29/${PORTVERSION}
PKGNAMESUFFIX= -devel
MAINTAINER= novel@FreeBSD.org
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 911f65dbf96e..b3bf4ba4aa73 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -9,8 +9,7 @@ PORTNAME= easytag
PORTVERSION= 2.1
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28gtk%202%29/${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= GTK2 Tag editor for MP3 and OGG files
diff --git a/audio/epos-devel/Makefile b/audio/epos-devel/Makefile
index cf475769f7da..27ec5016d9ea 100644
--- a/audio/epos-devel/Makefile
+++ b/audio/epos-devel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= epos
PORTVERSION= 2.5.37
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= epos
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dev/${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= Text-to-Speech system
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 19fcdb00fe9d..196c36893d0f 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -8,7 +8,7 @@
PORTNAME= espeak
PORTVERSION= 1.40.02
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.40
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= nivit@FreeBSD.org
diff --git a/audio/etktab/Makefile b/audio/etktab/Makefile
index ab98a2d31c33..12ae37ad2f80 100644
--- a/audio/etktab/Makefile
+++ b/audio/etktab/Makefile
@@ -9,8 +9,7 @@ PORTNAME= etktab
PORTVERSION= 3.2
PORTREVISION= 1
CATEGORIES= audio tcl tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= etktab
+MASTER_SITES= SF/${PORTNAME}/eTktab/${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} canada_multi-3.2.etk \
dvorak-3.2.etk uk-3.2.etk us-3.2.etk
DIST_SUBDIR= ${PORTNAME}
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 4033d9ac0977..ec1b6a6bd055 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -9,7 +9,7 @@ PORTNAME= extace
PORTVERSION= 1.9.9
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/eXtace/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An Audio Visualization plugin for the X Window System
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index d8d1ec7c4d5e..64ea1f9b5dc6 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -9,8 +9,7 @@ PORTNAME= flac
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}-src
MAINTAINER= naddy@FreeBSD.org
COMMENT= Free lossless audio codec
diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile
index dcfd9a8c2f6b..c39d45a9079c 100644
--- a/audio/flac123/Makefile
+++ b/audio/flac123/Makefile
@@ -9,7 +9,7 @@ PORTNAME= flac123
PORTVERSION= 0.0.11
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= SF/flac-tools
+MASTER_SITES= SF/flac-tools/${PORTNAME}/${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Command-line player for flac audio files
diff --git a/audio/fluidsynth-dssi/Makefile b/audio/fluidsynth-dssi/Makefile
index c8ccf446d795..b528d456c3aa 100644
--- a/audio/fluidsynth-dssi/Makefile
+++ b/audio/fluidsynth-dssi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fluidsynth-dssi
PORTVERSION= 1.0.0
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dssi
+MASTER_SITES= SF/dssi/${PORTNAME}/${PORTVERSION}
MAINTAINER= trasz@FreeBSD.org
COMMENT= Wrapper for FluidSynth allowing it to function as a DSSI plugin
diff --git a/audio/gdam/Makefile b/audio/gdam/Makefile
index 2e1b1b3b4d5b..b104fa3e91d5 100644
--- a/audio/gdam/Makefile
+++ b/audio/gdam/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gdam
PORTVERSION= 0.942
PORTREVISION= 6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pav@FreeBSD.org
COMMENT= DJ mixing software suitable for live performances
diff --git a/audio/gervill/Makefile b/audio/gervill/Makefile
index 28299c067179..306319f3ca93 100644
--- a/audio/gervill/Makefile
+++ b/audio/gervill/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gervill
PORTVERSION= 1.0
CATEGORIES= audio java
-MASTER_SITES= SF/rasmusdsp
+MASTER_SITES= SF/rasmusdsp/${PORTNAME}/Gervill%20${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A generic sound synthesizer for Java
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index 02a4d86fc27c..4fc8982bde2d 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= glurp
PORTVERSION= 0.11.6
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@mark.reidel.info
COMMENT= Nice and clean GTK+-2.x based graphical client for musicpd
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index 27d5afde05b3..568de9de7bf9 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnapster
PORTVERSION= 1.5.0
PORTREVISION= 6
CATEGORIES= audio
-MASTER_SITES= SF/gnapster
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME client for the online mp3 community called napster
diff --git a/audio/gnuitar/Makefile b/audio/gnuitar/Makefile
index 773c8a3d2a3d..1de49aadf808 100644
--- a/audio/gnuitar/Makefile
+++ b/audio/gnuitar/Makefile
@@ -7,8 +7,7 @@ PORTNAME= gnuitar
PORTVERSION= 0.3.2
PORTREVISION= 4
CATEGORIES= audio multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= gabor@FreeBSD.org
COMMENT= The real-time guitar processor
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index b6607e136cb6..3c7dfca562af 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cdplayer
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= audio gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gsburn
+MASTER_SITES= SF/gsburn/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= gnustep-
MAINTAINER= dinoex@FreeBSD.org
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 176b86865b9b..0f68ac762323 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gqmpeg
PORTVERSION= 0.91.1
PORTREVISION= 9
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= oliver@FreeBSD.org
COMMENT= Another gtk-based MP3 frontend
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index ba73c487da10..9284bfe0acd4 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.20.0
PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES+= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER?= lyngbol@wheel.dk
COMMENT?= Another gtk-based MP3 frontend
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index 9a8366839c58..b5318f631f90 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gqradio
PORTVERSION= 1.9.2
PORTREVISION= 7
CATEGORIES= audio
-MASTER_SITES= SF/gqmpeg
+MASTER_SITES= SF/gqmpeg/${PORTNAME}/${PORTVERSION}
MAINTAINER= stefan.jahn@nemesis-sektor.de
COMMENT= GTK2 based FM tuner
diff --git a/audio/gsi/Makefile b/audio/gsi/Makefile
index 65f2f49b0df6..2bc740467f1a 100644
--- a/audio/gsi/Makefile
+++ b/audio/gsi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gsi
PORTVERSION= 0.9.6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/GSI%20Current/v${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= General sound interface
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index a73439bd0f30..91349e35a724 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gspeakers
PORTVERSION= 0.11
PORTREVISION= 10
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gnome-based loudspeaker design program
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 7bbf852a57df..96eb427cb4b4 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkpod
PORTVERSION= 0.99.12
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= GUI for Apple iPods using GTK2
diff --git a/audio/hexter/Makefile b/audio/hexter/Makefile
index 7f9800820be5..56435f52921d 100644
--- a/audio/hexter/Makefile
+++ b/audio/hexter/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hexter
PORTVERSION= 0.6.2
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dssi
+MASTER_SITES= SF/dssi/${PORTNAME}/${PORTVERSION}
MAINTAINER= trasz@FreeBSD.org
COMMENT= DSSI softsynth that models the sound generation of a Yamaha DX7
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 5b812950cc15..ac397cdb9f02 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -9,7 +9,7 @@ PORTNAME= hydrogen
PORTVERSION= 0.9.3
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Hydrogen/${PORTVERSION}%20-%20stable
MAINTAINER= ports@FreeBSD.org
COMMENT= An advanced drum machine
diff --git a/audio/icegenerator/Makefile b/audio/icegenerator/Makefile
index 497352ed0d07..54343e6d627e 100644
--- a/audio/icegenerator/Makefile
+++ b/audio/icegenerator/Makefile
@@ -8,7 +8,7 @@
PORTNAME= icegenerator
DISTVERSION= 0.5.5-pre2
CATEGORIES= audio net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.5.5-pre2
MAINTAINER= funkblaster@mail.ru
COMMENT= Direct streaming generator for Icecast/Shoutcast
diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile
index 92d790c5db37..f1e9bd1fa15d 100644
--- a/audio/id3v2/Makefile
+++ b/audio/id3v2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= id3v2
PORTVERSION= 0.1.11
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= id3v2
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Command line id3v2 tag editor
diff --git a/audio/ifp-line/Makefile b/audio/ifp-line/Makefile
index c08ce5d28dc5..694ba13520a3 100644
--- a/audio/ifp-line/Makefile
+++ b/audio/ifp-line/Makefile
@@ -9,8 +9,7 @@
PORTNAME= ifp-line
PORTVERSION= 0.2.4.6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ifp-driver
+MASTER_SITES= SF/ifp-driver/${PORTNAME}/${PORTVERSION}
MAINTAINER= riggs@rrr.de
COMMENT= Command line interface to iRiver music players
diff --git a/audio/jack-keyboard/Makefile b/audio/jack-keyboard/Makefile
index 0b478c1cf73f..b68e9f855354 100644
--- a/audio/jack-keyboard/Makefile
+++ b/audio/jack-keyboard/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jack-keyboard
DISTVERSION= 2.5
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jack-keyboard
+MASTER_SITES= SF
MAINTAINER= trasz@FreeBSD.org
COMMENT= Virtual keyboard for JACK MIDI
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 22fc569dd61d..e0b302401d3e 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -9,7 +9,7 @@ PORTNAME= jack-rack
PORTVERSION= 1.4.7
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF/jack-rack
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= A LADSPA effects rack for the JACK audio server
diff --git a/audio/jack-smf-utils/Makefile b/audio/jack-smf-utils/Makefile
index 1a2c36027ed8..d3d9cccc72a4 100644
--- a/audio/jack-smf-utils/Makefile
+++ b/audio/jack-smf-utils/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jack-smf-utils
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jack-smf-utils
+MASTER_SITES= SF
MAINTAINER= trasz@FreeBSD.org
COMMENT= Standard MIDI File file player and recorder for JACK MIDI
diff --git a/audio/jamin/Makefile b/audio/jamin/Makefile
index 678d0fc5dd5b..6dd2cf7f8f26 100644
--- a/audio/jamin/Makefile
+++ b/audio/jamin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jamin
PORTVERSION= 0.95.0
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jamin
+MASTER_SITES= SF
MAINTAINER= trasz@FreeBSD.org
COMMENT= JACK Audio Mastering interface
diff --git a/audio/jid3lib/Makefile b/audio/jid3lib/Makefile
index b5f033906c5d..5fb666f9de3b 100644
--- a/audio/jid3lib/Makefile
+++ b/audio/jid3lib/Makefile
@@ -8,8 +8,7 @@ PORTNAME= jid3lib
PORTVERSION= 0.5.4
PORTREVISION= 2
CATEGORIES= audio java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= javamusictag
+MASTER_SITES= SF/javamusictag/${PORTNAME}/beta-dev6
MAINTAINER= ports@FreeBSD.org
COMMENT= Java ID3 Tag Library
diff --git a/audio/jmusic/Makefile b/audio/jmusic/Makefile
index 1d105e997a76..5c69ac7f184c 100644
--- a/audio/jmusic/Makefile
+++ b/audio/jmusic/Makefile
@@ -10,7 +10,7 @@ PORTNAME= jmusic
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= audio java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/jMusic_Stable/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ijliao@FreeBSD.org
diff --git a/audio/jxm/Makefile b/audio/jxm/Makefile
index 50722c8db919..4e00db097133 100644
--- a/audio/jxm/Makefile
+++ b/audio/jxm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jxm
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= audio java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= javaxm
+MASTER_SITES= SF/javaxm/JAR%20file%20only/${PORTVERSION}
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/audio/kexis/Makefile b/audio/kexis/Makefile
index 307e5bb89893..b88cec5408d1 100644
--- a/audio/kexis/Makefile
+++ b/audio/kexis/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kexis
PORTVERSION= 0.2.2
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Kexis/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= hideo@lastamericanempire.com
diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index 3dd3f76572b2..231ea26be01c 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -9,7 +9,7 @@
PORTNAME= ksmp3play
PORTVERSION= 0.5.2.1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-0.5.2/0.5.2
MAINTAINER= ports@FreeBSD.org
COMMENT= An curses-based MP3 player
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index c0ed8cf95570..05d99e62ced8 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -9,9 +9,9 @@ PORTNAME= lame
PORTVERSION= 3.98.2
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
ftp://ftp.fu-berlin.de/unix/sound/%SUBDIR%/
-MASTER_SITE_SUBDIR= lame
+
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//:S/./-/}
MAINTAINER= netchild@FreeBSD.org
diff --git a/audio/libaiff/Makefile b/audio/libaiff/Makefile
index 41f786745876..dd2e5b64c584 100644
--- a/audio/libaiff/Makefile
+++ b/audio/libaiff/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libaiff
PORTVERSION= 5.0
CATEGORIES= audio
-MASTER_SITES= SF/aifftools
+MASTER_SITES= SF/aifftools/${PORTNAME}/LibAiff%20${PORTVERSION}
DISTNAME= libaiff-5.0-release
MAINTAINER= gahr@FreeBSD.org
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index cf1ae1d21e42..bbb2d1b8bb64 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libcdaudio
PORTVERSION= 0.99.12p2
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= novel@FreeBSD.org
COMMENT= A library for playing audio CDs
diff --git a/audio/libcddb-doc/Makefile b/audio/libcddb-doc/Makefile
index 58548e2960e2..4b8b1e22e021 100644
--- a/audio/libcddb-doc/Makefile
+++ b/audio/libcddb-doc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libcddb-doc
PORTVERSION= 1.3.0
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libcddb
+MASTER_SITES= SF/libcddb/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Libcddb documentation
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index a152e5f34ad4..253485d31b90 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -9,8 +9,7 @@
PORTNAME= libcddb
PORTVERSION= 1.3.0
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= multimedia@FreeBSD.org
COMMENT= A library to access data on a CDDB server
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 6e6e1128e771..8b3f34877d92 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgpod
PORTVERSION= 0.7.2
CATEGORIES= audio
-MASTER_SITES= SF/gtkpod
+MASTER_SITES= SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= A library for direct access of iPod's contents
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index 331eafefd654..25ef65f9364a 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -8,9 +8,9 @@
PORTNAME= libid3tag
PORTVERSION= 0.15.1b
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/mad/${PORTNAME}/${PORTVERSION} \
ftp://ftp.mars.org/pub/mpeg/
-MASTER_SITE_SUBDIR= mad
+
MAINTAINER= dinoex@FreeBSD.org
COMMENT= ID3 tags library (part of MAD project)
diff --git a/audio/liblo/Makefile b/audio/liblo/Makefile
index 7d5b08e33d12..5d7ba5d18418 100644
--- a/audio/liblo/Makefile
+++ b/audio/liblo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= liblo
PORTVERSION= 0.26
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= liblo
+MASTER_SITES= SF
MAINTAINER= trasz@FreeBSD.org
COMMENT= Lightweight Open Sound Control implementation
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 07f1002dad51..d1e258d08ca0 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -9,9 +9,9 @@ PORTNAME= libmad
PORTVERSION= 0.15.1b
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/mad/${PORTNAME}/${PORTVERSION} \
ftp://ftp.mars.org/pub/mpeg/
-MASTER_SITE_SUBDIR= mad
+
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Libmad library (part of MAD project)
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index 6138d66a1c9b..6544ee9c18a0 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libmodplug
PORTVERSION= 0.8.7
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= modplug-xmms
+MASTER_SITES= SF/modplug-xmms/${PORTNAME}/${PORTVERSION}
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= ModPlug mod-like music shared libraries
diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index 559d811beb1d..244cc89333b0 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libmp3splt
PORTVERSION= 0.5.4
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mp3splt
+MASTER_SITES= SF/mp3splt/${PORTNAME}/${PORTVERSION}
MAINTAINER= citrin@citrin.ru
COMMENT= Library for mp3splt and mp3splt-gtk
diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile
index f8116bc2dd5d..938139eea613 100644
--- a/audio/libmtp/Makefile
+++ b/audio/libmtp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libmtp
PORTVERSION= 0.3.1
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pesho.petrov@gmail.com
COMMENT= Media Transfer Protocol (MTP) library
diff --git a/audio/libnoise/Makefile b/audio/libnoise/Makefile
index 16c18e63cf20..9e727baa08ff 100644
--- a/audio/libnoise/Makefile
+++ b/audio/libnoise/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libnoise
DISTVERSION= 1.0.0
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}
DISTNAME= ${PORTNAME}src-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index 81bd7e03bf07..a389d63c8d79 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libsidplay2
PORTVERSION= 2.1.1
PORTREVISION= 2
CATEGORIES= audio emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sidplay2
+MASTER_SITES= SF/sidplay2/sidplay2/sidplay-libs-${PORTVERSION}
DISTNAME= sidplay-libs-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index af6e81e07a70..c815e5b0c06e 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -9,8 +9,7 @@ PORTNAME= madman
PORTVERSION= 0.93
PORTREVISION= 6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= madman
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An advanced digital music manager
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index ef10c6f5872d..cabb8e4e571a 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -9,9 +9,9 @@ PORTNAME= madplay
PORTVERSION= 0.15.2b
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/mad/${PORTNAME}/${PORTVERSION} \
ftp://ftp.mars.org/pub/mpeg/
-MASTER_SITE_SUBDIR= mad
+
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Madplay MP3 player (part of MAD project)
diff --git a/audio/mctoolame-decoder/Makefile b/audio/mctoolame-decoder/Makefile
index ae3a59c10bec..e834be8389b6 100644
--- a/audio/mctoolame-decoder/Makefile
+++ b/audio/mctoolame-decoder/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mctoolame
PORTVERSION= 0.1.a
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}d/${PORTNAME}d-01a
PKGNAMESUFFIX= -decoder
DISTNAME= ${PORTNAME}d-${PORTVERSION:C/\.//g}
EXTRACT_SUFX= .tgz
diff --git a/audio/mctoolame-encoder/Makefile b/audio/mctoolame-encoder/Makefile
index a888c0d1efc0..c6ff30e1cebf 100644
--- a/audio/mctoolame-encoder/Makefile
+++ b/audio/mctoolame-encoder/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mctoolame
PORTVERSION= 0.1.a
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-01a
PKGNAMESUFFIX= -encoder
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.//g}
EXTRACT_SUFX= .tgz
diff --git a/audio/midimountain/Makefile b/audio/midimountain/Makefile
index 427f75bf0033..ad770125cc73 100644
--- a/audio/midimountain/Makefile
+++ b/audio/midimountain/Makefile
@@ -11,8 +11,8 @@ PORTVERSION= 0.3.0
PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.midimountain.com/download/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF/${PORTNAME}/MidiMountain-linux/Version%20${PORTVERSION}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= MIDI sequencer
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index a996c6a55024..d5f379537699 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mixxx
PORTVERSION= 1.4.2
PORTREVISION= 7
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A DJ mixing application
diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile
index fb504edbfc5a..5fa30840bd0b 100644
--- a/audio/mp3_check/Makefile
+++ b/audio/mp3_check/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mp3_check
PORTVERSION= 1.98
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mp3check
+MASTER_SITES= SF/mp3check/mp3check/${PORTVERSION}
MAINTAINER= ericb@thedeepsky.com
COMMENT= Verifies the integrity of mp3 audio files
diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
index 917b5b43c8e3..0ef29c514b79 100644
--- a/audio/mp3asm/Makefile
+++ b/audio/mp3asm/Makefile
@@ -10,8 +10,7 @@ PORTNAME= mp3asm
PORTVERSION= 0.1.3.1
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.1.3-1
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 795d4d9181b9..5c6a4e44e7a9 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mp3blaster
PORTVERSION= 3.2.5
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= MP3 console ncurses-based player
diff --git a/audio/mp3ck/Makefile b/audio/mp3ck/Makefile
index 7195a267eb8c..cbf89bc719cd 100644
--- a/audio/mp3ck/Makefile
+++ b/audio/mp3ck/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mp3ck
PORTVERSION= 0.04
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= yar@FreeBSD.org
COMMENT= A consistency check utility for MPEG Layer 2 or 3 files or streams
diff --git a/audio/mp3gain/Makefile b/audio/mp3gain/Makefile
index 355d23bf5ed5..beb0fa12e7a6 100644
--- a/audio/mp3gain/Makefile
+++ b/audio/mp3gain/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mp3gain
PORTVERSION= 1.5.1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:C/\./_/g}-src
MAINTAINER= dinoex@FreeBSD.org
diff --git a/audio/mp3mover/Makefile b/audio/mp3mover/Makefile
index b54aab6b039a..7cabc8fcd1d8 100644
--- a/audio/mp3mover/Makefile
+++ b/audio/mp3mover/Makefile
@@ -9,8 +9,7 @@
PORTNAME= mp3mover
PORTVERSION= 2.1.1
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mediamover
+MASTER_SITES= SF/mediamover/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Rename mp3s and manipulate them
diff --git a/audio/mp3towav-bundle/Makefile b/audio/mp3towav-bundle/Makefile
index e3ab916e84aa..b5a725b3e445 100644
--- a/audio/mp3towav-bundle/Makefile
+++ b/audio/mp3towav-bundle/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mp3towav
PORTVERSION= 0.4.1
PORTREVISION= 2
CATEGORIES= audio gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gsburn
+MASTER_SITES= SF/gsburn/${PORTNAME}.bundle/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= -bundle${PKGNAMESUFFIX2}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/audio/mp3wrap/Makefile b/audio/mp3wrap/Makefile
index 3335fcd23e0a..2ae5b640bbd9 100644
--- a/audio/mp3wrap/Makefile
+++ b/audio/mp3wrap/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mp3wrap
PORTVERSION= 0.5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= uspoerlein@gmail.com
diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
index e6d69d33d4e5..38863e816eb6 100644
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mpc
PORTVERSION= 0.15
CATEGORIES= audio ipv6
-MASTER_SITES= SF/musicpd
+MASTER_SITES= SF/musicpd/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@mark.reidel.info
COMMENT= Command line client for the musicpd
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index c2587455c07f..6b1cca4b94ea 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mpdcon
PORTVERSION= 1.1.99
PORTREVISION= 2
CATEGORIES= audio gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.2%20beta%201
DISTNAME= MPDCon-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
index 9a5503a51814..452451712917 100644
--- a/audio/mpdscribble/Makefile
+++ b/audio/mpdscribble/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mpdscribble
PORTVERSION= 0.18
CATEGORIES= audio
-MASTER_SITES= SF/musicpd
+MASTER_SITES= SF/musicpd/${PORTNAME}/${PORTVERSION}
MAINTAINER= kimelto@gmail.com
COMMENT= Musicpd last.fm client
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 4053b617bdde..93c0957a5cb8 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mpg123
PORTVERSION= 1.9.0
CATEGORIES= audio ipv6
-MASTER_SITES= SFP/mpg123/mpg123/${PORTVERSION} \
+MASTER_SITES= SF \
http://www.mpg123.de/download/
MAINTAINER= novel@FreeBSD.org
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 8145412b9cb8..5af3d7da85ab 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mpg321
PORTVERSION= 0.2.10
PORTREVISION= 7
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mpg321
+MASTER_SITES= SF
MAINTAINER= naddy@FreeBSD.org
COMMENT= A free command-line mp3 player, compatible with mpg123
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index 1a9c71fa86b3..85c74dbca185 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mpiosh
PORTVERSION= 0.7.1.p2
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF/mpio
+MASTER_SITES= SF/mpio/mpio%20pre-release/0.7.1-pre2
DISTNAME= mpio-${PORTVERSION:S|.p|_pre|}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index 2c62a98bd847..fb7dd8d3295a 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mumble
PORTVERSION= 1.1.7
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Mumble/${PORTVERSION}
MAINTAINER= marius@nuenneri.ch
COMMENT= A voice chat software primarily intended for use while gaming
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index 09c0c5866669..69a256bb6b59 100644
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@@ -10,7 +10,7 @@ PORTNAME= musicbox-tag-editor
PORTVERSION= 0.2.3
PORTREVISION= 11
CATEGORIES= audio
-MASTER_SITES= SF/musicbox
+MASTER_SITES= SF/musicbox/musicbox/${PORTVERSION}
DISTNAME= musicbox-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 0634cf4184a8..c4fc025f4235 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= musicpd
PORTVERSION= 0.15
CATEGORIES= audio ipv6
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION}
DISTNAME= mpd-${PORTVERSION}
MAINTAINER= jo.lindqvist@gmail.com
diff --git a/audio/napster/Makefile b/audio/napster/Makefile
index 1720b993c1be..4e420301f12e 100644
--- a/audio/napster/Makefile
+++ b/audio/napster/Makefile
@@ -8,8 +8,7 @@
PORTNAME= nap
PORTVERSION= 1.5.4
CATEGORIES+= audio net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nap
+MASTER_SITES= SF/nap/nap/${PORTVERSION}
MAINTAINER?= araujo@FreeBSD.org
COMMENT?= An MP3 sharing, search, and chat client for the OpenNAP network
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 3a3f21d554cc..c65464979c6d 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nas
PORTVERSION= 1.9.1
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}%20%28stable%29
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= multimedia@FreeBSD.org
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index 254cd1236b5d..28b3bebd464f 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ncmpc
PORTVERSION= 0.14
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF/musicpd
+MASTER_SITES= SF/musicpd/${PORTNAME}/${PORTVERSION}
MAINTAINER= hrkfdn@gmail.com
COMMENT= Ncurses client for the musicpd
diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile
index 29925df7e1e4..7944ca9dac3f 100644
--- a/audio/nosefart/Makefile
+++ b/audio/nosefart/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nosefart
PORTVERSION= 1.92f
PORTREVISION= 1
CATEGORIES= audio emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION}-mls
MAINTAINER= sethk@meowfishies.com
diff --git a/audio/opencore-amr/Makefile b/audio/opencore-amr/Makefile
index a47c98af244a..a2b9899873c9 100644
--- a/audio/opencore-amr/Makefile
+++ b/audio/opencore-amr/Makefile
@@ -8,7 +8,7 @@
PORTNAME= opencore-amr
PORTVERSION= 0.1.1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= # none knwon, please fix
MAINTAINER= gslin@gslin.org
COMMENT= OpenCORE implementation of AMR Narrowband & Wideband speech codec
diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile
index f364dda61640..3121181290e1 100644
--- a/audio/opmixer/Makefile
+++ b/audio/opmixer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= opmixer
PORTVERSION= 0.75
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= SF/optronic
+MASTER_SITES= SF/optronic/opMixer/${PORTVERSION}
DISTNAME= opMixer-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index 3026236ad014..c4a7d11f5544 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -10,7 +10,7 @@ PORTNAME= osalp
PORTVERSION= 0.7.5
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-beta
MAINTAINER= gahr@FreeBSD.org
COMMENT= Open Source Audio Library Project
diff --git a/audio/p5-tagged/Makefile b/audio/p5-tagged/Makefile
index ab2ee03a6e24..321e5e4dea51 100644
--- a/audio/p5-tagged/Makefile
+++ b/audio/p5-tagged/Makefile
@@ -9,11 +9,9 @@
PORTNAME= tagged
PORTVERSION= 0.40
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= MP3/:cpan ${PORTNAME}/:sf
+MASTER_SITES= CPAN/MP3 \
+ SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= p5-
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:cpan,sf
MAINTAINER= ports@FreeBSD.org
COMMENT= Read, change and write different tags of MP3 audio files
diff --git a/audio/playmidi/Makefile b/audio/playmidi/Makefile
index 8980ae9c0608..b612c1c2a247 100644
--- a/audio/playmidi/Makefile
+++ b/audio/playmidi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= playmidi
PORTVERSION= 2.5
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= MIDI player
diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index 1e634213e85d..9b922e8cd9f4 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pocketsphinx
PORTVERSION= 0.4.1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cmusphinx
+MASTER_SITES= SF/cmusphinx/${PORTNAME}/${PORTVERSION}
MAINTAINER= r.neese@gmail.com
COMMENT= Speech recognition system
diff --git a/audio/py-apetag/Makefile b/audio/py-apetag/Makefile
index 46d160b7f809..083b6447990b 100644
--- a/audio/py-apetag/Makefile
+++ b/audio/py-apetag/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apetag
PORTVERSION= 1.2
CATEGORIES= audio python
-MASTER_SITES= SF/pylibape
+MASTER_SITES= SF/pylibape/py-ApeTag/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py-ApeTag-${PORTVERSION}
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile
index 69d1904f9cb8..d4fdd7a873a4 100644
--- a/audio/py-cddb/Makefile
+++ b/audio/py-cddb/Makefile
@@ -7,8 +7,7 @@
PORTNAME= cddb
PORTVERSION= 1.4
CATEGORIES= audio python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cddb-py
+MASTER_SITES= SF/${PORTNAME}-py/${PORTNAME}-py/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= CDDB-${PORTVERSION}
diff --git a/audio/py-id3/Makefile b/audio/py-id3/Makefile
index 6ed8523a9dd2..a86f9718e8df 100644
--- a/audio/py-id3/Makefile
+++ b/audio/py-id3/Makefile
@@ -7,8 +7,7 @@
PORTNAME= id3
PORTVERSION= 1.2
CATEGORIES= audio python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= id3-py
+MASTER_SITES= SF/${PORTNAME}-py/${PORTNAME}-py/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= id3-py_${PORTVERSION}
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 27c9be3ad49c..25b6695b0af6 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -9,8 +9,7 @@ PORTNAME= karaoke
PORTVERSION= 0.5
PORTREVISION= 3
CATEGORIES= audio python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pykaraoke
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pykaraoke-${PORTVERSION}
diff --git a/audio/q-audio/Makefile b/audio/q-audio/Makefile
index e2e276df0a03..bc34c0fbbaf9 100644
--- a/audio/q-audio/Makefile
+++ b/audio/q-audio/Makefile
@@ -9,7 +9,7 @@ PORTNAME= audio
PORTVERSION= 2.7
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= SF/q-lang
+MASTER_SITES= SF/q-lang/q-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= q-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index e308263145e2..b90871943359 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qjackctl
DISTVERSION= 0.3.4
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= qjackctl
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
MAINTAINER= trasz@FreeBSD.org
COMMENT= Qt Interface for the JACK Audio Connection Kit
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index ee8fb29faf8f..d8ad7def9b15 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qsynth
DISTVERSION= 0.3.2
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= qsynth
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= lazyklimm@gmail.com
COMMENT= Qt fluidsynth front-end application
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index aca3c02dc94b..29471a68be59 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -9,8 +9,7 @@ PORTNAME= raop_play
PORTVERSION= 0.5.1
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= raop-play
+MASTER_SITES= SF/raop-play/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= sumikawa@FreeBSD.org
COMMENT= A music file player for Apple Airport Express
diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index c3ff36ec390e..12c3c06a8d26 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -9,11 +9,8 @@
PORTNAME= rawrec
PORTVERSION= 0.9.991
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE:S/$/:sun/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR= apps/sound/recorders/:sun \
- ${PORTNAME}/:sf
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sun,sf
+MASTER_SITES= ${MASTER_SITE_SUNSITE:S/%SUBDIR%/apps\/sound\/recorders/} \
+ SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility to record and playback raw audio data
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index 2043d3157f4f..b8e5a9bee9f7 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rezound
DISTVERSION= 0.12.3beta
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/ReZound/0.12.3beta
MAINTAINER= danfe@FreeBSD.org
COMMENT= Graphical audio file editor
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
index 077998efd40e..d467895ba185 100644
--- a/audio/rio500/Makefile
+++ b/audio/rio500/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rio500
PORTVERSION= 0.7
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= fortune@n.jpn.ph
COMMENT= Utilities for Diamond Rio500
diff --git a/audio/ripperx/Makefile b/audio/ripperx/Makefile
index b4b9c527bf7a..8775615fae7d 100644
--- a/audio/ripperx/Makefile
+++ b/audio/ripperx/Makefile
@@ -10,7 +10,6 @@ PORTVERSION= 2.7.2
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ripperx
DISTNAME= ripperX-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/ruby-audiofile/Makefile b/audio/ruby-audiofile/Makefile
index a95f355a0ba8..9ca347cd3abb 100644
--- a/audio/ruby-audiofile/Makefile
+++ b/audio/ruby-audiofile/Makefile
@@ -8,8 +8,7 @@
PORTNAME= audiofile
PORTVERSION= 0.2.4
CATEGORIES= audio ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ruby-${PORTNAME}
+MASTER_SITES= SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${CDDB_DISTNAME}${EXTRACT_SUFX}
diff --git a/audio/sidplay2/Makefile b/audio/sidplay2/Makefile
index f6c28198b382..ee07cda1341e 100644
--- a/audio/sidplay2/Makefile
+++ b/audio/sidplay2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sidplay2
PORTVERSION= 2.0.9
CATEGORIES= audio emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/sidplay-${PORTVERSION}
DISTNAME= sidplay-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/slimserver-slimscrobbler/Makefile b/audio/slimserver-slimscrobbler/Makefile
index 24ea28b1987a..cf99d260e2b1 100644
--- a/audio/slimserver-slimscrobbler/Makefile
+++ b/audio/slimserver-slimscrobbler/Makefile
@@ -8,8 +8,7 @@ PORTNAME= slimscrobbler
PORTVERSION= 0.37.1
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V0.37
PKGNAMEPREFIX= slimserver-
DISTNAME= SlimScrobbler${DISTVERSION:S/.//g}
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index ea466f6e91b5..1b73db99c700 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -11,7 +11,7 @@ PORTNAME= solfege
PORTVERSION= 3.15.1
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20unstable/${PORTVERSION}
PKGNAMESUFFIX= -nosound
MAINTAINER= dhn@FreeBSD.org
diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile
index 7031d4908ce3..360c5b5fe8b1 100644
--- a/audio/sphinx/Makefile
+++ b/audio/sphinx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sphinx
PORTVERSION= 2.0.4
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cmusphinx
+MASTER_SITES= SF/cmu${PORTNAME}/${PORTNAME}2/0.4
DISTNAME= sphinx2-0.4
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile
index d3ec55f2ae6b..659a1cfc9ecd 100644
--- a/audio/sphinx3/Makefile
+++ b/audio/sphinx3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sphinx3
PORTVERSION= 0.7
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cmusphinx
+MASTER_SITES= SF/cmusphinx/${PORTNAME}/${PORTVERSION}
MAINTAINER= r.neese@gmail.com
COMMENT= Speech recognition system
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index c27e8bfb1735..473067c4b976 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sphinxbase
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cmusphinx
+MASTER_SITES= SF/cmusphinx/${PORTNAME}/${PORTVERSION}
MAINTAINER= r.neese@gmail.com
COMMENT= CMU SPhinx Speech recognition system base
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index 9c9dc5570c33..eb35f40547f3 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -9,8 +9,7 @@ PORTNAME= spiralsynthmodular
PORTVERSION= 0.2.2a
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= spiralmodular
+MASTER_SITES= SF/spiralmodular/spiralmodular/${PORTVERSION}%20%28Latest%20Version%29
DISTNAME= spiralmodular-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index fd06aa1f707c..db3b830790dc 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -9,8 +9,9 @@ PORTNAME= streamripper
PORTVERSION= 1.64.5
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28current%29/${PORTVERSION} \
http://gd.tuwien.ac.at/hci/cdk/:cdk
+
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
cdk-${CDK_VERSION}.tgz:cdk
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/audio/tap-plugins/Makefile b/audio/tap-plugins/Makefile
index 36703023f11c..b4ab690501d9 100644
--- a/audio/tap-plugins/Makefile
+++ b/audio/tap-plugins/Makefile
@@ -7,8 +7,7 @@
PORTNAME= tap-plugins
PORTVERSION= 0.7.0
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tap-plugins
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= LADSPA Plugins by Tom Szilagy
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index e220b4035d86..ab5caac25cae 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -9,8 +9,7 @@ PORTNAME= timidity++
PORTVERSION= 2.13.2
PORTREVISION?= 7
CATEGORIES+= audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=timidity
+MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}
DISTNAME= TiMidity++-${PORTVERSION}
MAINTAINER?= nork@FreeBSD.org
diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
index e366b305f256..d3564d45b23a 100644
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@@ -9,8 +9,7 @@ PORTNAME= toolame
PORTVERSION= 0.2l
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%200.2/${PORTNAME}%2002l
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//}
EXTRACT_SUFX= .tgz
diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile
index 483daab7040b..24b679f6ea41 100644
--- a/audio/tse3/Makefile
+++ b/audio/tse3/Makefile
@@ -8,7 +8,7 @@ PORTNAME= tse3
PORTVERSION= 0.3.1
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TSE3/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A MIDI library
diff --git a/audio/tta/Makefile b/audio/tta/Makefile
index dd5f0eecdac6..9c11196348b4 100644
--- a/audio/tta/Makefile
+++ b/audio/tta/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tta
PORTVERSION= 3.4.1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}enc-src
DISTNAME= ${PORTNAME}enc-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 03fd62775ca6..e8197ad9873e 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -10,10 +10,13 @@ PORTNAME= tuxguitar
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= audio java
-MASTER_SITES= SF:src \
+MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
${MASTER_SITE_LOCAL}/gahr/:fluid \
+
http://people.freebsd.org/~gahr/distfiles/:fluid \
+
http://www.alsa-project.org/~james/sound-fonts/:fluid
+
DISTFILES= ${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}:src \
8MBGMSFX.SF2:fluid
EXTRACT_ONLY= ${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}
diff --git a/audio/twolame/Makefile b/audio/twolame/Makefile
index 98cb89f79eb0..919c8e809649 100644
--- a/audio/twolame/Makefile
+++ b/audio/twolame/Makefile
@@ -8,9 +8,9 @@
PORTNAME= twolame
PORTVERSION= 0.3.12
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://www.ecs.soton.ac.uk/~njh/twolame/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= multimedia@FreeBSD.org
COMMENT= MPEG Audio Layer 2 encoder
diff --git a/audio/ufmcontrol-i18n/Makefile b/audio/ufmcontrol-i18n/Makefile
index 7304130a74fa..da3a074fa04a 100644
--- a/audio/ufmcontrol-i18n/Makefile
+++ b/audio/ufmcontrol-i18n/Makefile
@@ -7,8 +7,7 @@
PORTNAME= ufmcontrol-i18n
PORTVERSION= 0.2.3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:C/-i18n$//1}
+MASTER_SITES= SF/ufmcontrol/${PORTNAME}/${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= USB radio control utility
diff --git a/audio/umix/Makefile b/audio/umix/Makefile
index 01432ea08613..e7c6eed72707 100644
--- a/audio/umix/Makefile
+++ b/audio/umix/Makefile
@@ -9,8 +9,7 @@ PORTNAME= umix
PORTVERSION= 1.0.2
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Advanced tool for adjusting soundcard mixers, replacement for aumix
diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile
index 7ad81176fe1c..f5f2f0dd5e5c 100644
--- a/audio/umodplayer/Makefile
+++ b/audio/umodplayer/Makefile
@@ -9,7 +9,7 @@ PORTNAME= umodplayer
PORTVERSION= 0.${DISTVERSION:L}
DISTVERSION= B5.1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/UModPlayer%20B5
DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/wmalbum/Makefile b/audio/wmalbum/Makefile
index 7c7302b82727..1c8e986226e2 100644
--- a/audio/wmalbum/Makefile
+++ b/audio/wmalbum/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wmalbum
PORTVERSION= 0.1.5
PORTREVISION= 4
CATEGORIES= audio windowmaker
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wmalbum
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= lx@redundancy.redundancy.org
COMMENT= A dockapp to display album covers for xmms
diff --git a/audio/xmms-a52dec/Makefile b/audio/xmms-a52dec/Makefile
index f5e715c863c9..c963fdb73a3c 100644
--- a/audio/xmms-a52dec/Makefile
+++ b/audio/xmms-a52dec/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-a52dec
PORTVERSION= 1.0
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xmms-a52dec
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A52 (aka AC3) decoder plugin for XMMS
diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile
index e0f96b820f57..0187d4337ca1 100644
--- a/audio/xmms-curses/Makefile
+++ b/audio/xmms-curses/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xmms-curses
PORTVERSION= 0.2.2
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= itetcu@FreeBSD.org
COMMENT= A ncurses program for (remote) controlling multimedia/xmms
diff --git a/audio/xmms-defx/Makefile b/audio/xmms-defx/Makefile
index e3cba5c92e11..263a09055c2c 100644
--- a/audio/xmms-defx/Makefile
+++ b/audio/xmms-defx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-defx
PORTVERSION= 0.9.9
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= defx
+MASTER_SITES= SF/defx/defx/${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Multi-effects processor plug-in for XMMS
diff --git a/audio/xmms-efxmms/Makefile b/audio/xmms-efxmms/Makefile
index 7fba4d71c6ef..839f1f58c5d3 100644
--- a/audio/xmms-efxmms/Makefile
+++ b/audio/xmms-efxmms/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-efxmms
PORTVERSION= 0.0.3
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= efxmms
+MASTER_SITES= SF/efxmms/EFXmms/EFXmms%20${PORTVERSION}
DISTNAME= EFXmms-${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
diff --git a/audio/xmms-eq/Makefile b/audio/xmms-eq/Makefile
index e722db2512e1..db4dbb770a8f 100644
--- a/audio/xmms-eq/Makefile
+++ b/audio/xmms-eq/Makefile
@@ -9,8 +9,7 @@ PORTNAME= eq
PORTVERSION= 0.7
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= equ
+MASTER_SITES= SF/${PORTNAME}u/${PORTNAME}-xmms-src/${PORTVERSION}
PKGNAMEPREFIX= xmms-
DISTNAME= ${PORTNAME}-xmms-${PORTVERSION}
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 3ae842d12229..2cd3338091d3 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xmms-flac
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= SF/flac
+MASTER_SITES= SF/flac/flac-src/flac-${PORTVERSION}-src
DISTNAME= flac-${PORTVERSION}
MAINTAINER= naddy@FreeBSD.org
diff --git a/audio/xmms-fxt/Makefile b/audio/xmms-fxt/Makefile
index 0f28573758b1..b88ead53eb62 100644
--- a/audio/xmms-fxt/Makefile
+++ b/audio/xmms-fxt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-fxt
PORTVERSION= 0.4
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}oolbox/${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Surround/Echo effect plugin for XMMS
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 87c04f2b288b..4de6d584b53a 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-jack
PORTVERSION= 0.19
CATEGORIES= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= XMMS plugin for jack
diff --git a/audio/xmms-osssurround/Makefile b/audio/xmms-osssurround/Makefile
index 6f110a9139f7..797fe9c0d120 100644
--- a/audio/xmms-osssurround/Makefile
+++ b/audio/xmms-osssurround/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-osssurround
PORTVERSION= 0.1
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xmms-a52dec
+MASTER_SITES= SF/xmms-a52dec/xmms-a52dec/1.0
DISTNAME= xmms-a52dec-1.0
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index a82be1351947..83b67795533c 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmms-tfmx
PORTVERSION= 0.5
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= XMMS Input plugin for playing TFMX tunes
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index 258ff96d5769..a97174d82e00 100644
--- a/audio/xmms-volnorm/Makefile
+++ b/audio/xmms-volnorm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= volnorm
PORTVERSION= 0.8.3
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= xmms-
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 345f6fae38c3..f80622496caf 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.6
PORTREVISION= 1
DISTVERSIONSUFFIX=DrMattDestruction
CATEGORIES?= audio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction
MAINTAINER= ports@FreeBSD.org
COMMENT?= Rewrite of xmms as a client/server system (developer release)
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index b521f26446a8..bc3afb1785c6 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xmp
PORTVERSION= 2.5.1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A player for many different Amiga and PC module formats
diff --git a/audio/xoscope/Makefile b/audio/xoscope/Makefile
index a03aad8daa25..76f8bd63beb4 100644
--- a/audio/xoscope/Makefile
+++ b/audio/xoscope/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xoscope
PORTVERSION= 1.12
CATEGORIES= audio hamradio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xoscope
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= db@FreeBSD.org
diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile
index 044a8e07d197..e71789339201 100644
--- a/audio/xsynth-dssi/Makefile
+++ b/audio/xsynth-dssi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xsynth-dssi
PORTVERSION= 0.9.0
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dssi
+MASTER_SITES= SF/dssi/${PORTNAME}/${PORTVERSION}
MAINTAINER= trasz@FreeBSD.org
COMMENT= Classic analog style software synthesizer
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index 903c5a535f09..81ec44cc0c68 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= yammi
PORTVERSION= 1.2.3
PORTREVISION= 7
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A QT-based music manager with fuzzy search
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index f718cb6a0543..5f65c45f29a2 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -9,9 +9,9 @@ PORTNAME= yamt
PORTVERSION= 0.5
PORTREVISION= 8
CATEGORIES= audio gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= demon@FreeBSD.org
COMMENT= Yet Another Mp3 Tool which helps you to organize your mp3s
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index 9efd298c6cbf..1fc21d6e1717 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -9,8 +9,7 @@ PORTNAME= zynaddsubfx
PORTVERSION= 2.2.1
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= zynaddsubfx
+MASTER_SITES= SF
DISTNAME= ZynAddSubFX-${PORTVERSION}
PATCH_SITES= http://www.student.nada.kth.se/~d00-llu/code_patches/