- Update to 2.1a2

Approved by:	miwi (mentor)

6 files changed, 251 insertions, 253 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index 7d30ab39dace..79d70743a405 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wml
-PORTVERSION=	2.0.11
+DISTVERSION=	2.1a2
 CATEGORIES=	www lang
 MASTER_SITES=	http://thewml.org/distrib/ \
 		ftp://thewml.org/distrib/
@@ -18,7 +18,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 
 USE_PERL5=	yes
-CONFIGURE_ARGS=	--with-perl=${PERL5}
+CONFIGURE_ARGS=	--with-perl=${PERL5} --with-catdir=man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	\
 		PERL_ARCH="${PERL_ARCH}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -26,13 +26,13 @@ GNU_CONFIGURE=	yes
 LIBTOOLFILES=	wml_backend/p2_mp4h/configure
 PLIST_SUB+=	ARCH=${PERL_ARCH}
 
-CAT1=	wml_aux_txt2html.1 wml_aux_tidy.1 wml_p4_gm4.1
-
 MAN1=	wmd.1 wmd_missing.1 wmk.1 wml.1 wmb.1 wmu.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_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 wml_aux_linklint.1
+	wml_p7_htmlfix.1 wml_p8_htmlstrip.1 wml_p9_slice.1 \
+	wml_aux_txt2html.1 wml_aux_tidy.1 wml_p4_gm4.1 \
+	wml_aux_linklint.1
 
 MAN3=	wml::all.3 wml::des::all.3 wml::des::gfont.3 \
 	wml::des::lowsrc.3 wml::des::imgdot.3 wml::des::imgbg.3 \
@@ -50,12 +50,11 @@ MAN3=	wml::all.3 wml::des::all.3 wml::des::gfont.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 \
+MAN7=	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_html401.7 wml_std_wai10.7 wml_std_xhtml10.7
-
-MAN7=	wml_intro.7 wml_macros.7 wml_tutorial.7 wml_faq.7 wml_tags.7
+	wml_std_html401.7 wml_std_wai10.7 wml_std_xhtml10.7 \
+	wml_intro.7 wml_macros.7 wml_tutorial.7 wml_faq.7 wml_tags.7
 
 .include <bsd.port.pre.mk>
 
@@ -63,18 +62,6 @@ MAN7=	wml_intro.7 wml_macros.7 wml_tutorial.7 wml_faq.7 wml_tags.7
 BROKEN=		Build fails on amd64 or ia64 (needs to build shared libraries with -fPIC)
 .endif
 
-#   catpages are usually not installed, so they are not compressed.
-#   But they are really needed as docs, so we compress manually...
-.if !defined(NOMANCOMPRESS)
-post-install:
-.for page in ${CAT1}
-	@${GZIP_CMD} ${PREFIX}/man/cat1/${page}
-.endfor
-.for page in ${CAT7}
-	@${GZIP_CMD} ${PREFIX}/man/cat7/${page}
-.endfor
-.endif
-
 post-build:
 	@${ECHO_MSG} "===>  Use 'make test' to run a quick test suite."
 
diff --git a/www/wml/distinfo b/www/wml/distinfo
index d36d83118dcc..8e1f3d65c20b 100644
--- a/www/wml/distinfo
+++ b/www/wml/distinfo
@@ -1,3 +1,3 @@
-MD5 (wml-2.0.11.tar.gz) = a26feebf4e59e9a6940f54c69dde05b5
-SHA256 (wml-2.0.11.tar.gz) = 8e11ef19ea67ff9c4b28ff0fcacf5098881ac0c5f09ddfe3abc29f1e12be5d4a
-SIZE (wml-2.0.11.tar.gz) = 3115230
+MD5 (wml-2.1a2.tar.gz) = 279f638c208631022d467a1fb25a0692
+SHA256 (wml-2.1a2.tar.gz) = 35ac0cbb66bc3981d85c04b501b577aec1f00e70f6ed14bf881785e5b70ecacd
+SIZE (wml-2.1a2.tar.gz) = 2213961
diff --git a/www/wml/files/patch-configure b/www/wml/files/patch-configure
index 3611d692a270..9254b01f59df 100644
--- a/www/wml/files/patch-configure
+++ b/www/wml/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Fri Oct 18 23:44:21 2002
 +++ configure	Thu Aug  5 23:40:57 2004
-@@ -1170,7 +1170,7 @@
-     esac
-     case " $ac_configure_args " in
-       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
--      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+      # *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-     esac
-   fi
- done
 @@ -2740,7 +2740,7 @@
  
  dummy:
diff --git a/www/wml/files/patch-wml_backend-p3_eperl_configure b/www/wml/files/patch-wml_backend-p3_eperl_configure
new file mode 100644
index 000000000000..fd5b31e4c47f
--- /dev/null
+++ b/www/wml/files/patch-wml_backend-p3_eperl_configure
@@ -0,0 +1,23 @@
+--- wml_backend/p3_eperl/configure.orig	2001-03-10 22:47:44.000000000 +0100
++++ wml_backend/p3_eperl/configure	2008-03-19 00:19:28.000000000 +0100
+@@ -577,7 +577,7 @@
+ PATH_PERL=$perlprog
+ echo "$ac_t""$perlprog v$perlvers" 1>&6
+ case $perlvers in
+-    5.003* | 5.004* | 5.005* | 5.006* )
++    5.003* | 5.004* | 5.005* | 5.006* | 5.007* | 5.008* )
+         ;;
+     * ) echo ""
+         echo "Latest Perl found on your system is $perlvers,"
+@@ -590,9 +590,9 @@
+         ;;
+ esac
+ case $perlvers in
+-    5.00[3-6]_[0-9][0-9] ) 
++    5.00[3-8]_[0-9][0-9] ) 
+ 	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; 
+-    5.00[3-6] ) 
++    5.00[3-8] ) 
+ 	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/$/00/'` ;; 
+ 	* ) 
+ 	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; 
diff --git a/www/wml/files/patch-wml_backend-p3_eperl_eperl_proto.h b/www/wml/files/patch-wml_backend-p3_eperl_eperl_proto.h
new file mode 100644
index 000000000000..b98065908a1b
--- /dev/null
+++ b/www/wml/files/patch-wml_backend-p3_eperl_eperl_proto.h
@@ -0,0 +1,11 @@
+--- wml_backend/p3_eperl/eperl_proto.h.orig	2008-03-19 00:22:05.000000000 +0100
++++ wml_backend/p3_eperl/eperl_proto.h	2008-03-19 00:22:54.000000000 +0100
+@@ -35,6 +35,8 @@
+ #ifndef EPERL_PROTO_H
+ #define EPERL_PROTO_H 1
+ 
++#include "eperl_getopt.h"
++
+ /*_BEGIN_PROTO_*/
+ 
+ /* eperl_main.c */
diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index cb85dbe09562..f3ec8adae4ee 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -1,221 +1,207 @@
-bin/wmb
-bin/wmd
-bin/wmk
-bin/wml
+lib/perl/lib/mach/auto/WML/GD/autosplit.ix
+lib/perl/lib/mach/auto/WML/GD/GD.so
+lib/perl/lib/mach/auto/WML/GD/GD.bs
+lib/perl/lib/mach/auto/WML/GD/.packlist
+lib/perl/lib/mach/auto/Term/ReadKey/autosplit.ix
+lib/perl/lib/mach/auto/Term/ReadKey/ReadKey.so
+lib/perl/lib/mach/auto/Term/ReadKey/ReadKey.bs
+lib/perl/lib/mach/auto/Term/ReadKey/.packlist
+lib/perl/lib/mach/auto/Image/Size/.packlist
+lib/perl/lib/mach/auto/IO/IO.so
+lib/perl/lib/mach/auto/IO/IO.bs
+lib/perl/lib/mach/auto/IO/.packlist
+lib/perl/lib/mach/auto/HTML/Clean/.packlist
+lib/perl/lib/mach/auto/Getopt/Long/.packlist
+lib/perl/lib/mach/auto/File/PathConvert/.packlist
+lib/perl/lib/mach/auto/Bit/Vector/Vector.so
+lib/perl/lib/mach/auto/Bit/Vector/Vector.bs
+lib/perl/lib/mach/auto/Bit/Vector/.packlist
+lib/perl/lib/mach/WML/GD.pm
+lib/perl/lib/mach/Term/ReadKey.pm
+lib/perl/lib/mach/IO/Socket/UNIX.pm
+lib/perl/lib/mach/IO/Socket/INET.pm
+lib/perl/lib/mach/IO/Socket.pm
+lib/perl/lib/mach/IO/Select.pm
+lib/perl/lib/mach/IO/Seekable.pm
+lib/perl/lib/mach/IO/Poll.pm
+lib/perl/lib/mach/IO/Pipe.pm
+lib/perl/lib/mach/IO/Handle.pm
+lib/perl/lib/mach/IO/File.pm
+lib/perl/lib/mach/IO/Dir.pm
+lib/perl/lib/mach/IO.pm
+lib/perl/lib/mach/Bit/Vector.pm
+lib/perl/lib/auto/Image/Size/xpmsize.al
+lib/perl/lib/auto/Image/Size/xbmsize.al
+lib/perl/lib/auto/Image/Size/tiffsize.al
+lib/perl/lib/auto/Image/Size/swfsize.al
+lib/perl/lib/auto/Image/Size/psdsize.al
+lib/perl/lib/auto/Image/Size/ppmsize.al
+lib/perl/lib/auto/Image/Size/pngsize.al
+lib/perl/lib/auto/Image/Size/jpegsize.al
+lib/perl/lib/auto/Image/Size/gifsize.al
+lib/perl/lib/auto/Image/Size/bmpsize.al
+lib/perl/lib/auto/Image/Size/autosplit.ix
+lib/perl/lib/auto/HTML/Clean/autosplit.ix
+lib/perl/lib/auto/Getopt/Long/config.al
+lib/perl/lib/auto/Getopt/Long/autosplit.ix
+lib/perl/lib/auto/Getopt/Long/GetOptions.al
+lib/perl/lib/auto/Getopt/Long/FindOption.al
+lib/perl/lib/auto/Getopt/Long/Croak.al
+lib/perl/lib/auto/Getopt/Long/Configure.al
+lib/perl/lib/Image/Size.pm
+lib/perl/lib/HTML/Clean.pm
+lib/perl/lib/Getopt/Long.pm
+lib/perl/lib/File/PathConvert.pm
+lib/include/sys/compat1.wml
+lib/include/sys/bootp4.wml
+lib/include/sys/bootp3.wml
+lib/include/sys/all.wml
+lib/include/sup/path.wml
+lib/include/sup/hextriple.wml
+lib/include/sup/all.wml
+lib/include/std/toc.wml
+lib/include/std/tags.wml
+lib/include/std/page.wml
+lib/include/std/logo.wml
+lib/include/std/lang.wml
+lib/include/std/label.wml
+lib/include/std/info.wml
+lib/include/std/href.wml
+lib/include/std/grid.wml
+lib/include/std/case.wml
+lib/include/std/box.wml
+lib/include/std/all.wml
+lib/include/mod/version.wml
+lib/include/mod/all.wml
+lib/include/mod/MakeMaker.wml
+lib/include/imp/generic.wml
+lib/include/imp/fsview.wml
+lib/include/imp/csmap.wml
+lib/include/imp/all.wml
+lib/include/fmt/xtable.wml
+lib/include/fmt/verbatim.wml
+lib/include/fmt/url.wml
+lib/include/fmt/text.wml
+lib/include/fmt/sdf.wml
+lib/include/fmt/pod.wml
+lib/include/fmt/isolatin.wml
+lib/include/fmt/all.wml
+lib/include/des/typography.wml
+lib/include/des/space.wml
+lib/include/des/rollover.wml
+lib/include/des/preload.wml
+lib/include/des/navbar.wml
+lib/include/des/lowsrc.wml
+lib/include/des/imgdot.wml
+lib/include/des/imgbg.wml
+lib/include/des/gfont.wml
+lib/include/des/all.wml
+lib/include/all.wml
+lib/exec/wml_p9_slice
+lib/exec/wml_p8_htmlstrip
+lib/exec/wml_p7_htmlfix
+lib/exec/wml_p6_asubst
+lib/exec/wml_p5_divert
+lib/exec/wml_p4_gm4
+lib/exec/wml_p3_eperl
+lib/exec/wml_p2_mp4h
+lib/exec/wml_p1_ipp
+lib/exec/wml_aux_weblint
+lib/exec/wml_aux_txt2html
+lib/exec/wml_aux_tidy
+lib/exec/wml_aux_map2html
+lib/exec/wml_aux_linklint
+lib/exec/wml_aux_iselect
+lib/exec/wml_aux_htmlinfo
+lib/exec/wml_aux_htmlclean
+lib/exec/wml_aux_freetable
+lib/aux/wmd.txt
+lib/aux/weblintrc
+lib/aux/txt2html.dict
+lib/aux/logos/logo-xemacs.png
+lib/aux/logos/logo-xemacs.info
+lib/aux/logos/logo-xemacs.gif
+lib/aux/logos/logo-wml.png
+lib/aux/logos/logo-wml.info
+lib/aux/logos/logo-wml.gif
+lib/aux/logos/logo-vim.png
+lib/aux/logos/logo-vim.info
+lib/aux/logos/logo-vim.gif
+lib/aux/logos/logo-php3.png
+lib/aux/logos/logo-php3.info
+lib/aux/logos/logo-php3.gif
+lib/aux/logos/logo-php.png
+lib/aux/logos/logo-php.info
+lib/aux/logos/logo-php.gif
+lib/aux/logos/logo-openbsd.png
+lib/aux/logos/logo-openbsd.info
+lib/aux/logos/logo-openbsd.gif
+lib/aux/logos/logo-netbsd.png
+lib/aux/logos/logo-netbsd.info
+lib/aux/logos/logo-netbsd.gif
+lib/aux/logos/logo-linux.png
+lib/aux/logos/logo-linux.info
+lib/aux/logos/logo-linux.gif
+lib/aux/logos/logo-htdig.png
+lib/aux/logos/logo-htdig.info
+lib/aux/logos/logo-htdig.gif
+lib/aux/logos/logo-gimp.png
+lib/aux/logos/logo-gimp.info
+lib/aux/logos/logo-gimp.gif
+lib/aux/logos/logo-freebsd.png
+lib/aux/logos/logo-freebsd.info
+lib/aux/logos/logo-freebsd.gif
+lib/aux/logos/logo-apache.png
+lib/aux/logos/logo-apache.info
+lib/aux/logos/logo-apache.gif
 bin/wmu
-lib/wml/data/logos/logo-apache.gif
-lib/wml/data/logos/logo-apache.info
-lib/wml/data/logos/logo-apache.png
-lib/wml/data/logos/logo-freebsd.gif
-lib/wml/data/logos/logo-freebsd.info
-lib/wml/data/logos/logo-freebsd.png
-lib/wml/data/logos/logo-gimp.gif
-lib/wml/data/logos/logo-gimp.info
-lib/wml/data/logos/logo-gimp.png
-lib/wml/data/logos/logo-htdig.gif
-lib/wml/data/logos/logo-htdig.info
-lib/wml/data/logos/logo-htdig.png
-lib/wml/data/logos/logo-linux.gif
-lib/wml/data/logos/logo-linux.info
-lib/wml/data/logos/logo-linux.png
-lib/wml/data/logos/logo-netbsd.gif
-lib/wml/data/logos/logo-netbsd.info
-lib/wml/data/logos/logo-netbsd.png
-lib/wml/data/logos/logo-openbsd.gif
-lib/wml/data/logos/logo-openbsd.info
-lib/wml/data/logos/logo-openbsd.png
-lib/wml/data/logos/logo-php.gif
-lib/wml/data/logos/logo-php.info
-lib/wml/data/logos/logo-php.png
-lib/wml/data/logos/logo-php3.gif
-lib/wml/data/logos/logo-php3.info
-lib/wml/data/logos/logo-php3.png
-lib/wml/data/logos/logo-vim.gif
-lib/wml/data/logos/logo-vim.info
-lib/wml/data/logos/logo-vim.png
-lib/wml/data/logos/logo-wml.gif
-lib/wml/data/logos/logo-wml.info
-lib/wml/data/logos/logo-wml.png
-lib/wml/data/logos/logo-xemacs.gif
-lib/wml/data/logos/logo-xemacs.info
-lib/wml/data/logos/logo-xemacs.png
-lib/wml/data/txt2html.dict
-lib/wml/data/weblintrc
-lib/wml/data/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/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
-lib/wml/include/des/space.wml
-lib/wml/include/des/typography.wml
-lib/wml/include/fmt/all.wml
-lib/wml/include/fmt/isolatin.wml
-lib/wml/include/fmt/pod.wml
-lib/wml/include/fmt/sdf.wml
-lib/wml/include/fmt/text.wml
-lib/wml/include/fmt/url.wml
-lib/wml/include/fmt/verbatim.wml
-lib/wml/include/fmt/xtable.wml
-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/page.wml
-lib/wml/include/std/tags.wml
-lib/wml/include/std/toc.wml
-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/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/psdsize.al
-lib/wml/perl/lib/auto/Image/Size/swfsize.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/%%ARCH%%/Bit/Vector.pm
-lib/wml/perl/lib/%%ARCH%%/IO.pm
-lib/wml/perl/lib/%%ARCH%%/IO/Dir.pm
-lib/wml/perl/lib/%%ARCH%%/IO/File.pm
-lib/wml/perl/lib/%%ARCH%%/IO/Handle.pm
-lib/wml/perl/lib/%%ARCH%%/IO/Pipe.pm
-lib/wml/perl/lib/%%ARCH%%/IO/Poll.pm
-lib/wml/perl/lib/%%ARCH%%/IO/Seekable.pm
-lib/wml/perl/lib/%%ARCH%%/IO/Select.pm
-lib/wml/perl/lib/%%ARCH%%/IO/Socket.pm
-lib/wml/perl/lib/%%ARCH%%/IO/Socket/INET.pm
-lib/wml/perl/lib/%%ARCH%%/IO/Socket/UNIX.pm
-lib/wml/perl/lib/%%ARCH%%/Term/ReadKey.pm
-lib/wml/perl/lib/%%ARCH%%/WML/GD.pm
-lib/wml/perl/lib/%%ARCH%%/auto/Bit/Vector/.packlist
-lib/wml/perl/lib/%%ARCH%%/auto/Bit/Vector/Vector.bs
-lib/wml/perl/lib/%%ARCH%%/auto/Bit/Vector/Vector.so
-lib/wml/perl/lib/%%ARCH%%/auto/File/PathConvert/.packlist
-lib/wml/perl/lib/%%ARCH%%/auto/Getopt/Long/.packlist
-lib/wml/perl/lib/%%ARCH%%/auto/HTML/Clean/.packlist
-lib/wml/perl/lib/%%ARCH%%/auto/IO/.packlist
-lib/wml/perl/lib/%%ARCH%%/auto/IO/IO.bs
-lib/wml/perl/lib/%%ARCH%%/auto/IO/IO.so
-lib/wml/perl/lib/%%ARCH%%/auto/Image/Size/.packlist
-lib/wml/perl/lib/%%ARCH%%/auto/Term/ReadKey/.packlist
-lib/wml/perl/lib/%%ARCH%%/auto/Term/ReadKey/ReadKey.bs
-lib/wml/perl/lib/%%ARCH%%/auto/Term/ReadKey/ReadKey.so
-lib/wml/perl/lib/%%ARCH%%/auto/Term/ReadKey/autosplit.ix
-lib/wml/perl/lib/%%ARCH%%/auto/WML/GD/.packlist
-lib/wml/perl/lib/%%ARCH%%/auto/WML/GD/GD.bs
-lib/wml/perl/lib/%%ARCH%%/auto/WML/GD/GD.so
-lib/wml/perl/lib/%%ARCH%%/auto/WML/GD/autosplit.ix
-man/cat1/wml_aux_tidy.1.gz
-man/cat1/wml_aux_txt2html.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
-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
-man/cat7/wml_std_html401.7.gz
-man/cat7/wml_std_wai10.7.gz
-man/cat7/wml_std_xhtml10.7.gz
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/WML/GD
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/WML
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Term/ReadKey
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Term
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Image/Size
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Image
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/IO
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/HTML/Clean
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/HTML
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Getopt
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/File/PathConvert
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/File
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Bit/Vector
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Bit
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto
-@dirrm lib/wml/perl/lib/%%ARCH%%/WML
-@dirrm lib/wml/perl/lib/%%ARCH%%/Term
-@dirrm lib/wml/perl/lib/%%ARCH%%/IO/Socket
-@dirrm lib/wml/perl/lib/%%ARCH%%/IO
-@dirrm lib/wml/perl/lib/%%ARCH%%/Bit
-@dirrm lib/wml/perl/lib/%%ARCH%%
-@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/Getopt/Long
-@dirrm lib/wml/perl/lib/auto/Getopt
-@dirrm lib/wml/perl/lib/auto
-@dirrm lib/wml/perl/lib/Image
-@dirrm lib/wml/perl/lib/HTML
-@dirrm lib/wml/perl/lib/Getopt
-@dirrm lib/wml/perl/lib/File
-@dirrm lib/wml/perl/lib
-@dirrm lib/wml/perl
-@dirrm lib/wml/include/sys
-@dirrm lib/wml/include/sup
-@dirrm lib/wml/include/std
-@dirrm lib/wml/include/mod
-@dirrm lib/wml/include/imp
-@dirrm lib/wml/include/fmt
-@dirrm lib/wml/include/des
-@dirrm lib/wml/include
-@dirrm lib/wml/exec
-@dirrm lib/wml/data/logos
-@dirrm lib/wml/data
-@dirrm lib/wml
+bin/wml
+bin/wmk
+bin/wmd
+bin/wmb
+@dirrm lib/perl/lib/mach/auto/WML/GD
+@dirrm lib/perl/lib/mach/auto/WML
+@dirrm lib/perl/lib/mach/auto/Term/ReadKey
+@dirrm lib/perl/lib/mach/auto/Term
+@dirrm lib/perl/lib/mach/auto/Image/Size
+@dirrm lib/perl/lib/mach/auto/Image
+@dirrm lib/perl/lib/mach/auto/IO
+@dirrm lib/perl/lib/mach/auto/HTML/Clean
+@dirrm lib/perl/lib/mach/auto/HTML
+@dirrm lib/perl/lib/mach/auto/Getopt/Long
+@dirrm lib/perl/lib/mach/auto/Getopt
+@dirrm lib/perl/lib/mach/auto/File/PathConvert
+@dirrm lib/perl/lib/mach/auto/File
+@dirrm lib/perl/lib/mach/auto/Bit/Vector
+@dirrm lib/perl/lib/mach/auto/Bit
+@dirrm lib/perl/lib/mach/auto
+@dirrm lib/perl/lib/mach/WML
+@dirrm lib/perl/lib/mach/Term
+@dirrm lib/perl/lib/mach/IO/Socket
+@dirrm lib/perl/lib/mach/IO
+@dirrm lib/perl/lib/mach/Bit
+@dirrm lib/perl/lib/mach
+@dirrm lib/perl/lib/auto/Image/Size
+@dirrm lib/perl/lib/auto/Image
+@dirrm lib/perl/lib/auto/HTML/Clean
+@dirrm lib/perl/lib/auto/HTML
+@dirrm lib/perl/lib/auto/Getopt/Long
+@dirrm lib/perl/lib/auto/Getopt
+@dirrm lib/perl/lib/auto
+@dirrm lib/perl/lib/Image
+@dirrm lib/perl/lib/HTML
+@dirrm lib/perl/lib/Getopt
+@dirrm lib/perl/lib/File
+@dirrm lib/perl/lib
+@dirrm lib/perl
+@dirrm lib/include/sys
+@dirrm lib/include/sup
+@dirrm lib/include/std
+@dirrm lib/include/mod
+@dirrm lib/include/imp
+@dirrm lib/include/fmt
+@dirrm lib/include/des
+@dirrm lib/include
+@dirrm lib/exec
+@dirrm lib/aux/logos
+@dirrm lib/aux