From eee58d187e2c55fca6f53b9e482d33cf5346fe81 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Wed, 26 Nov 2014 13:08:24 +0000 Subject: 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 --- net-p2p/p5-Net-BitTorrent-File/Makefile | 1 + net-p2p/p5-Net-BitTorrent-File/pkg-plist | 6 ------ net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile | 1 + net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist | 2 -- net-p2p/p5-Net-BitTorrent/Makefile | 2 +- net-p2p/p5-Net-BitTorrent/pkg-plist | 4 ---- net-p2p/p5-Net-DirectConnect/Makefile | 1 + net-p2p/p5-Net-DirectConnect/pkg-plist | 5 ----- net-p2p/p5-WWW-BitTorrent/Makefile | 1 + net-p2p/p5-WWW-BitTorrent/pkg-plist | 1 - net-p2p/torrentsniff/Makefile | 5 +++-- 11 files changed, 8 insertions(+), 21 deletions(-) (limited to 'net-p2p') diff --git a/net-p2p/p5-Net-BitTorrent-File/Makefile b/net-p2p/p5-Net-BitTorrent-File/Makefile index 1e07bb443095..bf87e752cc6f 100644 --- a/net-p2p/p5-Net-BitTorrent-File/Makefile +++ b/net-p2p/p5-Net-BitTorrent-File/Makefile @@ -3,6 +3,7 @@ PORTNAME= Net-BitTorrent-File PORTVERSION= 1.02 +PORTREVISION= 1 CATEGORIES= net-p2p perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/net-p2p/p5-Net-BitTorrent-File/pkg-plist b/net-p2p/p5-Net-BitTorrent-File/pkg-plist index 763ca8f34623..2efb5b491c9d 100644 --- a/net-p2p/p5-Net-BitTorrent-File/pkg-plist +++ b/net-p2p/p5-Net-BitTorrent-File/pkg-plist @@ -1,8 +1,2 @@ -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BitTorrent/File/.packlist %%SITE_PERL%%/Net/BitTorrent/File.pm %%PERL5_MAN3%%/Net::BitTorrent::File.3.gz -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BitTorrent/File -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BitTorrent -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net -@dirrmtry %%SITE_PERL%%/Net/BitTorrent -@dirrmtry %%SITE_PERL%%/Net diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile b/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile index 07faffedc66c..e6b3e8578bb9 100644 --- a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile +++ b/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile @@ -3,6 +3,7 @@ PORTNAME= Net-BitTorrent-PeerPacket PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= net-p2p perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist b/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist index 10922a4156bd..18e109d71981 100644 --- a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist +++ b/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist @@ -1,4 +1,2 @@ %%PERL5_MAN3%%/Net::BitTorrent::PeerPacket.3.gz %%SITE_PERL%%/Net/BitTorrent/PeerPacket.pm -@dirrmtry %%SITE_PERL%%/Net/BitTorrent -@dirrmtry %%SITE_PERL%%/Net diff --git a/net-p2p/p5-Net-BitTorrent/Makefile b/net-p2p/p5-Net-BitTorrent/Makefile index e87ba4535299..c0c7a9b90fa5 100644 --- a/net-p2p/p5-Net-BitTorrent/Makefile +++ b/net-p2p/p5-Net-BitTorrent/Makefile @@ -3,7 +3,7 @@ PORTNAME= Net-BitTorrent PORTVERSION= 0.052 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:SANKO diff --git a/net-p2p/p5-Net-BitTorrent/pkg-plist b/net-p2p/p5-Net-BitTorrent/pkg-plist index 96b83e012a29..af9987895f71 100644 --- a/net-p2p/p5-Net-BitTorrent/pkg-plist +++ b/net-p2p/p5-Net-BitTorrent/pkg-plist @@ -26,7 +26,3 @@ bin/net-bittorrent.pl %%SITE_PERL%%/Net/BitTorrent/Util.pm %%SITE_PERL%%/Net/BitTorrent/Version.pm man/man1/net-bittorrent.pl.1.gz -@dirrmtry %%SITE_PERL%%/Net/BitTorrent/Torrent/Tracker -@dirrmtry %%SITE_PERL%%/Net/BitTorrent/Torrent -@dirrmtry %%SITE_PERL%%/Net/BitTorrent -@dirrmtry %%SITE_PERL%%/Net diff --git a/net-p2p/p5-Net-DirectConnect/Makefile b/net-p2p/p5-Net-DirectConnect/Makefile index 1094d23db01b..1e4794fbf68d 100644 --- a/net-p2p/p5-Net-DirectConnect/Makefile +++ b/net-p2p/p5-Net-DirectConnect/Makefile @@ -3,6 +3,7 @@ PORTNAME= Net-DirectConnect PORTVERSION= 0.14 +PORTREVISION= 1 CATEGORIES= net-p2p net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/net-p2p/p5-Net-DirectConnect/pkg-plist b/net-p2p/p5-Net-DirectConnect/pkg-plist index d95788a0965a..934f9b7f895a 100644 --- a/net-p2p/p5-Net-DirectConnect/pkg-plist +++ b/net-p2p/p5-Net-DirectConnect/pkg-plist @@ -17,12 +17,7 @@ bin/dcshare %%SITE_PERL%%/Net/DirectConnect/pslib/psweb.pm %%SITE_PERL%%/Net/DirectConnect/pslib/pssql.pm %%SITE_PERL%%/Net/DirectConnect/sctp.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DirectConnect/.packlist %%PERL5_MAN3%%/Net::DirectConnect.3.gz %%PERL5_MAN3%%/Net::DirectConnect::filelist.3.gz man/man1/dcget.1.gz man/man1/dcshare.1.gz -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DirectConnect -@dirrm %%SITE_PERL%%/Net/DirectConnect/pslib -@dirrmtry %%SITE_PERL%%/Net/DirectConnect -@dirrmtry %%SITE_PERL%%/Net diff --git a/net-p2p/p5-WWW-BitTorrent/Makefile b/net-p2p/p5-WWW-BitTorrent/Makefile index 5ed2ea870088..2706da030881 100644 --- a/net-p2p/p5-WWW-BitTorrent/Makefile +++ b/net-p2p/p5-WWW-BitTorrent/Makefile @@ -3,6 +3,7 @@ PORTNAME= WWW-BitTorrent PORTVERSION= 0.01 +PORTREVISION= 1 CATEGORIES= net-p2p perl5 www MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/net-p2p/p5-WWW-BitTorrent/pkg-plist b/net-p2p/p5-WWW-BitTorrent/pkg-plist index 79c92dd02b92..6dcc5d023207 100644 --- a/net-p2p/p5-WWW-BitTorrent/pkg-plist +++ b/net-p2p/p5-WWW-BitTorrent/pkg-plist @@ -1,4 +1,3 @@ %%SITE_PERL%%/WWW/BitTorrent.pm %%SITE_PERL%%/WWW/bittorrent.pl -%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/BitTorrent/.packlist %%PERL5_MAN3%%/WWW::BitTorrent.3.gz diff --git a/net-p2p/torrentsniff/Makefile b/net-p2p/torrentsniff/Makefile index 138b0b23c9e5..be5ac642575d 100644 --- a/net-p2p/torrentsniff/Makefile +++ b/net-p2p/torrentsniff/Makefile @@ -3,6 +3,7 @@ PORTNAME= torrentsniff PORTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= net-p2p perl5 MASTER_SITES= http://www.highprogrammer.com/alan/perl/ @@ -18,7 +19,7 @@ SHEBANG_FILES= torrentsniff do-install: ${INSTALL_SCRIPT} ${WRKSRC}/torrentsniff ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${SITE_PERL}/BitTorrent - ${INSTALL_DATA} ${WRKSRC}/BitTorrent/BDecode.pm ${STAGEDIR}${SITE_PERL}/BitTorrent + ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/BitTorrent + ${INSTALL_DATA} ${WRKSRC}/BitTorrent/BDecode.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/BitTorrent .include -- cgit v1.2.3