- Downgrade to 2.0.12 (current version is broken)

- Pass maintainer to submitter

PR:		ports/129235
Submitted by:	rodrigo@bebik.net

9 files changed, 226 insertions, 259 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index fa527ea8b24..fd0a31e8eac 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	wml
-DISTVERSION=	2.1a2
-PORTREVISION=	1
+PORTVERSION=	2.0.12
+PORTEPOCH=	1
 CATEGORIES=	www lang
-MASTER_SITES=	http://thewml.org/distrib/ \
-		ftp://thewml.org/distrib/
+MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITE_SUBDIR=thewml
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	rodrigo@bebik.net
 COMMENT=	Website META Language, webdesign toolkit for HTML generation
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
-BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx
+BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx \
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
+PLIST_SUB=	WML_ARCH=${ARCH}-freebsd
 USE_PERL5=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-perl=${PERL5} --with-catdir=man \
 		--prefix=${PREFIX}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	\
-		PERL_ARCH="${PERL_ARCH}"
-GNU_CONFIGURE=	yes
-LIBTOOLFILES=	wml_backend/p2_mp4h/configure
-PLIST_SUB+=	ARCH=${PERL_ARCH}
 
 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 \
@@ -57,10 +56,13 @@ MAN7=	wml_barebone.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
 
+do-configure:
+	@[ -f ${CONFIGURE_COOKIE}] || (cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS})
+
 post-build:
 	@${ECHO_MSG} "===>  Use 'make test' to run a quick test suite."
 
 test:
-	@cd ${WRKSRC} && ${MAKE} test
+	@cd ${WRKSRC} && ${GMAKE} test
 
 .include <bsd.port.mk>
diff --git a/www/wml/distinfo b/www/wml/distinfo
index 8e1f3d65c20..de2befe06e7 100644
--- a/www/wml/distinfo
+++ b/www/wml/distinfo
@@ -1,3 +1,3 @@
-MD5 (wml-2.1a2.tar.gz) = 279f638c208631022d467a1fb25a0692
-SHA256 (wml-2.1a2.tar.gz) = 35ac0cbb66bc3981d85c04b501b577aec1f00e70f6ed14bf881785e5b70ecacd
-SIZE (wml-2.1a2.tar.gz) = 2213961
+MD5 (wml-2.0.12.tar.gz) = 06717f8d2949e96c1b7be4358baa65fa
+SHA256 (wml-2.0.12.tar.gz) = 8ae4c333ffb12fb668c96c56e2fc3f70d9617caf6ffafc12e140efd5ead6b847
+SIZE (wml-2.0.12.tar.gz) = 4984530
diff --git a/www/wml/files/patch-11-wmk.t b/www/wml/files/patch-11-wmk.t
new file mode 100644
index 00000000000..944fe18d3b4
--- /dev/null
+++ b/www/wml/files/patch-11-wmk.t
@@ -0,0 +1,11 @@
+--- wml_test/t/11-wmk.t	Thu Dec  1 19:22:04 2005
++++ wml_test/t/11-wmk.t	Tue Dec 16 22:13:48 2008
+@@ -37,6 +37,8 @@
+ bar
+ EOT_IN
+ 
++sleep 1;
++
+ $rc = `$wmk a.wml 2>&1`;
+ print ($rc eq "$ENV{WML} -n -q -W \"1,-N\" -o a.html a.wml\n" ? "ok\n" : "not ok\n");
+ $rc = &TEST::system("cmp $tmpfile1 a.html");
diff --git a/www/wml/files/patch-configure b/www/wml/files/patch-configure
deleted file mode 100644
index 9183621ea0f..00000000000
--- a/www/wml/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2001-06-18 00:44:29.000000000 +0200
-+++ configure	2008-03-26 11:21:24.000000000 +0100
-@@ -601,7 +601,6 @@
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- eval "dir=$prefix"
- case $dir in
--    *wml* ) libsubdir= ;;
-         * ) libsubdir="/wml" ;;
- esac
- 
-@@ -1265,7 +1264,7 @@
- 
- dummy:
- 	@echo INSTALLPRIVLIB=`echo $(INSTALLPRIVLIB) | $(abs2prefix)`
--	@echo INSTALLARCHLIB=`echo $(INSTALLARCHLIB) | $(abs2prefix)`
-+	@echo INSTALLARCHLIB=`echo $(INSTALLPRIVLIB) | $(abs2prefix)`/$(PERL_ARCH)
- };
- }
- EOT
diff --git a/www/wml/files/patch-gd_png.c b/www/wml/files/patch-gd_png.c
deleted file mode 100644
index a0782eb86a0..00000000000
--- a/www/wml/files/patch-gd_png.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- wml_common/gd/libgd/gd_png.c.orig	Mon Aug 16 11:51:29 2004
-+++ wml_common/gd/libgd/gd_png.c	Mon Aug 16 11:51:37 2004
-@@ -5,7 +5,7 @@
- #include "gd.h"
- 
- #ifdef HAVE_LIBPNG
--#include <png.h>    /* includes zlib.h and setjmp.h */
-+#include <libpng/png.h>    /* includes zlib.h and setjmp.h */
- 
- #define TRUE 1
- #define FALSE 0
diff --git a/www/wml/files/patch-wml_backend-p3_eperl_configure b/www/wml/files/patch-wml_backend-p3_eperl_configure
deleted file mode 100644
index fd5b31e4c47..00000000000
--- a/www/wml/files/patch-wml_backend-p3_eperl_configure
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
deleted file mode 100644
index b98065908a1..00000000000
--- a/www/wml/files/patch-wml_backend-p3_eperl_eperl_proto.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-descr b/www/wml/pkg-descr
index a9b6f206bae..8c11aaf5cc0 100644
--- a/www/wml/pkg-descr
+++ b/www/wml/pkg-descr
@@ -21,4 +21,4 @@
   provides most of the core features real hackers always wanted for HTML
   generation.
 
-WWW: http://thewml.org/
+WWW: http://developer.berlios.de/projects/thewml/
diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index 73e1cee10a6..b1bb63913db 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -1,186 +1,204 @@
-lib/wml/perl/lib/mach/auto/WML/GD/autosplit.ix
-lib/wml/perl/lib/mach/auto/WML/GD/GD.so
-lib/wml/perl/lib/mach/auto/WML/GD/GD.bs
-lib/wml/perl/lib/mach/auto/WML/GD/.packlist
-lib/wml/perl/lib/mach/auto/Term/ReadKey/autosplit.ix
-lib/wml/perl/lib/mach/auto/Term/ReadKey/ReadKey.so
-lib/wml/perl/lib/mach/auto/Term/ReadKey/ReadKey.bs
-lib/wml/perl/lib/mach/auto/Term/ReadKey/.packlist
-lib/wml/perl/lib/mach/auto/Image/Size/.packlist
-lib/wml/perl/lib/mach/auto/IO/IO.so
-lib/wml/perl/lib/mach/auto/IO/IO.bs
-lib/wml/perl/lib/mach/auto/IO/.packlist
-lib/wml/perl/lib/mach/auto/HTML/Clean/.packlist
-lib/wml/perl/lib/mach/auto/Getopt/Long/.packlist
-lib/wml/perl/lib/mach/auto/File/PathConvert/.packlist
-lib/wml/perl/lib/mach/auto/Bit/Vector/Vector.so
-lib/wml/perl/lib/mach/auto/Bit/Vector/Vector.bs
-lib/wml/perl/lib/mach/auto/Bit/Vector/.packlist
-lib/wml/perl/lib/mach/WML/GD.pm
-lib/wml/perl/lib/mach/Term/ReadKey.pm
-lib/wml/perl/lib/mach/IO/Socket/UNIX.pm
-lib/wml/perl/lib/mach/IO/Socket/INET.pm
-lib/wml/perl/lib/mach/IO/Socket.pm
-lib/wml/perl/lib/mach/IO/Select.pm
-lib/wml/perl/lib/mach/IO/Seekable.pm
-lib/wml/perl/lib/mach/IO/Poll.pm
-lib/wml/perl/lib/mach/IO/Pipe.pm
-lib/wml/perl/lib/mach/IO/Handle.pm
-lib/wml/perl/lib/mach/IO/File.pm
-lib/wml/perl/lib/mach/IO/Dir.pm
-lib/wml/perl/lib/mach/IO.pm
-lib/wml/perl/lib/mach/Bit/Vector.pm
-lib/wml/perl/lib/auto/Image/Size/xpmsize.al
+bin/wmk
+bin/wml
+bin/wmd
+bin/wmb
+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/wmd.txt
+lib/wml/data/txt2html.dict
+lib/wml/data/weblintrc
+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/exec/wml_aux_htmlclean
+lib/wml/exec/wml_aux_iselect
+lib/wml/exec/wml_aux_map2html
+lib/wml/exec/wml_aux_txt2html
+lib/wml/exec/wml_aux_tidy
+lib/wml/exec/wml_aux_htmlinfo
+lib/wml/exec/wml_aux_linklint
+lib/wml/exec/wml_aux_weblint
+lib/wml/exec/wml_aux_freetable
+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/all.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/%%WML_ARCH%%/auto/Bit/Vector/Vector.so
+lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit/Vector/Vector.bs
+lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit/Vector/.packlist
+lib/wml/perl/lib/%%WML_ARCH%%/auto/File/PathConvert/.packlist
+lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD/GD.so
+lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD/GD.bs
+lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD/autosplit.ix
+lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD/.packlist
+lib/wml/perl/lib/%%WML_ARCH%%/auto/Getopt/Long/.packlist
+lib/wml/perl/lib/%%WML_ARCH%%/auto/HTML/Clean/.packlist
+lib/wml/perl/lib/%%WML_ARCH%%/auto/Image/Size/.packlist
+lib/wml/perl/lib/%%WML_ARCH%%/auto/IO/IO.so
+lib/wml/perl/lib/%%WML_ARCH%%/auto/IO/IO.bs
+lib/wml/perl/lib/%%WML_ARCH%%/auto/IO/.packlist
+lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey/ReadKey.so
+lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey/ReadKey.bs
+lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey/autosplit.ix
+lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey/.packlist
+lib/wml/perl/lib/%%WML_ARCH%%/Bit/Vector.pm
+lib/wml/perl/lib/%%WML_ARCH%%/WML/GD.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Handle.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Poll.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Seekable.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Dir.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Pipe.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Select.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/File.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/UNIX.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/INET.pm
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/entries
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/format
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/text-base/INET.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/text-base/UNIX.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/format
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/entries
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Pipe.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Socket.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Seekable.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/File.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Poll.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Dir.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Handle.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Select.pm.svn-base
+lib/wml/perl/lib/%%WML_ARCH%%/Term/ReadKey.pm
+lib/wml/perl/lib/File/PathConvert.pm
+lib/wml/perl/lib/Getopt/Long.pm
+lib/wml/perl/lib/auto/Getopt/Long/GetOptions.al
+lib/wml/perl/lib/auto/Getopt/Long/FindOption.al
+lib/wml/perl/lib/auto/Getopt/Long/Configure.al
+lib/wml/perl/lib/auto/Getopt/Long/config.al
+lib/wml/perl/lib/auto/Getopt/Long/Croak.al
+lib/wml/perl/lib/auto/Getopt/Long/autosplit.ix
+lib/wml/perl/lib/auto/HTML/Clean/autosplit.ix
+lib/wml/perl/lib/auto/Image/Size/gifsize.al
 lib/wml/perl/lib/auto/Image/Size/xbmsize.al
-lib/wml/perl/lib/auto/Image/Size/tiffsize.al
-lib/wml/perl/lib/auto/Image/Size/swfsize.al
-lib/wml/perl/lib/auto/Image/Size/psdsize.al
-lib/wml/perl/lib/auto/Image/Size/ppmsize.al
+lib/wml/perl/lib/auto/Image/Size/xpmsize.al
 lib/wml/perl/lib/auto/Image/Size/pngsize.al
 lib/wml/perl/lib/auto/Image/Size/jpegsize.al
-lib/wml/perl/lib/auto/Image/Size/gifsize.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/bmpsize.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/autosplit.ix
-lib/wml/perl/lib/auto/HTML/Clean/autosplit.ix
-lib/wml/perl/lib/auto/Getopt/Long/config.al
-lib/wml/perl/lib/auto/Getopt/Long/autosplit.ix
-lib/wml/perl/lib/auto/Getopt/Long/GetOptions.al
-lib/wml/perl/lib/auto/Getopt/Long/FindOption.al
-lib/wml/perl/lib/auto/Getopt/Long/Croak.al
-lib/wml/perl/lib/auto/Getopt/Long/Configure.al
-lib/wml/perl/lib/Image/Size.pm
 lib/wml/perl/lib/HTML/Clean.pm
-lib/wml/perl/lib/Getopt/Long.pm
-lib/wml/perl/lib/File/PathConvert.pm
-lib/wml/include/sys/compat1.wml
-lib/wml/include/sys/bootp4.wml
-lib/wml/include/sys/bootp3.wml
-lib/wml/include/sys/all.wml
-lib/wml/include/sup/path.wml
-lib/wml/include/sup/hextriple.wml
-lib/wml/include/sup/all.wml
-lib/wml/include/std/toc.wml
-lib/wml/include/std/tags.wml
-lib/wml/include/std/page.wml
-lib/wml/include/std/logo.wml
-lib/wml/include/std/lang.wml
-lib/wml/include/std/label.wml
-lib/wml/include/std/info.wml
-lib/wml/include/std/href.wml
-lib/wml/include/std/grid.wml
-lib/wml/include/std/case.wml
-lib/wml/include/std/box.wml
-lib/wml/include/std/all.wml
-lib/wml/include/mod/version.wml
-lib/wml/include/mod/all.wml
-lib/wml/include/mod/MakeMaker.wml
-lib/wml/include/imp/generic.wml
-lib/wml/include/imp/fsview.wml
-lib/wml/include/imp/csmap.wml
-lib/wml/include/imp/all.wml
-lib/wml/include/fmt/xtable.wml
-lib/wml/include/fmt/verbatim.wml
-lib/wml/include/fmt/url.wml
-lib/wml/include/fmt/text.wml
-lib/wml/include/fmt/sdf.wml
-lib/wml/include/fmt/pod.wml
-lib/wml/include/fmt/isolatin.wml
-lib/wml/include/fmt/all.wml
-lib/wml/include/des/typography.wml
-lib/wml/include/des/space.wml
-lib/wml/include/des/rollover.wml
-lib/wml/include/des/preload.wml
-lib/wml/include/des/navbar.wml
-lib/wml/include/des/lowsrc.wml
-lib/wml/include/des/imgdot.wml
-lib/wml/include/des/imgbg.wml
-lib/wml/include/des/gfont.wml
-lib/wml/include/des/all.wml
-lib/wml/include/all.wml
-lib/wml/exec/wml_p9_slice
-lib/wml/exec/wml_p8_htmlstrip
-lib/wml/exec/wml_p7_htmlfix
-lib/wml/exec/wml_p6_asubst
-lib/wml/exec/wml_p5_divert
-lib/wml/exec/wml_p4_gm4
-lib/wml/exec/wml_p3_eperl
-lib/wml/exec/wml_p2_mp4h
-lib/wml/exec/wml_p1_ipp
-lib/wml/exec/wml_aux_weblint
-lib/wml/exec/wml_aux_txt2html
-lib/wml/exec/wml_aux_tidy
-lib/wml/exec/wml_aux_map2html
-lib/wml/exec/wml_aux_linklint
-lib/wml/exec/wml_aux_iselect
-lib/wml/exec/wml_aux_htmlinfo
-lib/wml/exec/wml_aux_htmlclean
-lib/wml/exec/wml_aux_freetable
-lib/wml/aux/wmd.txt
-lib/wml/aux/weblintrc
-lib/wml/aux/txt2html.dict
-lib/wml/aux/logos/logo-xemacs.png
-lib/wml/aux/logos/logo-xemacs.info
-lib/wml/aux/logos/logo-xemacs.gif
-lib/wml/aux/logos/logo-wml.png
-lib/wml/aux/logos/logo-wml.info
-lib/wml/aux/logos/logo-wml.gif
-lib/wml/aux/logos/logo-vim.png
-lib/wml/aux/logos/logo-vim.info
-lib/wml/aux/logos/logo-vim.gif
-lib/wml/aux/logos/logo-php3.png
-lib/wml/aux/logos/logo-php3.info
-lib/wml/aux/logos/logo-php3.gif
-lib/wml/aux/logos/logo-php.png
-lib/wml/aux/logos/logo-php.info
-lib/wml/aux/logos/logo-php.gif
-lib/wml/aux/logos/logo-openbsd.png
-lib/wml/aux/logos/logo-openbsd.info
-lib/wml/aux/logos/logo-openbsd.gif
-lib/wml/aux/logos/logo-netbsd.png
-lib/wml/aux/logos/logo-netbsd.info
-lib/wml/aux/logos/logo-netbsd.gif
-lib/wml/aux/logos/logo-linux.png
-lib/wml/aux/logos/logo-linux.info
-lib/wml/aux/logos/logo-linux.gif
-lib/wml/aux/logos/logo-htdig.png
-lib/wml/aux/logos/logo-htdig.info
-lib/wml/aux/logos/logo-htdig.gif
-lib/wml/aux/logos/logo-gimp.png
-lib/wml/aux/logos/logo-gimp.info
-lib/wml/aux/logos/logo-gimp.gif
-lib/wml/aux/logos/logo-freebsd.png
-lib/wml/aux/logos/logo-freebsd.info
-lib/wml/aux/logos/logo-freebsd.gif
-lib/wml/aux/logos/logo-apache.png
-lib/wml/aux/logos/logo-apache.info
-lib/wml/aux/logos/logo-apache.gif
-bin/wmu
-bin/wml
-bin/wmk
-bin/wmd
-bin/wmb
-@dirrm lib/wml/perl/lib/mach/auto/WML/GD
-@dirrm lib/wml/perl/lib/mach/auto/WML
-@dirrm lib/wml/perl/lib/mach/auto/Term/ReadKey
-@dirrm lib/wml/perl/lib/mach/auto/Term
-@dirrm lib/wml/perl/lib/mach/auto/Image/Size
-@dirrm lib/wml/perl/lib/mach/auto/Image
-@dirrm lib/wml/perl/lib/mach/auto/IO
-@dirrm lib/wml/perl/lib/mach/auto/HTML/Clean
-@dirrm lib/wml/perl/lib/mach/auto/HTML
-@dirrm lib/wml/perl/lib/mach/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/mach/auto/Getopt
-@dirrm lib/wml/perl/lib/mach/auto/File/PathConvert
-@dirrm lib/wml/perl/lib/mach/auto/File
-@dirrm lib/wml/perl/lib/mach/auto/Bit/Vector
-@dirrm lib/wml/perl/lib/mach/auto/Bit
-@dirrm lib/wml/perl/lib/mach/auto
-@dirrm lib/wml/perl/lib/mach/WML
-@dirrm lib/wml/perl/lib/mach/Term
-@dirrm lib/wml/perl/lib/mach/IO/Socket
-@dirrm lib/wml/perl/lib/mach/IO
-@dirrm lib/wml/perl/lib/mach/Bit
-@dirrm lib/wml/perl/lib/mach
+lib/wml/perl/lib/Image/Size.pm
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/WML
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Term
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Image/Size
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Image
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/IO
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/HTML/Clean
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/HTML
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Getopt/Long
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Getopt
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/File/PathConvert
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/File
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit/Vector
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/WML
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/Term
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/text-base
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%/Bit
+@dirrm lib/wml/perl/lib/%%WML_ARCH%%
 @dirrm lib/wml/perl/lib/auto/Image/Size
 @dirrm lib/wml/perl/lib/auto/Image
 @dirrm lib/wml/perl/lib/auto/HTML/Clean
@@ -203,6 +221,6 @@ bin/wmb
 @dirrm lib/wml/include/des
 @dirrm lib/wml/include
 @dirrm lib/wml/exec
-@dirrm lib/wml/aux/logos
-@dirrm lib/wml/aux
+@dirrm lib/wml/data/logos
+@dirrm lib/wml/data
 @dirrm lib/wml