update to bins-1.1.14 provided in PR pkg/17984 by Eric Jacoboni,

jaco at scrogneugneu.org.

Changes since 1.1.10 are:

- Some image files and directories can now be excluded by setting some
regexp to excludeFiles and excludeDirs new parameters. excludeDirs is
set to ^CVS$ in default config, and thus, CVS subdirs aren't processed
by bins now.

- HTML generation performances have been increased by using the
blind_cache parameter of HTML::Template.
Thanks to Mark Eichin for this one.

- Corrected a bug that wrongly set width and height of thumbnails and
prevented Internet Explorer (at least version 5) to display them.

- Changed the image template so that Internet Explorer can display the
title tooltip on the prev/next thumbnails (when thumbPrevNext is 1).

- bins now process .thm (THuMbnail) files. Accroding to Mark Eichin,
Canon cameras that do movies generate mvi*.thm files which are really
small JPEGs with exif data.

- It is now possible to use the <sizes> parameter in picture
description files to have different scaled images number and scaled
sizes for pictures in the same album (for example, one can have three
scaled pictures, small, medium and big, for most of the images of an
album, and a fourth one, huge, for big panoramas). Some other
parameters, such as titleOnThumbnail, defaultSize or
thumbnailBackground, can now also be used on a per image basis.

- A bug introduced in 1.1.10 version that caused scaleIfSameSize
parameter to be always 1 has been corrected.
Thanks to Mark Eichin for pointing out the problem
and to Dan (mcmahill @ mtl.mit.edu) and Kamil Iskra for the correction path.

- jpegtran can now be used even if it cannot handle the same file in
input and output (this is the case for the jpegtran shipped with most
GNU/Linux distribution, except Debian).
Patch from Kamil Iskra.

- Corrected encoding problem on creation date.

- Sorting order for directories and/or pictures can now be reversed,
using the -r command line option or the reverseOrder parameter.
Patch from Christian Hoenig for the -r option.

- A bug on automatic rotation of destination image when -o was used
has been corrected (width and height were inversed).

- French translation has been corrected.

- Some javascript code is now added in thumbnails pages to preload
thumbnails of the next page when current one is loaded, to speed up
the album browsing. This can be deactivated with the new
javaScriptPreloadImages parameter.

- Generated HTML code is now cleaned up to reduce the size of pages
and thus, speed up browsing. This reduces the size of HTML BINS files
by about 30%. This uses the HTML::Clean(3) library (new
dependency). This can be deactivated with the new compactHTML
parameter.

- Use of the jpegtran program is now deactivated in default config
(some versions fail to perform rotation correctly). A new parameter
rotateWithJpegtran has been added. Set it to 1 in binsrc to continue
to use jpegtran.

- Added some non breakable spaces in HTML code.

- Strip . (dots) in small size names when creating file names (this
caused problem with italian i18n). You may have to delete all your
generated HTML files before running bins on a old italian album to
clean it up.

- Some minor bugs have been corrected.

- French translation has been corrected.

4 files changed, 34 insertions, 23 deletions

diff --git a/www/bins/Makefile b/www/bins/Makefile
index 2fc97a9b3e2..99c338d37fc 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2002/07/31 14:34:01 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/24 11:24:55 dmcmahill Exp $
 #
 
-DISTNAME=	bins-1.1.10
-PKGREVISION=	2
+DISTNAME=	bins-1.1.14
 CATEGORIES=	www graphics
 MASTER_SITES=	http://jsautret.free.fr/BINS/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	wiz@netbsd.org
+MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://bins.sautret.org/
 COMMENT=	static HTML photo album generator
 
@@ -20,6 +19,7 @@ DEPENDS+=	p5-PerlMagick>=5.3.9nb1:../../graphics/p5-PerlMagick
 DEPENDS+=	p5-XML-Grove>=0.46.0.1:../../textproc/p5-XML-Grove
 DEPENDS+=	p5-XML-Handler-YAWriter-0.23:../../textproc/p5-XML-YAWriter
 DEPENDS+=	p5-XML-Parser>=2.30:../../textproc/p5-XML-Parser
+DEPENDS+=	p5-HTML-Clean>=0.8:../../www/p5-HTML-Clean
 DEPENDS+=	p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser
 DEPENDS+=	p5-HTML-Template>=2.5:../../www/p5-HTML-Template
 DEPENDS+=	p5-URI>=1.19:../../www/p5-URI
diff --git a/www/bins/PLIST b/www/bins/PLIST
index 8c6fd459678..16780dff29b 100644
--- a/www/bins/PLIST
+++ b/www/bins/PLIST
@@ -1,10 +1,30 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/30 09:46:32 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/24 11:24:55 dmcmahill Exp $
 bin/bins
 bin/bins_edit
 man/man1/bins.1
 man/man1/bins_edit.1
+share/doc/html/bins/bins-edit-gui_man.html
+share/doc/html/bins/bins_edit_man.html
+share/doc/html/bins/bins_man.html
+share/doc/html/bins/download.html
+share/doc/html/bins/examples.html
 share/doc/html/bins/index.html
 share/doc/html/bins/index_fr.html
+share/doc/html/bins/install.html
+share/doc/html/bins/install_automatic.html
+share/doc/html/bins/install_manual.html
+share/doc/html/bins/install_prerequisites.html
+share/doc/html/bins/intro.html
+share/doc/html/bins/license.html
+share/doc/html/bins/usage.html
+share/doc/html/bins/usage_album.html
+share/doc/html/bins/usage_custom.html
+share/doc/html/bins/usage_desc.html
+share/doc/html/bins/usage_desc_cli.html
+share/doc/html/bins/usage_desc_gui.html
+share/doc/html/bins/usage_desc_gui_gqview.html
+share/doc/html/bins/usage_desc_gui_nautilus.html
+share/doc/html/bins/usage_desc_xml.html
 share/examples/bins/binsrc
 share/examples/bins/templates.default/details.html
 share/examples/bins/templates.default/footer.html
diff --git a/www/bins/distinfo b/www/bins/distinfo
index f99a9c50014..4653dfab35f 100644
--- a/www/bins/distinfo
+++ b/www/bins/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/07/31 14:34:01 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2002/08/24 11:24:55 dmcmahill Exp $
 
-SHA1 (bins-1.1.10.tar.bz2) = 7ed3889654cefa264d22e3b136669701c5f3a9d3
-Size (bins-1.1.10.tar.bz2) = 98777 bytes
-SHA1 (patch-aa) = 290d84dfcb8c57e4da0528d845f27f2350ec0008
+SHA1 (bins-1.1.14.tar.bz2) = 3e3a97e3790aa300cc278b3234334297f8b4972b
+Size (bins-1.1.14.tar.bz2) = 116489 bytes
+SHA1 (patch-aa) = a7c5a0884ba0dbead3032fd7be36a1a65567d6dc
 SHA1 (patch-ab) = 3109680a859da8499a6b14406aeddbb06536c0fa
diff --git a/www/bins/patches/patch-aa b/www/bins/patches/patch-aa
index 9f4c93349d5..d4fd07be5dd 100644
--- a/www/bins/patches/patch-aa
+++ b/www/bins/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2002/07/31 14:34:02 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/24 11:24:56 dmcmahill Exp $
 
---- bins.orig	Sun Jun  9 15:54:12 2002
-+++ bins	Wed Jul 31 10:27:02 2002
-@@ -219,5 +219,5 @@
+--- bins.orig	Mon Aug 19 01:04:31 2002
++++ bins	Mon Aug 19 01:04:31 2002
+@@ -259,5 +259,5 @@
  
     # The following parameters cannot be set in config files for now :
 -   globalConfigDir => "/etc/bins",     # System wide
 +   globalConfigDir => "@pkgsysconfdir@/bins",     # System wide
                                         # configuration directory.
     userConfigDir    => "~/.bins",      # User configuration directory
-@@ -238,11 +238,12 @@
+@@ -278,11 +278,12 @@
  );
  
 -# normally, you don't have to touch that...
@@ -29,12 +29,3 @@ $NetBSD: patch-aa,v 1.3 2002/07/31 14:34:02 dmcmahill Exp $
 +# }
  my $local2htmlConverter;
  if ($defaultConfig{defaultEncoding} ne $defaultConfig{htmlEncoding}){
-@@ -2369,6 +2370,7 @@
-     warn "$x" if "$x";
- 
-+    my($srcformat) = $preview->Get("magick");
-     if (!$configHash->{scaleIfSameSize}
--	and grep (/^$preview->Get("magick")$/, @webFormats ) ) {
-+	and grep (/^$srcformat$/, @webFormats ) ) {
-       my ($width, $height) = $preview->Get("width", "height");
-       if ($width == $newWidth && $height == $newHeight) {