aboutsummaryrefslogtreecommitdiff
path: root/net-p2p
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2009-08-22 00:32:25 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2009-08-22 00:32:25 +0000
commit7914161a414ec0a620f9de779057c9fe0a80343d (patch)
treea4cb00a0087b36d6067c707189e054581a0f12cf /net-p2p
parenta13d9a603d44e9d2d333d5b2033b95a97545f73b (diff)
downloadports-7914161a414ec0a620f9de779057c9fe0a80343d.tar.gz
ports-7914161a414ec0a620f9de779057c9fe0a80343d.zip
Notes
Diffstat (limited to 'net-p2p')
-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
54 files changed, 58 insertions, 90 deletions
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}