2 files changed, 13 insertions, 109 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index 3f249ba3c60b..4490fce173ac 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wml
 PORTVERSION=	2.0.12
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www lang
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
@@ -16,8 +17,16 @@ MAINTAINER=	rodrigo@bebik.net
 COMMENT=	Website META Language, webdesign toolkit for HTML generation
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	\
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-Bit-Vector>=5.2:${PORTSDIR}/math/p5-Bit-Vector \
+		p5-File-PathConvert>0:${PORTSDIR}/devel/p5-File-PathConvert \
+		p5-Image-Size>=2.6:${PORTSDIR}/graphics/p5-Image-Size \
+		p5-Term-ReadKey>=2.11:${PORTSDIR}/devel/p5-Term-ReadKey \
+		p5-HTML-Clean>0:${PORTSDIR}/www/p5-HTML-Clean \
+		p5-GD>0:${PORTSDIR}/graphics/p5-GD
 BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+		${RUN_DEPENDS}
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
@@ -57,8 +66,9 @@ MAN7=	wml_barebone.7 \
 
 .include <bsd.port.pre.mk>
 
-PERL_ARCHNAME!=	${PERL} -V:archname 2>/dev/null || true
-PLIST_SUB=	LOCAL_PERL_ARCH=${PERL_ARCHNAME:S/archname='//:S/';//}
+post-patch:
+	@${PERL5} -pi -e 's!^(\s+have_\S+)=\S+!\1=1!' \
+		${WRKSRC}/wml_common/Makefile.in
 
 do-configure:
 	@[ -f ${CONFIGURE_COOKIE}] || (cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS})
diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index b44bea5054e2..2e0b77feda67 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -105,112 +105,6 @@ 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/%%LOCAL_PERL_ARCH%%/auto/Bit/Vector/Vector.so
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit/Vector/Vector.bs
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit/Vector/.packlist
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/File/PathConvert/.packlist
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD/GD.so
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD/GD.bs
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD/autosplit.ix
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD/.packlist
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Getopt/Long/.packlist
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/HTML/Clean/.packlist
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Image/Size/.packlist
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/IO/IO.so
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/IO/IO.bs
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/IO/.packlist
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey/ReadKey.bs
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey/autosplit.ix
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey/.packlist
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/Bit/Vector.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/WML/GD.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Handle.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Poll.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Seekable.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Dir.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Pipe.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Select.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/File.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/UNIX.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/INET.pm
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/entries
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/format
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/text-base/INET.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/text-base/UNIX.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/format
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/entries
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Pipe.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Socket.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Seekable.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/File.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Poll.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Dir.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Handle.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Select.pm.svn-base
-lib/wml/perl/lib/%%LOCAL_PERL_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/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/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/HTML/Clean.pm
-lib/wml/perl/lib/Image/Size.pm
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Image/Size
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Image
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/IO
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/HTML/Clean
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/HTML
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Getopt
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/File/PathConvert
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/File
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit/Vector
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/WML
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/Term
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/text-base
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/Bit
-@dirrm lib/wml/perl/lib/%%LOCAL_PERL_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