4 files changed, 125 insertions, 100 deletions

diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 34eff0320233..1463143078b9 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=		py-HTMLgen
-PORTVERSION=		2.1
+PORTVERSION=		2.2.2
 CATEGORIES=		www python
-MASTER_SITES=		ftp://ftp.python.org/pub/python/contrib-09-Dec-1999/Network/
+MASTER_SITES=		http://starship.python.net/crew/friedrich/
 DISTNAME=		HTMLgen
 
 MAINTAINER=		nectar@FreeBSD.org
diff --git a/www/py-HTMLgen/distinfo b/www/py-HTMLgen/distinfo
index 7b2a64763c47..a1e6549e602f 100644
--- a/www/py-HTMLgen/distinfo
+++ b/www/py-HTMLgen/distinfo
@@ -1 +1 @@
-MD5 (HTMLgen.tar.gz) = c86837829b9b9a07049e6a190b33c227
+MD5 (HTMLgen.tar.gz) = cd20f8b63d3215e57289ddbf56c97f48
diff --git a/www/py-HTMLgen/pkg-plist b/www/py-HTMLgen/pkg-plist
index 07fca458892b..b45f50972dbc 100644
--- a/www/py-HTMLgen/pkg-plist
+++ b/www/py-HTMLgen/pkg-plist
@@ -1,26 +1,30 @@
-lib/%%PYTHON_VERSION%%/site-packages/HTMLgen.py 
-lib/%%PYTHON_VERSION%%/site-packages/HTMLcolors.py 
-lib/%%PYTHON_VERSION%%/site-packages/HTMLutil.py 
+lib/%%PYTHON_VERSION%%/site-packages/Formtools.py
+lib/%%PYTHON_VERSION%%/site-packages/Formtools.pyc
+lib/%%PYTHON_VERSION%%/site-packages/GifImagePluginH.py 
+lib/%%PYTHON_VERSION%%/site-packages/GifImagePluginH.pyc 
 lib/%%PYTHON_VERSION%%/site-packages/HTMLcalendar.py 
-lib/%%PYTHON_VERSION%%/site-packages/barchart.py 
-lib/%%PYTHON_VERSION%%/site-packages/colorcube.py 
-lib/%%PYTHON_VERSION%%/site-packages/imgsize.py 
-lib/%%PYTHON_VERSION%%/site-packages/HTMLgen.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/HTMLcalendar.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/HTMLcolors.py 
 lib/%%PYTHON_VERSION%%/site-packages/HTMLcolors.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/HTMLgen.py 
+lib/%%PYTHON_VERSION%%/site-packages/HTMLgen.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/HTMLutil.py 
 lib/%%PYTHON_VERSION%%/site-packages/HTMLutil.pyc 
-lib/%%PYTHON_VERSION%%/site-packages/HTMLcalendar.pyc 
-lib/%%PYTHON_VERSION%%/site-packages/barchart.pyc 
-lib/%%PYTHON_VERSION%%/site-packages/colorcube.pyc 
-lib/%%PYTHON_VERSION%%/site-packages/imgsize.pyc 
-lib/%%PYTHON_VERSION%%/site-packages/ImageH.py 
 lib/%%PYTHON_VERSION%%/site-packages/ImageFileH.py 
-lib/%%PYTHON_VERSION%%/site-packages/ImagePaletteH.py 
-lib/%%PYTHON_VERSION%%/site-packages/GifImagePluginH.py 
-lib/%%PYTHON_VERSION%%/site-packages/JpegImagePluginH.py 
-lib/%%PYTHON_VERSION%%/site-packages/PngImagePluginH.py 
-lib/%%PYTHON_VERSION%%/site-packages/ImageH.pyc 
 lib/%%PYTHON_VERSION%%/site-packages/ImageFileH.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/ImageH.py 
+lib/%%PYTHON_VERSION%%/site-packages/ImageH.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/ImagePaletteH.py 
 lib/%%PYTHON_VERSION%%/site-packages/ImagePaletteH.pyc 
-lib/%%PYTHON_VERSION%%/site-packages/GifImagePluginH.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/JpegImagePluginH.py 
 lib/%%PYTHON_VERSION%%/site-packages/JpegImagePluginH.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/NavLinks.py
+lib/%%PYTHON_VERSION%%/site-packages/NavLinks.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PngImagePluginH.py 
 lib/%%PYTHON_VERSION%%/site-packages/PngImagePluginH.pyc
+lib/%%PYTHON_VERSION%%/site-packages/barchart.py 
+lib/%%PYTHON_VERSION%%/site-packages/barchart.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/colorcube.py 
+lib/%%PYTHON_VERSION%%/site-packages/colorcube.pyc 
+lib/%%PYTHON_VERSION%%/site-packages/imgsize.py 
+lib/%%PYTHON_VERSION%%/site-packages/imgsize.pyc 
diff --git a/www/py-HTMLgen/pkg-plist.docs b/www/py-HTMLgen/pkg-plist.docs
index 6712a6ac810b..2b1aa6e05feb 100644
--- a/www/py-HTMLgen/pkg-plist.docs
+++ b/www/py-HTMLgen/pkg-plist.docs
@@ -1,9 +1,24 @@
 share/doc/HTMLgen/README
-share/doc/HTMLgen/html/HTMLgen_overview.html
+share/doc/HTMLgen/html/Formtools-CheckBoxes.html
+share/doc/HTMLgen/html/Formtools-InputTable.html
+share/doc/HTMLgen/html/Formtools-RadioButtons.html
+share/doc/HTMLgen/html/Formtools_overview.html
+share/doc/HTMLgen/html/HTMLcalendar-Appointment.html
+share/doc/HTMLgen/html/HTMLcalendar-DateTable.html
+share/doc/HTMLgen/html/HTMLcalendar-Day.html
+share/doc/HTMLgen/html/HTMLcalendar-Month.html
+share/doc/HTMLgen/html/HTMLcalendar-Year.html
+share/doc/HTMLgen/html/HTMLcalendar-main.html
+share/doc/HTMLgen/html/HTMLcalendar-makeint.html
+share/doc/HTMLgen/html/HTMLcalendar-read_appt_file.html
+share/doc/HTMLgen/html/HTMLcalendar_overview.html
+share/doc/HTMLgen/html/HTMLcolors_overview.html
 share/doc/HTMLgen/html/HTMLgen-AbstractTag.html
 share/doc/HTMLgen/html/HTMLgen-AbstractTagSingle.html
 share/doc/HTMLgen/html/HTMLgen-Address.html
 share/doc/HTMLgen/html/HTMLgen-Area.html
+share/doc/HTMLgen/html/HTMLgen-AutoStringTemplate.html
+share/doc/HTMLgen/html/HTMLgen-AutoTemplateDocument.html
 share/doc/HTMLgen/html/HTMLgen-BR.html
 share/doc/HTMLgen/html/HTMLgen-Base.html
 share/doc/HTMLgen/html/HTMLgen-BaseFont.html
@@ -14,8 +29,8 @@ share/doc/HTMLgen/html/HTMLgen-Caption.html
 share/doc/HTMLgen/html/HTMLgen-Center.html
 share/doc/HTMLgen/html/HTMLgen-Cite.html
 share/doc/HTMLgen/html/HTMLgen-Code.html
-share/doc/HTMLgen/html/HTMLgen-HR.html
 share/doc/HTMLgen/html/HTMLgen-Comment.html
+share/doc/HTMLgen/html/HTMLgen-Container.html
 share/doc/HTMLgen/html/HTMLgen-Define.html
 share/doc/HTMLgen/html/HTMLgen-DefinitionList.html
 share/doc/HTMLgen/html/HTMLgen-Div.html
@@ -26,6 +41,7 @@ share/doc/HTMLgen/html/HTMLgen-Form.html
 share/doc/HTMLgen/html/HTMLgen-Frame.html
 share/doc/HTMLgen/html/HTMLgen-Frameset.html
 share/doc/HTMLgen/html/HTMLgen-FramesetDocument.html
+share/doc/HTMLgen/html/HTMLgen-HR.html
 share/doc/HTMLgen/html/HTMLgen-Heading.html
 share/doc/HTMLgen/html/HTMLgen-Href.html
 share/doc/HTMLgen/html/HTMLgen-Image.html
@@ -54,6 +70,7 @@ share/doc/HTMLgen/html/HTMLgen-SimpleDocument.html
 share/doc/HTMLgen/html/HTMLgen-Small.html
 share/doc/HTMLgen/html/HTMLgen-Span.html
 share/doc/HTMLgen/html/HTMLgen-Strike.html
+share/doc/HTMLgen/html/HTMLgen-StringTemplate.html
 share/doc/HTMLgen/html/HTMLgen-Strong.html
 share/doc/HTMLgen/html/HTMLgen-Sub.html
 share/doc/HTMLgen/html/HTMLgen-Sup.html
@@ -65,7 +82,6 @@ share/doc/HTMLgen/html/HTMLgen-Table.html
 share/doc/HTMLgen/html/HTMLgen-TableLite.html
 share/doc/HTMLgen/html/HTMLgen-TemplateDocument.html
 share/doc/HTMLgen/html/HTMLgen-Text.html
-share/doc/HTMLgen/html/index.html
 share/doc/HTMLgen/html/HTMLgen-Textarea.html
 share/doc/HTMLgen/html/HTMLgen-U.html
 share/doc/HTMLgen/html/HTMLgen-URL.html
@@ -75,10 +91,12 @@ share/doc/HTMLgen/html/HTMLgen-imgsize.html
 share/doc/HTMLgen/html/HTMLgen-markup_re.html
 share/doc/HTMLgen/html/HTMLgen-markup_regex.html
 share/doc/HTMLgen/html/HTMLgen-mpath.html
+share/doc/HTMLgen/html/HTMLgen-overlay_values.html
 share/doc/HTMLgen/html/HTMLgen-relpath.html
 share/doc/HTMLgen/html/HTMLgen-replace.html
-share/doc/HTMLgen/html/HTMLcolors_overview.html
-share/doc/HTMLgen/html/HTMLutil_overview.html
+share/doc/HTMLgen/html/HTMLgen.css
+share/doc/HTMLgen/html/HTMLgen_overview.html
+share/doc/HTMLgen/html/HTMLgen_src.html
 share/doc/HTMLgen/html/HTMLutil-Directory.html
 share/doc/HTMLgen/html/HTMLutil-been_marked.html
 share/doc/HTMLgen/html/HTMLutil-expand_dir_path.html
@@ -95,108 +113,111 @@ share/doc/HTMLgen/html/HTMLutil-parse_cern_line.html
 share/doc/HTMLgen/html/HTMLutil-parse_ncsa_line.html
 share/doc/HTMLgen/html/HTMLutil-print_image_sizes.html
 share/doc/HTMLgen/html/HTMLutil-store_image_inventory.html
-share/doc/HTMLgen/html/HTMLcalendar_overview.html
-share/doc/HTMLgen/html/HTMLcalendar-Appointment.html
-share/doc/HTMLgen/html/HTMLcalendar-DateTable.html
-share/doc/HTMLgen/html/HTMLcalendar-Day.html
-share/doc/HTMLgen/html/HTMLcalendar-Month.html
-share/doc/HTMLgen/html/HTMLcalendar-Year.html
-share/doc/HTMLgen/html/HTMLcalendar-main.html
-share/doc/HTMLgen/html/HTMLcalendar-makeint.html
-share/doc/HTMLgen/html/HTMLcalendar-read_appt_file.html
+share/doc/HTMLgen/html/HTMLutil_overview.html
+share/doc/HTMLgen/html/NavLinks-AdjacentArrows.html
+share/doc/HTMLgen/html/NavLinks-AdjacentArrows2.html
+share/doc/HTMLgen/html/NavLinks-AllFilenames.html
+share/doc/HTMLgen/html/NavLinks-AllIcons.html
+share/doc/HTMLgen/html/NavLinks-NavLinks.html
+share/doc/HTMLgen/html/NavLinks_overview.html
+share/doc/HTMLgen/html/StickyForm-FormState.html
+share/doc/HTMLgen/html/StickyForm-StickyForm.html
+share/doc/HTMLgen/html/StickyForm_overview.html
+share/doc/HTMLgen/html/barchart-BarChart.html
+share/doc/HTMLgen/html/barchart-DataList.html
+share/doc/HTMLgen/html/barchart-StackedBarChart.html
 share/doc/HTMLgen/html/barchart_overview.html
-share/doc/HTMLgen/html/index_frm.html
 share/doc/HTMLgen/html/cgiapp-CGI.html
-share/doc/HTMLgen/html/overview.html
+share/doc/HTMLgen/html/cgiapp-MinimalCGI.html
+share/doc/HTMLgen/html/cgiapp_overview.html
+share/doc/HTMLgen/html/colorcube-contrast.html
+share/doc/HTMLgen/html/colorcube-makecell.html
+share/doc/HTMLgen/html/colorcube.html
+share/doc/HTMLgen/html/colorcube_overview.html
 share/doc/HTMLgen/html/document.html
-share/doc/HTMLgen/html/lists.html
-share/doc/HTMLgen/html/top-frames.html
-share/doc/HTMLgen/html/frames.html
-share/doc/HTMLgen/html/tables.html
 share/doc/HTMLgen/html/forms.html
+share/doc/HTMLgen/html/frames.html
 share/doc/HTMLgen/html/imagemaps.html
-share/doc/HTMLgen/html/scripts.html
+share/doc/HTMLgen/html/imgfix-fixsize.html
+share/doc/HTMLgen/html/imgfix-lower.html
+share/doc/HTMLgen/html/imgfix_overview.html
+share/doc/HTMLgen/html/imgsize_overview.html
 share/doc/HTMLgen/html/independence.html
-share/doc/HTMLgen/html/parrot.html
+share/doc/HTMLgen/html/index.html
+share/doc/HTMLgen/html/index_frm.html
+share/doc/HTMLgen/html/installp_overview.html
+share/doc/HTMLgen/html/lists.html
 share/doc/HTMLgen/html/main.html
-share/doc/HTMLgen/html/HTMLgen.css
+share/doc/HTMLgen/html/overview.html
 share/doc/HTMLgen/html/panel.html
-share/doc/HTMLgen/html/barchart-BarChart.html
-share/doc/HTMLgen/html/barchart-DataList.html
-share/doc/HTMLgen/html/barchart-StackedBarChart.html
-share/doc/HTMLgen/html/colorcube_overview.html
-share/doc/HTMLgen/html/colorcube-contrast.html
-share/doc/HTMLgen/html/colorcube-makecell.html
-share/doc/HTMLgen/html/StickyForm_overview.html
-share/doc/HTMLgen/html/StickyForm-FormState.html
-share/doc/HTMLgen/html/StickyForm-StickyForm.html
-share/doc/HTMLgen/html/cgiapp_overview.html
-share/doc/HTMLgen/html/cgiapp-MinimalCGI.html
-share/doc/HTMLgen/html/HTMLgen_src.html
-share/doc/HTMLgen/html/colorcube.html
+share/doc/HTMLgen/html/parrot.html
+share/doc/HTMLgen/html/scripts.html
+share/doc/HTMLgen/html/tables.html
 share/doc/HTMLgen/html/templatetest.html
-share/doc/HTMLgen/html/imgsize_overview.html
-share/doc/HTMLgen/html/installp_overview.html
-share/doc/HTMLgen/html/imgfix_overview.html
-share/doc/HTMLgen/html/imgfix-fixsize.html
-share/doc/HTMLgen/html/imgfix-lower.html
-@dirrm share/doc/HTMLgen/html
-share/doc/HTMLgen/image/bar-red.gif
-share/doc/HTMLgen/image/blank.gif
-share/doc/HTMLgen/image/Doc_Layout.GIF
+share/doc/HTMLgen/html/top-frames.html
+share/doc/HTMLgen/image/BTN_HomePage.gif
 share/doc/HTMLgen/image/BTN_ManualTop.gif
-share/doc/HTMLgen/image/world_swirl.gif
-share/doc/HTMLgen/image/yellow_dot.gif
-share/doc/HTMLgen/image/BTN_PrevPage.gif
 share/doc/HTMLgen/image/BTN_NextPage.gif
-share/doc/HTMLgen/image/BTN_HomePage.gif
-share/doc/HTMLgen/image/note.gif
-share/doc/HTMLgen/image/parrot4.gif
-share/doc/HTMLgen/image/historic.gif
-share/doc/HTMLgen/image/orange_dot.gif
-share/doc/HTMLgen/image/bar-htmlgen.jpg
-share/doc/HTMLgen/image/www_icon.gif
-share/doc/HTMLgen/image/eagle21.gif
-share/doc/HTMLgen/image/texturec.jpg
-share/doc/HTMLgen/image/silywalk2.gif
-share/doc/HTMLgen/image/csmap_circle.gif
-share/doc/HTMLgen/image/csmap_rect.gif
-share/doc/HTMLgen/image/forms.gif
-share/doc/HTMLgen/image/imapbanner.gif
-share/doc/HTMLgen/image/purple_dot.gif
-share/doc/HTMLgen/image/red_dot.gif
-share/doc/HTMLgen/image/green_dot.gif
-share/doc/HTMLgen/image/blue_dot.gif
+share/doc/HTMLgen/image/BTN_PrevPage.gif
 share/doc/HTMLgen/image/Buzz.gif
-share/doc/HTMLgen/image/document.gif
-share/doc/HTMLgen/image/frames.gif
-share/doc/HTMLgen/image/lists.gif
-share/doc/HTMLgen/image/scripts.gif
-share/doc/HTMLgen/image/tables.gif
-share/doc/HTMLgen/image/textureb.gif
-share/doc/HTMLgen/image/b-forms.jpg
+share/doc/HTMLgen/image/Doc_Layout.GIF
+share/doc/HTMLgen/image/HTMLgen_banner.jpg
 share/doc/HTMLgen/image/b-document.jpg
+share/doc/HTMLgen/image/b-forms.jpg
 share/doc/HTMLgen/image/b-frames.jpg
+share/doc/HTMLgen/image/b-imagemaps.jpg
 share/doc/HTMLgen/image/b-lists.jpg
 share/doc/HTMLgen/image/b-manual.jpg
 share/doc/HTMLgen/image/b-overview.jpg
-share/doc/HTMLgen/image/b-tables.jpg
 share/doc/HTMLgen/image/b-scripts.jpg
-share/doc/HTMLgen/image/b-imagemaps.jpg
+share/doc/HTMLgen/image/b-tables.jpg
 share/doc/HTMLgen/image/back.gif
 share/doc/HTMLgen/image/bar-blue.gif
 share/doc/HTMLgen/image/bar-green.gif
+share/doc/HTMLgen/image/bar-htmlgen.jpg
 share/doc/HTMLgen/image/bar-orange.gif
-share/doc/HTMLgen/image/docclass.jpg
 share/doc/HTMLgen/image/bar-purple.gif
+share/doc/HTMLgen/image/bar-red.gif
 share/doc/HTMLgen/image/bar-yellow.gif
-share/doc/HTMLgen/image/HTMLgen_banner.jpg
 share/doc/HTMLgen/image/bg-dots.gif
+share/doc/HTMLgen/image/blank.gif
+share/doc/HTMLgen/image/blue_dot.gif
+share/doc/HTMLgen/image/csmap_circle.gif
+share/doc/HTMLgen/image/csmap_rect.gif
+share/doc/HTMLgen/image/docclass.jpg
+share/doc/HTMLgen/image/document.gif
+share/doc/HTMLgen/image/eagle21.gif
+share/doc/HTMLgen/image/forms.gif
+share/doc/HTMLgen/image/frames.gif
+share/doc/HTMLgen/image/future_image.gif
+share/doc/HTMLgen/image/green_dot.gif
+share/doc/HTMLgen/image/hg2logo.jpg
+share/doc/HTMLgen/image/historic.gif
 share/doc/HTMLgen/image/home.gif
+share/doc/HTMLgen/image/imapbanner.gif
+share/doc/HTMLgen/image/lists.gif
 share/doc/HTMLgen/image/next.gif
-share/doc/HTMLgen/image/top.gif
-share/doc/HTMLgen/image/hg2logo.jpg
+share/doc/HTMLgen/image/next_image.gif
+share/doc/HTMLgen/image/note.gif
+share/doc/HTMLgen/image/orange_dot.gif
+share/doc/HTMLgen/image/parrot4.gif
+share/doc/HTMLgen/image/past_image.gif
+share/doc/HTMLgen/image/prev_image.gif
+share/doc/HTMLgen/image/purple_dot.gif
+share/doc/HTMLgen/image/red_dot.gif
 share/doc/HTMLgen/image/rpm1.jpg
 share/doc/HTMLgen/image/rpm2.jpg
+share/doc/HTMLgen/image/scripts.gif
+share/doc/HTMLgen/image/silywalk2.gif
+share/doc/HTMLgen/image/tables.gif
+share/doc/HTMLgen/image/textureb.gif
+share/doc/HTMLgen/image/texturec.jpg
+share/doc/HTMLgen/image/this_image.gif
+share/doc/HTMLgen/image/top.gif
+share/doc/HTMLgen/image/up_image.gif
+share/doc/HTMLgen/image/world_swirl.gif
+share/doc/HTMLgen/image/www_icon.gif
+share/doc/HTMLgen/image/yellow_dot.gif
+@dirrm share/doc/HTMLgen/html
 @dirrm share/doc/HTMLgen/image
 @dirrm share/doc/HTMLgen