2 files changed, 73 insertions, 74 deletions

diff --git a/net/p5-Net-ext/Makefile b/net/p5-Net-ext/Makefile
index 770beb57f01b..2925f99f48c5 100644
--- a/net/p5-Net-ext/Makefile
+++ b/net/p5-Net-ext/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Perl modules for using sockets
 
 PERL_CONFIGURE=	yes
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Net::Gen.3 \
 		Net::Inet.3 \
 		Net::TCP.3 \
diff --git a/net/p5-Net-ext/pkg-plist b/net/p5-Net-ext/pkg-plist
index 83e157f66b21..a39dcbafd6f9 100644
--- a/net/p5-Net-ext/pkg-plist
+++ b/net/p5-Net-ext/pkg-plist
@@ -1,73 +1,73 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Gen.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Inet.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/TCP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/TCP/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UDP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UNIX.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UNIX/Server.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/BINMODE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/EOF.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/FETCH.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/FILENO.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/GETC.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/PRINTF.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/READ.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/READLINE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/RECV.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/STORE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/TIEHANDLE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/TIESCALAR.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/WRITE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/_findxopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/_getxopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/_setxopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/accept.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/delparam.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/didlisten.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/fcntl.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/fhvec.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/fileno.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/format_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/format_local_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/format_remote_addr.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getfh.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getlines.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getropt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/getsopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/ioctl.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/listen.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/new_from_fh.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/select.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/sendto.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setdebug.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setparam.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setropt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/setsopt.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen/unbind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/setdebug.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet/unbind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/PRINT.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/READLINE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/_setbuf_unbuf.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/PRINT.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/READLINE.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/_setbuf_unbuf.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/bind.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX/setdebug.al
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/TCP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/UNIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Gen 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Inet 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UDP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/UNIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Gen.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/Inet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/UDP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/BINMODE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/EOF.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/FETCH.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/FILENO.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/GETC.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/Gen.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/PRINTF.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/READ.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/READLINE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/RECV.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/STORE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/TIEHANDLE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/TIESCALAR.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/WRITE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_findxopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_getxopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/_setxopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/accept.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/bind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/delparam.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/didlisten.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fcntl.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fhvec.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/fileno.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_local_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/format_remote_addr.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getfh.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getlines.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getropt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/getsopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/ioctl.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/listen.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/new_from_fh.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/select.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/sendto.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setdebug.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setparam.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setropt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/setsopt.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen/unbind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/bind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/setdebug.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet/unbind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/PRINT.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/READLINE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/_setbuf_unbuf.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/PRINT.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/READLINE.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/_setbuf_unbuf.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/bind.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/setdebug.al
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true