aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/WebMagick/Makefile2
-rw-r--r--www/amphetadesk/Makefile3
-rw-r--r--www/anyremote2html/Makefile3
-rw-r--r--www/aria/Makefile2
-rw-r--r--www/aswiki/Makefile3
-rw-r--r--www/autoindex/Makefile3
-rw-r--r--www/autoindex2/Makefile2
-rw-r--r--www/awstats/Makefile2
-rw-r--r--www/b2evolution/Makefile3
-rw-r--r--www/bacula-web/Makefile3
-rw-r--r--www/bblog/Makefile3
-rw-r--r--www/bk2site/Makefile3
-rw-r--r--www/c-icap/Makefile3
-rw-r--r--www/campsite/Makefile2
-rw-r--r--www/checkbot/Makefile2
-rw-r--r--www/cheetah/Makefile2
-rw-r--r--www/chems/Makefile2
-rw-r--r--www/chpasswd/Makefile3
-rw-r--r--www/claroline/Makefile2
-rw-r--r--www/cntlm/Makefile2
-rw-r--r--www/coppermine/Makefile2
-rw-r--r--www/crp/Makefile3
-rw-r--r--www/csstidy/Makefile3
-rw-r--r--www/ctemplate/Makefile3
-rw-r--r--www/davical/Makefile2
-rw-r--r--www/dotproject-devel/Makefile2
-rw-r--r--www/dotproject/Makefile2
-rw-r--r--www/e107/Makefile2
-rw-r--r--www/efront/Makefile2
-rw-r--r--www/entrans/Makefile3
-rw-r--r--www/extsm/Makefile3
-rw-r--r--www/flashplugin-mozilla/Makefile2
-rw-r--r--www/flat-frog/Makefile3
-rw-r--r--www/freeway/Makefile3
-rw-r--r--www/galeon/Makefile3
-rw-r--r--www/gallery2/Makefile3
-rw-r--r--www/gallery3/Makefile3
-rw-r--r--www/getleft/Makefile2
-rw-r--r--www/goose/Makefile3
-rw-r--r--www/groupoffice/Makefile3
-rw-r--r--www/harvest/Makefile3
-rw-r--r--www/html2wml/Makefile2
-rw-r--r--www/hypermail/Makefile3
-rw-r--r--www/ilias/Makefile2
-rw-r--r--www/ilias3/Makefile2
-rw-r--r--www/impresscms/Makefile2
-rw-r--r--www/iwebcal/Makefile3
-rw-r--r--www/jericho-html/Makefile3
-rw-r--r--www/khtml2png/Makefile3
-rw-r--r--www/kompozer/Makefile2
-rw-r--r--www/lifetype/Makefile2
-rw-r--r--www/lilurl/Makefile3
-rw-r--r--www/limesurvey/Makefile2
-rw-r--r--www/linkchecker/Makefile2
-rw-r--r--www/links1/Makefile4
-rw-r--r--www/man2web/Makefile3
-rw-r--r--www/mergelog/Makefile3
-rw-r--r--www/middleman/Makefile3
-rw-r--r--www/mod_access_referer/Makefile3
-rw-r--r--www/mod_accounting/Makefile3
-rw-r--r--www/mod_auth_kerb/Makefile3
-rw-r--r--www/mod_auth_kerb2/Makefile3
-rw-r--r--www/mod_auth_mysql/Makefile3
-rw-r--r--www/mod_auth_mysql_another/Makefile3
-rw-r--r--www/mod_authn_sasl/Makefile3
-rw-r--r--www/mod_bf/Makefile3
-rw-r--r--www/mod_blosxom/Makefile3
-rw-r--r--www/mod_cfg_ldap/Makefile3
-rw-r--r--www/mod_cplusplus/Makefile3
-rw-r--r--www/mod_gzip/Makefile3
-rw-r--r--www/mod_ntlm/Makefile3
-rw-r--r--www/mod_ntlm2/Makefile3
-rw-r--r--www/mod_security/Makefile3
-rw-r--r--www/mod_sqlinclude/Makefile3
-rw-r--r--www/mod_webkit/Makefile3
-rw-r--r--www/mplayer-plugin/Makefile2
-rw-r--r--www/myghty/Makefile3
-rw-r--r--www/mysar/Makefile3
-rw-r--r--www/nanoblogger-extra/Makefile2
-rw-r--r--www/nanoblogger/Makefile2
-rw-r--r--www/neowebscript/Makefile3
-rw-r--r--www/netoffice/Makefile3
-rw-r--r--www/npapi-xine/Makefile2
-rw-r--r--www/nscache/Makefile4
-rw-r--r--www/ocaml-net/Makefile3
-rw-r--r--www/openbravoerp/Makefile3
-rw-r--r--www/openvrml/Makefile3
-rw-r--r--www/openxmldir/Makefile3
-rw-r--r--www/orangehrm/Makefile2
-rw-r--r--www/osb-browser/Makefile3
-rw-r--r--www/osb-nrcit/Makefile3
-rw-r--r--www/osb-nrcore/Makefile2
-rw-r--r--www/p5-libservlet/Makefile3
-rw-r--r--www/paros/Makefile3
-rw-r--r--www/peacock/Makefile3
-rw-r--r--www/php-dyn/Makefile3
-rw-r--r--www/php-screw/Makefile3
-rw-r--r--www/php-templates/Makefile3
-rw-r--r--www/phpbb-devel/Makefile2
-rw-r--r--www/phpbb/Makefile3
-rw-r--r--www/phpbb3/Makefile2
-rw-r--r--www/phpgedview/Makefile3
-rw-r--r--www/phprecipebook/Makefile2
-rw-r--r--www/phproxy/Makefile3
-rw-r--r--www/phpsysinfo-dev/Makefile2
-rw-r--r--www/phpwebapp/Makefile3
-rw-r--r--www/phpwiki/Makefile3
-rw-r--r--www/phpwiki13/Makefile3
-rw-r--r--www/pivot-weblog/Makefile3
-rw-r--r--www/pnews/Makefile3
-rw-r--r--www/privoxy/Makefile3
-rw-r--r--www/pserv/Makefile3
-rw-r--r--www/py-imdbpy/Makefile2
-rw-r--r--www/py-jonpy/Makefile3
-rw-r--r--www/py-mt/Makefile3
-rw-r--r--www/py-pysearch/Makefile2
-rw-r--r--www/py-turbodjango/Makefile3
-rw-r--r--www/py-webware/Makefile2
-rw-r--r--www/pyblosxom/Makefile4
-rw-r--r--www/pyjamas/Makefile2
-rw-r--r--www/retawq/Makefile3
-rw-r--r--www/rnews/Makefile2
-rw-r--r--www/ruby-tmpl/Makefile3
-rw-r--r--www/sarg/Makefile2
-rw-r--r--www/script4rss/Makefile3
-rw-r--r--www/serendipity/Makefile3
-rw-r--r--www/simplog/Makefile3
-rw-r--r--www/siteatschool/Makefile2
-rw-r--r--www/sitebar/Makefile3
-rw-r--r--www/slash/Makefile3
-rw-r--r--www/sqstat/Makefile2
-rw-r--r--www/srg/Makefile4
-rw-r--r--www/swish++/Makefile2
-rw-r--r--www/syndigator/Makefile2
-rw-r--r--www/tcldom-libxml2/Makefile1
-rw-r--r--www/tcldom/Makefile5
-rw-r--r--www/tclwebtest/Makefile3
-rw-r--r--www/tdiary/Makefile4
-rw-r--r--www/templatelite/Makefile3
-rw-r--r--www/tikiwiki/Makefile2
-rw-r--r--www/tinymce/Makefile3
-rw-r--r--www/tinymce3/Makefile2
-rw-r--r--www/transproxy/Makefile3
-rw-r--r--www/typo3/Makefile2
-rw-r--r--www/typo343/Makefile2
-rw-r--r--www/typo344/Makefile2
-rw-r--r--www/typo345/Makefile2
-rw-r--r--www/typo346/Makefile2
-rw-r--r--www/typolight/Makefile2
-rw-r--r--www/ump/Makefile3
-rw-r--r--www/vtiger-customerportal/Makefile3
-rw-r--r--www/vtiger/Makefile3
-rw-r--r--www/w3m/Makefile3
-rw-r--r--www/webcalendar-devel/Makefile3
-rw-r--r--www/webcalendar/Makefile3
-rw-r--r--www/webinject/Makefile3
-rw-r--r--www/wikindx/Makefile3
-rw-r--r--www/wsdlpull/Makefile2
-rw-r--r--www/xaraya/Makefile2
-rw-r--r--www/xoops/Makefile2
-rw-r--r--www/xpi-imdbpreview/Makefile2
-rw-r--r--www/yanopaste/Makefile2
-rw-r--r--www/yii/Makefile3
-rw-r--r--www/ziproxy/Makefile2
-rw-r--r--www/zope-archetypes/Makefile3
-rw-r--r--www/zope-cmfformcontroller/Makefile3
-rw-r--r--www/zope-cmfforum/Makefile3
-rw-r--r--www/zope-cmfphoto/Makefile3
-rw-r--r--www/zope-cmfphotoalbum/Makefile3
-rw-r--r--www/zope-cmfquickinstaller/Makefile3
-rw-r--r--www/zope-exuserfolder/Makefile3
-rw-r--r--www/zope-generator/Makefile3
-rw-r--r--www/zope-groupuserfolder/Makefile3
-rw-r--r--www/zope-i18nlayer/Makefile3
-rw-r--r--www/zope-mimetypesregistry/Makefile3
-rw-r--r--www/zope-placelesstranslationservice/Makefile3
-rw-r--r--www/zope-plonelanguagetool/Makefile3
-rw-r--r--www/zope-portaltransforms/Makefile3
-rw-r--r--www/zope-simpleblog/Makefile3
-rw-r--r--www/zope-ttwtype/Makefile3
-rw-r--r--www/zope-validation/Makefile3
-rw-r--r--www/zope-xmlmethods/Makefile3
-rw-r--r--www/zope-zmysqlda/Makefile4
-rw-r--r--www/zope-zsyncer/Makefile3
184 files changed, 192 insertions, 306 deletions
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 0e0c58574e71..99c9537511fd 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.03p3
PORTREVISION= 30
PORTEPOCH= 1
CATEGORIES= www graphics
-MASTER_SITES= SF/webmagick
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}-beta/2.03pre3
DISTNAME= ${PORTNAME}-2.03pre3
MAINTAINER= ache@freebsd.org
diff --git a/www/amphetadesk/Makefile b/www/amphetadesk/Makefile
index 80d4e086353d..0f513193e7a5 100644
--- a/www/amphetadesk/Makefile
+++ b/www/amphetadesk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= amphetadesk
PORTVERSION= 0.93.1
PORTREVISION= 2
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-v${PORTVERSION}
DISTNAME= ${PORTNAME}-src-v${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
diff --git a/www/anyremote2html/Makefile b/www/anyremote2html/Makefile
index bf53d633fa97..0cf1aec04d7a 100644
--- a/www/anyremote2html/Makefile
+++ b/www/anyremote2html/Makefile
@@ -8,8 +8,7 @@
PORTNAME= anyremote2html
PORTVERSION= 1.0
CATEGORIES= www deskutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= anyremote
+MASTER_SITES= SF/anyremote/${PORTNAME}/${PORTVERSION}
MAINTAINER= avl@FreeBSD.org
COMMENT= A web interface for anyRemote
diff --git a/www/aria/Makefile b/www/aria/Makefile
index e4f33be2aa88..d099e7932e84 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aria
PORTVERSION= 1.0.0
PORTREVISION= 4
CATEGORIES= www
-MASTER_SITES= SF/aria-rpm
+MASTER_SITES= SF/${PORTNAME}-rpm/Aria%20Sources/${PORTVERSION}-official
MAINTAINER= pgollucci@FreeBSD.org
COMMENT= Yet another download tool
diff --git a/www/aswiki/Makefile b/www/aswiki/Makefile
index 2a7fd4e70ceb..39522486c0f2 100644
--- a/www/aswiki/Makefile
+++ b/www/aswiki/Makefile
@@ -9,8 +9,7 @@ PORTNAME= aswiki
PORTVERSION= 1.0.4
PORTREVISION= 3
CATEGORIES= www ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= matusita@FreeBSD.org
COMMENT= WikiWikiWeb clone written in Ruby
diff --git a/www/autoindex/Makefile b/www/autoindex/Makefile
index 870c16a0b835..58d976e4461e 100644
--- a/www/autoindex/Makefile
+++ b/www/autoindex/Makefile
@@ -9,8 +9,7 @@ PORTNAME= AutoIndex
PORTVERSION= 1.5.4
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= autoindex
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}%20PHP%20Script%201.x/${PORTNAME}%20PHP%20${PORTVERSION}
MAINTAINER= danger@FreeBSD.org
COMMENT= PHP 4.x script that makes a table that lists the files in a directory
diff --git a/www/autoindex2/Makefile b/www/autoindex2/Makefile
index 67fd7d652bdd..271eeed8de6d 100644
--- a/www/autoindex2/Makefile
+++ b/www/autoindex2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= AutoIndex
PORTVERSION= 2.2.4
CATEGORIES= www
-MASTER_SITES= SF/autoindex
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}%20PHP%20Script%202.x/${PORTNAME}%20PHP%20${PORTVERSION}
MAINTAINER= danger@FreeBSD.org
COMMENT= PHP 5.x script that makes a table that lists the files in a directory
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 094137e53c67..cdf58b31e1b8 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -9,7 +9,7 @@ PORTNAME= awstats
PORTVERSION= 6.9
PORTEPOCH= 1
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/AWStats/${PORTVERSION}
MAINTAINER= samm@os2.kiev.ua
COMMENT= Free real-time logfile analyzer to get advanced web statistics
diff --git a/www/b2evolution/Makefile b/www/b2evolution/Makefile
index dd38823dc9b2..cfad532f28b0 100644
--- a/www/b2evolution/Makefile
+++ b/www/b2evolution/Makefile
@@ -8,8 +8,7 @@
PORTNAME= b2evolution
PORTVERSION= 2.4.6
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= evocms
+MASTER_SITES= SF/evocms/${PORTNAME}/b2evo%20${PORTVERSION}-stable
DISTNAME= ${PORTNAME}-${PORTVERSION}-${B2EVO_DATE}
MAINTAINER= svysh@pn.sinp.msu.ru
diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile
index c1b543a787cf..e8a64688ae47 100644
--- a/www/bacula-web/Makefile
+++ b/www/bacula-web/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bacula-web
DISTVERSION= 1.38.9
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bacula
+MASTER_SITES= SF/bacula/OldFiles
DISTNAME= bacula-gui-${DISTVERSION}
MAINTAINER= dan@langille.org
diff --git a/www/bblog/Makefile b/www/bblog/Makefile
index 913db792ad47..43fdc8cbe892 100644
--- a/www/bblog/Makefile
+++ b/www/bblog/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bBlog
PORTVERSION= 0.7.6
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A elegant personal publishing system with Smarty
diff --git a/www/bk2site/Makefile b/www/bk2site/Makefile
index 9d849040ec9a..b3d2a24fbfa6 100644
--- a/www/bk2site/Makefile
+++ b/www/bk2site/Makefile
@@ -10,8 +10,7 @@ PORTNAME= bk2site
PORTVERSION= 1.1.9
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Transforms Netscape bookmarks into a Yahoo-like website
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 4724fdae041a..433f0f58b3ea 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 060708
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= c_icap-${PORTVERSION}rc2
MAINTAINER= tofig@freebsd.az
diff --git a/www/campsite/Makefile b/www/campsite/Makefile
index 74bbfabf8dfa..66189c31e1c1 100644
--- a/www/campsite/Makefile
+++ b/www/campsite/Makefile
@@ -9,7 +9,7 @@ PORTNAME= campsite
PORTVERSION= 2.6.7
PORTREVISION= 6
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= koutek@o-k.cz
COMMENT= The free and open multilingual web publishing tool for news sites
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index d0bd5ebd3c24..0ee3e08ab9e6 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -8,7 +8,7 @@
PORTNAME= checkbot
PORTVERSION= 1.80
CATEGORIES= www perl5
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Checkbot%20${PORTVERSION}
MAINTAINER= jadawin@FreeBSD.org
COMMENT= A WWW link verifier, similar to momspider
diff --git a/www/cheetah/Makefile b/www/cheetah/Makefile
index 160963f7631f..4c86b0b4b221 100644
--- a/www/cheetah/Makefile
+++ b/www/cheetah/Makefile
@@ -9,7 +9,7 @@ PORTNAME= cheetah
PORTVERSION= 0.10
PORTREVISION= 6
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+ based light-weight web browser
diff --git a/www/chems/Makefile b/www/chems/Makefile
index dc93deeecf90..71ee06dbc97a 100644
--- a/www/chems/Makefile
+++ b/www/chems/Makefile
@@ -8,7 +8,7 @@
PORTNAME= chems
DISTVERSION= 0x04
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0x04
MAINTAINER= miwi@FreeBSD.org
COMMENT= The geekest content helper management system
diff --git a/www/chpasswd/Makefile b/www/chpasswd/Makefile
index b765e943f114..6e6a5a5f741e 100644
--- a/www/chpasswd/Makefile
+++ b/www/chpasswd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= chpasswd
PORTVERSION= 2.2.3
PORTREVISION= 3
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= orsochpasswd
+MASTER_SITES= SF/orso${PORTNAME}/orso${PORTNAME}/${PORTVERSION}
MAINTAINER= jmelo@FreeBSD.org
COMMENT= Allow users to change their Squid or Web password using the browser
diff --git a/www/claroline/Makefile b/www/claroline/Makefile
index c9be1b1664fb..f19b2b872d4f 100644
--- a/www/claroline/Makefile
+++ b/www/claroline/Makefile
@@ -8,7 +8,7 @@
PORTNAME= claroline
PORTVERSION= 1.9.0
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Claroline/Claroline%20${PORTVERSION}
DISTNAME= claroline190
MAINTAINER= wenheping@gmail.com
diff --git a/www/cntlm/Makefile b/www/cntlm/Makefile
index 311221f8c028..6506b9ae8516 100644
--- a/www/cntlm/Makefile
+++ b/www/cntlm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cntlm
PORTVERSION= 0.35.1
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@mawer.org
COMMENT= An NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy
diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile
index 5995e28146af..9e642e4dd648 100644
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -8,7 +8,7 @@
PORTNAME= coppermine
PORTVERSION= 1.4.23
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= cpg${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
diff --git a/www/crp/Makefile b/www/crp/Makefile
index c08149f5b259..f06ed3cf7f03 100644
--- a/www/crp/Makefile
+++ b/www/crp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= crp
PORTVERSION= 20031012
CATEGORIES= www science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Oct-12-2003
DISTNAME= CRP
EXTRACT_SUFX= .tgz
diff --git a/www/csstidy/Makefile b/www/csstidy/Makefile
index 1cdd641efdce..39c637cc2ea9 100644
--- a/www/csstidy/Makefile
+++ b/www/csstidy/Makefile
@@ -9,8 +9,7 @@
PORTNAME= csstidy
PORTVERSION= 1.2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/CSSTidy%20%28C%2B%2B%2C%20stable%29/${PORTVERSION}
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= ijliao@FreeBSD.org
diff --git a/www/ctemplate/Makefile b/www/ctemplate/Makefile
index 620cec588cc4..9d160a985efe 100644
--- a/www/ctemplate/Makefile
+++ b/www/ctemplate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ctemplate
PORTVERSION= 0.5
CATEGORIES= www textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ap@page2rss.com
COMMENT= Template system for C
diff --git a/www/davical/Makefile b/www/davical/Makefile
index 8be5522067b1..7d4cbe772441 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -8,7 +8,7 @@
PORTNAME= davical
PORTVERSION= 0.9.7
CATEGORIES?= www
-MASTER_SITES= SF/rscds
+MASTER_SITES= SF/rscds/${PORTNAME}/${PORTVERSION}
DISTNAME= davical_${PORTVERSION}-0
MAINTAINER= maurice@castro.aus.net
diff --git a/www/dotproject-devel/Makefile b/www/dotproject-devel/Makefile
index 1996452f2b2b..07bf9ff0e094 100644
--- a/www/dotproject-devel/Makefile
+++ b/www/dotproject-devel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dotproject
PORTVERSION= ${DOTPROJECTVER}.${DEVELVERSION:C/^([a-z]).*/\1/}${DEVELVERSION:C/^[a-z]*//}
CATEGORIES= www devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/dotProject%20Version%202.1-rc1
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}-${DOTPROJECTVER}-${DEVELVERSION}
diff --git a/www/dotproject/Makefile b/www/dotproject/Makefile
index 67754a6f1ecd..39a47c6aced6 100644
--- a/www/dotproject/Makefile
+++ b/www/dotproject/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dotproject
PORTVERSION= 2.1.2
CATEGORIES= www devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/dotProject%20Version%20${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= Open Source Project Management tool
diff --git a/www/e107/Makefile b/www/e107/Makefile
index 6fcb66a86c9c..7e9f2a47a93e 100644
--- a/www/e107/Makefile
+++ b/www/e107/Makefile
@@ -8,7 +8,7 @@
PORTNAME= e107
PORTVERSION= 0.7.15
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20v${PORTVERSION}
DISTNAME= ${PORTNAME}_v${PORTVERSION}_full
MAINTAINER= wenheping@gmail.com
diff --git a/www/efront/Makefile b/www/efront/Makefile
index a150ce360452..74c395b66143 100644
--- a/www/efront/Makefile
+++ b/www/efront/Makefile
@@ -8,7 +8,7 @@
PORTNAME= efront
DISTVERSION= 3.5.2
CATEGORIES= www
-MASTER_SITES= SF/efrontlearning
+MASTER_SITES= SF/${PORTNAME}learning/${PORTNAME}learning/eFront%20v${PORTVERSION}%20build%203470
DISTNAME= ${PORTNAME}_${PORTVERSION}_build3470
MAINTAINER= wenheping@gmail.com
diff --git a/www/entrans/Makefile b/www/entrans/Makefile
index 5e4ae7c53ec3..d767577899c6 100644
--- a/www/entrans/Makefile
+++ b/www/entrans/Makefile
@@ -8,8 +8,7 @@
PORTNAME= entrans
PORTVERSION= 0.3.2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= prudhvi-krishna-bsd@surapaneni.in
COMMENT= Entrans is an online, collaborative translation tool
diff --git a/www/extsm/Makefile b/www/extsm/Makefile
index 636fa263ba19..1142ae4f17fb 100644
--- a/www/extsm/Makefile
+++ b/www/extsm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= extsm
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= www java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=rxsm
+MASTER_SITES= SF/rxsm/rxsm/xsm%20${PORTVERSION}
DISTNAME= xsm_${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
diff --git a/www/flashplugin-mozilla/Makefile b/www/flashplugin-mozilla/Makefile
index 15190b822ff8..2d0391ab436e 100644
--- a/www/flashplugin-mozilla/Makefile
+++ b/www/flashplugin-mozilla/Makefile
@@ -9,7 +9,7 @@ PORTNAME?= flashplugin-mozilla
PORTVERSION= 0.4.13
PORTREVISION= 4
CATEGORIES= www
-MASTER_SITES= SF/gplflash
+MASTER_SITES= SF/gplflash/gplflash/${PORTVERSION}
DISTNAME= gplflash-${PORTVERSION}
MAINTAINER= llwang@infor.org
diff --git a/www/flat-frog/Makefile b/www/flat-frog/Makefile
index cda5da3881f2..bc4c29b37517 100644
--- a/www/flat-frog/Makefile
+++ b/www/flat-frog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= flat-frog
PORTVERSION= 2.2.13
CATEGORIES= www
-MASTER_SITES= SOURCEFORGE
-MASTER_SITE_SUBDIR= flatfrog
+MASTER_SITES= SF/flatfrog/flatfrog/${PORTNAME}-${PORTVERSION}
MAINTAINER= gslin@gslin.org
COMMENT= A templating engine working in php
diff --git a/www/freeway/Makefile b/www/freeway/Makefile
index 4794afddd205..63979bb75d1b 100644
--- a/www/freeway/Makefile
+++ b/www/freeway/Makefile
@@ -8,8 +8,7 @@
PORTNAME= freeway
PORTVERSION= 1.4.2.197
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= freeway-ecom
+MASTER_SITES= SF/${PORTNAME}-ecom/Freeway/${PORTVERSION}%20Sathish
DISTNAME= ${PORTNAME}_${PORTVERSION:S,.,_,g}
MAINTAINER= wenheping@gmail.com
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 2a729423c9ce..c9f3ccb64466 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -10,8 +10,7 @@ PORTNAME= galeon
PORTVERSION= 2.0.7
PORTREVISION= 1
CATEGORIES= www gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%202.x/Galeon%20${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index 738461a90e85..a80990e522ae 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gallery2
PORTVERSION= 2.3
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gallery
+MASTER_SITES= SF/gallery/${PORTNAME}/${PORTVERSION}
DISTNAME= gallery-${PORTVERSION}-full
DIST_SUBDIR= gallery2
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index ee5d46d181d2..3682a66ecefa 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gallery3
PORTVERSION= 3.0
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gallery
+MASTER_SITES= SF/gallery/${PORTNAME}/${PORTVERSION}-beta-1
DISTNAME= gallery-${PORTVERSION}-beta-1
MAINTAINER= appleboy.tw@gmail.com
diff --git a/www/getleft/Makefile b/www/getleft/Makefile
index f5fb17b046bb..dfab0c27e92b 100644
--- a/www/getleft/Makefile
+++ b/www/getleft/Makefile
@@ -9,7 +9,7 @@ PORTNAME= getleft
PORTVERSION= 1.2b2
PORTREVISION= 2
CATEGORIES= www ftp
-MASTER_SITES= SF/getleftdown
+MASTER_SITES= SF/${PORTNAME}down/${PORTNAME}-devel/${PORTVERSION}
DISTNAME= Getleft-${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
diff --git a/www/goose/Makefile b/www/goose/Makefile
index ba1bbcdbe26e..477ab5632dad 100644
--- a/www/goose/Makefile
+++ b/www/goose/Makefile
@@ -9,8 +9,7 @@
PORTNAME= goose
PORTVERSION= 0.5
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= goose-search
+MASTER_SITES= SF/${PORTNAME}-search/${PORTNAME}-search/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/groupoffice/Makefile b/www/groupoffice/Makefile
index d47b58899d1b..bfdcf4f2b1b2 100644
--- a/www/groupoffice/Makefile
+++ b/www/groupoffice/Makefile
@@ -8,8 +8,7 @@ PORTNAME= groupoffice
DISTVERSIONPREFIX= com-
DISTVERSION= 2.18-stable-21
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= group-office
+MASTER_SITES= SF/group-office/Group-Office%20stable/2.18-stable-21
MAINTAINER= as@bsdgroup.de
COMMENT= A modular web application framework vor office
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 71c28ca46377..621399e6000f 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -8,8 +8,7 @@
PORTNAME= harvest
PORTVERSION= 1.9.14
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20devel/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Collect information from all over the Internet
diff --git a/www/html2wml/Makefile b/www/html2wml/Makefile
index 00ff27eac9a1..5121c380b8d2 100644
--- a/www/html2wml/Makefile
+++ b/www/html2wml/Makefile
@@ -8,7 +8,7 @@
PORTNAME= html2wml
PORTVERSION= 0.4.11
CATEGORIES= www
-MASTER_SITES= SF/htmlwml http://maddingue.free.fr/softwares/download/Html2Wml/
+MASTER_SITES= SF/htmlwml/Html2Wml/${PORTVERSION} http://maddingue.free.fr/softwares/download/Html2Wml/
MAINTAINER= ports@FreeBSD.org
COMMENT= A CGI that can do on-the-fly HTML to WML conversion
diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile
index 77fe21028807..c63fd3cf6a6b 100644
--- a/www/hypermail/Makefile
+++ b/www/hypermail/Makefile
@@ -8,8 +8,7 @@
PORTNAME= hypermail
PORTVERSION= 2.2.0
CATEGORIES= www mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= dan@langille.org
COMMENT= A program to generate a cross-referenced HTML mail archive
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index 9a0b464a4f94..73555a09c149 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -8,7 +8,7 @@ PORTNAME= ilias
PORTVERSION= 3.10.7
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/1.%20ILIAS%203.10/ILIAS%20${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= A poweful, dynamic, PHP and MySQL based e-learning platform
diff --git a/www/ilias3/Makefile b/www/ilias3/Makefile
index 9a0b464a4f94..73555a09c149 100644
--- a/www/ilias3/Makefile
+++ b/www/ilias3/Makefile
@@ -8,7 +8,7 @@ PORTNAME= ilias
PORTVERSION= 3.10.7
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/1.%20ILIAS%203.10/ILIAS%20${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= A poweful, dynamic, PHP and MySQL based e-learning platform
diff --git a/www/impresscms/Makefile b/www/impresscms/Makefile
index 9cad2451f869..5859c3978c77 100644
--- a/www/impresscms/Makefile
+++ b/www/impresscms/Makefile
@@ -8,7 +8,7 @@
PORTNAME= impresscms
PORTVERSION= 1.1.2
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ImpressCMS%20Official%20Releases/ImpressCMS%20${PORTVERSION}%20Final
DISTNAME= ${PORTNAME}_${PORTVERSION}_final
MAINTAINER= wenheping@gmail.com
diff --git a/www/iwebcal/Makefile b/www/iwebcal/Makefile
index 33360dd5baab..4ed1411b2db9 100644
--- a/www/iwebcal/Makefile
+++ b/www/iwebcal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= iwebcal
PORTVERSION= 2.1
CATEGORIES= www deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/www/jericho-html/Makefile b/www/jericho-html/Makefile
index 80ea7d2580b9..b8b300e89529 100644
--- a/www/jericho-html/Makefile
+++ b/www/jericho-html/Makefile
@@ -8,8 +8,7 @@
PORTNAME= jericho-html
PORTVERSION= 2.6
CATEGORIES= www java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:S,-,,}
+MASTER_SITES= SF/jerichohtml/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A java library to analyse and manipulate HTML
diff --git a/www/khtml2png/Makefile b/www/khtml2png/Makefile
index 37524ed362b1..51fcd5f577e1 100644
--- a/www/khtml2png/Makefile
+++ b/www/khtml2png/Makefile
@@ -9,8 +9,7 @@ PORTNAME= khtml2png
DISTVERSION= 2.7.6
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
MAINTAINER= rafan@FreeBSD.org
COMMENT= Command line program to create screenshots of webpages
diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile
index 3098441f2afa..1fd3deb4a27a 100644
--- a/www/kompozer/Makefile
+++ b/www/kompozer/Makefile
@@ -10,7 +10,7 @@ PORTNAME= kompozer
DISTVERSION= 0.7.10
PORTREVISION= 4
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/current/${PORTVERSION}
DISTNAME= ${PORTNAME}-${DISTVERSION}dfsg-src
MAINTAINER= gecko@FreeBSD.org
diff --git a/www/lifetype/Makefile b/www/lifetype/Makefile
index f475984dcfe3..b469465785f0 100644
--- a/www/lifetype/Makefile
+++ b/www/lifetype/Makefile
@@ -8,7 +8,7 @@
PORTNAME= lifetype
PORTVERSION= 1.2.8
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${CONTRIBE_VERSION}__all_plugins${EXTRACT_SUFX} \
${CONTRIBE_VERSION}__all_templates${EXTRACT_SUFX}
diff --git a/www/lilurl/Makefile b/www/lilurl/Makefile
index 625a4a852b81..287217701c5b 100644
--- a/www/lilurl/Makefile
+++ b/www/lilurl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= lilurl
PORTVERSION= 0.1.1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= chinsan@FreeBSD.org
COMMENT= A simple PHP/MySQL script for generating lil? URLs
diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index 93b6dd23ebce..c7414f55f7eb 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -8,7 +8,7 @@
PORTNAME= limesurvey
PORTVERSION= 1.80
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}${PORTVERSION:S^.^^}_build6506_20090310
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index 81765b0e7b15..dcff6bf94ad6 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -9,7 +9,7 @@
PORTNAME= linkchecker
PORTVERSION= 5.0.1
CATEGORIES= www python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= LinkChecker-${PORTVERSION}
MAINTAINER= beat@FreeBSD.org
diff --git a/www/links1/Makefile b/www/links1/Makefile
index 217de5ec2082..f74eabedc9e8 100644
--- a/www/links1/Makefile
+++ b/www/links1/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 0.98
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/links/download/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= links
+ SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+
MAINTAINER= demon@FreeBSD.org
COMMENT= Lynx-like text WWW browser
diff --git a/www/man2web/Makefile b/www/man2web/Makefile
index e7b8e09edc44..0e616bd0151c 100644
--- a/www/man2web/Makefile
+++ b/www/man2web/Makefile
@@ -9,8 +9,7 @@ PORTNAME= man2web
PORTVERSION= 0.88
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= naddy@FreeBSD.org
COMMENT= Convert man pages to HTML
diff --git a/www/mergelog/Makefile b/www/mergelog/Makefile
index ae0ab53108a2..4c38048be985 100644
--- a/www/mergelog/Makefile
+++ b/www/mergelog/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mergelog
PORTVERSION= 4.5
PORTREVISION= 1
CATEGORIES= www textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= tobez@FreeBSD.org
COMMENT= A tool to merge and sort by date http log files
diff --git a/www/middleman/Makefile b/www/middleman/Makefile
index ad8896ab76d8..c305127ec683 100644
--- a/www/middleman/Makefile
+++ b/www/middleman/Makefile
@@ -9,8 +9,7 @@ PORTNAME= middleman
PORTVERSION= 1.9.1
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= middle-man
+MASTER_SITES= SF/middle-man/Source/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A robust proxy server
diff --git a/www/mod_access_referer/Makefile b/www/mod_access_referer/Makefile
index d709ec42f96f..55d4a20de8e4 100644
--- a/www/mod_access_referer/Makefile
+++ b/www/mod_access_referer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mod_access_referer
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= accessreferer
+MASTER_SITES= SF/accessreferer/accessreferer/${PORTVERSION}
DIST_SUBDIR= apache
PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/www/mod_accounting/Makefile b/www/mod_accounting/Makefile
index 3cb1178e1db5..7b2ca76242a4 100644
--- a/www/mod_accounting/Makefile
+++ b/www/mod_accounting/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mod_accounting
PORTVERSION= 0.5
PORTREVISION= 6
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mod-acct
+MASTER_SITES= SF/mod-acct/mod-acct/${PORTVERSION}
MAINTAINER= apache@FreeBSD.org
COMMENT= An Apache module that records traffic statistics into a database
diff --git a/www/mod_auth_kerb/Makefile b/www/mod_auth_kerb/Makefile
index fbfa2f9bccf7..4b67a6b16492 100644
--- a/www/mod_auth_kerb/Makefile
+++ b/www/mod_auth_kerb/Makefile
@@ -11,8 +11,7 @@ PORTNAME= mod_auth_kerb
PORTVERSION= 5.3
PORTEPOCH= 1
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=modauthkerb
+MASTER_SITES= SF/modauthkerb/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= apache@FreeBSD.org
COMMENT= An Apache module for authenticating users with Kerberos v5
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
index 3d8bf1040ed9..964f7d4f3926 100644
--- a/www/mod_auth_kerb2/Makefile
+++ b/www/mod_auth_kerb2/Makefile
@@ -11,8 +11,7 @@
PORTNAME= mod_auth_kerb
PORTVERSION= 5.4
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=modauthkerb
+MASTER_SITES= SF/modauthkerb/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= apache@FreeBSD.org
COMMENT= An Apache module for authenticating users with Kerberos v5
diff --git a/www/mod_auth_mysql/Makefile b/www/mod_auth_mysql/Makefile
index 4e32dc87dec3..349c79b6ff30 100644
--- a/www/mod_auth_mysql/Makefile
+++ b/www/mod_auth_mysql/Makefile
@@ -7,8 +7,7 @@
PORTNAME= mod_auth_mysql
PORTVERSION= 3.2
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= mod-auth-mysql
+MASTER_SITES= SF/mod-auth-mysql/mod-auth-mysql/mod-auth-mysql-1.0
MAINTAINER= apache@FreeBSD.org
COMMENT= Allows users to use MySQL databases for user authentication
diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile
index 8c97a5fa3ae2..76d83faeab19 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -8,8 +8,7 @@ PORTNAME= mod_auth_mysql
PORTVERSION= 3.0.0
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_//g}
+MASTER_SITES= SF/modauthmysql/modauthmysql/${PORTVERSION}
PKGNAMESUFFIX= _another
MAINTAINER= mbr@FreeBSD.org
diff --git a/www/mod_authn_sasl/Makefile b/www/mod_authn_sasl/Makefile
index ddf10223bc79..5911ef480365 100644
--- a/www/mod_authn_sasl/Makefile
+++ b/www/mod_authn_sasl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mod_authn_sasl
PORTVERSION= 1.0.2
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/g}
+MASTER_SITES= SF/mod-authn-sasl/mod-authn-sasl/${PORTVERSION}
MAINTAINER= apache@FreeBSD.org
COMMENT= Allows user authentication based on libsasl2 mechanisms on apache 2.2
diff --git a/www/mod_bf/Makefile b/www/mod_bf/Makefile
index 5c365daab318..5447d1e0ef02 100644
--- a/www/mod_bf/Makefile
+++ b/www/mod_bf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mod_bf
PORTVERSION= 0.2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= modbf
+MASTER_SITES= SF/modbf/${PORTNAME}/${PORTVERSION}
MAINTAINER= apache@FreeBSD.org
COMMENT= A brainf*ck module for Apache
diff --git a/www/mod_blosxom/Makefile b/www/mod_blosxom/Makefile
index ec8033ffbb53..3e922d7becd1 100644
--- a/www/mod_blosxom/Makefile
+++ b/www/mod_blosxom/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mod_blosxom
PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/mod-blosxom/${PORTNAME}/${PORTVERSION}
MAINTAINER= ychsiao@ychsiao.org
COMMENT= Apache module to build the extremely lightweight Weblog environment
diff --git a/www/mod_cfg_ldap/Makefile b/www/mod_cfg_ldap/Makefile
index 3136759cba5f..c05174e9c5e6 100644
--- a/www/mod_cfg_ldap/Makefile
+++ b/www/mod_cfg_ldap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mod_cfg_ldap
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_//g}
+MASTER_SITES= SF/modcfgldap/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= apache2
MAINTAINER= apache@FreeBSD.org
diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile
index b1e1266aa194..c928dd6d78a3 100644
--- a/www/mod_cplusplus/Makefile
+++ b/www/mod_cplusplus/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mod_cplusplus
PORTVERSION= 1.5.4
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= modcplusplus
+MASTER_SITES= SF/modcplusplus/modcplusplus/${PORTNAME}-${PORTVERSION}
MAINTAINER= apache@FreeBSD.org
COMMENT= Apache module for loading C++ objects as handlers
diff --git a/www/mod_gzip/Makefile b/www/mod_gzip/Makefile
index 40b681f9694f..73a125d23ebc 100644
--- a/www/mod_gzip/Makefile
+++ b/www/mod_gzip/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mod_gzip
PORTVERSION= 1.3.26.1a
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/mod-gzip/mod-gzip13x/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ale@FreeBSD.org
diff --git a/www/mod_ntlm/Makefile b/www/mod_ntlm/Makefile
index a38135a59dba..4f76bcf8f462 100644
--- a/www/mod_ntlm/Makefile
+++ b/www/mod_ntlm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mod_ntlm
PORTVERSION= 0.4
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= modntlm
+MASTER_SITES= SF/modntlm/modntlm/${PORTVERSION}
MAINTAINER= skv@FreeBSD.org
COMMENT= NTLM authentication module for the Apache webserver
diff --git a/www/mod_ntlm2/Makefile b/www/mod_ntlm2/Makefile
index 1d805f9e0de9..02578a92bc37 100644
--- a/www/mod_ntlm2/Makefile
+++ b/www/mod_ntlm2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mod_ntlm2
PORTVERSION= 0.1
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= modntlm
+MASTER_SITES= SF/modntlm/modntlm2/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= admin@lissyara.su
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 61c3fc5b0d5c..d12e545022ff 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mod_security
PORTVERSION= 2.5.9
PORTREVISION= 1
CATEGORIES= www security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= mod-security
+MASTER_SITES= SF/mod-security/modsecurity-apache/${PORTVERSION}
DISTNAME= ${PORTNAME:S/_//:S/2//}-apache_${PORTVERSION}
MAINTAINER= araujo@FreeBSD.org
diff --git a/www/mod_sqlinclude/Makefile b/www/mod_sqlinclude/Makefile
index f3435da23b27..120351dbaf09 100644
--- a/www/mod_sqlinclude/Makefile
+++ b/www/mod_sqlinclude/Makefile
@@ -8,8 +8,7 @@ PORTNAME= mod_sqlinclude
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/mod-sqlinclude/mod-sqlinclude/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= apache@FreeBSD.org
diff --git a/www/mod_webkit/Makefile b/www/mod_webkit/Makefile
index 135cf7db0353..239f62b39821 100644
--- a/www/mod_webkit/Makefile
+++ b/www/mod_webkit/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mod_webkit
PORTVERSION= 1.0.2b1
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= webware
+MASTER_SITES= SF/webware/OldFiles
DISTNAME= Webware-${PORTVERSION}
MAINTAINER= apache@FreeBSD.org
diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile
index 73e85474447c..fb50d26e4e51 100644
--- a/www/mplayer-plugin/Makefile
+++ b/www/mplayer-plugin/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mplayerplug-in
PORTVERSION= 3.55
PORTREVISION= 3
CATEGORIES= www multimedia
-MASTER_SITES= SF/mplayerplug-in
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
MAINTAINER= marcus@FreeBSD.org
COMMENT= A Mozilla plugin for the MPlayer media player
diff --git a/www/myghty/Makefile b/www/myghty/Makefile
index c356806b460b..163f9fee05d6 100644
--- a/www/myghty/Makefile
+++ b/www/myghty/Makefile
@@ -8,8 +8,7 @@
PORTNAME= myghty
PORTVERSION= 1.1
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= Myghty-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/mysar/Makefile b/www/mysar/Makefile
index c7b734be08c4..23c8397eab77 100644
--- a/www/mysar/Makefile
+++ b/www/mysar/Makefile
@@ -10,8 +10,7 @@ PORTNAME= mySAR
PORTVERSION= 2.1.4
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mysar
+MASTER_SITES= SF
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= edwin@mavetju.org
diff --git a/www/nanoblogger-extra/Makefile b/www/nanoblogger-extra/Makefile
index ea3633d340ba..ae8f037f307f 100644
--- a/www/nanoblogger-extra/Makefile
+++ b/www/nanoblogger-extra/Makefile
@@ -9,7 +9,7 @@
PORTNAME= nanoblogger-extra
PORTVERSION= 3.4
CATEGORIES= www
-MASTER_SITES= SF/nanoblogger
+MASTER_SITES= SF/nanoblogger/${PORTNAME}/Version%20${PORTVERSION}
MAINTAINER= tobias.rehbein@web.de
COMMENT= Extras for nanoblogger, a small weblog engine
diff --git a/www/nanoblogger/Makefile b/www/nanoblogger/Makefile
index 3d9083ac704b..70562e5a65f4 100644
--- a/www/nanoblogger/Makefile
+++ b/www/nanoblogger/Makefile
@@ -9,7 +9,7 @@
PORTNAME= nanoblogger
PORTVERSION= 3.4
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
MAINTAINER= tobias.rehbein@web.de
COMMENT= Small weblog engine written in Bash for the command line
diff --git a/www/neowebscript/Makefile b/www/neowebscript/Makefile
index 783af023d33e..badf6d4ceee7 100644
--- a/www/neowebscript/Makefile
+++ b/www/neowebscript/Makefile
@@ -9,8 +9,7 @@ PORTNAME= neowebscript
PORTVERSION= 3.3
PORTREVISION= 3
CATEGORIES= www tcl
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=nws
+MASTER_SITES= SF/nws/nws/${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
COMMENT= Embeds a TCL8 interpreter in the Apache server
diff --git a/www/netoffice/Makefile b/www/netoffice/Makefile
index 1fc956954e86..7514ba17fc30 100644
--- a/www/netoffice/Makefile
+++ b/www/netoffice/Makefile
@@ -8,8 +8,7 @@ PORTNAME= netoffice
PORTVERSION= 2.6.0b2
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= netoffice
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
MAINTAINER= araujo@FreeBSD.org
COMMENT= NetOffice is a free web based project-management environment
diff --git a/www/npapi-xine/Makefile b/www/npapi-xine/Makefile
index 2737bb92aae9..cc0222ee0993 100644
--- a/www/npapi-xine/Makefile
+++ b/www/npapi-xine/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.2
PORTREVISION= 1
DISTVERSIONPREFIX= plugin-
CATEGORIES= www multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-plugin/${PORTVERSION}
PKGNAMEPREFIX= npapi-
MAINTAINER= miwi@FreeBSD.org
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index 6a84e1bec514..3a41debbbea1 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -10,9 +10,9 @@ PORTNAME= nscache
PORTVERSION= 0.6
PORTREVISION= 7
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://www.idata.sk/~ondrej/sw/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/www/ocaml-net/Makefile b/www/ocaml-net/Makefile
index f2147dd10e16..f4c5756f1d56 100644
--- a/www/ocaml-net/Makefile
+++ b/www/ocaml-net/Makefile
@@ -9,8 +9,7 @@ PORTNAME= net
PORTVERSION= 2.2.9
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ocamlnet
+MASTER_SITES= SF/ocaml${PORTNAME}/ocaml${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ocaml-
DISTNAME= ocaml${PORTNAME}-${PORTVERSION}
diff --git a/www/openbravoerp/Makefile b/www/openbravoerp/Makefile
index 67bb85043926..dfd12d2966ed 100644
--- a/www/openbravoerp/Makefile
+++ b/www/openbravoerp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= openbravoerp
PORTVERSION= 2.40
CATEGORIES= www java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:S/erp//}
+MASTER_SITES= SF/openbravo/09-openbravo-old-installers/${PORTVERSION}
DISTNAME= OpenbravoERP_${PORTVERSION}-freebsd6${PLATFORM}-installer
EXTRACT_SUFX= .bin
EXTRACT_ONLY= #
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index 65edf2a4967e..487e6878dfdd 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openvrml
PORTVERSION= 0.17.5
PORTREVISION= 5
CATEGORIES= www graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= VRML97 runtime and browser
diff --git a/www/openxmldir/Makefile b/www/openxmldir/Makefile
index ba644111bb75..e05940ddcc8a 100644
--- a/www/openxmldir/Makefile
+++ b/www/openxmldir/Makefile
@@ -8,8 +8,7 @@
PORTNAME= openxmldir
PORTVERSION= 1.2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= open79xxdir
+MASTER_SITES= SF/open79xxdir/OpenXMLDir/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/orangehrm/Makefile b/www/orangehrm/Makefile
index fc27cf1d9f0f..60cdc5d87ca3 100644
--- a/www/orangehrm/Makefile
+++ b/www/orangehrm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= orangehrm
PORTVERSION= 2.4.2
PORTREVISION= 1
CATEGORIES= www misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/stable/${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= Open Source Human Resource Management
diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile
index b860b7eecc8a..810d1def2e47 100644
--- a/www/osb-browser/Makefile
+++ b/www/osb-browser/Makefile
@@ -9,8 +9,7 @@ PORTNAME= osb-browser
PORTVERSION= 0.5.2
PORTREVISION= 3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtk-webcore
+MASTER_SITES= SF/gtk-webcore/gtk-webcore/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gtk+ WebCore reference web browser implementation
diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile
index 3343f021101e..849119d7fd6e 100644
--- a/www/osb-nrcit/Makefile
+++ b/www/osb-nrcit/Makefile
@@ -9,8 +9,7 @@ PORTNAME= osb-nrcit
PORTVERSION= 0.5.2
PORTREVISION= 4
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtk-webcore
+MASTER_SITES= SF/gtk-webcore/gtk-webcore/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gtk+ WebCore embeddable web browser component
diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile
index 52969601b681..0fe5f2a7d677 100644
--- a/www/osb-nrcore/Makefile
+++ b/www/osb-nrcore/Makefile
@@ -9,7 +9,7 @@ PORTNAME= osb-nrcore
PORTVERSION= 0.5.2
PORTREVISION= 4
CATEGORIES= www
-MASTER_SITES= SF/gtk-webcore
+MASTER_SITES= SF/gtk-webcore/gtk-webcore/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gtk+ WebCore html rendering engine
diff --git a/www/p5-libservlet/Makefile b/www/p5-libservlet/Makefile
index ae830e57e29f..7adc4ffafba3 100644
--- a/www/p5-libservlet/Makefile
+++ b/www/p5-libservlet/Makefile
@@ -9,8 +9,7 @@
PORTNAME= libservlet
PORTVERSION= 0.9.2
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/www/paros/Makefile b/www/paros/Makefile
index 3688657de93e..f97d8ad57b92 100644
--- a/www/paros/Makefile
+++ b/www/paros/Makefile
@@ -9,8 +9,7 @@ PORTNAME= paros
PORTVERSION= 3.2.13
PORTREVISION= 1
CATEGORIES= www security java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Paros/Version%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-unix
MAINTAINER= wxs@FreeBSD.org
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index f8bde50724ff..fc9eecb8d23f 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -9,8 +9,7 @@ PORTNAME= peacock
PORTVERSION= 1.9.1
PORTREVISION= 14
CATEGORIES= www gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pav@FreeBSD.org
COMMENT= A GUI-based HTML Editor for GTK+/GNOME
diff --git a/www/php-dyn/Makefile b/www/php-dyn/Makefile
index a6d5225c0b75..1229acd9e8b7 100644
--- a/www/php-dyn/Makefile
+++ b/www/php-dyn/Makefile
@@ -8,8 +8,7 @@
PORTNAME= php-dyn
PORTVERSION= 1.2.1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/PHP_Dyn/${PORTVERSION}
DISTNAME= php_dyn-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile
index 4cb30f32cab0..3e269df3e746 100644
--- a/www/php-screw/Makefile
+++ b/www/php-screw/Makefile
@@ -8,8 +8,7 @@
PORTNAME= php-screw
PORTVERSION= 1.5
CATEGORIES= www security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= php_screw-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/www/php-templates/Makefile b/www/php-templates/Makefile
index f1bcfcb3ce57..37bc17520096 100644
--- a/www/php-templates/Makefile
+++ b/www/php-templates/Makefile
@@ -8,8 +8,7 @@
PORTNAME= php-templates
PORTVERSION= 1.7.2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.7
DISTNAME= php_templates-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
.if !defined(NOPORTDOCS)
diff --git a/www/phpbb-devel/Makefile b/www/phpbb-devel/Makefile
index 155b8bb608f8..62acb686b3dc 100644
--- a/www/phpbb-devel/Makefile
+++ b/www/phpbb-devel/Makefile
@@ -9,7 +9,7 @@ PORTNAME= phpbb
PORTVERSION= 3.0.0
PORTEPOCH= 1
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/phpBB%203/phpBB%20${PORTVERSION}
PKGNAMESUFFIX= -devel
DISTNAME= phpBB-${PORTVERSION}
diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index acc1682e18c4..13d105d08f7f 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= phpbb
PORTVERSION= 2.0.23
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/phpBB%202/phpBB%20v${PORTVERSION}
DISTNAME= phpBB-${PORTVERSION}
MAINTAINER= liukang@cn.freebsd.org
diff --git a/www/phpbb3/Makefile b/www/phpbb3/Makefile
index 2165530fb952..8292db4deece 100644
--- a/www/phpbb3/Makefile
+++ b/www/phpbb3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= phpbb
PORTVERSION= 3.0.5
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/phpBB%203/phpBB%20${PORTVERSION}
DISTNAME= phpBB-${PORTVERSION}
MAINTAINER= bg1tpt@gmail.com
diff --git a/www/phpgedview/Makefile b/www/phpgedview/Makefile
index 1feee39566ff..9091c209c8da 100644
--- a/www/phpgedview/Makefile
+++ b/www/phpgedview/Makefile
@@ -8,8 +8,7 @@
PORTNAME= phpGedView
PORTVERSION= 4.2.2
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= phpgedview
+MASTER_SITES= SF/${PORTNAME:L}/1%20PhpGedView/PhpGedView%20v${PORTVERSION}
DISTNAME= ${PORTNAME:S/p/P/}-basic-${PORTVERSION}
MAINTAINER= fbsd@opal.com
diff --git a/www/phprecipebook/Makefile b/www/phprecipebook/Makefile
index 7554f2dca0a9..d237dfd6133d 100644
--- a/www/phprecipebook/Makefile
+++ b/www/phprecipebook/Makefile
@@ -8,7 +8,7 @@
PORTNAME= phprecipebook
PORTVERSION= 2.39
CATEGORIES= www deskutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
MAINTAINER= mad@madpilot.net
COMMENT= Small php webapp to manage your recipes
diff --git a/www/phproxy/Makefile b/www/phproxy/Makefile
index fe94406fbda0..bd84def5e14e 100644
--- a/www/phproxy/Makefile
+++ b/www/phproxy/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phproxy
PORTVERSION= 0.5b2
PORTREVISION= 3
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= poxy
+MASTER_SITES= SF/poxy/PHProxy/0.5%20beta%202
DISTNAME= poxy-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/www/phpsysinfo-dev/Makefile b/www/phpsysinfo-dev/Makefile
index 02627bbf73b6..3ae2a0869217 100644
--- a/www/phpsysinfo-dev/Makefile
+++ b/www/phpsysinfo-dev/Makefile
@@ -8,7 +8,7 @@ PORTNAME= phpSysInfo
DISTVERSION= 3.0-RC6
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/3.0-RC6
MAINTAINER= walt@relnor.com
COMMENT= A PHP script for displaying system information
diff --git a/www/phpwebapp/Makefile b/www/phpwebapp/Makefile
index 171ce926845b..b89f2c67d5f3 100644
--- a/www/phpwebapp/Makefile
+++ b/www/phpwebapp/Makefile
@@ -9,8 +9,7 @@
PORTNAME= phpwebapp
PORTVERSION= 1.2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= munggo@pmy.lv
COMMENT= A web application framework
diff --git a/www/phpwiki/Makefile b/www/phpwiki/Makefile
index 091fcf0f2145..2ebaa5469638 100644
--- a/www/phpwiki/Makefile
+++ b/www/phpwiki/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpwiki
PORTVERSION= 1.2.10
PORTREVISION= 4
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpwiki
+MASTER_SITES= SF/${PORTNAME}/PhpWiki%201.2%20%28stable%29/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A PHP WikiWikiWeb
diff --git a/www/phpwiki13/Makefile b/www/phpwiki13/Makefile
index c3bacaf69321..f23348ff6b2e 100644
--- a/www/phpwiki13/Makefile
+++ b/www/phpwiki13/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpwiki
PORTVERSION= 1.3.14
PORTREVISION= 3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpwiki
+MASTER_SITES= SF/${PORTNAME}/PhpWiki%201.3%20%28current%29/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A PHP WikiWikiWeb
diff --git a/www/pivot-weblog/Makefile b/www/pivot-weblog/Makefile
index 33a15ef1a6bf..ab3207ac8aa2 100644
--- a/www/pivot-weblog/Makefile
+++ b/www/pivot-weblog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pivot-weblog
PORTVERSION= 1.40.7
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Pivot%20Weblog/Pivot%20${PORTVERSION}
DISTNAME= pivot_1407_full
MAINTAINER= hans@nordhaug.priv.no
diff --git a/www/pnews/Makefile b/www/pnews/Makefile
index 4bcfa60acae8..516071958874 100644
--- a/www/pnews/Makefile
+++ b/www/pnews/Makefile
@@ -10,8 +10,7 @@ PORTNAME= pnews
PORTVERSION= 2.6.6
PORTEPOCH= 1
CATEGORIES= www news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index befaca5c23bd..51c194f4b01d 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= privoxy
PORTVERSION= 3.0.12
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ijbswa
+MASTER_SITES= SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
DISTNAME= privoxy-${PORTVERSION}-stable-src
MAINTAINER= fk@fabiankeil.de
diff --git a/www/pserv/Makefile b/www/pserv/Makefile
index a42c39d69ffa..afb930298795 100644
--- a/www/pserv/Makefile
+++ b/www/pserv/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pserv
PORTVERSION= 3.4
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tar.Z
MAINTAINER= ale@FreeBSD.org
diff --git a/www/py-imdbpy/Makefile b/www/py-imdbpy/Makefile
index 1f3b8796109f..2d3344e86dea 100644
--- a/www/py-imdbpy/Makefile
+++ b/www/py-imdbpy/Makefile
@@ -9,7 +9,7 @@
PORTNAME= imdbpy
PORTVERSION= 3.9
CATEGORIES= www python
-MASTER_SITES= SF CHEESESHOP
+MASTER_SITES= SF/${PORTNAME}/IMDbPY/${PORTVERSION} CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= IMDbPY-${PORTVERSION}
diff --git a/www/py-jonpy/Makefile b/www/py-jonpy/Makefile
index c7d37f64a6c5..28847be46e09 100644
--- a/www/py-jonpy/Makefile
+++ b/www/py-jonpy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= jonpy
PORTVERSION= 0.07
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jonpy
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= xride@FreeBSD.org
diff --git a/www/py-mt/Makefile b/www/py-mt/Makefile
index bd0e941f2e0a..2b8b6fd55950 100644
--- a/www/py-mt/Makefile
+++ b/www/py-mt/Makefile
@@ -9,8 +9,7 @@
PORTNAME= mt
PORTVERSION= 1.0
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pymt
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/PyMT-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyMT-${PORTVERSION}
diff --git a/www/py-pysearch/Makefile b/www/py-pysearch/Makefile
index abe602446347..acc52f2c3787 100644
--- a/www/py-pysearch/Makefile
+++ b/www/py-pysearch/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pysearch
PORTVERSION= 3.1
CATEGORIES= www python
-MASTER_SITES= SOURCEFORGE
+MASTER_SITES= SF/${PORTNAME}/pYsearch/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pYsearch-${PORTVERSION}
diff --git a/www/py-turbodjango/Makefile b/www/py-turbodjango/Makefile
index 4d8b111bd068..cb14e58a4707 100644
--- a/www/py-turbodjango/Makefile
+++ b/www/py-turbodjango/Makefile
@@ -9,8 +9,7 @@ PORTNAME= turbodjango
PORTVERSION= 0.95.w2
PORTREVISION= 1
CATEGORIES= www python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tgwidgets
+MASTER_SITES= SF/tgwidgets/TurboDjango/TurboDjango%200.95w2
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PYTURBODJANGO_EGG}
EXTRACT_SUFX=
diff --git a/www/py-webware/Makefile b/www/py-webware/Makefile
index 33744d685fe5..d3922d70e108 100644
--- a/www/py-webware/Makefile
+++ b/www/py-webware/Makefile
@@ -8,7 +8,7 @@
PORTNAME= webware
DISTVERSION= 1.0.2
CATEGORIES= www python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Webware/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Webware-${PORTVERSION}
diff --git a/www/pyblosxom/Makefile b/www/pyblosxom/Makefile
index e3f6b7e3d82d..9051208c191f 100644
--- a/www/pyblosxom/Makefile
+++ b/www/pyblosxom/Makefile
@@ -8,9 +8,9 @@
PORTNAME= pyblosxom
PORTVERSION= 1.4.3
CATEGORIES= www python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= jun-g@daemonfreaks.com
COMMENT= A lightweight weblog system
diff --git a/www/pyjamas/Makefile b/www/pyjamas/Makefile
index 252a968a0ef4..1f5006414bad 100644
--- a/www/pyjamas/Makefile
+++ b/www/pyjamas/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pyjamas
PORTVERSION= 0.5
PORTREVISION= 0
CATEGORIES= www python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PYDISTUTILS_PKGNAME}-${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index ca845be04fcb..8f22e8c138e1 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -10,8 +10,7 @@ PORTNAME= retawq
DISTVERSION= 0.2.6c
PORTREVISION= 6
CATEGORIES= www ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.6c
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive, multi-threaded web browser for text terminals
diff --git a/www/rnews/Makefile b/www/rnews/Makefile
index 56e18e0253ad..7d313639b886 100644
--- a/www/rnews/Makefile
+++ b/www/rnews/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rnews
PORTVERSION= 0.92
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= as@bsdgroup.de
COMMENT= A server-side rss aggregator written in php with mysql
diff --git a/www/ruby-tmpl/Makefile b/www/ruby-tmpl/Makefile
index 6fac35a70ec9..cb30b1272958 100644
--- a/www/ruby-tmpl/Makefile
+++ b/www/ruby-tmpl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tmpl
PORTVERSION= 0.2.3
CATEGORIES= www textproc ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ruby-${PORTNAME}
+MASTER_SITES= SF/ruby-${PORTNAME}/ruby-${PORTNAME}/ruby-${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 505e76e0356c..cd7a7762477e 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sarg
PORTVERSION= 2.2.5
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= garga@FreeBSD.org
COMMENT= Squid log analyzer and HTML report generator
diff --git a/www/script4rss/Makefile b/www/script4rss/Makefile
index b2cdd04140b5..67a457065026 100644
--- a/www/script4rss/Makefile
+++ b/www/script4rss/Makefile
@@ -9,8 +9,7 @@
PORTNAME= script4rss
PORTVERSION= 0.4b
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Easily create scripts to convert HTML pages to RSS feeds
diff --git a/www/serendipity/Makefile b/www/serendipity/Makefile
index ec39b1be089b..57d7c31d187e 100644
--- a/www/serendipity/Makefile
+++ b/www/serendipity/Makefile
@@ -8,8 +8,7 @@
PORTNAME= serendipity
PORTVERSION= 1.4.1
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= php-blog
+MASTER_SITES= SF/php-blog/${PORTNAME}/${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= PHP based weblog software
diff --git a/www/simplog/Makefile b/www/simplog/Makefile
index 988bd1977d85..87871baf07dd 100644
--- a/www/simplog/Makefile
+++ b/www/simplog/Makefile
@@ -8,8 +8,9 @@
PORTNAME= simplog
PORTVERSION= 0.9.3.4
CATEGORIES= www
-MASTER_SITES= SF:src \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.9.3.2:src \
http://www.simplog.org/dl/:update
+
DISTFILES= ${PORTNAME}-0.9.3.2.tar.gz:src \
${PORTNAME}_update_only-${PORTVERSION}.tar.gz:update
diff --git a/www/siteatschool/Makefile b/www/siteatschool/Makefile
index 98db681ca033..ac2742362d6b 100644
--- a/www/siteatschool/Makefile
+++ b/www/siteatschool/Makefile
@@ -8,7 +8,7 @@
PORTNAME= siteatschool
PORTVERSION= 2.4.10
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Site%40School/Site%40School%20${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= CMS to manage and maintain a school website
diff --git a/www/sitebar/Makefile b/www/sitebar/Makefile
index 317da58fb2b3..8c11ef24718b 100644
--- a/www/sitebar/Makefile
+++ b/www/sitebar/Makefile
@@ -9,8 +9,7 @@
PORTNAME= sitebar
PORTVERSION= 3.3.9
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/SiteBar/${PORTVERSION}
DISTNAME= SiteBar-${PORTVERSION}
MAINTAINER= gunter@six-two.net
diff --git a/www/slash/Makefile b/www/slash/Makefile
index 8674a6a96331..25df02bc81e6 100644
--- a/www/slash/Makefile
+++ b/www/slash/Makefile
@@ -9,8 +9,7 @@ PORTNAME= slash
PORTVERSION= 2.2.6
PORTREVISION= 2
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= slashcode
+MASTER_SITES= SF/${PORTNAME}code/${PORTNAME}code/${PORTVERSION}
DISTNAME= slash-${PORTVERSION}
MAINTAINER= glarkin@FreeBSD.org
diff --git a/www/sqstat/Makefile b/www/sqstat/Makefile
index b245dffb6dc2..a1f7dd510c9f 100644
--- a/www/sqstat/Makefile
+++ b/www/sqstat/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.20
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://samm.kiev.ua/sqstat/ \
- ${MASTER_SITE_SOURCEFORGE}
+ SF/sqstat/sqstat/sqstat-${PORTVERSION}
MAINTAINER= sem@FreeBSD.org
COMMENT= A script which allows to look through active squid users connections
diff --git a/www/srg/Makefile b/www/srg/Makefile
index eef379a1b2f4..9a65c47efd82 100644
--- a/www/srg/Makefile
+++ b/www/srg/Makefile
@@ -9,9 +9,9 @@ PORTNAME= srg
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://mirror.crc.net.nz/pub/srg/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ds@tic-tac.ru
COMMENT= A Squid Report Generator
diff --git a/www/swish++/Makefile b/www/swish++/Makefile
index 4a34d3f1223a..5c4b6d3ba772 100644
--- a/www/swish++/Makefile
+++ b/www/swish++/Makefile
@@ -10,7 +10,7 @@ PORTNAME= swish++
PORTVERSION= 6.1.5
PORTREVISION= 1
CATEGORIES= www textproc
-MASTER_SITES= SF/swishplusplus
+MASTER_SITES= SF/swishplusplus/swishplusplus/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple Web Indexing System for Humans: C++ version
diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index a54cebe885be..763982005a55 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -11,7 +11,7 @@ PORTNAME= syndigator
PORTVERSION= 0.15.1
PORTREVISION= 5
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Syndigator/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An RSS feed reader based on Gtk2
diff --git a/www/tcldom-libxml2/Makefile b/www/tcldom-libxml2/Makefile
index 3191e5eeafcd..7eb591927084 100644
--- a/www/tcldom-libxml2/Makefile
+++ b/www/tcldom-libxml2/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTVERSION= 3.1
PKGNAMESUFFIX= -libxml2
MAINTAINER= frank@fenor.de
diff --git a/www/tcldom/Makefile b/www/tcldom/Makefile
index f1abf9fdacb0..ae40da819f54 100644
--- a/www/tcldom/Makefile
+++ b/www/tcldom/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= tcldom
-DISTVERSION= 3.1
+PORTVERSION= 3.1
PORTREVISION= 1
CATEGORIES= www tcl
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tclxml
+MASTER_SITES= SF/tclxml/TclDOM/${PORTVERSION}
MAINTAINER= frank@fenor.de
COMMENT= DOM API for Tcl based on TclDOMPro
diff --git a/www/tclwebtest/Makefile b/www/tclwebtest/Makefile
index 5842a2c42713..28173e92b951 100644
--- a/www/tclwebtest/Makefile
+++ b/www/tclwebtest/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tclwebtest
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= www tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mm@FreeBSD.org
COMMENT= Tool for issuing HTTP requests and dealing with the result
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index ca1aa814485a..ded5a45d91a3 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -8,8 +8,8 @@
PORTNAME= tdiary
PORTVERSION= 2.2.1
CATEGORIES?= www ruby
-MASTER_SITES= SF \
- http://www.tdiary.org/download/
+MASTER_SITES= http://www.tdiary.org/download/ \
+ SF
DISTNAME= ${PORTNAME}-full-${PORTVERSION}
MAINTAINER= tota@rtfm.jp
diff --git a/www/templatelite/Makefile b/www/templatelite/Makefile
index 0737371a53a6..894f61531838 100644
--- a/www/templatelite/Makefile
+++ b/www/templatelite/Makefile
@@ -8,8 +8,7 @@
PORTNAME= templatelite
PORTVERSION= 2.10
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Template%20Lite/Template%20Lite%20version%20${PORTVERSION}
DISTNAME= template_lite_${PORTVERSION}
MAINTAINER= zaa@zaa.pp.ru
diff --git a/www/tikiwiki/Makefile b/www/tikiwiki/Makefile
index 28caed6a667f..9a9eae70357d 100644
--- a/www/tikiwiki/Makefile
+++ b/www/tikiwiki/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tikiwiki
PORTVERSION= 2.4
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TikiWiki%202.x%20-Arcturus-/${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Powerful PHP based Wiki/CMS/Groupware
diff --git a/www/tinymce/Makefile b/www/tinymce/Makefile
index 09a317f011a7..298ee2aeef3e 100644
--- a/www/tinymce/Makefile
+++ b/www/tinymce/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tinymce
PORTVERSION= 2.1.3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/TinyMCE/${PORTVERSION}
DISTNAME= tinymce_2_1_3
EXTRACT_SUFX= .tgz
diff --git a/www/tinymce3/Makefile b/www/tinymce3/Makefile
index 3f7dda3cf3a6..c61b1a949b04 100644
--- a/www/tinymce3/Makefile
+++ b/www/tinymce3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tinymce
PORTVERSION= 3.2.4.1
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TinyMCE/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
MAINTAINER= sunpoet@sunpoet.net
diff --git a/www/transproxy/Makefile b/www/transproxy/Makefile
index 2e4e5cab0fa0..487c9fd63a29 100644
--- a/www/transproxy/Makefile
+++ b/www/transproxy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= transproxy
PORTVERSION= 1.6
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
diff --git a/www/typo3/Makefile b/www/typo3/Makefile
index 8e8e0d19b097..682f80287b99 100644
--- a/www/typo3/Makefile
+++ b/www/typo3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= typo3
PORTVERSION= 4.2.8
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
DISTNAME= ${PORTNAME}_src-${PORTVERSION}
MAINTAINER= gerrit.beine@gmx.de
diff --git a/www/typo343/Makefile b/www/typo343/Makefile
index 8e8e0d19b097..682f80287b99 100644
--- a/www/typo343/Makefile
+++ b/www/typo343/Makefile
@@ -8,7 +8,7 @@
PORTNAME= typo3
PORTVERSION= 4.2.8
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
DISTNAME= ${PORTNAME}_src-${PORTVERSION}
MAINTAINER= gerrit.beine@gmx.de
diff --git a/www/typo344/Makefile b/www/typo344/Makefile
index 8e8e0d19b097..682f80287b99 100644
--- a/www/typo344/Makefile
+++ b/www/typo344/Makefile
@@ -8,7 +8,7 @@
PORTNAME= typo3
PORTVERSION= 4.2.8
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
DISTNAME= ${PORTNAME}_src-${PORTVERSION}
MAINTAINER= gerrit.beine@gmx.de
diff --git a/www/typo345/Makefile b/www/typo345/Makefile
index 8e8e0d19b097..682f80287b99 100644
--- a/www/typo345/Makefile
+++ b/www/typo345/Makefile
@@ -8,7 +8,7 @@
PORTNAME= typo3
PORTVERSION= 4.2.8
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
DISTNAME= ${PORTNAME}_src-${PORTVERSION}
MAINTAINER= gerrit.beine@gmx.de
diff --git a/www/typo346/Makefile b/www/typo346/Makefile
index 8e8e0d19b097..682f80287b99 100644
--- a/www/typo346/Makefile
+++ b/www/typo346/Makefile
@@ -8,7 +8,7 @@
PORTNAME= typo3
PORTVERSION= 4.2.8
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TYPO3%20Source%20and%20Dummy/TYPO3%20${PORTVERSION}
DISTNAME= ${PORTNAME}_src-${PORTVERSION}
MAINTAINER= gerrit.beine@gmx.de
diff --git a/www/typolight/Makefile b/www/typolight/Makefile
index 0878b2d92d85..3a0efd584669 100644
--- a/www/typolight/Makefile
+++ b/www/typolight/Makefile
@@ -8,7 +8,7 @@
PORTNAME= typolight
PORTVERSION= 2.7.2
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TYPOlight/${PORTNAME}-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Powerful web content management system
diff --git a/www/ump/Makefile b/www/ump/Makefile
index a522abb51e79..5175b81bf0ea 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -9,12 +9,11 @@ PORTNAME= ump
PORTVERSION= 1.10
PORTREVISION= 12
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:timidity/} \
+MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${TIMIDITY_VERSION}:timidity \
http://www.geocities.com/SiliconValley/Lab/2826/1-10/:ump \
http://pubweb.bnl.gov/people/hoff/midi/1.10/:ump \
ftp://ftp.fu-berlin.de/unix/network/www/netscape/sdk/plugin/unix/:plugin \
ftp://ftp.fh-wolfenbuettel.de/pub/www/netscape/sdk/plugin/unix/:plugin
-MASTER_SITE_SUBDIR= timidity/:timidity
DISTFILES= ${BZ2DIST} ${ZDIST}
EXTRACT_ONLY= ${BZ2DIST:C/:.*$//}
diff --git a/www/vtiger-customerportal/Makefile b/www/vtiger-customerportal/Makefile
index e908eecefe29..37d201b096ec 100644
--- a/www/vtiger-customerportal/Makefile
+++ b/www/vtiger-customerportal/Makefile
@@ -7,8 +7,7 @@
PORTNAME= customerportal
PORTVERSION= 5.0.3
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= vtigercrm
+MASTER_SITES= SF/vtigercrm/vtiger%20CRM%20${PORTVERSION}/Add-ons
PKGNAMEPREFIX= vtiger-
DISTNAME= vtigercrm-customerportal-${DISTVERSION}
diff --git a/www/vtiger/Makefile b/www/vtiger/Makefile
index 4824b25859da..c3db361b6d19 100644
--- a/www/vtiger/Makefile
+++ b/www/vtiger/Makefile
@@ -8,8 +8,7 @@
PORTNAME= vtiger
PORTVERSION= 5.0.3
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= vtigercrm
+MASTER_SITES= SF/${PORTNAME}crm/${PORTNAME}%20CRM%20${PORTVERSION}/Core%20%20Product
DISTFILES= ${PORTNAME}crm-${DISTVERSION}.tar.gz \
${PORTNAME}CRM-${DISTVERSION}-PHP5.2-Patch1.tar.gz
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index b4f6e94ce165..446e2fb8ab97 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -9,8 +9,7 @@ PORTNAME= w3m
PORTVERSION= ${W3M_VERSION}
PORTREVISION= 3
CATEGORIES+= www ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/w3m/w3m/w3m-${PORTVERSION}
DISTNAME= w3m-${W3M_VERSION}
PATCH_SITES= http://www.alib.jp/files/
diff --git a/www/webcalendar-devel/Makefile b/www/webcalendar-devel/Makefile
index 5715cd35254d..3f6886e95528 100644
--- a/www/webcalendar-devel/Makefile
+++ b/www/webcalendar-devel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= WebCalendar
PORTVERSION= 1.2.0
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}%201.2/${PORTVERSION}
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME:S/-devel//g}-${PORTVERSION}
diff --git a/www/webcalendar/Makefile b/www/webcalendar/Makefile
index b496c6ebfaf9..1f3afe7d92cc 100644
--- a/www/webcalendar/Makefile
+++ b/www/webcalendar/Makefile
@@ -9,8 +9,7 @@ PORTNAME= WebCalendar
PORTVERSION= 1.0.5
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}%201.0/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= glarkin@FreeBSD.org
diff --git a/www/webinject/Makefile b/www/webinject/Makefile
index c8fa2c4258d9..f8ae0ae4e50a 100644
--- a/www/webinject/Makefile
+++ b/www/webinject/Makefile
@@ -8,8 +8,7 @@
PORTNAME= webinject
PORTVERSION= 1.41
CATEGORIES= www perl5 devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= webinject
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20-%20Source%20Code%20%28with%20UNIX%20style%20line%20endings%29
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= gerrit.beine@gmx.de
diff --git a/www/wikindx/Makefile b/www/wikindx/Makefile
index 6fb96823f4bf..b7cfe13d8340 100644
--- a/www/wikindx/Makefile
+++ b/www/wikindx/Makefile
@@ -8,8 +8,7 @@
PORTNAME= wikindx
PORTVERSION= 3.8.2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wikindx
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}3_8_2
DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/g}
MAINTAINER= miwi@FreeBSD.org
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index 3679a5c4caf0..c5bd1d7cddff 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -9,7 +9,7 @@
PORTNAME= wsdlpull
PORTVERSION= 1.23
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= pgollucci@FreeBSD.org
COMMENT= C++ WSDL Parser
diff --git a/www/xaraya/Makefile b/www/xaraya/Makefile
index 06d142e1c73f..9ba5a7039d3d 100644
--- a/www/xaraya/Makefile
+++ b/www/xaraya/Makefile
@@ -10,7 +10,7 @@
PORTNAME= xaraya
PORTVERSION= 1.1.5
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Core%20plus%20Modules/Xaraya%20${PORTVERSION}%20Core%20Plus
DISTNAME= ${PORTNAME}-${PORTVERSION}-base
MAINTAINER= gahr@FreeBSD.org
diff --git a/www/xoops/Makefile b/www/xoops/Makefile
index 24bad1087243..cf51d726cc96 100644
--- a/www/xoops/Makefile
+++ b/www/xoops/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xoops
PORTVERSION= 2.3.3
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/XOOPS%20Core%20%28stable%20releases%29/XOOPS%20${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= A Dynamic Web CMS
diff --git a/www/xpi-imdbpreview/Makefile b/www/xpi-imdbpreview/Makefile
index dd667f0bbf6e..0eed03285f89 100644
--- a/www/xpi-imdbpreview/Makefile
+++ b/www/xpi-imdbpreview/Makefile
@@ -8,7 +8,7 @@
PORTNAME= imdbpreview
DISTVERSION= 0.4.4
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/IMDb%20Preview/IMDb%20Preview%20${PORTVERSION}
DISTNAME= IMDb_Preview_${DISTVERSION}
MAINTAINER= miwi@FreeBSD.org
diff --git a/www/yanopaste/Makefile b/www/yanopaste/Makefile
index c01785f545f9..aaeeff53891b 100644
--- a/www/yanopaste/Makefile
+++ b/www/yanopaste/Makefile
@@ -8,7 +8,7 @@
PORTNAME= yanopaste
PORTVERSION= 1.2.0
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Yet Another Nopaste
diff --git a/www/yii/Makefile b/www/yii/Makefile
index 0b900c09da42..73dad7e77e85 100644
--- a/www/yii/Makefile
+++ b/www/yii/Makefile
@@ -9,7 +9,8 @@ PORTNAME= yii
PORTVERSION= 1.0.7.r1212
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- SF
+ SF/${PORTNAME}/${PORTNAME}/1.0.7
+
MAINTAINER= yzlin@FreeBSD.org
COMMENT= A high-performance component-based PHP framework
diff --git a/www/ziproxy/Makefile b/www/ziproxy/Makefile
index afe668e0056e..75f182b9ffd1 100644
--- a/www/ziproxy/Makefile
+++ b/www/ziproxy/Makefile
@@ -8,7 +8,7 @@ PORTNAME= ziproxy
PORTVERSION= 2.7.0
PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= pankov_p@mail.ru
COMMENT= A forwarding, non-caching, compressing proxy server
diff --git a/www/zope-archetypes/Makefile b/www/zope-archetypes/Makefile
index 99ec3d6dbc29..6d1079bb8021 100644
--- a/www/zope-archetypes/Makefile
+++ b/www/zope-archetypes/Makefile
@@ -9,8 +9,7 @@ PORTNAME= archetypes
PORTVERSION= 1.3.4
PORTREVISION= 2
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= archetypes
+MASTER_SITES= SF/${PORTNAME}/Archetypes/${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= Archetypes-${PORTVERSION}-final
DIST_SUBDIR= zope
diff --git a/www/zope-cmfformcontroller/Makefile b/www/zope-cmfformcontroller/Makefile
index 35d29090b386..b95fbb218bec 100644
--- a/www/zope-cmfformcontroller/Makefile
+++ b/www/zope-cmfformcontroller/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cmfformcontroller
PORTVERSION= 1.0.2
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/CMFFormController/${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= CMFFormController-${PORTVERSION}
EXTRACT_SUFX=.tgz
diff --git a/www/zope-cmfforum/Makefile b/www/zope-cmfforum/Makefile
index 9d07f82e80ab..4a244ba64807 100644
--- a/www/zope-cmfforum/Makefile
+++ b/www/zope-cmfforum/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cmfforum
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/CMFForum/${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= CMFForum-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/www/zope-cmfphoto/Makefile b/www/zope-cmfphoto/Makefile
index ad9aded6f7c0..1188a047d5ca 100644
--- a/www/zope-cmfphoto/Makefile
+++ b/www/zope-cmfphoto/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cmfphoto
PORTVERSION= 0.5.0
PORTREVISION= 1
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/CMFPhoto/CMFPhoto-${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= CMFPhoto-${PORTVERSION}
diff --git a/www/zope-cmfphotoalbum/Makefile b/www/zope-cmfphotoalbum/Makefile
index 4732cb14c2bc..65fb27a366c5 100644
--- a/www/zope-cmfphotoalbum/Makefile
+++ b/www/zope-cmfphotoalbum/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cmfphotoalbum
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/CMFPhotoAlbum/CMFPhotoAlbum-${PORTVERSION}.0
PKGNAMEPREFIX= zope-
DISTNAME= CMFPhotoAlbum-${PORTVERSION}.0
diff --git a/www/zope-cmfquickinstaller/Makefile b/www/zope-cmfquickinstaller/Makefile
index 48dc6de9db11..bf346ebaf627 100644
--- a/www/zope-cmfquickinstaller/Makefile
+++ b/www/zope-cmfquickinstaller/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cmfquickinstaller
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/QuickInstaller/${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= CMFQuickInstallerTool_${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/www/zope-exuserfolder/Makefile b/www/zope-exuserfolder/Makefile
index 383004b93335..ee46a18009c5 100644
--- a/www/zope-exuserfolder/Makefile
+++ b/www/zope-exuserfolder/Makefile
@@ -9,8 +9,7 @@ PORTNAME= exuserfolder
PORTVERSION= 0.20.0
PORTREVISION= 1
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= exuserfolder
+MASTER_SITES= SF
PKGNAMEPREFIX= zope-
DISTNAME= exUserFolder-0_20_0
EXTRACT_SUFX= .tgz
diff --git a/www/zope-generator/Makefile b/www/zope-generator/Makefile
index 45d606dd39ef..210c3ff4a8bd 100644
--- a/www/zope-generator/Makefile
+++ b/www/zope-generator/Makefile
@@ -8,8 +8,7 @@
PORTNAME= generator
PORTVERSION= 1.3.1
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= archetypes
+MASTER_SITES= SF/archetypes/Archetypes/1.3.4
PKGNAMEPREFIX= zope-
DISTNAME= ${PORTNAME}-${PORTVERSION}-final01
diff --git a/www/zope-groupuserfolder/Makefile b/www/zope-groupuserfolder/Makefile
index 26048280d755..bd21bced6258 100644
--- a/www/zope-groupuserfolder/Makefile
+++ b/www/zope-groupuserfolder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= groupuserfolder
PORTVERSION= 3.1.1
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/GroupUserFolder/${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= GroupUserFolder-${PORTVERSION}
diff --git a/www/zope-i18nlayer/Makefile b/www/zope-i18nlayer/Makefile
index db7d93b04765..416bae57ec12 100644
--- a/www/zope-i18nlayer/Makefile
+++ b/www/zope-i18nlayer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= i18nlayer
PORTVERSION= 0.6.0
PORTREVISION= 2
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/I18NLayer/${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= I18NLayer-${PORTVERSION}
diff --git a/www/zope-mimetypesregistry/Makefile b/www/zope-mimetypesregistry/Makefile
index 61a03f52d64a..ffcf0b72716f 100644
--- a/www/zope-mimetypesregistry/Makefile
+++ b/www/zope-mimetypesregistry/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mimetypesregistry
PORTVERSION= 1.3.6
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= archetypes
+MASTER_SITES= SF/archetypes/Archetypes/1.3.4
PKGNAMEPREFIX= zope-
DISTNAME= MimetypesRegistry-${PORTVERSION}-final01
diff --git a/www/zope-placelesstranslationservice/Makefile b/www/zope-placelesstranslationservice/Makefile
index b6fcee6a1af8..fa0f98f4bc14 100644
--- a/www/zope-placelesstranslationservice/Makefile
+++ b/www/zope-placelesstranslationservice/Makefile
@@ -8,8 +8,7 @@
PORTNAME= placelesstranslationservice
PORTVERSION= 1.0r8
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/PlacelessTranslationService/PTS-1.0rc8
PKGNAMEPREFIX= zope-
DISTNAME= PlacelessTranslationService-1.0-rc8
diff --git a/www/zope-plonelanguagetool/Makefile b/www/zope-plonelanguagetool/Makefile
index ebbdae22b37d..5cb15ff1a49e 100644
--- a/www/zope-plonelanguagetool/Makefile
+++ b/www/zope-plonelanguagetool/Makefile
@@ -9,8 +9,7 @@ PORTNAME= plonelanguagetool
PORTVERSION= 0.5
PORTREVISION= 2
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/PloneLanguageTool/${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= PloneLanguageTool-${PORTVERSION}
diff --git a/www/zope-portaltransforms/Makefile b/www/zope-portaltransforms/Makefile
index 47907fb593c5..8eea2a06cdfb 100644
--- a/www/zope-portaltransforms/Makefile
+++ b/www/zope-portaltransforms/Makefile
@@ -9,8 +9,7 @@ PORTNAME= portaltransforms
PORTVERSION= 1.3.7
PORTREVISION= 2
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= archetypes
+MASTER_SITES= SF/archetypes/Archetypes/1.3.4
PKGNAMEPREFIX= zope-
DISTNAME= PortalTransforms-${PORTVERSION}-final01
diff --git a/www/zope-simpleblog/Makefile b/www/zope-simpleblog/Makefile
index f127a5e115b7..c0b94f8387ab 100644
--- a/www/zope-simpleblog/Makefile
+++ b/www/zope-simpleblog/Makefile
@@ -9,8 +9,7 @@ PORTNAME= simpleblog
PORTVERSION= 1.2.1
PORTREVISION= 3
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/SimpleBlog/v${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= SimpleBlog${PORTVERSION}
DIST_SUBDIR= zope
diff --git a/www/zope-ttwtype/Makefile b/www/zope-ttwtype/Makefile
index 6f245b5a27d3..81782fedeee7 100644
--- a/www/zope-ttwtype/Makefile
+++ b/www/zope-ttwtype/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ttwtype
PORTVERSION= 1.0.r2
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= collective
+MASTER_SITES= SF/collective/TTWType/TTWType-1.0rc2
PKGNAMEPREFIX= zope-
DISTNAME= TTWType-1.0rc2
diff --git a/www/zope-validation/Makefile b/www/zope-validation/Makefile
index ac6484a3d9fa..9b17d9dcf6c9 100644
--- a/www/zope-validation/Makefile
+++ b/www/zope-validation/Makefile
@@ -8,8 +8,7 @@
PORTNAME= validation
PORTVERSION= 1.3.3
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= archetypes
+MASTER_SITES= SF/archetypes/Archetypes/1.3.4
PKGNAMEPREFIX= zope-
DISTNAME= ${PORTNAME}-${PORTVERSION}-final05
diff --git a/www/zope-xmlmethods/Makefile b/www/zope-xmlmethods/Makefile
index 8f8ae2f658ea..4325071646b8 100644
--- a/www/zope-xmlmethods/Makefile
+++ b/www/zope-xmlmethods/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xmlmethods
PORTVERSION= 1.0.0
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= zopexmlmethods
+MASTER_SITES= SF/zope${PORTNAME}/zope${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= zopexmlmethods-${PORTVERSION:C/\./-/g}
diff --git a/www/zope-zmysqlda/Makefile b/www/zope-zmysqlda/Makefile
index 05aa5ae9a4db..1522bec2748b 100644
--- a/www/zope-zmysqlda/Makefile
+++ b/www/zope-zmysqlda/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 2.0.8
PORTREVISION= 1
CATEGORIES= www databases zope
MASTER_SITES= http://www.zope.org/Members/adustman/Products/ZMySQLDA/${PORTVERSION}/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mysql-python
+ SF/mysql-python/${PORTNAME}/${PORTVERSION}
+
PKGNAMEPREFIX= zope-
DISTNAME= ${ZOPEPRODUCTNAME}-${PORTVERSION}
diff --git a/www/zope-zsyncer/Makefile b/www/zope-zsyncer/Makefile
index 70c5362b365c..acff24d010d2 100644
--- a/www/zope-zsyncer/Makefile
+++ b/www/zope-zsyncer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= zsyncer
PORTVERSION= 0.7.0
PORTREVISION= 1
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= zsyncer
+MASTER_SITES= SF/${PORTNAME}/ZSyncer/ZSyncer-${PORTVERSION}
PKGNAMEPREFIX= zope-
DISTNAME= ZSyncer-${PORTVERSION}
EXTRACT_SUFX= .tgz