Change the way Perl modules are installed, update the default Perl to 5.18.

Before, we had:

  site_perl :           lib/perl5/site_perl/5.18
  site_perl/perl_arch : lib/perl5/site_perl/5.18/mach
  perl_man3 :           lib/perl5/5.18/man/man3

Now we have:

  site_perl : lib/perl5/site_perl
  site_arch : lib/perl5/site_perl/mach/5.18
  perl_man3 : lib/perl5/site_perl/man/man3

Modules without any .so will be installed at the same place regardless of the
Perl version, minimizing the upgrade when the major Perl version is changed.
It uses a version dependent directory for modules with compiled bits.

As PERL_ARCH is no longer needed in plists, it has been removed from
PLIST_SUB.

The USE_PERL5=fixpacklist keyword is removed, the .packlist file is now
always removed, as is perllocal.pod.

The old site_perl and site_perl/arch directories have been kept in the
default Perl @INC for all Perl ports, and will be phased out as these old
Perl versions expire.

PR:		194969
Differential Revision:	https://reviews.freebsd.org/D1019
Exp-run by:	antoine
Reviewed by:	perl@
Approved by:	portmgr

39 files changed, 21 insertions, 146 deletions

diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index fc01828b12aa..5f9209c09376 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	libpurple
 PORTVERSION=	2.10.10
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
@@ -325,10 +325,4 @@ post-patch:
 		's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|'
 .endif
 
-.if !defined(PIDGIN_SLAVE) && ${PORT_OPTIONS:MPERL}
-post-stage:
-	@${SED} -i '' -e 's|^${STAGEDIR}||g' \
-		${STAGEDIR}${PREFIX}/lib/purple-2/perl/auto/Purple/.packlist
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 1ab126d501b8..eadae40a48ec 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -135,7 +135,6 @@ lib/purple-2/offlinemsg.so
 %%PERL:%%lib/purple-2/perl.a
 %%PERL:%%lib/purple-2/perl.so
 %%PERL:%%lib/purple-2/perl/Purple.pm
-%%PERL:%%lib/purple-2/perl/auto/Purple/.packlist
 %%PERL:%%lib/purple-2/perl/auto/Purple/Purple.so
 %%PERL:%%lib/purple-2/perl/auto/Purple/autosplit.ix
 lib/purple-2/psychic.a
@@ -320,9 +319,6 @@ share/sounds/purple/send.wav
 @dir share/locale/bn_IN
 @dir share/locale/be@latin/LC_MESSAGES
 @dir share/locale/be@latin
-%%PERL:%%@dir lib/purple-2/perl/auto/Purple
-%%PERL:%%@dir lib/purple-2/perl/auto
-%%PERL:%%@dir lib/purple-2/perl
 @dir lib/purple-2
 @dir include/libpurple/media
 @dir include/libpurple
diff --git a/net-im/p5-AnyEvent-XMPP/Makefile b/net-im/p5-AnyEvent-XMPP/Makefile
index b67d73ee0d42..3b6d043f003f 100644
--- a/net-im/p5-AnyEvent-XMPP/Makefile
+++ b/net-im/p5-AnyEvent-XMPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	AnyEvent-XMPP
 PORTVERSION=	0.55
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-AnyEvent-XMPP/pkg-plist b/net-im/p5-AnyEvent-XMPP/pkg-plist
index 1e697045ddf8..7d059385011f 100644
--- a/net-im/p5-AnyEvent-XMPP/pkg-plist
+++ b/net-im/p5-AnyEvent-XMPP/pkg-plist
@@ -96,13 +96,3 @@
 %%SITE_PERL%%/AnyEvent/XMPP/TestClient.pm
 %%SITE_PERL%%/AnyEvent/XMPP/Util.pm
 %%SITE_PERL%%/AnyEvent/XMPP/Writer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/XMPP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/XMPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/IM
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/Ext/MUC
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/Ext/Disco
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/Ext
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP/Error
-@dirrmtry %%SITE_PERL%%/AnyEvent/XMPP
-@dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/net-im/p5-DJabberd/Makefile b/net-im/p5-DJabberd/Makefile
index 6683b0717c16..3292cee8ea21 100644
--- a/net-im/p5-DJabberd/Makefile
+++ b/net-im/p5-DJabberd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DJabberd
 PORTVERSION=	0.85
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MART
diff --git a/net-im/p5-DJabberd/pkg-plist b/net-im/p5-DJabberd/pkg-plist
index 1bef53fbbd12..1cfe849500ca 100644
--- a/net-im/p5-DJabberd/pkg-plist
+++ b/net-im/p5-DJabberd/pkg-plist
@@ -95,20 +95,3 @@ bin/djabberd
 %%SITE_PERL%%/DJabberd/VHost.pm
 %%SITE_PERL%%/DJabberd/XMLElement.pm
 %%SITE_PERL%%/DJabberd/XMLParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DJabberd/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DJabberd
-@dirrmtry %%SITE_PERL%%/DJabberd/Stanza
-@dirrmtry %%SITE_PERL%%/DJabberd/SASL/Manager
-@dirrmtry %%SITE_PERL%%/DJabberd/SASL/Connection
-@dirrmtry %%SITE_PERL%%/DJabberd/SASL
-@dirrmtry %%SITE_PERL%%/DJabberd/RosterStorage
-@dirrmtry %%SITE_PERL%%/DJabberd/Queue
-@dirrmtry %%SITE_PERL%%/DJabberd/PresenceChecker
-@dirrmtry %%SITE_PERL%%/DJabberd/Delivery
-@dirrmtry %%SITE_PERL%%/DJabberd/Connection
-@dirrmtry %%SITE_PERL%%/DJabberd/Component
-@dirrmtry %%SITE_PERL%%/DJabberd/ClusterMessage
-@dirrmtry %%SITE_PERL%%/DJabberd/Bot
-@dirrmtry %%SITE_PERL%%/DJabberd/Authen
-@dirrmtry %%SITE_PERL%%/DJabberd/Agent
-@dirrmtry %%SITE_PERL%%/DJabberd
diff --git a/net-im/p5-Jabber-Connection/Makefile b/net-im/p5-Jabber-Connection/Makefile
index 2e2eb511c739..7fcec4e1a8ae 100644
--- a/net-im/p5-Jabber-Connection/Makefile
+++ b/net-im/p5-Jabber-Connection/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Jabber-Connection
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Jabber-Connection/pkg-plist b/net-im/p5-Jabber-Connection/pkg-plist
index 4952f56412da..b2723d94497d 100644
--- a/net-im/p5-Jabber-Connection/pkg-plist
+++ b/net-im/p5-Jabber-Connection/pkg-plist
@@ -1,10 +1,6 @@
 %%SITE_PERL%%/Jabber/Connection.pm
 %%SITE_PERL%%/Jabber/NS.pm
 %%SITE_PERL%%/Jabber/NodeFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/Connection/.packlist
 %%PERL5_MAN3%%/Jabber::Connection.3.gz
 %%PERL5_MAN3%%/Jabber::NS.3.gz
 %%PERL5_MAN3%%/Jabber::NodeFactory.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/Connection
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber
-@dirrm %%SITE_PERL%%/Jabber
diff --git a/net-im/p5-Jabber-Lite/Makefile b/net-im/p5-Jabber-Lite/Makefile
index 2eea8a846757..63e709380070 100644
--- a/net-im/p5-Jabber-Lite/Makefile
+++ b/net-im/p5-Jabber-Lite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Jabber-Lite
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BEECEE
diff --git a/net-im/p5-Jabber-Lite/pkg-plist b/net-im/p5-Jabber-Lite/pkg-plist
index 0d7812dbe4f4..5222fb74f305 100644
--- a/net-im/p5-Jabber-Lite/pkg-plist
+++ b/net-im/p5-Jabber-Lite/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Jabber/Lite.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/Lite/.packlist
 %%PERL5_MAN3%%/Jabber::Lite.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/Lite
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber
-@dirrmtry %%SITE_PERL%%/Jabber
diff --git a/net-im/p5-Jabber-SimpleSend/Makefile b/net-im/p5-Jabber-SimpleSend/Makefile
index 30134e2cab02..2d7871395daa 100644
--- a/net-im/p5-Jabber-SimpleSend/Makefile
+++ b/net-im/p5-Jabber-SimpleSend/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Jabber-SimpleSend
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Jabber-SimpleSend/pkg-plist b/net-im/p5-Jabber-SimpleSend/pkg-plist
index cfbf85d06c56..f505bd30c589 100644
--- a/net-im/p5-Jabber-SimpleSend/pkg-plist
+++ b/net-im/p5-Jabber-SimpleSend/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Jabber::SimpleSend.3.gz
 %%SITE_PERL%%/Jabber/SimpleSend.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/SimpleSend/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber/SimpleSend
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jabber
-@dirrmtry %%SITE_PERL%%/Jabber
diff --git a/net-im/p5-Net-AIM/Makefile b/net-im/p5-Net-AIM/Makefile
index a411239199b3..195879fe2b1b 100644
--- a/net-im/p5-Net-AIM/Makefile
+++ b/net-im/p5-Net-AIM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-AIM
 PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-AIM/pkg-plist b/net-im/p5-Net-AIM/pkg-plist
index 536240489530..e9fd0715bf96 100644
--- a/net-im/p5-Net-AIM/pkg-plist
+++ b/net-im/p5-Net-AIM/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Net/AIM.pm
 %%SITE_PERL%%/Net/AIM/Connection.pm
 %%SITE_PERL%%/Net/AIM/Event.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/AIM
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-AOLIM/Makefile b/net-im/p5-Net-AOLIM/Makefile
index 8e4867382742..40865b4f5421 100644
--- a/net-im/p5-Net-AOLIM/Makefile
+++ b/net-im/p5-Net-AOLIM/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-AOLIM
 PORTVERSION=	1.61
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-AOLIM/pkg-plist b/net-im/p5-Net-AOLIM/pkg-plist
index 9a956ebbf358..183f2280aa3c 100644
--- a/net-im/p5-Net-AOLIM/pkg-plist
+++ b/net-im/p5-Net-AOLIM/pkg-plist
@@ -1,7 +1,3 @@
 %%PERL5_MAN3%%/Net::AOLIM.3.gz
 %%SITE_PERL%%/Net/AOLIM.pm
 %%SITE_PERL%%/Net/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-Async-XMPP/Makefile b/net-im/p5-Net-Async-XMPP/Makefile
index b4a4843009dd..976bb84ad05e 100644
--- a/net-im/p5-Net-Async-XMPP/Makefile
+++ b/net-im/p5-Net-Async-XMPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Async-XMPP
 PORTVERSION=	0.003
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TEAM
diff --git a/net-im/p5-Net-Async-XMPP/pkg-plist b/net-im/p5-Net-Async-XMPP/pkg-plist
index 7803e9158845..11bbffa73298 100644
--- a/net-im/p5-Net-Async-XMPP/pkg-plist
+++ b/net-im/p5-Net-Async-XMPP/pkg-plist
@@ -8,10 +8,3 @@
 %%SITE_PERL%%/Net/Async/XMPP/Protocol.pm
 %%SITE_PERL%%/Net/Async/XMPP/Protocol.pod
 %%SITE_PERL%%/Net/Async/XMPP/Server.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async/XMPP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async/XMPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Async
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Async/XMPP
-@dirrmtry %%SITE_PERL%%/Net/Async
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-ICQ2000/Makefile b/net-im/p5-Net-ICQ2000/Makefile
index 0051fe5aa376..aec2365496e9 100644
--- a/net-im/p5-Net-ICQ2000/Makefile
+++ b/net-im/p5-Net-ICQ2000/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-ICQ2000
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	http://gonzo.kiev.ua/projects/vicq.old/
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-ICQ2000/pkg-plist b/net-im/p5-Net-ICQ2000/pkg-plist
index 8117fd44b386..8a9b28645004 100644
--- a/net-im/p5-Net-ICQ2000/pkg-plist
+++ b/net-im/p5-Net-ICQ2000/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/ICQ2000.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist
 %%PERL5_MAN3%%/Net::ICQ2000.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-Jabber/Makefile b/net-im/p5-Net-Jabber/Makefile
index 691e9674b9b1..b3ddd2e37f82 100644
--- a/net-im/p5-Net-Jabber/Makefile
+++ b/net-im/p5-Net-Jabber/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Jabber
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-Jabber/pkg-plist b/net-im/p5-Net-Jabber/pkg-plist
index e16c3cf1a8f8..8b97351b6b80 100644
--- a/net-im/p5-Net-Jabber/pkg-plist
+++ b/net-im/p5-Net-Jabber/pkg-plist
@@ -36,9 +36,3 @@
 %%SITE_PERL%%/Net/Jabber/Server.pm
 %%SITE_PERL%%/Net/Jabber/Stanza.pm
 %%SITE_PERL%%/Net/Jabber/XDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Jabber/Dialback
-@dirrmtry %%SITE_PERL%%/Net/Jabber
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-NetSend/Makefile b/net-im/p5-Net-NetSend/Makefile
index ada5f9b2df5a..ab2899a99989 100644
--- a/net-im/p5-Net-NetSend/Makefile
+++ b/net-im/p5-Net-NetSend/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-NetSend
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-NetSend/pkg-plist b/net-im/p5-Net-NetSend/pkg-plist
index 458b6681797c..c9b5ddd3c789 100644
--- a/net-im/p5-Net-NetSend/pkg-plist
+++ b/net-im/p5-Net-NetSend/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/NetSend.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NetSend/.packlist
 %%PERL5_MAN3%%/Net::NetSend.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NetSend
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-OSCAR/Makefile b/net-im/p5-Net-OSCAR/Makefile
index 93bd6e6fd465..ca24868ca161 100644
--- a/net-im/p5-Net-OSCAR/Makefile
+++ b/net-im/p5-Net-OSCAR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-OSCAR
 PORTVERSION=	1.928
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-OSCAR/pkg-plist b/net-im/p5-Net-OSCAR/pkg-plist
index 11f4f72cd9f6..7a01f03948f3 100644
--- a/net-im/p5-Net-OSCAR/pkg-plist
+++ b/net-im/p5-Net-OSCAR/pkg-plist
@@ -93,31 +93,3 @@ bin/oscartest
 %%SITE_PERL%%/Net/OSCAR/XML/Protocol.xml
 %%SITE_PERL%%/Net/OSCAR/XML/Template.pm
 %%SITE_PERL%%/Net/OSCAR/_BLInternal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OSCAR/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OSCAR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/XML
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/9
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/4
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/3
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/23
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/2
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/19
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks/1
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/ServerCallbacks
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Connection
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/9
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/7
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/4
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/3
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/23
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/21
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/2
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/19
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/16
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/14
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/13
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks/1
-@dirrmtry %%SITE_PERL%%/Net/OSCAR/Callbacks
-@dirrmtry %%SITE_PERL%%/Net/OSCAR
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-Stomp/Makefile b/net-im/p5-Net-Stomp/Makefile
index 2004a4b4aae9..b0ef2d62a51b 100644
--- a/net-im/p5-Net-Stomp/Makefile
+++ b/net-im/p5-Net-Stomp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Stomp
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-Net-Stomp/pkg-plist b/net-im/p5-Net-Stomp/pkg-plist
index 6cece596d7a0..2080740d7315 100644
--- a/net-im/p5-Net-Stomp/pkg-plist
+++ b/net-im/p5-Net-Stomp/pkg-plist
@@ -4,8 +4,3 @@
 %%SITE_PERL%%/Net/Stomp.pm
 %%SITE_PERL%%/Net/Stomp/Frame.pm
 %%SITE_PERL%%/Net/Stomp/StupidLogger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Stomp/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Stomp
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/Stomp
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-XMPP/Makefile b/net-im/p5-Net-XMPP/Makefile
index 968652e52901..2913b3c98be2 100644
--- a/net-im/p5-Net-XMPP/Makefile
+++ b/net-im/p5-Net-XMPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-XMPP
 PORTVERSION=	1.02.04
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAPATRICK
diff --git a/net-im/p5-Net-XMPP/pkg-plist b/net-im/p5-Net-XMPP/pkg-plist
index 59100c318963..12ccb64d8941 100644
--- a/net-im/p5-Net-XMPP/pkg-plist
+++ b/net-im/p5-Net-XMPP/pkg-plist
@@ -24,8 +24,3 @@
 %%SITE_PERL%%/Net/XMPP/Protocol.pm
 %%SITE_PERL%%/Net/XMPP/Roster.pm
 %%SITE_PERL%%/Net/XMPP/Stanza.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net/XMPP
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-im/p5-Net-XMPP2/Makefile b/net-im/p5-Net-XMPP2/Makefile
index ae3d213aee5c..1f9b916f396c 100644
--- a/net-im/p5-Net-XMPP2/Makefile
+++ b/net-im/p5-Net-XMPP2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-XMPP2
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Net
diff --git a/net-im/p5-Net-XMPP2/pkg-plist b/net-im/p5-Net-XMPP2/pkg-plist
index 0ba2c7cab535..7767dde003bd 100644
--- a/net-im/p5-Net-XMPP2/pkg-plist
+++ b/net-im/p5-Net-XMPP2/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP2/.packlist
 %%SITE_PERL%%/Net/XMPP2.pm
 %%SITE_PERL%%/Net/XMPP2/Client.pm
 %%SITE_PERL%%/Net/XMPP2/Component.pm
@@ -95,12 +94,3 @@
 %%PERL5_MAN3%%/Net::XMPP2::TestClient.3.gz
 %%PERL5_MAN3%%/Net::XMPP2::Util.3.gz
 %%PERL5_MAN3%%/Net::XMPP2::Writer.3.gz
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/IM
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/Ext/MUC
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/Ext/Disco
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/Ext
-@dirrmtry %%SITE_PERL%%/Net/XMPP2/Error
-@dirrmtry %%SITE_PERL%%/Net/XMPP2
-@dirrmtry %%SITE_PERL%%/Net
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net-im/p5-Protocol-XMPP/Makefile b/net-im/p5-Protocol-XMPP/Makefile
index b8e3d942d324..549db8c65116 100644
--- a/net-im/p5-Protocol-XMPP/Makefile
+++ b/net-im/p5-Protocol-XMPP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Protocol-XMPP
 PORTVERSION=	0.006
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TEAM
diff --git a/net-im/p5-Protocol-XMPP/pkg-plist b/net-im/p5-Protocol-XMPP/pkg-plist
index c36f66af9e1f..ae898220bc15 100644
--- a/net-im/p5-Protocol-XMPP/pkg-plist
+++ b/net-im/p5-Protocol-XMPP/pkg-plist
@@ -97,10 +97,3 @@
 %%SITE_PERL%%/Protocol/XMPP/TextElement.pm
 %%SITE_PERL%%/Protocol/XMPP/TextElement.pod
 %%SITE_PERL%%/Protocol/XMPP/User.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol/XMPP/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol/XMPP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Protocol
-@dirrmtry %%SITE_PERL%%/Protocol/XMPP/IQ
-@dirrmtry %%SITE_PERL%%/Protocol/XMPP/Element
-@dirrmtry %%SITE_PERL%%/Protocol/XMPP
-@dirrmtry %%SITE_PERL%%/Protocol
diff --git a/net-im/p5-SOAP-Transport-JABBER/Makefile b/net-im/p5-SOAP-Transport-JABBER/Makefile
index 7b321ec04a83..2680488c98c7 100644
--- a/net-im/p5-SOAP-Transport-JABBER/Makefile
+++ b/net-im/p5-SOAP-Transport-JABBER/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	SOAP-Transport-JABBER
 PORTVERSION=	0.713
+PORTREVISION=	1
 CATEGORIES=	net-im net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-im/p5-SOAP-Transport-JABBER/pkg-plist b/net-im/p5-SOAP-Transport-JABBER/pkg-plist
index 447e4daef868..588f357f7b63 100644
--- a/net-im/p5-SOAP-Transport-JABBER/pkg-plist
+++ b/net-im/p5-SOAP-Transport-JABBER/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/SOAP/Transport/JABBER.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport/JABBER/.packlist
 %%PERL5_MAN3%%/SOAP::Transport::JABBER.3.gz
diff --git a/net-im/sendxmpp/Makefile b/net-im/sendxmpp/Makefile
index a3046d7f5905..0adae8c29d79 100644
--- a/net-im/sendxmpp/Makefile
+++ b/net-im/sendxmpp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sendxmpp
 PORTVERSION=	0.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im perl5
 MASTER_SITES=	http://www.djcbsoftware.nl/code/sendxmpp/
 
@@ -16,9 +16,6 @@ RUN_DEPENDS+=	p5-Net-XMPP>0.0:${PORTSDIR}/net-im/p5-Net-XMPP \
 USES=		perl5
 USE_PERL5=	configure
 
-PLIST_FILES=	bin/sendxmpp \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/sendxmpp/.packlist \
-		man/man1/sendxmpp.1.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/sendxmpp
+PLIST_FILES=	bin/sendxmpp man/man1/sendxmpp.1.gz
 
 .include <bsd.port.mk>
diff --git a/net-im/twitmail/Makefile b/net-im/twitmail/Makefile
index 36c59b788bb5..0ed97844f6ea 100644
--- a/net-im/twitmail/Makefile
+++ b/net-im/twitmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	twitmail
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	net-im perl5
 MASTER_SITES=	http://www.hardakers.net/twitmail/releases/
 
diff --git a/net-im/twitmail/pkg-plist b/net-im/twitmail/pkg-plist
index 14bf040b639f..8fe81b7d535b 100644
--- a/net-im/twitmail/pkg-plist
+++ b/net-im/twitmail/pkg-plist
@@ -1,5 +1,2 @@
 bin/twitmail
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/twitmail/.packlist
 man/man1/twitmail.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/twitmail
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto