71 files changed, 66 insertions, 128 deletions

diff --git a/textproc/apache-poi/Makefile b/textproc/apache-poi/Makefile
index eebdbc4ebc29..a289b07a05d3 100644
--- a/textproc/apache-poi/Makefile
+++ b/textproc/apache-poi/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	poi
 PORTVERSION=	3.10.1
 CATEGORIES=	textproc devel java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/release/bin
+MASTER_SITES=	APACHE/${PORTNAME}/release/bin
 PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}-${RELEASE_DATE}
 
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 6894beef670e..03f7f44af200 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	apache-solr
 PORTVERSION=	4.10.1
 CATEGORIES=	textproc java
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}
+MASTER_SITES=	APACHE/lucene/solr/${PORTVERSION}
 DISTNAME=	solr-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/apache-solr3/Makefile b/textproc/apache-solr3/Makefile
index e4e1d08c4638..4b157a4ce86d 100644
--- a/textproc/apache-solr3/Makefile
+++ b/textproc/apache-solr3/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	apache-solr
 PORTVERSION=	3.6.2
 CATEGORIES=	textproc java
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}/
+MASTER_SITES=	APACHE/lucene/solr/${PORTVERSION}
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	gaod@hychen.org
diff --git a/textproc/aspell/Makefile.inc b/textproc/aspell/Makefile.inc
index 428e47f4eb44..2bd9e70966aa 100644
--- a/textproc/aspell/Makefile.inc
+++ b/textproc/aspell/Makefile.inc
@@ -1,8 +1,7 @@
 # $FreeBSD$
 # To be included by dictionaries ports.
 
-MASTER_SITES?=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR?=	aspell/dict/${DICT}
+MASTER_SITES?=	GNU/aspell/dict/${DICT}
 DISTNAME?=	aspell${DISTVERSION}
 PORTVERSION?=	${DISTVERSION:tl:C/cvs/0_/:C/pt_../p/:C/[0-9]?-?[a-z]+-//g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
 
diff --git a/textproc/bibtool/Makefile b/textproc/bibtool/Makefile
index f426f53c0139..adc3f932577d 100644
--- a/textproc/bibtool/Makefile
+++ b/textproc/bibtool/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	bibtool
 PORTVERSION=	2.59
 CATEGORIES=	textproc print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	biblio/bibtex/utils/${PORTNAME}
+MASTER_SITES=	TEX_CTAN/biblio/bibtex/utils/${PORTNAME}
 DISTNAME=	BibTool-${PORTVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
diff --git a/textproc/bsddiff/Makefile b/textproc/bsddiff/Makefile
index 21040366a2b7..e4dfbc7a42dd 100644
--- a/textproc/bsddiff/Makefile
+++ b/textproc/bsddiff/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	diff
 PORTVERSION=	20120705
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	gabor
+MASTER_SITES=	LOCAL/gabor
 PKGNAMEPREFIX=	bsd-
 
 MAINTAINER=	gabor@FreeBSD.org
diff --git a/textproc/bsdgrep/Makefile b/textproc/bsdgrep/Makefile
index 750e251182dc..8b19d4b3b0e3 100644
--- a/textproc/bsdgrep/Makefile
+++ b/textproc/bsdgrep/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	grep
 PORTVERSION=	20111002
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	gabor
+MASTER_SITES=	LOCAL/gabor
 PKGNAMEPREFIX=	bsd-
 
 MAINTAINER=	gabor@FreeBSD.org
diff --git a/textproc/bsdsort/Makefile b/textproc/bsdsort/Makefile
index 27a6fe64135a..e05af7085cfd 100644
--- a/textproc/bsdsort/Makefile
+++ b/textproc/bsdsort/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	sort
 PORTVERSION=	20120716
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	gabor
+MASTER_SITES=	LOCAL/gabor
 PKGNAMEPREFIX=	bsd-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index 6921751787dc..ee3d4f6c4f6f 100644
--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=		c2html
 PORTVERSION=		0.9.6
 CATEGORIES=		textproc www
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/www/converters
+MASTER_SITES=		SUNSITE/apps/www/converters
 
 MAINTAINER=		mkamm@gmx.net
 COMMENT=	C-language sources to HTML converter
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 61797906fe68..309234d95baa 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=		cdif
 PORTVERSION=		1.19
 CATEGORIES=		textproc
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	sanpei
+MASTER_SITES=		LOCAL/sanpei
 EXTRACT_SUFX=		# empty
 
 MAINTAINER=		sanpei@FreeBSD.org
diff --git a/textproc/chm2pdf/Makefile b/textproc/chm2pdf/Makefile
index 8ca3a8816d93..ef0887dfec60 100644
--- a/textproc/chm2pdf/Makefile
+++ b/textproc/chm2pdf/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	chm2pdf
 PORTVERSION=	0.9.1
 PORTREVISION=	3
 CATEGORIES=	textproc python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Python script that converts CHM files into PDF files
diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile
index ebdf82794969..dceb1d8abf48 100644
--- a/textproc/docbook-utils/Makefile
+++ b/textproc/docbook-utils/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	docbook-utils
 PORTVERSION=	0.6.14
 PORTREVISION=	13
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	docbook-tools/new-trials/SOURCES
+MASTER_SITES=	SOURCEWARE/docbook-tools/new-trials/SOURCES
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	Generates various output formats from DocBook SGML documents
diff --git a/textproc/flip/Makefile b/textproc/flip/Makefile
index 7f5a599bfe8c..83f7f12cf1d4 100644
--- a/textproc/flip/Makefile
+++ b/textproc/flip/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	flip
 PORTVERSION=	1.19
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	itetcu
+MASTER_SITES=	LOCAL/itetcu
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/textproc/foiltex/Makefile b/textproc/foiltex/Makefile
index 6e183638d8dc..96a3a3e9b1c7 100644
--- a/textproc/foiltex/Makefile
+++ b/textproc/foiltex/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	foiltex
 PORTVERSION=	2.1.4b
 PORTREVISION=	5
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	macros/latex/contrib/${PORTNAME}
+MASTER_SITES=	TEX_CTAN/macros/latex/contrib/${PORTNAME}
 DISTFILES=	foiltex.dtx foiltex.ins
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/gladtex/Makefile b/textproc/gladtex/Makefile
index 9a528d119973..ed22ab151329 100644
--- a/textproc/gladtex/Makefile
+++ b/textproc/gladtex/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gladtex
 PORTVERSION=	1.3
 PORTREVISION=	3
 CATEGORIES=	textproc math www
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Program to replace LaTeX formulas in HTML files with images
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 5062d50428ed..aeb5ca3248dd 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	groff
 PORTVERSION=	1.22.2
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	groff
+MASTER_SITES=	GNU
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Software typesetting package
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index b6a71f9d7d74..859e2c4518ef 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	gtkspell
 PORTVERSION=	2.0.16
 PORTREVISION?=	5
 CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	marcus
+MASTER_SITES=	LOCAL/marcus
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GTK+ 2 spell checking component
diff --git a/textproc/hhm/Makefile b/textproc/hhm/Makefile
index 372484eaacba..7690aafa2e50 100644
--- a/textproc/hhm/Makefile
+++ b/textproc/hhm/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	hhm
 PORTVERSION=	0.1.1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML Help Maker
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index b8835fe50210..22a7ba152779 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	htdig
 PORTVERSION=	3.2.0.b6
 PORTREVISION=	6
 CATEGORIES=	textproc www
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/3.2.0b6
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/3.2.0b6
 DISTNAME=	htdig-3.2.0b6
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile
index 3f271f0c7929..678fab352a39 100644
--- a/textproc/html2text/Makefile
+++ b/textproc/html2text/Makefile
@@ -4,9 +4,8 @@
 PORTNAME=	html2text
 PORTVERSION=	1.3.2a
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+MASTER_SITES=	SUNSITE/apps/www/converters \
 		http://www.mbayer.de/html2text/downloads/
-MASTER_SITE_SUBDIR=	apps/www/converters
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts HTML documents into plain text
diff --git a/textproc/ibus-m17n/Makefile b/textproc/ibus-m17n/Makefile
index cea471314abc..dd2b2e9c7822 100644
--- a/textproc/ibus-m17n/Makefile
+++ b/textproc/ibus-m17n/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	ibus-m17n
 PORTVERSION=	1.3.3
 PORTREVISION=	5
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	The m17n IMEngine for IBus framework
diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile
index ee94382cb565..768c8bc41931 100644
--- a/textproc/ibus-table/Makefile
+++ b/textproc/ibus-table/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	ibus-table
 PORTVERSION=	1.5.0
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Table based input method framework for IBus
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index a0621930775f..a77de58da043 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	iksemel
 PORTVERSION=	1.4
 PORTREVISION=	6
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	rhaamo@gruik.at
 COMMENT=	XML parser library mainly designed for Jabber applications
diff --git a/textproc/irstlm/Makefile b/textproc/irstlm/Makefile
index 5c996b24c9b6..157a8094cbcb 100644
--- a/textproc/irstlm/Makefile
+++ b/textproc/irstlm/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	irstlm
 PORTVERSION=	5.80.03
 PORTREVISION=	4
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/${PORTNAME}-5.80
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-5.80
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	The IRST Language Modeling Toolkit
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index 7ace079b9ef5..c82336f08f44 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	iso12083
 PORTVERSION=	1993
 PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama/iso12083
+MASTER_SITES=	LOCAL/kuriyama/iso12083
 DISTFILES=	article.dtd book.dtd maths.dtd serial.dtd
 EXTRACT_ONLY=	# empty
 
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 271bc0df24f1..91ef807a8bf3 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	iso8879
 PORTVERSION=	1986
 PORTREVISION=	3
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	LOCAL/kuriyama
 DISTNAME=	isoENTS
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile
index 884f6dea963a..3015897136d7 100644
--- a/textproc/java2html/Makefile
+++ b/textproc/java2html/Makefile
@@ -5,8 +5,7 @@ PORTNAME=		java2html
 PORTVERSION=		0.9.2
 PORTREVISION=		1
 CATEGORIES=		textproc www
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/www/converters
+MASTER_SITES=		SUNSITE/apps/www/converters
 
 MAINTAINER=		mkamm@gmx.net
 COMMENT=	Java sources to HTML converter
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 2cdeb80e06df..65d83e1843ff 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	latex2html
 PORTVERSION=	2008
 PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	support/${PORTNAME}
+MASTER_SITES=	TEX_CTAN/support/${PORTNAME}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Convert LaTeX documents to HTML
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 6efcf2f04ba8..996ef6b009b7 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	liblrdf
 PORTVERSION=	0.5.0
 PORTREVISION=	7
 CATEGORIES=	textproc
-MASTER_SITES=	GENTOO/distfiles
+MASTER_SITES=	GENTOO
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for manipulating RDF files describing LADSPA plugins
diff --git a/textproc/libtext-charwidth-perl/Makefile b/textproc/libtext-charwidth-perl/Makefile
index c3de7ad6805c..fcf4ff7c0057 100644
--- a/textproc/libtext-charwidth-perl/Makefile
+++ b/textproc/libtext-charwidth-perl/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	libtext-charwidth-perl
 PORTVERSION=	0.04
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/libt/libtext-charwidth-perl
+MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/libtext-wrapi18n-perl/Makefile b/textproc/libtext-wrapi18n-perl/Makefile
index 0009b128ba0e..a95f858872e5 100644
--- a/textproc/libtext-wrapi18n-perl/Makefile
+++ b/textproc/libtext-wrapi18n-perl/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	libtext-wrapi18n-perl
 PORTVERSION=	0.06
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/libt/libtext-wrapi18n-perl
+MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/ltxml/Makefile b/textproc/ltxml/Makefile
index e7e42b22257d..fd088472f12d 100644
--- a/textproc/ltxml/Makefile
+++ b/textproc/ltxml/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ltxml
 PORTVERSION=	1.2.9
 CATEGORIES=	textproc
-MASTER_SITES=	GENTOO/distfiles \
+MASTER_SITES=	GENTOO \
 		ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/lucene/Makefile b/textproc/lucene/Makefile
index 17142bcaa8ca..726cc37a2ca7 100644
--- a/textproc/lucene/Makefile
+++ b/textproc/lucene/Makefile
@@ -6,9 +6,7 @@ PORTVERSION=	3.6.2
 # Be sure to chase devel/openoffice-devel and textproc/py-lucene
 # when updating this
 CATEGORIES=	textproc java devel
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	${PORTNAME}/java/${PORTVERSION}/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	APACHE/${PORTNAME}/java/${PORTVERSION}
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Full-text search engine for Java
@@ -19,6 +17,7 @@ CONFLICTS=	lucene4-[0-9].*
 
 PORTSCOUT=	limit:^3\.
 
+USES=		tar:tgz
 USE_JAVA=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.6+
diff --git a/textproc/lucene4/Makefile b/textproc/lucene4/Makefile
index 4abc98593730..a21c781995c7 100644
--- a/textproc/lucene4/Makefile
+++ b/textproc/lucene4/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	lucene
 PORTVERSION=	4.10.4
 CATEGORIES=	textproc java devel
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	${PORTNAME}/java/${PORTVERSION}/
+MASTER_SITES=	APACHE/${PORTNAME}/java/${PORTVERSION}
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Full-text search engine for Java, 4.x branch
diff --git a/textproc/lucene5/Makefile b/textproc/lucene5/Makefile
index 3427274d5515..13ebbfb455f1 100644
--- a/textproc/lucene5/Makefile
+++ b/textproc/lucene5/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	lucene
 PORTVERSION=	5.1.0
 CATEGORIES=	textproc java devel
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	${PORTNAME}/java/${PORTVERSION}/
+MASTER_SITES=	APACHE/${PORTNAME}/java/${PORTVERSION}
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Full-text search engine for Java, 5.x branch
diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index 3ac8364a54b4..097212791176 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mdocml
 PORTVERSION=	1.13.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://mdocml.bsd.lv/snapshots/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	uqs
+		LOCAL/uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	mdoc macro compiler
diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
index 17fd28caf824..1c9feb4aa54e 100644
--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mgdiff
 PORTVERSION=	1.0
 PORTREVISION=	4
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications
+MASTER_SITES=	XCONTRIB/applications
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	portmaster@BSDforge.com
diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile
index 8d2c117d4bca..6b5508cf476d 100644
--- a/textproc/muse/Makefile
+++ b/textproc/muse/Makefile
@@ -6,9 +6,8 @@ PORTVERSION=	3.20
 PORTREVISION=	10
 CATEGORIES=	textproc elisp
 MASTER_SITES=	http://download.gna.org/muse-el/ \
-		${MASTER_SITE_LOCAL} \
+		LOCAL/dryice \
 		http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR=	dryice
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/p5-Google-Data-JSON/Makefile b/textproc/p5-Google-Data-JSON/Makefile
index 313be3b6a9e4..881229722930 100644
--- a/textproc/p5-Google-Data-JSON/Makefile
+++ b/textproc/p5-Google-Data-JSON/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	Google-Data-JSON
 PORTVERSION=	0.1.10
+DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TAKERU
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	General XML-JSON converter based on Google Data APIs
diff --git a/textproc/p5-PPI-XS/Makefile b/textproc/p5-PPI-XS/Makefile
index 7bf4d3969e22..649b0104dd62 100644
--- a/textproc/p5-PPI-XS/Makefile
+++ b/textproc/p5-PPI-XS/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	PPI-XS
 PORTVERSION=	0.902
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	PPI
+MASTER_SITES=	CPAN/PPI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/textproc/p5-Pod-Strip/Makefile b/textproc/p5-Pod-Strip/Makefile
index f21cf4173d2e..f558eddcbae8 100644
--- a/textproc/p5-Pod-Strip/Makefile
+++ b/textproc/p5-Pod-Strip/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.02
 PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Pod
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-String-BufferStack/Makefile b/textproc/p5-String-BufferStack/Makefile
index b910301f5b7e..7127c5ead2e1 100644
--- a/textproc/p5-String-BufferStack/Makefile
+++ b/textproc/p5-String-BufferStack/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.16
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	String
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/textproc/p5-Text-FixEOL/Makefile b/textproc/p5-Text-FixEOL/Makefile
index 41bcd98a0177..6d1baef6d9dd 100644
--- a/textproc/p5-Text-FixEOL/Makefile
+++ b/textproc/p5-Text-FixEOL/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.06
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Text
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/textproc/p5-Text-Reform/Makefile b/textproc/p5-Text-Reform/Makefile
index d453d104900b..482d9135ce58 100644
--- a/textproc/p5-Text-Reform/Makefile
+++ b/textproc/p5-Text-Reform/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.20
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Text
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-Text-Trim/Makefile b/textproc/p5-Text-Trim/Makefile
index 9e319613bdc2..4e52e1b97c2c 100644
--- a/textproc/p5-Text-Trim/Makefile
+++ b/textproc/p5-Text-Trim/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.02
 PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Text
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-XML-DOM2/Makefile b/textproc/p5-XML-DOM2/Makefile
index baf965221592..76e44f437b33 100644
--- a/textproc/p5-XML-DOM2/Makefile
+++ b/textproc/p5-XML-DOM2/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.06
 PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	XML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/p5-XML-Parser-Style-EasyTree/Makefile b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
index 112029f7d81c..0fa69f6febf5 100644
--- a/textproc/p5-XML-Parser-Style-EasyTree/Makefile
+++ b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.09
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	XML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/textproc/p5-podlators/Makefile b/textproc/p5-podlators/Makefile
index 659dc360d066..bf01fab2a452 100644
--- a/textproc/p5-podlators/Makefile
+++ b/textproc/p5-podlators/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	podlators
 PORTVERSION=	2.5.3
 PORTREVISION=	2
 CATEGORIES=	textproc perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Pod
+MASTER_SITES=	CPAN/Pod
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile
index d15ad76c28fe..a5956370937b 100644
--- a/textproc/pdfgrep/Makefile
+++ b/textproc/pdfgrep/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	pdfgrep
 PORTVERSION=	1.3.0
 PORTREVISION=	3
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	michael@ranner.eu
 COMMENT=	Tool to search text in PDF files
diff --git a/textproc/pecl-ctemplate/Makefile b/textproc/pecl-ctemplate/Makefile
index 3d688f5d2749..7387e9a8639d 100644
--- a/textproc/pecl-ctemplate/Makefile
+++ b/textproc/pecl-ctemplate/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	cTemplate
 PORTVERSION=	1.11
 PORTREVISION=	0
 CATEGORIES=	textproc pear
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	vanilla
+MASTER_SITES=	LOCAL/vanilla
 PKGNAMEPREFIX=	pecl-
 DIST_SUBDIR=	PECL
 
diff --git a/textproc/perl2html/Makefile b/textproc/perl2html/Makefile
index 3f948f3d623e..9adf5cbcd6ab 100644
--- a/textproc/perl2html/Makefile
+++ b/textproc/perl2html/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	perl2html
 PORTVERSION=	0.9.2
 PORTREVISION=	1
 CATEGORIES=	textproc www
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/www/converters
+MASTER_SITES=	SUNSITE/apps/www/converters
 
 MAINTAINER=	mkamm@gmx.net
 COMMENT=	Perl sources to HTML converter
diff --git a/textproc/popup-stacks/Makefile b/textproc/popup-stacks/Makefile
index 342904c9ceb0..95bf5a83814c 100644
--- a/textproc/popup-stacks/Makefile
+++ b/textproc/popup-stacks/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	popup
 PORTVERSION=	1.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://popup.sourceforge.net/files/cstack/
-MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-stacks${PKGNAMESUFFIX2}
 DISTFILES=	English-German.cstack.gz German-French.cstack.gz
 
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index e7c7f27126e8..dc1bc8c9c378 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	ppower4
 PORTVERSION=	0.9.4
 PORTREVISION=	7
 CATEGORIES=	textproc java
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	support/${PORTNAME}
+MASTER_SITES=	TEX_CTAN/support/${PORTNAME}
 DISTFILES=	pp4sty.zip pp4p.jar manual.pdf leveldemo.zip
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	pp4sty.zip leveldemo.zip
diff --git a/textproc/py-wordnet/Makefile b/textproc/py-wordnet/Makefile
index 4c0c8eb1f8a4..eec80e6b456e 100644
--- a/textproc/py-wordnet/Makefile
+++ b/textproc/py-wordnet/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	textproc python
 MASTER_SITES=	SF/pywordnet/pywordnet/${PORTVERSION}:pywn \
 		http://wordnetcode.princeton.edu/${WN_VERSION}/:wn \
 		ftp://ftp.ims.uni-stuttgart.de/pub/WordNet/${WN_VERSION}/:wn
-MASTER_SITE_SUBDIR=	pywordnet
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	pywordnet-${PORTVERSION}.tar.gz:pywn \
 		WordNet-${WN_VERSION}.tar.gz:wn
diff --git a/textproc/py2html/Makefile b/textproc/py2html/Makefile
index 00a8c4d74fbd..e8bcd221669a 100644
--- a/textproc/py2html/Makefile
+++ b/textproc/py2html/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	py2html
 PORTVERSION=	0.7
 CATEGORIES=	textproc www python
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	perky
+MASTER_SITES=	LOCAL/perky
 PKGNAMESUFFIX=	-${PYTHON_PKGNAMEPREFIX:S/-//}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/randlm/Makefile b/textproc/randlm/Makefile
index 2df1b844efd1..e678b3120663 100644
--- a/textproc/randlm/Makefile
+++ b/textproc/randlm/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	randlm
 PORTVERSION=	0.2.5
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A toolkit for building randomized language models
diff --git a/textproc/ruby-escape/Makefile b/textproc/ruby-escape/Makefile
index 877cd258cb12..cd8a14801cc2 100644
--- a/textproc/ruby-escape/Makefile
+++ b/textproc/ruby-escape/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	escape
 PORTVERSION=	0.2
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.a-k-r.org/${PORTNAME}/ \
-		${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/ruby-escape|}
+		LOCAL/tota/ruby-escape
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	${RUBY_PKGNAMEPREFIX:S|${RUBY_SUFFIX}-||}
 
diff --git a/textproc/ruby-rttool/Makefile b/textproc/ruby-rttool/Makefile
index 1320501cd6db..78044499984c 100644
--- a/textproc/ruby-rttool/Makefile
+++ b/textproc/ruby-rttool/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	rttool
 PORTVERSION=	1.0.3
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.rubyist.net/~rubikitch/archive/ \
-		${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/ruby-rttool|}
+		LOCAL/tota/ruby-rttool
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	${RUBY_PKGNAMEPREFIX:S|${RUBY_SUFFIX}-||}
 
diff --git a/textproc/scr2txt/Makefile b/textproc/scr2txt/Makefile
index c5b27df984b0..76fe9123d53f 100644
--- a/textproc/scr2txt/Makefile
+++ b/textproc/scr2txt/Makefile
@@ -4,14 +4,12 @@
 PORTNAME=	scr2txt
 PORTVERSION=	1.2
 CATEGORIES=	textproc
-
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nik
-NO_WRKSUBDIR=	yes
+MASTER_SITES=	LOCAL/nik
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts the output of "vidcontrol -p" to text
 
+NO_WRKSUBDIR=	yes
 USES=		uidfix
 MAKE_ENV=	BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX}
 
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index 1a139df823d4..1d41a2e5118d 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	1.1.5
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	senna/46945
+MASTER_SITES=	SFJP/senna/46945
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Embeddable Fulltext Search Engine
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index 5340bb109e45..4f0835988b36 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	sgmlformat
 PORTVERSION=	1.7
 PORTREVISION=	6
 CATEGORIES=	textproc print
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	LOCAL/kuriyama
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Generates groff and HTML from linuxdoc and docbook SGML documents
diff --git a/textproc/sgrep/Makefile b/textproc/sgrep/Makefile
index 805b93f046ac..971ff1d9f460 100644
--- a/textproc/sgrep/Makefile
+++ b/textproc/sgrep/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.99
 PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	jkoshy
+		LOCAL/jkoshy
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Grep for structured text like SGML and HTML
diff --git a/textproc/sgrep2/Makefile b/textproc/sgrep2/Makefile
index 4f87fc5102d4..e8758c461018 100644
--- a/textproc/sgrep2/Makefile
+++ b/textproc/sgrep2/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	sgrep2
 PORTVERSION=	1.94a
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	jkoshy
+		LOCAL/jkoshy
 DISTNAME=	sgrep-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index abd40f65a5bc..fee82b2a4091 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	source-highlight
 PORTVERSION=	3.1.6
 PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	src-highlite
+MASTER_SITES=	GNU/src-highlite
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	C/C++ and Java sources to HTML converter
diff --git a/textproc/txt2tags/Makefile b/textproc/txt2tags/Makefile
index 1d712445bffd..957a7968c1ca 100644
--- a/textproc/txt2tags/Makefile
+++ b/textproc/txt2tags/Makefile
@@ -4,13 +4,12 @@
 PORTNAME=	txt2tags
 PORTVERSION=	2.6
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert simply formatted text into markup (e.g., HTML)
 
-USES=		python:2
+USES=		python:2 tar:tgz
 NO_BUILD=	yes
 
 PORTDOCS=	ChangeLog README userguide.pdf
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index e74a4760e2ee..88d90accbfc2 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	uim-el
 PORTVERSION=	1.8.6
 PORTREVISION=	3
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	uim-${PORTVERSION}
 
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 9dbef5c88788..94682f86a01a 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	uim
 PORTVERSION=	1.8.6
 PORTREVISION?=	1
 CATEGORIES?=	textproc
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 .endif
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index 60f9c7a9e41b..58566b8b7efe 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -5,13 +5,11 @@ PORTNAME=	unroff
 PORTVERSION=	1.0.2
 PORTREVISION=	5
 CATEGORIES=	textproc
-MASTER_SITES=	http://www-rn.informatik.uni-bremen.de/software/unroff/%SUBDIR%/
-MASTER_SITE_SUBDIR=	dist
+MASTER_SITES=	http://www-rn.informatik.uni-bremen.de/software/unroff/dist/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 DIST_SUBDIR=	unroff
 
-PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	contrib
+PATCH_SITES=	http://www-rn.informatik.uni-bremen.de/software/unroff/contrib/
 PATCHFILES=	me-misc-patch.gz misc-patch-2.gz
 PATCH_DIST_STRIP=	-p1
 
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 332605547180..ca5d2124e471 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	xalan-j
 PORTVERSION=	2.7.1
 CATEGORIES=	textproc java
-MASTER_SITES=	${MASTER_SITE_APACHE_XML}
-MASTER_SITE_SUBDIR=	${PORTNAME}/binaries
+MASTER_SITES=	APACHE_XML/${PORTNAME}/binaries
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}-bin
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index 4cd1cd540d77..de17a121a453 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	xerces-j
 PORTVERSION=	2.11.0
 CATEGORIES=	textproc java
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	xerces/j
+MASTER_SITES=	APACHE/xerces/j
 DISTNAME=	Xerces-J-bin.${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile
index bfbacc8323ee..873e7e9c9d82 100644
--- a/textproc/xhtml/Makefile
+++ b/textproc/xhtml/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.0.20020801
 PORTREVISION=	4
 CATEGORIES=	textproc
 #MASTER_SITES=	http://www.w3.org/TR/xhtml1/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	LOCAL/kuriyama
 DISTNAME=	xhtml1-20020801
 
 MAINTAINER=	kuriyama@FreeBSD.org