aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2015-05-14 18:15:04 +0800
committermat <mat@FreeBSD.org>2015-05-14 18:15:04 +0800
commitd72353c225a0cff8478c442d745a54e4630671fc (patch)
tree627649ff7699a289d5d78c11bf8d105881402ca8 /audio
parent7790dd541328e5000ba710fc478bc5f22ab41cc6 (diff)
downloadfreebsd-ports-gnome-d72353c225a0cff8478c442d745a54e4630671fc.tar.gz
freebsd-ports-gnome-d72353c225a0cff8478c442d745a54e4630671fc.tar.zst
freebsd-ports-gnome-d72353c225a0cff8478c442d745a54e4630671fc.zip
MASTER_SITES cleanup.
- Replace ${MASTER_SITE_FOO} with FOO. - Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9% of the time.) - Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and no hint of what it should be was present. - Fix some logic. - And generally, make things more simple and easy to understand. While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and SAMBA macros. Also, replace some EXTRACT_SUFX occurences with USES=tar:*. Checked by: make fetch-urlall-list With hat: portmgr Sponsored by: Absolight
Diffstat (limited to 'audio')
-rw-r--r--audio/alsa-lib/Makefile2
-rw-r--r--audio/alsa-plugins/Makefile2
-rw-r--r--audio/alsa-utils/Makefile2
-rw-r--r--audio/amarok-kde4/Makefile3
-rw-r--r--audio/beast/Makefile3
-rw-r--r--audio/cam/Makefile3
-rw-r--r--audio/ccaudio2/Makefile3
-rw-r--r--audio/cdplay/Makefile3
-rw-r--r--audio/dagrab/Makefile3
-rw-r--r--audio/dir2ogg/Makefile3
-rw-r--r--audio/dtmfdial/Makefile3
-rw-r--r--audio/eawpats/Makefile2
-rw-r--r--audio/eawplus/Makefile3
-rw-r--r--audio/etcd/Makefile3
-rw-r--r--audio/festdoc/Makefile3
-rw-r--r--audio/festival/Makefile3
-rw-r--r--audio/festlex-cmu/Makefile3
-rw-r--r--audio/festlex-oald/Makefile3
-rw-r--r--audio/festlex-poslex/Makefile3
-rw-r--r--audio/festvox-don/Makefile3
-rw-r--r--audio/festvox-el11/Makefile3
-rw-r--r--audio/festvox-kal16/Makefile3
-rw-r--r--audio/festvox-kal8/Makefile3
-rw-r--r--audio/festvox-ked16/Makefile3
-rw-r--r--audio/festvox-ked8/Makefile3
-rw-r--r--audio/festvox-rab16/Makefile3
-rw-r--r--audio/festvox-rab8/Makefile3
-rw-r--r--audio/festvox-russian/Makefile3
-rw-r--r--audio/flake/Makefile3
-rw-r--r--audio/funktrackergold/Makefile6
-rw-r--r--audio/gmixer/Makefile3
-rw-r--r--audio/gnomoradio/Makefile3
-rw-r--r--audio/gnupod/Makefile3
-rw-r--r--audio/gtkguitune/Makefile2
-rw-r--r--audio/harp/Makefile3
-rw-r--r--audio/id3ed/Makefile3
-rw-r--r--audio/julius/Makefile3
-rw-r--r--audio/libaudiofile/Makefile3
-rw-r--r--audio/libworkman/Makefile3
-rw-r--r--audio/linux-f10-pulseaudio-libs/Makefile3
-rw-r--r--audio/lollypop/Makefile3
-rw-r--r--audio/mehdiaplayer/Makefile2
-rw-r--r--audio/mixer.app/Makefile2
-rw-r--r--audio/mixmos/Makefile2
-rw-r--r--audio/mp32ogg/Makefile3
-rw-r--r--audio/mp3info/Makefile5
-rw-r--r--audio/mp3rename/Makefile2
-rw-r--r--audio/mpdcon/Makefile3
-rw-r--r--audio/nspmod/Makefile3
-rw-r--r--audio/openal/Makefile2
-rw-r--r--audio/opus-tools/Makefile3
-rw-r--r--audio/opus/Makefile3
-rw-r--r--audio/opusfile/Makefile3
-rw-r--r--audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile1
-rw-r--r--audio/play/Makefile2
-rw-r--r--audio/pm3umpdl/Makefile5
-rw-r--r--audio/pms/Makefile1
-rw-r--r--audio/puddletag/Makefile3
-rw-r--r--audio/rawrec/Makefile2
-rw-r--r--audio/rexima/Makefile3
-rw-r--r--audio/s3mod/Makefile5
-rw-r--r--audio/soundgrab/Makefile1
-rw-r--r--audio/soundtracker/Makefile3
-rw-r--r--audio/spek/Makefile2
-rw-r--r--audio/squeezeboxserver-superdatetime/Makefile2
-rw-r--r--audio/streamtuner/Makefile1
-rw-r--r--audio/tcd/Makefile3
-rw-r--r--audio/tosha/Makefile3
-rw-r--r--audio/tuxguitar/Makefile9
-rw-r--r--audio/vagalume/Makefile3
-rw-r--r--audio/vitunes/Makefile3
-rw-r--r--audio/workman/Makefile3
-rw-r--r--audio/xanalyser/Makefile3
-rw-r--r--audio/xfce4-pulseaudio-plugin/Makefile3
-rw-r--r--audio/xmix/Makefile4
-rw-r--r--audio/xmms-ladspa/Makefile3
-rw-r--r--audio/xmms-mailnotify/Makefile3
-rw-r--r--audio/xpi-musicpm/Makefile2
-rw-r--r--audio/xwave/Makefile3
79 files changed, 84 insertions, 146 deletions
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 0e97eaeed6ab..df97ad9e32b2 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -5,7 +5,7 @@ PORTNAME= alsa-lib
PORTVERSION= 1.0.29
CATEGORIES= audio
MASTER_SITES= ALSA/lib \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= ALSA compatibility library
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index e38153b5ec16..63be5ff70713 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -5,7 +5,7 @@ PORTNAME= alsa-plugins
PORTVERSION= 1.0.29
CATEGORIES= audio
MASTER_SITES= ALSA/plugins \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= ALSA compatibility library plugins
diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index e09a17400f33..3144452753f3 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -5,7 +5,7 @@ PORTNAME= alsa-utils
PORTVERSION= 1.0.29
CATEGORIES= audio
MASTER_SITES= ALSA/utils \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= jbeich@FreeBSD.org
COMMENT= ALSA compatibility utils
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 0860f5ad0758..319140cfadc5 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,8 +5,7 @@ PORTNAME= amarok
PORTVERSION= 2.8.0
PORTREVISION= 5
CATEGORIES= audio kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE music player
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 03452d095be6..2be9f375c9ae 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -5,8 +5,7 @@ PORTNAME= beast
PORTVERSION= 0.7.8
PORTREVISION= 8
CATEGORIES= audio
-MASTER_SITES= http://dist.testbit.eu/beast/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${PORTVERSION:R}
+MASTER_SITES= http://dist.testbit.eu/beast/v${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful music composition and modular synthesis application
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index 548e4e605efe..f404a59b8c10 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cam
PORTVERSION= 1.02
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= SUNSITE/apps/sound/mixers
MAINTAINER= ports@FreeBSD.org
COMMENT= Cpu's Audio Mixer [curses based]
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index b6cf09bc9229..4bd8dd1fc775 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ccaudio2
PORTVERSION= 2.1.3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=ccaudio
+MASTER_SITES= GNU/ccaudio
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ class framework for manipulating audio files
diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile
index 71a3e8eb378f..4f7aa634cdbc 100644
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cdplay
PORTVERSION= 0.92
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dannyboy
+MASTER_SITES= LOCAL/dannyboy
MAINTAINER= ports@FreeBSD.org
COMMENT= CD-player with text-based user interface
diff --git a/audio/dagrab/Makefile b/audio/dagrab/Makefile
index 8626b2d65e93..7950091ac75f 100644
--- a/audio/dagrab/Makefile
+++ b/audio/dagrab/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dagrab
PORTVERSION= 0.3.5
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/cdrom
+MASTER_SITES= SUNSITE/apps/sound/cdrom
MAINTAINER= clkao@CirX.ORG
COMMENT= Read audio tracks from a CD into wav sound files
diff --git a/audio/dir2ogg/Makefile b/audio/dir2ogg/Makefile
index 7e1b5e0a650c..549ea09cff5e 100644
--- a/audio/dir2ogg/Makefile
+++ b/audio/dir2ogg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dir2ogg
PORTVERSION= 0.11.8
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= http://jak-linux.org/projects/dir2ogg/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION:R}
+MASTER_SITES= http://jak-linux.org/projects/dir2ogg/${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Command-line {wav,mp3,m4a} to ogg converter
diff --git a/audio/dtmfdial/Makefile b/audio/dtmfdial/Makefile
index d795e22ffed3..2f9dd0407eeb 100644
--- a/audio/dtmfdial/Makefile
+++ b/audio/dtmfdial/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dtmfdial
PORTVERSION= 0.2
CATEGORIES= audio comms
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/misc
+MASTER_SITES= SUNSITE/apps/sound/misc
DISTNAME= dtmf-dial-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/eawpats/Makefile b/audio/eawpats/Makefile
index 1df50f89be0c..3917c902ef1d 100644
--- a/audio/eawpats/Makefile
+++ b/audio/eawpats/Makefile
@@ -5,7 +5,7 @@ PORTNAME= eawpats
PORTVERSION= 12
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
DISTNAME= eawpats12_full
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/eawplus/Makefile b/audio/eawplus/Makefile
index 934c19632346..149285072e76 100644
--- a/audio/eawplus/Makefile
+++ b/audio/eawplus/Makefile
@@ -5,8 +5,7 @@ PORTNAME= eawplus
PORTVERSION= 12.1
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nork
+MASTER_SITES= LOCAL/nork
MAINTAINER= ports@FreeBSD.org
COMMENT= E.A.W.+Izumo+Tamuki collection of Gravis Ultrasound MIDI patches
diff --git a/audio/etcd/Makefile b/audio/etcd/Makefile
index c9aab0c35f58..d82bcab65ed5 100644
--- a/audio/etcd/Makefile
+++ b/audio/etcd/Makefile
@@ -5,10 +5,9 @@ PORTNAME= etcd
PORTVERSION= 1.0.1
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/gahr \
http://people.freebsd.org/~gahr/distfiles/ \
http://www.gahr.ch/etcd/
-MASTER_SITE_SUBDIR= gahr
MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced Tiny CD, a simple ncurses-based CD player
diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index 293f1246bed4..5f86c4179c01 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= festdoc
PORTVERSION= 1.4.0.1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DIST_SUBDIR= festival
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 2894748bc6c6..2c108c8175b8 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festival
PORTVERSION= 2.1
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTFILES= ${DISTNAME}-release.tar.gz \
speech_tools-${PORTVERSION}-release.tar.gz
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index 50a913fe42b7..86ba7d5eb761 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -4,8 +4,7 @@
PORTNAME= festlex-cmu
PORTVERSION= 1.95
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festlex_CMU
DIST_SUBDIR= festival
EXTRACT_ONLY=
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index 439978bc731d..e8c165f78a26 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festlex-oald
PORTVERSION= 1.4.1
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festlex_OALD
DIST_SUBDIR= festival
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index 75df1ab1ac45..cdb864b0150d 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festlex-poslex
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festlex_POSLEX
DIST_SUBDIR= festival
EXTRACT_ONLY=
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index f648062222b3..9561491d6435 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-don
PORTVERSION= 1.4.0
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_don
DIST_SUBDIR= festival
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 9f97a5ab394c..f65d5217afb2 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-el11
PORTVERSION= 1.4.0
PORTREVISION= 2
CATEGORIES= audio accessibility spanish
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.95
+MASTER_SITES= FESTIVAL/1.95
DISTNAME= festvox_ellpc11k
DIST_SUBDIR= festival
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 6e020d806884..cef597111442 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -4,8 +4,7 @@
PORTNAME= festvox-kal16
PORTVERSION= 1.4.0
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kallpc16k
DIST_SUBDIR= festival
EXTRACT_ONLY=
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index d9b9517312c4..21307d7f9510 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-kal8
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kallpc8k
DIST_SUBDIR= festival
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index 157355703ece..a8ac324ceb8b 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-ked16
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kedlpc16k
DIST_SUBDIR= festival
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index d336a7d75419..0cd4d5c9ed62 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-ked8
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= 1.4.1
+MASTER_SITES= FESTIVAL/1.4.1
DISTNAME= festvox_kedlpc8k
DIST_SUBDIR= festival
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 3ad716b786f1..0801dd8a6b16 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-rab16
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festvox_rablpc16k
DIST_SUBDIR= festival
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 2bfd06b83c75..16ebfc65235c 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox-rab8
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= audio accessibility
-MASTER_SITES= ${MASTER_SITE_FESTIVAL}
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+MASTER_SITES= FESTIVAL
DISTNAME= festvox_rablpc8k
DIST_SUBDIR= festival
diff --git a/audio/festvox-russian/Makefile b/audio/festvox-russian/Makefile
index 79863e8b1410..606eab51e19e 100644
--- a/audio/festvox-russian/Makefile
+++ b/audio/festvox-russian/Makefile
@@ -5,8 +5,7 @@ PORTNAME= festvox
PORTVERSION= 0.5
CATEGORIES= audio
MASTER_SITES= SF/festlang.berlios/ \
- ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= festlang
+ BERLIOS/festlang
PKGNAMESUFFIX= -russian
DISTNAME= msu_ru_nsh_clunits-${PORTVERSION}
DIST_SUBDIR= festival
diff --git a/audio/flake/Makefile b/audio/flake/Makefile
index 4dd36423dd69..cadc1dbbc159 100644
--- a/audio/flake/Makefile
+++ b/audio/flake/Makefile
@@ -4,8 +4,7 @@
PORTNAME= flake
PORTVERSION= 0.11
CATEGORIES= audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}-enc/${PORTNAME:tl}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME:tl}-enc/${PORTNAME:tl}/${PORTVERSION}
MAINTAINER= dbn@FreeBSD.org
COMMENT= FLAC audio encoder
diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile
index 6e4b7147ca42..de3594cf11b3 100644
--- a/audio/funktrackergold/Makefile
+++ b/audio/funktrackergold/Makefile
@@ -2,12 +2,10 @@
# $FreeBSD$
PORTNAME= funktrackergold
-PORTVERSION= 1.5.2
+DISTVERSION= 1.5-2
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
-DISTNAME= funktrackergold-1.5-2
+MASTER_SITES= SUNSITE/apps/sound/players
MAINTAINER= ports@FreeBSD.org
COMMENT= Curses MOD/FNK music tracker
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index 75298e65c4fa..8b5689e96411 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gmixer
PORTVERSION= 0.98c
PORTREVISION= 6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cpiazza
+MASTER_SITES= LOCAL/cpiazza
MAINTAINER= ports@FreeBSD.org
COMMENT= X11/gtk+ mixer control
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index c8a2c72bb12e..2d8b04a959c0 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gnomoradio
PORTVERSION= 0.15.1
PORTREVISION= 18
CATEGORIES= audio net
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Program for finding and playing free music from the Internet
diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index f3655c712c9f..56b4bfeef55e 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -5,9 +5,8 @@ PORTNAME= gnupod
PORTVERSION= 0.99.8
PORTREVISION= 2
CATEGORIES= audio perl5
-MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
+MASTER_SITES= SAVANNAH \
http://www.blinkenlights.ch/gnupod-dist/stable/
-MASTER_SITE_SUBDIR= gnupod
MAINTAINER= ports@FreeBSD.org
COMMENT= Set of Perl scripts for using an Apple iPod
diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile
index 74444404bea2..7c41c225dcd9 100644
--- a/audio/gtkguitune/Makefile
+++ b/audio/gtkguitune/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.8
DISTVERSIONPREFIX= gtk2-
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://www.oocities.org/harpin_floh/mysoft/
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index fdf4cee79136..896e09c3fe9a 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -4,8 +4,7 @@ PORTNAME= harp
PORTVERSION= 0.5.2
PORTREVISION= 5
CATEGORIES= audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= heckendorfc@gmail.com
COMMENT= Minimalist audio player
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index ee96ddbe0d3c..bb37ba2452cc 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -4,13 +4,14 @@
PORTNAME= id3ed
PORTVERSION= 1.10.4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
MAINTAINER= turutani@scphys.kyoto-u.ac.jp
COMMENT= Id3 tag editor for mp3 files
LICENSE= GPLv2
+BROKEN= Unfetchable
GNU_CONFIGURE= yes
PLIST_FILES= bin/id3ed \
diff --git a/audio/julius/Makefile b/audio/julius/Makefile
index e410d75d4750..5ace26ac95db 100644
--- a/audio/julius/Makefile
+++ b/audio/julius/Makefile
@@ -5,8 +5,7 @@ PORTNAME= julius
PORTVERSION= 4.1.2
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= julius/37582
+MASTER_SITES= SFJP/julius/37582
MAINTAINER= numisemis@yahoo.com
COMMENT= Large Vocabulary Continuous Speech Recognition Engine
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 0f3ed13e0ecd..983b780166d5 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -6,8 +6,7 @@ PORTNAME= libaudiofile
PORTVERSION= 0.3.6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/lib//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/${PORTNAME:S/lib//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= audiofile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index 2db5f374b088..5c690052e8dc 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libworkman
PORTVERSION= 1.4
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jim
+MASTER_SITES= LOCAL/jim
DISTNAME= ${PORTNAME}-1999-06-20
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/linux-f10-pulseaudio-libs/Makefile b/audio/linux-f10-pulseaudio-libs/Makefile
index fc7c74f4a7b0..ca7d5a55e79c 100644
--- a/audio/linux-f10-pulseaudio-libs/Makefile
+++ b/audio/linux-f10-pulseaudio-libs/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pulseaudio-libs
PORTVERSION= 0.9.14
CATEGORIES= audio linux
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
+MASTER_SITES= LOCAL/netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for PulseAudio clients (Linux Fedora 10)
diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index 7f4ebaefeb1f..5e002d1411bb 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -4,8 +4,7 @@
PORTNAME= lollypop
PORTVERSION= 0.9.15
CATEGORIES= audio
-MASTER_SITES= https://github.com/gnumdk/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/download/${PORTVERSION}
+MASTER_SITES= https://github.com/gnumdk/${PORTNAME}/releases/download/${PORTVERSION}/
MAINTAINER= olivierd@FreeBSD.org
COMMENT= Play and organize your music collection
diff --git a/audio/mehdiaplayer/Makefile b/audio/mehdiaplayer/Makefile
index e3b32e25fa1e..13633de22282 100644
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mehdiaplayer
PORTVERSION= 0.2
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= vg@FreeBSD.org
COMMENT= Simple media player using Qt/Phonon
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 925919b9830f..2a731b1c2c1e 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mixer.app
PORTVERSION= 1.8.0
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mixmos/Makefile b/audio/mixmos/Makefile
index 956a976375f4..0a5ee125bd7c 100644
--- a/audio/mixmos/Makefile
+++ b/audio/mixmos/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mixmos
PORTVERSION= 0.2.0
PORTREVISION= 9
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_TUCOWS}
+MASTER_SITES= TUCOWS
MAINTAINER= h.skuhra@gmail.com
COMMENT= GTK2 audio mixer
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index 11173508df7a..a986ed41ced1 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.11
PORTREVISION= 2
CATEGORIES= audio perl5
MASTER_SITES= ftp://ftp.faceprint.com/pub/software/scripts/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
EXTRACT_SUFX= # empty
MAINTAINER= uqs@FreeBSD.org
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index 26592b6f9e23..3f836aec7d05 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -3,10 +3,9 @@
PORTNAME= mp3info
PORTVERSION= 0.8.5
+DISTVERSIONSUFFIX= a
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mp3-utils/mp3info
-DISTNAME= ${PORTNAME}-${PORTVERSION}a
+MASTER_SITES= SUNSITE/apps/sound/mp3-utils/mp3info
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= MP3 technical info viewer and ID3 1.x tag editor
diff --git a/audio/mp3rename/Makefile b/audio/mp3rename/Makefile
index fb17efb3c351..d47a714b3e32 100644
--- a/audio/mp3rename/Makefile
+++ b/audio/mp3rename/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mp3rename
PORTVERSION= 0.6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index bf191e25203c..8a086c7c7d1e 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -4,8 +4,7 @@ PORTNAME= mpdcon
PORTVERSION= 1.5.1
PORTREVISION= 2
CATEGORIES= audio gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= MPDCon-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index efa452da1462..d512917db4af 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -4,8 +4,7 @@
PORTNAME= nspmod
PORTVERSION= 0.1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
+MASTER_SITES= SUNSITE/apps/sound/players
MAINTAINER= ports@FreeBSD.org
COMMENT= MOD/S3M/MTM tracker that does its own DSP, uses VoxWare v2.90+
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 445615e2c978..54ff84767606 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -5,7 +5,7 @@ PORTNAME= openal
PORTVERSION= 20060211
PORTREVISION= 15
CATEGORIES= audio
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
DISTVERSION= 0.0.8
MAINTAINER= erik@bz.bzflag.bz
diff --git a/audio/opus-tools/Makefile b/audio/opus-tools/Makefile
index 4d5f01b92766..08b44cbc3216 100644
--- a/audio/opus-tools/Makefile
+++ b/audio/opus-tools/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.1.9
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
- ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= opus
+ MOZILLA_EXTENDED/opus
MAINTAINER= naddy@FreeBSD.org
COMMENT= Encode, inspect, and decode Opus files
diff --git a/audio/opus/Makefile b/audio/opus/Makefile
index 9635a02d1fcc..2dfe7f792f0c 100644
--- a/audio/opus/Makefile
+++ b/audio/opus/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
- ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= opus
+ MOZILLA_EXTENDED/opus
MAINTAINER= naddy@FreeBSD.org
COMMENT= IETF audio codec
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index 2f38900e8577..e8d7352084c8 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/opus/ \
- ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= opus
+ MOZILLA_EXTENDED/opus
MAINTAINER= liangtai.s16@gmail.com
COMMENT= Opus playback library
diff --git a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
index fa0315d6e685..81f3d773014f 100644
--- a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= audio perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR=Ogg
PKGNAMEPREFIX= p5-
MAINTAINER= dominique.goncalves@gmail.com
diff --git a/audio/play/Makefile b/audio/play/Makefile
index 6bcdf939de03..0be482589c24 100644
--- a/audio/play/Makefile
+++ b/audio/play/Makefile
@@ -5,7 +5,7 @@ PORTNAME= play
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_PORTS_JP}
+MASTER_SITES= PORTS_JP
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple audio file player
diff --git a/audio/pm3umpdl/Makefile b/audio/pm3umpdl/Makefile
index 14fa3f8869f6..2c518d7ade00 100644
--- a/audio/pm3umpdl/Makefile
+++ b/audio/pm3umpdl/Makefile
@@ -7,7 +7,6 @@ CATEGORIES= audio deskutils
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:VVELOX
EXTRACT_SUFX=
-EXTRACT_ONLY=
MAINTAINER= ports@FreeBSD.org
COMMENT= Loading a M3U file into musicpd
@@ -15,11 +14,11 @@ COMMENT= Loading a M3U file into musicpd
RUN_DEPENDS= ${LOCALBASE}/bin/mpc:${PORTSDIR}/audio/musicpc
USES= perl5
-NO_WRKSUBDIR= yes
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
-post-extract:
+do-extract:
+ @${MKDIR} ${WRKSRC}
@${CP} -v ${DISTDIR}/${DISTNAME} ${WRKSRC}
do-build:
diff --git a/audio/pms/Makefile b/audio/pms/Makefile
index 70e6e7ac1b6e..f478322f52b2 100644
--- a/audio/pms/Makefile
+++ b/audio/pms/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.42
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= riggs@FreeBSD.org
COMMENT= ncurses-based client for the Music Player Daemon
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index be61e7f136e2..0c078b92ad3e 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -3,8 +3,7 @@
PORTNAME= puddletag
PORTVERSION= 1.0.5
CATEGORIES= audio python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= pawel@FreeBSD.org
COMMENT= Audio tag editor
diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index 7fd2a360feff..853534ce1703 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -5,7 +5,7 @@ PORTNAME= rawrec
PORTVERSION= 0.9.991
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE:S/%SUBDIR%/apps\/sound\/recorders/} \
+MASTER_SITES= SUNSITE/apps/sound/recorders \
SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/rexima/Makefile b/audio/rexima/Makefile
index ae6d466d85f5..abb28fe30ce6 100644
--- a/audio/rexima/Makefile
+++ b/audio/rexima/Makefile
@@ -4,8 +4,7 @@
PORTNAME= rexima
PORTVERSION= 1.4
CATEGORIES= audio
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= SUNSITE/apps/sound/mixers
MAINTAINER= jerry@freebsd.se
COMMENT= ncurses-based console mixer
diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index 7e89ecc14c43..762ff8fcbe32 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -3,11 +3,10 @@
PORTNAME= s3mod
PORTVERSION= 1.09
+DISTVERSIONPREFIX= v
PORTREVISION= 2
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
+MASTER_SITES= SUNSITE/apps/sound/players
MAINTAINER= ports@FreeBSD.org
COMMENT= MOD/S3M player
diff --git a/audio/soundgrab/Makefile b/audio/soundgrab/Makefile
index 5d6768ba7854..55df71365921 100644
--- a/audio/soundgrab/Makefile
+++ b/audio/soundgrab/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.0.1
PORTREVISION= 2
CATEGORIES= audio perl5
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-MASTER_SITE_SUBDIR= apps/sound/editors
MAINTAINER= ports@FreeBSD.org
COMMENT= Interactively select and save sections of an audio file
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 3ba8d021dc1d..9f59731a5cab 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -5,8 +5,7 @@ PORTNAME= soundtracker
PORTVERSION= 0.6.8
PORTREVISION= 16
CATEGORIES= audio
-MASTER_SITES= http://www.soundtracker.org/dl/%SUBDIR%/
-MASTER_SITE_SUBDIR= v${PORTVERSION:R}
+MASTER_SITES= http://www.soundtracker.org/dl/v${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Mod player/tracking tool which supports XM and MOD formats
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index 1c1af8b147ed..cfdf1bd94999 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -5,7 +5,7 @@ PORTNAME= spek
PORTVERSION= 0.8.2
PORTREVISION= 4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= alexander@kojevnikov.com
COMMENT= Acoustic spectrum analyser
diff --git a/audio/squeezeboxserver-superdatetime/Makefile b/audio/squeezeboxserver-superdatetime/Makefile
index d80b9eb97437..560c5655abba 100644
--- a/audio/squeezeboxserver-superdatetime/Makefile
+++ b/audio/squeezeboxserver-superdatetime/Makefile
@@ -4,7 +4,7 @@
PORTNAME= superdatetime
PORTVERSION= 5.9.16
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= squeezeboxserver-
DISTNAME= SuperDateTime${PORTVERSION}
DIST_SUBDIR= squeezeboxserver
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index b0b33ec34274..41742e0d169b 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.99.99
PORTREVISION= 20
CATEGORIES= audio www
MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+ stream directory browser
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile
index 741cc7d0f010..7f8b4b28a7af 100644
--- a/audio/tcd/Makefile
+++ b/audio/tcd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tcd
PORTVERSION= 2.2.0
PORTREVISION= 8
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple, user-friendly ncurses-based CD player
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index 9056e44eec96..8d758964127c 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -5,8 +5,7 @@ PORTNAME= tosha
PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= audio
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= markp
+MASTER_SITES= LOCAL/markp
MAINTAINER= ports@FreeBSD.org
COMMENT= Read CD digital audio and video data via the SCSI bus
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 469b964d67b8..8d41255f24c2 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -6,12 +6,13 @@ PORTVERSION= 1.2
PORTREVISION= 9
CATEGORIES= audio java
MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
- ${MASTER_SITE_LOCAL}/gahr/:fluid \
+ 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 \
+DISTNAME= ${PORTNAME}-src-${DISTVERSION}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src \
8MBGMSFX.SF2:fluid
-EXTRACT_ONLY= ${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multitrack tablature editor and player
@@ -36,7 +37,7 @@ USE_LDCONFIG= yes
JAVA_VERSION= 1.6+
NOCCACHE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/TuxGuitar
+WRKSRC_SUBDIR= TuxGuitar
OPTIONS_DEFINE= DOCS
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index 47384bc4f03e..0ed2aaee9332 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.8.6
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://vagalume.igalia.com/files/source/ \
- ${MASTER_SITE_DEBIAN_POOL}
-MASTER_SITE_SUBDIR= pool/main/v/vagalume/
+ DEBIAN_POOL/pool/main/v/vagalume/
MAINTAINER= decke@FreeBSD.org
COMMENT= A GTK+-based client for the Last.fm online radio
diff --git a/audio/vitunes/Makefile b/audio/vitunes/Makefile
index 72f78fa048be..c1a08d74368a 100644
--- a/audio/vitunes/Makefile
+++ b/audio/vitunes/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://vitunes.org/files/ \
http://mirror.4bit.ws/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dhn
+ LOCAL/dhn
MAINTAINER= dhn@FreeBSD.org
COMMENT= Curses-based media player with vim-like keybinds
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index ae9733d1ce3a..67cf96caff41 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -5,8 +5,7 @@ PORTNAME= workman
PORTVERSION= 1.3a
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications/WorkMan
+MASTER_SITES= XCONTRIB/applications/WorkMan
DISTNAME= WorkMan-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 1c0e938c53b3..3212edd3341b 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.32
PORTREVISION= 1
CATEGORIES= audio hamradio
MASTER_SITES= http://arvin.schnell-web.net/xanalyser/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= db
+ LOCAL/db
MAINTAINER= db@FreeBSD.org
COMMENT= Spectrum analyser
diff --git a/audio/xfce4-pulseaudio-plugin/Makefile b/audio/xfce4-pulseaudio-plugin/Makefile
index da9e44ce874b..c90488076cbb 100644
--- a/audio/xfce4-pulseaudio-plugin/Makefile
+++ b/audio/xfce4-pulseaudio-plugin/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xfce4-pulseaudio-plugin
PORTVERSION= 0.2.3
CATEGORIES= audio xfce
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index b63a6f81f10d..f292249bdc36 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -5,11 +5,9 @@ PORTNAME= xmix
PORTVERSION= 2.1
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= SUNSITE/apps/sound/mixers
PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
PATCHFILES= xmix-2.1.mixers.patch
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index ae130a62ebe5..780c3863bac3 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.ecs.soton.ac.uk/~njl98r/code/ladspa/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+ LOCAL/arved
DISTNAME= xmms_ladspa-${PORTVERSION}
MAINTAINER= arved@FreeBSD.org
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index 2baea4ebf740..1b72cb973abf 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmms-mailnotify
PORTVERSION= 0.2.0
PORTREVISION= 9
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+MASTER_SITES= LOCAL/arved
MAINTAINER= arved@FreeBSD.org
COMMENT= XMMS plugin, that plays a sound on incoming mail and opens the MUA
diff --git a/audio/xpi-musicpm/Makefile b/audio/xpi-musicpm/Makefile
index 1345ad49abf3..08e8dd8cbab9 100644
--- a/audio/xpi-musicpm/Makefile
+++ b/audio/xpi-musicpm/Makefile
@@ -4,7 +4,7 @@
PORTNAME= musicpm
PORTVERSION= 1.4.4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= mpm_${PORTVERSION}
MAINTAINER= dhn@FreeBSD.org
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index aecbd8034e97..009ce540ebac 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xwave
PORTVERSION= 2.2
PORTREVISION= 3
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= arved
+MASTER_SITES= LOCAL/arved
DISTNAME= ${PORTNAME}${PORTVERSION:S/./v/}
MAINTAINER= a0516@marimga.de