- Update to 2.0.9

- Now works on perl 5.8
- Pass maintainership over to submitter

PR:		ports/66370
Submitted by:	Christian Lackas <delta@lackas.net>

4 files changed, 113 insertions, 106 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index 11761a3aeebe..f921b0636196 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	wml
-PORTVERSION=	2.0.8
+PORTVERSION=	2.0.9
 CATEGORIES=	www lang
 MASTER_SITES=	http://thewml.org/distrib/ \
 		ftp://thewml.org/distrib/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	delta@lackas.net
 COMMENT=	Website META Language, webdesign toolkit for HTML generation
 
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl=${PERL5}
+PLIST_SUB+=	ARCH=${ARCH}-freebsd
 
 CAT1=	wml_aux_txt2html.1 wml_aux_tidy.1 wml_p4_gm4.1
 
@@ -49,12 +51,6 @@ CAT7=	wml_barebone.7 \
 
 MAN7=	wml_intro.7 wml_macros.7 wml_tutorial.7 wml_faq.7 wml_tags.7
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} >= 500800
-BROKEN=		"Does not compile with perl >=5.8"
-.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)
@@ -73,4 +69,4 @@ post-build:
 test:
 	@cd ${WRKSRC} && ${MAKE} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/wml/distinfo b/www/wml/distinfo
index 1b8f3a382b2d..49924510565d 100644
--- a/www/wml/distinfo
+++ b/www/wml/distinfo
@@ -1,2 +1,2 @@
-MD5 (wml-2.0.8.tar.gz) = 98d2df48eb879d9c09c0fe81413b3db9
-SIZE (wml-2.0.8.tar.gz) = 2299298
+MD5 (wml-2.0.9.tar.gz) = a7c9da3b58f7e40706e3c29c37b4822b
+SIZE (wml-2.0.9.tar.gz) = 2570742
diff --git a/www/wml/files/patch-configure b/www/wml/files/patch-configure
new file mode 100644
index 000000000000..a23ebc058d63
--- /dev/null
+++ b/www/wml/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sat May  8 01:58:52 2004
++++ configure	Sat May  8 01:58:59 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
diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index e78a74c1f245..59ec01483e0f 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -3,45 +3,45 @@ bin/wmd
 bin/wmk
 bin/wml
 bin/wmu
-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/logos/logo-netbsd.gif
-lib/wml/aux/logos/logo-netbsd.info
-lib/wml/aux/logos/logo-netbsd.png
-lib/wml/aux/logos/logo-openbsd.gif
-lib/wml/aux/logos/logo-openbsd.info
-lib/wml/aux/logos/logo-openbsd.png
-lib/wml/aux/logos/logo-php.gif
-lib/wml/aux/logos/logo-php.info
-lib/wml/aux/logos/logo-php.png
-lib/wml/aux/logos/logo-xemacs.gif
-lib/wml/aux/logos/logo-xemacs.info
-lib/wml/aux/logos/logo-xemacs.png
-lib/wml/aux/txt2html.dict
-lib/wml/aux/weblintrc
-lib/wml/aux/wmd.txt
+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-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-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-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
@@ -127,38 +127,38 @@ lib/wml/perl/lib/auto/Image/Size/xbmsize.al
 lib/wml/perl/lib/auto/Image/Size/xpmsize.al
 lib/wml/perl/lib/auto/Image/Size/psdsize.al
 lib/wml/perl/lib/auto/Image/Size/swfsize.al
-lib/wml/perl/lib/%%PERL_ARCH%%/Bit/Vector.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/Dir.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/File.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/Handle.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/Pipe.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/Poll.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/Seekable.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/Select.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/Socket.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/Socket/INET.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/IO/Socket/UNIX.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/Term/ReadKey.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/WML/GD.pm
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/Bit/Vector/.packlist
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/Bit/Vector/Vector.bs
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/Bit/Vector/Vector.so
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/File/PathConvert/.packlist
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/Getopt/Long/.packlist
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/HTML/Clean/.packlist
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/IO/.packlist
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/IO/IO.bs
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/IO/IO.so
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/Image/Size/.packlist
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/Term/ReadKey/.packlist
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.bs
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/Term/ReadKey/autosplit.ix
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/WML/GD/.packlist
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/WML/GD/GD.bs
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/WML/GD/GD.so
-lib/wml/perl/lib/%%PERL_ARCH%%/auto/WML/GD/autosplit.ix
+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
@@ -173,8 +173,8 @@ 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/data/logos
+@dirrm lib/wml/data
 @dirrm lib/wml/include/des
 @dirrm lib/wml/include/fmt
 @dirrm lib/wml/include/imp
@@ -183,28 +183,28 @@ man/cat7/wml_std_xhtml10.7.gz
 @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/%%ARCH%%/auto/Getopt/Long
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Getopt
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Bit/Vector
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Bit
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/File/PathConvert
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/File
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Image/Size
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Image
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/WML/GD
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/WML
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/IO
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Term/ReadKey
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Term
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/HTML/Clean
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/HTML
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto
+@dirrm lib/wml/perl/lib/%%ARCH%%/Bit
+@dirrm lib/wml/perl/lib/%%ARCH%%/WML
+@dirrm lib/wml/perl/lib/%%ARCH%%/IO/Socket
+@dirrm lib/wml/perl/lib/%%ARCH%%/IO
+@dirrm lib/wml/perl/lib/%%ARCH%%/Term
+@dirrm lib/wml/perl/lib/%%ARCH%%
 @dirrm lib/wml/perl/lib/Getopt
 @dirrm lib/wml/perl/lib/auto/Getopt/Long
 @dirrm lib/wml/perl/lib/auto/Getopt