summaryrefslogtreecommitdiff
path: root/net-p2p
diff options
context:
space:
mode:
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/Makefile101
-rw-r--r--net-p2p/amule-devel/Makefile4
-rw-r--r--net-p2p/amule/Makefile4
-rw-r--r--net-p2p/amule1/Makefile2
-rw-r--r--net-p2p/amule2/Makefile4
-rw-r--r--net-p2p/apollon/Makefile4
-rw-r--r--net-p2p/azureus/Makefile2
-rw-r--r--net-p2p/azureus2/Makefile2
-rw-r--r--net-p2p/bnbt/Makefile2
-rw-r--r--net-p2p/btpeer/Makefile2
-rw-r--r--net-p2p/btqueue/Makefile2
-rw-r--r--net-p2p/cdonkey/Makefile2
-rw-r--r--net-p2p/ctorrent/Makefile2
-rw-r--r--net-p2p/dcd/Makefile2
-rw-r--r--net-p2p/dclib/Makefile2
-rw-r--r--net-p2p/dctc-gui-qt/Makefile4
-rw-r--r--net-p2p/dctc-gui/Makefile4
-rw-r--r--net-p2p/dctc/Makefile2
-rw-r--r--net-p2p/ed2k/Makefile2
-rw-r--r--net-p2p/edonkey-gui-gtk-urlslave/Makefile4
-rw-r--r--net-p2p/edonkey-gui-gtk/Makefile4
-rw-r--r--net-p2p/edonkey-gui-gtk/pkg-message2
-rw-r--r--net-p2p/edonkey-tool-hash/Makefile2
-rw-r--r--net-p2p/fcptools/Makefile2
-rw-r--r--net-p2p/fidelio/Makefile2
-rw-r--r--net-p2p/freenet/Makefile2
-rw-r--r--net-p2p/freenet05/Makefile2
-rw-r--r--net-p2p/frost/Makefile2
-rw-r--r--net-p2p/gift-fasttrack/Makefile4
-rw-r--r--net-p2p/gift-gnutella/Makefile4
-rw-r--r--net-p2p/gift-openft/Makefile4
-rw-r--r--net-p2p/gift/Makefile2
-rw-r--r--net-p2p/giftcurs/Makefile4
-rw-r--r--net-p2p/giftoxic/Makefile4
-rw-r--r--net-p2p/giftui/Makefile4
-rw-r--r--net-p2p/gkrellm-gift/Makefile4
-rw-r--r--net-p2p/gnewtellium/Makefile2
-rw-r--r--net-p2p/gnome-btdownload/Makefile4
-rw-r--r--net-p2p/gnome-btdownload/pkg-descr2
-rw-r--r--net-p2p/gnunet/Makefile2
-rw-r--r--net-p2p/gtk-gnutella/Makefile2
-rw-r--r--net-p2p/gtkhx/Makefile2
-rw-r--r--net-p2p/gtorrentviewer/Makefile2
-rw-r--r--net-p2p/hagelslag/Makefile2
-rw-r--r--net-p2p/hx/Makefile2
-rw-r--r--net-p2p/i2p/Makefile2
-rw-r--r--net-p2p/javadc/Makefile2
-rw-r--r--net-p2p/jigdo/Makefile2
-rw-r--r--net-p2p/kmldonkey/Makefile2
-rw-r--r--net-p2p/ktorrent-devel/Makefile2
-rw-r--r--net-p2p/ktorrent/Makefile2
-rw-r--r--net-p2p/ktorrent2/Makefile2
-rw-r--r--net-p2p/libbt/Makefile2
-rw-r--r--net-p2p/liberator/Makefile2
-rw-r--r--net-p2p/libfreenet/Makefile2
-rw-r--r--net-p2p/libpdtp/Makefile2
-rw-r--r--net-p2p/libtorrent/Makefile2
-rw-r--r--net-p2p/limewire/Makefile2
-rw-r--r--net-p2p/linux-agsatellite/Makefile2
-rw-r--r--net-p2p/linux-edonkey-core/Makefile2
-rw-r--r--net-p2p/linux-edonkey-core/files/README.FreeBSD4
-rw-r--r--net-p2p/linux-edonkey-server/Makefile2
-rw-r--r--net-p2p/linux-edonkey-tool-recovermet/Makefile2
-rw-r--r--net-p2p/linux-jigdo/Makefile2
-rw-r--r--net-p2p/linux-overnet-core/Makefile2
-rw-r--r--net-p2p/minder/Makefile2
-rw-r--r--net-p2p/mldonkey-devel/Makefile2
-rw-r--r--net-p2p/mldonkey-perlreactor/Makefile2
-rw-r--r--net-p2p/mldonkey-sancho/Makefile2
-rw-r--r--net-p2p/mldonkey-serverspy/Makefile2
-rw-r--r--net-p2p/mldonkey-urlslave/Makefile2
-rw-r--r--net-p2p/mldonkey/Makefile2
-rw-r--r--net-p2p/mute-net/Makefile2
-rw-r--r--net-p2p/mutella/Makefile2
-rw-r--r--net-p2p/napshare/Makefile2
-rw-r--r--net-p2p/nicotine-plus/Makefile2
-rw-r--r--net-p2p/nicotine-plus/pkg-descr2
-rw-r--r--net-p2p/nicotine/Makefile2
-rw-r--r--net-p2p/nicotine/pkg-descr2
-rw-r--r--net-p2p/opendchub/Makefile2
-rw-r--r--net-p2p/p5-pdonkey/Makefile2
-rw-r--r--net-p2p/peercast/Makefile2
-rw-r--r--net-p2p/phex/Makefile2
-rw-r--r--net-p2p/py-bittornado-core/Makefile2
-rw-r--r--net-p2p/py-bittornado/Makefile2
-rw-r--r--net-p2p/py-bittorrent-devel/Makefile2
-rw-r--r--net-p2p/py-bittorrent/Makefile2
-rw-r--r--net-p2p/py-fngrab/Makefile2
-rw-r--r--net-p2p/py-kenosis-bittorrent/Makefile6
-rw-r--r--net-p2p/py-kenosis/Makefile2
-rw-r--r--net-p2p/py-py2play/Makefile2
-rw-r--r--net-p2p/pyslsk/Makefile2
-rw-r--r--net-p2p/qtella/Makefile2
-rw-r--r--net-p2p/qtorrent/Makefile2
-rw-r--r--net-p2p/rtorrent/Makefile4
-rw-r--r--net-p2p/squall/Makefile2
-rw-r--r--net-p2p/torrentflux/Makefile4
-rw-r--r--net-p2p/torrentflux/files/install.txt.in2
-rw-r--r--net-p2p/torrentsniff/Makefile2
-rw-r--r--net-p2p/trackerbt/Makefile2
-rw-r--r--net-p2p/transmission-cli/Makefile2
-rw-r--r--net-p2p/transmission/Makefile2
-rw-r--r--net-p2p/valknut/Makefile4
-rw-r--r--net-p2p/verlihub-plugins/Makefile4
-rw-r--r--net-p2p/verlihub/Makefile2
-rw-r--r--net-p2p/vuze/Makefile2
-rw-r--r--net-p2p/xmule/Makefile2
-rw-r--r--net-p2p/xnap/Makefile2
108 files changed, 230 insertions, 131 deletions
diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index 4502aca7411b..2f535e4934b3 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -3,6 +3,105 @@
COMMENT = peer-to-peer network applications
-# SUBDIR += none yet
+ SUBDIR += amule1
+ SUBDIR += amule2
+ SUBDIR += apollon
+ SUBDIR += azureus
+ SUBDIR += bnbt
+ SUBDIR += btpeer
+ SUBDIR += btqueue
+ SUBDIR += cdonkey
+ SUBDIR += ctorrent
+ SUBDIR += dcd
+ SUBDIR += dclib
+ SUBDIR += dctc
+ SUBDIR += dctc-gui
+ SUBDIR += dctc-gui-qt
+ SUBDIR += edonkey-gui-gtk
+ SUBDIR += edonkey-gui-gtk-urlslave
+ SUBDIR += edonkey-tool-hash
+ SUBDIR += ed2k
+ SUBDIR += fcptools
+ SUBDIR += fidelio
+ SUBDIR += freenet
+ SUBDIR += frost
+ SUBDIR += gift
+ SUBDIR += giftcurs
+ SUBDIR += giftoxic
+ SUBDIR += giftui
+ SUBDIR += gift-fasttrack
+ SUBDIR += gift-gnutella
+ SUBDIR += gift-openft
+ SUBDIR += gkrellm-gift
+ SUBDIR += gnewtellium
+ SUBDIR += gnome-btdownload
+ SUBDIR += gnunet
+ SUBDIR += gtkhx
+ SUBDIR += gtk-gnutella
+ SUBDIR += gtorrentviewer
+ SUBDIR += hagelslag
+ SUBDIR += hx
+ SUBDIR += i2p
+ SUBDIR += javadc
+ SUBDIR += jigdo
+ SUBDIR += kmldonkey
+ SUBDIR += ktorrent
+ SUBDIR += libbt
+ SUBDIR += liberator
+ SUBDIR += libfreenet
+ SUBDIR += libpdtp
+ SUBDIR += libtorrent
+ SUBDIR += limewire
+ SUBDIR += linux-agsatellite
+ SUBDIR += linux-edonkey-core
+ SUBDIR += linux-edonkey-server
+ SUBDIR += linux-edonkey-tool-recovermet
+ SUBDIR += linux-jigdo
+ SUBDIR += linux-overnet-core
+ SUBDIR += minder
+ SUBDIR += mldonkey
+ SUBDIR += mldonkey-core
+ SUBDIR += mldonkey-core-devel
+ SUBDIR += mldonkey-devel
+ SUBDIR += mldonkey-gui
+ SUBDIR += mldonkey-gui-devel
+ SUBDIR += mldonkey-perlreactor
+ SUBDIR += mldonkey-sancho
+ SUBDIR += mldonkey-serverspy
+ SUBDIR += mldonkey-urlslave
+ SUBDIR += mutella
+ SUBDIR += mute-net
+ SUBDIR += mute-net-gui
+ SUBDIR += mute-net-text
+ SUBDIR += napshare
+ SUBDIR += nicotine
+ SUBDIR += opendchub
+ SUBDIR += peercast
+ SUBDIR += phex
+ SUBDIR += pyslsk
+ SUBDIR += py-bittornado
+ SUBDIR += py-bittornado-core
+ SUBDIR += py-bittorrent
+ SUBDIR += py-bittorrent-core
+ SUBDIR += py-bittorrent-core-devel
+ SUBDIR += py-bittorrent-devel
+ SUBDIR += py-fngrab
+ SUBDIR += py-kenosis
+ SUBDIR += py-kenosis-bittorrent
+ SUBDIR += py-py2play
+ SUBDIR += p5-pdonkey
+ SUBDIR += qtella
+ SUBDIR += qtorrent
+ SUBDIR += rtorrent
+ SUBDIR += squall
+ SUBDIR += torrentflux
+ SUBDIR += torrentsniff
+ SUBDIR += trackerbt
+ SUBDIR += transmission
+ SUBDIR += valknut
+ SUBDIR += verlihub
+ SUBDIR += verlihub-plugins
+ SUBDIR += xmule
+ SUBDIR += xnap
.include <bsd.port.subdir.mk>
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index c9ba978e207c..248129472ff2 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aMule
PORTVERSION= 2.1.0
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://download.berlios.de/amule/
MAINTAINER= ganael.laplanche@martymac.com
@@ -54,7 +54,7 @@ CURL_CONFIG?= ${LOCALBASE}/bin/curl-config
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-BROKEN= "Won't compile on FreeBSD 4.x - See net/amule1 for 4.x compatibility."
+BROKEN= "Won't compile on FreeBSD 4.x - See net-p2p/amule1 for 4.x compatibility."
.endif
# Configure options
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index c9ba978e207c..248129472ff2 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aMule
PORTVERSION= 2.1.0
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://download.berlios.de/amule/
MAINTAINER= ganael.laplanche@martymac.com
@@ -54,7 +54,7 @@ CURL_CONFIG?= ${LOCALBASE}/bin/curl-config
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-BROKEN= "Won't compile on FreeBSD 4.x - See net/amule1 for 4.x compatibility."
+BROKEN= "Won't compile on FreeBSD 4.x - See net-p2p/amule1 for 4.x compatibility."
.endif
# Configure options
diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile
index 18fc4bdafdb5..3cc31d6d3e37 100644
--- a/net-p2p/amule1/Makefile
+++ b/net-p2p/amule1/Makefile
@@ -8,7 +8,7 @@
PORTNAME= aMule
PORTVERSION= 1.2.8
PORTREVISION= 3
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://download.berlios.de/amule/
MAINTAINER= ganael.laplanche@martymac.com
diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile
index c9ba978e207c..248129472ff2 100644
--- a/net-p2p/amule2/Makefile
+++ b/net-p2p/amule2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aMule
PORTVERSION= 2.1.0
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://download.berlios.de/amule/
MAINTAINER= ganael.laplanche@martymac.com
@@ -54,7 +54,7 @@ CURL_CONFIG?= ${LOCALBASE}/bin/curl-config
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-BROKEN= "Won't compile on FreeBSD 4.x - See net/amule1 for 4.x compatibility."
+BROKEN= "Won't compile on FreeBSD 4.x - See net-p2p/amule1 for 4.x compatibility."
.endif
# Configure options
diff --git a/net-p2p/apollon/Makefile b/net-p2p/apollon/Makefile
index fd4b9d195342..950d5e146b6f 100644
--- a/net-p2p/apollon/Makefile
+++ b/net-p2p/apollon/Makefile
@@ -8,14 +8,14 @@
PORTNAME= apollon
PORTVERSION= 1.0.1
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= apollon
MAINTAINER= freebsd-ports@varju.ca
COMMENT= KDE client for giFT daemon
-LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
+LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
USE_BZIP2= yes
USE_KDELIBS_VER=3
diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile
index e290bfe7bc14..2aa0602be461 100644
--- a/net-p2p/azureus/Makefile
+++ b/net-p2p/azureus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= azureus
PORTVERSION= 2.3.0.6
PORTREVISION= 1
-CATEGORIES= net java
+CATEGORIES= net-p2p java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= Azureus_${PORTVERSION}_source
diff --git a/net-p2p/azureus2/Makefile b/net-p2p/azureus2/Makefile
index e290bfe7bc14..2aa0602be461 100644
--- a/net-p2p/azureus2/Makefile
+++ b/net-p2p/azureus2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= azureus
PORTVERSION= 2.3.0.6
PORTREVISION= 1
-CATEGORIES= net java
+CATEGORIES= net-p2p java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= Azureus_${PORTVERSION}_source
diff --git a/net-p2p/bnbt/Makefile b/net-p2p/bnbt/Makefile
index d96e838c53b5..be5e60493922 100644
--- a/net-p2p/bnbt/Makefile
+++ b/net-p2p/bnbt/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bnbt
PORTVERSION= 8.1b3
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bnbt
DISTNAME= bnbt81b-3-sf
diff --git a/net-p2p/btpeer/Makefile b/net-p2p/btpeer/Makefile
index 033ffd95661e..6529c417c495 100644
--- a/net-p2p/btpeer/Makefile
+++ b/net-p2p/btpeer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= btpeer
PORTVERSION= 0.2.1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://www.alhem.net/project/btpeer/
MAINTAINER= lioux@FreeBSD.org
diff --git a/net-p2p/btqueue/Makefile b/net-p2p/btqueue/Makefile
index 320637d4cc50..35886f9bf4cd 100644
--- a/net-p2p/btqueue/Makefile
+++ b/net-p2p/btqueue/Makefile
@@ -7,7 +7,7 @@
PORTNAME= btqueue
PORTVERSION= 0.0.18
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= BTQueue-${PORTVERSION}
diff --git a/net-p2p/cdonkey/Makefile b/net-p2p/cdonkey/Makefile
index 7d09fa56279a..74ab466b7dca 100644
--- a/net-p2p/cdonkey/Makefile
+++ b/net-p2p/cdonkey/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cdonkey
PORTVERSION= 0.9.0
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://suche.org/
DISTNAME= cDonkey-${PORTVERSION}
diff --git a/net-p2p/ctorrent/Makefile b/net-p2p/ctorrent/Makefile
index 00583c5a9700..963f776518bb 100644
--- a/net-p2p/ctorrent/Makefile
+++ b/net-p2p/ctorrent/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ctorrent
PORTVERSION= 1.3.4
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net-p2p/dcd/Makefile b/net-p2p/dcd/Makefile
index 85f6dfb03ee2..c928f64e4848 100644
--- a/net-p2p/dcd/Makefile
+++ b/net-p2p/dcd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dcd
PORTVERSION= 0.5.9
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://www.dc.ds.pg.gda.pl/download/sources/stable/
MAINTAINER= mraleks@bk.ru
diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile
index 8858c847be8e..15af4f767433 100644
--- a/net-p2p/dclib/Makefile
+++ b/net-p2p/dclib/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dclib
PORTVERSION= 0.3.7
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://download.berlios.de/dcgui/ \
http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
diff --git a/net-p2p/dctc-gui-qt/Makefile b/net-p2p/dctc-gui-qt/Makefile
index 1bace60fd4ef..6faa33c540ff 100644
--- a/net-p2p/dctc-gui-qt/Makefile
+++ b/net-p2p/dctc-gui-qt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dctc
PORTVERSION= 0.1.2
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= dc-qt
PKGNAMESUFFIX= -gui-qt
@@ -16,7 +16,7 @@ DISTNAME= dc-qt-${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= A Qt GUI for the Direct Connect (TM) dctc text client
-RUN_DEPENDS= dctc:${PORTSDIR}/net/dctc
+RUN_DEPENDS= dctc:${PORTSDIR}/net-p2p/dctc
USE_QT_VER= 3
USE_REINPLACE= yes
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 3bc7cd18d9a1..96bbd77c1868 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dctc
PORTVERSION= 0.66
PORTREVISION= 2
-CATEGORIES= net gnome
+CATEGORIES= net-p2p gnome
MASTER_SITES= http://unixpages.org/distfiles/
PKGNAMESUFFIX= -gui
DISTNAME= dc_gui-${PORTVERSION}
@@ -16,7 +16,7 @@ DISTNAME= dc_gui-${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
COMMENT= A GUI to DirectConnect (www.neo-modus.com) text client
-BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc
+BUILD_DEPENDS= dctc:${PORTSDIR}/net-p2p/dctc
LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4
USE_GETTEXT= yes
diff --git a/net-p2p/dctc/Makefile b/net-p2p/dctc/Makefile
index db3ae336bc90..45fe3555a611 100644
--- a/net-p2p/dctc/Makefile
+++ b/net-p2p/dctc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dctc
PORTVERSION= 0.84.1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://unixpages.org/distfiles/
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/net-p2p/ed2k/Makefile b/net-p2p/ed2k/Makefile
index 35a5cc6ca35d..5e09f9d2ecc3 100644
--- a/net-p2p/ed2k/Makefile
+++ b/net-p2p/ed2k/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ed2k
PORTVERSION= 1.4
-CATEGORIES= misc
+CATEGORIES= net-p2p
MASTER_SITES= http://www.sdalu.com/download/software/tools/
PKGNAMESUFFIX= -hash${PKGNAMESUFFIX2}
DISTNAME= ed2k.c
diff --git a/net-p2p/edonkey-gui-gtk-urlslave/Makefile b/net-p2p/edonkey-gui-gtk-urlslave/Makefile
index f8d207a441a3..bfcad2bd436f 100644
--- a/net-p2p/edonkey-gui-gtk-urlslave/Makefile
+++ b/net-p2p/edonkey-gui-gtk-urlslave/Makefile
@@ -8,7 +8,7 @@
PORTNAME= edonkey
PORTVERSION= 0.0.2
PORTREVISION= 4
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://home.ircnet.de/cru/ed2k_urlslave/dist/
PKGNAMESUFFIX= -gui-gtk-urlslave
DISTNAME= ed2k_urlslave-v2
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+ enabled Perl script for adding ed2k:// links to ed2k GTK+ GUI
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-RUN_DEPENDS= ed2k_gui:${PORTSDIR}/net/edonkey-gui-gtk
+RUN_DEPENDS= ed2k_gui:${PORTSDIR}/net-p2p/edonkey-gui-gtk
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile
index ede219d20666..d8ee369af6ae 100644
--- a/net-p2p/edonkey-gui-gtk/Makefile
+++ b/net-p2p/edonkey-gui-gtk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= edonkey
PORTVERSION= 0.6.4
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ed2k-gtk-gui
PKGNAMESUFFIX= -gui-gtk
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GTK GUI to eDonkey2000 'core' command line client
LIB_DEPENDS= gnet-2.0:${PORTSDIR}/net/gnet2
-RUN_DEPENDS= donkey:${PORTSDIR}/net/linux-edonkey-core
+RUN_DEPENDS= donkey:${PORTSDIR}/net-p2p/linux-edonkey-core
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/net-p2p/edonkey-gui-gtk/pkg-message b/net-p2p/edonkey-gui-gtk/pkg-message
index 0408bcdbd962..4f38170ce65c 100644
--- a/net-p2p/edonkey-gui-gtk/pkg-message
+++ b/net-p2p/edonkey-gui-gtk/pkg-message
@@ -7,7 +7,7 @@ It might not work at all. As always, there are no implied guarantees.
You try this at your own risk. Be warned. :-)
If it does not work for you, you can always try the Linux version
-of this port available at ${PORTSDIR}/net/linux-edonkey-gui-gtk. It
+of this port available at ${PORTSDIR}/net-p2p/linux-edonkey-gui-gtk. It
might work.
However, before trying the Linux version, try removing old configuration
diff --git a/net-p2p/edonkey-tool-hash/Makefile b/net-p2p/edonkey-tool-hash/Makefile
index 65e0bc642ad9..05df9bc5dcc7 100644
--- a/net-p2p/edonkey-tool-hash/Makefile
+++ b/net-p2p/edonkey-tool-hash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= edonkey
PORTVERSION= 0.4.0
-CATEGORIES= misc
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ed2k-tools
PKGNAMESUFFIX= -tool-hash
diff --git a/net-p2p/fcptools/Makefile b/net-p2p/fcptools/Makefile
index 4d03573f951b..ff655637b11b 100644
--- a/net-p2p/fcptools/Makefile
+++ b/net-p2p/fcptools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fcptools
PORTVERSION= 0.4.7.${RELEASE_DATE}
-CATEGORIES= net security
+CATEGORIES= net-p2p security
MASTER_SITES= http://freenetproject.org/snapshots/
DISTNAME= ${PORTNAME}-${RELEASE_DATE}
EXTRACT_SUFX= .tgz
diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index 221f70203c33..0a6281a761ea 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fidelio
PORTVERSION= 1.0.b1
PORTREVISION= 1
-CATEGORIES= net gnome
+CATEGORIES= net-p2p gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/b/}
diff --git a/net-p2p/freenet/Makefile b/net-p2p/freenet/Makefile
index b0f669b04913..9163f46b4da2 100644
--- a/net-p2p/freenet/Makefile
+++ b/net-p2p/freenet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= freenet
PORTVERSION= 0.5.2.1.5106
PORTREVISION= 1
-CATEGORIES= net java security
+CATEGORIES= net-p2p java security
MASTER_SITES= http://freenetproject.org/snapshots/ \
http://downloads.freenetproject.org/ \
http://fgudin.nerim.net/files/
diff --git a/net-p2p/freenet05/Makefile b/net-p2p/freenet05/Makefile
index b0f669b04913..9163f46b4da2 100644
--- a/net-p2p/freenet05/Makefile
+++ b/net-p2p/freenet05/Makefile
@@ -8,7 +8,7 @@
PORTNAME= freenet
PORTVERSION= 0.5.2.1.5106
PORTREVISION= 1
-CATEGORIES= net java security
+CATEGORIES= net-p2p java security
MASTER_SITES= http://freenetproject.org/snapshots/ \
http://downloads.freenetproject.org/ \
http://fgudin.nerim.net/files/
diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile
index f203cdde1d01..be60b1e17964 100644
--- a/net-p2p/frost/Makefile
+++ b/net-p2p/frost/Makefile
@@ -8,7 +8,7 @@
PORTNAME= frost
PORTVERSION= 1.2.0.20051020
PORTEPOCH= 2
-CATEGORIES= net java
+CATEGORIES= net-p2p java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= jtcfrost
DISTNAME= ${PORTNAME}-20-Oct-2005-java${JAVA_VERSION:S/.//}
diff --git a/net-p2p/gift-fasttrack/Makefile b/net-p2p/gift-fasttrack/Makefile
index d9d761e7357d..7647785933dc 100644
--- a/net-p2p/gift-fasttrack/Makefile
+++ b/net-p2p/gift-fasttrack/Makefile
@@ -7,13 +7,13 @@
PORTNAME= giFT-FastTrack
PORTVERSION= 0.8.9
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://download.berlios.de/gift-fasttrack/
MAINTAINER= shoesoft@gmx.net
COMMENT= A FastTrack plugin for giFT
-LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
+LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-p2p/gift-gnutella/Makefile b/net-p2p/gift-gnutella/Makefile
index 955607394764..971a81c784d7 100644
--- a/net-p2p/gift-gnutella/Makefile
+++ b/net-p2p/gift-gnutella/Makefile
@@ -7,7 +7,7 @@
PORTNAME= giFT-gnutella
PORTVERSION= 0.0.10.1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gift
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= shoesoft@gmx.net
COMMENT= A gnutella plugin for giFT
-LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
+LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/gift-openft/Makefile b/net-p2p/gift-openft/Makefile
index 81fbedc5a0b5..152be633e03a 100644
--- a/net-p2p/gift-openft/Makefile
+++ b/net-p2p/gift-openft/Makefile
@@ -7,7 +7,7 @@
PORTNAME= giFT-OpenFT
PORTVERSION= 0.2.1.6
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gift
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= shoesoft@gmx.net
COMMENT= An OpenFT plugin for giFT
-LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift \
+LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift \
db3.3:${PORTSDIR}/databases/db3
USE_BZIP2= yes
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index 5e6e79899f3d..85f6c7c7e79c 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/gift/Makefile
@@ -8,7 +8,7 @@
PORTNAME= giFT
PORTVERSION= 0.11.8.1
PORTREVISION= 3
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
DISTNAME= ${PORTNAME:L}-${PORTVERSION}
diff --git a/net-p2p/giftcurs/Makefile b/net-p2p/giftcurs/Makefile
index 2ffaf25c7d08..3ceaa9b24976 100644
--- a/net-p2p/giftcurs/Makefile
+++ b/net-p2p/giftcurs/Makefile
@@ -8,14 +8,14 @@
PORTNAME= giFTcurs
PORTVERSION= 0.6.2
PORTREVISION= 4
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= giftcurs
MAINTAINER= shoesoft@gmx.net
COMMENT= A cursed frontend to the giFT daemon
-RUN_DEPENDS= ${LOCALBASE}/bin/giftd:${PORTSDIR}/net/gift
+RUN_DEPENDS= ${LOCALBASE}/bin/giftd:${PORTSDIR}/net-p2p/gift
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-p2p/giftoxic/Makefile b/net-p2p/giftoxic/Makefile
index d881847f82a7..e812108c27bc 100644
--- a/net-p2p/giftoxic/Makefile
+++ b/net-p2p/giftoxic/Makefile
@@ -8,14 +8,14 @@
PORTNAME= giFToxic
PORTVERSION= 0.0.9
PORTREVISION= 5
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= giftoxic
MAINTAINER= joeldiaz@bellsouth.net
COMMENT= GTK2 client for giFT
-LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
+LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
USE_X_PREFIX= yes
USE_GETOPT_LONG= yes
diff --git a/net-p2p/giftui/Makefile b/net-p2p/giftui/Makefile
index aad2e340abb6..e7ecd6d644e7 100644
--- a/net-p2p/giftui/Makefile
+++ b/net-p2p/giftui/Makefile
@@ -8,7 +8,7 @@
PORTNAME= giFTui
PORTVERSION= 0.4.1
PORTREVISION= 4
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= giftui
DISTNAME= giftui-0.4.1
@@ -16,7 +16,7 @@ DISTNAME= giftui-0.4.1
MAINTAINER= joeldiaz@bellsouth.net
COMMENT= GTK2 client for giFT daemon
-LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
+LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/net-p2p/gkrellm-gift/Makefile b/net-p2p/gkrellm-gift/Makefile
index cdf37db41d9a..3a02f4daa1b6 100644
--- a/net-p2p/gkrellm-gift/Makefile
+++ b/net-p2p/gkrellm-gift/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gift
PORTVERSION= 0.2.3
PORTREVISION= 4
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ftp://ftp.code-monkey.de/pub/gkrellm-gift/ \
http://depot.fsck.ch/mirror/distfiles/
PKGNAMEPREFIX= gkrellm-
@@ -17,7 +17,7 @@ DISTNAME= ${PKGNAMEPREFIX}giFT-${PORTVERSION}
MAINTAINER= ports@fsck.ch
COMMENT= GKrellM2 plugin that monitors active giFT transfers
-LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
+LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
diff --git a/net-p2p/gnewtellium/Makefile b/net-p2p/gnewtellium/Makefile
index 74b219196e5d..dd19abff3e5a 100644
--- a/net-p2p/gnewtellium/Makefile
+++ b/net-p2p/gnewtellium/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnewtellium
PORTVERSION= 0.05b
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net-p2p/gnome-btdownload/Makefile b/net-p2p/gnome-btdownload/Makefile
index 7b9c6cbb6968..2b03d35b5f62 100644
--- a/net-p2p/gnome-btdownload/Makefile
+++ b/net-p2p/gnome-btdownload/Makefile
@@ -9,14 +9,14 @@ PORTNAME= gnome-btdownload
PORTVERSION= 0.0.20
PORTREVISION= 2
PORTEPOCH= 1
-CATEGORIES= net gnome
+CATEGORIES= net-p2p gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnome-bt
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple Gnome interface designed as a mime-sink for BitTorrent files
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/BitTorrent/__init__.py:${PORTSDIR}/net/py-bittorrent-core
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/BitTorrent/__init__.py:${PORTSDIR}/net-p2p/py-bittorrent-core
IGNORE=does not run with BitTorrent 4.x yet
diff --git a/net-p2p/gnome-btdownload/pkg-descr b/net-p2p/gnome-btdownload/pkg-descr
index 84a72379f101..48030bee84cc 100644
--- a/net-p2p/gnome-btdownload/pkg-descr
+++ b/net-p2p/gnome-btdownload/pkg-descr
@@ -1,5 +1,5 @@
Gnome interface for 'executing' BitTorrent files. It is designed as a mime-sink
for BitTorrent files. Not a front-end, more-or-less just a session dialog. See
-net/py-bittorrent for more information.
+net-p2p/py-bittorrent for more information.
WWW: http://gnome-bt.sourceforge.net/
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 77d34182b123..48a8c9461de8 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -9,7 +9,7 @@
PORTNAME= gnunet
PORTVERSION= 0.6.6b
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://www.ovmj.org/GNUnet/download/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 0ba51eef7ef9..9adb178411ef 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -26,7 +26,7 @@
PORTNAME= gtk-gnutella
DISTVERSION= 0.96b
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://gtk-gnutella.sourceforge.net/download/ \
ftp://gtk-gnutella.sourceforge.net/pub/gtk-gnutella/
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index 9c4686c0f551..79a7277a124a 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkhx
PORTVERSION= 0.9.3
PORTREVISION= 4
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkhx
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 0801566354c5..b8f99887516b 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtorrentviewer
PORTVERSION= 0.2b
PORTREVISION= 3
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= GTorrentViewer-${PORTVERSION}
diff --git a/net-p2p/hagelslag/Makefile b/net-p2p/hagelslag/Makefile
index f402a92acdc0..f9371d64816c 100644
--- a/net-p2p/hagelslag/Makefile
+++ b/net-p2p/hagelslag/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hagelslag
PORTVERSION= 0.13
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://tiefighter.et.tudelft.nl/hagelslag/ \
ftp://tiefighter.et.tudelft.nl/pub/hagelslag/v${PORTVERSION}/
diff --git a/net-p2p/hx/Makefile b/net-p2p/hx/Makefile
index f6d3c75c93d6..44fc2a22564f 100644
--- a/net-p2p/hx/Makefile
+++ b/net-p2p/hx/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hx
PORTVERSION= 0.7.14
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://members.macconnect.com/users/j/jalex/
MAINTAINER= ports@FreeBSD.org
diff --git a/net-p2p/i2p/Makefile b/net-p2p/i2p/Makefile
index 14d5a99e88ab..1ce98d880ea4 100644
--- a/net-p2p/i2p/Makefile
+++ b/net-p2p/i2p/Makefile
@@ -7,7 +7,7 @@
PORTNAME= i2p
PORTVERSION= 0.6.1.9
-CATEGORIES= net java security
+CATEGORIES= net-p2p java security
MASTER_SITES= http://dev.i2p.net/i2p/
MAINTAINER= lioux@FreeBSD.org
diff --git a/net-p2p/javadc/Makefile b/net-p2p/javadc/Makefile
index 0cf6bb7b7443..83e1a7d7a5b7 100644
--- a/net-p2p/javadc/Makefile
+++ b/net-p2p/javadc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= javadc
PORTVERSION= 0.20
-CATEGORIES= net java
+CATEGORIES= net-p2p java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index 06e672cd2d9d..0a168a5d3b78 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jigdo
PORTVERSION= 0.7.1
-CATEGORIES= ftp
+CATEGORIES= net-p2p
MASTER_SITES= http://atterer.net/jigdo/
MAINTAINER= bra@fsn.hu
diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile
index c57aa196f471..d7ce8e6a8445 100644
--- a/net-p2p/kmldonkey/Makefile
+++ b/net-p2p/kmldonkey/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kmldonkey
PORTVERSION= 0.10.1
PORTREVISION= 1
-CATEGORIES= net kde
+CATEGORIES= net-p2p kde
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.pre/pre/}
diff --git a/net-p2p/ktorrent-devel/Makefile b/net-p2p/ktorrent-devel/Makefile
index 336386555bb5..731f149fe225 100644
--- a/net-p2p/ktorrent-devel/Makefile
+++ b/net-p2p/ktorrent-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ktorrent
PORTVERSION= 1.2.r2
-CATEGORIES= net kde
+CATEGORIES= net-p2p kde
MASTER_SITES= http://ktorrent.pwsp.net/downloads/${PORTVERSION:S/.r/rc/}/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index 336386555bb5..731f149fe225 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ktorrent
PORTVERSION= 1.2.r2
-CATEGORIES= net kde
+CATEGORIES= net-p2p kde
MASTER_SITES= http://ktorrent.pwsp.net/downloads/${PORTVERSION:S/.r/rc/}/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
diff --git a/net-p2p/ktorrent2/Makefile b/net-p2p/ktorrent2/Makefile
index 336386555bb5..731f149fe225 100644
--- a/net-p2p/ktorrent2/Makefile
+++ b/net-p2p/ktorrent2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ktorrent
PORTVERSION= 1.2.r2
-CATEGORIES= net kde
+CATEGORIES= net-p2p kde
MASTER_SITES= http://ktorrent.pwsp.net/downloads/${PORTVERSION:S/.r/rc/}/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index e97dc83d00af..9250f48d0dfa 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libbt
PORTVERSION= 1.04
-CATEGORIES= net devel
+CATEGORIES= net-p2p devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net-p2p/liberator/Makefile b/net-p2p/liberator/Makefile
index c37b8e0a5037..34c625f0d68c 100644
--- a/net-p2p/liberator/Makefile
+++ b/net-p2p/liberator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= liberator
PORTVERSION= 2.0.2
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ofcp-${PORTVERSION}
diff --git a/net-p2p/libfreenet/Makefile b/net-p2p/libfreenet/Makefile
index 4128446f84fc..3efd94df1942 100644
--- a/net-p2p/libfreenet/Makefile
+++ b/net-p2p/libfreenet/Makefile
@@ -9,7 +9,7 @@
PORTNAME= libfreenet
PORTVERSION= 0.5.0
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://thalassocracy.org/libfreenet/
MAINTAINER= ports@FreeBSD.org
diff --git a/net-p2p/libpdtp/Makefile b/net-p2p/libpdtp/Makefile
index fadb9275e6eb..07fa9a0dba92 100644
--- a/net-p2p/libpdtp/Makefile
+++ b/net-p2p/libpdtp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libpdtp
PORTVERSION= 0.1.20040808
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://dist.bsdlab.org/
DISTNAME= ${PORTNAME}-20040808
diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile
index 13c25ef92fbb..613ee6a34f4d 100644
--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libtorrent
PORTVERSION= 0.8.3
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://libtorrent.rakshasa.no/downloads/
MAINTAINER= flz@FreeBSD.org
diff --git a/net-p2p/limewire/Makefile b/net-p2p/limewire/Makefile
index 3856d3537d8e..67f1fefc5e3f 100644
--- a/net-p2p/limewire/Makefile
+++ b/net-p2p/limewire/Makefile
@@ -7,7 +7,7 @@
PORTNAME= limewire
PORTVERSION= 4.9
-CATEGORIES= net java
+CATEGORIES= net-p2p java
MASTER_SITES= http://maverick.limewire.com/download/
DISTNAME= LimeWireOther
diff --git a/net-p2p/linux-agsatellite/Makefile b/net-p2p/linux-agsatellite/Makefile
index d0831a85a470..6c64eed7f98f 100644
--- a/net-p2p/linux-agsatellite/Makefile
+++ b/net-p2p/linux-agsatellite/Makefile
@@ -8,7 +8,7 @@
PORTNAME= agsatellite
PORTVERSION= 0.520
PORTREVISION= 4
-CATEGORIES= net audio linux
+CATEGORIES= net-p2p audio linux
MASTER_SITES= http://www.audiogalaxy.com/downloads/
PKGNAMEPREFIX= linux-
DISTNAME= AGSatellite${PORTVERSION:S/.//}-glibc21
diff --git a/net-p2p/linux-edonkey-core/Makefile b/net-p2p/linux-edonkey-core/Makefile
index 472a87075b60..dcbf8cf69ae4 100644
--- a/net-p2p/linux-edonkey-core/Makefile
+++ b/net-p2p/linux-edonkey-core/Makefile
@@ -8,7 +8,7 @@
PORTNAME= edonkey
PORTVERSION= 1.3.0
PORTEPOCH= 1
-CATEGORIES= net linux
+CATEGORIES= net-p2p linux
MASTER_SITES= http://www.zen18864.zen.co.uk/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -core
diff --git a/net-p2p/linux-edonkey-core/files/README.FreeBSD b/net-p2p/linux-edonkey-core/files/README.FreeBSD
index b4e4c3d86f33..d89debf7d22f 100644
--- a/net-p2p/linux-edonkey-core/files/README.FreeBSD
+++ b/net-p2p/linux-edonkey-core/files/README.FreeBSD
@@ -1,7 +1,7 @@
1) You have to configure the 'core' client and add a password
- Install the "net/edonkey-core" port and type 'donkey'
+ Install the "net-p2p/edonkey-core" port and type 'donkey'
from the command line and then typing 'pass username password' (and
hitting ENTER). Once you are finished, type 'q' (ENTER) and 'y'
(ENTER) to quit and make the core save its preferences.
@@ -20,7 +20,7 @@ type 'donkey - !' from the command line.
3) Run the GUI and connect to the core client
- Install the port "net/edonkey-gui-gtk" or "net/edonkey-gui-java",
+ Install the port "net-p2p/edonkey-gui-gtk" or "net-p2p/edonkey-gui-java",
whichever one you prefer. Next run 'edonkey-gui-gtk' (if you chose
the FreeBSD native GTK GUI client, or linux-edonkey-gui-gtk if Linux
one) or 'edonkey-gui-java' (if you chose the Java GUI client). The
diff --git a/net-p2p/linux-edonkey-server/Makefile b/net-p2p/linux-edonkey-server/Makefile
index d6128236f5a1..ecb785099252 100644
--- a/net-p2p/linux-edonkey-server/Makefile
+++ b/net-p2p/linux-edonkey-server/Makefile
@@ -8,7 +8,7 @@
PORTNAME= edonkey
PORTVERSION= 16.39
PORTREVISION= 1
-CATEGORIES= net linux
+CATEGORIES= net-p2p linux
MASTER_SITES= http://www.edonkey2000.com/files/
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -server
diff --git a/net-p2p/linux-edonkey-tool-recovermet/Makefile b/net-p2p/linux-edonkey-tool-recovermet/Makefile
index 5c7012cd66af..0e89235baf59 100644
--- a/net-p2p/linux-edonkey-tool-recovermet/Makefile
+++ b/net-p2p/linux-edonkey-tool-recovermet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= edonkey
PORTVERSION= 0.0.2
PORTREVISION= 1
-CATEGORIES= misc linux
+CATEGORIES= net-p2p linux
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
PKGNAMEPREFIX= linux-
diff --git a/net-p2p/linux-jigdo/Makefile b/net-p2p/linux-jigdo/Makefile
index 0245f8aa06f7..f4eb334f65c3 100644
--- a/net-p2p/linux-jigdo/Makefile
+++ b/net-p2p/linux-jigdo/Makefile
@@ -9,7 +9,7 @@
PORTNAME= jigdo
PORTVERSION= 0.7.2
#PORTREVISION?= 0
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://atterer.net/jigdo/
PKGNAMEPREFIX= linux-
DISTNAME= jigdo-bin-${PORTVERSION}
diff --git a/net-p2p/linux-overnet-core/Makefile b/net-p2p/linux-overnet-core/Makefile
index 6ee5d30d3cfe..de3d5507bf56 100644
--- a/net-p2p/linux-overnet-core/Makefile
+++ b/net-p2p/linux-overnet-core/Makefile
@@ -7,7 +7,7 @@
PORTNAME= overnet
PORTVERSION= 1.0.1
-CATEGORIES= net linux
+CATEGORIES= net-p2p linux
MASTER_SITES= http://www.zen18864.zen.co.uk/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -core
diff --git a/net-p2p/minder/Makefile b/net-p2p/minder/Makefile
index 2f63ae568968..6a80046bdfc9 100644
--- a/net-p2p/minder/Makefile
+++ b/net-p2p/minder/Makefile
@@ -8,7 +8,7 @@
PORTNAME= minder
PORTVERSION= 1.2
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://www.alhem.net/project/minder/
MAINTAINER= lioux@FreeBSD.org
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index 96946b8a0dd5..92de4f9f13ae 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mldonkey
PORTVERSION= 2.7.3
PORTREVISION= 1
-CATEGORIES+= net
+CATEGORIES+= net-p2p
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMESUFFIX= -devel
diff --git a/net-p2p/mldonkey-perlreactor/Makefile b/net-p2p/mldonkey-perlreactor/Makefile
index 7553fac3a6ca..da64941c242f 100644
--- a/net-p2p/mldonkey-perlreactor/Makefile
+++ b/net-p2p/mldonkey-perlreactor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mldonkey
PORTVERSION= 0.2
-CATEGORIES= net perl5
+CATEGORIES= net-p2p perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= remotefilesync
PKGNAMESUFFIX= -perlreactor
diff --git a/net-p2p/mldonkey-sancho/Makefile b/net-p2p/mldonkey-sancho/Makefile
index 2f0e50285792..83157667d6d6 100644
--- a/net-p2p/mldonkey-sancho/Makefile
+++ b/net-p2p/mldonkey-sancho/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sancho
DISTVERSION= 0.9.4-23
PORTREVISION= 4
-CATEGORIES= net java
+CATEGORIES= net-p2p java
MASTER_SITES= http://sancho-gui.sourceforge.net/%SUBDIR%/
MASTER_SITE_SUBDIR= dl/tmp94
PKGNAMEPREFIX= mldonkey-
diff --git a/net-p2p/mldonkey-serverspy/Makefile b/net-p2p/mldonkey-serverspy/Makefile
index 868d71c21bd5..6c7310e798ed 100644
--- a/net-p2p/mldonkey-serverspy/Makefile
+++ b/net-p2p/mldonkey-serverspy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mldonkey
PORTVERSION= 1.2
PORTREVISION= 1
-CATEGORIES= net perl5
+CATEGORIES= net-p2p perl5
MASTER_SITES= http://www.moviegalaxy.com.ar/mlservspy/
PKGNAMESUFFIX= -serverspy
DISTNAME= mlservspy-${PORTVERSION}
diff --git a/net-p2p/mldonkey-urlslave/Makefile b/net-p2p/mldonkey-urlslave/Makefile
index abff026e5466..f5ce62cdc27f 100644
--- a/net-p2p/mldonkey-urlslave/Makefile
+++ b/net-p2p/mldonkey-urlslave/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mldonkey
PORTVERSION= 0.0.1
PORTREVISION= 2
-CATEGORIES= net perl5
+CATEGORIES= net-p2p perl5
MASTER_SITES= http://home.ircnet.de/cru/ed2k_urlslave/dist/
PKGNAMESUFFIX= -urlslave
DISTNAME= mlurlslave-v${PORTVERSION:S/^0.0.//}
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index 0239fca67967..8d618a8ef87e 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mldonkey
PORTVERSION= 2.5.30.17
PORTREVISION= 1
-CATEGORIES+= net
+CATEGORIES+= net-p2p
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net-p2p/mute-net/Makefile b/net-p2p/mute-net/Makefile
index 9e7d5a38e164..55e6f40ac667 100644
--- a/net-p2p/mute-net/Makefile
+++ b/net-p2p/mute-net/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mute
PORTVERSION= 0.3
PORTREVISION= 3
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}-net
PKGNAMESUFFIX= -net
diff --git a/net-p2p/mutella/Makefile b/net-p2p/mutella/Makefile
index ff2762f26c3e..a38ae1a1043c 100644
--- a/net-p2p/mutella/Makefile
+++ b/net-p2p/mutella/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mutella
PORTVERSION= 0.4.5
PORTEPOCH= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mutella
diff --git a/net-p2p/napshare/Makefile b/net-p2p/napshare/Makefile
index 5953ccc92e38..f7e24fa6cb53 100644
--- a/net-p2p/napshare/Makefile
+++ b/net-p2p/napshare/Makefile
@@ -8,7 +8,7 @@
PORTNAME= napshare
PORTVERSION= 1.2
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= napshare
diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile
index 75b71739feb2..363341847c3c 100644
--- a/net-p2p/nicotine-plus/Makefile
+++ b/net-p2p/nicotine-plus/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nicotine
PORTVERSION= 1.0.8
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://nicotine.thegraveyard.org/
MAINTAINER= sw@gegenunendlich.de
diff --git a/net-p2p/nicotine-plus/pkg-descr b/net-p2p/nicotine-plus/pkg-descr
index 89180e33ab94..ba82d0f159cb 100644
--- a/net-p2p/nicotine-plus/pkg-descr
+++ b/net-p2p/nicotine-plus/pkg-descr
@@ -1,4 +1,4 @@
Nicotine is a GTK2 SoulSeek filesharing client, and is based upon the
-PySoulSeek (net/pyslsk) code.
+PySoulSeek (net-p2p/pyslsk) code.
WWW: http://nicotine.thegraveyard.org/
diff --git a/net-p2p/nicotine/Makefile b/net-p2p/nicotine/Makefile
index 75b71739feb2..363341847c3c 100644
--- a/net-p2p/nicotine/Makefile
+++ b/net-p2p/nicotine/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nicotine
PORTVERSION= 1.0.8
PORTREVISION= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://nicotine.thegraveyard.org/
MAINTAINER= sw@gegenunendlich.de
diff --git a/net-p2p/nicotine/pkg-descr b/net-p2p/nicotine/pkg-descr
index 89180e33ab94..ba82d0f159cb 100644
--- a/net-p2p/nicotine/pkg-descr
+++ b/net-p2p/nicotine/pkg-descr
@@ -1,4 +1,4 @@
Nicotine is a GTK2 SoulSeek filesharing client, and is based upon the
-PySoulSeek (net/pyslsk) code.
+PySoulSeek (net-p2p/pyslsk) code.
WWW: http://nicotine.thegraveyard.org/
diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile
index 418101c52d92..05ef4e478685 100644
--- a/net-p2p/opendchub/Makefile
+++ b/net-p2p/opendchub/Makefile
@@ -8,7 +8,7 @@
PORTNAME= opendchub
PORTVERSION= 0.7.14
PORTREVISION= 2
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net-p2p/p5-pdonkey/Makefile b/net-p2p/p5-pdonkey/Makefile
index a7120117a6d7..ce398590dcac 100644
--- a/net-p2p/p5-pdonkey/Makefile
+++ b/net-p2p/p5-pdonkey/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pdonkey
PORTVERSION= 0.05
-CATEGORIES= net perl5
+CATEGORIES= net-p2p perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
MASTER_SITE_SUBDIR= ${PORTNAME}/:sf \
diff --git a/net-p2p/peercast/Makefile b/net-p2p/peercast/Makefile
index 0312392beead..c807b7804b10 100644
--- a/net-p2p/peercast/Makefile
+++ b/net-p2p/peercast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= peercast
PORTVERSION= 0.1214
-CATEGORIES= net multimedia
+CATEGORIES= net-p2p multimedia
MASTER_SITES= http://www.peercast.org/
DISTNAME= peercast-linux
EXTRACT_SUFX= .tgz
diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile
index bacfc6a74099..811d08c36af2 100644
--- a/net-p2p/phex/Makefile
+++ b/net-p2p/phex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phex
PORTVERSION= 2.2.0.83
-CATEGORIES= net java
+CATEGORIES= net-p2p java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/net-p2p/py-bittornado-core/Makefile b/net-p2p/py-bittornado-core/Makefile
index 63267ab94c52..29e84abe6813 100644
--- a/net-p2p/py-bittornado-core/Makefile
+++ b/net-p2p/py-bittornado-core/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -core
-CATEGORIES= net python
+CATEGORIES= net-p2p python
COMMENT= An extended BitTorrent peer-to-peer core tool for distributing files
diff --git a/net-p2p/py-bittornado/Makefile b/net-p2p/py-bittornado/Makefile
index 928e02a5a387..e99efecb01a3 100644
--- a/net-p2p/py-bittornado/Makefile
+++ b/net-p2p/py-bittornado/Makefile
@@ -9,7 +9,7 @@ PORTNAME= BitTornado
PORTVERSION= 0.3.14
PORTREVISION= 1
PORTEPOCH= 1
-CATEGORIES?= net python ipv6
+CATEGORIES?= net-p2p python ipv6
MASTER_SITES= http://www.bittornado.com/download/ \
http://e.scarywater.net/bt/download/ \
http://mediahost.inetsalestech.com/shadow/ \
diff --git a/net-p2p/py-bittorrent-devel/Makefile b/net-p2p/py-bittorrent-devel/Makefile
index 0ed3c6744d0e..35abfff37031 100644
--- a/net-p2p/py-bittorrent-devel/Makefile
+++ b/net-p2p/py-bittorrent-devel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BitTorrent
PORTVERSION= 4.3.5
PORTEPOCH= 1
-CATEGORIES?= net python
+CATEGORIES?= net-p2p python
MASTER_SITES= http://www.bittorrent.com/dl/ \
${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
diff --git a/net-p2p/py-bittorrent/Makefile b/net-p2p/py-bittorrent/Makefile
index 992a3832bcda..76e8bf5a1999 100644
--- a/net-p2p/py-bittorrent/Makefile
+++ b/net-p2p/py-bittorrent/Makefile
@@ -8,7 +8,7 @@
PORTNAME= BitTorrent
PORTVERSION= 4.2.2
PORTEPOCH= 1
-CATEGORIES?= net python
+CATEGORIES?= net-p2p python
MASTER_SITES= http://www.bittorrent.com/dl/ \
${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
diff --git a/net-p2p/py-fngrab/Makefile b/net-p2p/py-fngrab/Makefile
index 84ae8beb93c8..6c4e02f1e230 100644
--- a/net-p2p/py-fngrab/Makefile
+++ b/net-p2p/py-fngrab/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fngrab
PORTVERSION= 0.0.4
-CATEGORIES= net python
+CATEGORIES= net-p2p python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= freebbs
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net-p2p/py-kenosis-bittorrent/Makefile b/net-p2p/py-kenosis-bittorrent/Makefile
index dd9738a1663c..de9b51efcc88 100644
--- a/net-p2p/py-kenosis-bittorrent/Makefile
+++ b/net-p2p/py-kenosis-bittorrent/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kenosis
PORTVERSION= ${KENOSIS_VERSION}.0.3.4.2
PORTREVISION= 3
PORTEPOCH= 2
-CATEGORIES?= net python
+CATEGORIES?= net-p2p python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ DISTNAME= ${KENOSIS_DISTNAME}
MAINTAINER= lioux@FreeBSD.org
COMMENT?= A Kenosis enabled, distributed BitTorrent
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kenosis/__init__.py:${PORTSDIR}/net/py-kenosis
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kenosis/__init__.py:${PORTSDIR}/net-p2p/py-kenosis
USE_PYTHON= yes
USE_PYDISTUTILS= yes
@@ -38,7 +38,7 @@ PORTDOCS= \
.include <bsd.port.pre.mk>
#KENOSIS_PORTDIR= ../py-kenosis
-KENOSIS_PORTDIR= ${PORTSDIR}/net/py-kenosis
+KENOSIS_PORTDIR= ${PORTSDIR}/net-p2p/py-kenosis
KENOSIS_DISTNAME!= cd ${KENOSIS_PORTDIR} && make -V DISTNAME
KENOSIS_VERSION!= cd ${KENOSIS_PORTDIR} && make -V PORTVERSION
diff --git a/net-p2p/py-kenosis/Makefile b/net-p2p/py-kenosis/Makefile
index 11f14c2bb821..bacadddf3fd8 100644
--- a/net-p2p/py-kenosis/Makefile
+++ b/net-p2p/py-kenosis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kenosis
PORTVERSION= 0.95
-CATEGORIES= net python
+CATEGORIES= net-p2p python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net-p2p/py-py2play/Makefile b/net-p2p/py-py2play/Makefile
index 0145d707d06b..e09903fad8e9 100644
--- a/net-p2p/py-py2play/Makefile
+++ b/net-p2p/py-py2play/Makefile
@@ -7,7 +7,7 @@
PORTNAME= py2play
PORTVERSION= 0.1.8
-CATEGORIES= net python
+CATEGORIES= net-p2p python
MASTER_SITES= http://download.gna.org/slune/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Py2Play-${PORTVERSION}
diff --git a/net-p2p/pyslsk/Makefile b/net-p2p/pyslsk/Makefile
index d7cb10ed6966..a6f6d48a55f2 100644
--- a/net-p2p/pyslsk/Makefile
+++ b/net-p2p/pyslsk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pyslsk
PORTVERSION= 1.2.7b
PORTREVISION= 2
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://www.sensi.org/~ak/pyslsk/
MAINTAINER= shoesoft@gmx.net
diff --git a/net-p2p/qtella/Makefile b/net-p2p/qtella/Makefile
index e597fee1f9da..1d3d7fd39bb9 100644
--- a/net-p2p/qtella/Makefile
+++ b/net-p2p/qtella/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qtella
PORTVERSION= 0.6.4
PORTREVISION= 4
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= qtella
diff --git a/net-p2p/qtorrent/Makefile b/net-p2p/qtorrent/Makefile
index 7238ff2884b1..065f46c32f12 100644
--- a/net-p2p/qtorrent/Makefile
+++ b/net-p2p/qtorrent/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qtorrent
PORTVERSION= 0.9.6.1
PORTREVISION= 3
-CATEGORIES= net python
+CATEGORIES= net-p2p python
MASTER_SITES= http://thegraveyard.org/files/
MAINTAINER= ports@FreeBSD.org
diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index 6ab1f20fca3a..ca353b064f28 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -7,14 +7,14 @@
PORTNAME= rtorrent
PORTVERSION= 0.4.3
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://libtorrent.rakshasa.no/downloads/
MAINTAINER= flz@FreeBSD.org
COMMENT= BitTorrent Client written in C++
LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \
- torrent.6:${PORTSDIR}/net/libtorrent
+ torrent.6:${PORTSDIR}/net-p2p/libtorrent
MAN1= rtorrent.1
diff --git a/net-p2p/squall/Makefile b/net-p2p/squall/Makefile
index 94189f4f110c..2b1e8e43b8e6 100644
--- a/net-p2p/squall/Makefile
+++ b/net-p2p/squall/Makefile
@@ -7,7 +7,7 @@
PORTNAME= squall
PORTVERSION= 0.1.20040808
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://dist.bsdlab.org/
DISTNAME= ${PORTNAME}-20040808
diff --git a/net-p2p/torrentflux/Makefile b/net-p2p/torrentflux/Makefile
index cd79f5d3b99d..f05f0d904dec 100644
--- a/net-p2p/torrentflux/Makefile
+++ b/net-p2p/torrentflux/Makefile
@@ -7,7 +7,7 @@
PORTNAME= torrentflux
DISTVERSION= 2.0beta1
-CATEGORIES= net www
+CATEGORIES= net-p2p www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@ COMMENT= A PHP based BitTorrent client that runs on a web server
RUN_DEPENDS= ${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb \
${LOCALBASE}/bin/sqlite:${PORTSDIR}/databases/sqlite2 \
- ${LOCALBASE}/bin/btshowmetainfo.py:${PORTSDIR}/net/py-bittornado-core
+ ${LOCALBASE}/bin/btshowmetainfo.py:${PORTSDIR}/net-p2p/py-bittornado-core
NO_PACKAGE= dependencies need manual installation, see ${FILESDIR}/install.txt.in
diff --git a/net-p2p/torrentflux/files/install.txt.in b/net-p2p/torrentflux/files/install.txt.in
index fe6c49ac809d..9d23cd120d7c 100644
--- a/net-p2p/torrentflux/files/install.txt.in
+++ b/net-p2p/torrentflux/files/install.txt.in
@@ -19,7 +19,7 @@ port up and running.
- this port is pulled in either ways, but you may want to avoid installing
TCL as a build dependency
-4. install port net/torrentflux with WITH_TF_DATADIR=/your/download/directory
+4. install port net-p2p/torrentflux with WITH_TF_DATADIR=/your/download/directory
- The directory must be writable by the 'www' user and reside on a
partition with enough free space to accommodate all files you plan
to download. It will be created if it doesn't exist.
diff --git a/net-p2p/torrentsniff/Makefile b/net-p2p/torrentsniff/Makefile
index 59deef6d85e4..deba18a2daf6 100644
--- a/net-p2p/torrentsniff/Makefile
+++ b/net-p2p/torrentsniff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= torrentsniff
PORTVERSION= 0.3.0
-CATEGORIES= net perl5
+CATEGORIES= net-p2p perl5
MASTER_SITES= http://www.highprogrammer.com/alan/perl/
MAINTAINER= pav@FreeBSD.org
diff --git a/net-p2p/trackerbt/Makefile b/net-p2p/trackerbt/Makefile
index f260049ae14e..4426052a5020 100644
--- a/net-p2p/trackerbt/Makefile
+++ b/net-p2p/trackerbt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= trackerbt
PORTVERSION= 0.1.1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://www.alhem.net/project/trackerbt/
MAINTAINER= lioux@FreeBSD.org
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 9128f90d8cc5..f69ba16916e0 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -7,7 +7,7 @@
PORTNAME= transmission
PORTVERSION= 0.4
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://download.m0k.org/${PORTNAME}/files/
MASTER_SITE_SUBDIR=mezz
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index 9128f90d8cc5..f69ba16916e0 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -7,7 +7,7 @@
PORTNAME= transmission
PORTVERSION= 0.4
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://download.m0k.org/${PORTNAME}/files/
MASTER_SITE_SUBDIR=mezz
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index 3c1a97a04f78..d8e39db15c9f 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -8,14 +8,14 @@
PORTNAME= valknut
PORTVERSION= 0.3.7
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= http://download.berlios.de/dcgui/ \
http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
MAINTAINER= markus@FreeBSD.org
COMMENT= A Direct Connect client QT GUI
-LIB_DEPENDS= dc.0:${PORTSDIR}/net/dclib \
+LIB_DEPENDS= dc.0:${PORTSDIR}/net-p2p/dclib \
xml2.5:${PORTSDIR}/textproc/libxml2
USE_QT_VER= 3
diff --git a/net-p2p/verlihub-plugins/Makefile b/net-p2p/verlihub-plugins/Makefile
index 08def04562d9..8139a44a99d3 100644
--- a/net-p2p/verlihub-plugins/Makefile
+++ b/net-p2p/verlihub-plugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= verlihub-plugins
PORTVERSION= 0.1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= verlihub
DISTNAME= vh_plugins-0.1
@@ -15,7 +15,7 @@ DISTNAME= vh_plugins-0.1
MAINTAINER= hurbold@yahoo.com
COMMENT= Plugins for the Verlihub Linux/Unix Direct Connect Hub Software
-BUILD_DEPENDS= ${LOCALBASE}/bin/verlihub:${PORTSDIR}/net/verlihub
+BUILD_DEPENDS= ${LOCALBASE}/bin/verlihub:${PORTSDIR}/net-p2p/verlihub
LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
WRKSRC= ${WRKDIR}/vh_plugins-0.1
diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index 33a204d8a2c5..f520a3bced2c 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -8,7 +8,7 @@
PORTNAME= verlihub
PORTVERSION= 0.9.8.c
PORTEPOCH= 1
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= verlihub
DISTNAME= verlihub-0.9.8c-RC2
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index e290bfe7bc14..2aa0602be461 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -8,7 +8,7 @@
PORTNAME= azureus
PORTVERSION= 2.3.0.6
PORTREVISION= 1
-CATEGORIES= net java
+CATEGORIES= net-p2p java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= Azureus_${PORTVERSION}_source
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index a93551be354b..11f37e06bd74 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmule
PORTVERSION= 1.12.2
-CATEGORIES= net
+CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
#MASTER_SITES= http://download.berlios.de/%SUBDIR%/
MASTER_SITE_SUBDIR= xmule
diff --git a/net-p2p/xnap/Makefile b/net-p2p/xnap/Makefile
index 8911c117aee8..2f2a7693634f 100644
--- a/net-p2p/xnap/Makefile
+++ b/net-p2p/xnap/Makefile
@@ -8,7 +8,7 @@
PORTNAME= XNap
DISTVERSION= 2.5r3
PORTREVISION= 1
-CATEGORIES= net audio java
+CATEGORIES= net-p2p audio java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
#DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}