5 files changed, 88 insertions, 55 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index 80c417a34f30..d04191eb66e9 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:	wml
-# Version required:	1.4.11
+# Version required:	1.6.0
 # Date created:		09-Sep-1997
 # Whom:			Ralf S. Engelschall <rse@engelschall.com>
 #
-# $Id: Makefile,v 1.16 1997/12/30 10:17:22 rse Exp $
+# $Id: Makefile,v 1.17 1997/12/31 10:05:27 rse Exp $
 #
 
-DISTNAME=	wml-1.4.11
+DISTNAME=	wml-1.6.0
 CATEGORIES=	www lang
 MASTER_SITES=	http://www.engelschall.com/sw/wml/distrib/ \
-		ftp://ftp.engelschall.com/sw/wml/ \
-		ftp://ftp.hyperreal.org/software/engelschall/wml/
+		ftp://ftp.ch.engelschall.com/sw/wml/ \
+		ftp://ftp.de.engelschall.com/sw/wml/ \
+		ftp://ftp.hyperreal.org/software/engelschall/wml/ \
+		ftp://ftp.dppl.com/pub/engelschall/wml/
 
 MAINTAINER=	rse@engelschall.com
 
@@ -22,7 +24,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 CAT1=	wml_aux_linklint.1 wml_aux_txt2html.1 \
 	wml_aux_wwwtable.1 wml_p2_mhc.1 wml_p4_gm4.1
 
-MAN1=	wmd.1 wmk.1 wml.1 wmb.1 \
+MAN1=	wmd.1 wmk.1 wml.1 wmb.1 wmu.1 \
 	wml_aux_htmlinfo.1 wml_aux_iselect.1 \
 	wml_aux_map2html.1 wml_aux_weblint.1 wml_p1_ipp.1 \
 	wml_p3_eperl.1 wml_p5_divert.1 wml_p6_asubst.1 \
@@ -37,13 +39,12 @@ MAN3=	wml::all.3 wml::des::all.3 wml::des::gfont.3 \
 	wml::fmt::xtable.3 wml::imp::all.3 wml::imp::csmap.3 \
 	wml::imp::fsview.3 wml::imp::generic.3 wml::std::all.3 \
 	wml::std::box.3 wml::std::case.3 wml::std::grid.3 \
-	wml::std::href.3 wml::std::info.3 wml::std::page.3 \
-	wml::std::tags.3 wml::std::toc.3 wml::sup::all.3 \
-	wml::sup::hextriple.3 wml::sup::path.3 wml::sup::stack.3 \
-	wml::sys::all.3 wml::sys::boot.3 wml::usr::all.3 \
-	wml::usr::rse.3
+	wml::std::href.3 wml::std::lang.3 wml::std::logo.3 \
+	wml::std::info.3 wml::std::page.3 wml::std::tags.3 \
+	wml::std::toc.3 wml::sup::all.3 wml::sup::hextriple.3 \
+	wml::sup::path.3 wml::sys::all.3 wml::sys::boot.3
 
-MAN7=	wml_intro.7 wml_tutorial.7 wml_faq.7
+MAN7=	wml_intro.7 wml_tutorial.7 wml_faq.7 wml_tags.7
 
 #   catpages are usually not installed, so they are not compressed.
 #   But they are really needed as docs, so we compress manually...
diff --git a/www/wml/distinfo b/www/wml/distinfo
index dd7c98e6a8e9..e6d2ba631206 100644
--- a/www/wml/distinfo
+++ b/www/wml/distinfo
@@ -1 +1 @@
-MD5 (wml-1.4.11.tar.gz) = 90f1a2b23d280b100bf52340cae5d050
+MD5 (wml-1.6.0.tar.gz) = 1f5edafc3fbd41fcaa44ed7e6928797d
diff --git a/www/wml/pkg-descr b/www/wml/pkg-descr
index c60c4a9266ca..6112e235dd20 100644
--- a/www/wml/pkg-descr
+++ b/www/wml/pkg-descr
@@ -1,18 +1,23 @@
   __        ___  __ _     
-  \ \      / / \/  | |    
+  \ \      / / \/  | |      Website META Language
    \ \ /\ / / |\/| | |    
-    \ V  V /| |  | | |___ 
-     \_/\_/ |_|  |_|_____|
-                         
-  WML -- Website META Language
+    \ V  V /| |  | | |___   ``WML is the Unix toolkit for getting
+     \_/\_/ |_|  |_|_____|    your webdesigner's HTML job done.''
 
-  WML is a free HTML generation toolkit consisting of 9 independent languages.
-  The main idea of WML is a sequential filtering scheme where each language
-  provides one of 9 processing passes. So WML reads an input file, applies
-  passes 1-9 (or optionally only the passes specified) and finally produces
-  one or more output files. It operates as a powerful offline HTML generation
-  toolkit for webmasters. While not trivial and idiot proof it provides most
-  of the features real hackers always wanted for HTML generation. 
+  Copyright (c) 1996,1997,1998 Ralf S. Engelschall
 
-  The documentation and latest release can be found on
-  http://www.engelschall.com/sw/wml/
+  WML is a free and extensible Webdesigner's off-line HTML generation toolkit
+  for Unix, distributed under the GNU General Public License (GPL v2). It is
+  written in ANSI C and Perl 5, build via a GNU Autoconf based source tree
+  and runs out-of-the-box on all major Unix derivates.  It can be used
+  free of charge both in educational and commercial environments.
+  
+  WML consists of a control frontend driving up to nine backends in a
+  sequential pass-oriented filtering scheme. Each backend provides one
+  particular core language. For maximum power WML additionally ships with a
+  well-suited set of include files which provide higher-level features build
+  on top of the backends core languages. While not trivial and idiot proof WML
+  provides most of the core features real hackers always wanted for HTML
+  generation.
+                               http://www.engelschall.com/sw/wml/
+                                ftp://ftp.engelschall.com/sw/wml/
diff --git a/www/wml/pkg-message b/www/wml/pkg-message
index f7bc6be87a00..f77f2a92d784 100644
--- a/www/wml/pkg-message
+++ b/www/wml/pkg-message
@@ -1,8 +1,6 @@
   
-  Copyright (c) 1996,1997 Ralf S. Engelschall, All rights reserved.
-
   This program is free software; it may be redistributed and/or modified only
-  under the terms of either the GNU General Public License, which may be found
+  under the terms of the GNU General Public License, which may be found
   in the WML source distribution.  Look at the file COPYING. 
 
   This program is distributed in the hope that it will be useful, but WITHOUT
diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index 96fe505d7b24..e1b42ee89a3a 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -2,27 +2,34 @@ bin/wmd
 bin/wmk
 bin/wml
 bin/wmb
-bin/wml_p1_ipp
-bin/wml_p2_mhc
-bin/wml_p3_eperl
-bin/wml_p4_gm4
-bin/wml_p5_divert
-bin/wml_p6_asubst
-bin/wml_p7_htmlfix
-bin/wml_p8_htmlstrip
-bin/wml_p9_slice
-bin/wml_aux_iselect
-bin/wml_aux_linklint
-bin/wml_aux_txt2html
-bin/wml_aux_wwwtable
-bin/wml_aux_htmlinfo
-bin/wml_aux_map2html
-bin/wml_aux_weblint
+bin/wmu
+lib/wml/exec/wml_p1_ipp
+lib/wml/exec/wml_p2_mhc
+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_iselect
+lib/wml/exec/wml_aux_linklint
+lib/wml/exec/wml_aux_txt2html
+lib/wml/exec/wml_aux_wwwtable
+lib/wml/exec/wml_aux_htmlinfo
+lib/wml/exec/wml_aux_map2html
+lib/wml/exec/wml_aux_weblint
 lib/wml/aux/txt2html.dict
 lib/wml/aux/weblintrc
-lib/wml/aux/generated-via-wml-1.gif
-lib/wml/aux/generated-via-wml-2.gif
 lib/wml/aux/wmd.txt
+lib/wml/aux/logos/logo-apache.gif
+lib/wml/aux/logos/logo-apache.info
+lib/wml/aux/logos/logo-freebsd.gif
+lib/wml/aux/logos/logo-freebsd.info
+lib/wml/aux/logos/logo-linux.gif
+lib/wml/aux/logos/logo-linux.info
+lib/wml/aux/logos/logo-wml.gif
+lib/wml/aux/logos/logo-wml.info
 lib/wml/include/all.wml
 lib/wml/include/des/all.wml
 lib/wml/include/des/gfont.wml
@@ -51,6 +58,8 @@ 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/lang.wml
+lib/wml/include/std/logo.wml
 lib/wml/include/std/info.wml
 lib/wml/include/std/page.wml
 lib/wml/include/std/tags.wml
@@ -58,11 +67,8 @@ 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/sup/stack.wml
 lib/wml/include/sys/all.wml
 lib/wml/include/sys/boot.wml
-lib/wml/include/usr/all.wml
-lib/wml/include/usr/rse.wml
 lib/wml/perl/lib/site_perl/i386-freebsd/auto/Getopt/Long/.packlist
 lib/wml/perl/lib/site_perl/i386-freebsd/auto/Bit/Vector/Vector.so
 lib/wml/perl/lib/site_perl/i386-freebsd/auto/Bit/Vector/Vector.bs
@@ -75,6 +81,11 @@ lib/wml/perl/lib/site_perl/i386-freebsd/auto/GD/.packlist
 lib/wml/perl/lib/site_perl/i386-freebsd/auto/IO/IO.so
 lib/wml/perl/lib/site_perl/i386-freebsd/auto/IO/IO.bs
 lib/wml/perl/lib/site_perl/i386-freebsd/auto/IO/.packlist
+lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term/ReadKey/ReadKey.so
+lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term/ReadKey/ReadKey.bs
+lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term/ReadKey/.packlist
+lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text/DelimMatch/.packlist
+lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text/BlockParser/.packlist
 lib/wml/perl/lib/site_perl/Getopt/Long.pm
 lib/wml/perl/lib/site_perl/Bit/Vector.pm
 lib/wml/perl/lib/site_perl/File/PathConvert.pm
@@ -88,6 +99,8 @@ lib/wml/perl/lib/site_perl/auto/Image/Size/ppmsize.al
 lib/wml/perl/lib/site_perl/auto/Image/Size/tiffsize.al
 lib/wml/perl/lib/site_perl/auto/Image/Size/autosplit.ix
 lib/wml/perl/lib/site_perl/auto/GD/autosplit.ix
+lib/wml/perl/lib/site_perl/auto/Term/ReadKey/autosplit.ix
+lib/wml/perl/lib/site_perl/auto/Text/DelimMatch/autosplit.ix
 lib/wml/perl/lib/site_perl/GD.pm
 lib/wml/perl/lib/site_perl/IO/Pipe.pm
 lib/wml/perl/lib/site_perl/IO/File.pm
@@ -100,10 +113,14 @@ lib/wml/perl/lib/site_perl/IO/Seekable.pm
 lib/wml/perl/lib/site_perl/IO/Dir.pm
 lib/wml/perl/lib/site_perl/IO/Poll.pm
 lib/wml/perl/lib/site_perl/IO.pm
+lib/wml/perl/lib/site_perl/Term/ReadKey.pm
+lib/wml/perl/lib/site_perl/Text/DelimMatch.pm
+lib/wml/perl/lib/site_perl/Text/BlockParser.pm
 man/man1/wmd.1.gz
 man/man1/wmk.1.gz
 man/man1/wml.1.gz
 man/man1/wmb.1.gz
+man/man1/wmu.1.gz
 man/man1/wml_p1_ipp.1.gz
 man/cat1/wml_p2_mhc.1.gz
 man/man1/wml_p3_eperl.1.gz
@@ -148,6 +165,8 @@ man/man3/wml::std::box.3.gz
 man/man3/wml::std::case.3.gz
 man/man3/wml::std::grid.3.gz
 man/man3/wml::std::href.3.gz
+man/man3/wml::std::lang.3.gz
+man/man3/wml::std::logo.3.gz
 man/man3/wml::std::info.3.gz
 man/man3/wml::std::page.3.gz
 man/man3/wml::std::tags.3.gz
@@ -155,14 +174,14 @@ man/man3/wml::std::toc.3.gz
 man/man3/wml::sup::all.3.gz
 man/man3/wml::sup::hextriple.3.gz
 man/man3/wml::sup::path.3.gz
-man/man3/wml::sup::stack.3.gz
 man/man3/wml::sys::all.3.gz
 man/man3/wml::sys::boot.3.gz
-man/man3/wml::usr::all.3.gz
-man/man3/wml::usr::rse.3.gz
 man/man7/wml_intro.7.gz
 man/man7/wml_tutorial.7.gz
 man/man7/wml_faq.7.gz
+man/man7/wml_tags.7.gz
+@dirrm lib/wml/exec
+@dirrm lib/wml/aux/logos
 @dirrm lib/wml/aux
 @dirrm lib/wml/include/des
 @dirrm lib/wml/include/fmt
@@ -170,7 +189,6 @@ man/man7/wml_faq.7.gz
 @dirrm lib/wml/include/std
 @dirrm lib/wml/include/sup
 @dirrm lib/wml/include/sys
-@dirrm lib/wml/include/usr
 @dirrm lib/wml/include
 @dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Getopt/Long
 @dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Getopt
@@ -182,6 +200,11 @@ man/man7/wml_faq.7.gz
 @dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Image
 @dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/GD
 @dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/IO
+@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term/ReadKey
+@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Term
+@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text/DelimMatch
+@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text/BlockParser
+@dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto/Text
 @dirrm lib/wml/perl/lib/site_perl/i386-freebsd/auto
 @dirrm lib/wml/perl/lib/site_perl/i386-freebsd
 @dirrm lib/wml/perl/lib/site_perl/Getopt
@@ -191,9 +214,15 @@ man/man7/wml_faq.7.gz
 @dirrm lib/wml/perl/lib/site_perl/auto/Image/Size
 @dirrm lib/wml/perl/lib/site_perl/auto/Image
 @dirrm lib/wml/perl/lib/site_perl/auto/GD
+@dirrm lib/wml/perl/lib/site_perl/auto/Term/ReadKey
+@dirrm lib/wml/perl/lib/site_perl/auto/Term
+@dirrm lib/wml/perl/lib/site_perl/auto/Text/DelimMatch
+@dirrm lib/wml/perl/lib/site_perl/auto/Text
 @dirrm lib/wml/perl/lib/site_perl/auto
 @dirrm lib/wml/perl/lib/site_perl/IO/Socket
 @dirrm lib/wml/perl/lib/site_perl/IO
+@dirrm lib/wml/perl/lib/site_perl/Term
+@dirrm lib/wml/perl/lib/site_perl/Text
 @dirrm lib/wml/perl/lib/site_perl
 @dirrm lib/wml/perl/lib
 @dirrm lib/wml/perl