Unbreak by fixing perl paths.

1 files changed, 87 insertions, 88 deletions

diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index 51c98ae..c2c1add 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -71,59 +71,60 @@ lib/wml/include/sup/hextriple.wml
 lib/wml/include/sup/path.wml
 lib/wml/include/sys/all.wml
 lib/wml/include/sys/boot.wml
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/File/PathConvert.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/Getopt/Long.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/Image/Size.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/Text/BlockParser.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/Text/DelimMatch.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Text/DelimMatch/autosplit.ix
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Getopt/Long/Configure.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Getopt/Long/Croak.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Getopt/Long/FindOption.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Getopt/Long/GetOptions.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Getopt/Long/autosplit.ix
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Getopt/Long/config.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image/Size/autosplit.ix
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image/Size/gifsize.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image/Size/jpegsize.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image/Size/pngsize.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image/Size/ppmsize.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image/Size/tiffsize.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image/Size/xbmsize.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image/Size/xpmsize.al
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit/Vector.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Dir.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/File.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Handle.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Pipe.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Poll.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Seekable.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Select.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket/INET.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket/UNIX.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/ReadKey.pm
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector/.packlist
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.bs
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.so
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/PathConvert/.packlist
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/.packlist
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.bs
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.so
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Long/.packlist
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/.packlist
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Size/.packlist
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/.packlist
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.bs
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/autosplit.ix
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/BlockParser/.packlist
-lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DelimMatch/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/File/PathConvert.pm
+lib/perl5/site_perl/%%PERL_VER%%/Getopt/Long.pm
+lib/perl5/site_perl/%%PERL_VER%%/Image/Size.pm
+lib/perl5/site_perl/%%PERL_VER%%/Text/BlockParser.pm
+lib/perl5/site_perl/%%PERL_VER%%/Text/DelimMatch.pm
+lib/perl5/site_perl/%%PERL_VER%%/auto/Text/DelimMatch/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/auto/Getopt/Long/Configure.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Getopt/Long/Croak.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Getopt/Long/FindOption.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Getopt/Long/GetOptions.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Getopt/Long/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/auto/Getopt/Long/config.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size/bmpsize.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size/gifsize.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size/jpegsize.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size/pngsize.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size/ppmsize.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size/tiffsize.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size/xbmsize.al
+lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size/xpmsize.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit/Vector.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Dir.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/File.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Handle.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Pipe.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Poll.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Seekable.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Select.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket/INET.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket/UNIX.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/ReadKey.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/PathConvert/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Long/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Size/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/BlockParser/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DelimMatch/.packlist
 man/cat1/wml_p2_mhc.1.gz
 man/cat1/wml_p4_gm4.1.gz
 man/cat1/wml_aux_linklint.1.gz
@@ -136,6 +137,7 @@ man/cat7/wml_std_csspos.7.gz
 man/cat7/wml_std_html20.7.gz
 man/cat7/wml_std_html32.7.gz
 man/cat7/wml_std_html40.7.gz
+@exec mkdir %D/lib/wml/perl
 @dirrm lib/wml/exec
 @dirrm lib/wml/aux/logos
 @dirrm lib/wml/aux
@@ -146,40 +148,37 @@ man/cat7/wml_std_html40.7.gz
 @dirrm lib/wml/include/sup
 @dirrm lib/wml/include/sys
 @dirrm lib/wml/include
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Getopt
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image/Size
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Image
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Text/DelimMatch
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto/Text
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/auto
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/PathConvert
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Size
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/BlockParser
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DelimMatch
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/%%PERL_ARCH%%
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/File
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/Getopt
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/Image
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/Text
-@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%
-@dirrm lib/wml/perl/lib/site_perl
-@dirrm lib/wml/perl/lib
 @dirrm lib/wml/perl
 @dirrm lib/wml
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Getopt/Long
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Getopt
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Image/Size
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Image
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Text/DelimMatch
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Text
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO/Socket
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/Vector
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/PathConvert
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt/Long
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Getopt
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Size
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/BlockParser
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/DelimMatch
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/File
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Getopt
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Image
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Text