46 files changed, 48 insertions, 91 deletions

diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index 9ce9197d8aed..3be10c652a6d 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	aldo
 PORTVERSION=	0.7.5
 PORTREVISION=	2
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	lambert@lambertfam.org
 COMMENT=	Morse code training program
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile
index 6b0658549b55..d5a00abff3ba 100644
--- a/comms/bpl+/Makefile
+++ b/comms/bpl+/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	bpl+
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	max
+MASTER_SITES=	LOCAL/max
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index d24a81e27894..894393ad86a6 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	0.4.1
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://chirp.danplanet.com/download/${PORTVERSION}/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Chirp is a free, open-source tool for programming your amateur radio
diff --git a/comms/chu/Makefile b/comms/chu/Makefile
index 35fb2250d03e..ef3f15ac1a8d 100644
--- a/comms/chu/Makefile
+++ b/comms/chu/Makefile
@@ -4,9 +4,8 @@
 PORTNAME=	chu
 PORTVERSION=	0.1.29
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+MASTER_SITES=	SUNSITE/system/admin/time \
 		http://www.rossi.com/chu/
-MASTER_SITE_SUBDIR=	system/admin/time
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Synchronise computer clock to CHU radio station
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index e93770046278..cc731163b214 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.8.2
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.cqrlog.com/files/cqrlog_${PORTVERSION}/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	shurd
+		LOCAL/shurd
 DISTNAME=	${PORTNAME}_${PORTVERSION}.src
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/cwdaemon/Makefile b/comms/cwdaemon/Makefile
index 66a7435d06c9..4bdf1d6101b3 100644
--- a/comms/cwdaemon/Makefile
+++ b/comms/cwdaemon/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	cwdaemon
 PORTVERSION=	0.9.4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.chronos.org.uk/download/ \
-		    ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio cw (Morse code) keyer daemon
diff --git a/comms/ebook2cw/Makefile b/comms/ebook2cw/Makefile
index 4f79dcabb607..fa09a311b696 100644
--- a/comms/ebook2cw/Makefile
+++ b/comms/ebook2cw/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	ebook2cw
 PORTVERSION=	0.8.2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://fkurz.net/ham/ebook2cw/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Convert text files into cw as an mp3 or ogg file
diff --git a/comms/ebook2cwgui/Makefile b/comms/ebook2cwgui/Makefile
index ac44f7990fa1..c3d7c0af3a64 100644
--- a/comms/ebook2cwgui/Makefile
+++ b/comms/ebook2cwgui/Makefile
@@ -6,8 +6,7 @@ PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://fkurz.net/ham/ebook2cw/ \
 		http://distfiles.bsdjunk.com/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	gui front end for ebooks2cw
diff --git a/comms/esmska/Makefile b/comms/esmska/Makefile
index 3fb2e41ce885..59d5f4414d6f 100644
--- a/comms/esmska/Makefile
+++ b/comms/esmska/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	esmska
 PORTVERSION=	0.21
 CATEGORIES=	comms java
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	gamato@users.sf.net
 COMMENT=	Program for sending SMS over the Internet
diff --git a/comms/fl_moxgen/Makefile b/comms/fl_moxgen/Makefile
index 6d03a5dc9cd9..30d49b2ea3b1 100644
--- a/comms/fl_moxgen/Makefile
+++ b/comms/fl_moxgen/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	fl_moxgen
 PORTVERSION=	1.00
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	flmoxgen
+MASTER_SITES=	SF/flmoxgen
 DISTNAME=	Fl_MoxGen-${PORTVERSION}
 
 MAINTAINER=	shurd@FreeBSD.org
diff --git a/comms/fllog/Makefile b/comms/fllog/Makefile
index 92a5ab3175b7..edc31945006c 100644
--- a/comms/fllog/Makefile
+++ b/comms/fllog/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	fllog
 PORTVERSION=	1.2.0
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/fllog/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	shurd
+		LOCAL/shurd
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Ham Radio logging program
diff --git a/comms/flrig/Makefile b/comms/flrig/Makefile
index 0350f48244ab..e7748238638a 100644
--- a/comms/flrig/Makefile
+++ b/comms/flrig/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	flrig
 PORTVERSION=	1.3.22
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/flrig/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Ham Radio rig control program, cooperates with fldigi
diff --git a/comms/flwrap/Makefile b/comms/flwrap/Makefile
index 4a0f1a6f8b16..6584bf8a2f07 100644
--- a/comms/flwrap/Makefile
+++ b/comms/flwrap/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.3.4
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/flwrap/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Flwrap is a companion utility for fldigi
diff --git a/comms/geoid/Makefile b/comms/geoid/Makefile
index 7a656c0a128e..364f38b623a7 100644
--- a/comms/geoid/Makefile
+++ b/comms/geoid/Makefile
@@ -6,8 +6,7 @@ PORTREVISION=	7
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/LinuxApps/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 DISTNAME=	fl_geoid
 EXTRACT_SUFX=	.src.tar.gz
 
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 3a192afa02d3..c2279d8fe422 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	3.7.4
 PORTREVISION=	2
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
diff --git a/comms/gtkmmorse/Makefile b/comms/gtkmmorse/Makefile
index 5b4c5b8d2b13..7a8374bde7d0 100644
--- a/comms/gtkmmorse/Makefile
+++ b/comms/gtkmmorse/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gtkmmorse
 PORTVERSION=	0.9.27
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Graphical Morse Code Trainer
diff --git a/comms/ibp/Makefile b/comms/ibp/Makefile
index 45c43dbbe4cc..0e7241ad78fe 100644
--- a/comms/ibp/Makefile
+++ b/comms/ibp/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.21
 PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Little program for monitoring amateur radio beacons
diff --git a/comms/kb/Makefile b/comms/kb/Makefile
index ac6dce3dfef4..a1091ab3deec 100644
--- a/comms/kb/Makefile
+++ b/comms/kb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	8.04
 PORTREVISION=	8
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.db.net/downloads/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 DISTFILES=	kb_src-${PORTVERSION}.tar.gz kb_inst-${PORTVERSION}.tar.gz
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/libfec/Makefile b/comms/libfec/Makefile
index 9330e2b0ab24..9aec53b85f79 100644
--- a/comms/libfec/Makefile
+++ b/comms/libfec/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	3.0.1
 PORTREVISION=	1
 CATEGORIES=	comms astro hamradio math
 MASTER_SITES=	http://www.ka9q.net/code/fec/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 DISTNAME=	fec-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index a398eb9aae12..8a1ddad5e474 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	linpsk
 PORTVERSION=	1.2
 CATEGORIES=	comms hamradio
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Simple Qt PSK31, RTTY, and MSK31 client
diff --git a/comms/locator/Makefile b/comms/locator/Makefile
index 834142075037..520a3bb3467c 100644
--- a/comms/locator/Makefile
+++ b/comms/locator/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	locator
 PORTVERSION=	0.1
 CATEGORIES=	comms hamradio astro geography
-MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/ham/}
+MASTER_SITES=	SUNSITE/apps/ham/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Grid square calculator program used in Amateur Radio and GPS work
diff --git a/comms/morse/Makefile b/comms/morse/Makefile
index 748a318494e2..dc6258ef0609 100644
--- a/comms/morse/Makefile
+++ b/comms/morse/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	morse
 PORTVERSION=	2.5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.catb.org/~esr/morse/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Morse Code Trainer
diff --git a/comms/nasawash/Makefile b/comms/nasawash/Makefile
index 93294c66dcd4..683c2c19f3a7 100644
--- a/comms/nasawash/Makefile
+++ b/comms/nasawash/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	nasawash
 PORTVERSION=	0.50
 CATEGORIES=	comms hamradio
 MASTER_SITES=	ftp://ftp.amsat.org/amsat/software/Linux/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 DISTNAME=	nasawash
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/nec2c/Makefile b/comms/nec2c/Makefile
index fac68676e4c4..af071b96f13e 100644
--- a/comms/nec2c/Makefile
+++ b/comms/nec2c/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	.9
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://nec-archives.pa3kj.com/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 DISTNAME=	nec2c
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/o2sms/Makefile b/comms/o2sms/Makefile
index 95c963416a53..f5faf6c37b4a 100644
--- a/comms/o2sms/Makefile
+++ b/comms/o2sms/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	o2sms
 PORTVERSION=	3.36
 PORTREVISION=	1
 CATEGORIES=	comms perl5
-MASTER_SITES=	CPAN \
+MASTER_SITES=	CPAN/WWW/MACKERS \
 		http://www.mackers.com/projects/o2sms/releases/
-MASTER_SITE_SUBDIR=	WWW/MACKERS
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Send SMS messages via the websites of Irish mobile operators
diff --git a/comms/picocom/Makefile b/comms/picocom/Makefile
index d74cffaca5d1..da8b31e0047c 100644
--- a/comms/picocom/Makefile
+++ b/comms/picocom/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	picocom
 PORTVERSION=	1.7
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Dumb Terminal Emulator
diff --git a/comms/predict/Makefile b/comms/predict/Makefile
index e5d96d00f553..dc415e1c607e 100644
--- a/comms/predict/Makefile
+++ b/comms/predict/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	predict
 PORTVERSION=	2.2.3
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	ftp://ftp.amsat.org/amsat/software/Linux/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Satellite tracking program for amateur radio satellites
diff --git a/comms/pyla/Makefile b/comms/pyla/Makefile
index b4c10470656a..802c8a88b718 100644
--- a/comms/pyla/Makefile
+++ b/comms/pyla/Makefile
@@ -5,11 +5,9 @@ PORTNAME=	pyla
 PORTVERSION=	1.1.7.1
 CATEGORIES=	comms python
 #MASTER_SITES=	http://www.teamsw.it/pyla/download/
-MASTER_SITES=   ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=     mr
+MASTER_SITES=   LOCAL/mr
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyla${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mike@Reifenberger.com
 COMMENT=	Hylafax client written in Python
@@ -19,7 +17,7 @@ COMMENT=	Hylafax client written in Python
 WRKSRC=		${WRKDIR}/${PORTNAME}
 DATADIR=	${PREFIX}/lib/pyla
 
-USES=		python
+USES=		python tar:tgz
 PLIST=		${WRKDIR}/pkg-plist
 
 do-build:
diff --git a/comms/qrq/Makefile b/comms/qrq/Makefile
index 72b39dce7653..33043228f3a1 100644
--- a/comms/qrq/Makefile
+++ b/comms/qrq/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	0.3.1
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://fkurz.net/ham/qrq/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Morse telegraphy trainer similar to the classic DOS version by DL4MM
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index bce95898ba51..d8fba3e5a6d9 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	8.2.11
 PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://users.telenet.be/on4qz/qsstv/downloads/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	shurd
+		LOCAL/shurd
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index e9235504439a..2ca5bbdb3365 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	quisk
 PORTVERSION=	3.6.22
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://james.ahlstrom.name/quisk/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=shurd
+		LOCAL/shurd
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Software Defined Radio (SDR)
diff --git a/comms/soundmodem/Makefile b/comms/soundmodem/Makefile
index a34a4f8e6517..a9131ffc7628 100644
--- a/comms/soundmodem/Makefile
+++ b/comms/soundmodem/Makefile
@@ -6,8 +6,7 @@ CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.baycom.org/~tom/ham/soundmodem/ \
 		http://soundmodem.vk4msl.yi.org/ \
 		http://pv529.ncsrv.de/soundmodem/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	shurd
+		LOCAL/shurd
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio sound modem
diff --git a/comms/splat/Makefile b/comms/splat/Makefile
index 7d10bc154049..d262753acd8c 100644
--- a/comms/splat/Makefile
+++ b/comms/splat/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	splat
 PORTVERSION=	1.4.0
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/ham
+MASTER_SITES=	SUNSITE/apps/ham
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Used in calculating path losses, useful to ham radio and others
diff --git a/comms/sredird/Makefile b/comms/sredird/Makefile
index 3d8b1f1db3f7..eefe865d269c 100644
--- a/comms/sredird/Makefile
+++ b/comms/sredird/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	sredird
 PORTVERSION=	2.2.2
 PORTREVISION=	1
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	system/serial
+MASTER_SITES=	SUNSITE/system/serial
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RFC 2217 compliant serial port redirector
diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile
index 2ff190041aa4..476968355502 100644
--- a/comms/usrp/Makefile
+++ b/comms/usrp/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	usrp
 PORTVERSION=	3.4.3
 PORTREVISION=	4
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	adrian
+MASTER_SITES=	LOCAL/adrian
 DISTNAME=	Ettus-USRP-3.4.3
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/vrflash/Makefile b/comms/vrflash/Makefile
index 1daa9284f1b8..0c3d9b49c454 100644
--- a/comms/vrflash/Makefile
+++ b/comms/vrflash/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	vrflash
 PORTVERSION=	0.20
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES=	LOCAL/dinoex
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Flash kernels and romdisks to the Agenda VR3
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 901d2b03e11d..2e015cc955cc 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -5,8 +5,7 @@ VERSION=	9.1
 PORTREVISION=	10
 DISTVERSION=	${VERSION}.r${SVN_REV}
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+MASTER_SITES=	LOCAL/db
 DISTNAME=	wsjt-r${SVN_REV}
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 3403a8252f1c..3872e3435f51 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	wspr
 DISTVERSION=	${VERSION}.r${SVN_REV}
 PORTREVISION=	3
 CATEGORIES=	comms hamradio
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+MASTER_SITES=	LOCAL/db
 DISTNAME=	wspr-r${SVN_REV}
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/wwl/Makefile b/comms/wwl/Makefile
index 5d1b35eaa91c..8f3f8a2452c9 100644
--- a/comms/wwl/Makefile
+++ b/comms/wwl/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	wwl
 PORTVERSION=	1.3
 CATEGORIES=	comms hamradio astro geography
 MASTER_SITES=	http://www.db.net/downloads/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 DISTNAME=	${PORTNAME}+db-${PORTVERSION}
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/wy60/Makefile b/comms/wy60/Makefile
index edd6003be1ef..afd9368fb3f7 100644
--- a/comms/wy60/Makefile
+++ b/comms/wy60/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	wy60
 PORTVERSION=	2.0.9
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Curses-based emulator for the Wyse 60 terminal
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile
index 6898a474e384..3f5d92f06c2d 100644
--- a/comms/xdx/Makefile
+++ b/comms/xdx/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	2.4
 PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.chronos.org.uk/download/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	Amateur Radio DX cluster monitor
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 4fc0a8f59789..f9034751be56 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	xlog
 PORTVERSION=	2.0.13
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SAVANNAH
-MASTER_SITE_SUBDIR=	xlog
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Amateur Radio logging application
diff --git a/comms/xnec2c/Makefile b/comms/xnec2c/Makefile
index 6f987d00cb6d..212c26d8edf9 100644
--- a/comms/xnec2c/Makefile
+++ b/comms/xnec2c/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xnec2c
 PORTVERSION=	3.3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.qsl.net/5b4az/pkg/nec2/xnec2c/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	shurd
+		LOCAL/shurd
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Used to calculate antenna patterns useful to ham radio
diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile
index 82ef021a0cb1..e02c10e50ecc 100644
--- a/comms/xwota/Makefile
+++ b/comms/xwota/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.4
 PORTREVISION=	7
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://people.fabaris.it/iz0ete/xwota/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	X version of who is on the air
diff --git a/comms/yagiuda/Makefile b/comms/yagiuda/Makefile
index 99b1ebf212f4..c4632f306902 100644
--- a/comms/yagiuda/Makefile
+++ b/comms/yagiuda/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	yagiuda
 PORTVERSION=	1.19
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.g8wrb.org/yagi/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Used to calculate yagi-uda antenna patterns useful to ham radio
diff --git a/comms/yfklog/Makefile b/comms/yfklog/Makefile
index d56846694eef..f06213f5c865 100644
--- a/comms/yfklog/Makefile
+++ b/comms/yfklog/Makefile
@@ -5,11 +5,10 @@ PORTNAME=	yfklog
 PORTVERSION=	0.3.5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://fkurz.net/ham/yfklog/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz yfk.png
+		LOCAL/db
+DISTFILES=	${DISTNAME}.tar.gz yfk.png
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio curses based logging program