aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/aiksaurus/Makefile3
-rw-r--r--textproc/amberfish/Makefile3
-rw-r--r--textproc/apertium/Makefile2
-rw-r--r--textproc/bbe/Makefile3
-rw-r--r--textproc/bedic-data/Makefile3
-rw-r--r--textproc/cbedic/Makefile3
-rw-r--r--textproc/clucene/Makefile3
-rw-r--r--textproc/code2html/Makefile4
-rw-r--r--textproc/csv2xml/Makefile3
-rw-r--r--textproc/csvdiff/Makefile3
-rw-r--r--textproc/cwtext/Makefile2
-rw-r--r--textproc/db2latex/Makefile3
-rw-r--r--textproc/dbacl/Makefile3
-rw-r--r--textproc/dblatex/Makefile3
-rw-r--r--textproc/denature/Makefile3
-rw-r--r--textproc/dict/Makefile2
-rw-r--r--textproc/dictem/Makefile3
-rw-r--r--textproc/dictfmt/Makefile3
-rw-r--r--textproc/doc-mode.el/Makefile3
-rw-r--r--textproc/docbook-xsl/Makefile3
-rw-r--r--textproc/dom4j/Makefile3
-rw-r--r--textproc/dsssl-docbook-modular/Makefile3
-rw-r--r--textproc/dtdparse/Makefile3
-rw-r--r--textproc/estraier/Makefile4
-rw-r--r--textproc/expat2/Makefile3
-rw-r--r--textproc/ezxml/Makefile4
-rw-r--r--textproc/flex/Makefile2
-rw-r--r--textproc/fop/Makefile4
-rw-r--r--textproc/gmetadom/Makefile3
-rw-r--r--textproc/gxmlviewer/Makefile3
-rw-r--r--textproc/heirloom-doctools/Makefile3
-rw-r--r--textproc/htdig/Makefile2
-rw-r--r--textproc/html2fo/Makefile3
-rw-r--r--textproc/hyperestraier/Makefile3
-rw-r--r--textproc/info2html/Makefile2
-rw-r--r--textproc/ispell/Makefile5
-rw-r--r--textproc/jdictionary-int-eng/Makefile1
-rw-r--r--textproc/jdictionary/Makefile3
-rw-r--r--textproc/jdictionary/Makefile.plugin2
-rw-r--r--textproc/jrefentry/Makefile3
-rw-r--r--textproc/kbedic/Makefile3
-rw-r--r--textproc/kdiff3/Makefile3
-rw-r--r--textproc/kmflcomp/Makefile4
-rw-r--r--textproc/libcsv/Makefile2
-rw-r--r--textproc/libkmfl/Makefile4
-rw-r--r--textproc/liblinebreak/Makefile3
-rw-r--r--textproc/liblingoteach/Makefile3
-rw-r--r--textproc/liblrdf/Makefile3
-rw-r--r--textproc/libuninameslist/Makefile2
-rw-r--r--textproc/libwpd/Makefile2
-rw-r--r--textproc/libwpd08/Makefile2
-rw-r--r--textproc/libwps/Makefile2
-rw-r--r--textproc/libxode/Makefile3
-rw-r--r--textproc/lttoolbox/Makefile2
-rw-r--r--textproc/makefaq/Makefile3
-rw-r--r--textproc/metauml/Makefile3
-rw-r--r--textproc/nunnimcax/Makefile3
-rw-r--r--textproc/openfts/Makefile3
-rw-r--r--textproc/openjade/Makefile3
-rw-r--r--textproc/opensp/Makefile3
-rw-r--r--textproc/ots/Makefile2
-rw-r--r--textproc/p5-XML-XSH/Makefile6
-rw-r--r--textproc/p5-xmltv/Makefile3
-rw-r--r--textproc/pardiff/Makefile3
-rw-r--r--textproc/pdftohtml/Makefile3
-rw-r--r--textproc/popup/Makefile3
-rw-r--r--textproc/prosper/Makefile3
-rw-r--r--textproc/py-4suite-xml/Makefile4
-rw-r--r--textproc/py-4suite/Makefile4
-rw-r--r--textproc/py-docutils/Makefile3
-rw-r--r--textproc/py-dsv/Makefile3
-rw-r--r--textproc/py-enchant/Makefile3
-rw-r--r--textproc/py-excelerator/Makefile2
-rw-r--r--textproc/py-pyx12/Makefile3
-rw-r--r--textproc/py-reverend/Makefile3
-rw-r--r--textproc/py-stripogram/Makefile3
-rw-r--r--textproc/py-xlwriter/Makefile3
-rw-r--r--textproc/py-xml/Makefile3
-rw-r--r--textproc/pychm/Makefile2
-rw-r--r--textproc/queequeg/Makefile3
-rw-r--r--textproc/raptor/Makefile4
-rw-r--r--textproc/raptor2/Makefile4
-rw-r--r--textproc/rasqal/Makefile4
-rw-r--r--textproc/redland-bindings/Makefile3
-rw-r--r--textproc/redland/Makefile4
-rw-r--r--textproc/resume/Makefile3
-rw-r--r--textproc/rman/Makefile3
-rw-r--r--textproc/rnv/Makefile2
-rw-r--r--textproc/roap/Makefile3
-rw-r--r--textproc/romdict/Makefile3
-rw-r--r--textproc/ruby-format/Makefile3
-rw-r--r--textproc/ruby-nqxml/Makefile3
-rw-r--r--textproc/ruby-raspell/Makefile3
-rw-r--r--textproc/ruby-xtemplate/Makefile3
-rw-r--r--textproc/saxon-devel/Makefile3
-rw-r--r--textproc/saxon-he/Makefile3
-rw-r--r--textproc/scim-bridge-qt4/Makefile3
-rw-r--r--textproc/scim-bridge/Makefile3
-rw-r--r--textproc/scim-input-pad/Makefile3
-rw-r--r--textproc/scim-kmfl-imengine/Makefile4
-rw-r--r--textproc/scim-m17n/Makefile4
-rw-r--r--textproc/scim-table-imengine/Makefile3
-rw-r--r--textproc/sdcv/Makefile3
-rw-r--r--textproc/sgmltools-lite/Makefile3
-rw-r--r--textproc/silvercity/Makefile3
-rw-r--r--textproc/skim/Makefile3
-rw-r--r--textproc/slides/Makefile3
-rw-r--r--textproc/soothsayer/Makefile2
-rw-r--r--textproc/soprano/Makefile2
-rw-r--r--textproc/stardict2-dictd_mova/Makefile3
-rw-r--r--textproc/stardict2-quick/Makefile3
-rw-r--r--textproc/stardict2-rptts/Makefile3
-rw-r--r--textproc/stardict2/Makefile3
-rw-r--r--textproc/stardict3/Makefile3
-rw-r--r--textproc/tinyxml/Makefile3
-rw-r--r--textproc/tkxmlive/Makefile3
-rw-r--r--textproc/tokyodystopia/Makefile2
-rw-r--r--textproc/translate-toolkit/Makefile3
-rw-r--r--textproc/txt2html/Makefile2
-rw-r--r--textproc/ua-ispell/Makefile3
-rw-r--r--textproc/uml2svg/Makefile3
-rw-r--r--textproc/uncrustify/Makefile2
-rw-r--r--textproc/wbxml2/Makefile3
-rw-r--r--textproc/webcpp/Makefile3
-rw-r--r--textproc/website/Makefile3
-rw-r--r--textproc/weka/Makefile2
-rw-r--r--textproc/word2x/Makefile3
-rw-r--r--textproc/wv/Makefile4
-rw-r--r--textproc/wv2/Makefile2
-rw-r--r--textproc/xaira/Makefile2
-rw-r--r--textproc/xlhtml/Makefile3
-rw-r--r--textproc/xlreader/Makefile3
-rw-r--r--textproc/xmlada-gcc/Makefile3
-rw-r--r--textproc/xmlcatmgr/Makefile3
-rw-r--r--textproc/xmlenc/Makefile3
-rw-r--r--textproc/xmlindent/Makefile3
-rw-r--r--textproc/xmlppm/Makefile4
-rw-r--r--textproc/xqilla/Makefile3
-rw-r--r--textproc/xslide.el/Makefile3
-rw-r--r--textproc/y2l/Makefile3
-rw-r--r--ukrainian/ispell/Makefile3
-rw-r--r--vietnamese/vietunicode-hannom/Makefile3
-rw-r--r--vietnamese/vietunicode-trichlor/Makefile3
-rw-r--r--vietnamese/vietunicode-web1/Makefile3
144 files changed, 162 insertions, 264 deletions
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 986c827544d8..ad0d235fa6bf 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -9,8 +9,7 @@ PORTNAME= aiksaurus
PORTVERSION= 1.2.1
PORTREVISION?= 2
CATEGORIES?= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aiksaurus
+MASTER_SITES= SF
MAINTAINER?= gnome@FreeBSD.org
COMMENT?= A set of libraries and applications which provide a thesaurus
diff --git a/textproc/amberfish/Makefile b/textproc/amberfish/Makefile
index ecd759e4b9b1..e93db3246be8 100644
--- a/textproc/amberfish/Makefile
+++ b/textproc/amberfish/Makefile
@@ -8,9 +8,10 @@
PORTNAME= amberfish
PORTVERSION= 1.6.4
CATEGORIES= textproc databases
-MASTER_SITES= SF \
+MASTER_SITES= SF/${PORTNAME}/Amberfish%20source%20-%20stable/${PORTVERSION} \
http://etymon.com/software/amberfish/stable/
+
MAINTAINER= ports@FreeBSD.org
COMMENT= General purpose text retrieval Software
diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index aacd3c1f22d5..9402c60bede8 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -8,7 +8,7 @@
PORTNAME= apertium
PORTVERSION= 3.1.1
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3.1
MAINTAINER= freebsd@levsha.org.ua
COMMENT= A toolbox to build shallow-transfer machine translation systems
diff --git a/textproc/bbe/Makefile b/textproc/bbe/Makefile
index 0124edeeec2e..0af8764c663a 100644
--- a/textproc/bbe/Makefile
+++ b/textproc/bbe/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bbe
PORTVERSION= 0.2.2
CATEGORIES= textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME}-
+MASTER_SITES= SF/${PORTNAME}-/${PORTNAME}/${PORTVERSION}
MAINTAINER= avl@FreeBSD.org
COMMENT= A sed-like editor for binary files
diff --git a/textproc/bedic-data/Makefile b/textproc/bedic-data/Makefile
index e8092575a92b..ce672fbc65a1 100644
--- a/textproc/bedic-data/Makefile
+++ b/textproc/bedic-data/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bedic-data
PORTVERSION= 0.1.b1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kbedic
+MASTER_SITES= SF/kbedic/Dictionary%20Data/1.0
DISTNAME= ${PORTNAME}
MAINTAINER= todorov@freebsd-bg.org
diff --git a/textproc/cbedic/Makefile b/textproc/cbedic/Makefile
index a3363df36717..15417620832a 100644
--- a/textproc/cbedic/Makefile
+++ b/textproc/cbedic/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cbedic
PORTVERSION= 1.2
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kbedic
+MASTER_SITES= SF/kbedic/CBE%20Dictionary/${PORTVERSION}
MAINTAINER= roam@FreeBSD.org
COMMENT= An English-to-Bulgarian and Bulgarian-to-English dictionary
diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile
index 2cf35f54e290..0093ae24a890 100644
--- a/textproc/clucene/Makefile
+++ b/textproc/clucene/Makefile
@@ -8,8 +8,7 @@
PORTNAME= clucene
PORTVERSION= 0.9.21
CATEGORIES= textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-core-stable/${PORTVERSION}
DISTNAME= ${PORTNAME}-core-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/code2html/Makefile b/textproc/code2html/Makefile
index 12cdd0c34263..13d33fbb57ba 100644
--- a/textproc/code2html/Makefile
+++ b/textproc/code2html/Makefile
@@ -8,9 +8,9 @@
PORTNAME= code2html
PORTVERSION= 0.9.1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://www.palfrader.org/code2html/all/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= Sourcecode to HTML converter
diff --git a/textproc/csv2xml/Makefile b/textproc/csv2xml/Makefile
index 0877aadd63e5..f0e7ceb70229 100644
--- a/textproc/csv2xml/Makefile
+++ b/textproc/csv2xml/Makefile
@@ -8,8 +8,7 @@
PORTNAME= csv2xml
PORTVERSION= 0.6
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple but effective csv to xml converter
diff --git a/textproc/csvdiff/Makefile b/textproc/csvdiff/Makefile
index eaa6d762567f..09e7af413285 100644
--- a/textproc/csvdiff/Makefile
+++ b/textproc/csvdiff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= csvdiff
PORTVERSION= 1.3
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION:S,.,-,g}
MAINTAINER= chinsan@FreeBSD.org
diff --git a/textproc/cwtext/Makefile b/textproc/cwtext/Makefile
index 3c69cbf4ad1f..e5bfb89a6bb0 100644
--- a/textproc/cwtext/Makefile
+++ b/textproc/cwtext/Makefile
@@ -9,7 +9,7 @@
PORTNAME= cwtext
PORTVERSION= 0.96
CATEGORIES= textproc hamradio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= db@FreeBSD.org
COMMENT= Morse Code Generator
diff --git a/textproc/db2latex/Makefile b/textproc/db2latex/Makefile
index d03923a0bd82..9d04c1315a56 100644
--- a/textproc/db2latex/Makefile
+++ b/textproc/db2latex/Makefile
@@ -10,8 +10,7 @@ PORTNAME= db2latex
PORTVERSION= 0.8p1
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.8pre1
DISTNAME= ${PORTNAME}-xsl-${PORTVERSION:S/p/pre/}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/dbacl/Makefile b/textproc/dbacl/Makefile
index b6adebd840cf..b3d3254eec44 100644
--- a/textproc/dbacl/Makefile
+++ b/textproc/dbacl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dbacl
PORTVERSION= 1.12
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= clsung@FreeBSD.org
COMMENT= Digramic Bayesian classifier
diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile
index be48135dc675..5cefbcc0bf40 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dblatex
PORTVERSION= 0.2.9
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= johnson.peter@gmail.com
COMMENT= DocBook to LaTeX/ConTeXt Publishing
diff --git a/textproc/denature/Makefile b/textproc/denature/Makefile
index 328f46390e2d..981d8f67ba41 100644
--- a/textproc/denature/Makefile
+++ b/textproc/denature/Makefile
@@ -10,8 +10,7 @@ PORTNAME= denature
PORTVERSION= 0.6.5
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A HTML to PDF converter
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 82c0e3dd2f46..15b37bd566f2 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -9,7 +9,7 @@
PORTNAME= dict
PORTVERSION= 1.11.1
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}d/${PORTNAME}d-${PORTVERSION}
DISTNAME= ${PORTNAME}d-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index 5c96de185a5e..b9e9356f8891 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -8,8 +8,7 @@ PORTNAME= dictem
PORTVERSION= 1.0.0
PORTREVISION= 1
CATEGORIES= textproc net elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/dictem/dictem/dictem-${PORTVERSION}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= m.boyarov@bsd.by
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index ae5d7e185a02..1175d48a92ae 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dictfmt
PORTVERSION= 1.11.1
CATEGORIES= textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= dict
+MASTER_SITES= SF/dict/dictd/dictd-${PORTVERSION}
DISTNAME= dictd-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
diff --git a/textproc/doc-mode.el/Makefile b/textproc/doc-mode.el/Makefile
index a58d74f1e513..fd9fa665dcdd 100644
--- a/textproc/doc-mode.el/Makefile
+++ b/textproc/doc-mode.el/Makefile
@@ -9,8 +9,7 @@ PORTNAME= doc-mode.el
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= textproc elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=xpt
+MASTER_SITES= SF/xpt/doc-mode/doc-mode-${PORTVERSION}
DISTNAME= doc-mode-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index 4fbde3b1842b..3d9f3c2a3eb9 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= docbook-xsl
PORTVERSION= 1.75.1
CATEGORIES= textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= docbook
+MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/dom4j/Makefile b/textproc/dom4j/Makefile
index b1fa07dada9c..d7445db297b6 100644
--- a/textproc/dom4j/Makefile
+++ b/textproc/dom4j/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dom4j
PORTVERSION= 1.6.1
PORTREVISION= 2
CATEGORIES= textproc java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dom4j
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Open Source XML framework for Java
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index 0a17bca993e8..63eb52335bc6 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.79
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= docbook
+MASTER_SITES= SF/docbook/docbook-dsssl/${PORTVERSION}
DISTNAME= docbook-dsssl-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} docbook-dsssl-doc-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/textproc/dtdparse/Makefile b/textproc/dtdparse/Makefile
index 7c2d655e5cf7..cd6977766192 100644
--- a/textproc/dtdparse/Makefile
+++ b/textproc/dtdparse/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dtdparse
PORTVERSION= 2.00
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dtdparse
+MASTER_SITES= SF
DISTNAME= SGML-DTDParse-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/estraier/Makefile b/textproc/estraier/Makefile
index e1b8d85fef07..4b01bdf4becb 100644
--- a/textproc/estraier/Makefile
+++ b/textproc/estraier/Makefile
@@ -9,9 +9,9 @@ PORTNAME= estraier
PORTVERSION= 1.2.29
PORTREVISION= 4
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://estraier.sourceforge.net/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ahze@FreeBSD.org
COMMENT= A full-text search system for personal use
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 74a5cf882787..e5fada6b1365 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= expat
PORTVERSION= 2.0.1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= expat
+MASTER_SITES= SF
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= XML 1.0 parser written in C
diff --git a/textproc/ezxml/Makefile b/textproc/ezxml/Makefile
index 56de89665159..bb253f4bcc3b 100644
--- a/textproc/ezxml/Makefile
+++ b/textproc/ezxml/Makefile
@@ -8,9 +8,9 @@
PORTNAME= ezxml
PORTVERSION= 0.8.6
CATEGORIES= textproc devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/ezXML/ezXML%20${PORTVERSION} \
http://www.yazzy.org/ports/ezxml/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= Easy to use C library for parsing XML documents
diff --git a/textproc/flex/Makefile b/textproc/flex/Makefile
index a49ee7eb1711..46482481200c 100644
--- a/textproc/flex/Makefile
+++ b/textproc/flex/Makefile
@@ -9,7 +9,7 @@ PORTNAME= flex
PORTVERSION= 2.5.35
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast lexical analyzer generator
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 25b2f2e40132..a180f8f1b996 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -9,8 +9,8 @@ PORTNAME= fop
PORTVERSION= 0.95
CATEGORIES= textproc java
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:fop/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:hyph/}
-MASTER_SITE_SUBDIR= xmlgraphics/fop/source/:fop offo/:hyph
+ SF/offo/offo-hyphenation/1.0:hyph
+MASTER_SITE_SUBDIR= xmlgraphics/fop/source/:fop
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
DISTFILES= ${DISTNAME}.tar.gz:fop offo-hyphenation.zip:hyph
EXTRACT_ONLY= ${DISTNAME}.tar.gz
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index da9448d293cc..cca48c8e35e8 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -10,8 +10,7 @@ PORTNAME= gmetadom
PORTVERSION= 0.2.4
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}b
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index 7581c272d3f7..fb8a9236c6ac 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -10,8 +10,7 @@ PORTNAME= gxmlviewer
PORTVERSION= 1.3.3
PORTREVISION= 9
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-0
MAINTAINER= ports@FreeBSD.org
COMMENT= An xmlviewer with a netscape plugin, and now a bonobo control as well
diff --git a/textproc/heirloom-doctools/Makefile b/textproc/heirloom-doctools/Makefile
index 94dfa1e00f2a..c706974bd009 100644
--- a/textproc/heirloom-doctools/Makefile
+++ b/textproc/heirloom-doctools/Makefile
@@ -7,8 +7,7 @@
PORTNAME= heirloom-doctools
PORTVERSION= 0.0.080407
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= heirloom/
+MASTER_SITES= SF/heirloom/${PORTNAME}/080407
DISTNAME= ${PORTNAME}-${PORTVERSION:S,0.0.,,}
MAINTAINER= hrs@FreeBSD.org
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index b1c88a844920..eb6a1ede6730 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -9,7 +9,7 @@ PORTNAME= htdig
PORTVERSION= 3.2.0.b6
PORTREVISION= 2
CATEGORIES= textproc www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3.2.0b6
DISTNAME= htdig-3.2.0b6
MAINTAINER= DougB@FreeBSD.org
diff --git a/textproc/html2fo/Makefile b/textproc/html2fo/Makefile
index 27e1aeb8634b..abd6ddd718fc 100644
--- a/textproc/html2fo/Makefile
+++ b/textproc/html2fo/Makefile
@@ -9,8 +9,7 @@
PORTNAME= html2fo
PORTVERSION= 0.4.2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= HTML to xsl:fo converter
diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile
index f19c9be19a7f..59b3d509dd1b 100644
--- a/textproc/hyperestraier/Makefile
+++ b/textproc/hyperestraier/Makefile
@@ -8,8 +8,7 @@
PORTNAME= hyperestraier
PORTVERSION= 1.4.13
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ahze@FreeBSD.org
COMMENT= A full-text search system
diff --git a/textproc/info2html/Makefile b/textproc/info2html/Makefile
index 510bdd438699..4a4641364cea 100644
--- a/textproc/info2html/Makefile
+++ b/textproc/info2html/Makefile
@@ -8,7 +8,7 @@
PORTNAME= info2html
PORTVERSION= 2.0
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tar
MAINTAINER= wenheping@gmail.com
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 4a3d86f2a501..63b901ef0738 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -154,15 +154,14 @@ EXTRA_DICT+= ${FIDICTFILE}:fi ${FIAFFIXFILE}:fi
.endif
.if defined(ISPELL_PL)
PLDISTFILE= ispell-pl-20021127.tar.gz
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:pl/}
-MASTER_SITE_SUBDIR+= ispell-pl/:pl
+MASTER_SITES+= SF/ispell-pl/ispell-pl/20021127:pl
MASKBITS?= 64
EXTRA_DICT+= ${PLDISTFILE}:pl
EXTRACT_ONLY+= ${PLDISTFILE}
BUILDHASH= ${WRKDIR}/${PLDISTFILE:S=.tar.gz==}/zbuduj.slownik.sh
.endif
.if defined(ISPELL_BG)
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:bg/}
+MASTER_SITES+= SF/bgoffice/Ispell%20BG/2.1:bg
MASTER_SITE_SUBDIR+= bgoffice/:bg
BGDISTFILE= ispell-bg-2.1.tar.gz
MASKBITS?= 64
diff --git a/textproc/jdictionary-int-eng/Makefile b/textproc/jdictionary-int-eng/Makefile
index d8cd9ba310f1..aa42bb0f909a 100644
--- a/textproc/jdictionary-int-eng/Makefile
+++ b/textproc/jdictionary-int-eng/Makefile
@@ -9,6 +9,7 @@ PORTNAME= jdictionary-int-eng
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= textproc
+MASTER_SITES= SF/jdictionary/Plugins%20for%20jDictionary/Smart%20Interlinuga-English
DISTNAME= Smart_Interlingua_English-1_0.jar
COMMENT= JDictionary plugin: Interlingua-English dictionary
diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile
index 6ea3969fc3c9..305fb4eaeb27 100644
--- a/textproc/jdictionary/Makefile
+++ b/textproc/jdictionary/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jdictionary
PORTVERSION= 1.8
PORTREVISION= 4
CATEGORIES= textproc java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/jdictionary/jDictionary/jDictionary%20version%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION:S,.,_,}
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/textproc/jdictionary/Makefile.plugin b/textproc/jdictionary/Makefile.plugin
index 1e08f254884f..81762f228a1b 100644
--- a/textproc/jdictionary/Makefile.plugin
+++ b/textproc/jdictionary/Makefile.plugin
@@ -5,8 +5,6 @@
# $FreeBSD$
#
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jdictionary
EXTRACT_SUFX= #
MAINTAINER?= janos.mohacsi@bsd.hu
diff --git a/textproc/jrefentry/Makefile b/textproc/jrefentry/Makefile
index 31f215c263bb..ea1eb3662c08 100644
--- a/textproc/jrefentry/Makefile
+++ b/textproc/jrefentry/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jrefentry
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= docbook
+MASTER_SITES= SF/docbook/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= DocBook XML JRefEntry DTD
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index 8ae97e953d03..907f9b762eb8 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kbedic
PORTVERSION= 4.0
PORTREVISION= 5
CATEGORIES= textproc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/KBE%20Dictionary/${PORTVERSION}
MAINTAINER= roam@FreeBSD.org
COMMENT= An English-Bulgarian-English dictionary
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 42893e88892f..eb1c1102c2cb 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kdiff3
PORTVERSION= 0.9.92
PORTREVISION= 3
CATEGORIES= textproc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= h.eichmann@gmx.de
COMMENT= A KDE3 graphical frontend for diff
diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile
index 726d6caec7d9..34ef3fb63aaa 100644
--- a/textproc/kmflcomp/Makefile
+++ b/textproc/kmflcomp/Makefile
@@ -8,9 +8,9 @@
PORTNAME= kmflcomp
PORTVERSION= 0.9.8
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/kmfl/kmfl/${PORTVERSION} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
-MASTER_SITE_SUBDIR= kmfl
+
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
KMFL-Compiler.sxw
DIST_SUBDIR= kmfl
diff --git a/textproc/libcsv/Makefile b/textproc/libcsv/Makefile
index 890f11b308c5..89237c016379 100644
--- a/textproc/libcsv/Makefile
+++ b/textproc/libcsv/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libcsv
PORTVERSION= 3.0.0
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= skv@FreeBSD.org
COMMENT= Small, simple and fast CSV library
diff --git a/textproc/libkmfl/Makefile b/textproc/libkmfl/Makefile
index b2f104e8742d..491bd2a9994b 100644
--- a/textproc/libkmfl/Makefile
+++ b/textproc/libkmfl/Makefile
@@ -8,9 +8,9 @@
PORTNAME= libkmfl
PORTVERSION= 0.9.8
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/kmfl/kmfl/${PORTVERSION} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
-MASTER_SITE_SUBDIR= kmfl
+
DIST_SUBDIR= kmfl
MAINTAINER= nikola.lecic@anthesphoria.net
diff --git a/textproc/liblinebreak/Makefile b/textproc/liblinebreak/Makefile
index e56cf15d3248..7361755761dd 100644
--- a/textproc/liblinebreak/Makefile
+++ b/textproc/liblinebreak/Makefile
@@ -8,8 +8,7 @@
PORTNAME= liblinebreak
PORTVERSION= 1.2
CATEGORIES= textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= vimgadgets
+MASTER_SITES= SF/vimgadgets/${PORTNAME}/${PORTVERSION}
MAINTAINER= yuri.pankov@gmail.com
COMMENT= Implementation of the line breaking algorithm for Unicode
diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile
index 2c65bd5b6257..4e901657cafb 100644
--- a/textproc/liblingoteach/Makefile
+++ b/textproc/liblingoteach/Makefile
@@ -9,8 +9,7 @@ PORTNAME= liblingoteach
PORTVERSION= 0.2.1
PORTREVISION= 3
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lingoteach
+MASTER_SITES= SF/lingoteach/OldFiles
MAINTAINER= mva@FreeBSD.org
COMMENT= A library for parsing lesson files based on the LingoTeach DTD
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 90bbf5105fb4..1a4979a811f8 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -8,8 +8,7 @@ PORTNAME= liblrdf
PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lrdf
+MASTER_SITES= SF/lrdf/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for manipulating RDF files describing LADSPA plugins
diff --git a/textproc/libuninameslist/Makefile b/textproc/libuninameslist/Makefile
index 203566d91d8d..72390cbe353f 100644
--- a/textproc/libuninameslist/Makefile
+++ b/textproc/libuninameslist/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libuninameslist
PORTVERSION= 20060907
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/Unicode%205%2C%20${PORTVERSION}
DISTNAME= ${PORTNAME}_src-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index 517cba9f673f..1e0b3d26037f 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libwpd
PORTVERSION= 0.8.14
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
COMMENT= Tools for importing and exporting WordPerfect(tm) documents
diff --git a/textproc/libwpd08/Makefile b/textproc/libwpd08/Makefile
index 517cba9f673f..1e0b3d26037f 100644
--- a/textproc/libwpd08/Makefile
+++ b/textproc/libwpd08/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libwpd
PORTVERSION= 0.8.14
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
COMMENT= Tools for importing and exporting WordPerfect(tm) documents
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index f3bdead3ebf1..a116e69e9d92 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libwps
PORTVERSION= 0.1.2
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ahze@FreeBSD.org
COMMENT= A Microsoft file word processor format import filter library
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 44b353d6f835..1ef9fba4d06d 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libxode
PORTVERSION= 0.71
PORTREVISION= 4
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An XML library which wraps expat
diff --git a/textproc/lttoolbox/Makefile b/textproc/lttoolbox/Makefile
index 695485d1505f..b55555083fdd 100644
--- a/textproc/lttoolbox/Makefile
+++ b/textproc/lttoolbox/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lttoolbox
PORTVERSION= 3.1.1
CATEGORIES= textproc
-MASTER_SITES= SF/apertium
+MASTER_SITES= SF/apertium/${PORTNAME}/3.1
MAINTAINER= freebsd@levsha.org.ua
COMMENT= A tool for lexical, morphological analysis and generation of words
diff --git a/textproc/makefaq/Makefile b/textproc/makefaq/Makefile
index ce1f83bed543..247da4c10bee 100644
--- a/textproc/makefaq/Makefile
+++ b/textproc/makefaq/Makefile
@@ -8,8 +8,7 @@
PORTNAME= makefaq
PORTVERSION= 2.5
CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/metauml/Makefile b/textproc/metauml/Makefile
index 9fc690531df6..f45ac24ecf04 100644
--- a/textproc/metauml/Makefile
+++ b/textproc/metauml/Makefile
@@ -9,8 +9,7 @@ PORTNAME= metauml
PORTVERSION= 0.2.5
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTFILES= ${PORTNAME}_lib_${PORTVERSION}.tgz ${PORTNAME}_manual_${PORTVERSION}.pdf lop-release.tgz
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${PORTNAME}_lib_${PORTVERSION}.tgz lop-release.tgz
diff --git a/textproc/nunnimcax/Makefile b/textproc/nunnimcax/Makefile
index 7975a247517d..a3e5401234fe 100644
--- a/textproc/nunnimcax/Makefile
+++ b/textproc/nunnimcax/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NunniMCAX
PORTVERSION= 1.4.1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nunnimcax
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= skv@FreeBSD.org
COMMENT= C, non validating XML parser with SAX-like API
diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile
index f7e8ab6028f8..7b1cf10de294 100644
--- a/textproc/openfts/Makefile
+++ b/textproc/openfts/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openfts
PORTVERSION= 0.39
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openfts
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenFTS-perl%2C%20v${PORTVERSION}
DISTNAME= Search-OpenFTS-${PORTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 4757e55ebd30..5abdac105c5d 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openjade
PORTVERSION= 1.3.3p1
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.3.3
DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-pre/}
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index adbb1cf3d8ae..b0564bf25f4e 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= OpenSP
PORTVERSION= 1.5.2
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openjade
+MASTER_SITES= SF/openjade/${PORTNAME:L}/${PORTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= This package is a collection of SGML/XML tools called OpenSP
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index 6939db9a9ece..782be89b1266 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ots
PORTVERSION= 0.5.0
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= SF/libots
+MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Open Text Summarizer
diff --git a/textproc/p5-XML-XSH/Makefile b/textproc/p5-XML-XSH/Makefile
index fef8439d56e6..7c342ccc993e 100644
--- a/textproc/p5-XML-XSH/Makefile
+++ b/textproc/p5-XML-XSH/Makefile
@@ -9,11 +9,9 @@ PORTNAME= XML-XSH
PORTVERSION= 1.8.2
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge/}
-MASTER_SITE_SUBDIR= XML/:cpan xsh/:sourceforge
+MASTER_SITES= CPAN/XML \
+ SF/xsh/xsh/${PORTNAME}-${PORTVERSION}%20%28linux_unix%29
PKGNAMEPREFIX= p5-
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:cpan,sourceforge
MAINTAINER= perl@FreeBSD.org
COMMENT= This is xsh - an XML Editing Shell
diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index c8ad9316d24a..02d85f3f8d36 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmltv
PORTVERSION= 0.5.52
PORTREVISION= 1
CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xmltv
+MASTER_SITES= SF
PKGNAMEPREFIX= p5-
MAINTAINER= multimedia@FreeBSD.org
diff --git a/textproc/pardiff/Makefile b/textproc/pardiff/Makefile
index 455f5dafde20..109de8ba4dd1 100644
--- a/textproc/pardiff/Makefile
+++ b/textproc/pardiff/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pardiff
PORTVERSION= 0.9.4
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pardiff
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Parallelizing diff Filter, converts diff output to paralleled format
diff --git a/textproc/pdftohtml/Makefile b/textproc/pdftohtml/Makefile
index ba7a3fe5604c..9c341c20f988 100644
--- a/textproc/pdftohtml/Makefile
+++ b/textproc/pdftohtml/Makefile
@@ -10,8 +10,7 @@ PORTNAME= pdftohtml
PORTVERSION= 0.39
PORTREVISION= 3
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= erwin@FreeBSD.org
COMMENT= A command-line tool for converting pdf-files into html
diff --git a/textproc/popup/Makefile b/textproc/popup/Makefile
index 8d81826c6405..0f834b61d4a4 100644
--- a/textproc/popup/Makefile
+++ b/textproc/popup/Makefile
@@ -9,8 +9,7 @@ PORTNAME= popup
PORTVERSION= 0.5
PORTREVISION= 2
CATEGORIES= textproc gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Popup-${PORTVERSION}pre1
DISTNAME= Popup-${PORTVERSION}pre1
MAINTAINER= dinoex@FreeBSD.org
diff --git a/textproc/prosper/Makefile b/textproc/prosper/Makefile
index d29233ba4a9d..2af2cf0dcbd1 100644
--- a/textproc/prosper/Makefile
+++ b/textproc/prosper/Makefile
@@ -9,8 +9,7 @@ PORTNAME= prosper
PORTVERSION= 1.00.4
PORTREVISION= 7
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} contrib-prosper-1.0.0.tar.gz
MAINTAINER= vs@FreeBSD.org
diff --git a/textproc/py-4suite-xml/Makefile b/textproc/py-4suite-xml/Makefile
index d399cb0b2121..759cfcbc0a7c 100644
--- a/textproc/py-4suite-xml/Makefile
+++ b/textproc/py-4suite-xml/Makefile
@@ -9,8 +9,8 @@ PORTNAME= 4Suite-XML
PORTVERSION= 1.0.2
CATEGORIES= textproc python
MASTER_SITES= ftp://ftp.4suite.org/pub/4Suite/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= foursuite
+ SF/foursuite/4Suite/XML-${PORTVERSION}
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mike@skew.org
diff --git a/textproc/py-4suite/Makefile b/textproc/py-4suite/Makefile
index dc947a3884da..736d8d6ef648 100644
--- a/textproc/py-4suite/Makefile
+++ b/textproc/py-4suite/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 1.0.b1
PORTREVISION= 1
CATEGORIES= textproc python
MASTER_SITES= ftp://ftp.4suite.org/pub/4Suite/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= foursuite
+ SF/foursuite/4Suite/1.0b1
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= 4Suite-1.0b1
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 32e5cb3e5c44..b69fc9f6af41 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -9,8 +9,7 @@
PORTNAME= docutils
PORTVERSION= 0.5
CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wenheping@gmail.com
diff --git a/textproc/py-dsv/Makefile b/textproc/py-dsv/Makefile
index b982f50926d8..af882660415d 100644
--- a/textproc/py-dsv/Makefile
+++ b/textproc/py-dsv/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dsv
PORTVERSION= 1.4.0
CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= python-${PORTNAME}
+MASTER_SITES= SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 82a11fb1e788..ebe093cef4f1 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -8,8 +8,7 @@
PORTNAME= enchant
PORTVERSION= 1.5.3
CATEGORIES= textproc devel python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= py${PORTNAME}
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${MASTER_SITE_SUBDIR}-${PORTVERSION}
diff --git a/textproc/py-excelerator/Makefile b/textproc/py-excelerator/Makefile
index 12eb5ae3fd2b..b60b211881e2 100644
--- a/textproc/py-excelerator/Makefile
+++ b/textproc/py-excelerator/Makefile
@@ -8,7 +8,7 @@
PORTNAME= excelerator
PORTVERSION= 0.6.4.1
CATEGORIES= textproc python
-MASTER_SITES= SF/pyexcelerator
+MASTER_SITES= SF/py${PORTNAME}/pyExcelerator/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyexcelerator-${PORTVERSION}
diff --git a/textproc/py-pyx12/Makefile b/textproc/py-pyx12/Makefile
index ab72d3c53e21..63f8b195673d 100644
--- a/textproc/py-pyx12/Makefile
+++ b/textproc/py-pyx12/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pyx12
PORTVERSION= 1.5.0
CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyx12-${PORTVERSION:S/.b/b/}
diff --git a/textproc/py-reverend/Makefile b/textproc/py-reverend/Makefile
index c529f7e00b0b..04322a464b93 100644
--- a/textproc/py-reverend/Makefile
+++ b/textproc/py-reverend/Makefile
@@ -8,8 +8,7 @@
PORTNAME= reverend
PORTVERSION= 0.3
CATEGORIES= textproc mail math python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Reverend/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Reverend-${PORTVERSION}
diff --git a/textproc/py-stripogram/Makefile b/textproc/py-stripogram/Makefile
index ed1633c6175a..0fdf5f28befe 100644
--- a/textproc/py-stripogram/Makefile
+++ b/textproc/py-stripogram/Makefile
@@ -8,8 +8,7 @@
PORTNAME= stripogram
PORTVERSION= 1.4
CATEGORIES= textproc python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= squishdot
+MASTER_SITES= SF/squishdot/strip-o-gram/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= stripogram-1-4
EXTRACT_SUFX= .tgz
diff --git a/textproc/py-xlwriter/Makefile b/textproc/py-xlwriter/Makefile
index 4acc8c10e62c..94ed3242e771 100644
--- a/textproc/py-xlwriter/Makefile
+++ b/textproc/py-xlwriter/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xlwriter
PORTVERSION= 0.4a3
CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyxlwriter
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyXLWriter-${PORTVERSION}
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index a74dc98ffa40..76136ab69283 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xml
PORTVERSION= 0.8.4
PORTREVISION= 2
CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyxml
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyXML-${PORTVERSION}
diff --git a/textproc/pychm/Makefile b/textproc/pychm/Makefile
index 3ebce455307f..a400364645a0 100644
--- a/textproc/pychm/Makefile
+++ b/textproc/pychm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pychm
PORTVERSION= 0.8.4
CATEGORIES= textproc python
-MASTER_SITES= SF/gnochm
+MASTER_SITES= SF/gnochm/${PORTNAME}/${PORTVERSION}
MAINTAINER= radek@raadradd.com
COMMENT= Bindings for CHMLIB library
diff --git a/textproc/queequeg/Makefile b/textproc/queequeg/Makefile
index 08c5e6f55531..002423e67e41 100644
--- a/textproc/queequeg/Makefile
+++ b/textproc/queequeg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= queequeg
PORTVERSION= 0.91
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A tiny English grammar checker
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 69e1b57a9666..5eebe1f2795e 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -9,9 +9,9 @@
PORTNAME= raptor
PORTVERSION= 1.4.18
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \
http://download.librdf.org/source/
-MASTER_SITE_SUBDIR= librdf
+
MAINTAINER= chuck@pkix.net
COMMENT= RDF Parser Toolkit for Redland
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 69e1b57a9666..5eebe1f2795e 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -9,9 +9,9 @@
PORTNAME= raptor
PORTVERSION= 1.4.18
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \
http://download.librdf.org/source/
-MASTER_SITE_SUBDIR= librdf
+
MAINTAINER= chuck@pkix.net
COMMENT= RDF Parser Toolkit for Redland
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 0c28c68e0f79..0ab29325f2a5 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -10,9 +10,9 @@ PORTNAME= redland
PORTVERSION= 1.0.7
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \
http://librdf.org/dist/source/
-MASTER_SITE_SUBDIR= librdf
+
MAINTAINER= chuck@pkix.net
COMMENT= A high-level interface for RDF
diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index aaaade75ed0a..82401b0dbce4 100644
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -8,8 +8,7 @@
PORTNAME= redland-bindings
PORTVERSION= 1.0.7.1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- http://download.librdf.org/source/
+MASTER_SITES= http://download.librdf.org/source/
MAINTAINER= chuck@pkix.net
COMMENT= Language bindings for the Redland package
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 0c28c68e0f79..0ab29325f2a5 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -10,9 +10,9 @@ PORTNAME= redland
PORTVERSION= 1.0.7
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \
http://librdf.org/dist/source/
-MASTER_SITE_SUBDIR= librdf
+
MAINTAINER= chuck@pkix.net
COMMENT= A high-level interface for RDF
diff --git a/textproc/resume/Makefile b/textproc/resume/Makefile
index 8b894fb359ab..71d07b1aca4c 100644
--- a/textproc/resume/Makefile
+++ b/textproc/resume/Makefile
@@ -9,8 +9,7 @@ PORTNAME= resume
PORTVERSION= 1.5.1
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xmlresume
+MASTER_SITES= SF/xml${PORTNAME}/xml${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g}
EXTRACT_SUFX= .tgz
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index e9efbabc48d4..3d92568af264 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -8,8 +8,7 @@
PORTNAME= rman
PORTVERSION= 3.2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= polyglotman
+MASTER_SITES= SF/polyglotman/polyglotman/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Reverse compile man pages from formatted form
diff --git a/textproc/rnv/Makefile b/textproc/rnv/Makefile
index 9d412cafed2a..0969ed7f0189 100644
--- a/textproc/rnv/Makefile
+++ b/textproc/rnv/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rnv
PORTVERSION= 1.7.10
CATEGORIES= textproc devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION}
MAINTAINER= skv@FreeBSD.org
COMMENT= Relax NG Compact Syntax validator
diff --git a/textproc/roap/Makefile b/textproc/roap/Makefile
index 7dc3f7a2f313..62e3740ab1d2 100644
--- a/textproc/roap/Makefile
+++ b/textproc/roap/Makefile
@@ -9,8 +9,7 @@
PORTNAME= roap
PORTVERSION= 0.1.2
CATEGORIES= textproc python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/romdict/Makefile b/textproc/romdict/Makefile
index 0b2a7f1a57ad..14fd87e4269f 100644
--- a/textproc/romdict/Makefile
+++ b/textproc/romdict/Makefile
@@ -8,8 +8,7 @@
PORTNAME= romdict
PORTVERSION= 0.5
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Eng-Rom/${PORTVERSION}
DISTFILES= eng-rom-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= itetcu@people.tecnik93.com
diff --git a/textproc/ruby-format/Makefile b/textproc/ruby-format/Makefile
index 0da96ece1600..3e0ac8397eaa 100644
--- a/textproc/ruby-format/Makefile
+++ b/textproc/ruby-format/Makefile
@@ -8,8 +8,7 @@
PORTNAME= format
PORTVERSION= 1.09
CATEGORIES= textproc ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}r
+MASTER_SITES= SF/${PORTNAME}r/FormatR/FormatR.${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= FormatR.${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/textproc/ruby-nqxml/Makefile b/textproc/ruby-nqxml/Makefile
index e5793d8768c9..fcbfe9969ab5 100644
--- a/textproc/ruby-nqxml/Makefile
+++ b/textproc/ruby-nqxml/Makefile
@@ -8,8 +8,7 @@
PORTNAME= nqxml
PORTVERSION= 1.1.3p1
CATEGORIES= textproc ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ruby
diff --git a/textproc/ruby-raspell/Makefile b/textproc/ruby-raspell/Makefile
index 6629f279a07d..6a735ff0a31b 100644
--- a/textproc/ruby-raspell/Makefile
+++ b/textproc/ruby-raspell/Makefile
@@ -9,8 +9,7 @@ PORTNAME= raspell
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= textproc ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
EXTRACT_SUFX= .tgz
DIST_SUBDIR= ruby
diff --git a/textproc/ruby-xtemplate/Makefile b/textproc/ruby-xtemplate/Makefile
index 8a877e854c00..36397b634ee7 100644
--- a/textproc/ruby-xtemplate/Makefile
+++ b/textproc/ruby-xtemplate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xtemplate
PORTVERSION= 0.8.0
CATEGORIES= textproc ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ruby
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index 7162a34fd322..a00c5048554b 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 8.9.0.4
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= saxon
+MASTER_SITES= SF/${PORTNAME}/Saxon-B/${PORTVERSION}
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}b${PORTVERSION:S,.,-,g}j.zip \
${PORTNAME}-resources8-9
diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile
index 7162a34fd322..a00c5048554b 100644
--- a/textproc/saxon-he/Makefile
+++ b/textproc/saxon-he/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 8.9.0.4
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= saxon
+MASTER_SITES= SF/${PORTNAME}/Saxon-B/${PORTVERSION}
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}b${PORTVERSION:S,.,-,g}j.zip \
${PORTNAME}-resources8-9
diff --git a/textproc/scim-bridge-qt4/Makefile b/textproc/scim-bridge-qt4/Makefile
index 0fb32048bfc2..614c0f0f7fc7 100644
--- a/textproc/scim-bridge-qt4/Makefile
+++ b/textproc/scim-bridge-qt4/Makefile
@@ -8,8 +8,7 @@
PORTNAME= scim-bridge
PORTVERSION= 0.4.15
CATEGORIES= textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= scim
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -qt4
MAINTAINER= henry.hu.sh@gmail.com
diff --git a/textproc/scim-bridge/Makefile b/textproc/scim-bridge/Makefile
index 7047d4c8cd02..5611e4a3c94a 100644
--- a/textproc/scim-bridge/Makefile
+++ b/textproc/scim-bridge/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scim-bridge
PORTVERSION= 0.4.15
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= scim
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
MAINTAINER= henry.hu.sh@gmail.com
COMMENT= Scim-bridge agent (server)
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index bc4aacfaacaf..f870fc775b4b 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scim-input-pad
PORTVERSION= 0.1.1
PORTREVISION= 7
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=scim
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= SCIM add-on to input various symbols with on-screen pad
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 3a1a2060f091..9eb9ec51a839 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -9,9 +9,9 @@ PORTNAME= scim-kmfl-imengine
PORTVERSION= 0.9.8
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/kmfl/kmfl/${PORTVERSION} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
-MASTER_SITE_SUBDIR= kmfl
+
DIST_SUBDIR= kmfl
MAINTAINER= nikola.lecic@anthesphoria.net
diff --git a/textproc/scim-m17n/Makefile b/textproc/scim-m17n/Makefile
index f19593a5611a..7f3a5a4ad60d 100644
--- a/textproc/scim-m17n/Makefile
+++ b/textproc/scim-m17n/Makefile
@@ -9,9 +9,9 @@ PORTNAME= scim-m17n
PORTVERSION= 0.2.3
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= SF \
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
-MASTER_SITE_SUBDIR=scim
+
MAINTAINER= nikola.lecic@anthesphoria.net
COMMENT= A SCIM IMEngine module which uses m17n library as the backend
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index bf26d5667e05..d3682b1ae144 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -9,8 +9,7 @@ PORTNAME= scim-table-imengine
PORTVERSION= 0.5.7
PORTREVISION= 4
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=scim
+MASTER_SITES= SF/scim/scim-tables/${PORTVERSION}
DISTNAME= scim-tables-${PORTVERSION}
MAINTAINER= lx@FreeBSD.org
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 0c6370b7c1b7..2120b9813cb2 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -8,8 +8,7 @@ PORTNAME= sdcv
PORTVERSION= 0.4.2
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= chinsan@FreeBSD.org
COMMENT= A text-based utility for work with dictionaries in StarDict's format
diff --git a/textproc/sgmltools-lite/Makefile b/textproc/sgmltools-lite/Makefile
index d4d6cf1af730..e4a04204f8d8 100644
--- a/textproc/sgmltools-lite/Makefile
+++ b/textproc/sgmltools-lite/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sgmltools-lite
PORTVERSION= 3.0.3
PORTREVISION= 4
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sgmltools-lite
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Generates various output formats from DocBook SGML documents
diff --git a/textproc/silvercity/Makefile b/textproc/silvercity/Makefile
index a7e57c150fe1..3824ecdd0dc1 100644
--- a/textproc/silvercity/Makefile
+++ b/textproc/silvercity/Makefile
@@ -9,8 +9,7 @@
PORTNAME= silvercity
PORTVERSION= 0.9.7
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Python%20SilverCity%20Bindings/${PORTVERSION}
DISTNAME= SilverCity-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index 643a7db45080..e2297cda14e6 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -9,8 +9,7 @@ PORTNAME= skim
PORTVERSION= 1.4.5
PORTREVISION= 3
CATEGORIES= textproc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= scim
+MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An input method platform based on SCIM library and KDE/QT
diff --git a/textproc/slides/Makefile b/textproc/slides/Makefile
index 83c89e00230f..27f9cf62b713 100644
--- a/textproc/slides/Makefile
+++ b/textproc/slides/Makefile
@@ -12,8 +12,7 @@
PORTNAME= slides
PORTVERSION= 3.3.1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= docbook
+MASTER_SITES= SF/docbook/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Doctype and stylesheets for making slides
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index a875de1cd0ba..ed6328a4b13c 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= soothsayer
PORTVERSION= 0.6.3
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= # none known, please fix
MAINTAINER= ports@FreeBSD.org
COMMENT= Intelligent predictive text entry platform
diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index 8f5dcb119f8e..f67d362940d6 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -7,7 +7,7 @@
PORTNAME= soprano
PORTVERSION= 2.3.0
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Soprano/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= QT4 RDF framework
diff --git a/textproc/stardict2-dictd_mova/Makefile b/textproc/stardict2-dictd_mova/Makefile
index 6fdf0f92eaf4..04d210d935d3 100644
--- a/textproc/stardict2-dictd_mova/Makefile
+++ b/textproc/stardict2-dictd_mova/Makefile
@@ -9,8 +9,7 @@ PORTNAME= stardict
PORTVERSION= 2.4.2
PORTREVISION= 5
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= stardict
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dictionaries-mova/${PORTVERSION}
PKGNAMESUFFIX= -dictd_mova
DIST_SUBDIR= stardict
diff --git a/textproc/stardict2-quick/Makefile b/textproc/stardict2-quick/Makefile
index c1947c15d2ec..f87f1d498490 100644
--- a/textproc/stardict2-quick/Makefile
+++ b/textproc/stardict2-quick/Makefile
@@ -9,8 +9,7 @@ PORTNAME= stardict
PORTVERSION= 2.4.2
PORTREVISION= 6
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= stardict
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dictionaries-quick/${PORTVERSION}
PKGNAMESUFFIX= -quick
DIST_SUBDIR= stardict
diff --git a/textproc/stardict2-rptts/Makefile b/textproc/stardict2-rptts/Makefile
index 13f55e562cff..11c545b4119e 100644
--- a/textproc/stardict2-rptts/Makefile
+++ b/textproc/stardict2-rptts/Makefile
@@ -7,8 +7,7 @@
PORTNAME= stardict2-rptts
PORTVERSION= 2.1.0
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= stardict
+MASTER_SITES= SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}
DISTNAME= WyabdcRealPeopleTTS
DIST_SUBDIR= stardict
EXTRACT_ONLY= # empty
diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index ee914b9a3615..97488f2a5871 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= stardict
PORTVERSION= 2.4.8
PORTREVISION= 9
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DIST_SUBDIR= stardict
MAINTAINER= delphij@FreeBSD.org
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index 0a1382ef97ca..ad5e03fd6539 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -9,8 +9,7 @@ PORTNAME= stardict
PORTVERSION= 3.0.1
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DIST_SUBDIR= stardict
MAINTAINER= d9364104@mail.nchu.edu.tw
diff --git a/textproc/tinyxml/Makefile b/textproc/tinyxml/Makefile
index ea8e33f8ad3c..4d4f51be66ed 100644
--- a/textproc/tinyxml/Makefile
+++ b/textproc/tinyxml/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tinyxml
PORTVERSION= 2.5.3
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
MAINTAINER= skv@FreeBSD.org
diff --git a/textproc/tkxmlive/Makefile b/textproc/tkxmlive/Makefile
index ec95b222066e..d1f8642e0bd8 100644
--- a/textproc/tkxmlive/Makefile
+++ b/textproc/tkxmlive/Makefile
@@ -8,8 +8,7 @@ PORTNAME= tkxmlive
PORTVERSION= 0.1.5
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= tkxmlive-0.1.5-1
MAINTAINER= nivit@FreeBSD.org
diff --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile
index 378d52480c08..2e945c06de91 100644
--- a/textproc/tokyodystopia/Makefile
+++ b/textproc/tokyodystopia/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tokyodystopia
PORTVERSION= 0.9.13
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= SOURCEFORGE \
+MASTER_SITES= SF/tokyocabinet/${PORTNAME}/${PORTVERSION} \
http://tokyocabinet.sourceforge.net/dystopiapkg/
MASTER_SITE_SUBDIR= tokyocabinet
diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index b9ace1b22c5a..532df092038e 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -8,9 +8,10 @@
PORTNAME= translate-toolkit
PORTVERSION= 1.4.0
CATEGORIES= textproc
-MASTER_SITES= SF/translate \
+MASTER_SITES= SF/translate/Translate%20Toolkit/${PORTVERSION} \
http://freebsd.unixfreunde.de/sources/
+
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts between many translation formats
diff --git a/textproc/txt2html/Makefile b/textproc/txt2html/Makefile
index ff6a44abe2d6..08a6eb16bf88 100644
--- a/textproc/txt2html/Makefile
+++ b/textproc/txt2html/Makefile
@@ -8,7 +8,7 @@
PORTNAME= txt2html
PORTVERSION= 2.51
CATEGORIES= textproc perl5
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= jadawin@FreeBSD.org
COMMENT= Convert raw text to something with a little HTML formatting
diff --git a/textproc/ua-ispell/Makefile b/textproc/ua-ispell/Makefile
index 2e9a9cb2264f..1ee39c2c69e8 100644
--- a/textproc/ua-ispell/Makefile
+++ b/textproc/ua-ispell/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ispell-uk
PORTVERSION= 0.7
PORTREVISION= 1
CATEGORIES= textproc ukrainian
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ispell-uk
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= mi@aldan.algebra.com
COMMENT= Ukrainian (KOI8-U) dictionary for ISPELL
diff --git a/textproc/uml2svg/Makefile b/textproc/uml2svg/Makefile
index 2ad095e7b207..a543c9f1fb87 100644
--- a/textproc/uml2svg/Makefile
+++ b/textproc/uml2svg/Makefile
@@ -8,8 +8,7 @@
PORTNAME= uml2svg
PORTVERSION= 0.18
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= uml2svg
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gabor@FreeBSD.org
COMMENT= XSL stylesheets to convert UML to SVG
diff --git a/textproc/uncrustify/Makefile b/textproc/uncrustify/Makefile
index 6d5d45c781a4..fbef9d2b6e6f 100644
--- a/textproc/uncrustify/Makefile
+++ b/textproc/uncrustify/Makefile
@@ -8,7 +8,7 @@
PORTNAME= uncrustify
PORTVERSION= 0.53
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile
index 2e901e00cabf..15236ad8964c 100644
--- a/textproc/wbxml2/Makefile
+++ b/textproc/wbxml2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= wbxml2
PORTVERSION= 0.10.6
CATEGORIES= textproc devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= libwbxml
+MASTER_SITES= SF/libwbxml/libwbxml/${PORTVERSION}
DISTNAME= libwbxml-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/webcpp/Makefile b/textproc/webcpp/Makefile
index 961e6d0efe86..1eca4fb08f72 100644
--- a/textproc/webcpp/Makefile
+++ b/textproc/webcpp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= webcpp
PORTVERSION= 0.8.4
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Webcpp/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= chip-set@mail.ru
diff --git a/textproc/website/Makefile b/textproc/website/Makefile
index 27482100ec99..8fd44ec87a02 100644
--- a/textproc/website/Makefile
+++ b/textproc/website/Makefile
@@ -10,8 +10,7 @@
PORTNAME= website
PORTVERSION= 2.5.0
CATEGORIES= textproc www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= docbook
+MASTER_SITES= SF/docbook/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Doctype and stylesheets for making websites
diff --git a/textproc/weka/Makefile b/textproc/weka/Makefile
index 30a801516374..a75338f7afe7 100644
--- a/textproc/weka/Makefile
+++ b/textproc/weka/Makefile
@@ -8,7 +8,7 @@
PORTNAME= weka
DISTVERSION= 3-4-14
CATEGORIES= textproc java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3-4/${PORTVERSION}
MAINTAINER= simon@olofsson.de
COMMENT= Data Mining Software in Java
diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile
index 03330d85d0d0..b6fd58265a44 100644
--- a/textproc/word2x/Makefile
+++ b/textproc/word2x/Makefile
@@ -9,8 +9,7 @@ PORTNAME= word2x
PORTVERSION= 0.005
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-zero/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Converter from MS Word to text, HTML or LaTeX
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 83cff40397fb..7a6d25f8afac 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -9,9 +9,7 @@ PORTNAME= wv
PORTVERSION= 1.2.5
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= http://www.abisource.com/downloads/wv/${PORTVERSION}/ \
- SF
-MASTER_SITE_SUBDIR= wvware
+MASTER_SITES= http://www.abisource.com/downloads/wv/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= A library and executables to access Microsoft Word files
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index e7d97d7aafcb..36a838a51a43 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wv2
PORTVERSION= 0.3.1
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= SF/wvware
+MASTER_SITES= SF/wvware/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A library providing routines to access Microsoft Word files
diff --git a/textproc/xaira/Makefile b/textproc/xaira/Makefile
index c4ea2e3265df..d97dc62e9884 100644
--- a/textproc/xaira/Makefile
+++ b/textproc/xaira/Makefile
@@ -9,7 +9,7 @@ PORTNAME= xaira
PORTVERSION= 1.23
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mathias@monnerville.com
COMMENT= XML Aware Indexing and Retrieval Architecture
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index d5e225fbab9a..25f8978f60dc 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.5
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= chicago
+MASTER_SITES= SF/chicago/${PORTNAME}/backend
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/xlreader/Makefile b/textproc/xlreader/Makefile
index 6c527f823710..5780a294a8bf 100644
--- a/textproc/xlreader/Makefile
+++ b/textproc/xlreader/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xlreader
PORTVERSION= 0.9.0
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/textproc/xmlada-gcc/Makefile b/textproc/xmlada-gcc/Makefile
index 1e8fcb3d2634..1cec7be60c02 100644
--- a/textproc/xmlada-gcc/Makefile
+++ b/textproc/xmlada-gcc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmlada
PORTVERSION= 5.0.4
PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnuada
+MASTER_SITES= SF/gnuada/GNAT_GCC%20Source/4.1.1%20R6
PKGNAMESUFFIX= -gcc
DISTNAME= gnat-gcc-xmlada-4.1.1_gnat_5.04a-r6.src
EXTRACT_SUFX= .rpm
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index d343c55073f3..f74cad08bc44 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xmlcatmgr
PORTVERSION= 2.2
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= hrs@FreeBSD.org
COMMENT= SGML and XML catalog manager
diff --git a/textproc/xmlenc/Makefile b/textproc/xmlenc/Makefile
index d6ef1436f0bd..9269bda07021 100644
--- a/textproc/xmlenc/Makefile
+++ b/textproc/xmlenc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmlenc
PORTVERSION= 0.52
PORTREVISION= 2
CATEGORIES= textproc java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xmlenc
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= hq@FreeBSD.org
diff --git a/textproc/xmlindent/Makefile b/textproc/xmlindent/Makefile
index 2ef837d1d46e..5bcd0090e1bd 100644
--- a/textproc/xmlindent/Makefile
+++ b/textproc/xmlindent/Makefile
@@ -10,8 +10,7 @@ PORTNAME= xmlindent
PORTVERSION= 0.2.17
PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= david@trucs.org
COMMENT= XML stream reformatter
diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile
index 1b0b11661b0a..54af8a30c8d5 100644
--- a/textproc/xmlppm/Makefile
+++ b/textproc/xmlppm/Makefile
@@ -9,9 +9,9 @@
PORTNAME= xmlppm
PORTVERSION= 0.98.3
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
http://www.cs.cornell.edu/People/jcheney/xmlppm/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= hsmtkk@gmail.com
COMMENT= XML-Conscious PPM Compression
diff --git a/textproc/xqilla/Makefile b/textproc/xqilla/Makefile
index 04833017566a..d9342b2d1930 100644
--- a/textproc/xqilla/Makefile
+++ b/textproc/xqilla/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xqilla
PORTVERSION= 2.2.0
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xqilla
+MASTER_SITES= SF
DISTNAME= XQilla-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/textproc/xslide.el/Makefile b/textproc/xslide.el/Makefile
index 54c31f5af277..ca9f1aad5f90 100644
--- a/textproc/xslide.el/Makefile
+++ b/textproc/xslide.el/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xslide.el
PORTVERSION= 0.2.2
PORTREVISION= 1
CATEGORIES= textproc elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xslide
+MASTER_SITES= SF/xslide/xslide/${PORTVERSION}
DISTNAME= xslide-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/textproc/y2l/Makefile b/textproc/y2l/Makefile
index 7fea11dcef55..36f80754a948 100644
--- a/textproc/y2l/Makefile
+++ b/textproc/y2l/Makefile
@@ -9,8 +9,7 @@
PORTNAME= y2l
PORTVERSION= 1.1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ijliao@FreeBSD.org
COMMENT= Yacc-to-Latex pretty printer/convertor
diff --git a/ukrainian/ispell/Makefile b/ukrainian/ispell/Makefile
index 59617579a45d..fb455002435f 100644
--- a/ukrainian/ispell/Makefile
+++ b/ukrainian/ispell/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ispell-uk
PORTVERSION= 0.7
CATEGORIES= ukrainian textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ispell-uk
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= mi@aldan.algebra.com
COMMENT= Ukrainian (KOI8-U) dictionary for ISPELL
diff --git a/vietnamese/vietunicode-hannom/Makefile b/vietnamese/vietunicode-hannom/Makefile
index d828acf18fe9..5ca3e84f2ec3 100644
--- a/vietnamese/vietunicode-hannom/Makefile
+++ b/vietnamese/vietunicode-hannom/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vietunicode-hannom
PORTVERSION= 2005.02.06
PORTREVISION= 1
CATEGORIES= vietnamese x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= vietunicode
+MASTER_SITES= SF/vietunicode/hannom/hannom%20v2005
DISTNAME= hannom
MAINTAINER= chinsan@FreeBSD.org
diff --git a/vietnamese/vietunicode-trichlor/Makefile b/vietnamese/vietunicode-trichlor/Makefile
index 3aa34b86db04..257f05b63066 100644
--- a/vietnamese/vietunicode-trichlor/Makefile
+++ b/vietnamese/vietunicode-trichlor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vietunicode-trichlor
PORTVERSION= 2004.04.30
PORTREVISION= 1
CATEGORIES= vietnamese x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= vietunicode
+MASTER_SITES= SF/vietunicode/VietFonts-TriChlor/TrichlorSet%20v2004
DISTNAME= VietFonts_TriChlor_ttf
MAINTAINER= chinsan@FreeBSD.org
diff --git a/vietnamese/vietunicode-web1/Makefile b/vietnamese/vietunicode-web1/Makefile
index 6fe78bed88fb..10a5446b0213 100644
--- a/vietnamese/vietunicode-web1/Makefile
+++ b/vietnamese/vietunicode-web1/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vietunicode-web1
PORTVERSION= 2004.04.30
PORTREVISION= 1
CATEGORIES= vietnamese x11-fonts
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= vietunicode
+MASTER_SITES= SF/vietunicode/VietFonts-Web1/Web1%20Package%20v2004
DISTNAME= VietFontsWeb1_ttf
MAINTAINER= chinsan@FreeBSD.org