author: Mathieu Arnold <mat@FreeBSD.org> 2015-05-14 10:15:04 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2015-05-14 10:15:04 +0000
commit: 60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree: 627649ff7699a289d5d78c11bf8d105881402ca8 /misc
parent: a50428b01c275f058b067787701d333a9d45cbcb (diff)
download: ports-60d1a83c2a113150cedbc43ff12a7375144f741a.tar.gz
ports-60d1a83c2a113150cedbc43ff12a7375144f741a.zip
56 files changed, 63 insertions, 114 deletions
diff --git a/misc/amfm/Makefile b/misc/amfm/Makefile
index ae435de23041..13ce7330b6dc 100644
--- a/misc/amfm/Makefile
+++ b/misc/amfm/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	amfm
 PORTVERSION=	1.0
 CATEGORIES=	misc
 MASTER_SITES=	http://github.com/ikegam/amfm/raw/9679aa06eead7ed3571480e892f426828e17e361/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	sanpei
+		LOCAL/sanpei
 DISTNAME=	amfm
 EXTRACT_SUFX=	.c
 
diff --git a/misc/asr-manpages/Makefile b/misc/asr-manpages/Makefile
index 3324e2ea71b4..212969913129 100644
--- a/misc/asr-manpages/Makefile
+++ b/misc/asr-manpages/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	asr-manpages
 PORTVERSION=	20000406
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fjoe
+MASTER_SITES=	LOCAL/fjoe
 DISTNAME=	asr.pages
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/misc/bbjd/Makefile b/misc/bbjd/Makefile
index 044056be1bae..6e10cbd4ae97 100644
--- a/misc/bbjd/Makefile
+++ b/misc/bbjd/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	bbjd
 PORTVERSION=	1.01
 PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	SUNSITE
-MASTER_SITE_SUBDIR=	games/strategy
+MASTER_SITES=	SUNSITE/games/strategy
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Beat the blackjack dealer
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 8406075515a2..f589fbf7a6c4 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -4,14 +4,13 @@
 PORTNAME=	buffer
 PORTVERSION=	1.19
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GENTOO} \
+MASTER_SITES=	GENTOO \
 		http://www.mondorescue.org/download/MondoCD/TGZS/
-MASTER_SITE_SUBDIR=	distfiles
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Buffer sporadic I/O for faster tape and pipe throughput
 
+USES=		tar:tgz
 PLIST_FILES=	bin/buffer \
 		man/man1/buffer.1.gz
 
diff --git a/misc/chef/Makefile b/misc/chef/Makefile
index 3ed68dd4414e..cdd8367f34ee 100644
--- a/misc/chef/Makefile
+++ b/misc/chef/Makefile
@@ -4,16 +4,15 @@ PORTNAME=	chef
 PORTVERSION=	19930426
 CATEGORIES=	misc
 MASTER_SITES=	http://mysite.verizon.net/ebrowne72/chef/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	brooks
+		LOCAL/brooks
 DISTNAME=	bork
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Feelter thet cunferts Ingleesh text tu Muck Cheenese-a
 
 CONFLICTS=	filters-* talkfilters-*
 PLIST_FILES=	bin/chef
+USES=		tar:Z
 
 WRKSRC=		${WRKDIR}/bork
 
diff --git a/misc/compat10x/Makefile b/misc/compat10x/Makefile
index eae7a1524080..97376911569f 100644
--- a/misc/compat10x/Makefile
+++ b/misc/compat10x/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	compat10x
 PORTVERSION=	10.0.1000510.201410
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	garga/compat
+MASTER_SITES=	LOCAL/garga/compat
 PKGNAMESUFFIX=	-${ARCH}
 DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
 
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index ff020adcf04a..f578844ae999 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	${COMPAT4X_PORTVERSION}
 PORTREVISION=	10
 CATEGORIES=	misc
 MASTER_SITES=	${COMPAT4X_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${COMPAT4X_MASTER_SITE_SUBDIR}
 PKGNAMESUFFIX=	-${COMPAT4X_ARCH}
 DISTFILES=	${COMPAT4X_DISTFILES}
 DIST_SUBDIR=	${COMPAT4X_ARCH}/${PORTVERSION}
@@ -71,12 +70,10 @@ FREEBSD4_LIBS=		libc_r.so.4 libperl.so.3
 
 .if defined(COMPAT4X_OSRELDATE) && !empty(COMPAT4X_OSRELDATE)
 COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}.${COMPAT4X_OSRELDATE}
-COMPAT4X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
-COMPAT4X_MASTER_SITE_SUBDIR=	snapshots/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}
+COMPAT4X_MASTER_SITES=	ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/${COMPAT4X_ARCH}/${COMPAT4X_OSVERSION}-${COMPAT4X_OSBRANCH}-${COMPAT4X_OSRELDATE}-JPSNAP/${PORTNAME}/
 .else
 COMPAT4X_PORTVERSION=	${COMPAT4X_OSVERSION}
-COMPAT4X_MASTER_SITES=	${MASTER_SITE_LOCAL}
-COMPAT4X_MASTER_SITE_SUBDIR=	kris/${COMPAT4X_ARCH}
+COMPAT4X_MASTER_SITES=	LOCAL/kris/${COMPAT4X_ARCH}
 .endif
 
 do-extract:
diff --git a/misc/compat5x/Makefile b/misc/compat5x/Makefile
index 2ca0aaba7a81..5bea85666112 100644
--- a/misc/compat5x/Makefile
+++ b/misc/compat5x/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	compat5x
 PORTVERSION=	5.4.0.8.1
 PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=amdmi3/compat5x
+MASTER_SITES=	LOCAL/amdmi3/compat5x
 PKGNAMESUFFIX=	-${ARCH}
 DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
 
diff --git a/misc/compat6x/Makefile b/misc/compat6x/Makefile
index fb51def717c6..909574cced62 100644
--- a/misc/compat6x/Makefile
+++ b/misc/compat6x/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	compat6x
 PORTVERSION=	6.4.604000.200810
 PORTREVISION=	3
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://people.freebsd.org/~${MASTER_SITE_SUBDIR}/
-MASTER_SITE_SUBDIR=	mnag/compat6x
+MASTER_SITES=	LOCAL/mnag/compat6x \
+		http://people.freebsd.org/~mnag/compat6x/
 PKGNAMESUFFIX=	-${ARCH}
 DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
 
diff --git a/misc/compat7x/Makefile b/misc/compat7x/Makefile
index 8868f0a1d01f..b32bb7ed618d 100644
--- a/misc/compat7x/Makefile
+++ b/misc/compat7x/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	compat7x
 PORTVERSION=	7.4.704000.201310.1
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	garga/compat
+MASTER_SITES=	LOCAL/garga/compat
 PKGNAMESUFFIX=	-${ARCH}
 DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
 
diff --git a/misc/compat8x/Makefile b/misc/compat8x/Makefile
index cbe2c0bce28d..f0c96e7209e3 100644
--- a/misc/compat8x/Makefile
+++ b/misc/compat8x/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	compat8x
 PORTVERSION=	8.4.804000.201310
 PORTREVISION=	2
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	garga/compat
+MASTER_SITES=	LOCAL/garga/compat
 PKGNAMESUFFIX=	-${ARCH}
 DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
 
diff --git a/misc/compat9x/Makefile b/misc/compat9x/Makefile
index 34286f377bfc..24f94dfe5821 100644
--- a/misc/compat9x/Makefile
+++ b/misc/compat9x/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	compat9x
 PORTVERSION=	9.2.902000.201310
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	garga/compat
+MASTER_SITES=	LOCAL/garga/compat
 PKGNAMESUFFIX=	-${ARCH}
 DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
 
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index 27bae8de3956..712b70e3f4ad 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	dahdi-kmod
 PORTVERSION=	${DAHDI_VERSION:S/-//g}
 PORTREVISION=	7
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}\
+MASTER_SITES=	LOCAL/fjoe \
 		http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
-MASTER_SITE_SUBDIR=	fjoe
 DISTNAME=	dahdi-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}\
 		oslec-linux-${OSLEC_VERSION}${EXTRACT_SUFX}\
diff --git a/misc/dahdi-kmod26/Makefile b/misc/dahdi-kmod26/Makefile
index e00e7b94cd07..31036865b35a 100644
--- a/misc/dahdi-kmod26/Makefile
+++ b/misc/dahdi-kmod26/Makefile
@@ -5,10 +5,9 @@ PORTNAME=	dahdi-kmod26
 PORTVERSION=	${DAHDI_VERSION:S/-/./g}
 PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}\
+MASTER_SITES=	LOCAL/fjoe \
 		http://people.freebsd.org/~fjoe/dahdi/\
 		http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
-MASTER_SITE_SUBDIR=	fjoe
 DISTNAME=	dahdi-freebsd-${DAHDI_VERSION}
 DISTFILES=	${DISTNAME}.tar.bz2\
 		oslec-linux-${OSLEC_VERSION}${EXTRACT_SUFX}\
diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile
index 874a0a93cad1..c069feb2ff51 100644
--- a/misc/dahdi/Makefile
+++ b/misc/dahdi/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	dahdi
 PORTVERSION=	${DAHDI_VERSION:S/-//g}
 PORTREVISION=	6
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fjoe
+MASTER_SITES=	LOCAL/fjoe
 DISTNAME=	${PORTNAME}-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/misc/diction/Makefile b/misc/diction/Makefile
index 4b1f180a6a7e..062d9beeada4 100644
--- a/misc/diction/Makefile
+++ b/misc/diction/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	diction
 PORTVERSION=	1.11
 PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	GNU diction and style
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index 05e4d9edc5b4..783f03127df1 100644
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -6,9 +6,8 @@ PORTVERSION=	${VERSION}
 PORTREVISION=	${REVISION}
 PORTEPOCH=	1
 CATEGORIES=	misc
-MASTER_SITES=	http://http.distributed.net/pub/dcti/%SUBDIR%/ \
-		ftp://ftp.distributed.net/pub/dcti/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION:S/^/v/:R}
+MASTER_SITES=	http://http.distributed.net/pub/dcti/v${PORTVERSION:R}/ \
+		ftp://ftp.distributed.net/pub/dcti/v${PORTVERSION:R}/
 # This is architecture dependent
 DISTNAME=	dnetc${PORTVERSION:E}-freebsd-${ARCH:S/i386/x86/}-elf
 
diff --git a/misc/dphys-config/Makefile b/misc/dphys-config/Makefile
index 1dee04047355..f46f9bd50033 100644
--- a/misc/dphys-config/Makefile
+++ b/misc/dphys-config/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	dphys-config
 PORTVERSION=	20100216
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index f56560288ea8..184a060fcbc8 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -5,8 +5,7 @@ PORTNAME=		estic
 PORTVERSION=		1.61
 PORTREVISION=		1
 CATEGORIES=		misc comms
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=		LOCAL/dinoex
 PKGNAMESUFFIX?=		${NOX11_SUFFIX}${PKGNAMESUFFIX2}
 DISTFILES=		estic-1.60-sources.zip estic-1.61-patch-from-1.60.zip
 
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 9d63bf2ea3da..2dfe2c290851 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	figlet
 PORTVERSION=	2.2.5
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.figlet.org/pub/figlet/program/unix/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	obrien
+		LOCAL/obrien
 
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	SysV banner-like program prints strings in large fancy ASCII art
diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile
index e3f9b5e550af..e67a555af335 100644
--- a/misc/findutils/Makefile
+++ b/misc/findutils/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	findutils
 PORTVERSION=	4.5.14
 PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
-MASTER_SITE_SUBDIR=	findutils
+MASTER_SITES=	GNU_ALPHA
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/misc/fortune-mod-bofh/Makefile b/misc/fortune-mod-bofh/Makefile
index c3100d6f20f0..76d642870d10 100644
--- a/misc/fortune-mod-bofh/Makefile
+++ b/misc/fortune-mod-bofh/Makefile
@@ -5,10 +5,9 @@ PORTNAME=	fortune-mod-bofh
 PORTVERSION=	2.0
 PORTREVISION=	3
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL:S/$/:freebsd/} \
-		http://www.irq.org/:original
-MASTER_SITE_SUBDIR=	flz/${PORTNAME}/:freebsd
-DISTFILES=	bofh-fortune-mod${PORTVERSION}${EXTRACT_SUFX}:original,freebsd
+MASTER_SITES=	LOCAL/flz/${PORTNAME} \
+		http://www.irq.org/
+DISTFILES=	bofh-fortune-mod${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Compilation of excuses from the "Bastard Operator From Hell"
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index a793c2ae6a81..82abb4e4f1df 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	gnuit
 PORTVERSION=	4.9.5
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Interactive Tools - a file system browser for UNIX systems
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index 1615248516a3..b78d01c873e6 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	gnuls
 PORTVERSION=	8.22
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	coreutils
+MASTER_SITES=	GNU/coreutils
 DISTNAME=	coreutils-${PORTVERSION}
 
 MAINTAINER=	bmc@clapper.org
diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index 3ea48ccd58ea..c3658a881591 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	gnustep-examples
 PORTVERSION=	1.4.0
 PORTREVISION=	3
 CATEGORIES=	misc gnustep
-MASTER_SITES=	${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR=	usr-apps
+MASTER_SITES=	GNUSTEP/usr-apps
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNUstep example applications
diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile
index 1afb1a5ba936..79b448bdedf2 100644
--- a/misc/gregexp/Makefile
+++ b/misc/gregexp/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	gregexp
 PORTVERSION=	0.4
 CATEGORIES=	misc
-MASTER_SITES=	http://dentrassi.de/download/gregexp/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	http://dentrassi.de/download/gregexp/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical regular expression explorer
diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index b98705b1ca35..399aff74237b 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	hello
 PORTVERSION=	2.9
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	hello
+MASTER_SITES=	GNU
 
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Utility for saying hello to the world and reading email
diff --git a/misc/histring/Makefile b/misc/histring/Makefile
index 7ce55aed69af..603ef7d14c3b 100644
--- a/misc/histring/Makefile
+++ b/misc/histring/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	histring
 PORTVERSION=	1.1.0
 CATEGORIES=	misc
 MASTER_SITES=	http://ess4.engr.uvic.ca/proj/histring/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	roam/misc
+		LOCAL/roam/misc
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Highlight strings using the ANSI terminal escape sequences
diff --git a/misc/imerge/Makefile b/misc/imerge/Makefile
index 42cdbfcce7f2..41879de1c42f 100644
--- a/misc/imerge/Makefile
+++ b/misc/imerge/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	imerge
 PORTVERSION=	0.2.4
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+		LOCAL/knu
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Tool to help merge one file to another interactively
diff --git a/misc/inplace/Makefile b/misc/inplace/Makefile
index 0c3b12bc974f..61222fe22fb7 100644
--- a/misc/inplace/Makefile
+++ b/misc/inplace/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	inplace
 PORTVERSION=	1.2.3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+		LOCAL/knu
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Tool to edit files in-place through given filter commands
diff --git a/misc/ipbt/Makefile b/misc/ipbt/Makefile
index 2fd0b0152da3..5a46db690143 100644
--- a/misc/ipbt/Makefile
+++ b/misc/ipbt/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	ipbt
 DISTVERSION=	r8765
 CATEGORIES=	misc
 MASTER_SITES=	http://www.chiark.greenend.org.uk/~sgtatham/ipbt/ \
-		LOCAL
-MASTER_SITE_SUBDIR=	uqs
+		LOCAL/uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	High-tech ttyrec player with improvements over ttyplay
diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index 96a30acadf97..0c2a2787fff9 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	iselect
 PORTVERSION=	1.4.0
 CATEGORIES=	misc
-MASTER_SITES=	OSSP
-MASTER_SITE_SUBDIR=	tool/iselect
+MASTER_SITES=	OSSP/tool/iselect
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive Selection Tool
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index e46ee6026f10..7c6a7d5f70a7 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -1,5 +1,4 @@
-MASTER_SITES?=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR?=	${KDE4_BRANCH}/${PORTVERSION}/src/kde-l10n/
+MASTER_SITES?=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src/kde-l10n/
 PKGNAMEPREFIX=	${KDE4_L10N:S/@/_/}-
 DISTNAME=	${PORTNAME}-${KDE4_L10N}-${PORTVERSION}
 DIST_SUBDIR?=	KDE/${PORTVERSION}/kde-l10n
diff --git a/misc/mime-support/Makefile b/misc/mime-support/Makefile
index 087b58aef30e..cfb7cc2d4c99 100644
--- a/misc/mime-support/Makefile
+++ b/misc/mime-support/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mime-support
 PORTVERSION=	3.58
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION:C/([0-9]*\.[0-9]*)\.(.*)/\1-\2/}
 
 MAINTAINER=	oliver@FreeBSD.org
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 4df6e853b178..5bc4d25d46a5 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mmv
 PORTVERSION=	1.01b.15
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_1.01b.orig
 
 PATCH_SITES=	${MASTER_SITES}
diff --git a/misc/nsf/Makefile b/misc/nsf/Makefile
index 0b7130a263d2..52c5a7e8fe21 100644
--- a/misc/nsf/Makefile
+++ b/misc/nsf/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	nsf
 PORTVERSION=	1.0
 CATEGORIES=	misc
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	will
+MASTER_SITES=	LOCAL/will
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NAKAMURA's Shell Form input
diff --git a/misc/openr2/Makefile b/misc/openr2/Makefile
index 468a909bbb36..b2dc0ca32a80 100644
--- a/misc/openr2/Makefile
+++ b/misc/openr2/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	openr2
 PORTVERSION=	1.3.3
 PORTREVISION=	0
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	MFC/R2 call setup library
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index 8b9cc31cd33f..40a42cd0694f 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	uuid
 PORTVERSION=	1.6.2
 PORTREVISION=	7
 CATEGORIES=	misc devel
-MASTER_SITES=	${MASTER_SITE_OSSP}
-MASTER_SITE_SUBDIR=	lib/${PORTNAME}
+MASTER_SITES=	OSSP/lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
 MAINTAINER=	vd@FreeBSD.org
diff --git a/misc/p5-Locale-Msgcat/Makefile b/misc/p5-Locale-Msgcat/Makefile
index e01fce3bd877..031b40d75c78 100644
--- a/misc/p5-Locale-Msgcat/Makefile
+++ b/misc/p5-Locale-Msgcat/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	Msgcat
 PORTVERSION=	1.03
 PORTREVISION=	1
 CATEGORIES=	misc perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Locale
+MASTER_SITES=	CPAN/Locale
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index e513fd250b9f..917940a6fff6 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	pinfo
 PORTVERSION=	0.6.10
 PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	GENTOO/distfiles \
+MASTER_SITES=	GENTOO \
 		http://alioth.debian.org/frs/download.php/file/3351/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/misc/py-yolk/Makefile b/misc/py-yolk/Makefile
index bc4dbc6397fe..e0d348427c9f 100644
--- a/misc/py-yolk/Makefile
+++ b/misc/py-yolk/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	yolk
 PORTVERSION=	0.4.3
 PORTREVISION=	0
 CATEGORIES=	misc python
-MASTER_SITES=	${MASTER_SITE_CHEESESHOP}
-MASTER_SITE_SUBDIR=	source/y/${PORTNAME}
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/misc/rtfm/Makefile b/misc/rtfm/Makefile
index 2aac0d7d39e1..af3ea5729719 100644
--- a/misc/rtfm/Makefile
+++ b/misc/rtfm/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	rtfm
 PORTVERSION=	1.0
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	chris
+MASTER_SITES=	LOCAL/chris
 
 MAINTAINER=	chris@FreeBSD.org
 COMMENT=	FreeBSD documentation search mechanism
diff --git a/misc/ruby-progressbar/Makefile b/misc/ruby-progressbar/Makefile
index a66b7f58cc4a..dbafc5c0b75d 100644
--- a/misc/ruby-progressbar/Makefile
+++ b/misc/ruby-progressbar/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	progressbar
 PORTVERSION=	0.9
 CATEGORIES=	misc ruby
 MASTER_SITES=	http://0xcc.net/ruby-progressbar/ \
-		${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/progressbar|}
+		LOCAL/tota/progressbar
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 
diff --git a/misc/shuffle/Makefile b/misc/shuffle/Makefile
index ee72db954673..a7043bdf5803 100644
--- a/misc/shuffle/Makefile
+++ b/misc/shuffle/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	shuffle
 PORTVERSION=	20010603
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dd
+MASTER_SITES=	LOCAL/dd
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce random permutations
diff --git a/misc/sls/Makefile b/misc/sls/Makefile
index 8e8c3ebc67ff..5b39530d94bf 100644
--- a/misc/sls/Makefile
+++ b/misc/sls/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	sls
 PORTVERSION=	1.00
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dannyboy
+MASTER_SITES=	LOCAL/dannyboy
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	sec@42.org
diff --git a/misc/tcb/Makefile b/misc/tcb/Makefile
index f8f65cf29937..1e2d6332cfb2 100644
--- a/misc/tcb/Makefile
+++ b/misc/tcb/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tcb
 PORTVERSION=	1.4a
 PORTREVISION=	1
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	utils/file
+MASTER_SITES=	SUNSITE/utils/file
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	File viewer for terminal
diff --git a/misc/team/Makefile b/misc/team/Makefile
index f0144f64d60d..1a0e351676d4 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	team
 PORTVERSION=	3.1
 PORTREVISION=	2
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	joerg
+MASTER_SITES=	LOCAL/joerg
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Portable multi-buffered tape streaming utility
diff --git a/misc/unclutter/Makefile b/misc/unclutter/Makefile
index 836dde32d87e..d99cadba6ce1 100644
--- a/misc/unclutter/Makefile
+++ b/misc/unclutter/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	unclutter
 PORTVERSION=	8
 PORTREVISION=	3
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
+MASTER_SITES=	XCONTRIB/utilities
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Remove idle cursor image from screen
diff --git a/misc/usbrh-libusb/Makefile b/misc/usbrh-libusb/Makefile
index 1269cc02dca0..d58c10818fd1 100644
--- a/misc/usbrh-libusb/Makefile
+++ b/misc/usbrh-libusb/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	usbrh-libusb
 PORTVERSION=	0.05
 CATEGORIES=	misc
 MASTER_SITES=	http://www.dd.iij4u.or.jp/~briareos/soft/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	sanpei
+		LOCAL/sanpei
 DISTNAME=	usbrh-${PORTVERSION}
 
 MAINTAINER=	sanpei@FreeBSD.org
diff --git a/misc/vera/Makefile b/misc/vera/Makefile
index b37aedc0a87c..d705bc4ee23a 100644
--- a/misc/vera/Makefile
+++ b/misc/vera/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	vera
 PORTVERSION=	1.22
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	vera
+MASTER_SITES=	GNU
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Virtual Entity of Relevant Acronyms
diff --git a/misc/viz/Makefile b/misc/viz/Makefile
index 8ef3fef9367e..79231aeb8191 100644
--- a/misc/viz/Makefile
+++ b/misc/viz/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	viz
 PORTVERSION=	1.1.1
 CATEGORIES=	misc
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	fenner
+MASTER_SITES=	LOCAL/fenner
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert invisible (binary) characters to a visible form
diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile
index d28365dafd44..5602c1c29a08 100644
--- a/misc/wmScoreBoard/Makefile
+++ b/misc/wmScoreBoard/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	wmScoreBoard
 PORTVERSION=	0.30
 PORTREVISION=	4
 CATEGORIES=	misc windowmaker
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	pat
+MASTER_SITES=	LOCAL/pat
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Maker dockapp that display game scores from excite
diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile
index a6eb64476191..f73af455f498 100644
--- a/misc/wmwork/Makefile
+++ b/misc/wmwork/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.2.5
 PORTREVISION=	3
 CATEGORIES=	misc windowmaker afterstep
 MASTER_SITES=	http://people.debian.org/~godisch/wmwork/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	xride
+		LOCAL/xride
 
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	Dockapp that keeps track of time you have spent on something
diff --git a/misc/xgas/Makefile b/misc/xgas/Makefile
index eaf7b1077f3b..e05c0d334487 100644
--- a/misc/xgas/Makefile
+++ b/misc/xgas/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xgas
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/demos
+MASTER_SITES=	SUNSITE/X11/demos
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/misc/xless/Makefile b/misc/xless/Makefile
index 76a71e5a4a59..92787a0757c5 100644
--- a/misc/xless/Makefile
+++ b/misc/xless/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	xless
 PORTVERSION=	1.7
 PORTREVISION=	2
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
+MASTER_SITES=	XCONTRIB/applications \
 		ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
-MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11-based viewer for text files
diff --git a/misc/xtar/Makefile b/misc/xtar/Makefile
index 8dfbeb64d467..f9f3e7e827f5 100644
--- a/misc/xtar/Makefile
+++ b/misc/xtar/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xtar
 PORTVERSION=	1.4
 PORTREVISION=	4
 CATEGORIES=	misc
-MASTER_SITES=	MASTER_SITE_XCONTRIB/utilities
+MASTER_SITES=	XCONTRIB/utilities
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View and manipulate contents of a tar file
author	Mathieu Arnold <mat@FreeBSD.org>	2015-05-14 10:15:04 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2015-05-14 10:15:04 +0000
commit	60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree	627649ff7699a289d5d78c11bf8d105881402ca8 /misc
parent	a50428b01c275f058b067787701d333a9d45cbcb (diff)
download	ports-60d1a83c2a113150cedbc43ff12a7375144f741a.tar.gz ports-60d1a83c2a113150cedbc43ff12a7375144f741a.zip