46 files changed, 24 insertions, 392 deletions

diff --git a/MOVED b/MOVED
index 47d0200b7272..4cf56f179bc3 100644
--- a/MOVED
+++ b/MOVED
@@ -1303,3 +1303,10 @@ japanese/lookup-mule||2004-11-05|no longer supported
 emulators/linux-mupen64|emulators/mupen64|2004-11-08|replaced with native port
 math/fftpack|math/bihar|2004-11-08|more suitable name
 security/md5crk||2004-11-08|project shut down
+devel/p5-Filter-CBC|security/p5-Filter-CBC|2004-11-09|moved to security category
+devel/p5-POE-Component-Pcap|net/p5-POE-Component-Pcap|2004-11-09|moved to net category
+devel/p5-POE-Component-Client-Ping|net/p5-POE-Component-Client-Ping|2004-11-09|moved to net category
+devel/p5-POE-Component-DBIAgent|databases/p5-POE-Component-DBIAgent|2004-11-09|moved to databases category
+devel/p5-POE-Component-Client-POP3|mail/p5-POE-Component-Client-POP3|2004-11-09|moved to mail category
+devel/p5-POE-Component-Client-HTTP|www/p5-POE-Component-Client-HTTP|2004-11-09|moved to www category
+devel/p5-POE-Component-Client-UserAgent|www/p5-POE-Component-Client-UserAgent|2004-11-09|moved to www category
diff --git a/databases/Makefile b/databases/Makefile
index 3a78367f9638..95ff4f781efd 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -190,6 +190,7 @@
     SUBDIR += p5-Metadata
     SUBDIR += p5-Mysql
     SUBDIR += p5-Mysql-Diff
+    SUBDIR += p5-POE-Component-DBIAgent
     SUBDIR += p5-POE-Component-LaDBI
     SUBDIR += p5-Pg
     SUBDIR += p5-ResourcePool-Resource-DBI
diff --git a/databases/p5-POE-Component-DBIAgent/Makefile b/databases/p5-POE-Component-DBIAgent/Makefile
index 5579271b8a11..ed5a8ad82be1 100644
--- a/databases/p5-POE-Component-DBIAgent/Makefile
+++ b/databases/p5-POE-Component-DBIAgent/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	POE-Component-DBIAgent
 PORTVERSION=	0.21
-CATEGORIES=	devel perl5 databases
+CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
diff --git a/databases/p5-POE-Component-DBIAgent/pkg-descr b/databases/p5-POE-Component-DBIAgent/pkg-descr
index 2b5c32f85935..f7c895acc818 100644
--- a/databases/p5-POE-Component-DBIAgent/pkg-descr
+++ b/databases/p5-POE-Component-DBIAgent/pkg-descr
@@ -5,6 +5,3 @@ database queries to it via two-way pipe (or however Wheel::Run is able
 to manage it).
 
 WWW: http://search.cpan.org/dist/POE-Component-DBIAgent/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/devel/Makefile b/devel/Makefile
index 9c2bb1e272a4..8c61e140aca2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -821,7 +821,6 @@
     SUBDIR += p5-Filesys-Statvfs_Df
     SUBDIR += p5-Filesys-Virtual
     SUBDIR += p5-Filter
-    SUBDIR += p5-Filter-CBC
     SUBDIR += p5-FreezeThaw
     SUBDIR += p5-Getargs-Long
     SUBDIR += p5-Getopt-ArgvFile
@@ -906,18 +905,12 @@
     SUBDIR += p5-POE-API-Hooks
     SUBDIR += p5-POE-API-Peek
     SUBDIR += p5-POE-Component-Child
-    SUBDIR += p5-POE-Component-Client-HTTP
-    SUBDIR += p5-POE-Component-Client-POP3
-    SUBDIR += p5-POE-Component-Client-Ping
-    SUBDIR += p5-POE-Component-Client-UserAgent
-    SUBDIR += p5-POE-Component-DBIAgent
     SUBDIR += p5-POE-Component-DebugShell
     SUBDIR += p5-POE-Component-DirWatch
     SUBDIR += p5-POE-Component-EasyDBI
     SUBDIR += p5-POE-Component-IKC
     SUBDIR += p5-POE-Component-JobQueue
     SUBDIR += p5-POE-Component-Logger
-    SUBDIR += p5-POE-Component-Pcap
     SUBDIR += p5-POE-Component-RSS
     SUBDIR += p5-POE-Component-Server-XMLRPC
     SUBDIR += p5-POE-Component-TSTP
diff --git a/devel/p5-Filter-CBC/Makefile b/devel/p5-Filter-CBC/Makefile
deleted file mode 100644
index c76913aa51e4..000000000000
--- a/devel/p5-Filter-CBC/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:	Filter-CBC
-# Date created:		11 Dec 2001
-# Whom:			Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Filter-CBC
-PORTVERSION=	0.09
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Filter
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	Source filter for Cipher Block Chaining
-
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
-		${SITE_PERL}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		Filter::CBC.3
-
-post-install:
-.ifndef(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/p5-Filter-CBC/distinfo b/devel/p5-Filter-CBC/distinfo
deleted file mode 100644
index b9f3e8175681..000000000000
--- a/devel/p5-Filter-CBC/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (Filter-CBC-0.09.tar.gz) = 474c25e26ef509350a72090b296d24a3
-SIZE (Filter-CBC-0.09.tar.gz) = 8485
diff --git a/devel/p5-Filter-CBC/pkg-descr b/devel/p5-Filter-CBC/pkg-descr
deleted file mode 100644
index c76cede02578..000000000000
--- a/devel/p5-Filter-CBC/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Filter::CBC is a Source filter that uses Cipher Block Chaining (CBC) to
-encrypt your code. The tricky part is that most CBC Algorithms have binary
-output. The textmode bypasses this obstacle, by converting the data to less
-scary data.
-
-WWW: http://search.cpan.org/search?dist=Filter-CBC
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/devel/p5-Filter-CBC/pkg-plist b/devel/p5-Filter-CBC/pkg-plist
deleted file mode 100644
index 94989c6b4e2b..000000000000
--- a/devel/p5-Filter-CBC/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/CBC/.packlist
-%%SITE_PERL%%/Filter/CBC.pm
-%%SITE_PERL%%/Filter/cbc2code.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/autofilter.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/blowfish.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/defaults.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/des.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/des_ede3.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/gost.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/idea.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/null.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/rc6.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/rijndael.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/tea.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/twofish.pl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/CBC
-@unexec rmdir %D/%%SITE_PERL%%/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
diff --git a/devel/p5-POE-Component-Client-HTTP/Makefile b/devel/p5-POE-Component-Client-HTTP/Makefile
deleted file mode 100644
index feecdab0589c..000000000000
--- a/devel/p5-POE-Component-Client-HTTP/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	POE-Component-Client-HTTP
-# Date created:		10 Dec 2001
-# Whom:			Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	POE-Component-Client-HTTP
-PORTVERSION=	0.65
-CATEGORIES=	devel perl5 www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	POE component for non-blocking/concurrent HTTP queries
-
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay/Handle.pm:${PORTSDIR}/security/p5-Net-SSLeay \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		POE::Component::Client::HTTP.3 POE::Component::Client::SSL.3
-
-.include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Client-HTTP/distinfo b/devel/p5-POE-Component-Client-HTTP/distinfo
deleted file mode 100644
index 07b0a2369ee2..000000000000
--- a/devel/p5-POE-Component-Client-HTTP/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (POE-Component-Client-HTTP-0.65.tar.gz) = 9a2f493854380fe1aac7d769a4f9a437
-SIZE (POE-Component-Client-HTTP-0.65.tar.gz) = 32389
diff --git a/devel/p5-POE-Component-Client-HTTP/pkg-descr b/devel/p5-POE-Component-Client-HTTP/pkg-descr
deleted file mode 100644
index 546c9bb4ab39..000000000000
--- a/devel/p5-POE-Component-Client-HTTP/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-POE::Component::Client::HTTP is an asynchronous, event driven HTTP user
-agent.  It accepts events containing HTTP::Request objects, and it
-returns events carrying HTTP::Response objects.  It supports https and
-simultaneous HTTP transactions.  It lets other sessions run while HTTP
-transactions are being processed, and it lets several HTTP transactions
-be processed in parallel.
-
-WWW: http://search.cpan.org/dist/POE-Component-Client-HTTP/
diff --git a/devel/p5-POE-Component-Client-HTTP/pkg-plist b/devel/p5-POE-Component-Client-HTTP/pkg-plist
deleted file mode 100644
index 382c1b783a04..000000000000
--- a/devel/p5-POE-Component-Client-HTTP/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%SITE_PERL%%/POE/Component/Client/HTTP.pm
-%%SITE_PERL%%/POE/Component/Client/HTTP/SSL.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/HTTP/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/HTTP
-@dirrm %%SITE_PERL%%/POE/Component/Client/HTTP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
diff --git a/devel/p5-POE-Component-Client-POP3/Makefile b/devel/p5-POE-Component-Client-POP3/Makefile
deleted file mode 100644
index 674ac5fce79a..000000000000
--- a/devel/p5-POE-Component-Client-POP3/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	POE-Component-Client-POP3
-# Date created:	   17 March 2002
-# Whom:		   Sergey Skvortsov <skv@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	POE-Component-Client-POP3
-PORTVERSION=	0.02
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	Impliment a POP3 client POE component
-
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
-
-MAN3=		POE::Component::Client::POP3.3
-
-post-install:
-.ifndef(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/samples/* ${EXAMPLESDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Client-POP3/distinfo b/devel/p5-POE-Component-Client-POP3/distinfo
deleted file mode 100644
index 1131c7816c1b..000000000000
--- a/devel/p5-POE-Component-Client-POP3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (POE-Component-Client-POP3-0.02.tar.gz) = 95728dfddce8af663ea61449beb265f1
-SIZE (POE-Component-Client-POP3-0.02.tar.gz) = 14045
diff --git a/devel/p5-POE-Component-Client-POP3/pkg-descr b/devel/p5-POE-Component-Client-POP3/pkg-descr
deleted file mode 100644
index 8d4662304ba0..000000000000
--- a/devel/p5-POE-Component-Client-POP3/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-POE::Component::Client::POP3 is a POE component for interacting with a
-POP3 server.  This means it is an event driven way to communicate with a
-server that impliments Post Office Protocol Version 3 see rfc 1939 for
-details on the protocol.
-
-WWW: http://search.cpan.org/search?dist=POE-Component-Client-POP3
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-Client-POP3/pkg-plist b/devel/p5-POE-Component-Client-POP3/pkg-plist
deleted file mode 100644
index 5dd93f06af76..000000000000
--- a/devel/p5-POE-Component-Client-POP3/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3/.packlist
-%%SITE_PERL%%/POE/Component/Client/POP3.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/test.perl
-%%PORTDOCS%%%%EXAMPLESDIR%%/term.perl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/devel/p5-POE-Component-Client-Ping/Makefile b/devel/p5-POE-Component-Client-Ping/Makefile
deleted file mode 100644
index 6b492abef789..000000000000
--- a/devel/p5-POE-Component-Client-Ping/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	POE-Component-Client-Ping
-# Date created:		10 Dec 2001
-# Whom:			Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	POE-Component-Client-Ping
-PORTVERSION=	1.04
-CATEGORIES=	devel perl5 net
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	POE component for non-blocking/concurrent ICMP ping
-
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		POE::Component::Client::Ping.3
-
-.include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Client-Ping/distinfo b/devel/p5-POE-Component-Client-Ping/distinfo
deleted file mode 100644
index fb06a0027ba9..000000000000
--- a/devel/p5-POE-Component-Client-Ping/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (POE-Component-Client-Ping-1.04.tar.gz) = 1bf8420be2474db9253c5f96e2c921c7
-SIZE (POE-Component-Client-Ping-1.04.tar.gz) = 10745
diff --git a/devel/p5-POE-Component-Client-Ping/pkg-descr b/devel/p5-POE-Component-Client-Ping/pkg-descr
deleted file mode 100644
index 79d11d23c920..000000000000
--- a/devel/p5-POE-Component-Client-Ping/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-POE::Component::Client::Ping is non-blocking ICMP ping client session.
-It lets several other sessions ping through it in parallel, and it
-lets them continue doing other things while they wait for responses.
-
-WWW: http://search.cpan.org/dist/POE-Component-Client-Ping/
diff --git a/devel/p5-POE-Component-Client-Ping/pkg-plist b/devel/p5-POE-Component-Client-Ping/pkg-plist
deleted file mode 100644
index b58ec262f1d1..000000000000
--- a/devel/p5-POE-Component-Client-Ping/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%SITE_PERL%%/POE/Component/Client/Ping.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
diff --git a/devel/p5-POE-Component-Client-UserAgent/Makefile b/devel/p5-POE-Component-Client-UserAgent/Makefile
deleted file mode 100644
index 6393b9b171ca..000000000000
--- a/devel/p5-POE-Component-Client-UserAgent/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	POE-Component-Client-UserAgent
-# Date created:		10 Dec 2001
-# Whom:			Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	POE-Component-Client-UserAgent
-PORTVERSION=	0.06
-CATEGORIES=	devel perl5 www
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/R/RC/RCAPUTO
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	LWP and LWP::Parallel based POE component
-
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/LWP/Parallel.pm:${PORTSDIR}/www/p5-ParallelUA
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		POE::Component::Client::UserAgent.3
-
-.include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Client-UserAgent/distinfo b/devel/p5-POE-Component-Client-UserAgent/distinfo
deleted file mode 100644
index 2071c3999866..000000000000
--- a/devel/p5-POE-Component-Client-UserAgent/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (POE-Component-Client-UserAgent-0.06.tar.gz) = ba95eb2e3acc66e993a7d7925b25e686
-SIZE (POE-Component-Client-UserAgent-0.06.tar.gz) = 9014
diff --git a/devel/p5-POE-Component-Client-UserAgent/pkg-descr b/devel/p5-POE-Component-Client-UserAgent/pkg-descr
deleted file mode 100644
index 8872c51127ce..000000000000
--- a/devel/p5-POE-Component-Client-UserAgent/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-POE::Component::Client::UserAgent is based on LWP and LWP::Parallel.
-It lets other tasks run while making a request to an Internet server
-and waiting for response, and it lets several requests run in parallel.
-
-WWW: http://search.cpan.org/dist/POE-Component-Client-UserAgent/
diff --git a/devel/p5-POE-Component-Client-UserAgent/pkg-plist b/devel/p5-POE-Component-Client-UserAgent/pkg-plist
deleted file mode 100644
index cc7a99bf5043..000000000000
--- a/devel/p5-POE-Component-Client-UserAgent/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%SITE_PERL%%/POE/Component/Client/UserAgent.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/UserAgent/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/UserAgent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
diff --git a/devel/p5-POE-Component-DBIAgent/Makefile b/devel/p5-POE-Component-DBIAgent/Makefile
deleted file mode 100644
index 5579271b8a11..000000000000
--- a/devel/p5-POE-Component-DBIAgent/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	POE-Component-DBIAgent
-# Date created:		10 Dec 2001
-# Whom:			Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	POE-Component-DBIAgent
-PORTVERSION=	0.21
-CATEGORIES=	devel perl5 databases
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	POE Component for running asynchronous DBI calls
-
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
-		${SITE_PERL}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		POE::Component::DBIAgent.3 POE::Component::DBIAgent::Helper.3 \
-		POE::Component::DBIAgent::Queue.3
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
-.else
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/p5-POE-Component-DBIAgent/distinfo b/devel/p5-POE-Component-DBIAgent/distinfo
deleted file mode 100644
index a0684a63543b..000000000000
--- a/devel/p5-POE-Component-DBIAgent/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (POE-Component-DBIAgent-0.21.tar.gz) = d17e55da5d47e23aab47d19ec1e25b32
-SIZE (POE-Component-DBIAgent-0.21.tar.gz) = 12027
diff --git a/devel/p5-POE-Component-DBIAgent/pkg-descr b/devel/p5-POE-Component-DBIAgent/pkg-descr
deleted file mode 100644
index 2b5c32f85935..000000000000
--- a/devel/p5-POE-Component-DBIAgent/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-The DBIAgent is your answer to non-blocking DBI in POE.
-
-It fires off child processes (configurable, defaults to 3) and feeds
-database queries to it via two-way pipe (or however Wheel::Run is able
-to manage it).
-
-WWW: http://search.cpan.org/dist/POE-Component-DBIAgent/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-DBIAgent/pkg-plist b/devel/p5-POE-Component-DBIAgent/pkg-plist
deleted file mode 100644
index eb28d829b63b..000000000000
--- a/devel/p5-POE-Component-DBIAgent/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DBIAgent/.packlist
-%%SITE_PERL%%/POE/Component/DBIAgent.pm
-%%SITE_PERL%%/POE/Component/DBIAgent/Helper.pm
-%%SITE_PERL%%/POE/Component/DBIAgent/Queue.pm
-@dirrm %%SITE_PERL%%/POE/Component/DBIAgent
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DBIAgent
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/devel/p5-POE-Component-Pcap/Makefile b/devel/p5-POE-Component-Pcap/Makefile
deleted file mode 100644
index 740750d3abc6..000000000000
--- a/devel/p5-POE-Component-Pcap/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	POE-Component-Pcap
-# Date created:		10 Dec 2001
-# Whom:			Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	POE-Component-Pcap
-PORTVERSION=	0.04
-CATEGORIES=	devel perl5 net
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	POE component for non-blocking use of Net::Pcap
-
-BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE \
-		${SITE_PERL}/${PERL_ARCH}/Net/Pcap.pm:${PORTSDIR}/net/p5-Net-Pcap \
-		${SITE_PERL}/NetPacket/Ethernet.pm:${PORTSDIR}/net/p5-NetPacket
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		POE::Component::Pcap.3
-
-.include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Pcap/distinfo b/devel/p5-POE-Component-Pcap/distinfo
deleted file mode 100644
index 33063e4f7380..000000000000
--- a/devel/p5-POE-Component-Pcap/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (POE-Component-Pcap-0.04.tar.gz) = 11c6e6babcb8ee0b6a3c247c04059dc1
-SIZE (POE-Component-Pcap-0.04.tar.gz) = 6940
diff --git a/devel/p5-POE-Component-Pcap/pkg-descr b/devel/p5-POE-Component-Pcap/pkg-descr
deleted file mode 100644
index b2e0c5d73057..000000000000
--- a/devel/p5-POE-Component-Pcap/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-POE::Component::Pcap provides a wrapper for using the Net::Pcap module
-from POE programs.  The component creates a separate session which posts
-events to a specified session and state when packets are available.
-
-WWW: http://search.cpan.org/dist/POE-Component-Pcap/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/devel/p5-POE-Component-Pcap/pkg-plist b/devel/p5-POE-Component-Pcap/pkg-plist
deleted file mode 100644
index 371401577a37..000000000000
--- a/devel/p5-POE-Component-Pcap/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap/.packlist
-%%SITE_PERL%%/POE/Component/Pcap.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/mail/Makefile b/mail/Makefile
index 27ecba56f1dc..ea9e9db9af54 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -289,6 +289,7 @@
     SUBDIR += p5-Net-QMTP
     SUBDIR += p5-Net-SMTP-Server
     SUBDIR += p5-Net-Server-Mail
+    SUBDIR += p5-POE-Component-Client-POP3
     SUBDIR += p5-POE-Component-SMTP
     SUBDIR += p5-Qmail-Envelope
     SUBDIR += p5-Sendmail-Milter
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index 674ac5fce79a..c377a3088e40 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -7,18 +7,17 @@
 
 PORTNAME=	POE-Component-Client-POP3
 PORTVERSION=	0.02
-CATEGORIES=	devel perl5
+CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
-COMMENT=	Impliment a POP3 client POE component
+COMMENT=	Implement a POP3 client POE component
 
 BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
 PERL_CONFIGURE=	yes
 
 MAN3=		POE::Component::Client::POP3.3
diff --git a/mail/p5-POE-Component-Client-POP3/pkg-descr b/mail/p5-POE-Component-Client-POP3/pkg-descr
index 8d4662304ba0..a23abdac54c1 100644
--- a/mail/p5-POE-Component-Client-POP3/pkg-descr
+++ b/mail/p5-POE-Component-Client-POP3/pkg-descr
@@ -3,7 +3,4 @@ POP3 server.  This means it is an event driven way to communicate with a
 server that impliments Post Office Protocol Version 3 see rfc 1939 for
 details on the protocol.
 
-WWW: http://search.cpan.org/search?dist=POE-Component-Client-POP3
-
--- Sergey Skvortsov
-skv@FreeBSD.org
+WWW: http://search.cpan.org/dist/POE-Component-Client-POP3/
diff --git a/net/Makefile b/net/Makefile
index 28bfacf11a85..c5b2f2a54c57 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -491,7 +491,9 @@
     SUBDIR += p5-NetAddr-IP-Count
     SUBDIR += p5-NetPacket
     SUBDIR += p5-OAI-Harvester
+    SUBDIR += p5-POE-Component-Client-Ping
     SUBDIR += p5-POE-Component-Jabber
+    SUBDIR += p5-POE-Component-Pcap
     SUBDIR += p5-POE-Component-RRDTool
     SUBDIR += p5-POE-Component-Spread
     SUBDIR += p5-Parallel-MPI
diff --git a/net/p5-POE-Component-Client-Ping/Makefile b/net/p5-POE-Component-Client-Ping/Makefile
index 6b492abef789..d3b4f4b6bfea 100644
--- a/net/p5-POE-Component-Client-Ping/Makefile
+++ b/net/p5-POE-Component-Client-Ping/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	POE-Component-Client-Ping
 PORTVERSION=	1.04
-CATEGORIES=	devel perl5 net
+CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Pcap/Makefile b/net/p5-POE-Component-Pcap/Makefile
index 740750d3abc6..4f608c81b838 100644
--- a/net/p5-POE-Component-Pcap/Makefile
+++ b/net/p5-POE-Component-Pcap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	POE-Component-Pcap
 PORTVERSION=	0.04
-CATEGORIES=	devel perl5 net
+CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-POE-Component-Pcap/pkg-descr b/net/p5-POE-Component-Pcap/pkg-descr
index b2e0c5d73057..e6594410e4ff 100644
--- a/net/p5-POE-Component-Pcap/pkg-descr
+++ b/net/p5-POE-Component-Pcap/pkg-descr
@@ -3,6 +3,3 @@ from POE programs.  The component creates a separate session which posts
 events to a specified session and state when packets are available.
 
 WWW: http://search.cpan.org/dist/POE-Component-Pcap/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/security/Makefile b/security/Makefile
index 4561b59cfb81..e7d18395d1ee 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -286,6 +286,7 @@
     SUBDIR += p5-Digest-SHA1
     SUBDIR += p5-Digest-SHA2
     SUBDIR += p5-File-Scan
+    SUBDIR += p5-Filter-CBC
     SUBDIR += p5-Filter-Crypto
     SUBDIR += p5-GnuPG-Interface
     SUBDIR += p5-IO-Socket-SSL
diff --git a/security/p5-Filter-CBC/Makefile b/security/p5-Filter-CBC/Makefile
index c76913aa51e4..af2399f5fc47 100644
--- a/security/p5-Filter-CBC/Makefile
+++ b/security/p5-Filter-CBC/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Filter-CBC
 PORTVERSION=	0.09
-CATEGORIES=	devel perl5
+CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Filter
 PKGNAMEPREFIX=	p5-
@@ -21,9 +21,7 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Filter::CBC.3
 
 post-install:
diff --git a/security/p5-Filter-CBC/pkg-descr b/security/p5-Filter-CBC/pkg-descr
index c76cede02578..a4cbde899f28 100644
--- a/security/p5-Filter-CBC/pkg-descr
+++ b/security/p5-Filter-CBC/pkg-descr
@@ -3,7 +3,4 @@ encrypt your code. The tricky part is that most CBC Algorithms have binary
 output. The textmode bypasses this obstacle, by converting the data to less
 scary data.
 
-WWW: http://search.cpan.org/search?dist=Filter-CBC
-
--- Sergey Skvortsov
-skv@FreeBSD.org
+WWW: http://search.cpan.org/dist/Filter-CBC/
diff --git a/www/Makefile b/www/Makefile
index c1255d76101d..3d2c885af66e 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -512,6 +512,8 @@
     SUBDIR += p5-Maypole-Authentication-UserSessionCookie
     SUBDIR += p5-Maypole-Component
     SUBDIR += p5-PHP-Session
+    SUBDIR += p5-POE-Component-Client-HTTP
+    SUBDIR += p5-POE-Component-Client-UserAgent
     SUBDIR += p5-POE-Component-Server-HTTP
     SUBDIR += p5-ParallelUA
     SUBDIR += p5-PodToHTML
diff --git a/www/p5-POE-Component-Client-HTTP/Makefile b/www/p5-POE-Component-Client-HTTP/Makefile
index feecdab0589c..57e82e57e5ad 100644
--- a/www/p5-POE-Component-Client-HTTP/Makefile
+++ b/www/p5-POE-Component-Client-HTTP/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	POE-Component-Client-HTTP
 PORTVERSION=	0.65
-CATEGORIES=	devel perl5 www
+CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-POE-Component-Client-UserAgent/Makefile b/www/p5-POE-Component-Client-UserAgent/Makefile
index 6393b9b171ca..2c52c119c0e6 100644
--- a/www/p5-POE-Component-Client-UserAgent/Makefile
+++ b/www/p5-POE-Component-Client-UserAgent/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	POE-Component-Client-UserAgent
 PORTVERSION=	0.06
-CATEGORIES=	devel perl5 www
+CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/R/RC/RCAPUTO
 PKGNAMEPREFIX=	p5-