aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-im/ari-yahoo/Makefile3
-rw-r--r--net-im/emesene/Makefile2
-rw-r--r--net-im/eva/Makefile3
-rw-r--r--net-im/gtkyahoo/Makefile3
-rw-r--r--net-im/ickle/Makefile3
-rw-r--r--net-im/icmpchat/Makefile3
-rw-r--r--net-im/icqlib/Makefile3
-rw-r--r--net-im/jabber.el/Makefile3
-rw-r--r--net-im/jwchat/Makefile2
-rw-r--r--net-im/kmerlin/Makefile3
-rw-r--r--net-im/kmess-kde4/Makefile3
-rw-r--r--net-im/kmess/Makefile3
-rw-r--r--net-im/libicq2000/Makefile3
-rw-r--r--net-im/libjingle/Makefile3
-rw-r--r--net-im/libmsn/Makefile2
-rw-r--r--net-im/libpurple/Makefile3
-rw-r--r--net-im/libyahoo2/Makefile3
-rw-r--r--net-im/licq/Makefile.inc3
-rw-r--r--net-im/meanwhile/Makefile3
-rw-r--r--net-im/msn-proxy/Makefile2
-rw-r--r--net-im/pebrot/Makefile3
-rw-r--r--net-im/pidgin-birthday-reminder/Makefile2
-rw-r--r--net-im/pidgin-birthday_reminder/Makefile2
-rw-r--r--net-im/pidgin-latex/Makefile3
-rw-r--r--net-im/pidgin-libnotify/Makefile3
-rw-r--r--net-im/pork/Makefile3
-rw-r--r--net-im/py-jabber/Makefile3
-rw-r--r--net-im/py-msnp/Makefile3
-rw-r--r--net-im/py-xmpppy-irc/Makefile3
-rw-r--r--net-im/tapioca-qt/Makefile3
-rw-r--r--net-im/telepathy-mission-control/Makefile2
-rw-r--r--net-im/telepathy-qt/Makefile3
-rw-r--r--net-im/tmsnc/Makefile3
-rw-r--r--net-im/trix/Makefile2
-rw-r--r--net-im/ysm/Makefile3
-rw-r--r--net-mgmt/angst/Makefile4
-rw-r--r--net-mgmt/ap-utils/Makefile2
-rw-r--r--net-mgmt/bandwidthd/Makefile3
-rw-r--r--net-mgmt/bigsister/Makefile3
-rw-r--r--net-mgmt/bpft/Makefile4
-rw-r--r--net-mgmt/cdpr/Makefile3
-rw-r--r--net-mgmt/choparp/Makefile3
-rw-r--r--net-mgmt/confregdecode/Makefile3
-rw-r--r--net-mgmt/cricket/Makefile3
-rw-r--r--net-mgmt/docsis/Makefile2
-rw-r--r--net-mgmt/ehnt/Makefile3
-rw-r--r--net-mgmt/etherape/Makefile3
-rw-r--r--net-mgmt/ezradius/Makefile2
-rw-r--r--net-mgmt/fprobe/Makefile3
-rw-r--r--net-mgmt/fruity/Makefile3
-rw-r--r--net-mgmt/icmpmonitor/Makefile3
-rw-r--r--net-mgmt/ifgraph/Makefile3
-rw-r--r--net-mgmt/ipacco/Makefile3
-rw-r--r--net-mgmt/ipcad/Makefile5
-rw-r--r--net-mgmt/ipplan/Makefile2
-rw-r--r--net-mgmt/isic/Makefile3
-rw-r--r--net-mgmt/jffnms/Makefile3
-rw-r--r--net-mgmt/mtrace/Makefile3
-rw-r--r--net-mgmt/nagios-check_bacula/Makefile2
-rw-r--r--net-mgmt/nagios-devel/Makefile2
-rw-r--r--net-mgmt/nagios/Makefile2
-rw-r--r--net-mgmt/nagios2/Makefile2
-rw-r--r--net-mgmt/nagiostat/Makefile3
-rw-r--r--net-mgmt/ndoutils/Makefile3
-rw-r--r--net-mgmt/ndpmon/Makefile3
-rw-r--r--net-mgmt/nedi/Makefile3
-rw-r--r--net-mgmt/net-snmp-devel/Makefile3
-rw-r--r--net-mgmt/net-snmp-tkmib/Makefile3
-rw-r--r--net-mgmt/net-snmp/Makefile3
-rw-r--r--net-mgmt/net-snmp4/Makefile3
-rw-r--r--net-mgmt/netams/Makefile3
-rw-r--r--net-mgmt/netdisco/Makefile3
-rw-r--r--net-mgmt/netleak/Makefile3
-rw-r--r--net-mgmt/nfdump-devel/Makefile3
-rw-r--r--net-mgmt/nfdump/Makefile3
-rw-r--r--net-mgmt/nfsen/Makefile4
-rw-r--r--net-mgmt/nipper/Makefile2
-rw-r--r--net-mgmt/nrpe2/Makefile3
-rw-r--r--net-mgmt/nsca-client/Makefile1
-rw-r--r--net-mgmt/nsca/Makefile3
-rw-r--r--net-mgmt/ocsinventory-agent/Makefile3
-rw-r--r--net-mgmt/ocsinventory-ng/Makefile3
-rw-r--r--net-mgmt/openlldp/Makefile2
-rw-r--r--net-mgmt/openvmps/Makefile3
-rw-r--r--net-mgmt/ourmon/Makefile2
-rw-r--r--net-mgmt/p5-SNMP-Info/Makefile1
-rw-r--r--net-mgmt/p5-SNMP/Makefile3
-rw-r--r--net-mgmt/pads/Makefile2
-rw-r--r--net-mgmt/phpip/Makefile3
-rw-r--r--net-mgmt/pixilate/Makefile3
-rw-r--r--net-mgmt/pnp/Makefile2
-rw-r--r--net-mgmt/py-snmp/Makefile3
-rw-r--r--net-mgmt/py-snmp2/Makefile3
-rw-r--r--net-mgmt/py-snmp4-apps/Makefile2
-rw-r--r--net-mgmt/py-snmp4-mibs/Makefile2
-rw-r--r--net-mgmt/py-snmp4/Makefile2
-rw-r--r--net-mgmt/py-twistedSNMP/Makefile3
-rw-r--r--net-mgmt/py-yapsnmp/Makefile3
-rw-r--r--net-mgmt/sblim-wbemcli/Makefile2
-rw-r--r--net-mgmt/scdp/Makefile3
-rw-r--r--net-mgmt/sdig/Makefile3
-rw-r--r--net-mgmt/sing/Makefile3
-rw-r--r--net-mgmt/snmptt/Makefile2
-rw-r--r--net-mgmt/tcpreplay/Makefile3
-rw-r--r--net-mgmt/tork/Makefile2
-rw-r--r--net-mgmt/weplab/Makefile2
-rw-r--r--net-mgmt/xymon-client/Makefile3
-rw-r--r--net-mgmt/xymon-server/Makefile3
-rw-r--r--net-mgmt/zabbix-agent/Makefile2
-rw-r--r--net-mgmt/zabbix/Makefile2
-rw-r--r--net-mgmt/zabbix2-agent/Makefile2
-rw-r--r--net-mgmt/zabbix2/Makefile2
-rw-r--r--net-p2p/amule-devel/Makefile2
-rw-r--r--net-p2p/amule/Makefile2
-rw-r--r--net-p2p/amule2/Makefile2
-rw-r--r--net-p2p/apollon/Makefile2
-rw-r--r--net-p2p/azureus/Makefile2
-rw-r--r--net-p2p/azureus2/Makefile3
-rw-r--r--net-p2p/btqueue/Makefile3
-rw-r--r--net-p2p/ctcs/Makefile2
-rw-r--r--net-p2p/dclib/Makefile3
-rw-r--r--net-p2p/dctc-gui-qt/Makefile2
-rw-r--r--net-p2p/edonkey-gui-gtk/Makefile2
-rw-r--r--net-p2p/edonkey-tool-hash/Makefile3
-rw-r--r--net-p2p/fidelio/Makefile3
-rw-r--r--net-p2p/frost/Makefile3
-rw-r--r--net-p2p/gift-gnutella/Makefile3
-rw-r--r--net-p2p/gift-openft/Makefile3
-rw-r--r--net-p2p/gift/Makefile3
-rw-r--r--net-p2p/giftoxic/Makefile3
-rw-r--r--net-p2p/giftui/Makefile3
-rw-r--r--net-p2p/gnewtellium/Makefile3
-rw-r--r--net-p2p/gtorrentviewer/Makefile3
-rw-r--r--net-p2p/i2p/Makefile4
-rw-r--r--net-p2p/javadc/Makefile3
-rw-r--r--net-p2p/libbt/Makefile3
-rw-r--r--net-p2p/liberator/Makefile3
-rw-r--r--net-p2p/libtorrent-rasterbar-14/Makefile2
-rw-r--r--net-p2p/lopster/Makefile4
-rw-r--r--net-p2p/mldonkey-perlreactor/Makefile3
-rw-r--r--net-p2p/mute-net/Makefile3
-rw-r--r--net-p2p/mutella/Makefile3
-rw-r--r--net-p2p/napshare/Makefile2
-rw-r--r--net-p2p/nicotine-plus/Makefile3
-rw-r--r--net-p2p/opendchub/Makefile3
-rw-r--r--net-p2p/opennap/Makefile3
-rw-r--r--net-p2p/p5-pdonkey/Makefile8
-rw-r--r--net-p2p/phex/Makefile2
-rw-r--r--net-p2p/py-fngrab/Makefile3
-rw-r--r--net-p2p/py-kenosis/Makefile2
-rw-r--r--net-p2p/qbittorrent-22/Makefile2
-rw-r--r--net-p2p/qbittorrent/Makefile2
-rw-r--r--net-p2p/qtella/Makefile3
-rw-r--r--net-p2p/rblibtorrent-devel/Makefile2
-rw-r--r--net-p2p/rblibtorrent/Makefile2
-rw-r--r--net-p2p/sharktorrent/Makefile2
-rw-r--r--net-p2p/torrent_swapper/Makefile3
-rw-r--r--net-p2p/torrentvolve/Makefile2
-rw-r--r--net-p2p/tribler/Makefile2
-rw-r--r--net-p2p/tvrss/Makefile3
-rw-r--r--net-p2p/valknut/Makefile3
-rw-r--r--net-p2p/verlihub-plugins/Makefile.plugins3
-rw-r--r--net-p2p/verlihub/Makefile2
-rw-r--r--net-p2p/vhcp/Makefile2
-rw-r--r--net-p2p/vuze/Makefile3
-rw-r--r--net-p2p/xnap/Makefile3
-rw-r--r--net/arpdig/Makefile3
-rw-r--r--net/arprelease/Makefile3
-rw-r--r--net/asfrecorder/Makefile3
-rw-r--r--net/bittwist/Makefile2
-rw-r--r--net/ccxstream/Makefile3
-rw-r--r--net/clusterit/Makefile3
-rw-r--r--net/cryptcat/Makefile3
-rw-r--r--net/cyphesis/Makefile3
-rw-r--r--net/dhcp6/Makefile3
-rw-r--r--net/dictd/Makefile3
-rw-r--r--net/easysoap/Makefile2
-rw-r--r--net/empty/Makefile2
-rw-r--r--net/frickin/Makefile2
-rw-r--r--net/fspclient/Makefile3
-rw-r--r--net/fspd/Makefile3
-rw-r--r--net/fsplib/Makefile3
-rw-r--r--net/gatekeeper/Makefile3
-rw-r--r--net/geotrace/Makefile3
-rw-r--r--net/gini/Makefile3
-rw-r--r--net/glflow/Makefile3
-rw-r--r--net/gnetcat/Makefile3
-rw-r--r--net/gofish/Makefile3
-rw-r--r--net/gq/Makefile2
-rw-r--r--net/grdc-applet/Makefile2
-rw-r--r--net/gspoof/Makefile3
-rw-r--r--net/gutenfetch/Makefile3
-rw-r--r--net/hlmaster/Makefile3
-rw-r--r--net/iaxmodem/Makefile3
-rw-r--r--net/igmpproxy/Makefile3
-rw-r--r--net/ipex/Makefile3
-rw-r--r--net/iplog/Makefile3
-rw-r--r--net/jags/Makefile2
-rw-r--r--net/java-beepcore/Makefile3
-rw-r--r--net/jicmp/Makefile2
-rw-r--r--net/jrdesktop/Makefile2
-rw-r--r--net/kiax/Makefile3
-rw-r--r--net/kojoney/Makefile3
-rw-r--r--net/l2tpd/Makefile3
-rw-r--r--net/lambdamoo/Makefile3
-rw-r--r--net/latd/Makefile3
-rw-r--r--net/ldapscripts/Makefile4
-rw-r--r--net/libdnet/Makefile2
-rw-r--r--net/libnetdude/Makefile3
-rw-r--r--net/libnids/Makefile3
-rw-r--r--net/libnss-mysql/Makefile3
-rw-r--r--net/libpcapnav/Makefile3
-rw-r--r--net/librsync/Makefile3
-rw-r--r--net/libsocketcpp/Makefile3
-rw-r--r--net/liferea/Makefile3
-rw-r--r--net/linknx/Makefile2
-rw-r--r--net/linuxigd/Makefile3
-rw-r--r--net/lla/Makefile3
-rw-r--r--net/lyntin/Makefile3
-rw-r--r--net/mcast-tools/Makefile3
-rw-r--r--net/mediatomb/Makefile3
-rw-r--r--net/mknbi/Makefile3
-rw-r--r--net/mmucl/Makefile3
-rw-r--r--net/mpd4/Makefile3
-rw-r--r--net/mpd5/Makefile3
-rw-r--r--net/nbd-server/Makefile3
-rw-r--r--net/nemesis/Makefile3
-rw-r--r--net/nepenthes/Makefile2
-rw-r--r--net/netatalk/Makefile3
-rw-r--r--net/netclasses/Makefile3
-rw-r--r--net/netdude/Makefile3
-rw-r--r--net/netmap/Makefile3
-rw-r--r--net/netscript/Makefile4
-rw-r--r--net/netstrain/Makefile3
-rw-r--r--net/ng_car/Makefile3
-rw-r--r--net/ngrep/Makefile3
-rw-r--r--net/ns/Makefile3
-rw-r--r--net/ns2/Makefile3
-rw-r--r--net/ntlmaps/Makefile3
-rw-r--r--net/ntop/Makefile3
-rw-r--r--net/omnitty/Makefile3
-rw-r--r--net/openmcu/Makefile3
-rw-r--r--net/openslp/Makefile3
-rw-r--r--net/p5-Net-Gnats/Makefile3
-rw-r--r--net/p5-Net-HL7/Makefile2
-rw-r--r--net/panoptis/Makefile1
-rw-r--r--net/pdb/Makefile3
-rw-r--r--net/penguintv/Makefile3
-rw-r--r--net/phpldapadmin/Makefile2
-rw-r--r--net/phpldapadmin098/Makefile3
-rw-r--r--net/plugdaemon/Makefile3
-rw-r--r--net/poptop/Makefile3
-rw-r--r--net/portfwd/Makefile3
-rw-r--r--net/pppoa/Makefile3
-rw-r--r--net/pptpclient/Makefile2
-rw-r--r--net/prosearch/Makefile3
-rw-r--r--net/proxychains/Makefile3
-rw-r--r--net/ptpd/Makefile1
-rw-r--r--net/pvm++/Makefile3
-rw-r--r--net/py-google/Makefile3
-rw-r--r--net/py-libnet/Makefile3
-rw-r--r--net/py-pcap/Makefile4
-rw-r--r--net/py-pcs/Makefile3
-rw-r--r--net/py-s3cmd/Makefile3
-rw-r--r--net/py-soappy-devel/Makefile3
-rw-r--r--net/py-soappy/Makefile3
-rw-r--r--net/py-soapy/Makefile3
-rw-r--r--net/py-xmlrpc/Makefile3
-rw-r--r--net/py-zsi/Makefile3
-rw-r--r--net/pypvm/Makefile3
-rw-r--r--net/pythondirector/Makefile3
-rw-r--r--net/raddump/Makefile3
-rw-r--r--net/rdesktop/Makefile3
-rw-r--r--net/remmina-applet/Makefile2
-rw-r--r--net/rexx-sock/Makefile3
-rw-r--r--net/ripe-whois/Makefile3
-rw-r--r--net/rtg/Makefile3
-rw-r--r--net/ruby-ldap/Makefile3
-rw-r--r--net/ruby-mpi/Makefile3
-rw-r--r--net/ruby-nis/Makefile3
-rw-r--r--net/rude/Makefile3
-rw-r--r--net/scr_ipfm/Makefile3
-rw-r--r--net/seda/Makefile3
-rw-r--r--net/skstream/Makefile3
-rw-r--r--net/slbd/Makefile3
-rw-r--r--net/slirp/Makefile3
-rw-r--r--net/smm++/Makefile3
-rw-r--r--net/sntop/Makefile3
-rw-r--r--net/ss5/Makefile3
-rw-r--r--net/stund/Makefile3
-rw-r--r--net/tapidbus/Makefile3
-rw-r--r--net/tcludp/Makefile3
-rw-r--r--net/tcpick/Makefile3
-rw-r--r--net/tcpsg/Makefile3
-rw-r--r--net/tcpxtract/Makefile3
-rw-r--r--net/tightvnc/Makefile3
-rw-r--r--net/tinyfugue/Makefile3
-rw-r--r--net/tptest/Makefile3
-rw-r--r--net/tsocks/Makefile5
-rw-r--r--net/uriparser/Makefile2
-rw-r--r--net/vde/Makefile3
-rw-r--r--net/vde2/Makefile3
-rw-r--r--net/vncreflector/Makefile3
-rw-r--r--net/wizd/Makefile2
-rw-r--r--net/wmlj/Makefile3
-rw-r--r--net/wmping/Makefile3
-rw-r--r--net/wmwave/Makefile3
-rw-r--r--net/wol/Makefile3
-rw-r--r--net/x11vnc/Makefile3
-rw-r--r--net/xmlrpc++/Makefile3
-rw-r--r--net/xmlrpc-c/Makefile2
-rw-r--r--net/xmlrpc-epi/Makefile2
-rw-r--r--net/xprobe/Makefile3
-rw-r--r--net/yaph/Makefile3
-rw-r--r--net/zillion/Makefile3
-rw-r--r--news/PicMonger/Makefile3
-rw-r--r--news/fidogate-ds/Makefile3
-rw-r--r--news/golded+/Makefile3
-rw-r--r--news/grn/Makefile3
-rw-r--r--news/husky-base-devel/Makefile4
-rw-r--r--news/husky-base-devel/Makefile.inc2
-rw-r--r--news/husky-base/Makefile1
-rw-r--r--news/husky-base/Makefile.inc2
-rw-r--r--news/husky-bsopack/Makefile1
-rw-r--r--news/husky-fidoconf-devel/Makefile1
-rw-r--r--news/husky-fidoconf/Makefile1
-rw-r--r--news/husky-hpt-devel/Makefile1
-rw-r--r--news/husky-hpt/Makefile1
-rw-r--r--news/husky-hptkill/Makefile1
-rw-r--r--news/husky-hptsqfix/Makefile1
-rw-r--r--news/husky-hpucode/Makefile1
-rw-r--r--news/husky-htick-devel/Makefile2
-rw-r--r--news/husky-htick/Makefile1
-rw-r--r--news/husky-msged/Makefile1
-rw-r--r--news/husky-nltools/Makefile1
-rw-r--r--news/husky-smapi-devel/Makefile1
-rw-r--r--news/husky-smapi/Makefile1
-rw-r--r--news/husky-sqpack/Makefile1
-rw-r--r--news/klibido/Makefile3
-rw-r--r--news/mmail/Makefile4
-rw-r--r--news/multisuck/Makefile3
-rw-r--r--news/newsgrab/Makefile3
-rw-r--r--news/newsstar/Makefile3
-rw-r--r--news/nget/Makefile3
-rw-r--r--news/noffle/Makefile3
-rw-r--r--news/nzbget/Makefile2
-rw-r--r--news/sabnzbdplus/Makefile2
-rw-r--r--news/slrn/Makefile7
-rw-r--r--news/trn4/Makefile3
-rw-r--r--news/yencode/Makefile3
-rw-r--r--news/yydecode/Makefile3
351 files changed, 367 insertions, 593 deletions
diff --git a/net-im/ari-yahoo/Makefile b/net-im/ari-yahoo/Makefile
index c66ca24bfd59..bd1c95a76f34 100644
--- a/net-im/ari-yahoo/Makefile
+++ b/net-im/ari-yahoo/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ari-yahoo
PORTVERSION= 1.10
PORTREVISION= 2
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A console Yahoo! messenger client
diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index f1f90cb1454d..08eca40ada53 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -9,7 +9,7 @@ PORTNAME= emesene
PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= net-im python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= A MSN Messenger client writen in python
diff --git a/net-im/eva/Makefile b/net-im/eva/Makefile
index 3b5d8d03a01f..bd733a49e8bf 100644
--- a/net-im/eva/Makefile
+++ b/net-im/eva/Makefile
@@ -9,8 +9,7 @@ PORTNAME= eva
PORTVERSION= 0.4.1
PORTREVISION= 6
CATEGORIES= net-im kde
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= evaq
+MASTER_SITES= SF/${PORTNAME}q/${PORTNAME}-0.4/Eva%20${PORTVERSION}
PATCH_SITES= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
PATCHFILES= eva-0.4.1_20070504.patch.gz
diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index de7fa8631f81..a34dbf0042f4 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtkyahoo
PORTVERSION= 0.18.3
PORTREVISION= 4
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gtkyahoo
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Yahoo Messenger Client using GTK
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index a6aaa02ec227..833193f56a73 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -10,8 +10,7 @@ PORTNAME= ickle
PORTVERSION= 0.3.2
PORTREVISION= 6
CATEGORIES= net-im devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= ICQ2000 protocol implementation
diff --git a/net-im/icmpchat/Makefile b/net-im/icmpchat/Makefile
index d21df3d4ee3b..398d409baba3 100644
--- a/net-im/icmpchat/Makefile
+++ b/net-im/icmpchat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= icmpchat
PORTVERSION= 0.6
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= icmpchat
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple console-based chat that uses ICMP protocol
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 9684e799eb9c..051f7764f44b 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= icqlib
PORTVERSION= 1.0.0
PORTREVISION= 2
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A library required by kicq (not libicq)
diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile
index a2c9b03b6aa1..0fb889f017c5 100644
--- a/net-im/jabber.el/Makefile
+++ b/net-im/jabber.el/Makefile
@@ -7,8 +7,7 @@
PORTNAME= jabber.el
PORTVERSION= 0.7.1
CATEGORIES= net-im elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= emacs-jabber
+MASTER_SITES= SF/emacs-jabber/emacs-jabber/${PORTVERSION}
DISTNAME= emacs-jabber-${PORTVERSION}
MAINTAINER= m.boyarov@bsd.by
diff --git a/net-im/jwchat/Makefile b/net-im/jwchat/Makefile
index 97be916cbdd9..6a6aace36b71 100644
--- a/net-im/jwchat/Makefile
+++ b/net-im/jwchat/Makefile
@@ -9,7 +9,7 @@ PORTNAME= jwchat
PORTVERSION= 1.0.b2
PORTREVISION= 1
CATEGORIES= net-im www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0beta2
DISTNAME= ${PORTNAME}-${PORTVERSION:S,.b,beta,}
MAINTAINER= pgollucci@FreeBSD.org
diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index 5a5e33684ce3..2ad0539051d7 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kmerlin
PORTVERSION= 1.4.2
PORTREVISION= 6
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 72b194c5d52b..eeb3b8eb0987 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kmess
PORTVERSION= 1.5.p.1
PORTREVISION= 3
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Older%20versions/1.5pre1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/}
MAINTAINER= freebsd-ports@club-internet.fr
diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile
index 72b194c5d52b..eeb3b8eb0987 100644
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kmess
PORTVERSION= 1.5.p.1
PORTREVISION= 3
CATEGORIES= net-im kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Older%20versions/1.5pre1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/}
MAINTAINER= freebsd-ports@club-internet.fr
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index a874d802e0f7..30a48cb8cf2f 100644
--- a/net-im/libicq2000/Makefile
+++ b/net-im/libicq2000/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libicq2000
PORTVERSION= 0.3.2
PORTREVISION= 2
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An opensource C++ library to support icq2000/2001 protocol
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index a87295d3b288..0979643c157b 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libjingle
PORTVERSION= 0.4.0
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= lioux@FreeBSD.org
COMMENT= Google Talk's implementation of Jingle and Jingle-Audio
diff --git a/net-im/libmsn/Makefile b/net-im/libmsn/Makefile
index 312dd24dc7b7..ecd4bd23f0e8 100644
--- a/net-im/libmsn/Makefile
+++ b/net-im/libmsn/Makefile
@@ -9,7 +9,7 @@
PORTNAME= libmsn
DISTVERSION= 4.0-beta6
CATEGORIES= net-im
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/4.0%20beta%206
MAINTAINER= decept0@gmail.com
COMMENT= A library for connecting to MSN Messenger service
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index d797197be4eb..015d0859d84f 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -10,8 +10,7 @@ PORTNAME?= libpurple
PORTVERSION= 2.6.1
PORTREVISION?= 1
CATEGORIES?= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_PROJECT}
-MASTER_SITE_SUBDIR= pidgin/Pidgin/${PORTVERSION}
+MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}
DISTNAME= pidgin-${PORTVERSION}
MAINTAINER?= marcus@FreeBSD.org
diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile
index 6ddb077c23f9..6ea41f8db0cd 100644
--- a/net-im/libyahoo2/Makefile
+++ b/net-im/libyahoo2/Makefile
@@ -9,8 +9,7 @@
PORTNAME= libyahoo2
PORTVERSION= 0.7.7
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= chinsan@FreeBSD.org
COMMENT= A C library that handles the new Yahoo! Messenger protocol
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index 7d4dff4124b7..e603991de4f8 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -10,8 +10,7 @@ CONSOLE_LICQ_VER= 1.3.6
.if ${PORTNAME} != "base"
RUN_DEPENDS+= licq:${PORTSDIR}/${LICQ_PORT}
.endif
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= licq
+MASTER_SITES= SF/licq/licq/${LICQ_VER}
DISTNAME= ${PKGNAMEPREFIX}${LICQ_VER}
DISTFILES= ${DISTNAME}.tar.bz2
GNU_CONFIGURE= yes
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index 4f6ab1b8adf4..8e0fead5ce03 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -9,8 +9,7 @@ PORTNAME= meanwhile
PORTVERSION= 1.0.2
PORTREVISION= 2
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= marcus@FreeBSD.org
COMMENT= Open Source implementation of the Lotus Sametime protocol
diff --git a/net-im/msn-proxy/Makefile b/net-im/msn-proxy/Makefile
index fc511225b6b8..69a520468676 100644
--- a/net-im/msn-proxy/Makefile
+++ b/net-im/msn-proxy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= msn-proxy
PORTVERSION= 0.7
CATEGORIES= net-im
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= loos.br@gmail.com
COMMENT= Messenger proxy/control daemon
diff --git a/net-im/pebrot/Makefile b/net-im/pebrot/Makefile
index b0722daabe70..73d5b804ec6f 100644
--- a/net-im/pebrot/Makefile
+++ b/net-im/pebrot/Makefile
@@ -7,8 +7,7 @@
PORTNAME= pebrot
PORTVERSION= 0.8.9
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= kevlo@FreeBSD.org
COMMENT= Text-based MSN messenger client
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index 54b037d00550..2ec36fbf82e2 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -9,7 +9,7 @@ PORTNAME= birthday_reminder
PORTVERSION= 1.2
PORTREVISION= 2
CATEGORIES= net-im
-MASTER_SITES= SF/pidgin-birthday
+MASTER_SITES= SF/pidgin-birthday/pidgin-birthday/${PORTVERSION}
PKGNAMEPREFIX= pidgin-
MAINTAINER= avl@FreeBSD.org
diff --git a/net-im/pidgin-birthday_reminder/Makefile b/net-im/pidgin-birthday_reminder/Makefile
index 54b037d00550..2ec36fbf82e2 100644
--- a/net-im/pidgin-birthday_reminder/Makefile
+++ b/net-im/pidgin-birthday_reminder/Makefile
@@ -9,7 +9,7 @@ PORTNAME= birthday_reminder
PORTVERSION= 1.2
PORTREVISION= 2
CATEGORIES= net-im
-MASTER_SITES= SF/pidgin-birthday
+MASTER_SITES= SF/pidgin-birthday/pidgin-birthday/${PORTVERSION}
PKGNAMEPREFIX= pidgin-
MAINTAINER= avl@FreeBSD.org
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index 9ad6338f2738..081e0e8486d1 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -9,8 +9,7 @@ PORTNAME= latex
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
+MASTER_SITES= SF/pidgin-${PORTNAME}/pidgin-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= pidgin-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index 55e68ea5da67..025e8b7d999f 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libnotify
PORTVERSION= 0.14
PORTREVISION= 2
CATEGORIES= net-im
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gaim-libnotify
+MASTER_SITES= SF/gaim-${PORTNAME}/pidgin-${PORTNAME}/pidgin-${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= pidgin-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/net-im/pork/Makefile b/net-im/pork/Makefile
index f02069941113..0a6c9da12c1e 100644
--- a/net-im/pork/Makefile
+++ b/net-im/pork/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pork
PORTVERSION= 0.99.8.1
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ojnk
+MASTER_SITES= SF/ojnk/${PORTNAME}/${PORTVERSION}
MAINTAINER= wxs@FreeBSD.org
COMMENT= Console-based AIM client
diff --git a/net-im/py-jabber/Makefile b/net-im/py-jabber/Makefile
index ecd9b79fab97..f2704c416829 100644
--- a/net-im/py-jabber/Makefile
+++ b/net-im/py-jabber/Makefile
@@ -9,8 +9,7 @@
PORTNAME= jabber
PORTVERSION= 0.5
CATEGORIES= net-im python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jabberpy
+MASTER_SITES= SF/${PORTNAME}py/${PORTNAME}py%20libs/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= jabberpy-${PORTVERSION}-0
diff --git a/net-im/py-msnp/Makefile b/net-im/py-msnp/Makefile
index d98a051924a1..0d26b53576bc 100644
--- a/net-im/py-msnp/Makefile
+++ b/net-im/py-msnp/Makefile
@@ -9,8 +9,7 @@
PORTNAME= msnp
PORTVERSION= 0.4.1
CATEGORIES= net-im python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}.py-${PORTVERSION}
diff --git a/net-im/py-xmpppy-irc/Makefile b/net-im/py-xmpppy-irc/Makefile
index 07a4cbedcf93..07d1ee7b8049 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xmpppy-irc
PORTVERSION= 0.3
CATEGORIES= net-im python irc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= xmpppy
+MASTER_SITES= SF/xmpppy/PyIRCt/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= irc-transport-${PORTVERSION}
diff --git a/net-im/tapioca-qt/Makefile b/net-im/tapioca-qt/Makefile
index 8f7c59e43525..d51d88081843 100644
--- a/net-im/tapioca-qt/Makefile
+++ b/net-im/tapioca-qt/Makefile
@@ -8,8 +8,7 @@ PORTNAME= tapioca-qt
PORTVERSION= 0.14.1
PORTREVISION= 4
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tapioca-voip
+MASTER_SITES= SF/tapioca-voip/${PORTNAME}/${PORTVERSION}
MAINTAINER= arved@FreeBSD.org
COMMENT= Framework for VoIP and IP applications
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 877c3e91c06b..9ca1076b4f3c 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -9,7 +9,7 @@ PORTNAME= telepathy-mission-control
PORTVERSION= 4.67
PORTREVISION= 1
CATEGORIES= net-im devel
-MASTER_SITES= SF/mission-control
+MASTER_SITES= SF/mission-control/mission-control/${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Telepathy component to apps to abstract details of connection managers
diff --git a/net-im/telepathy-qt/Makefile b/net-im/telepathy-qt/Makefile
index b923ac3a0b96..1202cc4b6f0a 100644
--- a/net-im/telepathy-qt/Makefile
+++ b/net-im/telepathy-qt/Makefile
@@ -8,8 +8,7 @@ PORTNAME= telepathy-qt
PORTVERSION= 0.14.1
PORTREVISION= 3
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tapioca-voip
+MASTER_SITES= SF/tapioca-voip/${PORTNAME}/${PORTVERSION}
MAINTAINER= arved@FreeBSD.org
COMMENT= Framework for VoIP and IP applications
diff --git a/net-im/tmsnc/Makefile b/net-im/tmsnc/Makefile
index dbfb547aef97..ac068ebc5f50 100644
--- a/net-im/tmsnc/Makefile
+++ b/net-im/tmsnc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tmsnc
PORTVERSION= 0.3.2
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Source%20code%20and%20binaries/${PORTVERSION}
MAINTAINER= snowfly@yuntech.edu.tw
COMMENT= A textbased (console) MSN client
diff --git a/net-im/trix/Makefile b/net-im/trix/Makefile
index b82bbf7cb27b..fc855536902a 100644
--- a/net-im/trix/Makefile
+++ b/net-im/trix/Makefile
@@ -9,7 +9,7 @@ PORTNAME= trix
PORTVERSION= 0.94
PORTREVISION= 3
CATEGORIES= net-im
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= pascalamsg@gmail.com
COMMENT= TriX is a chat compatible with 2.0 protocol of the Vypress Chat
diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile
index bb10e825494e..3f78995f8f93 100644
--- a/net-im/ysm/Makefile
+++ b/net-im/ysm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ysm
PORTVERSION= 7.2.9.9.1
PORTREVISION= 1
CATEGORIES= net-im
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ysmv7
+MASTER_SITES= SF/${PORTNAME}v7/${PORTNAME}v7/${PORTNAME}v7%202.9.9.1
DISTNAME= ${PORTNAME}v${PORTVERSION:S/./_/g}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-mgmt/angst/Makefile b/net-mgmt/angst/Makefile
index 110fc8a3a8a8..47931099a337 100644
--- a/net-mgmt/angst/Makefile
+++ b/net-mgmt/angst/Makefile
@@ -10,9 +10,9 @@ PORTNAME= angst
PORTVERSION= 0.4b
PORTREVISION= 2
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-0.4.tar.gz \
${MASTER_SITE_PACKETSTORM:S:%SUBDIR%:sniffers/angst:}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= An active sniffer
diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index 35c580404a92..0acf9b675516 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ap-utils
PORTVERSION= 1.4.1
PORTREVISION= 3
CATEGORIES= net-mgmt
-MASTER_SITES=` SF
+MASTER_SITES=` SF
MAINTAINER= david@catwhisker.org
COMMENT= A set of utilities to configure and monitor wireless access points
diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile
index 304e9b72df62..ccf3fc323f88 100644
--- a/net-mgmt/bandwidthd/Makefile
+++ b/net-mgmt/bandwidthd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bandwidthd
PORTVERSION= 2.0.1
PORTREVISION= 2
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/bigsister/Makefile b/net-mgmt/bigsister/Makefile
index 0a4f3676403e..218360f6b879 100644
--- a/net-mgmt/bigsister/Makefile
+++ b/net-mgmt/bigsister/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bigsister
PORTVERSION= 1.02
PORTREVISION= 3
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Big%20Sister/${PORTVERSION}
DISTNAME= big-sister-${PORTVERSION}
MAINTAINER= freebsd@troback.com
diff --git a/net-mgmt/bpft/Makefile b/net-mgmt/bpft/Makefile
index 80c47ed9f208..8e95ea2b265b 100644
--- a/net-mgmt/bpft/Makefile
+++ b/net-mgmt/bpft/Makefile
@@ -7,9 +7,9 @@
PORTNAME= bpft
PORTVERSION= 4.20040414
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}4/${PORTNAME}4/${PORTNAME}4-snapshot \
ftp://rusunix.org/pub/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR=bpft4
+
DISTNAME= bpft4-2004-04-14
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/cdpr/Makefile b/net-mgmt/cdpr/Makefile
index 1f60730a413c..d75a9728f128 100644
--- a/net-mgmt/cdpr/Makefile
+++ b/net-mgmt/cdpr/Makefile
@@ -9,8 +9,7 @@
PORTNAME= cdpr
PORTVERSION= 2.2.1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mich@FreeBSD.org
COMMENT= Cisco Discovery Protocol Reporter
diff --git a/net-mgmt/choparp/Makefile b/net-mgmt/choparp/Makefile
index c9b03efe7799..af6e8ef215d9 100644
--- a/net-mgmt/choparp/Makefile
+++ b/net-mgmt/choparp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= choparp
PORTVERSION= 20021107
PORTREVISION= 3
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= choparp
+MASTER_SITES= SF
MAINTAINER= nork@FreeBSD.org
COMMENT= Simple proxy arp daemon
diff --git a/net-mgmt/confregdecode/Makefile b/net-mgmt/confregdecode/Makefile
index 989cd05c9060..4352188f2b1f 100644
--- a/net-mgmt/confregdecode/Makefile
+++ b/net-mgmt/confregdecode/Makefile
@@ -9,8 +9,7 @@ PORTNAME= confregdecode
PORTVERSION= 1.2.1
PORTREVISION= 3
CATEGORIES= net-mgmt java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cosi-nms
+MASTER_SITES= SF/cosi-nms/${PORTNAME}/${PORTVERSION}
DISTNAME= confregdecode-src-${PORTVERSION}
MAINTAINER= marcus@FreeBSD.org
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index 83e23d8aca2a..7ec1b6df8b14 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cricket
PORTVERSION= 1.0.5
PORTREVISION= 5
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-mgmt/docsis/Makefile b/net-mgmt/docsis/Makefile
index 747ef8104153..fdc168330e9b 100644
--- a/net-mgmt/docsis/Makefile
+++ b/net-mgmt/docsis/Makefile
@@ -9,7 +9,7 @@ PORTNAME= docsis
PORTVERSION= 0.9.5
PORTREVISION= 3
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= jflemer@alum.rpi.edu
COMMENT= DOCSIS(tm) binary configuration file encoder/decoder
diff --git a/net-mgmt/ehnt/Makefile b/net-mgmt/ehnt/Makefile
index 37805a91db60..609fc8706cce 100644
--- a/net-mgmt/ehnt/Makefile
+++ b/net-mgmt/ehnt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ehnt
PORTVERSION= 0.3
PORTREVISION= 8
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= marck@FreeBSD.org
COMMENT= A simple Cisco NetFlow data collector
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index bd4c00292bef..0712793cf2ff 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -9,8 +9,7 @@ PORTNAME= etherape
PORTVERSION= 0.9.6
PORTREVISION= 5
CATEGORIES= net-mgmt gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A graphical network traffic visualization tool for gnome
diff --git a/net-mgmt/ezradius/Makefile b/net-mgmt/ezradius/Makefile
index 9fb6e9b062d5..d9a70de1c220 100644
--- a/net-mgmt/ezradius/Makefile
+++ b/net-mgmt/ezradius/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ezradius
PORTVERSION= 0.2.1.2
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.1stable
DISTNAME= ${PORTNAME}-${PORTVERSION}stable${EXTRACT_SUFFIX}
MAINTAINER= lucio@zetasolucoes.com.br
diff --git a/net-mgmt/fprobe/Makefile b/net-mgmt/fprobe/Makefile
index d004bd0e63e1..617a6fd571bb 100644
--- a/net-mgmt/fprobe/Makefile
+++ b/net-mgmt/fprobe/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fprobe
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool that collects network traffic data
diff --git a/net-mgmt/fruity/Makefile b/net-mgmt/fruity/Makefile
index 417034d22f92..fbfb06972b77 100644
--- a/net-mgmt/fruity/Makefile
+++ b/net-mgmt/fruity/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fruity
DISTVERSION= 1.0-rc2
PORTREVISION= 3
CATEGORIES= net-mgmt www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fruity
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0-rc2
MAINTAINER= dan@langille.org
COMMENT= Fruity is a PHP based web-frontend to your Nagios configuration
diff --git a/net-mgmt/icmpmonitor/Makefile b/net-mgmt/icmpmonitor/Makefile
index 39d75cfb8a18..700623c63f21 100644
--- a/net-mgmt/icmpmonitor/Makefile
+++ b/net-mgmt/icmpmonitor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= icmpmonitor
PORTVERSION= 1.2
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= icmpmonitor
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A multiple host icmp monitoring tool
diff --git a/net-mgmt/ifgraph/Makefile b/net-mgmt/ifgraph/Makefile
index 2b16f9c123ea..14f4b3bf8a2f 100644
--- a/net-mgmt/ifgraph/Makefile
+++ b/net-mgmt/ifgraph/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ifgraph
PORTVERSION= 0.4.10
PORTREVISION= 2
CATEGORIES= net-mgmt www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
MAINTAINER= lth@FreeBSD.org
COMMENT= Simple grapher of SNMP data with RRD
diff --git a/net-mgmt/ipacco/Makefile b/net-mgmt/ipacco/Makefile
index ed97561292b8..e3a9fc2dbb1e 100644
--- a/net-mgmt/ipacco/Makefile
+++ b/net-mgmt/ipacco/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ipacco
PORTVERSION= 0.2.0.1
PORTREVISION= 5
CATEGORIES= net-mgmt www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ipacco
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Web based tool to analyze Cisco IP accounting data
diff --git a/net-mgmt/ipcad/Makefile b/net-mgmt/ipcad/Makefile
index 8e8f818a7923..727b63619d8c 100644
--- a/net-mgmt/ipcad/Makefile
+++ b/net-mgmt/ipcad/Makefile
@@ -9,10 +9,11 @@ PORTNAME= ipcad
PORTVERSION= 3.7.3
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://ipcad.sourceforge.net/ \
+
http://lionet.info/soft/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= vlm@lionet.info
COMMENT= IP accounting daemon with Cisco-like RSH and NetFlow export
diff --git a/net-mgmt/ipplan/Makefile b/net-mgmt/ipplan/Makefile
index eb6d199f9739..c1223f5823b2 100644
--- a/net-mgmt/ipplan/Makefile
+++ b/net-mgmt/ipplan/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ipplan
PORTVERSION= 4.92
CATEGORIES= net-mgmt
-MASTER_SITES= SF/iptrack
+MASTER_SITES= SF/iptrack/${PORTNAME}/Release%20${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= IP address management and tracking
diff --git a/net-mgmt/isic/Makefile b/net-mgmt/isic/Makefile
index 7fbf61733cc6..0679a18f4710 100644
--- a/net-mgmt/isic/Makefile
+++ b/net-mgmt/isic/Makefile
@@ -9,8 +9,7 @@ PORTNAME= isic
PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ISIC%20v${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= wxs@FreeBSD.org
diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile
index f6e8ef09ca3b..8ebf82c04afe 100644
--- a/net-mgmt/jffnms/Makefile
+++ b/net-mgmt/jffnms/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jffnms
PORTVERSION= 0.8.3
PORTREVISION= 4
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Very advanced network monitoring and control system
diff --git a/net-mgmt/mtrace/Makefile b/net-mgmt/mtrace/Makefile
index 82e627e1e190..92b2743c0eca 100644
--- a/net-mgmt/mtrace/Makefile
+++ b/net-mgmt/mtrace/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mtrace
PORTVERSION= 5.2
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= bms@FreeBSD.org
COMMENT= Multicast traceroute program for IPv4
diff --git a/net-mgmt/nagios-check_bacula/Makefile b/net-mgmt/nagios-check_bacula/Makefile
index 5a067d580b4e..601b6b1de416 100644
--- a/net-mgmt/nagios-check_bacula/Makefile
+++ b/net-mgmt/nagios-check_bacula/Makefile
@@ -9,7 +9,7 @@ PORTNAME= check_bacula
PORTVERSION= 3.0.0
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF/bacula
+MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
PKGNAMEPREFIX= nagios-
DISTNAME= bacula-${PORTVERSION}
diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile
index 9e6bde75ea71..17290b014676 100644
--- a/net-mgmt/nagios-devel/Makefile
+++ b/net-mgmt/nagios-devel/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nagios
PORTVERSION= 3.1.2
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= -devel
MAINTAINER= jarrod@netleader.com.au
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index a1f06866bb41..b316a61225bc 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nagios
PORTVERSION= 3.0.6
PORTREVISION= 3
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
MAINTAINER= jarrod@netleader.com.au
COMMENT= Extremely powerful network monitoring system
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 06c9abeff5ea..46bdf7335d9c 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nagios
PORTVERSION= 2.12
PORTREVISION= 5
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
MAINTAINER= jarrod@netleader.com.au
COMMENT= Extremely powerful network monitoring system
diff --git a/net-mgmt/nagiostat/Makefile b/net-mgmt/nagiostat/Makefile
index 0b184a78738d..9770a7b7a292 100644
--- a/net-mgmt/nagiostat/Makefile
+++ b/net-mgmt/nagiostat/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nagiostat
PORTVERSION= 1.0.0
PORTREVISION= 3
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0
EXTRACT_SUFX= .tgz
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/net-mgmt/ndoutils/Makefile b/net-mgmt/ndoutils/Makefile
index 2633a8696231..f054b71eafb7 100644
--- a/net-mgmt/ndoutils/Makefile
+++ b/net-mgmt/ndoutils/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ndoutils
PORTVERSION= 1.4b7
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= nagios
+MASTER_SITES= SF/nagios/${PORTNAME}-1.x/${PORTNAME}-${PORTVERSION}
MAINTAINER= pgollucci@FreeBSD.org
COMMENT= Keep Nagios perfdata in MySQL or Postgresql database
diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile
index fa827a18481f..5200df9c8efe 100644
--- a/net-mgmt/ndpmon/Makefile
+++ b/net-mgmt/ndpmon/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ndpmon
PORTVERSION= 1.3d
CATEGORIES= net-mgmt ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.3
EXTRACT_SUFX= .tgz
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/net-mgmt/nedi/Makefile b/net-mgmt/nedi/Makefile
index 2a5763363a58..ef72653f4ec0 100644
--- a/net-mgmt/nedi/Makefile
+++ b/net-mgmt/nedi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nedi
DISTVERSION= 1.0.w
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/w
EXTRACT_SUFX= .tgz
MAINTAINER= cristi@net.utcluj.ro
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index c2440a81e69e..a9a7d46755c9 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= snmp
PORTVERSION= 5.4.2.1
PORTREVISION= 5
CATEGORIES= net-mgmt ipv6
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= net-snmp
+MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= net-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/net-mgmt/net-snmp-tkmib/Makefile b/net-mgmt/net-snmp-tkmib/Makefile
index abc876757a41..339801466519 100644
--- a/net-mgmt/net-snmp-tkmib/Makefile
+++ b/net-mgmt/net-snmp-tkmib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ucd-snmp-tkmib
PORTVERSION= 4.2.7.1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= net-snmp
+MASTER_SITES= SF/net-snmp/ucd-snmp/${PORTVERSION}%20source%20code
DISTNAME= ucd-snmp-${PORTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index c2440a81e69e..a9a7d46755c9 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= snmp
PORTVERSION= 5.4.2.1
PORTREVISION= 5
CATEGORIES= net-mgmt ipv6
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= net-snmp
+MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= net-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 14d32099f99e..9a0fecce1c35 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ucd-snmp
PORTVERSION= 4.2.7.1
CATEGORIES= net-mgmt ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= net-snmp
+MASTER_SITES= SF/net-snmp/${PORTNAME}/${PORTVERSION}%20source%20code
MAINTAINER= ports@FreeBSD.org
COMMENT= An extendable SNMP implementation
diff --git a/net-mgmt/netams/Makefile b/net-mgmt/netams/Makefile
index 4684467ce50e..a606f3b3b5e1 100644
--- a/net-mgmt/netams/Makefile
+++ b/net-mgmt/netams/Makefile
@@ -8,8 +8,7 @@
PORTNAME= netams
DISTVERSION= 3.4.1rc1
CATEGORIES= net-mgmt
-MASTER_SITES= http://www.netams.com/files/ \
- SF
+MASTER_SITES= http://www.netams.com/files/
MAINTAINER= jura@netams.com
COMMENT= Network Traffic Accounting and Monitoring Software
diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index c937a7e34c00..877b8f5af8b3 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -9,8 +9,7 @@ PORTNAME= netdisco
PORTVERSION= 0.95
PORTREVISION= 2
CATEGORIES= net-mgmt www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}_with_mibs
MAINTAINER= ports@FreeBSD.org
diff --git a/net-mgmt/netleak/Makefile b/net-mgmt/netleak/Makefile
index 78259f0d8af9..7df06d2a7068 100644
--- a/net-mgmt/netleak/Makefile
+++ b/net-mgmt/netleak/Makefile
@@ -8,8 +8,7 @@
PORTNAME= netleak
PORTVERSION= 0.1a
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
index 9514904db29a..e5de4e2a1c50 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nfdump-devel
PORTVERSION= 20070808
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nfdump
+MASTER_SITES= SF/nfdump/snapshot/nfdump-snapshot-${PORTVERSION}
DISTNAME= nfdump-snapshot-${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index 05471df55ebd..a1b0b9245159 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -8,8 +8,7 @@
PORTNAME= nfdump
PORTVERSION= 1.5.8
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Command-line tools to collect and process NetFlow data
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index 2c28990d168a..faa71520626c 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -8,9 +8,9 @@
PORTNAME= nfsen
PORTVERSION= 1.3.2
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
http://nfsen.sourceforge.net/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Web based frontend to nfdump netflow collector
diff --git a/net-mgmt/nipper/Makefile b/net-mgmt/nipper/Makefile
index e6ee3101b4d6..3ac42895a818 100644
--- a/net-mgmt/nipper/Makefile
+++ b/net-mgmt/nipper/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nipper
PORTVERSION= 0.11.10
PORTEPOCH= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Nipper%20${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= steinex@nognu.de
diff --git a/net-mgmt/nrpe2/Makefile b/net-mgmt/nrpe2/Makefile
index 06db4b5454f5..bdb980de2659 100644
--- a/net-mgmt/nrpe2/Makefile
+++ b/net-mgmt/nrpe2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nrpe
DISTVERSION= 2.12
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= nagios
+MASTER_SITES= SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
MAINTAINER= jarrod@netleader.com.au
COMMENT= Nagios Remote Plugin Executor
diff --git a/net-mgmt/nsca-client/Makefile b/net-mgmt/nsca-client/Makefile
index 80f0146e2381..dd5c8e9adcca 100644
--- a/net-mgmt/nsca-client/Makefile
+++ b/net-mgmt/nsca-client/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTNAME= nsca
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../nsca
diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index c26ba3db5ed7..d3446023baef 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nsca
PORTVERSION= 2.7.2
PORTREVISION= 2
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nagios
+MASTER_SITES= SF/nagios/nsca-2.x/nsca-${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= Nagios Service Check Acceptor
diff --git a/net-mgmt/ocsinventory-agent/Makefile b/net-mgmt/ocsinventory-agent/Makefile
index 99b4a379b377..00b99de2dc88 100644
--- a/net-mgmt/ocsinventory-agent/Makefile
+++ b/net-mgmt/ocsinventory-agent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Ocsinventory
PORTVERSION= 1.02
CATEGORIES= net-mgmt
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ocsinventory
+MASTER_SITES= SF/${PORTNAME:L}/OCS%20Inventory%20NG/${PORTVERSION}
PKGNAMESUFFIX= -Agent
DISTNAME= OCSNG_UNIX_AGENT-${PORTVERSION}
diff --git a/net-mgmt/ocsinventory-ng/Makefile b/net-mgmt/ocsinventory-ng/Makefile
index 0694c32a64e9..a63ba59e09bd 100644
--- a/net-mgmt/ocsinventory-ng/Makefile
+++ b/net-mgmt/ocsinventory-ng/Makefile
@@ -7,8 +7,7 @@
PORTNAME= ocsinventory-ng
PORTVERSION= 1.02.1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ocsinventory
+MASTER_SITES= SF/ocsinventory/OCS%20Inventory%20NG/1.02
DISTNAME= OCSNG_UNIX_SERVER-${PORTVERSION}
MAINTAINER= araujo@FreeBSD.org
diff --git a/net-mgmt/openlldp/Makefile b/net-mgmt/openlldp/Makefile
index 1245bce70a19..48e0ce8e2db1 100644
--- a/net-mgmt/openlldp/Makefile
+++ b/net-mgmt/openlldp/Makefile
@@ -9,7 +9,7 @@ PORTNAME= openlldp
DISTVERSION= 0.3alpha
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.3alpha
MAINTAINER= roar.pettersen@it.uib.no
COMMENT= Link Layer Discovery Protocol daemon
diff --git a/net-mgmt/openvmps/Makefile b/net-mgmt/openvmps/Makefile
index 360a3ee2d059..00933a2709bc 100644
--- a/net-mgmt/openvmps/Makefile
+++ b/net-mgmt/openvmps/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openvmps
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= vmps
+MASTER_SITES= SF/vmps/vmpsd/${PORTVERSION}
DISTNAME= vmpsd-${PORTVERSION}
MAINTAINER= craig@yekse.gank.org
diff --git a/net-mgmt/ourmon/Makefile b/net-mgmt/ourmon/Makefile
index 894105373a5a..3ea93600451d 100644
--- a/net-mgmt/ourmon/Makefile
+++ b/net-mgmt/ourmon/Makefile
@@ -8,7 +8,7 @@ PORTNAME= ourmon
PORTVERSION= 2.8.1
PORTREVISION= 3
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}281
DISTNAME= ourmon281
MAINTAINER= manos@cs.pdx.edu
diff --git a/net-mgmt/p5-SNMP-Info/Makefile b/net-mgmt/p5-SNMP-Info/Makefile
index b0b5d1bbdf32..c4cf3f0dfd81 100644
--- a/net-mgmt/p5-SNMP-Info/Makefile
+++ b/net-mgmt/p5-SNMP-Info/Makefile
@@ -8,7 +8,6 @@ PORTNAME= SNMP-Info
PORTVERSION= 2.01
CATEGORIES= net-mgmt perl5
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= snmp-info
PKGNAMEPREFIX= p5-
MAINTAINER= jadawin@FreeBSD.org
diff --git a/net-mgmt/p5-SNMP/Makefile b/net-mgmt/p5-SNMP/Makefile
index d8b0bbeb36f8..94153300d586 100644
--- a/net-mgmt/p5-SNMP/Makefile
+++ b/net-mgmt/p5-SNMP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= SNMP
PORTVERSION= 4.2.7.1
CATEGORIES= net-mgmt perl5
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= net-snmp
+MASTER_SITES= SF/net-${PORTNAME:L}/ucd-${PORTNAME:L}/${PORTVERSION}%20source%20code
PKGNAMEPREFIX= p5-
DISTNAME= ucd-snmp-${PORTVERSION}
diff --git a/net-mgmt/pads/Makefile b/net-mgmt/pads/Makefile
index 14df522d9a0f..e13a431d7aba 100644
--- a/net-mgmt/pads/Makefile
+++ b/net-mgmt/pads/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pads
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF/passive
+MASTER_SITES= SF/passive/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Passively detect network assets
diff --git a/net-mgmt/phpip/Makefile b/net-mgmt/phpip/Makefile
index bb00c2fecdb0..8524b630962a 100644
--- a/net-mgmt/phpip/Makefile
+++ b/net-mgmt/phpip/Makefile
@@ -8,8 +8,7 @@
PORTNAME= phpip
PORTVERSION= ${SNAPSHOT}
CATEGORIES= net-mgmt www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpip
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/4.3.2%20-%20No%20Upgrade%20Support
DISTNAME= ${PORTNAME}-4.3.2-build-${SNAPSHOT}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index 62d18242814e..d2c446028876 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -8,8 +8,7 @@ PORTNAME= pixilate
PORTVERSION= 0.4.1
PORTREVISION= 4
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= winfingerprint
+MASTER_SITES= SF/winfingerprint/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Generates packets to match a list of Cisco PIX access lists
diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index c9727feca0e9..37e6a08c06a7 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pnp
PORTVERSION= 0.4.14
CATEGORIES= net-mgmt
-MASTER_SITES= SF/pnp4nagios
+MASTER_SITES= SF/${PORTNAME}4nagios/PNP/${PORTNAME}-${PORTVERSION}
MAINTAINER= rea-fbsd@codelabs.ru
COMMENT= Nagios performance data collector and grapher
diff --git a/net-mgmt/py-snmp/Makefile b/net-mgmt/py-snmp/Makefile
index f7591e3942bd..a66fe89deef4 100644
--- a/net-mgmt/py-snmp/Makefile
+++ b/net-mgmt/py-snmp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= snmp
PORTVERSION= 3.4.4
CATEGORIES= net-mgmt python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pysnmp
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}-devel/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pysnmp-${PORTVERSION}
diff --git a/net-mgmt/py-snmp2/Makefile b/net-mgmt/py-snmp2/Makefile
index fb62bd612751..717265241e62 100644
--- a/net-mgmt/py-snmp2/Makefile
+++ b/net-mgmt/py-snmp2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= snmp2
PORTVERSION= 2.0.9
CATEGORIES= net-mgmt python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pysnmp
+MASTER_SITES= SF/pysnmp/pysnmp/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pysnmp-${PORTVERSION}
diff --git a/net-mgmt/py-snmp4-apps/Makefile b/net-mgmt/py-snmp4-apps/Makefile
index 74ac5dfb821f..377cfb78338f 100644
--- a/net-mgmt/py-snmp4-apps/Makefile
+++ b/net-mgmt/py-snmp4-apps/Makefile
@@ -8,7 +8,7 @@
PORTNAME= snmp4-apps
PORTVERSION= 0.2.7a
CATEGORIES= net-mgmt python
-MASTER_SITES= SF/pysnmp
+MASTER_SITES= SF/pysnmp/pysnmp-apps-devel/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pysnmp-apps-${PORTVERSION}
diff --git a/net-mgmt/py-snmp4-mibs/Makefile b/net-mgmt/py-snmp4-mibs/Makefile
index 451a2d8474e6..7b605b1b867a 100644
--- a/net-mgmt/py-snmp4-mibs/Makefile
+++ b/net-mgmt/py-snmp4-mibs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= snmp4-mibs
PORTVERSION= 0.0.6a
CATEGORIES= net-mgmt python
-MASTER_SITES= SF/pysnmp
+MASTER_SITES= SF/pysnmp/pysnmp-mibs-devel/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pysnmp-mibs-${PORTVERSION}
diff --git a/net-mgmt/py-snmp4/Makefile b/net-mgmt/py-snmp4/Makefile
index 873dc4312b16..45f27dab47c7 100644
--- a/net-mgmt/py-snmp4/Makefile
+++ b/net-mgmt/py-snmp4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= snmp4
PORTVERSION= 4.1.10a
CATEGORIES= net-mgmt python
-MASTER_SITES= SF/pysnmp
+MASTER_SITES= SF/pysnmp/pysnmp-devel/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pysnmp-${PORTVERSION}
diff --git a/net-mgmt/py-twistedSNMP/Makefile b/net-mgmt/py-twistedSNMP/Makefile
index 098459892580..25d6205fb19b 100644
--- a/net-mgmt/py-twistedSNMP/Makefile
+++ b/net-mgmt/py-twistedSNMP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= twistedSNMP
PORTVERSION= 0.3.13
CATEGORIES= net-mgmt python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedSNMP-${PORTVERSION}
diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile
index 430123d3ca1e..832313c7ffc3 100644
--- a/net-mgmt/py-yapsnmp/Makefile
+++ b/net-mgmt/py-yapsnmp/Makefile
@@ -8,8 +8,7 @@ PORTNAME= yapsnmp
PORTVERSION= 0.7.8
PORTREVISION= 5
CATEGORIES= net-mgmt python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= yapsnmp
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= arved@FreeBSD.org
diff --git a/net-mgmt/sblim-wbemcli/Makefile b/net-mgmt/sblim-wbemcli/Makefile
index 7e560021c609..4f2ed7e9c90d 100644
--- a/net-mgmt/sblim-wbemcli/Makefile
+++ b/net-mgmt/sblim-wbemcli/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sblim-wbemcli
PORTVERSION= 1.6.1
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,sblim,}
+MASTER_SITES= SF/sblim/${PORTNAME}/${PORTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= CLI for Web Based Enterprise Management by SBLIM
diff --git a/net-mgmt/scdp/Makefile b/net-mgmt/scdp/Makefile
index 511aec75d082..a37c05270136 100644
--- a/net-mgmt/scdp/Makefile
+++ b/net-mgmt/scdp/Makefile
@@ -8,8 +8,7 @@ PORTNAME= scdp
PORTVERSION= 1.0.b
PORTREVISION= 3
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= scdp
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0b
DISTNAME= scdp-${PORTVERSION:S/.b/b/}
MAINTAINER= arved@FreeBSD.org
diff --git a/net-mgmt/sdig/Makefile b/net-mgmt/sdig/Makefile
index 2db7b2b996e1..656cd52c27cd 100644
--- a/net-mgmt/sdig/Makefile
+++ b/net-mgmt/sdig/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sdig
PORTVERSION= 0.43
PORTREVISION= 3
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= raj@cserv62.csub.edu
COMMENT= Translate IP/DNS/WINS/MAC address into port description
diff --git a/net-mgmt/sing/Makefile b/net-mgmt/sing/Makefile
index 52d6307567fb..c4fcf58f8ebd 100644
--- a/net-mgmt/sing/Makefile
+++ b/net-mgmt/sing/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sing
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= net-mgmt security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}
DISTNAME= SING-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/snmptt/Makefile b/net-mgmt/snmptt/Makefile
index 7a45e4dc9d35..53b061e4553b 100644
--- a/net-mgmt/snmptt/Makefile
+++ b/net-mgmt/snmptt/Makefile
@@ -9,7 +9,7 @@ PORTNAME= snmptt
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile
index 906268876c4c..94a2c6aab7d3 100644
--- a/net-mgmt/tcpreplay/Makefile
+++ b/net-mgmt/tcpreplay/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tcpreplay
PORTVERSION= 3.4.3
CATEGORIES= net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= A tool to replay saved packet capture files
diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index 49e1334c6946..f922e4717517 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tork
PORTVERSION= 0.30
PORTREVISION= 1
CATEGORIES= net-mgmt security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/TorK%20Source%20Tarball/TorK-${PORTVERSION}
MAINTAINER= thomas.sander@gmx.de
COMMENT= TorK is an Anonymity Manager for the KDE Desktop
diff --git a/net-mgmt/weplab/Makefile b/net-mgmt/weplab/Makefile
index c2307b257fbd..f31cb556cecb 100644
--- a/net-mgmt/weplab/Makefile
+++ b/net-mgmt/weplab/Makefile
@@ -8,7 +8,7 @@
PORTNAME= weplab
PORTVERSION= 0.1.5
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= WepLab is a tool designed to teach how WEP works
diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
index 4b7f68cba8da..fa1faec6268d 100644
--- a/net-mgmt/xymon-client/Makefile
+++ b/net-mgmt/xymon-client/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xymon
PORTVERSION= 4.2.3
CATEGORIES= net-mgmt www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= hobbitmon
+MASTER_SITES= SF/hobbitmon/hobbitserver/${PORTVERSION}
PKGNAMESUFFIX= -client${PKGNAMESUFFIX2}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index fee17f7109de..5de6219394bc 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xymon
PORTVERSION= 4.2.3
CATEGORIES= net-mgmt www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= hobbitmon
+MASTER_SITES= SF/hobbitmon/hobbitserver/${PORTVERSION}
PKGNAMESUFFIX= -server${PKGNAMESUFFIX2}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile
index 2b4b115c0608..4a060b1d06b6 100644
--- a/net-mgmt/zabbix-agent/Makefile
+++ b/net-mgmt/zabbix-agent/Makefile
@@ -9,7 +9,7 @@ PORTNAME= zabbix
PORTVERSION= 1.6.5
PORTEPOCH= 2
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ZABBIX%20Latest%20Stable/${PORTVERSION}
PKGNAMESUFFIX= -agent
MAINTAINER= ports@christianserving.org
diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile
index 4f38e914f82e..91b7a81dfa67 100644
--- a/net-mgmt/zabbix/Makefile
+++ b/net-mgmt/zabbix/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.6.5
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ZABBIX%20Latest%20Stable/${PORTVERSION}
MAINTAINER= ports@christianserving.org
COMMENT= Application and network monitoring solution
diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile
index 2b4b115c0608..4a060b1d06b6 100644
--- a/net-mgmt/zabbix2-agent/Makefile
+++ b/net-mgmt/zabbix2-agent/Makefile
@@ -9,7 +9,7 @@ PORTNAME= zabbix
PORTVERSION= 1.6.5
PORTEPOCH= 2
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ZABBIX%20Latest%20Stable/${PORTVERSION}
PKGNAMESUFFIX= -agent
MAINTAINER= ports@christianserving.org
diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile
index 4f38e914f82e..91b7a81dfa67 100644
--- a/net-mgmt/zabbix2/Makefile
+++ b/net-mgmt/zabbix2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.6.5
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net-mgmt
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ZABBIX%20Latest%20Stable/${PORTVERSION}
MAINTAINER= ports@christianserving.org
COMMENT= Application and network monitoring solution
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 52887f849518..2a0157812c42 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aMule
PORTVERSION= 2.2.5
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= SF/amule
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= boris@tagnet.ru
COMMENT= The all-platform eMule p2p client
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 52887f849518..2a0157812c42 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aMule
PORTVERSION= 2.2.5
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= SF/amule
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= boris@tagnet.ru
COMMENT= The all-platform eMule p2p client
diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile
index 52887f849518..2a0157812c42 100644
--- a/net-p2p/amule2/Makefile
+++ b/net-p2p/amule2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aMule
PORTVERSION= 2.2.5
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= SF/amule
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= boris@tagnet.ru
COMMENT= The all-platform eMule p2p client
diff --git a/net-p2p/apollon/Makefile b/net-p2p/apollon/Makefile
index eff2373b10ed..366e26ec55e9 100644
--- a/net-p2p/apollon/Makefile
+++ b/net-p2p/apollon/Makefile
@@ -9,7 +9,7 @@ PORTNAME= apollon
PORTVERSION= 1.0.2.1
PORTREVISION= 2
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Apollon%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE client for giFT daemon
diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile
index df37c6ed4d3f..37c3c9a6d76f 100644
--- a/net-p2p/azureus/Makefile
+++ b/net-p2p/azureus/Makefile
@@ -9,7 +9,7 @@ PORTNAME= azureus
PORTVERSION= 3.1.1.0
PORTREVISION= 1
CATEGORIES= net-p2p java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/vuze/vuze-${PORTVERSION}
DISTNAME= Vuze_${PORTVERSION}_source
MAINTAINER= rnoland@FreeBSD.org
diff --git a/net-p2p/azureus2/Makefile b/net-p2p/azureus2/Makefile
index df90f299e00f..ce59fc1fd0fb 100644
--- a/net-p2p/azureus2/Makefile
+++ b/net-p2p/azureus2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= azureus2
PORTVERSION= 2.5.0.4
PORTREVISION= 2
CATEGORIES= net-p2p java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= azureus
+MASTER_SITES= SF/azureus/x_obsolete/azureus-${PORTVERSION}
DISTNAME= azureus_${PORTVERSION}_source
MAINTAINER= rnoland@2hip.net
diff --git a/net-p2p/btqueue/Makefile b/net-p2p/btqueue/Makefile
index 1a92cb0f3b47..8985e2d26e24 100644
--- a/net-p2p/btqueue/Makefile
+++ b/net-p2p/btqueue/Makefile
@@ -9,8 +9,7 @@ PORTNAME= btqueue
PORTVERSION= 0.1.3
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= BTQueue-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-p2p/ctcs/Makefile b/net-p2p/ctcs/Makefile
index 7576b7216c5a..b6aa9f6eb5e2 100644
--- a/net-p2p/ctcs/Makefile
+++ b/net-p2p/ctcs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ctcs
PORTVERSION= 1.4.1
CATEGORIES= net-p2p
-MASTER_SITES= SF/dtorrent
+MASTER_SITES= SF/dtorrent/${PORTNAME}/${PORTVERSION}
MAINTAINER= dereckson@gmail.com
COMMENT= CTorrent monitoring and managing interface
diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile
index 5f86a47a99da..5ddb7962b107 100644
--- a/net-p2p/dclib/Makefile
+++ b/net-p2p/dclib/Makefile
@@ -11,8 +11,7 @@ PORTNAME= dclib
PORTVERSION= 0.3.23
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= wxdcgui
+MASTER_SITES= SF/wxdcgui/${PORTNAME}/${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= Direct connect interface library for valknut
diff --git a/net-p2p/dctc-gui-qt/Makefile b/net-p2p/dctc-gui-qt/Makefile
index 5807af00581b..5287fe9c2bd0 100644
--- a/net-p2p/dctc-gui-qt/Makefile
+++ b/net-p2p/dctc-gui-qt/Makefile
@@ -9,7 +9,7 @@ PORTNAME= dctc
PORTVERSION= 0.1.2
PORTREVISION= 5
CATEGORIES= net-p2p
-MASTER_SITES= SF/dc-qt
+MASTER_SITES= SF/dc-qt/dc-qt/${PORTVERSION}
PKGNAMESUFFIX= -gui-qt
DISTNAME= dc-qt-${PORTVERSION}
diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile
index f220aff18a14..4e709d16a978 100644
--- a/net-p2p/edonkey-gui-gtk/Makefile
+++ b/net-p2p/edonkey-gui-gtk/Makefile
@@ -10,7 +10,7 @@ PORTNAME= edonkey
PORTVERSION= 0.6.4
PORTREVISION= 7
CATEGORIES= net-p2p
-MASTER_SITES= SF/ed2k-gtk-gui
+MASTER_SITES= SF/ed2k-gtk-gui/ed2k-gtk-gui/${PORTVERSION}
PKGNAMESUFFIX= -gui-gtk
DISTNAME= ed2k-gtk-gui-${PORTVERSION}
diff --git a/net-p2p/edonkey-tool-hash/Makefile b/net-p2p/edonkey-tool-hash/Makefile
index a3829e6f784f..e5cafa68e8e7 100644
--- a/net-p2p/edonkey-tool-hash/Makefile
+++ b/net-p2p/edonkey-tool-hash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= edonkey
PORTVERSION= 0.4.0
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ed2k-tools
+MASTER_SITES= SF/ed2k-tools/ed2k_hash/${PORTVERSION}
PKGNAMESUFFIX= -tool-hash
DISTNAME= ed2k_hash-${PORTVERSION}
diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index 3ab585a4c2a6..16e1b141030a 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fidelio
PORTVERSION= 1.0.b1
PORTREVISION= 6
CATEGORIES= net-p2p gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0b1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/b/}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile
index c5a664a41b98..984c8c687ebe 100644
--- a/net-p2p/frost/Makefile
+++ b/net-p2p/frost/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.2.0.20080304
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= net-p2p java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= jtcfrost
+MASTER_SITES= SF/jtc${PORTNAME}/${PORTNAME}/04-Mar-2008
DISTNAME= ${PORTNAME}-04-Mar-2008
MAINTAINER= peter.thoenen@yahoo.com
diff --git a/net-p2p/gift-gnutella/Makefile b/net-p2p/gift-gnutella/Makefile
index 78448f36cc0c..63e8ff8b6a77 100644
--- a/net-p2p/gift-gnutella/Makefile
+++ b/net-p2p/gift-gnutella/Makefile
@@ -8,8 +8,7 @@
PORTNAME= giFT-gnutella
PORTVERSION= 0.0.11
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gift
+MASTER_SITES= SF/gift/${PORTNAME:L}/${PORTVERSION}
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= shoesoft@gmx.net
diff --git a/net-p2p/gift-openft/Makefile b/net-p2p/gift-openft/Makefile
index c5c0ec70b5fa..d984f063a67b 100644
--- a/net-p2p/gift-openft/Makefile
+++ b/net-p2p/gift-openft/Makefile
@@ -8,8 +8,7 @@
PORTNAME= giFT-OpenFT
PORTVERSION= 0.2.1.6
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gift
+MASTER_SITES= SF/gift/${PORTNAME:L}/${PORTVERSION}
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= shoesoft@gmx.net
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index d97fa3c1c10e..250544dbfac1 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/gift/Makefile
@@ -9,8 +9,7 @@ PORTNAME= giFT
PORTVERSION= 0.11.8.1
PORTREVISION= 7
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= shoesoft@gmx.net
diff --git a/net-p2p/giftoxic/Makefile b/net-p2p/giftoxic/Makefile
index b642aa2253f0..918055d59286 100644
--- a/net-p2p/giftoxic/Makefile
+++ b/net-p2p/giftoxic/Makefile
@@ -9,8 +9,7 @@ PORTNAME= giFToxic
PORTVERSION= 0.0.9
PORTREVISION= 9
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= giftoxic
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}
MAINTAINER= joeldiaz@bellsouth.net
COMMENT= GTK2 client for giFT
diff --git a/net-p2p/giftui/Makefile b/net-p2p/giftui/Makefile
index 5debda3346c4..47c3a19319e3 100644
--- a/net-p2p/giftui/Makefile
+++ b/net-p2p/giftui/Makefile
@@ -9,8 +9,7 @@ PORTNAME= giFTui
PORTVERSION= 0.4.1
PORTREVISION= 9
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= giftui
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME:L}-${PORTVERSION}
DISTNAME= giftui-0.4.1
MAINTAINER= joeldiaz@bellsouth.net
diff --git a/net-p2p/gnewtellium/Makefile b/net-p2p/gnewtellium/Makefile
index aed0b939cec7..973b9b52966e 100644
--- a/net-p2p/gnewtellium/Makefile
+++ b/net-p2p/gnewtellium/Makefile
@@ -8,8 +8,7 @@ PORTNAME= gnewtellium
PORTVERSION= 0.05b
PORTREVISION= 4
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A gnutella client
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 0d8e0798bb78..3a94ca94c22e 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -10,8 +10,7 @@ PORTNAME= gtorrentviewer
PORTVERSION= 0.2b
PORTREVISION= 11
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/GTorrentViewer/${PORTVERSION}
DISTNAME= GTorrentViewer-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-p2p/i2p/Makefile b/net-p2p/i2p/Makefile
index c86836963b8a..35e52f0b4718 100644
--- a/net-p2p/i2p/Makefile
+++ b/net-p2p/i2p/Makefile
@@ -10,7 +10,9 @@ PORTVERSION= 0.7.4
CATEGORIES= net-p2p java security
MASTER_SITES= http://mirror.i2p2.de/:i2p \
${MASTER_SITE_GOOGLE_CODE}:i2p \
- SF/jetty:jetty
+
+ SF/jetty/OldFiles:jetty
+
DISTFILES= \
i2psource_${PORTVERSION}${EXTRACT_SUFX}:i2p \
${JETTY_DISTFILE}:jetty
diff --git a/net-p2p/javadc/Makefile b/net-p2p/javadc/Makefile
index be2096d86954..6d50976290ba 100644
--- a/net-p2p/javadc/Makefile
+++ b/net-p2p/javadc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= javadc
PORTVERSION= 0.20
PORTREVISION= 2
CATEGORIES= net-p2p java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= # none known, please fix
MAINTAINER= ports@FreeBSD.org
COMMENT= Open source Java DirectConnect (TM) command-line client
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index 4cb26d75782b..95b57a3163bb 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libbt
PORTVERSION= 1.05
PORTREVISION= 2
CATEGORIES= net-p2p devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= flz@FreeBSD.org
COMMENT= C library implementing the core BitTorrent protocol
diff --git a/net-p2p/liberator/Makefile b/net-p2p/liberator/Makefile
index 41d170f1f5dc..65369183ffb7 100644
--- a/net-p2p/liberator/Makefile
+++ b/net-p2p/liberator/Makefile
@@ -9,8 +9,7 @@ PORTNAME= liberator
PORTVERSION= 2.0.2
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/ofcp/ofcp-${PORTVERSION}
DISTNAME= ofcp-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile
index 3d914ad6469d..76b207129ad6 100644
--- a/net-p2p/libtorrent-rasterbar-14/Makefile
+++ b/net-p2p/libtorrent-rasterbar-14/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libtorrent
PORTVERSION= 0.14.3
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= rb
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}-rasterbar-${PORTVERSION}
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index a68728b1eba8..86be84436cfd 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -9,9 +9,9 @@ PORTNAME= lopster
PORTVERSION= 1.2.2
PORTREVISION= 6
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://lopster.sourceforge.net/download/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+ client for Napster
diff --git a/net-p2p/mldonkey-perlreactor/Makefile b/net-p2p/mldonkey-perlreactor/Makefile
index da64941c242f..14505a93c773 100644
--- a/net-p2p/mldonkey-perlreactor/Makefile
+++ b/net-p2p/mldonkey-perlreactor/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mldonkey
PORTVERSION= 0.2
CATEGORIES= net-p2p perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= remotefilesync
+MASTER_SITES= SF/remotefilesync/perlreactor/perlreactor%20${PORTVERSION}
PKGNAMESUFFIX= -perlreactor
DISTNAME= perlreactor_${PORTVERSION}
diff --git a/net-p2p/mute-net/Makefile b/net-p2p/mute-net/Makefile
index 88f29f638036..d5d777ae8366 100644
--- a/net-p2p/mute-net/Makefile
+++ b/net-p2p/mute-net/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mute
PORTVERSION= 0.3
PORTREVISION= 5
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}-net
+MASTER_SITES= SF/mute-net/MUTE%20File%20Sharing/${PORTVERSION}
PKGNAMESUFFIX= -net
DISTNAME= MUTE_fileSharing-${PORTVERSION}_UnixSource
diff --git a/net-p2p/mutella/Makefile b/net-p2p/mutella/Makefile
index 442514429f29..17da0b252241 100644
--- a/net-p2p/mutella/Makefile
+++ b/net-p2p/mutella/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mutella
PORTVERSION= 0.4.5
PORTEPOCH= 1
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mutella
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gavin.atkinson@ury.york.ac.uk
COMMENT= A command line Gnutella client
diff --git a/net-p2p/napshare/Makefile b/net-p2p/napshare/Makefile
index c0ee11ecb4ad..d8982c52d31b 100644
--- a/net-p2p/napshare/Makefile
+++ b/net-p2p/napshare/Makefile
@@ -9,7 +9,7 @@ PORTNAME= napshare
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/NapShare%20V${PORTVERSION}/Linux
MAINTAINER= ports@FreeBSD.org
COMMENT= A GTK based Gnutella client
diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile
index 680978a836a2..09cec87da716 100644
--- a/net-p2p/nicotine-plus/Makefile
+++ b/net-p2p/nicotine-plus/Makefile
@@ -9,8 +9,7 @@ PORTNAME= plus
PORTVERSION= 1.2.12
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
+MASTER_SITES= SF/nicotine-${PORTNAME}/nicotine-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= nicotine-
DISTNAME= ${PKGNAMEPREFIX:S/-/+/}-${PORTVERSION}
diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile
index b7323f5739fa..caab289f976d 100644
--- a/net-p2p/opendchub/Makefile
+++ b/net-p2p/opendchub/Makefile
@@ -8,8 +8,7 @@
PORTNAME= opendchub
PORTVERSION= 0.7.15
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Open%20DC%20Hub/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Unofficial Unix version of the Direct Connect Hub software
diff --git a/net-p2p/opennap/Makefile b/net-p2p/opennap/Makefile
index a743b77b5b1b..b4ecb5a20a02 100644
--- a/net-p2p/opennap/Makefile
+++ b/net-p2p/opennap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= opennap
PORTVERSION= 0.44
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= drogoh@megalomaniacal.net
COMMENT= The OpenNAP open-source Napster server
diff --git a/net-p2p/p5-pdonkey/Makefile b/net-p2p/p5-pdonkey/Makefile
index 4e5be72217b6..77a357b1b2ea 100644
--- a/net-p2p/p5-pdonkey/Makefile
+++ b/net-p2p/p5-pdonkey/Makefile
@@ -9,14 +9,10 @@
PORTNAME= pdonkey
PORTVERSION= 0.05
CATEGORIES= net-p2p perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
- ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
-MASTER_SITE_SUBDIR= ${PORTNAME}/:sf \
- ../by-authors/K/KL/KLIMKIN/:cpan
+MASTER_SITES= CPAN/../../authors/id/K/KL/KLIMKIN \
+ SF
PKGNAMEPREFIX= p5-
DISTNAME= P2P-pDonkey-${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf \
- ${DISTNAME}${EXTRACT_SUFX}:cpan
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl tools for eDonkey network
diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile
index 16988df8f8b1..bd384ef4726f 100644
--- a/net-p2p/phex/Makefile
+++ b/net-p2p/phex/Makefile
@@ -8,7 +8,7 @@
PORTNAME= phex
PORTVERSION= 3.4.2.116
CATEGORIES= net-p2p java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Phex%20Final%20Releases/Phex%203.4.2
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= bsdkaffee@gmail.com
diff --git a/net-p2p/py-fngrab/Makefile b/net-p2p/py-fngrab/Makefile
index ba6c4c05d059..a97d4831f8fb 100644
--- a/net-p2p/py-fngrab/Makefile
+++ b/net-p2p/py-fngrab/Makefile
@@ -9,8 +9,7 @@
PORTNAME= fngrab
PORTVERSION= 0.0.4
CATEGORIES= net-p2p python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= freebbs
+MASTER_SITES= SF/freebbs/${PORTNAME}-${PORTVERSION}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-p2p/py-kenosis/Makefile b/net-p2p/py-kenosis/Makefile
index 0a191778fca4..52e017b6364a 100644
--- a/net-p2p/py-kenosis/Makefile
+++ b/net-p2p/py-kenosis/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kenosis
PORTVERSION= 0.96
CATEGORIES= net-p2p python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/net-p2p/qbittorrent-22/Makefile b/net-p2p/qbittorrent-22/Makefile
index 8ccb588dad89..fd153f44f05b 100644
--- a/net-p2p/qbittorrent-22/Makefile
+++ b/net-p2p/qbittorrent-22/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qbittorrent
PORTVERSION= 1.3.4
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Bittorrent client written in C++ / Qt4 using libtorrent
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 8ccb588dad89..fd153f44f05b 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qbittorrent
PORTVERSION= 1.3.4
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Bittorrent client written in C++ / Qt4 using libtorrent
diff --git a/net-p2p/qtella/Makefile b/net-p2p/qtella/Makefile
index 1c4e06449f97..3308fa759626 100644
--- a/net-p2p/qtella/Makefile
+++ b/net-p2p/qtella/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qtella
PORTVERSION= 0.7.0
PORTREVISION= 5
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Gnutella client using Qt
diff --git a/net-p2p/rblibtorrent-devel/Makefile b/net-p2p/rblibtorrent-devel/Makefile
index 3d914ad6469d..76b207129ad6 100644
--- a/net-p2p/rblibtorrent-devel/Makefile
+++ b/net-p2p/rblibtorrent-devel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libtorrent
PORTVERSION= 0.14.3
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= rb
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}-rasterbar-${PORTVERSION}
diff --git a/net-p2p/rblibtorrent/Makefile b/net-p2p/rblibtorrent/Makefile
index afd6b82353e3..87f65bb21778 100644
--- a/net-p2p/rblibtorrent/Makefile
+++ b/net-p2p/rblibtorrent/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libtorrent
PORTVERSION= 0.13
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= rb
MAINTAINER= johan@stromnet.se
diff --git a/net-p2p/sharktorrent/Makefile b/net-p2p/sharktorrent/Makefile
index 1f86a4b422ee..f4b9c7a8462d 100644
--- a/net-p2p/sharktorrent/Makefile
+++ b/net-p2p/sharktorrent/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sharktorrent
PORTVERSION= 0.1.1
PORTREVISION= 4
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= alepulver@FreeBSD.org
COMMENT= C++ Bittorrent client using wxWidgets, libtorrent and boost
diff --git a/net-p2p/torrent_swapper/Makefile b/net-p2p/torrent_swapper/Makefile
index fb2a121481cb..20c3d5e983a2 100644
--- a/net-p2p/torrent_swapper/Makefile
+++ b/net-p2p/torrent_swapper/Makefile
@@ -9,8 +9,7 @@ PORTNAME= torrent_swapper
PORTVERSION= 1.0
PORTREVISION= 4
CATEGORIES= net-p2p
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= bit-torrent
+MASTER_SITES= SF/bit-torrent/bit-torrent/Torrent%20Swapper
DISTNAME= swapper
MAINTAINER= alepulver@FreeBSD.org
diff --git a/net-p2p/torrentvolve/Makefile b/net-p2p/torrentvolve/Makefile
index 7c1da69182d0..4e9617e5c9d3 100644
--- a/net-p2p/torrentvolve/Makefile
+++ b/net-p2p/torrentvolve/Makefile
@@ -9,7 +9,7 @@ PORTNAME= torrentvolve
DISTVERSION= 1.4-beta
PORTREVISION= 2
CATEGORIES= net-p2p java www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Beta%201.4
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Cross-platform PHP-driven web-based BitTorrent client
diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index a780e53a8ba4..f4ade89621f7 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tribler
PORTVERSION= 4.0.4
PORTREVISION= 2
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Tribler%20V${PORTVERSION}
DISTNAME= Tribler_${PORTVERSION}_src
MAINTAINER= alepulver@FreeBSD.org
diff --git a/net-p2p/tvrss/Makefile b/net-p2p/tvrss/Makefile
index 6da7f3278fe8..91c6569eec1b 100644
--- a/net-p2p/tvrss/Makefile
+++ b/net-p2p/tvrss/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tvrss
DISTVERSION= 1.8beta
PORTREVISION= 2
CATEGORIES= net-p2p
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tvtrss
+MASTER_SITES= SF/tvtrss/TV%20RSS/TV%20RSS%201.8beta
MAINTAINER= ports@FreeBSD.org
COMMENT= Torrent RSS feed reader
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index 41418c4ccd60..99a43c7bc8eb 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -11,8 +11,7 @@ PORTNAME= valknut
PORTVERSION= 0.4.9
PORTREVISION= 2
CATEGORIES= net-p2p
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= wxdcgui
+MASTER_SITES= SF/wxdcgui/${PORTNAME}-qt4/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
diff --git a/net-p2p/verlihub-plugins/Makefile.plugins b/net-p2p/verlihub-plugins/Makefile.plugins
index 82bf60106460..017ea3737cd7 100644
--- a/net-p2p/verlihub-plugins/Makefile.plugins
+++ b/net-p2p/verlihub-plugins/Makefile.plugins
@@ -6,8 +6,7 @@
PLUGIN_NAME?= ${PORTNAME}
PKGNAMEPREFIX= verlihub-plugins-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= verlihub
+MASTER_SITES= SF/verlihub/OldFiles
DISTNAME= ${PLUGIN_NAME}
COMMENT?= ${PLUGIN_DESC} plugin for the VerliHub - a Direct Connect protocol server
diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index bbc203b27d92..70b3d58e4b91 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -10,7 +10,7 @@ DISTVERSION= 0.9.8d-RC2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net-p2p
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Verlihub/${DISTVERSION}
MAINTAINER= skylord@vt.net.ru
COMMENT= A Direct Connect protocol server (Hub)
diff --git a/net-p2p/vhcp/Makefile b/net-p2p/vhcp/Makefile
index 17b4de0ace41..44046bc848e4 100644
--- a/net-p2p/vhcp/Makefile
+++ b/net-p2p/vhcp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vhcp
PORTVERSION= 1.7g2
CATEGORIES= net-p2p www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/PHP%205.x/1.7g
DISTNAME= vhcp_v${PORTVERSION}
MAINTAINER= gelraen.ua@gmail.com
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 59b0feaf9245..913970560631 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vuze
PORTVERSION= 4.2.0.2
PORTREVISION= 1
CATEGORIES= net-p2p java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= azureus
+MASTER_SITES= SF/azureus/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= Vuze_${PORTVERSION}_source
MAINTAINER= rnoland@FreeBSD.org
diff --git a/net-p2p/xnap/Makefile b/net-p2p/xnap/Makefile
index 6e96e5c8f8fa..a542cad00e08 100644
--- a/net-p2p/xnap/Makefile
+++ b/net-p2p/xnap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= XNap
DISTVERSION= 2.5r3
PORTREVISION= 3
CATEGORIES= net-p2p audio java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/2.5r3
#DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
DISTNAME= ${PORTNAME:L}-${DISTVERSION}
diff --git a/net/arpdig/Makefile b/net/arpdig/Makefile
index 714abadd0952..5ad58f61c39d 100644
--- a/net/arpdig/Makefile
+++ b/net/arpdig/Makefile
@@ -8,8 +8,7 @@
PORTNAME= arpdig
PORTVERSION= 0.5.2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= marck@FreeBSD.org
COMMENT= ARP Digger utility
diff --git a/net/arprelease/Makefile b/net/arprelease/Makefile
index 9e7d92bc7bc8..fa35f43f59d9 100644
--- a/net/arprelease/Makefile
+++ b/net/arprelease/Makefile
@@ -9,8 +9,7 @@ PORTNAME= arprelease
PORTVERSION= 1.2
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Libnet tool to flush arp cache entries from devices (eg. routers)
diff --git a/net/asfrecorder/Makefile b/net/asfrecorder/Makefile
index e4741d763d46..a213cfd1da79 100644
--- a/net/asfrecorder/Makefile
+++ b/net/asfrecorder/Makefile
@@ -8,8 +8,7 @@
PORTNAME= asfrecorder
PORTVERSION= 1.1.20010307
CATEGORIES= net audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= asfrecorder
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1
DISTNAME= ASFRecorder
MAINTAINER= ports@FreeBSD.org
diff --git a/net/bittwist/Makefile b/net/bittwist/Makefile
index e2d4ab093136..6c88ff4d2f65 100644
--- a/net/bittwist/Makefile
+++ b/net/bittwist/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bittwist
PORTVERSION= 1.0
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/_BSD/Bit-Twist%20${PORTVERSION}
DISTNAME= ${PORTNAME}-bsd-${PORTVERSION}
MAINTAINER= wxs@FreeBSD.org
diff --git a/net/ccxstream/Makefile b/net/ccxstream/Makefile
index 46d4526db8d3..b91ea1ea7934 100644
--- a/net/ccxstream/Makefile
+++ b/net/ccxstream/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ccxstream
PORTVERSION= 1.0.15
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xbplayer
+MASTER_SITES= SF/xbplayer/XStream%20Servers/ccXStream%20${PORTVERSION}%20for%20Linux
MAINTAINER= ports@FreeBSD.org
COMMENT= Stream media files to XBox Media Center via XBMSP
diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile
index 66a953a35f8b..cb19d5b85855 100644
--- a/net/clusterit/Makefile
+++ b/net/clusterit/Makefile
@@ -8,8 +8,7 @@
PORTNAME= clusterit
PORTVERSION= 2.5
CATEGORIES= net devel parallel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= demon@FreeBSD.org
COMMENT= A collection of clustering tools
diff --git a/net/cryptcat/Makefile b/net/cryptcat/Makefile
index 10d22f173340..cfad64014561 100644
--- a/net/cryptcat/Makefile
+++ b/net/cryptcat/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cryptcat
PORTVERSION= 1.2.1
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-unix-1.2/${PORTNAME}-unix-${PORTVERSION}
DISTNAME= ${PORTNAME}-unix-${PORTVERSION}
EXTRACT_SUFX= .tar
diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile
index 2ae3548721aa..8d789dcbf766 100644
--- a/net/cyphesis/Makefile
+++ b/net/cyphesis/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cyphesis
PORTVERSION= 0.5.20
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=worldforge
+MASTER_SITES= SF/worldforge/${PORTNAME}%20%28server%29/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A server for WorldForge games
diff --git a/net/dhcp6/Makefile b/net/dhcp6/Makefile
index c43ad0fccef3..4677c022e7a4 100644
--- a/net/dhcp6/Makefile
+++ b/net/dhcp6/Makefile
@@ -9,8 +9,7 @@ PORTNAME= dhcp6
PORTVERSION= 20080615
PORTREVISION= 1
CATEGORIES= net ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wide-dhcpv6
+MASTER_SITES= SF/wide-dhcpv6/wide-dhcpv6/wide-dhcpv6-${PORTVERSION}
DISTNAME= wide-dhcpv6-${PORTVERSION}
MAINTAINER= suz@FreeBSD.org
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 732828288369..43cee016a78d 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -9,8 +9,7 @@
PORTNAME= dictd
PORTVERSION= 1.11.1
CATEGORIES+= net textproc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= dict
+MASTER_SITES= SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER?= clsung@FreeBSD.org
COMMENT= Dict protocol (RFC 2229) server
diff --git a/net/easysoap/Makefile b/net/easysoap/Makefile
index 5566e5e8bd7b..18b2cb38f69f 100644
--- a/net/easysoap/Makefile
+++ b/net/easysoap/Makefile
@@ -9,7 +9,7 @@ PORTNAME= easysoap
PORTVERSION= 0.8.0
PORTREVISION= 3
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SWANSONG
DISTNAME= EasySoap++-${PORTVERSION}
MAINTAINER= glarkin@FreeBSD.org
diff --git a/net/empty/Makefile b/net/empty/Makefile
index 50bc5593b4eb..cde4b616a136 100644
--- a/net/empty/Makefile
+++ b/net/empty/Makefile
@@ -7,7 +7,7 @@
PORTNAME= empty
PORTVERSION= 0.6.17b
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= zmey20000@yahoo.com
diff --git a/net/frickin/Makefile b/net/frickin/Makefile
index 3ed160306ed8..6e3916567bcb 100644
--- a/net/frickin/Makefile
+++ b/net/frickin/Makefile
@@ -9,7 +9,7 @@ PORTNAME= frickin
DISTVERSION= 2.0BETA2
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
EXTRACT_SUFX= .tgz
MAINTAINER= asm@asm.kiev.ua
diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index ed19d75b2edc..db64b14b7cbf 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -8,8 +8,7 @@
PORTNAME= fspclient
PORTVERSION= 0.92.1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A ftp-like client for the FSP service
diff --git a/net/fspd/Makefile b/net/fspd/Makefile
index f9c2bee6cbd3..52ca828a5e82 100644
--- a/net/fspd/Makefile
+++ b/net/fspd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fspd
PORTVERSION= 2.8.1.24
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fsp
+MASTER_SITES= SF/fsp/fsp/2.8.1b24
DISTNAME= fsp-2.8.1b24
MAINTAINER= bg1tpt@gmail.com
diff --git a/net/fsplib/Makefile b/net/fsplib/Makefile
index 1bf5d0670d3f..44a09cff2fb0 100644
--- a/net/fsplib/Makefile
+++ b/net/fsplib/Makefile
@@ -8,8 +8,7 @@ PORTNAME= fsplib
PORTVERSION= 0.11
PORTREVISION= 0
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fsp
+MASTER_SITES= SF/fsp/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library implementing FSP protocol
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index a8045baa1bce..4b4f2a5aa2ca 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -10,8 +10,7 @@ PORTNAME= gatekeeper
DISTVERSION= 2.2.4
PORTREVISION= 3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openh323gk
+MASTER_SITES= SF/openh323gk/Sources/${PORTVERSION}
DISTNAME= gnugk-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net/geotrace/Makefile b/net/geotrace/Makefile
index 06cb7fcfe3f5..33d9f3bc54ef 100644
--- a/net/geotrace/Makefile
+++ b/net/geotrace/Makefile
@@ -10,8 +10,7 @@ PORTNAME= geotrace
PORTVERSION= 0.0.4
PORTREVISION= 6
CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/GeoTrace/${PORTVERSION}
MAINTAINER= ijliao@FreeBSD.org
COMMENT= Graphical traceroute utility
diff --git a/net/gini/Makefile b/net/gini/Makefile
index de02e59264e1..1cce84c2a3ca 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gini
PORTVERSION= 0.5.1
PORTREVISION= 5
CATEGORIES= net multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= A lightweight media streaming server
diff --git a/net/glflow/Makefile b/net/glflow/Makefile
index ea7d57e568b1..dac93f4ef621 100644
--- a/net/glflow/Makefile
+++ b/net/glflow/Makefile
@@ -9,8 +9,7 @@ PORTNAME= glFlow
PORTVERSION= 0.1.4
PORTEPOCH= 1
CATEGORIES= net security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= glflow
+MASTER_SITES= SF
DISTNAME= glFlow-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/net/gnetcat/Makefile b/net/gnetcat/Makefile
index f68d68bff531..28039e2c1d03 100644
--- a/net/gnetcat/Makefile
+++ b/net/gnetcat/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnetcat
PORTVERSION= 0.7.1
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= netcat
+MASTER_SITES= SF/netcat/netcat/${PORTVERSION}
DISTNAME= netcat-0.7.1
MAINTAINER= ports@FreeBSD.org
diff --git a/net/gofish/Makefile b/net/gofish/Makefile
index 841a0f1317c8..ab635d6a6478 100644
--- a/net/gofish/Makefile
+++ b/net/gofish/Makefile
@@ -9,8 +9,7 @@
PORTNAME= gofish
PORTVERSION= 1.1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= kaiw27@gmail.com
COMMENT= GoFish Gopher Server
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 4ae88ef8b56d..3174c0c56633 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.3.4
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= SF/gqclient
+MASTER_SITES= SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK-based LDAP client
diff --git a/net/grdc-applet/Makefile b/net/grdc-applet/Makefile
index 9bded90d5a36..f0b7c4217409 100644
--- a/net/grdc-applet/Makefile
+++ b/net/grdc-applet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= grdc
PORTVERSION= 0.6.0
CATEGORIES= net gnome
-MASTER_SITES= SF/grdc
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-gnome/${PORTVERSION}
PKGNAMESUFFIX= -applet
DISTNAME= ${PORTNAME}-gnome-${PORTVERSION}
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index e5dae8db3ba0..ccc5ade13cc5 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -10,8 +10,7 @@ PORTNAME= gspoof
PORTVERSION= 3.2
PORTREVISION= 11
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Gspoof-3/${PORTVERSION}
MAINTAINER= cm@therek.net
COMMENT= Console/GTK+ TCP/IP Packets Forger
diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile
index 0d72f1d5f8b1..9ce1aa641249 100644
--- a/net/gutenfetch/Makefile
+++ b/net/gutenfetch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= gutenfetch
PORTVERSION= 1.5
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gutenfetch
+MASTER_SITES= SF
MAINTAINER= johntabularasa@users.sf.net
COMMENT= Fetch listings and books from Project Gutenberg
diff --git a/net/hlmaster/Makefile b/net/hlmaster/Makefile
index 20cde0bd77ec..7d5d794f3157 100644
--- a/net/hlmaster/Makefile
+++ b/net/hlmaster/Makefile
@@ -8,8 +8,7 @@
PORTNAME= hlmaster
PORTVERSION= 0.9.3
CATEGORIES= net games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Half-Life game master server daemon
diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile
index be4c78693715..9e570e73da48 100644
--- a/net/iaxmodem/Makefile
+++ b/net/iaxmodem/Makefile
@@ -9,8 +9,7 @@ PORTNAME= iaxmodem
PORTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= net comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= stucchi@gufi.org
COMMENT= Software modem that connects to IAX channel
diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile
index 90c43ccef07c..3104ba7b972e 100644
--- a/net/igmpproxy/Makefile
+++ b/net/igmpproxy/Makefile
@@ -9,8 +9,7 @@ PORTNAME= igmpproxy
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-beta2
DISTNAME= ${PORTNAME}-src-${PORTVERSION}-beta2
MAINTAINER= melifaro@ipfw.ru
diff --git a/net/ipex/Makefile b/net/ipex/Makefile
index c91bab5f04c8..893bb49b4700 100644
--- a/net/ipex/Makefile
+++ b/net/ipex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ipex
PORTVERSION= 3.0
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ipex
+MASTER_SITES= SF
MAINTAINER= csjp@FreeBSD.org
COMMENT= Packet examination / sniffer utility
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 639dfb7fcfe8..f857043b6df1 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -9,8 +9,7 @@ PORTNAME= iplog
PORTVERSION= 2.2.3
PORTREVISION= 3
CATEGORIES= net security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ojnk
+MASTER_SITES= SF/ojnk/${PORTNAME}/${PORTVERSION}
MAINTAINER= udo.schweigert@siemens.com
COMMENT= TCP/IP traffic logging tool
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 02a06008b32f..aeccef8e7241 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -9,7 +9,7 @@ PORTNAME= jags
PORTVERSION= 0.22.1
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Jags/${PORTNAME}-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= JAGS - Just Another GTK+ Samba Client
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index 67dd3942dd0c..90a2684a1ff9 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -9,8 +9,7 @@ PORTNAME= beepcore
PORTVERSION= 0.9.08
PORTREVISION= 3
CATEGORIES= net java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}-java
+MASTER_SITES= SF/${PORTNAME}-java/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= java-
EXTRACT_SUFX= .tgz
diff --git a/net/jicmp/Makefile b/net/jicmp/Makefile
index 6e10c5e45b17..8d764dc27c42 100644
--- a/net/jicmp/Makefile
+++ b/net/jicmp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= jicmp
PORTVERSION= 1.0.9
CATEGORIES= net java
-MASTER_SITES= SF/opennms
+MASTER_SITES= SF/opennms/OldFiles
MAINTAINER= rtdean@cytherianage.net
COMMENT= A Java native interface (JNI) to ICMP (ping)
diff --git a/net/jrdesktop/Makefile b/net/jrdesktop/Makefile
index 7512a2009435..031e439b1c4b 100644
--- a/net/jrdesktop/Makefile
+++ b/net/jrdesktop/Makefile
@@ -8,7 +8,7 @@
PORTNAME= jrdesktop
PORTVERSION= 0.2.0030
CATEGORIES= net java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= gahr@FreeBSD.org
diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 6f220fbef0fb..b4b14a63d4d8 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kiax
PORTVERSION= 0.8.51
PORTREVISION= 3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src_bin.tar.gz/${PORTVERSION}%20%28Ariana%29
DISTNAME= kiax-${PORTVERSION}-src
MAINTAINER= kjelderg@gmail.com
diff --git a/net/kojoney/Makefile b/net/kojoney/Makefile
index f965e183ed33..a173d5f69252 100644
--- a/net/kojoney/Makefile
+++ b/net/kojoney/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kojoney
PORTVERSION= 0.0.4.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kojoney
+MASTER_SITES= SF/${PORTNAME}/Kojoney%20New%20Way/Kojoney%20${PORTVERSION}
MAINTAINER= systemoperator@gmail.com
COMMENT= A low level interaction honeypot that emulates an SSH server
diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile
index 81110fdc1ed1..ee305c0f7b62 100644
--- a/net/l2tpd/Makefile
+++ b/net/l2tpd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= l2tpd
PORTVERSION= 0.69
PORTREVISION= 3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/L2TPd/${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
COMMENT= An implementation of the layer two tunneling protocol
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 168cb6a6b01f..f4aa9812a372 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lambdamoo
PORTVERSION= 1.8.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= LambdaMOO-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net/latd/Makefile b/net/latd/Makefile
index 517f3fabf7a0..2a5dd67cbe51 100644
--- a/net/latd/Makefile
+++ b/net/latd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= latd
PORTVERSION= 1.25
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= linux-decnet
+MASTER_SITES= SF/linux-decnet/${PORTNAME}/${PORTVERSION}
MAINTAINER= tillman@seekingfire.com
COMMENT= The linux-decnet project LAT protocol suite
diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index e386fcaef1a6..43a7aa123cfb 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -8,9 +8,9 @@
PORTNAME= ldapscripts
PORTVERSION= 1.9.0
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://contribs.martymac.com/ldapscripts/
-MASTER_SITE_SUBDIR= ldapscripts
+
EXTRACT_SUFX= .tgz
MAINTAINER= ganael.laplanche@martymac.com
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 8de04f5a4517..b3a252e548cf 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libdnet
PORTVERSION= 1.11
PORTREVISION?= 3
CATEGORIES?= net
-MASTER_SITES= SF
+MASTER_SITES= SF/libdnet/libdnet/libdnet-${PORTVERSION}
MAINTAINER?= onatan@gmail.com
COMMENT= A simple interface to low level networking routines
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index 3588b7739f26..89a9b5461163 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libnetdude
PORTVERSION= 0.10a
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= netdude
+MASTER_SITES= SF/netdude/${PORTNAME}/0.10
MAINTAINER= brenton.chang@gmail.com
COMMENT= A library for manipulating libpcap/tcpdump trace files
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 02069e16a8a8..467af6b9e008 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libnids
PORTVERSION= 1.23
CATEGORIES= net security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= roam@FreeBSD.org
COMMENT= Network monitoring library with TCP/IP reassembly
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index d95115243e76..a99fdab1f756 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libnss-mysql
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libnss-mysql
+MASTER_SITES= SF
MAINTAINER= vd@FreeBSD.org
COMMENT= NSS module using a MySQL database for backend
diff --git a/net/libpcapnav/Makefile b/net/libpcapnav/Makefile
index ba485ad35978..f1e27c5fdecb 100644
--- a/net/libpcapnav/Makefile
+++ b/net/libpcapnav/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libpcapnav
PORTVERSION= 0.8
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= netdude
+MASTER_SITES= SF/netdude/${PORTNAME}/${PORTVERSION}
MAINTAINER= brenton.chang@gmail.com
COMMENT= A libpcap wrapper library
diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index 212aa71f0e7a..2612deb5cda4 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -10,8 +10,7 @@ PORTNAME= librsync
PORTVERSION= 0.9.7
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for delta compression of streams
diff --git a/net/libsocketcpp/Makefile b/net/libsocketcpp/Makefile
index 8311d7e7030c..fc6cff79e993 100644
--- a/net/libsocketcpp/Makefile
+++ b/net/libsocketcpp/Makefile
@@ -9,8 +9,7 @@
PORTNAME= libsocketcpp
PORTVERSION= 1.0.7
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= libsocket
+MASTER_SITES= SF/libsocket/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ wrapper library to the sockets
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 5925866d380b..880ce4a0bf45 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -9,8 +9,7 @@ PORTNAME= liferea
PORTVERSION= 1.4.28
PORTREVISION= 2
CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= liferea
+MASTER_SITES= SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= Simple RSS/RDF feed reader
diff --git a/net/linknx/Makefile b/net/linknx/Makefile
index 8feade116f43..1b973a2f7929 100644
--- a/net/linknx/Makefile
+++ b/net/linknx/Makefile
@@ -9,7 +9,7 @@ PORTNAME= linknx
PORTVERSION= 0.0.1.25
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= bkoenig@alpha-tierchen.de
COMMENT= Rule-based event handling in a KNX installation
diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index e566e9441cad..3ddf18bea28c 100644
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= linuxigd
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= linux-igd
+MASTER_SITES= SF/linux-igd/linux-igd/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Linux UPnP Internet Gateway Device
diff --git a/net/lla/Makefile b/net/lla/Makefile
index e825d75bc971..3c7c623368c6 100644
--- a/net/lla/Makefile
+++ b/net/lla/Makefile
@@ -8,8 +8,7 @@
PORTNAME= lla
PORTVERSION= 0.99.1
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}.${PORTVERSION}
EXTRACT_SUFX= .pl
diff --git a/net/lyntin/Makefile b/net/lyntin/Makefile
index 29949bdd7f0d..c1501e025bbe 100644
--- a/net/lyntin/Makefile
+++ b/net/lyntin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lyntin
PORTVERSION= 4.1.1
PORTREVISION= 1
CATEGORIES= net games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= stefan@aeschbacher.ch
COMMENT= A highly configurable client program to help playing muds
diff --git a/net/mcast-tools/Makefile b/net/mcast-tools/Makefile
index 7dca7f5b22cf..17ab6a08745d 100644
--- a/net/mcast-tools/Makefile
+++ b/net/mcast-tools/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mcast-tools
PORTVERSION= 20061214
PORTREVISION= 0
CATEGORIES= net ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mcast-tools
+MASTER_SITES= SF
MAINTAINER= suz@FreeBSD.org
COMMENT= IPv6 multicast routing daemons and tools
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 7eb8f19b3da6..7b3c8b266936 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mediatomb
PORTVERSION= 0.11.0
PORTREVISION= 2
CATEGORIES= net multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/MediaTomb/${PORTVERSION}
MAINTAINER= leo@mediatomb.cc
COMMENT= UPnP AV MediaServer
diff --git a/net/mknbi/Makefile b/net/mknbi/Makefile
index 467ed85aef6b..d31707bf0bfa 100644
--- a/net/mknbi/Makefile
+++ b/net/mknbi/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mknbi
PORTVERSION= 1.4.4
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= etherboot
+MASTER_SITES= SF/etherboot/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Creates tagged boot images for net/ether boot
diff --git a/net/mmucl/Makefile b/net/mmucl/Makefile
index 7d6247dc4dcb..557b250dd41d 100644
--- a/net/mmucl/Makefile
+++ b/net/mmucl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mmucl
PORTVERSION= 1.5.2
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= tim@SPYDERWEB.COM.AU
COMMENT= Powerful GUI MUD client written in TCL
diff --git a/net/mpd4/Makefile b/net/mpd4/Makefile
index 89493bd82716..f669b21545f4 100644
--- a/net/mpd4/Makefile
+++ b/net/mpd4/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mpd
DISTVERSION= 4.4.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= mpd
+MASTER_SITES= SF/${PORTNAME}/Mpd4/Mpd-${PORTVERSION}
DIST_SUBDIR= mpd4
MAINTAINER= mav@FreeBSD.org
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index 5b794a3a5649..9d93025ac5fe 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mpd
DISTVERSION= 5.3
CATEGORIES= net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= mpd
+MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
DIST_SUBDIR= mpd5
MAINTAINER= mav@FreeBSD.org
diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile
index 35f277ae1a3a..513107b0befb 100644
--- a/net/nbd-server/Makefile
+++ b/net/nbd-server/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 2.8.5
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nbd
+MASTER_SITES= SF/nbd/nbd/${PORTVERSION}
DISTNAME= nbd-${PORTVERSION}
MAINTAINER= rebehn@ant.uni-bremen.de
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index b34ccf3cf42e..ed0c07d931a0 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.4
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= molter@tin.it
COMMENT= Command-line network packet creation and injection suite
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index 4c9e69d89ddd..9237c99cf0bf 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nepenthes
PORTVERSION= 0.2.2
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Nepenthes%20development/${PORTVERSION}
MAINTAINER= systemoperator@gmail.com
COMMENT= Determine the malware activity on a network
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index c890d29836ee..289506abc39a 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -9,8 +9,7 @@ PORTNAME= netatalk
PORTVERSION= 2.0.4
PORTEPOCH= 1
CATEGORIES= net print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= netatalk
+MASTER_SITES= SF
MAINTAINER= marcus@FreeBSD.org
COMMENT= File and print server for AppleTalk networks
diff --git a/net/netclasses/Makefile b/net/netclasses/Makefile
index 9f3d008745ef..f8fb07048642 100644
--- a/net/netclasses/Makefile
+++ b/net/netclasses/Makefile
@@ -8,8 +8,7 @@
PORTNAME= netclasses
PORTVERSION= 1.06
CATEGORIES= net gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Objective-C framework for socket programming with GNUstep
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 12358d8fa10c..0cd5d5e20665 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -10,8 +10,7 @@ PORTNAME= netdude
PORTVERSION= 0.4.8a
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.4.8
MAINTAINER= brenton.chang@gmail.com
COMMENT= NETwork DUmp data Displayer and Editor for tcpdump tracefiles
diff --git a/net/netmap/Makefile b/net/netmap/Makefile
index 4afe76350990..4b87b3e85c31 100644
--- a/net/netmap/Makefile
+++ b/net/netmap/Makefile
@@ -10,8 +10,7 @@ PORTNAME= netmap
PORTVERSION= 0.1.2b
PORTREVISION= 3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NetMap%200.1.2
MAINTAINER= ports@FreeBSD.org
COMMENT= Make a graphical representation of the surounding network
diff --git a/net/netscript/Makefile b/net/netscript/Makefile
index a31c892ae6cf..82b063cd4a0c 100644
--- a/net/netscript/Makefile
+++ b/net/netscript/Makefile
@@ -10,9 +10,9 @@ PORTNAME= netscript
PORTVERSION= 1.7.1
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://fakehalo.deadpig.org/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/net/netstrain/Makefile b/net/netstrain/Makefile
index c88e9afd7501..4c20b95454c7 100644
--- a/net/netstrain/Makefile
+++ b/net/netstrain/Makefile
@@ -8,8 +8,7 @@
PORTNAME= netstrain
PORTVERSION= 3.0
CATEGORIES= net ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= Janos.Mohacsi@bsd.hu
COMMENT= Tool to measure practical TCP throughput between two machines
diff --git a/net/ng_car/Makefile b/net/ng_car/Makefile
index 490ace370309..d9adf053f08f 100644
--- a/net/ng_car/Makefile
+++ b/net/ng_car/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ng_car
PORTVERSION= 0.6
CATEGORIES= net kld
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= mpd
+MASTER_SITES= SF/mpd/misc/${PORTNAME}-${PORTVERSION}
MAINTAINER= mav@FreeBSD.org
COMMENT= Netgraph committed access rate node
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index 101d60a4d9ce..50e9e229c5bc 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -9,8 +9,7 @@
PORTNAME= ngrep
PORTVERSION= 1.45
CATEGORIES= net security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= edwin@mavetju.org
diff --git a/net/ns/Makefile b/net/ns/Makefile
index b57ca4302f3c..3496a940136e 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ns
PORTVERSION= 2.33
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nsnam
+MASTER_SITES= SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION}
MAINTAINER= lstewart@FreeBSD.org
COMMENT= Discrete event simulator for networking research
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index b57ca4302f3c..3496a940136e 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ns
PORTVERSION= 2.33
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nsnam
+MASTER_SITES= SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION}
MAINTAINER= lstewart@FreeBSD.org
COMMENT= Discrete event simulator for networking research
diff --git a/net/ntlmaps/Makefile b/net/ntlmaps/Makefile
index 826b296a3199..6f9e9068f56e 100644
--- a/net/ntlmaps/Makefile
+++ b/net/ntlmaps/Makefile
@@ -8,8 +8,7 @@ PORTNAME= ntlmaps
PORTVERSION= 0.9.9.0.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= kevlo@FreeBSD.org
COMMENT= A proxy that authenticates the user using the NTLM protocol
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 3bc047c36446..f6d5af8acb5e 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ntop
PORTVERSION= 3.3.9
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= wxs@FreeBSD.org
COMMENT= Network monitoring tool with command line and web interfaces
diff --git a/net/omnitty/Makefile b/net/omnitty/Makefile
index e1416cab027d..ab30d3ac4b3e 100644
--- a/net/omnitty/Makefile
+++ b/net/omnitty/Makefile
@@ -9,8 +9,7 @@ PORTNAME= omnitty
PORTVERSION= 0.3.0
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= rafan@FreeBSD.org
COMMENT= A curses-based SSH multiplexer
diff --git a/net/openmcu/Makefile b/net/openmcu/Makefile
index b7644d106c50..d6ae6081ef94 100644
--- a/net/openmcu/Makefile
+++ b/net/openmcu/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openmcu
PORTVERSION= 2.2.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openh323
+MASTER_SITES= SF/openh323/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 7ea1acf69888..681443cc776a 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openslp
PORTVERSION= 1.2.1
PORTREVISION= 3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openslp
+MASTER_SITES= SF/${PORTNAME}/OpenSLP/${PORTVERSION}
MAINTAINER= marcus@FreeBSD.org
COMMENT= Open-source implementation of the Service Location Protocol
diff --git a/net/p5-Net-Gnats/Makefile b/net/p5-Net-Gnats/Makefile
index 307705d3b932..154b83330e60 100644
--- a/net/p5-Net-Gnats/Makefile
+++ b/net/p5-Net-Gnats/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Net-Gnats
PORTVERSION= 0.06
CATEGORIES= net databases perl5
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= gnatsperl
+MASTER_SITES= SF/gnatsperl/gnatsperl/${PORTVERSION}
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/net/p5-Net-HL7/Makefile b/net/p5-Net-HL7/Makefile
index 4b1b9d65bb64..e3a9a8c9fb0d 100644
--- a/net/p5-Net-HL7/Makefile
+++ b/net/p5-Net-HL7/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Net-HL7
PORTVERSION= 0.75
CATEGORIES= net perl5
-MASTER_SITES= SF/hl7toolkit
+MASTER_SITES= SF/hl7toolkit/hl7api/${PORTVERSION}
PKGNAMEPREFIX= p5-
MAINTAINER= bbp2006@columbia.edu
diff --git a/net/panoptis/Makefile b/net/panoptis/Makefile
index ec90edeadd5a..20fb8c8ca0f8 100644
--- a/net/panoptis/Makefile
+++ b/net/panoptis/Makefile
@@ -10,7 +10,6 @@ PORTVERSION= 0.1.4
PORTREVISION= 1
CATEGORIES= net security
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sbrabez@gmail.com
COMMENT= Detect and block DoS/DDoS attacks
diff --git a/net/pdb/Makefile b/net/pdb/Makefile
index 2547a419e4d7..1d783f32ab4c 100644
--- a/net/pdb/Makefile
+++ b/net/pdb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pdb
PORTVERSION= 0.1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pktdbg pdb
+MASTER_SITES= SF/pktdbg/pktdbg/${PORTVERSION}%20Beta
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gnn@FreeBSD.org
diff --git a/net/penguintv/Makefile b/net/penguintv/Makefile
index 56e04c24bb45..b657ae8e0b96 100644
--- a/net/penguintv/Makefile
+++ b/net/penguintv/Makefile
@@ -8,8 +8,7 @@ PORTNAME= PenguinTV
PORTVERSION= 4.0.0
PORTREVISION= 1
CATEGORIES= net audio multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= penguintv
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/4.0
MAINTAINER= edwin@mavetju.org
COMMENT= Graphical RSS feed reader with incorperated playback functions - development version
diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile
index 35b6d23d6b81..7b5f852c9728 100644
--- a/net/phpldapadmin/Makefile
+++ b/net/phpldapadmin/Makefile
@@ -9,7 +9,7 @@ PORTNAME= phpldapadmin
PORTVERSION= 1.2.0
PORTEPOCH= 1
CATEGORIES= net www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/net/phpldapadmin098/Makefile b/net/phpldapadmin098/Makefile
index cee295bbf620..b64eee4d8255 100644
--- a/net/phpldapadmin098/Makefile
+++ b/net/phpldapadmin098/Makefile
@@ -9,8 +9,7 @@ PORTNAME= phpldapadmin098
PORTVERSION= 0.9.8.5
PORTEPOCH= 1
CATEGORIES= net www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= phpldapadmin
+MASTER_SITES= SF/phpldapadmin/phpldapadmin/${PORTVERSION}
DISTNAME= ${PORTNAME:S/098//}-${PORTVERSION}
MAINTAINER= m.seaman@infracaninophile.co.uk
diff --git a/net/plugdaemon/Makefile b/net/plugdaemon/Makefile
index 369053f28f34..c2ac5e4506a2 100644
--- a/net/plugdaemon/Makefile
+++ b/net/plugdaemon/Makefile
@@ -8,8 +8,7 @@
PORTNAME= plugdaemon
PORTVERSION= 2.5.4
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= lx@FreeBSD.org
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index 1755b7335f21..929e3cdc5e8e 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -9,8 +9,7 @@ PORTNAME= poptop
PORTVERSION= 1.3.4
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/pptpd/pptpd-${PORTVERSION}
DISTNAME= pptpd-${PORTVERSION:S/.b/-b/}
MAINTAINER= ports@FreeBSD.org
diff --git a/net/portfwd/Makefile b/net/portfwd/Makefile
index 3d182bc23292..1c79bd564edf 100644
--- a/net/portfwd/Makefile
+++ b/net/portfwd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= portfwd
PORTVERSION= 0.29
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ale@FreeBSD.org
COMMENT= A Port Forwarding Daemon
diff --git a/net/pppoa/Makefile b/net/pppoa/Makefile
index e4b6ee1e9762..b9a383d4b866 100644
--- a/net/pppoa/Makefile
+++ b/net/pppoa/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.3.1
PORTEPOCH= 2
CATEGORIES= net
MASTER_SITES= http://www.oracle-base.com/articles/misc/:mngt \
- ${MASTER_SITE_SOURCEFORGE:S/$/:src/}
-MASTER_SITE_SUBDIR= speedtouch/:src
+ SF/speedtouch/speedtouch%20driver/Release%20${PORTVERSION}:src
DISTFILES= ${SPEEDTOUCH}.tar.bz2:src ${ALCATELDRIVER}:mngt
EXTRACT_ONLY= ${SPEEDTOUCH}.tar.bz2
diff --git a/net/pptpclient/Makefile b/net/pptpclient/Makefile
index dcff1e6f453a..51995c53605c 100644
--- a/net/pptpclient/Makefile
+++ b/net/pptpclient/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pptpclient
PORTVERSION= 1.7.2
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/pptp/pptp-${PORTVERSION}
DISTNAME= pptp-${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile
index b2c46128e13b..e9a3a13247c2 100644
--- a/net/prosearch/Makefile
+++ b/net/prosearch/Makefile
@@ -9,8 +9,7 @@ PORTNAME= prosearch
PORTVERSION= 0.18.2
PORTREVISION= 3
CATEGORIES= net www
-MASTER_SITES= http://pro.setun.net/search/download/ SF
-MASTER_SITE_SUBDIR= pro-search
+MASTER_SITES= http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
MAINTAINER= proler@gmail.com
COMMENT= Powerful file search
diff --git a/net/proxychains/Makefile b/net/proxychains/Makefile
index 533249a893d7..525439c720bf 100644
--- a/net/proxychains/Makefile
+++ b/net/proxychains/Makefile
@@ -6,8 +6,7 @@
PORTNAME= proxychains
PORTVERSION= 3.1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= proxychains
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/version%20${PORTVERSION}
MAINTAINER= mycroft@virgaria.org
COMMENT= Redirect connection through proxy servers
diff --git a/net/ptpd/Makefile b/net/ptpd/Makefile
index c3c82958c35f..1a6bc444fd19 100644
--- a/net/ptpd/Makefile
+++ b/net/ptpd/Makefile
@@ -10,7 +10,6 @@ DISTVERSION= 1.0.0
PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnn@FreeBSD.org
COMMENT= An implementation of the precision time protocol IEEE 1588
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index b80999678dea..33cd5bfb511e 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -10,8 +10,7 @@ PORTNAME= pvm++
PORTVERSION= 0.6.0
PORTREVISION= 4
CATEGORIES= net parallel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S:+:-plus:g}
+MASTER_SITES= SF/pvm-plus-plus/pvm-plus-plus/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++-Library for PVM
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index 0e33c2e7d212..858b833df7da 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -8,8 +8,7 @@
PORTNAME= google
PORTVERSION= 0.6
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pygoogle
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygoogle-${PORTVERSION}
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index 7f8a3782c004..dc6b3d503201 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libnet
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= net python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pylibnet
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pylibnet-${PORTVERSION}
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index de3976f01ef4..edd898705512 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -8,9 +8,9 @@
PORTNAME= pcap
PORTVERSION= 0.6.2
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/pylib${PORTNAME}/pylib${PORTNAME}/${PORTVERSION} \
http://people.freebsd.org/~perky/distfiles/:local
-MASTER_SITE_SUBDIR= pylibpcap
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pylibpcap-${PORTVERSION}
diff --git a/net/py-pcs/Makefile b/net/py-pcs/Makefile
index 558b0fd28128..60324bf35a4d 100644
--- a/net/py-pcs/Makefile
+++ b/net/py-pcs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pcs
PORTVERSION= 0.5
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pcs
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Beta-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gnn@FreeBSD.org
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index e0d718dd3ef1..d287c2e5ae0b 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= s3cmd
PORTVERSION= 0.9.9
CATEGORIES= net python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= s3tools
+MASTER_SITES= SF/s3tools/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= clsung@FreeBSD.org
diff --git a/net/py-soappy-devel/Makefile b/net/py-soappy-devel/Makefile
index ff4d3c5d1b6e..aabccafed1a4 100644
--- a/net/py-soappy-devel/Makefile
+++ b/net/py-soappy-devel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= soappy
PORTVERSION= 0.12.0
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pywebsvcs
+MASTER_SITES= SF/pywebsvcs/SOAP.py/${PORTVERSION}_rc1
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= -devel
DISTNAME= SOAPpy-${PORTVERSION}
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 6497a0da33e7..20021caaea20 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= soappy
PORTVERSION= 0.11.6
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pywebsvcs
+MASTER_SITES= SF/pywebsvcs/SOAP.py/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= SOAPpy-${PORTVERSION}
diff --git a/net/py-soapy/Makefile b/net/py-soapy/Makefile
index 3ed4a7ee4854..f049e7b674ca 100644
--- a/net/py-soapy/Makefile
+++ b/net/py-soapy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= soapy
PORTVERSION= 0.1
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sbrabez@gmail.com
diff --git a/net/py-xmlrpc/Makefile b/net/py-xmlrpc/Makefile
index 87e3a696b343..492016dc89df 100644
--- a/net/py-xmlrpc/Makefile
+++ b/net/py-xmlrpc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xmlrpc
PORTVERSION= 0.8.8.3
PORTREVISION= 2
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= py-${PORTNAME}
+MASTER_SITES= SF/py-${PORTNAME}/source/py-${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py-${PORTNAME}-${PORTVERSION}
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index 3861f38e9cbe..b5946a33bd28 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= zsi
PORTVERSION= 2.0
PORTEPOCH= 1
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pywebsvcs
+MASTER_SITES= SF/pywebsvcs/ZSI/ZSI-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
diff --git a/net/pypvm/Makefile b/net/pypvm/Makefile
index 08f172ee6206..417f87995ba5 100644
--- a/net/pypvm/Makefile
+++ b/net/pypvm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pypvm
PORTVERSION= 0.94
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= brooks@FreeBSD.org
COMMENT= PVM for Python
diff --git a/net/pythondirector/Makefile b/net/pythondirector/Makefile
index 8296b6ecebf8..4a403f03e2d6 100644
--- a/net/pythondirector/Makefile
+++ b/net/pythondirector/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pydirector
PORTVERSION= 1.0.0
CATEGORIES= net python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pythondirector
+MASTER_SITES= SF/pythondirector/pythondirector/pythondirector-${PORTVERSION}
MAINTAINER= clement@FreeBSD.org
COMMENT= A TCP load balancer written in Python
diff --git a/net/raddump/Makefile b/net/raddump/Makefile
index 15a5b3d43024..db4c6093374d 100644
--- a/net/raddump/Makefile
+++ b/net/raddump/Makefile
@@ -8,8 +8,7 @@
PORTNAME= raddump
PORTVERSION= 0.3.1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= raddump
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= shanali@yahoo.com
COMMENT= Radius Packet Analyzer
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 1b9ed43d85c3..7230a429ebe1 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rdesktop
PORTVERSION= 1.6.0
PORTREVISION?= 0
CATEGORIES= net comms ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= obrien@FreeBSD.org
COMMENT= RDP client for Windows NT/2000/2003 Terminal Server
diff --git a/net/remmina-applet/Makefile b/net/remmina-applet/Makefile
index 9bded90d5a36..f0b7c4217409 100644
--- a/net/remmina-applet/Makefile
+++ b/net/remmina-applet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= grdc
PORTVERSION= 0.6.0
CATEGORIES= net gnome
-MASTER_SITES= SF/grdc
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-gnome/${PORTVERSION}
PKGNAMESUFFIX= -applet
DISTNAME= ${PORTNAME}-gnome-${PORTVERSION}
diff --git a/net/rexx-sock/Makefile b/net/rexx-sock/Makefile
index f594791d41c5..6d5ea8e7c49c 100644
--- a/net/rexx-sock/Makefile
+++ b/net/rexx-sock/Makefile
@@ -9,8 +9,7 @@
PORTNAME= sock
PORTVERSION= 1.4
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rxsock
+MASTER_SITES= SF/rx${PORTNAME}/rx${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= rexx-
DISTNAME= RxSock-${PORTVERSION}
diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile
index 74eeab705739..df5ee30e6e43 100644
--- a/net/ripe-whois/Makefile
+++ b/net/ripe-whois/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ripe-whois
PORTVERSION= 3.2.2
CATEGORIES= net ipv6
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= whois
+MASTER_SITES= SF/whois/whois/${PORTVERSION}
DISTNAME= whois3-${PORTVERSION}
MAINTAINER= lerik@nolink.net
diff --git a/net/rtg/Makefile b/net/rtg/Makefile
index a1a187605a87..f45e8045546d 100644
--- a/net/rtg/Makefile
+++ b/net/rtg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rtg
PORTVERSION= 0.7.4
PORTREVISION= 4
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rtg
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A flexible, high-performance SNMP statistics monitoring system
diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index 9e2972f5dc7c..5eccc752bea0 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ldap
PORTVERSION= 0.9.7
PORTREVISION= 1
CATEGORIES= net ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ruby-${PORTNAME}
+MASTER_SITES= SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/net/ruby-mpi/Makefile b/net/ruby-mpi/Makefile
index 31b91cf93613..ae0f48a3fe26 100644
--- a/net/ruby-mpi/Makefile
+++ b/net/ruby-mpi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mpi
PORTVERSION= 0.4
PORTREVISION= 4
CATEGORIES= net ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}ruby
+MASTER_SITES= SF/${PORTNAME}ruby/${PORTNAME}ruby/${PORTNAME}ruby-${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}_ruby-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/net/ruby-nis/Makefile b/net/ruby-nis/Makefile
index f7f56605e8c3..716ccf911f7f 100644
--- a/net/ruby-nis/Makefile
+++ b/net/ruby-nis/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nis
PORTVERSION= 0.1.1
PORTREVISION= 1
CATEGORIES= net ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ruby-${PORTNAME}
+MASTER_SITES= SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/net/rude/Makefile b/net/rude/Makefile
index ca06e97f350a..6aa296d8c198 100644
--- a/net/rude/Makefile
+++ b/net/rude/Makefile
@@ -9,8 +9,7 @@ PORTNAME= rude
PORTVERSION= 0.70
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= Janos.Mohacsi@bsd.hu
COMMENT= Rude is a Real-time UDP Data Emitter and Collector (crude)
diff --git a/net/scr_ipfm/Makefile b/net/scr_ipfm/Makefile
index 895f41a2b01d..743a92214b3c 100644
--- a/net/scr_ipfm/Makefile
+++ b/net/scr_ipfm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= scr_ipfm
PORTVERSION= 0.64
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= scripfm
+MASTER_SITES= SF/scripfm/scripfm/${PORTNAME}-${PORTVERSION}
MAINTAINER= sexbear@tmu.edu.tw
COMMENT= Use logs generated by ipfm to show data graphically
diff --git a/net/seda/Makefile b/net/seda/Makefile
index 388f6bc6f850..f93dfab26882 100644
--- a/net/seda/Makefile
+++ b/net/seda/Makefile
@@ -9,8 +9,7 @@ PORTNAME= seda
PORTVERSION= 3.0
PORTREVISION= 2
CATEGORIES= net java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-release-${VERSION_DATE}
MAINTAINER= ports@FreeBSD.org
diff --git a/net/skstream/Makefile b/net/skstream/Makefile
index 0e2ac5f944a7..1c0d79a334e7 100644
--- a/net/skstream/Makefile
+++ b/net/skstream/Makefile
@@ -9,8 +9,7 @@ PORTNAME= skstream
PORTVERSION= 0.3.6
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= worldforge
+MASTER_SITES= SF/worldforge/${PORTNAME}%20%28network%20lib%29/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= An iostream based C++ socket library
diff --git a/net/slbd/Makefile b/net/slbd/Makefile
index 50ccaa0c5f72..052c373d4cc9 100644
--- a/net/slbd/Makefile
+++ b/net/slbd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= slbd
PORTVERSION= 1.3
CATEGORIES= net sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Server load balancing daemon for *BSD pf
diff --git a/net/slirp/Makefile b/net/slirp/Makefile
index fdacfe93d52f..3abd7b2558aa 100644
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= slirp
PORTVERSION= 1.0.16
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=slirp
+MASTER_SITES= SF
MAINTAINER= demon@FreeBSD.org
COMMENT= A (C)SLIP/PPP emulator for users with shell accounts
diff --git a/net/smm++/Makefile b/net/smm++/Makefile
index 6d9a6236f67d..12beae893f2d 100644
--- a/net/smm++/Makefile
+++ b/net/smm++/Makefile
@@ -9,8 +9,7 @@ PORTNAME= smm++
PORTVERSION= 6.1.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= smm
+MASTER_SITES= SF/smm/smm/${PORTVERSION}
DISTNAME= smm611
EXTRACT_SUFX= .tgz
diff --git a/net/sntop/Makefile b/net/sntop/Makefile
index 394adce75100..efc048c8ee31 100644
--- a/net/sntop/Makefile
+++ b/net/sntop/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sntop
PORTVERSION= 1.4.3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= fernan@iib.unsam.edu.ar
COMMENT= Monitor status of network nodes using fping
diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index 5f1c8a18daf6..90f69887f39d 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ss5
PORTVERSION= 3.6.4
PORTREVISION= 1
CATEGORIES= net security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ss5
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-3
DISTNAME= ${PORTNAME}-${PORTVERSION}-3
MAINTAINER= raffaele.delorenzo@libero.it
diff --git a/net/stund/Makefile b/net/stund/Makefile
index 03b36c1a4ea0..53f142410c4b 100644
--- a/net/stund/Makefile
+++ b/net/stund/Makefile
@@ -8,8 +8,7 @@
PORTNAME= stund
PORTVERSION= 0.96
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= stun
+MASTER_SITES= SF/stun/stun/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_Aug13
EXTRACT_SUFX= .tgz
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index 6ddbeff64796..bce50a828370 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tapidbus
PORTVERSION= 0.2.1
PORTREVISION= 5
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tapioca-voip
+MASTER_SITES= SF/tapioca-voip/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstraction layer for interprocess communication
diff --git a/net/tcludp/Makefile b/net/tcludp/Makefile
index 8d1e223007ba..ade18d6d6037 100644
--- a/net/tcludp/Makefile
+++ b/net/tcludp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tcludp
PORTVERSION= 1.0.8
PORTREVISION= 1
CATEGORIES= net tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tcludp
+MASTER_SITES= SF
MAINTAINER= frank@fenor.de
COMMENT= UDP extension for TCL
diff --git a/net/tcpick/Makefile b/net/tcpick/Makefile
index 4f70cdb59421..d60c1ebe11ac 100644
--- a/net/tcpick/Makefile
+++ b/net/tcpick/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tcpick
PORTVERSION= 0.2.1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= A text-based TCP stream sniffer
diff --git a/net/tcpsg/Makefile b/net/tcpsg/Makefile
index 42011a5b2ba1..fb7c073e20fd 100644
--- a/net/tcpsg/Makefile
+++ b/net/tcpsg/Makefile
@@ -9,8 +9,7 @@
PORTNAME= tcpsg
PORTVERSION= 0.0.2
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mich@FreeBSD.org
COMMENT= A simple TCP port forwarder
diff --git a/net/tcpxtract/Makefile b/net/tcpxtract/Makefile
index fc5f7f7ac0b9..ebacf9fd0402 100644
--- a/net/tcpxtract/Makefile
+++ b/net/tcpxtract/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tcpxtract
PORTVERSION= 1.0.1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= nobutaka@freebsd.org
COMMENT= A tool for extracting files from network traffic
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 6c5de72706fe..6f30946ad0b8 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -10,8 +10,7 @@ PORTNAME= tightvnc
PORTVERSION= 1.3.10
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= vnc-tight
+MASTER_SITES= SF/vnc-tight/TightVNC-unix/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}_unixsrc
MAINTAINER= itetcu@FreeBSD.org
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 0c650afad70e..7dfe936ec3b1 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tf
PORTVERSION= 5.0b8
CATEGORIES= net games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= tinyfugue
+MASTER_SITES= SF/tinyfugue/tinyfugue/5.0%20beta%208
DISTVERSION= ${PORTVERSION:S/.//}
DISTNAME= ${PORTNAME}-${DISTVERSION}
diff --git a/net/tptest/Makefile b/net/tptest/Makefile
index 7da45c641b79..d01127f20652 100644
--- a/net/tptest/Makefile
+++ b/net/tptest/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tptest
PORTVERSION= 3.1.7
CATEGORIES= net benchmarks
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTNAME}%203.1
MAINTAINER= girgen@FreeBSD.org
COMMENT= Software suite for testing network throughput and Internet services
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index 6b3ba85adc44..f11989371e4d 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -8,10 +8,11 @@ PORTNAME= tsocks
PORTVERSION= 1.8.b5
PORTREVISION= 4
CATEGORIES= net security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.8%20beta%205 \
http://ftp1.sourceforge.net/tsocks/ \
+
http://www.yazzy.org/ports/tsocks/
-MASTER_SITE_SUBDIR= tsocks
+
DISTNAME=${PORTNAME}-${PORTVERSION:C/.b/beta/}
MAINTAINER= ports@FreeBSD.org
diff --git a/net/uriparser/Makefile b/net/uriparser/Makefile
index c30c599078b0..f2bd40862c47 100644
--- a/net/uriparser/Makefile
+++ b/net/uriparser/Makefile
@@ -8,7 +8,7 @@
PORTNAME= uriparser
PORTVERSION= 0.7.5
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION}
MAINTAINER= ed@FreeBSD.org
COMMENT= URI parsing library
diff --git a/net/vde/Makefile b/net/vde/Makefile
index 4d739e250f30..cff10a11bb51 100644
--- a/net/vde/Makefile
+++ b/net/vde/Makefile
@@ -8,8 +8,7 @@
PORTNAME= vde
PORTVERSION= 1.5.7
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= vde
+MASTER_SITES= SF/${PORTNAME}/OldFiles
EXTRACT_SUFX= .tgz
MAINTAINER= craig@yekse.gank.org
diff --git a/net/vde2/Makefile b/net/vde2/Makefile
index c91b7ea1739d..770c7689c3e1 100644
--- a/net/vde2/Makefile
+++ b/net/vde2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= vde2
PORTVERSION= 2.1.6
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= vde
+MASTER_SITES= SF/vde/${PORTNAME}/${PORTVERSION}
MAINTAINER= pgollucci@FreeBSD.org
COMMENT= User-mode virtual ethernet infrastructure
diff --git a/net/vncreflector/Makefile b/net/vncreflector/Makefile
index e7ed5dc3cee8..0f4a4256d424 100644
--- a/net/vncreflector/Makefile
+++ b/net/vncreflector/Makefile
@@ -9,8 +9,7 @@ PORTNAME= vncreflector
PORTVERSION= 1.2.4
PORTREVISION= 3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=vnc-reflector
+MASTER_SITES= SF/vnc-reflector/vnc-reflector/${PORTVERSION}
DISTNAME= vnc_reflector-${PORTVERSION}
MAINTAINER= brooks@FreeBSD.org
diff --git a/net/wizd/Makefile b/net/wizd/Makefile
index 2e09abc3de12..7f3c70a8d0c4 100644
--- a/net/wizd/Makefile
+++ b/net/wizd/Makefile
@@ -9,7 +9,7 @@ PORTNAME= wizd
PORTVERSION= 24
PORTREVISION= 2
CATEGORIES= net multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Sources/Sources%20v${PORTVERSION}
DISTFILES= wizd_sources_v${PORTVERSION}.zip simplicity_v1-2.zip
MAINTAINER= ayu@commun.jp
diff --git a/net/wmlj/Makefile b/net/wmlj/Makefile
index 96c5ce30758c..145ab07a75e0 100644
--- a/net/wmlj/Makefile
+++ b/net/wmlj/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wmlj
PORTVERSION= 0.4.0
PORTREVISION= 5
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A dockapp that monitors your friends list at LiveJournal.com
diff --git a/net/wmping/Makefile b/net/wmping/Makefile
index 315bb3e76a3d..fb10c524bb90 100644
--- a/net/wmping/Makefile
+++ b/net/wmping/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wmping
PORTVERSION= 0.2.1
PORTREVISION= 1
CATEGORIES= net windowmaker
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= serg@cad.kiev.ua
COMMENT= Windowmaker dock app to display network hosts status
diff --git a/net/wmwave/Makefile b/net/wmwave/Makefile
index 70a5f515eea4..fb387f78dc1f 100644
--- a/net/wmwave/Makefile
+++ b/net/wmwave/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wmwave
PORTVERSION= 0.4
PORTREVISION= 6
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/}
EXTRACT_SUFX= .tgz
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 1b8092cbc683..c0f5df37f321 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -10,8 +10,7 @@ PORTNAME= wol
PORTVERSION= 0.7.1
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ahh
+MASTER_SITES= SF/ahh/OldFiles
MAINTAINER= cm@therek.net
COMMENT= Tool to wake up Wake-On-LAN compliant computers
diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index baa255fef547..ab0e8b17e9c0 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= x11vnc
PORTVERSION= 0.9.6
PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=libvncserver
+MASTER_SITES= SF/libvncserver/${PORTNAME}/${PORTVERSION}
MAINTAINER= beech@FreeBSD.org
COMMENT= VNC server for use with real X displays
diff --git a/net/xmlrpc++/Makefile b/net/xmlrpc++/Makefile
index 94c0db60541e..da488c3a301e 100644
--- a/net/xmlrpc++/Makefile
+++ b/net/xmlrpc++/Makefile
@@ -10,8 +10,7 @@ PORTNAME= xmlrpc++
PORTVERSION= 0.7
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xmlrpcpp
+MASTER_SITES= SF/xmlrpcpp/xmlrpc%2B%2B/Version%20${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 46bf8ad8a5d3..c1329285840b 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -10,7 +10,7 @@ PORTNAME= xmlrpc-c
PORTVERSION= 1.06.32
PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
EXTRACT_SUFX= .tgz
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile
index e0c17e3effd0..8caa4a895fd6 100644
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xmlrpc-epi
PORTVERSION= 0.54
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-base/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A general purpose implementation of the xmlrpc specification in C
diff --git a/net/xprobe/Makefile b/net/xprobe/Makefile
index 5c03f34f4418..3a424560b34e 100644
--- a/net/xprobe/Makefile
+++ b/net/xprobe/Makefile
@@ -8,8 +8,7 @@
PORTNAME= xprobe2
PORTVERSION= 0.3
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xprobe
+MASTER_SITES= SF/xprobe/${PORTNAME}/Xprobe2%20${PORTVERSION}
MAINTAINER= wxs@FreeBSD.org
COMMENT= ICMP active OS fingerprint scanner
diff --git a/net/yaph/Makefile b/net/yaph/Makefile
index 754e2c796ad6..2c1e6598469a 100644
--- a/net/yaph/Makefile
+++ b/net/yaph/Makefile
@@ -6,8 +6,7 @@
PORTNAME= yaph
PORTVERSION= 0.91
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= mycroft@virgaria.org
diff --git a/net/zillion/Makefile b/net/zillion/Makefile
index 12cc0a8e5e3a..4e8125071d61 100644
--- a/net/zillion/Makefile
+++ b/net/zillion/Makefile
@@ -9,8 +9,7 @@ PORTNAME= zillion
PORTVERSION= 0.1
PORTREVISION= 2
CATEGORIES= net gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-0_1
MAINTAINER= dinoex@FreeBSD.org
diff --git a/news/PicMonger/Makefile b/news/PicMonger/Makefile
index b36eac4c62e8..53a1e89210f6 100644
--- a/news/PicMonger/Makefile
+++ b/news/PicMonger/Makefile
@@ -9,8 +9,7 @@ PORTNAME= PicMonger
PORTVERSION= 0.9.6
PORTREVISION= 7
CATEGORIES= news graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=picmonger
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An automated USENET (NNTP) picture decoding client
diff --git a/news/fidogate-ds/Makefile b/news/fidogate-ds/Makefile
index c7715a15a71e..cb1957b8347b 100644
--- a/news/fidogate-ds/Makefile
+++ b/news/fidogate-ds/Makefile
@@ -8,8 +8,7 @@ PORTNAME= fidogate
PORTVERSION= 5.1.7
PORTREVISION= 1
CATEGORIES= news mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= rusfidogate
+MASTER_SITES= SF/rus${PORTNAME}/${PORTNAME}-stable/${PORTNAME}%20${PORTVERSION}ds
PKGNAMESUFFIX= -ds
DISTNAME= fidogate${PORTVERSION}ds
diff --git a/news/golded+/Makefile b/news/golded+/Makefile
index 04fe823f01c1..da0aa94ea5c1 100644
--- a/news/golded+/Makefile
+++ b/news/golded+/Makefile
@@ -8,8 +8,7 @@
PORTNAME= golded+
PORTVERSION= 1.1.5.a${SNAPDATE}
CATEGORIES= news mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=golded-plus
+MASTER_SITES= SF/golded-plus/golded-plus-src/Snapshot%20of%20the%201.1.5
DISTNAME= gps${SNAPDATE:S,^200,,}
SNAPDATE= 20070503
EXTRACT_SUFX= .tb2
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 534277503470..aa7ca3dd3537 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -9,8 +9,7 @@ PORTNAME= grn
PORTVERSION= 0.0.28
PORTREVISION= 6
CATEGORIES= news gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/pre-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A NNTP client for Gnome
diff --git a/news/husky-base-devel/Makefile b/news/husky-base-devel/Makefile
index 6cb6ae7071de..70cb3abacf19 100644
--- a/news/husky-base-devel/Makefile
+++ b/news/husky-base-devel/Makefile
@@ -9,7 +9,9 @@ PORTNAME= base
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= news mail
-DISTFILES= huskybase-${PORTVERSION}-tar.gz
+MASTER_SITES= SF/husky/huskybase/1.4%20RC4
+DISTNAME= huskybase-${PORTVERSION}
+EXTRACT_SUFX= -tar.gz
MAINTAINER= os@rsu.ru
COMMENT= Common files for Husky Fidosoft Project. Development version
diff --git a/news/husky-base-devel/Makefile.inc b/news/husky-base-devel/Makefile.inc
index fa5e08aab1ee..a22052479400 100644
--- a/news/husky-base-devel/Makefile.inc
+++ b/news/husky-base-devel/Makefile.inc
@@ -4,8 +4,6 @@
PKGNAMEPREFIX= husky-
PKGNAMESUFFIX= -devel
-MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= husky
DIST_SUBDIR= husky
WRKSRC?= ${WRKDIR}/${PORTNAME}
diff --git a/news/husky-base/Makefile b/news/husky-base/Makefile
index 9eabecbaf4de..d291c8d82271 100644
--- a/news/husky-base/Makefile
+++ b/news/husky-base/Makefile
@@ -9,6 +9,7 @@ PORTNAME= base
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/huskybase/${PORTVERSION}
DISTNAME= huskybase-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-base/Makefile.inc b/news/husky-base/Makefile.inc
index 96e98ea5787e..04ad15031ae4 100644
--- a/news/husky-base/Makefile.inc
+++ b/news/husky-base/Makefile.inc
@@ -3,8 +3,6 @@
#
PKGNAMEPREFIX= husky-
-MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= husky
DIST_SUBDIR= husky
WRKSRC?= ${WRKDIR}/${PORTNAME}
diff --git a/news/husky-bsopack/Makefile b/news/husky-bsopack/Makefile
index c50b2b1b17da..22c4a0d2295f 100644
--- a/news/husky-bsopack/Makefile
+++ b/news/husky-bsopack/Makefile
@@ -9,6 +9,7 @@ PORTNAME= bsopack
PORTVERSION= 0.2.4
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/0.2-release
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-fidoconf-devel/Makefile b/news/husky-fidoconf-devel/Makefile
index 7c6ffedaa632..399b61cf1b61 100644
--- a/news/husky-fidoconf-devel/Makefile
+++ b/news/husky-fidoconf-devel/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fidoconf
DISTVERSION= 1.4-rc5
CATEGORIES= news mail
+MASTER_SITES= SF/husky/fidoconfig/1.4-RC5
MAINTAINER= os@rsu.ru
COMMENT= Configuration library for Husky Fidosoft Project. Development version
diff --git a/news/husky-fidoconf/Makefile b/news/husky-fidoconf/Makefile
index a1f054e27840..3cb5399dc9e8 100644
--- a/news/husky-fidoconf/Makefile
+++ b/news/husky-fidoconf/Makefile
@@ -9,6 +9,7 @@ PORTNAME= fidoconf
PORTVERSION= 0.14.4
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/fidoconfig/0.14-release
DISTNAME= ${PORTNAME}_${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-hpt-devel/Makefile b/news/husky-hpt-devel/Makefile
index ee2efaebabde..64a149b481d1 100644
--- a/news/husky-hpt-devel/Makefile
+++ b/news/husky-hpt-devel/Makefile
@@ -8,6 +8,7 @@
PORTNAME= hpt
DISTVERSION= 1.4-rc5
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/1.4-RC5
MAINTAINER= os@rsu.ru
COMMENT= Highly Portable Tosser (full-featured FTN tosser). Development version
diff --git a/news/husky-hpt/Makefile b/news/husky-hpt/Makefile
index b237efb44326..b667cbddcd4b 100644
--- a/news/husky-hpt/Makefile
+++ b/news/husky-hpt/Makefile
@@ -9,6 +9,7 @@ PORTNAME= hpt
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/1.2-release
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-hptkill/Makefile b/news/husky-hptkill/Makefile
index 47d38cbedcf8..bfc8eb5c0469 100644
--- a/news/husky-hptkill/Makefile
+++ b/news/husky-hptkill/Makefile
@@ -9,6 +9,7 @@ PORTNAME= hptkill
PORTVERSION= 1.10.4
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/1.10-release
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-hptsqfix/Makefile b/news/husky-hptsqfix/Makefile
index 2b55f27e9355..4147cfe89f07 100644
--- a/news/husky-hptsqfix/Makefile
+++ b/news/husky-hptsqfix/Makefile
@@ -9,6 +9,7 @@ PORTNAME= hptsqfix
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/1.2-release
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-hpucode/Makefile b/news/husky-hpucode/Makefile
index 3c7ea80e63d7..7dae7fef34b7 100644
--- a/news/husky-hpucode/Makefile
+++ b/news/husky-hpucode/Makefile
@@ -9,6 +9,7 @@ PORTNAME= hpucode
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/1.2-release
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-htick-devel/Makefile b/news/husky-htick-devel/Makefile
index 5652bd22cbbe..a1653c496f56 100644
--- a/news/husky-htick-devel/Makefile
+++ b/news/husky-htick-devel/Makefile
@@ -8,6 +8,8 @@
PORTNAME= htick
DISTVERSION= 1.4-rc5
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/1.4-RC5
+
PKGNAMESUFFIX= -devel
MAINTAINER= mail@ozzmosis.com
diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile
index 6836432a4e5e..24c6c37fb82b 100644
--- a/news/husky-htick/Makefile
+++ b/news/husky-htick/Makefile
@@ -9,6 +9,7 @@ PORTNAME= htick
PORTVERSION= 1.0.4
PORTREVISION= 2
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/1.0-release
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-msged/Makefile b/news/husky-msged/Makefile
index eb4ddcfc46aa..585f8335737b 100644
--- a/news/husky-msged/Makefile
+++ b/news/husky-msged/Makefile
@@ -9,6 +9,7 @@ PORTNAME= msged
PORTVERSION= 6.2RC1
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/6.2%20RC1
DISTNAME= ${PORTNAME}-${PORTVERSION}-stable-src
EXTRACT_SUFX= .tgz
diff --git a/news/husky-nltools/Makefile b/news/husky-nltools/Makefile
index c10f747546a1..d717a4f0a39c 100644
--- a/news/husky-nltools/Makefile
+++ b/news/husky-nltools/Makefile
@@ -9,6 +9,7 @@ PORTNAME= nltools
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/1.2-release
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-smapi-devel/Makefile b/news/husky-smapi-devel/Makefile
index 97a7be0eb83f..c0dc7d799181 100644
--- a/news/husky-smapi-devel/Makefile
+++ b/news/husky-smapi-devel/Makefile
@@ -8,6 +8,7 @@
PORTNAME= smapi
DISTVERSION= 2.4-rc5
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/2.4-RC5
MAINTAINER= os@rsu.ru
COMMENT= MSGAPI for Husky Fidosoft Project. Development version
diff --git a/news/husky-smapi/Makefile b/news/husky-smapi/Makefile
index f1352a3daca1..ad47bbd88f84 100644
--- a/news/husky-smapi/Makefile
+++ b/news/husky-smapi/Makefile
@@ -9,6 +9,7 @@ PORTNAME= smapi
PORTVERSION= 2.2.4
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/2.2-release
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/husky-sqpack/Makefile b/news/husky-sqpack/Makefile
index 011b9097c0d0..2114cdab4279 100644
--- a/news/husky-sqpack/Makefile
+++ b/news/husky-sqpack/Makefile
@@ -9,6 +9,7 @@ PORTNAME= sqpack
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= news mail
+MASTER_SITES= SF/husky/${PORTNAME}/1.2-release
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= fjoe@FreeBSD.org
diff --git a/news/klibido/Makefile b/news/klibido/Makefile
index 01715fd88bac..206311bbfce2 100644
--- a/news/klibido/Makefile
+++ b/news/klibido/Makefile
@@ -9,8 +9,7 @@ PORTNAME= klibido
PORTVERSION= 0.2.5
PORTREVISION= 5
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A very fast and efficient KDE/QT-based downloader for Usenet binaries
diff --git a/news/mmail/Makefile b/news/mmail/Makefile
index c7c0929d938a..463ca915984d 100644
--- a/news/mmail/Makefile
+++ b/news/mmail/Makefile
@@ -9,9 +9,9 @@
PORTNAME= mmail
PORTVERSION= 0.49
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/multimail/MultiMail/${PORTVERSION} \
${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= multimail \
+
system/bbs/mail
MAINTAINER= chinsan@FreeBSD.org
diff --git a/news/multisuck/Makefile b/news/multisuck/Makefile
index 5c7ef7d6b3ec..073e81d718fd 100644
--- a/news/multisuck/Makefile
+++ b/news/multisuck/Makefile
@@ -9,8 +9,7 @@
PORTNAME= multisuck
PORTVERSION= 1.0.4
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-server/conn news suck
diff --git a/news/newsgrab/Makefile b/news/newsgrab/Makefile
index 8bac9f49cffd..3103ad29a960 100644
--- a/news/newsgrab/Makefile
+++ b/news/newsgrab/Makefile
@@ -9,8 +9,7 @@ PORTNAME= newsgrab
PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= newsgrab
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile
index 71c65a2499ad..86807d95a1a9 100644
--- a/news/newsstar/Makefile
+++ b/news/newsstar/Makefile
@@ -8,8 +8,7 @@
PORTNAME= newsstar
PORTVERSION= 1.3.2
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= anray@FreeBSD.org
COMMENT= Transfer news between a local NNTP server (INN, sn, s-news)
diff --git a/news/nget/Makefile b/news/nget/Makefile
index 256160fafca8..49f40255d74d 100644
--- a/news/nget/Makefile
+++ b/news/nget/Makefile
@@ -9,8 +9,7 @@ PORTNAME= nget
PORTVERSION= 0.27.1
PORTREVISION= 1
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nget
+MASTER_SITES= SF
DISTNAME= nget-${PORTVERSION}+uulib
MAINTAINER= ports@FreeBSD.org
diff --git a/news/noffle/Makefile b/news/noffle/Makefile
index 7ed1457fd3d9..85de2c4e2036 100644
--- a/news/noffle/Makefile
+++ b/news/noffle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= noffle
PORTVERSION= 1.1.5
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28devel%29/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= News server for low speed dial-up connections
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index cd825a9c6b79..c23c500dbdd6 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nzbget
PORTVERSION= 0.6.0
CATEGORIES= news
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= toxic@doobie.com
COMMENT= A binary newsreader supporting NZB files
diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 53cf9b1fecb0..008fd8973120 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sabnzbdplus
PORTVERSION= 0.4.11
CATEGORIES= news
-MASTER_SITES= SF/sabnzbdplus
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/sabnzbd-${PORTVERSION}
DISTNAME= SABnzbd-${PORTVERSION}-src
MAINTAINER= daniel@netwalk.org
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index c13c7e236a5b..3ca052dfe48c 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -8,12 +8,15 @@
PORTNAME= slrn
PORTVERSION= 0.9.9p1
CATEGORIES= news ipv6
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
ftp://angel.sovam.com/pub/tools/net/news/ \
+
ftp://ftp.fu-berlin.de/pub/unix/news/slrn/ \
+
ftp://ftp.ntua.gr/pub/lang/slang/slrn/ \
+
ftp://ftp.plig.org/pub/slrn/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= johans@stack.nl
COMMENT= SLang-based newsreader
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index c3af50959a29..3cb58304be4b 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -9,8 +9,7 @@ PORTNAME= trn
PORTVERSION= 4.0.b76
PORTREVISION= 1
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}4/4.0%20test76
DISTNAME= trn-4.0-test76
MAINTAINER= johans@stack.nl
diff --git a/news/yencode/Makefile b/news/yencode/Makefile
index 6a5b4004b827..c64c8b8e6de1 100644
--- a/news/yencode/Makefile
+++ b/news/yencode/Makefile
@@ -10,8 +10,7 @@ PORTNAME= yencode
PORTVERSION= 0.46
PORTREVISION= 5
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A free (GPL) encoder and decoder for the yEnc Usenet file format
diff --git a/news/yydecode/Makefile b/news/yydecode/Makefile
index 3cbf9525eace..d9f1e4cf9209 100644
--- a/news/yydecode/Makefile
+++ b/news/yydecode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= yydecode
PORTVERSION= 0.2.10
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= yydecode
+MASTER_SITES= SF
MAINTAINER= miki@ceti.pl
COMMENT= Tool to decode yEnc encoded files