3 files changed, 217 insertions, 206 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index 79d70743a405..41402e79808b 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wml
 DISTVERSION=	2.1a2
+PORTREVISION=	1
 CATEGORIES=	www lang
 MASTER_SITES=	http://thewml.org/distrib/ \
 		ftp://thewml.org/distrib/
@@ -18,7 +19,8 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx
 
 USE_PERL5=	yes
-CONFIGURE_ARGS=	--with-perl=${PERL5} --with-catdir=man
+CONFIGURE_ARGS=	--with-perl=${PERL5} --with-catdir=man \
+		--prefix=${PREFIX}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	\
 		PERL_ARCH="${PERL_ARCH}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/www/wml/files/patch-configure b/www/wml/files/patch-configure
index 9254b01f59df..9183621ea0f1 100644
--- a/www/wml/files/patch-configure
+++ b/www/wml/files/patch-configure
@@ -1,6 +1,14 @@
---- configure.orig	Fri Oct 18 23:44:21 2002
-+++ configure	Thu Aug  5 23:40:57 2004
-@@ -2740,7 +2740,7 @@
+--- 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)`
diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index f3ec8adae4ee..73e1cee10a6e 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -1,207 +1,208 @@
-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
+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
+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/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/bmpsize.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/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
+@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
+@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/aux/logos
+@dirrm lib/wml/aux
+@dirrm lib/wml