10 files changed, 10 insertions, 17 deletions

diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 0584f2009539..ee822a49b88d 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	bitlbee
 PORTVERSION=	3.4
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	brix
+		LOCAL/brix
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	IRC to other chat networks gateway
diff --git a/irc/cwirc/Makefile b/irc/cwirc/Makefile
index 4c0c1ed70245..dcdbf06f5bc0 100644
--- a/irc/cwirc/Makefile
+++ b/irc/cwirc/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	2.0.0
 PORTREVISION=	5
 CATEGORIES=	irc comms hamradio
 MASTER_SITES=	http://users.skynet.be/ppc/cwirc/download/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
+		LOCAL/db
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	X-Chat Morse plugin
diff --git a/irc/keitairc2/Makefile b/irc/keitairc2/Makefile
index f61b4b0bdc6c..de42695534ea 100644
--- a/irc/keitairc2/Makefile
+++ b/irc/keitairc2/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=		keitairc
 PORTVERSION=		2.0
 CATEGORIES=		irc
-MASTER_SITES=		SFJP
-MASTER_SITE_SUBDIR=	${PORTNAME}/47485
+MASTER_SITES=		SFJP/${PORTNAME}/47485
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IRC proxy for mobilephone that have a web interface
diff --git a/irc/py-gozerbot/Makefile b/irc/py-gozerbot/Makefile
index e656dd7c51fb..d72dc14de170 100644
--- a/irc/py-gozerbot/Makefile
+++ b/irc/py-gozerbot/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.8.1.1
 PORTREVISION=	2
 CATEGORIES=	irc python
 MASTER_SITES=	http://gozerbot.org/media/tarball/ \
-		${MASTER_SITE_GOOGLE_CODE}
+		GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sten@blinkenlights.nl
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index 66e33790599b..f501993206a6 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -5,13 +5,14 @@ PORTNAME=	quirc
 PORTVERSION=	0.9.84
 PORTREVISION=	5
 CATEGORIES=	irc tk
-MASTER_SITES=	${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITES=	LOCAL:local # This ends up being empty.
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcl/Tk IRC client for the X Window System
 
 OPTIONS_DEFINE=	DOCS
 
+BROKEN=		Unfetchable
 USES=		tk
 USE_XORG=	xt
 
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index f095e02a3708..ddb3e8874e7f 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	SAVANNAH
-MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	yasu@utahime.org
diff --git a/irc/simpleirc/Makefile b/irc/simpleirc/Makefile
index 3c2f2825ea70..046393fad72d 100644
--- a/irc/simpleirc/Makefile
+++ b/irc/simpleirc/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	simpleirc
 PORTVERSION=	1.2
 CATEGORIES=	irc
 MASTER_SITES=	http://dl.suckless.org/tools/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dhn
+		LOCAL/dhn
 DISTNAME=	sic-${PORTVERSION}
 
 MAINTAINER=	dhn@FreeBSD.org
diff --git a/irc/thales/Makefile b/irc/thales/Makefile
index b17de2b64256..116dd2028f00 100644
--- a/irc/thales/Makefile
+++ b/irc/thales/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	thales
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	irc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Thales -- An IRC to MySQL gateway
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 274399bce2fc..7d42b407ea47 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	20140213
 PORTREVISION=	5
 CATEGORIES=	irc
 MASTER_SITES=	http://perturb.me.uk/distfiles/weechat-devel/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	jase/weechat-devel
+		LOCAL/jase/weechat-devel
 PKGNAMESUFFIX=	-devel
 DISTNAME=	weechat-devel-${GITREV}
 DISTFILES=	${DISTNAME}.txz
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 0371cc02509b..4074e1983e6f 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/ \
 		http://perturb.me.uk/distfiles/weechat/:mandocs \
-		${MASTER_SITE_LOCAL:S/$/:mandocs/}
-MASTER_SITE_SUBDIR=	jase/weechat/:mandocs
+		LOCAL/jase/weechat/:mandocs
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jase@FreeBSD.org