Use MASTER_SITE_SUBDIR instead of rolling my own.

Clue provided by:	pav

12 files changed, 24 insertions, 12 deletions

diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index 9a719a2069a8..1c71f8a6a334 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -11,7 +11,8 @@ PORTVERSION=	0.11
 PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	ftp://ftp.faceprint.com/pub/software/scripts/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	uqs@FreeBSD.org
diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile
index 15b56f302707..9b07a3318ad3 100644
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@@ -9,7 +9,8 @@ PORTVERSION=	0.6.0
 PORTREVISION=	5
 CATEGORIES=	ftp
 MASTER_SITES=	http://amtrickey.net/download/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	uqs@FreeBSD.org
diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index cd1210f823f8..ad88e50fddee 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -12,7 +12,8 @@ PORTEPOCH=	1
 CATEGORIES=	games
 # Fetched from http://gitweb.dragonflybsd.org/dragonfly.git/tree/v2.4.0:/games
 # Content is stable, but file timestamps differ. Bad gitweb, no cookie!
-MASTER_SITES=	${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Traditional BSD games taken from DragonFly BSD
diff --git a/games/wmquake/Makefile b/games/wmquake/Makefile
index 009a7befc467..1f0c80c12d5e 100644
--- a/games/wmquake/Makefile
+++ b/games/wmquake/Makefile
@@ -10,7 +10,8 @@ PORTVERSION=	1.1
 PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Id Software\'s Quake I in a 64x64 WM dockapp window
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 3bfaef3f6dca..112ee3315436 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	feh
 PORTVERSION=	1.10
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.chaosdorf.de/~derf/feh/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	An image viewer that utilizes Imlib2
diff --git a/misc/ipbt/Makefile b/misc/ipbt/Makefile
index 1461dc3c6e98..53fe338e0216 100644
--- a/misc/ipbt/Makefile
+++ b/misc/ipbt/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	ipbt
 DISTVERSION=	r8765
 CATEGORIES=	misc
 MASTER_SITES=	http://www.chiark.greenend.org.uk/~sgtatham/ipbt/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	A high-tech ttyrec player with improvements over ttyplay
diff --git a/net/wmwifi/Makefile b/net/wmwifi/Makefile
index b918ced7989a..3c5958a10ce6 100644
--- a/net/wmwifi/Makefile
+++ b/net/wmwifi/Makefile
@@ -11,7 +11,8 @@ DISTVERSIONSUFFIX=-bsd
 PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://digitalssg.net/debian/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Dockapp displaying the signal strength of WiFi connection
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index e1734af3397b..308021311ac3 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	symon
 PORTVERSION=	2.82
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.xs4all.nl/~wpd/symon/philes/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Performance and information monitoring tool
diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index 7209492fca60..6ff5350fb310 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	mdocml
 PORTVERSION=	1.10.6
 CATEGORIES=	textproc
 MASTER_SITES=	http://mdocml.bsd.lv/snapshots/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	mdoc macro compiler
diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile
index 28de0dc7f037..a13ed428bfc4 100644
--- a/x11-clocks/wmbday/Makefile
+++ b/x11-clocks/wmbday/Makefile
@@ -9,7 +9,8 @@ PORTVERSION=	0.3.1
 PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://buzzinhornetz.ath.cx/wmbday/files/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Window Maker dock app that will remind you of birthdays
diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile
index 8bc79a88f56d..6be26806af69 100644
--- a/x11-clocks/wmtimer/Makefile
+++ b/x11-clocks/wmtimer/Makefile
@@ -10,7 +10,8 @@ PORTVERSION=	2.92
 PORTREVISION=	8
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://www.darkops.net/wmtimer/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Multi-Function timer dockapp for WindowMaker
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 432b8a19cd06..d02a3613a960 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	wmcliphist
 PORTVERSION=	1.0
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://linux.nawebu.cz/wmcliphist/ \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%/uqs/}
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Clipboard history management dockapp for Window Maker