From 60d1a83c2a113150cedbc43ff12a7375144f741a Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 14 May 2015 10:15:04 +0000
Subject: 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
---
sysutils/44bsd-more/Makefile | 3 +--
sysutils/915resolution/Makefile | 3 +--
sysutils/acpica-tools/Makefile | 3 +--
sysutils/afbinit/Makefile | 7 ++-----
sysutils/amrstat/Makefile | 3 +--
sysutils/apcpwr/Makefile | 3 +--
sysutils/apt/Makefile | 2 +-
sysutils/asmon/Makefile | 3 +--
sysutils/asusoled/Makefile | 3 +--
sysutils/backuppc-devel/Makefile | 3 +--
sysutils/batmon/Makefile | 3 +--
sysutils/battray/Makefile | 2 +-
sysutils/bbapm/Makefile | 3 +--
sysutils/boxbackup-devel/Makefile | 3 +--
sysutils/cdf/Makefile | 3 +--
sysutils/cdrdao/Makefile | 1 -
sysutils/cdrtools-devel/Makefile | 3 +--
sysutils/cdrtools/Makefile | 3 +--
sysutils/confctl/Makefile | 3 +--
sysutils/consolehm/Makefile | 3 +--
sysutils/copytape/Makefile | 3 +--
sysutils/crashme/Makefile | 3 +--
sysutils/daemontools/Makefile | 3 +--
sysutils/dvdimagecmp/Makefile | 3 +--
sysutils/farbot/Makefile | 2 +-
sysutils/fortunelock/Makefile | 3 +--
sysutils/fsc/Makefile | 3 +--
sysutils/fusefs-afuse/Makefile | 2 +-
sysutils/fusefs-chironfs/Makefile | 2 +-
sysutils/fusefs-rar2fs/Makefile | 2 +-
sysutils/fusefs-sqlfs/Makefile | 3 +--
sysutils/geomgui/Makefile | 3 +--
sysutils/getdelta/Makefile | 3 +--
sysutils/gigolo/Makefile | 3 +--
sysutils/gkfreq/Makefile | 3 +--
sysutils/gkrellfire/Makefile | 3 +--
sysutils/gkrellm2/Makefile | 3 +--
sysutils/gstopd/Makefile | 3 +--
sysutils/hatop/Makefile | 2 +-
sysutils/heartbeat/Makefile | 3 +--
sysutils/isc-cron/Makefile | 3 +--
sysutils/ldapenter/Makefile | 2 +-
sysutils/less/Makefile | 3 +--
sysutils/libcdio-paranoia/Makefile | 3 +--
sysutils/libcdio/Makefile | 3 +--
sysutils/libchk/Makefile | 3 +--
sysutils/mgeupsd/Makefile | 3 +--
sysutils/mkntpwd/Makefile | 3 +--
sysutils/mksunbootcd/Makefile | 2 +-
sysutils/mountsmb2/Makefile | 3 +--
sysutils/msktutil/Makefile | 2 +-
sysutils/no-login/Makefile | 3 +--
sysutils/open/Makefile | 2 +-
sysutils/p5-BackupPC-XS/Makefile | 3 +--
sysutils/p5-Filesys-DfPortable/Makefile | 1 -
sysutils/p5-Samba-SIDhelper/Makefile | 1 -
sysutils/p5-Sys-Filesystem/Makefile | 1 -
sysutils/p5-arclog/Makefile | 3 +--
sysutils/p5-reslog/Makefile | 3 +--
sysutils/paicc/Makefile | 3 +--
sysutils/pdixtract/Makefile | 3 +--
sysutils/polkit-kde/Makefile | 3 +--
sysutils/py-danzfs/Makefile | 2 +-
sysutils/radmind/Makefile | 3 +--
sysutils/rdate/Makefile | 5 ++---
sysutils/rdiff-backup-devel/Makefile | 7 ++-----
sysutils/rdiff-backup/Makefile | 7 ++-----
sysutils/rfstool/Makefile | 2 +-
sysutils/rsyncbackup/Makefile | 2 +-
sysutils/samesame/Makefile | 3 +--
sysutils/sformat/Makefile | 3 +--
sysutils/slack/Makefile | 2 +-
sysutils/superiotool/Makefile | 3 +--
sysutils/symlinks/Makefile | 3 +--
sysutils/symon/Makefile | 3 +--
sysutils/thefish/Makefile | 3 +--
sysutils/timemon/Makefile | 3 +--
sysutils/ucspi-ssl-tls/Makefile | 3 +--
sysutils/ucspi-ssl/Makefile | 3 +--
sysutils/ucspi-tcp/Makefile | 9 +++------
sysutils/udfclient/Makefile | 5 ++---
sysutils/usermin/Makefile | 3 +--
sysutils/vbetool/Makefile | 3 +--
sysutils/whowatch/Makefile | 3 +--
sysutils/wmbluecpu/Makefile | 3 +--
sysutils/wmcube/Makefile | 3 +--
sysutils/wmmemfree/Makefile | 3 +--
sysutils/xe-guest-utilities/Makefile | 3 +--
sysutils/xfsm/Makefile | 3 +--
sysutils/xin/Makefile | 3 +--
sysutils/xlogmaster/Makefile | 3 +--
sysutils/xsysstats/Makefile | 3 +--
sysutils/zisofs-tools/Makefile | 3 +--
93 files changed, 96 insertions(+), 182 deletions(-)
(limited to 'sysutils')
diff --git a/sysutils/44bsd-more/Makefile b/sysutils/44bsd-more/Makefile
index 7da9e3327132..154055c8ec25 100644
--- a/sysutils/44bsd-more/Makefile
+++ b/sysutils/44bsd-more/Makefile
@@ -4,8 +4,7 @@
PORTNAME= 44bsd-more
PORTVERSION= ${RELDATE}
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cy
+MASTER_SITES= LOCAL/cy
MAINTAINER= cy@FreeBSD.org
COMMENT= The pager installed with FreeBSD before less(1) was imported
diff --git a/sysutils/915resolution/Makefile b/sysutils/915resolution/Makefile
index 52838b3a1ade..5bae447c4b4a 100644
--- a/sysutils/915resolution/Makefile
+++ b/sysutils/915resolution/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.5.3
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= ehaupt
+MASTER_SITES= LOCAL/ehaupt
MAINTAINER= ports@FreeBSD.org
COMMENT= Resolution tool for Intel i915 video cards
diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 03c0e545d3b0..e927d09d083e 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -4,8 +4,7 @@ PORTNAME= acpica
PORTVERSION= 20150410
CATEGORIES= sysutils devel
MASTER_SITES= https://acpica.org/sites/acpica/files/ \
- LOCAL
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
PKGNAMESUFFIX= -tools
DISTNAME= ${PORTNAME}-unix2-${PORTVERSION}
diff --git a/sysutils/afbinit/Makefile b/sysutils/afbinit/Makefile
index b16a74076cd1..69b90490be46 100644
--- a/sysutils/afbinit/Makefile
+++ b/sysutils/afbinit/Makefile
@@ -5,16 +5,13 @@ PORTNAME= afbinit
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= sysutils graphics
-MASTER_SITES= ${MASTER_SITE_DEBIAN:S/$/:afbinit,patch/} \
- http://dlc.sun.com/%SUBDIR%/:microcode
-MASTER_SITE_SUBDIR= pool/contrib/a/afbinit/:afbinit,patch \
- osol/sparc-gfx/downloads/:microcode
+MASTER_SITES= DEBIAN/pool/contrib/a/afbinit/:afbinit,patch \
+ http://dlc.sun.com/osol/sparc-gfx/downloads/:microcode
DISTFILES= ${PORTNAME}_${PORTVERSION}.orig.tar.gz:afbinit \
afb-ucode.tar.bz2:microcode
DIST_SUBDIR= ${PORTNAME}
PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
PATCHFILES= ${PORTNAME}_${PORTVERSION}-4.diff.gz:patch
PATCH_DIST_STRIP= -p1
diff --git a/sysutils/amrstat/Makefile b/sysutils/amrstat/Makefile
index b99ded8b15ff..74429cdd71df 100644
--- a/sysutils/amrstat/Makefile
+++ b/sysutils/amrstat/Makefile
@@ -4,8 +4,7 @@
PORTNAME= amrstat
PORTVERSION= 20070216
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+MASTER_SITES= LOCAL/jkim
MAINTAINER= jkim@FreeBSD.org
COMMENT= Utility for LSI Logic's MegaRAID RAID controllers
diff --git a/sysutils/apcpwr/Makefile b/sysutils/apcpwr/Makefile
index a35bd7e592fa..af2b67c73435 100644
--- a/sysutils/apcpwr/Makefile
+++ b/sysutils/apcpwr/Makefile
@@ -5,8 +5,7 @@ PORTNAME= apcpwr
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= sysutils net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jwd
+MASTER_SITES= LOCAL/jwd
MAINTAINER= ports@FreeBSD.org
COMMENT= Control APC 9211 MasterSwitchs via snmp
diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile
index ba37d89e15cf..52e87bb34670 100644
--- a/sysutils/apt/Makefile
+++ b/sysutils/apt/Makefile
@@ -5,7 +5,7 @@ PORTNAME= apt
PORTVERSION= 0.6.46.4.1
PORTREVISION= 8
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= apt_0.6.46.4-0.1
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index b2a2a45eb436..d38c2ae019e6 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -5,8 +5,7 @@ PORTNAME= asmon
PORTVERSION= 0.61
PORTREVISION= 3
CATEGORIES= sysutils afterstep
-MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR= apps/asmon
+MASTER_SITES= AFTERSTEP/apps/asmon
MAINTAINER= bofh@FreeBSD.org
COMMENT= Swallowable applet monitors the CPU usage, memory, and swap, etc
diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index e967806557a8..99d4c12c9394 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -4,8 +4,7 @@ PORTNAME= asusoled
PORTVERSION= 0.10
PORTREVISION= 10
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+MASTER_SITES= LOCAL/jkim
MAINTAINER= jkim@FreeBSD.org
COMMENT= Utility for ASUS USB OLED Display
diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile
index f318f10b2354..20cbd7e4e32b 100644
--- a/sysutils/backuppc-devel/Makefile
+++ b/sysutils/backuppc-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= backuppc
DISTVERSION= 4.0.0alpha3
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-beta/${DISTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-beta/${DISTVERSION}
PKGNAMESUFFIX= -devel
DISTNAME= BackupPC-${DISTVERSION}
diff --git a/sysutils/batmon/Makefile b/sysutils/batmon/Makefile
index c722aae9a0d8..1e33772af1e3 100644
--- a/sysutils/batmon/Makefile
+++ b/sysutils/batmon/Makefile
@@ -4,8 +4,7 @@ PORTNAME= batmon
PORTVERSION= 0.6
PORTREVISION= 2
CATEGORIES= sysutils gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
MAINTAINER= ports@FreeBSD.org
COMMENT= GNUstep battery monitor for laptops
diff --git a/sysutils/battray/Makefile b/sysutils/battray/Makefile
index d06aca8a2577..d9e7e32fafaf 100644
--- a/sysutils/battray/Makefile
+++ b/sysutils/battray/Makefile
@@ -4,7 +4,7 @@
PORTNAME= battray
PORTVERSION= 1.5
CATEGORIES= sysutils python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= martin@arp242.net
COMMENT= Display notebook battery status in tray
diff --git a/sysutils/bbapm/Makefile b/sysutils/bbapm/Makefile
index 94471a1af42e..12780c2bd9b5 100644
--- a/sysutils/bbapm/Makefile
+++ b/sysutils/bbapm/Makefile
@@ -7,8 +7,7 @@ PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:C/%SUBDIR%/bbtools\/${PORTNAME}\/bbapm-0.0.1-freebsd-patch/}
-PATCH_SITE_SUBDIR= bbtools
+PATCH_SITES= SF/bbtools/${PORTNAME}/bbapm-0.0.1-freebsd-patch
PATCHFILES= bbapm-0.0.1-freebsd-patch-2.diff
PATCH_DIST_STRIP= -p1
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 79f00ac0633e..9cd914fc4490 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -4,7 +4,7 @@
PORTNAME= boxbackup
PORTVERSION= 0.11.r${SVNVERSION:C/^[0-9\.]+_[a-z]+_([0-9]+)/\1/}
CATEGORIES= sysutils
-MASTER_SITES= http://www.boxbackup.org/snapshots/%SUBDIR%/
+MASTER_SITES= http://www.boxbackup.org/snapshots/201108/
PKGNAMESUFFIX= ${CLIENT_OR_SERVER}-devel
DISTNAME= ${PORTNAME}-${SVNVERSION}
@@ -15,7 +15,6 @@ LICENSE= BSD3CLAUSE GPLv2
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE-DUAL.txt
-MASTER_SITE_SUBDIR=201108
SVNVERSION= 0.11_trunk_2979
NO_LATEST_LINK= yes
diff --git a/sysutils/cdf/Makefile b/sysutils/cdf/Makefile
index 7714cf53a8e2..43a63f37647d 100644
--- a/sysutils/cdf/Makefile
+++ b/sysutils/cdf/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cdf
PORTVERSION= 0.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= bmp-plugins
+MASTER_SITES= SF/bmp-plugins
MAINTAINER= novel@FreeBSD.org
COMMENT= Colorized df
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 4ac6be3a78c5..ca0c9f7c34dd 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.2.3
PORTREVISION?= 5
CATEGORIES= sysutils audio
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= cdrdao/cdrdao/${PORTVERSION}
DISTNAME= cdrdao-${PORTVERSION}
MAINTAINER= marius@FreeBSD.org
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 7dd354c4c245..5f409547bfa4 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -21,8 +21,7 @@ PORTNAME= cdrtools
PORTVERSION= 3.01a24
PORTEPOCH= 1
CATEGORIES= sysutils audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/alpha
+MASTER_SITES= SF/${PORTNAME}/alpha
MAINTAINER= marius@FreeBSD.org
COMMENT= CD/DVD/BluRay and ISO-9660 image creation and extraction tools
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index e05eb85277d5..a16722a131c0 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -22,8 +22,7 @@ PORTNAME= cdrtools
PORTVERSION= 3.00
PORTREVISION= 2
CATEGORIES= sysutils audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= marius@FreeBSD.org
COMMENT= CD/DVD/BluRay and ISO-9660 image creation and extraction tools
diff --git a/sysutils/confctl/Makefile b/sysutils/confctl/Makefile
index b6624fbca91b..e26cc88fbdeb 100644
--- a/sysutils/confctl/Makefile
+++ b/sysutils/confctl/Makefile
@@ -5,8 +5,7 @@ PORTNAME= confctl
PORTVERSION= 1.2
CATEGORIES= sysutils
MASTER_SITES= http://cloud.github.com/downloads/trasz/confctl/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= trasz
+ LOCAL/trasz
MAINTAINER= trasz@FreeBSD.org
COMMENT= Utility to parse and modify C-like configuration files
diff --git a/sysutils/consolehm/Makefile b/sysutils/consolehm/Makefile
index 324500da626e..147cf68da6b4 100644
--- a/sysutils/consolehm/Makefile
+++ b/sysutils/consolehm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= consolehm
PORTVERSION= 1.31
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= fenner
+MASTER_SITES= LOCAL/fenner
MAINTAINER= ports@FreeBSD.org
COMMENT= Console based hardware monitor for FreeBSD
diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile
index f12bfa21ebd7..5c935ce3f3f1 100644
--- a/sysutils/copytape/Makefile
+++ b/sysutils/copytape/Makefile
@@ -4,8 +4,7 @@
PORTNAME= copytape
PORTVERSION= 1.0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_COMP_SOURCES}
-MASTER_SITE_SUBDIR= unix/volume10
+MASTER_SITES= COMP_SOURCES/unix/volume10
DISTNAME= copytape
EXTRACT_SUFX= .Z
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 66a3a90c9c82..9d95a018fb6b 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crashme
PORTVERSION= 2.4
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR=kris
+MASTER_SITES= LOCAL/kris
DISTNAME= crashme
MAINTAINER= gjc@alum.mit.edu
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 9796a79be988..a869e9a7e0fd 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -55,8 +55,7 @@ DISTFILES+= ${DISTNAME}-man${MANDATE}.tar.gz:1
.if ${PORT_OPTIONS:MSIGQ12}
#PATCH_SITES+= http://thedjbway.org/patches/:sigq12
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:sigq12/}
-PATCH_SITE_SUBDIR+= bdrewery/${PORTNAME}/:sigq12
+PATCH_SITES+= LOCAL/bdrewery/${PORTNAME}/:sigq12
PATCHFILES+= daemontools-0.76.sigq12.patch:-p2:sigq12
.endif
diff --git a/sysutils/dvdimagecmp/Makefile b/sysutils/dvdimagecmp/Makefile
index eaf783b7e13b..9b50685ea41c 100644
--- a/sysutils/dvdimagecmp/Makefile
+++ b/sysutils/dvdimagecmp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dvdimagecmp
PORTVERSION= 0.3
CATEGORIES= sysutils
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= apps/video
+MASTER_SITES= SUNSITE/apps/video
MAINTAINER= ports@thepentagon.org
COMMENT= Simple tool for comparing an image to a burned disc
diff --git a/sysutils/farbot/Makefile b/sysutils/farbot/Makefile
index e72170b44040..f23433466b6a 100644
--- a/sysutils/farbot/Makefile
+++ b/sysutils/farbot/Makefile
@@ -5,7 +5,7 @@ PORTNAME= farbot
PORTVERSION= 1.0.b2
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= farbot-1.0-beta2
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/fortunelock/Makefile b/sysutils/fortunelock/Makefile
index 2687785cc7c5..060b456a3bba 100644
--- a/sysutils/fortunelock/Makefile
+++ b/sysutils/fortunelock/Makefile
@@ -4,8 +4,7 @@
PORTNAME= fortunelock
PORTVERSION= 0.1.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dannyboy
+MASTER_SITES= LOCAL/dannyboy
MAINTAINER= ports@FreeBSD.org
COMMENT= Locks a terminal while showing fortunes
diff --git a/sysutils/fsc/Makefile b/sysutils/fsc/Makefile
index f3a07eb04113..24d706f79c1a 100644
--- a/sysutils/fsc/Makefile
+++ b/sysutils/fsc/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fsc
PORTVERSION= 1.0.1
PORTREVISION= 3
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= trhodes
+MASTER_SITES= LOCAL/trhodes
MAINTAINER= trhodes@FreeBSD.org
COMMENT= The FreeBSD Services Control family of utilities
diff --git a/sysutils/fusefs-afuse/Makefile b/sysutils/fusefs-afuse/Makefile
index b0b79d29973a..9d43a7aec19d 100644
--- a/sysutils/fusefs-afuse/Makefile
+++ b/sysutils/fusefs-afuse/Makefile
@@ -4,7 +4,7 @@
PORTNAME= afuse
PORTVERSION= 0.4.1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= fusefs-
MAINTAINER= ak@FreeBSD.org
diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile
index 90b9b5e53095..c5c97f1e2f76 100644
--- a/sysutils/fusefs-chironfs/Makefile
+++ b/sysutils/fusefs-chironfs/Makefile
@@ -5,7 +5,7 @@ PORTNAME= chironfs
PORTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= fusefs-
MAINTAINER= leeym@FreeBSD.org
diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile
index 3986aa0fdd31..07414b64ddf0 100644
--- a/sysutils/fusefs-rar2fs/Makefile
+++ b/sysutils/fusefs-rar2fs/Makefile
@@ -5,7 +5,7 @@ PORTNAME= rar2fs
PORTVERSION= 1.15.1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}:rar2fs http://www.rarlab.com/rar/:unrarsrc
+MASTER_SITES= GOOGLE_CODE:rar2fs http://www.rarlab.com/rar/:unrarsrc
PKGNAMEPREFIX= fusefs-
DISTFILES= rar2fs-1.15.1.tar.gz:rar2fs unrarsrc-4.2.4.tar.gz:unrarsrc
diff --git a/sysutils/fusefs-sqlfs/Makefile b/sysutils/fusefs-sqlfs/Makefile
index ff7bd1bd911f..7d81ffbaa947 100644
--- a/sysutils/fusefs-sqlfs/Makefile
+++ b/sysutils/fusefs-sqlfs/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils
-MASTER_SITES= SAVANNAH
-MASTER_SITE_SUBDIR= libsqlfs
+MASTER_SITES= SAVANNAH/libsqlfs
PKGNAMEPREFIX= fusefs-
DISTNAME= lib${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile
index 5854c332f3c4..56b7a5beed6c 100644
--- a/sysutils/geomgui/Makefile
+++ b/sysutils/geomgui/Makefile
@@ -5,8 +5,7 @@ PORTNAME= geomgui
PORTVERSION= 0.13
CATEGORIES= sysutils
MASTER_SITES= http://tinkering.hambrew.net/geomgui/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= xride
+ LOCAL/xride
MAINTAINER= xride@FreeBSD.org
COMMENT= Viewer for kernel geom layer
diff --git a/sysutils/getdelta/Makefile b/sysutils/getdelta/Makefile
index 059f47762f37..d776b3b98ef3 100644
--- a/sysutils/getdelta/Makefile
+++ b/sysutils/getdelta/Makefile
@@ -5,11 +5,10 @@ PORTNAME= getdelta
PORTVERSION= 0.7.8
PORTREVISION= 5
CATEGORIES= sysutils ports-mgmt
-MASTER_SITES= ${MASTER_SITE_GENTOO} \
+MASTER_SITES= GENTOO \
http://132.207.4.160/distfiles/ \
http://distfiles.gentoo.org/distfiles/ \
http://linux01.gwdg.de/~nlissne/
-MASTER_SITE_SUBDIR= distfiles
MAINTAINER= astatutov@gmail.com
COMMENT= Script for reducing bandwidth load while upgrading ports disfiles
diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile
index cc644b653179..10270ed1f02d 100644
--- a/sysutils/gigolo/Makefile
+++ b/sysutils/gigolo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= gigolo
PORTVERSION= 0.4.2
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= XFCE
-MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
MAINTAINER= koalative@gmail.com
COMMENT= Frontend to easily manage filesystem connections
diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile
index ce52a38ed985..0333173b0649 100644
--- a/sysutils/gkfreq/Makefile
+++ b/sysutils/gkfreq/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gkrellm-gkfreq
PORTVERSION= 2.2
#PORTREVISION= 0
CATEGORIES= sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
MAINTAINER= ume@FreeBSD.org
COMMENT= Plugin to GKrellM that displays the current CPU frequencies
diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile
index 1c474fe892ee..e60293112d97 100644
--- a/sysutils/gkrellfire/Makefile
+++ b/sysutils/gkrellfire/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.4.2
PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://freenet-homepage.de/thomas-steinke/ \
- LOCAL
-MASTER_SITE_SUBDIR= novel
+ LOCAL/novel
MAINTAINER= novel@FreeBSD.org
COMMENT= Gkrellm2 plugin which shows the system load as a flame
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 2a2a98676d84..05526ea3666e 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 2.3.5
PORTREVISION= 6
CATEGORIES= sysutils ipv6
MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ume
+ LOCAL/ume
PKGNAMESUFFIX= 2
MAINTAINER= ume@FreeBSD.org
diff --git a/sysutils/gstopd/Makefile b/sysutils/gstopd/Makefile
index 6cfda4aba35c..30c1c1094fbc 100644
--- a/sysutils/gstopd/Makefile
+++ b/sysutils/gstopd/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gstopd
PORTVERSION= 1.1
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= mr
+MASTER_SITES= LOCAL/mr
MAINTAINER= mr@FreeBSD.org
COMMENT= GEOM stop daemon
diff --git a/sysutils/hatop/Makefile b/sysutils/hatop/Makefile
index a7abcc3c5b0b..8e66f9d3e024 100644
--- a/sysutils/hatop/Makefile
+++ b/sysutils/hatop/Makefile
@@ -4,7 +4,7 @@
PORTNAME= hatop
PORTVERSION= 0.7.7
CATEGORIES= sysutils net
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@christianserving.org
COMMENT= Interactive real-time monitoring tool for the HAProxy unix socket
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index c72c250f8f30..155d1e7e3857 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.1.4
PORTREVISION= 24
CATEGORIES= sysutils
#MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kuriyama/heartbeat
+MASTER_SITES= LOCAL/kuriyama/heartbeat
DISTNAME= STABLE-${PORTVERSION}
DIST_SUBDIR= heartbeat
diff --git a/sysutils/isc-cron/Makefile b/sysutils/isc-cron/Makefile
index 720309c7c768..d1f227c5b50a 100644
--- a/sysutils/isc-cron/Makefile
+++ b/sysutils/isc-cron/Makefile
@@ -5,8 +5,7 @@ PORTNAME= isc-cron
PORTVERSION= 4.1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= cron
+MASTER_SITES= ISC/cron
DISTNAME= cron_${PORTVERSION}.shar
EXTRACT_SUFX=
diff --git a/sysutils/ldapenter/Makefile b/sysutils/ldapenter/Makefile
index 7c7dd0252a4b..a11b613b0e72 100644
--- a/sysutils/ldapenter/Makefile
+++ b/sysutils/ldapenter/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ldapenter
PORTVERSION= 0.2.0
PORTREVISION= 1
CATEGORIES= sysutils editors net
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Add/Modify LDAP entries using template forms
diff --git a/sysutils/less/Makefile b/sysutils/less/Makefile
index a4700d0d8e15..51f38dead7c3 100644
--- a/sysutils/less/Makefile
+++ b/sysutils/less/Makefile
@@ -4,9 +4,8 @@
PORTNAME= less
PORTVERSION= 458
CATEGORIES= sysutils
-MASTER_SITES= http://www.greenwoodsoftware.com/%SUBDIR%/ \
+MASTER_SITES= http://www.greenwoodsoftware.com/less/ \
http://bitrote.org/distfiles/
-MASTER_SITE_SUBDIR= less
MAINTAINER= jharris@widomaker.com
COMMENT= Better pager utility
diff --git a/sysutils/libcdio-paranoia/Makefile b/sysutils/libcdio-paranoia/Makefile
index 446ae056f940..130ddac874b8 100644
--- a/sysutils/libcdio-paranoia/Makefile
+++ b/sysutils/libcdio-paranoia/Makefile
@@ -4,8 +4,7 @@ PORTNAME= libcdio-paranoia
PORTVERSION= 10.2+0.90+1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= libcdio
+MASTER_SITES= GNU/libcdio
MAINTAINER= arved@FreeBSD.org
COMMENT= Read audio from the CDROM directly as data
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index d763b8f58640..efd565bde7d7 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libcdio
PORTVERSION= 0.92
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= libcdio
+MASTER_SITES= GNU
MAINTAINER= arved@FreeBSD.org
COMMENT= Compact Disc Input and Control Library
diff --git a/sysutils/libchk/Makefile b/sysutils/libchk/Makefile
index eeb11835017c..404e25252a6a 100644
--- a/sysutils/libchk/Makefile
+++ b/sysutils/libchk/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libchk
PORTVERSION= 1.10.3
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= knu
+ LOCAL/knu
MAINTAINER= knu@FreeBSD.org
COMMENT= Tool to check shared library links
diff --git a/sysutils/mgeupsd/Makefile b/sysutils/mgeupsd/Makefile
index a9e987eaa05c..d5a026f4b775 100644
--- a/sysutils/mgeupsd/Makefile
+++ b/sysutils/mgeupsd/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mgeupsd
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/ups
+MASTER_SITES= SUNSITE/system/ups
MAINTAINER= ports@FreeBSD.org
COMMENT= Monitor a state of MGE Pulsar UPS connected to RS-232 port
diff --git a/sysutils/mkntpwd/Makefile b/sysutils/mkntpwd/Makefile
index 2a800f21e9fd..2facfe863767 100644
--- a/sysutils/mkntpwd/Makefile
+++ b/sysutils/mkntpwd/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mkntpwd
PORTVERSION= 1.0
CATEGORIES= sysutils net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ldaputils/Contrib/mkntpwd
+MASTER_SITES= SF/ldaputils/Contrib/mkntpwd
DISTNAME= ${PORTNAME}
MAINTAINER= pcTA@cs.nctu.edu.tw
diff --git a/sysutils/mksunbootcd/Makefile b/sysutils/mksunbootcd/Makefile
index 53db36b3f233..bfa844477a40 100644
--- a/sysutils/mksunbootcd/Makefile
+++ b/sysutils/mksunbootcd/Makefile
@@ -5,7 +5,7 @@ PORTNAME= mksunbootcd
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
MAINTAINER= ports@FreeBSD.org
COMMENT= Makes ISO images suitable to boot on sparc systems
diff --git a/sysutils/mountsmb2/Makefile b/sysutils/mountsmb2/Makefile
index 388946c07806..05564390e824 100644
--- a/sysutils/mountsmb2/Makefile
+++ b/sysutils/mountsmb2/Makefile
@@ -4,8 +4,7 @@
PORTNAME= mountsmb2
PORTVERSION= 0.90.2
CATEGORIES= sysutils net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= lippe
+MASTER_SITES= LOCAL/lippe
MAINTAINER= ports@FreeBSD.org
COMMENT= SMB/CIFS shares mounting scripts to do it at login
diff --git a/sysutils/msktutil/Makefile b/sysutils/msktutil/Makefile
index 4cb47a9af901..01a960e5a007 100644
--- a/sysutils/msktutil/Makefile
+++ b/sysutils/msktutil/Makefile
@@ -5,7 +5,7 @@ PORTNAME= msktutil
PORTVERSION= 0.5.1
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
http://mirrors.rit.edu/zi/
MAINTAINER= zi@FreeBSD.org
diff --git a/sysutils/no-login/Makefile b/sysutils/no-login/Makefile
index 6b7a5948341c..e5fcea6104cf 100644
--- a/sysutils/no-login/Makefile
+++ b/sysutils/no-login/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nologin
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=wes
+MASTER_SITES= LOCAL/wes
MAINTAINER= ports@FreeBSD.org
COMMENT= Refuse a login to a user, and make a note of it in syslog
diff --git a/sysutils/open/Makefile b/sysutils/open/Makefile
index 7072cd51169d..47ef18a3d7a4 100644
--- a/sysutils/open/Makefile
+++ b/sysutils/open/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.4
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.hs-niederrhein.de/pub/linux/src/ \
ftp://ftp.uni-bremen.de/pub/mirrors/sunsite/utils/console/ \
- ${MASTER_SITE_LOCAL:S^$^fjoe/^}
+ LOCAL/fjoe
MAINTAINER= fjoe@FreeBSD.org
COMMENT= Open opens a new vt and runs a command on it
diff --git a/sysutils/p5-BackupPC-XS/Makefile b/sysutils/p5-BackupPC-XS/Makefile
index 6eb6fa9e5867..d6d53b0d9621 100644
--- a/sysutils/p5-BackupPC-XS/Makefile
+++ b/sysutils/p5-BackupPC-XS/Makefile
@@ -5,8 +5,7 @@ PORTNAME= BackupPC-XS
PORTVERSION= 0.30
PORTREVISION= 1
CATEGORIES= sysutils perl5
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= backuppc/backuppc-beta/4.0.0alpha3
+MASTER_SITES= SF/backuppc/backuppc-beta/4.0.0alpha3
PKGNAMEPREFIX= p5-
MAINTAINER= moiseev@mezonplus.ru
diff --git a/sysutils/p5-Filesys-DfPortable/Makefile b/sysutils/p5-Filesys-DfPortable/Makefile
index a54674a67643..959b24ba356d 100644
--- a/sysutils/p5-Filesys-DfPortable/Makefile
+++ b/sysutils/p5-Filesys-DfPortable/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.85
PORTREVISION= 1
CATEGORIES= sysutils perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Filesys
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/sysutils/p5-Samba-SIDhelper/Makefile b/sysutils/p5-Samba-SIDhelper/Makefile
index 6ac6fd93a377..afaf9eb6b4f2 100644
--- a/sysutils/p5-Samba-SIDhelper/Makefile
+++ b/sysutils/p5-Samba-SIDhelper/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.0.0
PORTREVISION= 3
CATEGORIES= sysutils perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Samba
PKGNAMEPREFIX= p5-
MAINTAINER= vvelox@vvelox.net
diff --git a/sysutils/p5-Sys-Filesystem/Makefile b/sysutils/p5-Sys-Filesystem/Makefile
index 165503eb3ede..eeea50def38e 100644
--- a/sysutils/p5-Sys-Filesystem/Makefile
+++ b/sysutils/p5-Sys-Filesystem/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.401
PORTREVISION= 1
CATEGORIES= sysutils perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Sys
PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@FreeBSD.org
diff --git a/sysutils/p5-arclog/Makefile b/sysutils/p5-arclog/Makefile
index 72e66f00dcca..a20123af186c 100644
--- a/sysutils/p5-arclog/Makefile
+++ b/sysutils/p5-arclog/Makefile
@@ -5,8 +5,7 @@ PORTNAME= arclog
PORTVERSION= 3.04
PORTREVISION= 3
CATEGORIES= sysutils perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/IMACAT
+MASTER_SITES= CPAN/Locale/IMACAT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/sysutils/p5-reslog/Makefile b/sysutils/p5-reslog/Makefile
index 581ceba552ff..a69fdc472bf3 100644
--- a/sysutils/p5-reslog/Makefile
+++ b/sysutils/p5-reslog/Makefile
@@ -5,8 +5,7 @@ PORTNAME= reslog
PORTVERSION= 3.16
PORTREVISION= 3
CATEGORIES= sysutils perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/IMACAT
+MASTER_SITES= CPAN/Locale/IMACAT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/sysutils/paicc/Makefile b/sysutils/paicc/Makefile
index 688cb8733526..c73badaa8681 100644
--- a/sysutils/paicc/Makefile
+++ b/sysutils/paicc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= paicc
PORTVERSION= 1.4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/shell
+MASTER_SITES= SUNSITE/utils/shell
MAINTAINER= peter@FreeBSD.org
COMMENT= Paint Changed Characters
diff --git a/sysutils/pdixtract/Makefile b/sysutils/pdixtract/Makefile
index 2a2ceb565b0c..024b0805c21e 100644
--- a/sysutils/pdixtract/Makefile
+++ b/sysutils/pdixtract/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pdixtract
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= markus
+MASTER_SITES= LOCAL/markus
DISTNAME= PDITOOL
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile
index e0576b375ef3..62af8182be85 100644
--- a/sysutils/polkit-kde/Makefile
+++ b/sysutils/polkit-kde/Makefile
@@ -5,8 +5,7 @@ PORTNAME= polkit-kde
PORTVERSION= 0.99.1
PORTREVISION= 3
CATEGORIES= sysutils kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/apps/KDE4.x/admin/
+MASTER_SITES= KDE/stable/apps/KDE4.x/admin/
DISTNAME= ${PORTNAME}-agent-1-${PORTVERSION:C/1$/0/}
MAINTAINER= kde@FreeBSD.org
diff --git a/sysutils/py-danzfs/Makefile b/sysutils/py-danzfs/Makefile
index 891d173f6f95..9c74577141a0 100644
--- a/sysutils/py-danzfs/Makefile
+++ b/sysutils/py-danzfs/Makefile
@@ -4,7 +4,7 @@
PORTNAME= danzfs
PORTVERSION= 0.2.0
CATEGORIES= sysutils python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= knaggsy2000@gmail.com
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index a576cfa5a4a9..2817f7495c0e 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -5,8 +5,7 @@ PORTNAME= radmind
PORTVERSION= 1.14.1
PORTREVISION= 2014052201
CATEGORIES= sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mikeg@bsd-box.net
COMMENT= Utility for administering filesystem changes
diff --git a/sysutils/rdate/Makefile b/sysutils/rdate/Makefile
index 3766abb35a4d..03052a9508e0 100644
--- a/sysutils/rdate/Makefile
+++ b/sysutils/rdate/Makefile
@@ -4,9 +4,8 @@
PORTNAME= rdate
PORTVERSION= 20150501
CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.stack.nl/pub/users/%SUBDIR%/rdate/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= johans
+MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/rdate/ \
+ LOCAL/johans
MAINTAINER= johans@FreeBSD.org
COMMENT= Sets the clock of the local host to the time of another host
diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile
index c869b268b138..3bdabef6f666 100644
--- a/sysutils/rdiff-backup-devel/Makefile
+++ b/sysutils/rdiff-backup-devel/Makefile
@@ -5,12 +5,9 @@ PORTNAME= rdiff-backup
PORTVERSION= 1.3.3
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:savannah \
- vd/${PORTNAME}${PKGNAMESUFFIX}/:local
+MASTER_SITES= SAVANNAH \
+ LOCAL/vd/${PORTNAME}${PKGNAMESUFFIX}
PKGNAMESUFFIX= -devel
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:savannah,local
MAINTAINER= ports@FreeBSD.org
COMMENT= Local/remote mirroring+incremental backup
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index de6085543789..417ac2c9916b 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -6,11 +6,8 @@ PORTVERSION= 1.2.8
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:savannah \
- vd/${PORTNAME}${PKGNAMESUFFIX}/:local
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:savannah,local
+MASTER_SITES= SAVANNAH \
+ LOCAL/vd/${PORTNAME}${PKGNAMESUFFIX}
MAINTAINER= udvzsolt@gmail.com
COMMENT= Local/remote mirroring+incremental backup
diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile
index 9c796ad8ddd7..11f263757d3a 100644
--- a/sysutils/rfstool/Makefile
+++ b/sysutils/rfstool/Makefile
@@ -4,7 +4,7 @@
PORTNAME= rfstool
PORTVERSION= 0.14
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
DISTNAME= rfstool-0.14-source
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/rsyncbackup/Makefile b/sysutils/rsyncbackup/Makefile
index 9bae23703fa7..6774b066deea 100644
--- a/sysutils/rsyncbackup/Makefile
+++ b/sysutils/rsyncbackup/Makefile
@@ -4,7 +4,7 @@
PORTNAME= rsyncbackup
PORTVERSION= 1.0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= rsyncbackup
MAINTAINER= ports@danielbond.org
diff --git a/sysutils/samesame/Makefile b/sysutils/samesame/Makefile
index 7481a96cec4c..70a476eadf92 100644
--- a/sysutils/samesame/Makefile
+++ b/sysutils/samesame/Makefile
@@ -5,8 +5,7 @@ PORTNAME= samesame
PORTVERSION= 1.10
CATEGORIES= sysutils
MASTER_SITES= http://samesame.kruijff.org/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dhn
+ LOCAL/dhn
MAINTAINER= samesame@akruijff.dds.nl
COMMENT= Find duplicate files and optionally link them together
diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index 7118326a1c6b..8e0d63283ad8 100644
--- a/sysutils/sformat/Makefile
+++ b/sysutils/sformat/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 3.5
PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.berlios.de/pub/sformat/:sformat \
- ${MASTER_SITE_LOCAL:S/$/:libschily,sformat/}
-MASTER_SITE_SUBDIR= marius/:libschily,sformat
+ LOCAL/marius:libschily,sformat
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sformat \
${LIBSCHILY}:libschily
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/sysutils/slack/Makefile b/sysutils/slack/Makefile
index 98e47588e462..f6db3997cea1 100644
--- a/sysutils/slack/Makefile
+++ b/sysutils/slack/Makefile
@@ -5,7 +5,7 @@ PORTNAME= slack
PORTVERSION= 0.15.2
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
http://www.sundell.net/~alan/projects/slack/
MAINTAINER= satwell@disjoint.net
diff --git a/sysutils/superiotool/Makefile b/sysutils/superiotool/Makefile
index ead41d784468..e018d0772732 100644
--- a/sysutils/superiotool/Makefile
+++ b/sysutils/superiotool/Makefile
@@ -4,9 +4,8 @@
PORTNAME= superiotool
DISTVERSION= 20121019
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/avg \
http://www.icyb.net.ua/~avg/distfiles/
-MASTER_SITE_SUBDIR=avg
MAINTAINER= avg@icyb.net.ua
COMMENT= Helper tool for Super I/O chip detection and analysis
diff --git a/sysutils/symlinks/Makefile b/sysutils/symlinks/Makefile
index 0e01b8cea9cd..d6ad19c770b4 100644
--- a/sysutils/symlinks/Makefile
+++ b/sysutils/symlinks/Makefile
@@ -4,8 +4,7 @@
PORTNAME= symlinks
PORTVERSION= 1.4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/file
+MASTER_SITES= SUNSITE/utils/file
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Symbolic link maintenance utility
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index eb578d9b114a..4889a422045f 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.86
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://wpd.home.xs4all.nl/symon/philes/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= uqs@FreeBSD.org
COMMENT= Performance and information monitoring tool
diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index 77de6dbc09ca..705c3148623b 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -5,8 +5,7 @@ PORTNAME= thefish
PORTVERSION= 0.6.6
PORTREVISION= 6
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gtk+/ncurses rc.conf editor/management tool
diff --git a/sysutils/timemon/Makefile b/sysutils/timemon/Makefile
index d6edabf5578b..a2bf91be53b1 100644
--- a/sysutils/timemon/Makefile
+++ b/sysutils/timemon/Makefile
@@ -5,8 +5,7 @@ PORTNAME= timemon
PORTVERSION= 4.1
PORTREVISION= 2
CATEGORIES= sysutils gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= TimeMon-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/ucspi-ssl-tls/Makefile b/sysutils/ucspi-ssl-tls/Makefile
index a8fffd2a45ac..08b7e5713c60 100644
--- a/sysutils/ucspi-ssl-tls/Makefile
+++ b/sysutils/ucspi-ssl-tls/Makefile
@@ -10,8 +10,7 @@ COMMENT= UCSPI tools for building SSL client-server applications w/ TLS support
CONFLICTS= ucspi-ssl-[0-9]*
PATCH_SITES+= http://www.fehcom.de/qmail/spamcontrol/:tls \
- ${MASTER_SITE_LOCAL:S/$/:tls/}
-PATCH_SITE_SUBDIR+= garga/ucspi-ssl/:tls
+ LOCAL/garga/ucspi-ssl/:tls
PATCHFILES+= ucspi-ssl-0.70_ucspitls-0.6.patch_:tls
PATCH_WRKSRC= ${WRKSRC}/src
diff --git a/sysutils/ucspi-ssl/Makefile b/sysutils/ucspi-ssl/Makefile
index bc44c1547469..47f95dc774a0 100644
--- a/sysutils/ucspi-ssl/Makefile
+++ b/sysutils/ucspi-ssl/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= sysutils
MASTER_SITES= LOCAL/garga/ucspi-ssl \
http://www.superscript.com/ucspi-ssl/ \
http://dev.qmailrocks.org/downloads/qmailrocks_3.0-beta/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER?= lx@FreeBSD.org
COMMENT?= UCSPI tools for building SSL client-server applications
diff --git a/sysutils/ucspi-tcp/Makefile b/sysutils/ucspi-tcp/Makefile
index 3910103140ad..3e10991d6548 100644
--- a/sysutils/ucspi-tcp/Makefile
+++ b/sysutils/ucspi-tcp/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.88
PORTREVISION= 2
CATEGORIES= sysutils net
MASTER_SITES= http://cr.yp.to/ucspi-tcp/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= garga/ucspi-tcp
+ LOCAL/garga/ucspi-tcp
PATCH_DIST_STRIP= -p1
@@ -55,8 +54,7 @@ BROKEN= SSL and LIMITS options cannot coexist, please choose one of them
.endif
MASTER_SITES+= http://smarden.org/pape/djb/manpages/:man \
- ${MASTER_SITE_LOCAL:S/$/:man/}
-MASTER_SITE_SUBDIR+= garga/ucspi-tcp/:man
+ LOCAL/garga/ucspi-tcp/:man
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
${DISTNAME}-man.tar.gz:man
MAN_FILES= addcr.1 argv0.1 date@.1 delcr.1 finger@.1 fixcrio.1 \
@@ -98,8 +96,7 @@ PATCH_SITES+= http://www.fefe.de/ucspi/:ipv6
PATCHFILES+= ucspi-tcp-0.88-ipv6.diff19.bz2:ipv6
.endif
-PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:rss,ssl,rbl2smtpd/}
-PATCH_SITE_SUBDIR+= garga/ucspi-tcp/:rss,ssl,rbl2smtpd
+PATCH_SITES+= LOCAL/garga/ucspi-tcp/:rss,ssl,rbl2smtpd
.include <bsd.port.pre.mk>
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index bbc28a97104e..1da76c6a7349 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 0.7.5
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.13thmonkey.org/udfclient/releases/ \
- ${MASTER_SITE_NETBSD} \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= miwi
+ NETBSD \
+ LOCAL/miwi
DISTFILES= UDFclient.${PORTVERSION}.tgz
MAINTAINER= avg@icyb.net.ua
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index 1c2909ba7c85..10eff11620f4 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -5,8 +5,7 @@ PORTVERSION= 1.650
CATEGORIES= sysutils
MASTER_SITES= http://www.webmin.com/uupdates/:up \
SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \
- ${MASTER_SITE_LOCAL:S/$/:up/}
-MASTER_SITE_SUBDIR= olgeni/:up
+ LOCAL/olgeni/:up
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf ${USERMIN_MODULES:S/gz$/gz:up/}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/sysutils/vbetool/Makefile b/sysutils/vbetool/Makefile
index d624d1e61f00..10b3edfa023f 100644
--- a/sysutils/vbetool/Makefile
+++ b/sysutils/vbetool/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.codon.org.uk/~mjg59/vbetool/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkim
+ LOCAL/jkim
MAINTAINER= jkim@FreeBSD.org
COMMENT= Application for executing video card BIOS code
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
index e61093812cf8..18b0af2bf23c 100644
--- a/sysutils/whowatch/Makefile
+++ b/sysutils/whowatch/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/IDS
+ PACKETSTORM/UNIX/IDS
MAINTAINER= ports@FreeBSD.org
COMMENT= Displays information in real time about users currently logged on
diff --git a/sysutils/wmbluecpu/Makefile b/sysutils/wmbluecpu/Makefile
index 1fbe45fc10bc..868bef78c6b8 100644
--- a/sysutils/wmbluecpu/Makefile
+++ b/sysutils/wmbluecpu/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wmbluecpu
PORTVERSION= 0.4
PORTREVISION= 4
CATEGORIES= sysutils windowmaker
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/xutils
+MASTER_SITES= SUNSITE/X11/xutils
MAINTAINER= benjsc@FreeBSD.org
COMMENT= CPU monitoring dockapp
diff --git a/sysutils/wmcube/Makefile b/sysutils/wmcube/Makefile
index a76119a743c8..3c0a76d39766 100644
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@@ -5,10 +5,9 @@ PORTNAME= wmcube
PORTVERSION= 0.98
PORTREVISION= 3
CATEGORIES= sysutils windowmaker
-MASTER_SITES= ${MASTER_SITE_TUCOWS} \
+MASTER_SITES= TUCOWS/x11/dock \
http://dockapps.org/download.php/id/222/ \
http://freebsd.unixfreunde.de/sources/
-MASTER_SITE_SUBDIR= x11/dock
MAINTAINER= garga@FreeBSD.org
COMMENT= Window Maker dockapp that displays cpu load and a realtime 3D object
diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile
index cefcfd97aede..18b377ba6a33 100644
--- a/sysutils/wmmemfree/Makefile
+++ b/sysutils/wmmemfree/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wmmemfree
PORTVERSION= 0.7
PORTREVISION= 4
CATEGORIES= sysutils windowmaker
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/xutils
+MASTER_SITES= SUNSITE/X11/xutils
MAINTAINER= ports@FreeBSD.org
COMMENT= Memory and swap monitoring dockapp
diff --git a/sysutils/xe-guest-utilities/Makefile b/sysutils/xe-guest-utilities/Makefile
index d41e25f9b943..ea05a1ad6a41 100644
--- a/sysutils/xe-guest-utilities/Makefile
+++ b/sysutils/xe-guest-utilities/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xe-guest-utilities
PORTVERSION= 6.2.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= feld
+MASTER_SITES= LOCAL/feld
DISTNAME= ${PORTNAME}-6.0.2
MAINTAINER= dinoex@FreeBSD.org
diff --git a/sysutils/xfsm/Makefile b/sysutils/xfsm/Makefile
index 91a57a76fb1a..bc747df7e88b 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfsm
PORTVERSION= 1.99
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/status/xstatus
+MASTER_SITES= SUNSITE/system/status/xstatus
MAINTAINER= ports@FreeBSD.org
COMMENT= X File System Monitor
diff --git a/sysutils/xin/Makefile b/sysutils/xin/Makefile
index 29d9b53b7f8b..9c5b156ba49b 100644
--- a/sysutils/xin/Makefile
+++ b/sysutils/xin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xin
PORTVERSION= 1.0.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/file
+MASTER_SITES= SUNSITE/utils/file
MAINTAINER= ports@FreeBSD.org
COMMENT= Splits standard input and pipes into a command
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 113d6c9e721d..0955f2c2eb62 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xlogmaster
PORTVERSION= 1.6.2
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= Quick & easy monitoring of logfiles and devices
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index a5e2a4fa1ff5..26174f6536c4 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -4,8 +4,7 @@ PORTNAME= xsysstats
PORTVERSION= 1.51
PORTREVISION= 3
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile
index ab09db76ab85..4b0368218411 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -5,8 +5,7 @@ PORTNAME= zisofs-tools
PORTVERSION= 1.0.8
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}
-MASTER_SITE_SUBDIR= linux/utils/fs/zisofs
+MASTER_SITES= KERNEL_ORG/linux/utils/fs/zisofs
MAINTAINER= chip-set@mail.ru
COMMENT= User utilities for zisofs
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0