Upgrade this out-of-date port from WML 1.6.8 to WML 1.99.8. Yes, I know

that our 1.99.8 is a developer version for approaching WML 2.0. But
1.6.x and 1.7.x are both horribly broken for FreeBSD 3.x and 4.x because
of the way Perl is installed (under /usr/libdata). And because 1.99.8
is already stable enough and very near 2.0, we now go this way for the
port, too.

4 files changed, 153 insertions, 128 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index 1d482a95761..a5509cf4ecf 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wml
-PORTVERSION= 	1.6.8
+PORTVERSION= 	1.99.8
 CATEGORIES=	www lang
 MASTER_SITES=	http://www.engelschall.com/sw/wml/distrib/ \
 		ftp://ftp.ch.engelschall.com/sw/wml/ \
@@ -15,19 +15,17 @@ MASTER_SITES=	http://www.engelschall.com/sw/wml/distrib/ \
 
 MAINTAINER=	rse@engelschall.com
 
-.include <bsd.port.pre.mk>
-
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl=${PERL5}
 
 CAT1=	wml_aux_linklint.1 wml_aux_txt2html.1 \
-	wml_aux_wwwtable.1 wml_p2_mhc.1 wml_p4_gm4.1
+	wml_aux_tidy.1 wml_p4_gm4.1
 
 MAN1=	wmd.1 wmk.1 wml.1 wmb.1 wmu.1 \
-	wml_aux_htmlinfo.1 wml_aux_iselect.1 \
+	wml_aux_freetable.1 wml_aux_htmlclean.1 wml_aux_htmlinfo.1 wml_aux_iselect.1 \
 	wml_aux_map2html.1 wml_aux_weblint.1 wml_p1_ipp.1 \
-	wml_p3_eperl.1 wml_p5_divert.1 wml_p6_asubst.1 \
+	wml_p2_mp4h.1 wml_p3_eperl.1 wml_p5_divert.1 wml_p6_asubst.1 \
 	wml_p7_htmlfix.1 wml_p8_htmlstrip.1 wml_p9_slice.1
 
 MAN3=	wml::all.3 wml::des::all.3 wml::des::gfont.3 \
@@ -39,14 +37,17 @@ MAN3=	wml::all.3 wml::des::all.3 wml::des::gfont.3 \
 	wml::fmt::xtable.3 wml::imp::all.3 wml::imp::csmap.3 \
 	wml::imp::fsview.3 wml::imp::generic.3 wml::std::all.3 \
 	wml::std::box.3 wml::std::case.3 wml::std::grid.3 \
-	wml::std::href.3 wml::std::lang.3 wml::std::logo.3 \
-	wml::std::info.3 wml::std::page.3 wml::std::tags.3 \
-	wml::std::toc.3 wml::sup::all.3 wml::sup::hextriple.3 \
-	wml::sup::path.3 wml::sys::all.3 wml::sys::boot.3
+	wml::std::label.3 wml::std::href.3 wml::std::lang.3 \
+	wml::std::logo.3 wml::std::info.3 wml::std::page.3 \
+	wml::std::tags.3 wml::std::toc.3 wml::sup::all.3 \
+	wml::sup::hextriple.3 wml::mod::MakeMaker.3 wml::mod::all.3 \
+	wml::mod::version.3 wml::sup::path.3 wml::sys::all.3 \
+	wml::sys::bootp3.3 wml::sys::bootp4.3 wml::sys::compat1.3
 
 CAT7=	wml_barebone.7 \
 	wml_std_css1.7 wml_std_css2.7 wml_std_csspos.7 \
-	wml_std_html20.7 wml_std_html32.7 wml_std_html40.7
+	wml_std_html20.7 wml_std_html32.7 wml_std_html40.7 \
+	wml_std_html401.7 wml_std_wai10.7 wml_std_xhtml10.7
 
 MAN7=	wml_intro.7 wml_tutorial.7 wml_faq.7 wml_tags.7
 
@@ -62,4 +63,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/wml/distinfo b/www/wml/distinfo
index ce8e48a82c3..b1f581db12d 100644
--- a/www/wml/distinfo
+++ b/www/wml/distinfo
@@ -1 +1 @@
-MD5 (wml-1.6.8.tar.gz) = 32755141cba3c05b5fcb4b2a98eb328e
+MD5 (wml-1.99.8.tar.gz) = 4725ac1608108d69a30678cb5af0658f
diff --git a/www/wml/pkg-descr b/www/wml/pkg-descr
index 2653ce8981b..95994e1347b 100644
--- a/www/wml/pkg-descr
+++ b/www/wml/pkg-descr
@@ -4,7 +4,8 @@
     \ V  V /| |  | | |___   ``WML is the Unix toolkit for getting
      \_/\_/ |_|  |_|_____|    your webdesigner's HTML job done.''
 
-  Copyright (c) 1996,1997,1998 Ralf S. Engelschall
+  Copyright (c) 1996-2000 Ralf S. Engelschall
+  Copyright (c) 1999-2000 Denis Barbier
 
   WML is a free and extensible Webdesigner's off-line HTML generation toolkit
   for Unix, distributed under the GNU General Public License (GPL v2). It is
@@ -21,4 +22,3 @@
   generation.
 
 WWW: http://www.engelschall.com/sw/wml/
-     ftp://ftp.engelschall.com/sw/wml/
diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index c2c1addff09..c4214dc17ed 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -1,43 +1,59 @@
+bin/wmb
 bin/wmd
 bin/wmk
 bin/wml
-bin/wmb
 bin/wmu
-lib/wml/exec/wml_p1_ipp
-lib/wml/exec/wml_p2_mhc
-lib/wml/exec/wml_p3_eperl
-lib/wml/exec/wml_p4_gm4
-lib/wml/exec/wml_p5_divert
-lib/wml/exec/wml_p6_asubst
-lib/wml/exec/wml_p7_htmlfix
-lib/wml/exec/wml_p8_htmlstrip
-lib/wml/exec/wml_p9_slice
-lib/wml/exec/wml_aux_iselect
-lib/wml/exec/wml_aux_linklint
-lib/wml/exec/wml_aux_txt2html
-lib/wml/exec/wml_aux_wwwtable
-lib/wml/exec/wml_aux_htmlinfo
-lib/wml/exec/wml_aux_map2html
-lib/wml/exec/wml_aux_weblint
-lib/wml/aux/txt2html.dict
-lib/wml/aux/weblintrc
-lib/wml/aux/wmd.txt
 lib/wml/aux/logos/logo-apache.gif
 lib/wml/aux/logos/logo-apache.info
+lib/wml/aux/logos/logo-apache.png
 lib/wml/aux/logos/logo-freebsd.gif
 lib/wml/aux/logos/logo-freebsd.info
+lib/wml/aux/logos/logo-freebsd.png
+lib/wml/aux/logos/logo-gimp.gif
+lib/wml/aux/logos/logo-gimp.info
+lib/wml/aux/logos/logo-gimp.png
+lib/wml/aux/logos/logo-htdig.gif
+lib/wml/aux/logos/logo-htdig.info
+lib/wml/aux/logos/logo-htdig.png
 lib/wml/aux/logos/logo-linux.gif
 lib/wml/aux/logos/logo-linux.info
+lib/wml/aux/logos/logo-linux.png
+lib/wml/aux/logos/logo-php3.gif
+lib/wml/aux/logos/logo-php3.info
+lib/wml/aux/logos/logo-php3.png
 lib/wml/aux/logos/logo-vim.gif
 lib/wml/aux/logos/logo-vim.info
+lib/wml/aux/logos/logo-vim.png
 lib/wml/aux/logos/logo-wml.gif
 lib/wml/aux/logos/logo-wml.info
+lib/wml/aux/logos/logo-wml.png
+lib/wml/aux/txt2html.dict
+lib/wml/aux/weblintrc
+lib/wml/aux/wmd.txt
+lib/wml/exec/wml_aux_freetable
+lib/wml/exec/wml_aux_htmlclean
+lib/wml/exec/wml_aux_htmlinfo
+lib/wml/exec/wml_aux_iselect
+lib/wml/exec/wml_aux_linklint
+lib/wml/exec/wml_aux_map2html
+lib/wml/exec/wml_aux_tidy
+lib/wml/exec/wml_aux_txt2html
+lib/wml/exec/wml_aux_weblint
+lib/wml/exec/wml_p1_ipp
+lib/wml/exec/wml_p2_mp4h
+lib/wml/exec/wml_p3_eperl
+lib/wml/exec/wml_p4_gm4
+lib/wml/exec/wml_p5_divert
+lib/wml/exec/wml_p6_asubst
+lib/wml/exec/wml_p7_htmlfix
+lib/wml/exec/wml_p8_htmlstrip
+lib/wml/exec/wml_p9_slice
 lib/wml/include/all.wml
 lib/wml/include/des/all.wml
 lib/wml/include/des/gfont.wml
-lib/wml/include/des/lowsrc.wml
 lib/wml/include/des/imgbg.wml
 lib/wml/include/des/imgdot.wml
+lib/wml/include/des/lowsrc.wml
 lib/wml/include/des/navbar.wml
 lib/wml/include/des/preload.wml
 lib/wml/include/des/rollover.wml
@@ -55,14 +71,18 @@ lib/wml/include/imp/all.wml
 lib/wml/include/imp/csmap.wml
 lib/wml/include/imp/fsview.wml
 lib/wml/include/imp/generic.wml
+lib/wml/include/mod/MakeMaker.wml
+lib/wml/include/mod/all.wml
+lib/wml/include/mod/version.wml
 lib/wml/include/std/all.wml
 lib/wml/include/std/box.wml
 lib/wml/include/std/case.wml
 lib/wml/include/std/grid.wml
 lib/wml/include/std/href.wml
+lib/wml/include/std/info.wml
+lib/wml/include/std/label.wml
 lib/wml/include/std/lang.wml
 lib/wml/include/std/logo.wml
-lib/wml/include/std/info.wml
 lib/wml/include/std/page.wml
 lib/wml/include/std/tags.wml
 lib/wml/include/std/toc.wml
@@ -70,66 +90,65 @@ lib/wml/include/sup/all.wml
 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/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
+lib/wml/include/sys/bootp3.wml
+lib/wml/include/sys/bootp4.wml
+lib/wml/include/sys/compat1.wml
+lib/wml/perl/lib/File/PathConvert.pm
+lib/wml/perl/lib/Getopt/Long.pm
+lib/wml/perl/lib/HTML/Clean.pm
+lib/wml/perl/lib/Image/Size.pm
+lib/wml/perl/lib/auto/Getopt/Long/Configure.al
+lib/wml/perl/lib/auto/Getopt/Long/Croak.al
+lib/wml/perl/lib/auto/Getopt/Long/FindOption.al
+lib/wml/perl/lib/auto/Getopt/Long/GetOptions.al
+lib/wml/perl/lib/auto/Getopt/Long/autosplit.ix
+lib/wml/perl/lib/auto/Getopt/Long/config.al
+lib/wml/perl/lib/auto/HTML/Clean/autosplit.ix
+lib/wml/perl/lib/auto/Image/Size/autosplit.ix
+lib/wml/perl/lib/auto/Image/Size/bmpsize.al
+lib/wml/perl/lib/auto/Image/Size/gifsize.al
+lib/wml/perl/lib/auto/Image/Size/jpegsize.al
+lib/wml/perl/lib/auto/Image/Size/pngsize.al
+lib/wml/perl/lib/auto/Image/Size/ppmsize.al
+lib/wml/perl/lib/auto/Image/Size/tiffsize.al
+lib/wml/perl/lib/auto/Image/Size/xbmsize.al
+lib/wml/perl/lib/auto/Image/Size/xpmsize.al
+lib/wml/perl/lib/i386-freebsd/Bit/Vector.pm
+lib/wml/perl/lib/i386-freebsd/IO.pm
+lib/wml/perl/lib/i386-freebsd/IO/Dir.pm
+lib/wml/perl/lib/i386-freebsd/IO/File.pm
+lib/wml/perl/lib/i386-freebsd/IO/Handle.pm
+lib/wml/perl/lib/i386-freebsd/IO/Pipe.pm
+lib/wml/perl/lib/i386-freebsd/IO/Poll.pm
+lib/wml/perl/lib/i386-freebsd/IO/Seekable.pm
+lib/wml/perl/lib/i386-freebsd/IO/Select.pm
+lib/wml/perl/lib/i386-freebsd/IO/Socket.pm
+lib/wml/perl/lib/i386-freebsd/IO/Socket/INET.pm
+lib/wml/perl/lib/i386-freebsd/IO/Socket/UNIX.pm
+lib/wml/perl/lib/i386-freebsd/Term/ReadKey.pm
+lib/wml/perl/lib/i386-freebsd/WML/GD.pm
+lib/wml/perl/lib/i386-freebsd/auto/Bit/Vector/.packlist
+lib/wml/perl/lib/i386-freebsd/auto/Bit/Vector/Vector.bs
+lib/wml/perl/lib/i386-freebsd/auto/Bit/Vector/Vector.so
+lib/wml/perl/lib/i386-freebsd/auto/File/PathConvert/.packlist
+lib/wml/perl/lib/i386-freebsd/auto/Getopt/Long/.packlist
+lib/wml/perl/lib/i386-freebsd/auto/HTML/Clean/.packlist
+lib/wml/perl/lib/i386-freebsd/auto/IO/.packlist
+lib/wml/perl/lib/i386-freebsd/auto/IO/IO.bs
+lib/wml/perl/lib/i386-freebsd/auto/IO/IO.so
+lib/wml/perl/lib/i386-freebsd/auto/Image/Size/.packlist
+lib/wml/perl/lib/i386-freebsd/auto/Term/ReadKey/.packlist
+lib/wml/perl/lib/i386-freebsd/auto/Term/ReadKey/ReadKey.bs
+lib/wml/perl/lib/i386-freebsd/auto/Term/ReadKey/ReadKey.so
+lib/wml/perl/lib/i386-freebsd/auto/Term/ReadKey/autosplit.ix
+lib/wml/perl/lib/i386-freebsd/auto/WML/GD/.packlist
+lib/wml/perl/lib/i386-freebsd/auto/WML/GD/GD.bs
+lib/wml/perl/lib/i386-freebsd/auto/WML/GD/GD.so
+lib/wml/perl/lib/i386-freebsd/auto/WML/GD/autosplit.ix
 man/cat1/wml_aux_linklint.1.gz
+man/cat1/wml_aux_tidy.1.gz
 man/cat1/wml_aux_txt2html.1.gz
-man/cat1/wml_aux_wwwtable.1.gz
+man/cat1/wml_p4_gm4.1.gz
 man/cat7/wml_barebone.7.gz
 man/cat7/wml_std_css1.7.gz
 man/cat7/wml_std_css2.7.gz
@@ -137,48 +156,53 @@ 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
+man/cat7/wml_std_html401.7.gz
+man/cat7/wml_std_wai10.7.gz
+man/cat7/wml_std_xhtml10.7.gz
 @dirrm lib/wml/exec
 @dirrm lib/wml/aux/logos
 @dirrm lib/wml/aux
 @dirrm lib/wml/include/des
 @dirrm lib/wml/include/fmt
 @dirrm lib/wml/include/imp
+@dirrm lib/wml/include/mod
 @dirrm lib/wml/include/std
 @dirrm lib/wml/include/sup
 @dirrm lib/wml/include/sys
 @dirrm lib/wml/include
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/Getopt/Long
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/Getopt
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/Bit/Vector
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/Bit
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/File/PathConvert
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/File
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/Image/Size
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/Image
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/WML/GD
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/WML
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/IO
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/Term/ReadKey
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/Term
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/HTML/Clean
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto/HTML
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/auto
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/Bit
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/WML
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/IO/Socket
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/IO
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%/Term
+@dirrm lib/wml/perl/lib/%%PERL_ARCH%%
+@dirrm lib/wml/perl/lib/Getopt
+@dirrm lib/wml/perl/lib/auto/Getopt/Long
+@dirrm lib/wml/perl/lib/auto/Getopt
+@dirrm lib/wml/perl/lib/auto/Image/Size
+@dirrm lib/wml/perl/lib/auto/Image
+@dirrm lib/wml/perl/lib/auto/HTML/Clean
+@dirrm lib/wml/perl/lib/auto/HTML
+@dirrm lib/wml/perl/lib/auto
+@dirrm lib/wml/perl/lib/File
+@dirrm lib/wml/perl/lib/Image
+@dirrm lib/wml/perl/lib/HTML
+@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