3 files changed, 87 insertions, 92 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index bffc6ebc04ba..34ad4f10fb45 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -3,7 +3,7 @@
 # Date created:		09-Sep-1997
 # Whom:			Ralf S. Engelschall <rse@engelschall.com>
 #
-# $Id: Makefile,v 1.22 1998/08/02 15:43:35 rse Exp $
+# $Id: Makefile,v 1.23 1998/08/25 00:16:46 asami Exp $
 #
 
 DISTNAME=	wml-1.6.7
@@ -15,8 +15,6 @@ MASTER_SITES=	http://www.engelschall.com/sw/wml/distrib/ \
 
 MAINTAINER=	rse@engelschall.com
 
-BROKEN=		perl5 upgrade
-
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
diff --git a/www/wml/pkg-message b/www/wml/pkg-message
index f77f2a92d784..3581e6b09f00 100644
--- a/www/wml/pkg-message
+++ b/www/wml/pkg-message
@@ -1,4 +1,3 @@
-  
   This program is free software; it may be redistributed and/or modified only
   under the terms of the GNU General Public License, which may be found
   in the WML source distribution.  Look at the file COPYING. 
diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index 347c51e69d58..07f52c8f23bd 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -71,59 +71,59 @@ 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/i386-freebsd/auto/Getopt/Long/.packlist
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/Bit/Vector/Vector.so
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/Bit/Vector/Vector.bs
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/Bit/Vector/.packlist
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/File/PathConvert/.packlist
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/Image/Size/.packlist
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/GD/GD.so
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/GD/GD.bs
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/GD/.packlist
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/IO/IO.so
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/IO/IO.bs
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/IO/.packlist
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term/ReadKey/ReadKey.so
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term/ReadKey/ReadKey.bs
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term/ReadKey/.packlist
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text/DelimMatch/.packlist
-lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text/BlockParser/.packlist
-lib/wml/perl/lib/site_perl/Getopt/Long.pm
-lib/wml/perl/lib/site_perl/Bit/Vector.pm
-lib/wml/perl/lib/site_perl/File/PathConvert.pm
-lib/wml/perl/lib/site_perl/Image/Size.pm
-lib/wml/perl/lib/site_perl/auto/Getopt/Long/Configure.al
-lib/wml/perl/lib/site_perl/auto/Getopt/Long/Croak.al
-lib/wml/perl/lib/site_perl/auto/Getopt/Long/FindOption.al
-lib/wml/perl/lib/site_perl/auto/Getopt/Long/GetOptions.al
-lib/wml/perl/lib/site_perl/auto/Getopt/Long/autosplit.ix
-lib/wml/perl/lib/site_perl/auto/Getopt/Long/config.al
-lib/wml/perl/lib/site_perl/auto/Image/Size/gifsize.al
-lib/wml/perl/lib/site_perl/auto/Image/Size/xbmsize.al
-lib/wml/perl/lib/site_perl/auto/Image/Size/xpmsize.al
-lib/wml/perl/lib/site_perl/auto/Image/Size/pngsize.al
-lib/wml/perl/lib/site_perl/auto/Image/Size/jpegsize.al
-lib/wml/perl/lib/site_perl/auto/Image/Size/ppmsize.al
-lib/wml/perl/lib/site_perl/auto/Image/Size/tiffsize.al
-lib/wml/perl/lib/site_perl/auto/Image/Size/autosplit.ix
-lib/wml/perl/lib/site_perl/auto/GD/autosplit.ix
-lib/wml/perl/lib/site_perl/auto/Term/ReadKey/autosplit.ix
-lib/wml/perl/lib/site_perl/auto/Text/DelimMatch/autosplit.ix
-lib/wml/perl/lib/site_perl/GD.pm
-lib/wml/perl/lib/site_perl/IO/Pipe.pm
-lib/wml/perl/lib/site_perl/IO/File.pm
-lib/wml/perl/lib/site_perl/IO/Select.pm
-lib/wml/perl/lib/site_perl/IO/Socket.pm
-lib/wml/perl/lib/site_perl/IO/Socket/INET.pm
-lib/wml/perl/lib/site_perl/IO/Socket/UNIX.pm
-lib/wml/perl/lib/site_perl/IO/Handle.pm
-lib/wml/perl/lib/site_perl/IO/Seekable.pm
-lib/wml/perl/lib/site_perl/IO/Dir.pm
-lib/wml/perl/lib/site_perl/IO/Poll.pm
-lib/wml/perl/lib/site_perl/IO.pm
-lib/wml/perl/lib/site_perl/Term/ReadKey.pm
-lib/wml/perl/lib/site_perl/Text/DelimMatch.pm
-lib/wml/perl/lib/site_perl/Text/BlockParser.pm
+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%%/i386-freebsd/Bit/Vector.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/GD.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Dir.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/File.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Handle.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Pipe.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Poll.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Seekable.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Select.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Socket.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Socket/INET.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Socket/UNIX.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/Term/ReadKey.pm
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Bit/Vector/.packlist
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Bit/Vector/Vector.bs
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Bit/Vector/Vector.so
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/PathConvert/.packlist
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/GD/.packlist
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/GD/GD.bs
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/GD/GD.so
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/GD/autosplit.ix
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Getopt/Long/.packlist
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/IO/.packlist
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/IO/IO.bs
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/IO/IO.so
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Image/Size/.packlist
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/.packlist
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/ReadKey.bs
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/ReadKey.so
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/autosplit.ix
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Text/BlockParser/.packlist
+lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/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
@@ -146,41 +146,39 @@ 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/i386-freebsd/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Getopt
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Bit/Vector
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Bit
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/File/PathConvert
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/File
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Image/Size
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Image
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/GD
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/IO
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term/ReadKey
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text/DelimMatch
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text/BlockParser
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto
-@dirrm lib/wml/perl/lib/site_perl/i386-freebsd
-@dirrm lib/wml/perl/lib/site_perl/Getopt
-@dirrm lib/wml/perl/lib/site_perl/Bit
-@dirrm lib/wml/perl/lib/site_perl/File
-@dirrm lib/wml/perl/lib/site_perl/Image
-@dirrm lib/wml/perl/lib/site_perl/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/site_perl/auto/Getopt
-@dirrm lib/wml/perl/lib/site_perl/auto/Image/Size
-@dirrm lib/wml/perl/lib/site_perl/auto/Image
-@dirrm lib/wml/perl/lib/site_perl/auto/GD
-@dirrm lib/wml/perl/lib/site_perl/auto/Term/ReadKey
-@dirrm lib/wml/perl/lib/site_perl/auto/Term
-@dirrm lib/wml/perl/lib/site_perl/auto/Text/DelimMatch
-@dirrm lib/wml/perl/lib/site_perl/auto/Text
-@dirrm lib/wml/perl/lib/site_perl/auto
-@dirrm lib/wml/perl/lib/site_perl/IO/Socket
-@dirrm lib/wml/perl/lib/site_perl/IO
-@dirrm lib/wml/perl/lib/site_perl/Term
-@dirrm lib/wml/perl/lib/site_perl/Text
+@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%%/i386-freebsd/Bit
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO/Socket
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/IO
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/Term
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Bit/Vector
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Bit
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/PathConvert
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/File
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/GD
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Getopt/Long
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Getopt
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/IO
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Image/Size
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Image
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Text/BlockParser
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Text/DelimMatch
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto/Text
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd/auto
+@dirrm lib/wml/perl/lib/site_perl/%%PERL_VER%%/i386-freebsd
+@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