Update to 1.1.29:

BINS 1.1.29
-----------

- A search engine has been added. It only woks on web browser
supporting javascript and DOM. It can be deactivated via the new
searchEngine parameter. It allows search on image description fields
set in the new searchFields parameter. Maximum results returned by the
search engine is set by the searchLimit parameter.
This adds a new dependency on Text::Unaccent.

- Michael Olson's mwolson templates have been added.

- Martin Pohlack's martin templates have been added. These templates are based
upon marc ones, in turn based on joi. Here are the modifications with
marc:
   - fixed some bugs in the css
   - more layout stuff done in css
   - changed colors to grey-levels, which allows the viewer to
     concentrate on the important parts, the images (if you don't like
     it, you only have to change some lines in the css).
   - some layout changes, links (next, prev, ...) have a fixed
     position now, so you don't have to move the mouse if you want to
     cycle through many images.
   - use transparent pngs for the slide background in browser which
     support it -> smoother slide corners (round corners are
     oversampled, compare the gif and the png)
   - Display the content of the jpeg-comment filed below the image

- Fixed a bug when javaScriptPreloadImage was set to 1 : the next image
preloaded was always at maximum size.
Patch from Malcolm Parsons

- Add support for jpegtran with MMX (libjpeg-mmx-progs).
Patch by Ludovic Rousseau

- Fix -f option so it can work with files given with a relative path.
Patch by Ludovic Rousseau

- Default template has been renamed to swigs, has it may not be the
default in the future (it uses tables and don't use CSS).

- A tools directory has been added in the archive, containing the
small BINS related utilities. The new tools add_num_prefix,
remove_num_prefix and bins_addtext have been added. All is documented
on the web site.

- A FAQ has been added.

- BINS now has a page on gna!, see https://gna.org/projects/bins/

BINS 1.1.28
-----------

- Replaced parameter "enlarge" with "whenSrcSmaller" to dictate what to
do if the source image is smaller than the size of the generated
image. Fixed a bug that prevented enlarged image from actually being
generated.
Patch from Alexander Blazej

- Added new linkRelative parameter allow to use relative links if
linkInsteadOfCopy is set to 1.
Patch from Dan McMahill

- Transform functionality now allow perl code. A new dateString
parameter allow to specify the date string to be used (following
date(1)), introducing a dependency on Date::Parse.
Patch from Martin Michlmayr

- Handle buggy EXIF information in DateTimeOriginal.
Patch from Martin Michlmayr

- Fix on deExifyImages option.
Patch from Martin Michlmayr

- Fix encoding problem whith ISO 646 used by Solaris.
Patch from Martin Michlmayr

- Fix bug when source directories is a prefix of the destination one.
Patch from Pizza

- Make JPEG Comments available as image subtext.
Patch from Martin Pohlack

- Catalan translation (ca) has been added.
Thanks to Joan Antoja Sabin

- A CSS bug in marc template has been fixed.
Correction from Martin Pohlack

- The image details page, using the Joi template, now respects use of a
background image.
Fix by Alexander Blazej

- The image details page's "Album Tree" link is fixed.
Fix by Alexander Blazej

- Standardized indentation (4 columns).
Done by Alexander Blazej

- Default value of borderOnThumbnails has been set to 0.

3 files changed, 125 insertions, 95 deletions

diff --git a/www/bins/Makefile b/www/bins/Makefile
index 66439c4ad2d..6369e243110 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2005/07/16 19:10:41 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/10/04 19:12:01 wiz Exp $
 #
 
-DISTNAME=	bins-1.1.27
+DISTNAME=	bins-1.1.29
 CATEGORIES=	www graphics
 MASTER_SITES=	http://zubro.chez.tiscali.fr/BINS/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,19 +11,21 @@ HOMEPAGE=	http://bins.sautret.org/
 COMMENT=	Static HTML photo album generator
 
 DEPENDS+=	p5-gettext>=1.01:../../devel/p5-gettext
-DEPENDS+=	p5-Text-Iconv>=1.1:../../converters/p5-Text-Iconv
-DEPENDS+=	p5-Storable>=2.04:../../devel/p5-Storable
+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-Image-Info>=1.10:../../graphics/p5-Image-Info
 DEPENDS+=	p5-Image-Size>=2.980:../../graphics/p5-Image-Size
 DEPENDS+=	p5-IO-String>=1.01:../../devel/p5-IO-String
 DEPENDS+=	p5-PerlMagick>=5.3.9nb1:../../graphics/p5-PerlMagick
+DEPENDS+=	p5-Storable>=2.04:../../devel/p5-Storable
+DEPENDS+=	p5-Text-Iconv>=1.1:../../converters/p5-Text-Iconv
+DEPENDS+=	p5-Text-Unaccent>=1.0:../../textproc/p5-Text-Unaccent
+DEPENDS+=	p5-TimeDate>=1.0:../../time/p5-TimeDate
+DEPENDS+=	p5-URI>=1.19:../../www/p5-URI
 DEPENDS+=	p5-XML-Grove>=0.46.0.1:../../textproc/p5-XML-Grove
 DEPENDS+=	p5-XML-Handler-YAWriter>=0.23:../../textproc/p5-XML-Handler-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
 
 USE_PKGLOCALEDIR=	YES
 
@@ -32,7 +34,8 @@ USE_PKGLOCALEDIR=	YES
 # have previous versions in pkgsrc.
 #
 USE_TOOLS+=	perl:run
-REPLACE_PERL=	bins bins_edit bins-edit-gui bins_cleanupgallery bins_txt2xml
+REPLACE_PERL=	bins bins_edit bins-edit-gui tools/bins_addtext \
+		tools/bins_cleanupgallery tools/bins_txt2xml
 
 INSTALLATION_DIRS=	bin man/man1
 
@@ -44,9 +47,9 @@ post-patch:
 
 do-install:
 	# Programs and manual pages
-	${INSTALL_SCRIPT} ${WRKSRC}/anti_bins ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/anti_bins ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bins ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bins_cleanupgallery ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/bins_cleanupgallery ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bins_edit ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/bins.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/bins_edit.1 ${PREFIX}/man/man1
@@ -56,58 +59,23 @@ do-install:
 	# Example configuration file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins
 	${INSTALL_DATA} ${WRKSRC}/binsrc ${PREFIX}/share/examples/bins/
+.for template in swigs
 	# template: default
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.default
-	${INSTALL_DATA} ${WRKSRC}/templates.default/*.html		\
-		${PREFIX}/share/examples/bins/templates.default/
-	# template: jab
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.jab
-	${INSTALL_DATA} ${WRKSRC}/templates.jab/*.html			\
-		${PREFIX}/share/examples/bins/templates.jab/
-	# template: joi
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.joi
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.joi/static
-	${INSTALL_DATA} ${WRKSRC}/templates.joi/*.html			\
-		${PREFIX}/share/examples/bins/templates.joi/
-	${INSTALL_DATA}							\
-		${WRKSRC}/templates.joi/static/*.css			\
-		${WRKSRC}/templates.joi/static/*.png			\
-		${WRKSRC}/templates.joi/static/*.js			\
-		${PREFIX}/share/examples/bins/templates.joi/static/
-	# template: marc
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.marc
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.marc/static
-	${INSTALL_DATA} ${WRKSRC}/templates.marc/*.html			\
-		${PREFIX}/share/examples/bins/templates.marc/
-	${INSTALL_DATA}							\
-		${WRKSRC}/templates.marc/static/*.css			\
-		${WRKSRC}/templates.marc/static/*.png			\
-		${WRKSRC}/templates.marc/static/*.js			\
-		${PREFIX}/share/examples/bins/templates.marc/static/
-	# template: new
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.new
-	${INSTALL_DATA} ${WRKSRC}/templates.new/*.html			\
-		${PREFIX}/share/examples/bins/templates.new/
-	# template: petrus
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.petrus
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.petrus/static
-	${INSTALL_DATA} ${WRKSRC}/templates.petrus/*.html		\
-		${PREFIX}/share/examples/bins/templates.petrus/
-	${INSTALL_DATA}							\
-		${WRKSRC}/templates.petrus/static/*.css			\
-		${WRKSRC}/templates.petrus/static/*.png			\
-		${WRKSRC}/templates.petrus/static/*.js			\
-		${PREFIX}/share/examples/bins/templates.petrus/static/
-	# template: satyap
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.satyap
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.satyap/static
-	${INSTALL_DATA} ${WRKSRC}/templates.satyap/*.html		\
-		${PREFIX}/share/examples/bins/templates.satyap/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.${template}
+	${INSTALL_DATA} ${WRKSRC}/templates.${template}/*.*		\
+		${PREFIX}/share/examples/bins/templates.${template}/
+.endfor
+.for template in joi marc martin mwolson petrus satyap
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.${template}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.${template}/static
+	${INSTALL_DATA} ${WRKSRC}/templates.${template}/*.*		\
+		${PREFIX}/share/examples/bins/templates.${template}/
 	${INSTALL_DATA}							\
-		${WRKSRC}/templates.satyap/static/*.css			\
-		${PREFIX}/share/examples/bins/templates.satyap/static/
+		${WRKSRC}/templates.${template}/static/*		\
+		${PREFIX}/share/examples/bins/templates.${template}/static/
+.endfor
 	# Translations
-	for lang in de eo es fi fr it ja nl pl ru zh_TW; do \
+	for lang in ca de eo es fi fr hu it ja nl pl ru zh_TW; do \
 		${INSTALL_DATA_DIR} \
 		${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES; \
 		${INSTALL_DATA} ${WRKSRC}/intl/$$lang.mo \
diff --git a/www/bins/PLIST b/www/bins/PLIST
index d6abede4585..62ad136da29 100644
--- a/www/bins/PLIST
+++ b/www/bins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2005/02/18 13:48:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/10/04 19:12:01 wiz Exp $
 bin/anti_bins
 bin/bins
 bin/bins_cleanupgallery
@@ -8,8 +8,10 @@ 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/contact.html
 share/doc/html/bins/download.html
 share/doc/html/bins/examples.html
+share/doc/html/bins/faq.html
 share/doc/html/bins/index.html
 share/doc/html/bins/index_fr.html
 share/doc/html/bins/install.html
@@ -29,25 +31,8 @@ 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/doc/html/bins/usage_httpd.html
+share/doc/html/bins/usage_tools.html
 share/examples/bins/binsrc
-share/examples/bins/templates.default/details.html
-share/examples/bins/templates.default/footer.html
-share/examples/bins/templates.default/image.html
-share/examples/bins/templates.default/imagelist.html
-share/examples/bins/templates.default/navbar.html
-share/examples/bins/templates.default/path.html
-share/examples/bins/templates.default/subalbum.html
-share/examples/bins/templates.default/thumbnail.html
-share/examples/bins/templates.default/tree.html
-share/examples/bins/templates.jab/details.html
-share/examples/bins/templates.jab/footer.html
-share/examples/bins/templates.jab/image.html
-share/examples/bins/templates.jab/imagelist.html
-share/examples/bins/templates.jab/navbar.html
-share/examples/bins/templates.jab/path.html
-share/examples/bins/templates.jab/subalbum.html
-share/examples/bins/templates.jab/thumbnail.html
-share/examples/bins/templates.jab/tree.html
 share/examples/bins/templates.joi/details.html
 share/examples/bins/templates.joi/footer.html
 share/examples/bins/templates.joi/image.html
@@ -134,8 +119,66 @@ share/examples/bins/templates.marc/thumbnav.html
 share/examples/bins/templates.marc/thumbnavrow.html
 share/examples/bins/templates.marc/tree.html
 share/examples/bins/templates.marc/xlink.html
-share/examples/bins/templates.new/th.html
-share/examples/bins/templates.new/thubnail.html
+share/examples/bins/templates.martin/details.html
+share/examples/bins/templates.martin/footer.html
+share/examples/bins/templates.martin/image.html
+share/examples/bins/templates.martin/imagelist.html
+share/examples/bins/templates.martin/imagenavbar.html
+share/examples/bins/templates.martin/navbar.html
+share/examples/bins/templates.martin/path.html
+share/examples/bins/templates.martin/static/actthumb.png
+share/examples/bins/templates.martin/static/albumtree.png
+share/examples/bins/templates.martin/static/back.png
+share/examples/bins/templates.martin/static/contact.png
+share/examples/bins/templates.martin/static/exit.png
+share/examples/bins/templates.martin/static/first.png
+share/examples/bins/templates.martin/static/firstInactive.png
+share/examples/bins/templates.martin/static/home.png
+share/examples/bins/templates.martin/static/huge.png
+share/examples/bins/templates.martin/static/hugeActive.png
+share/examples/bins/templates.martin/static/imagelist.png
+share/examples/bins/templates.martin/static/info.png
+share/examples/bins/templates.martin/static/large.png
+share/examples/bins/templates.martin/static/largeActive.png
+share/examples/bins/templates.martin/static/last.png
+share/examples/bins/templates.martin/static/lastInactive.png
+share/examples/bins/templates.martin/static/martin.css
+share/examples/bins/templates.martin/static/media.png
+share/examples/bins/templates.martin/static/medium.png
+share/examples/bins/templates.martin/static/mediumActive.png
+share/examples/bins/templates.martin/static/metal_slide_light.gif
+share/examples/bins/templates.martin/static/metal_slide_light.png
+share/examples/bins/templates.martin/static/next.png
+share/examples/bins/templates.martin/static/nextInactive.png
+share/examples/bins/templates.martin/static/prev.png
+share/examples/bins/templates.martin/static/prevInactive.png
+share/examples/bins/templates.martin/static/related.png
+share/examples/bins/templates.martin/static/slides.css
+share/examples/bins/templates.martin/static/small.png
+share/examples/bins/templates.martin/static/smallActive.png
+share/examples/bins/templates.martin/static/subalbum.png
+share/examples/bins/templates.martin/static/thumbnails.png
+share/examples/bins/templates.martin/static/up.png
+share/examples/bins/templates.martin/subalbum.html
+share/examples/bins/templates.martin/subjectpath.html
+share/examples/bins/templates.martin/thumbnail.html
+share/examples/bins/templates.martin/thumbnavrow.html
+share/examples/bins/templates.martin/tree.html
+share/examples/bins/templates.martin/xlink.html
+share/examples/bins/templates.mwolson/bodyheader.html
+share/examples/bins/templates.mwolson/details.html
+share/examples/bins/templates.mwolson/footer.html
+share/examples/bins/templates.mwolson/header.html
+share/examples/bins/templates.mwolson/image.html
+share/examples/bins/templates.mwolson/imagelist.html
+share/examples/bins/templates.mwolson/navbar.html
+share/examples/bins/templates.mwolson/path.html
+share/examples/bins/templates.mwolson/static/style.css
+share/examples/bins/templates.mwolson/subalbum.html
+share/examples/bins/templates.mwolson/thheader.html
+share/examples/bins/templates.mwolson/thumbnail.html
+share/examples/bins/templates.mwolson/tree.html
+share/examples/bins/templates.petrus/README.txt
 share/examples/bins/templates.petrus/details.html
 share/examples/bins/templates.petrus/footer.html
 share/examples/bins/templates.petrus/image.html
@@ -194,27 +237,46 @@ share/examples/bins/templates.satyap/subalbum.html
 share/examples/bins/templates.satyap/thheader.html
 share/examples/bins/templates.satyap/thumbnail.html
 share/examples/bins/templates.satyap/tree.html
+share/examples/bins/templates.swigs/album.txt
+share/examples/bins/templates.swigs/album_fr.txt
+share/examples/bins/templates.swigs/details.html
+share/examples/bins/templates.swigs/footer.html
+share/examples/bins/templates.swigs/image.html
+share/examples/bins/templates.swigs/imagelist.html
+share/examples/bins/templates.swigs/navbar.html
+share/examples/bins/templates.swigs/path.html
+share/examples/bins/templates.swigs/search.html
+share/examples/bins/templates.swigs/search.js
+share/examples/bins/templates.swigs/search_data.js
+share/examples/bins/templates.swigs/search_result.html
+share/examples/bins/templates.swigs/subalbum.html
+share/examples/bins/templates.swigs/thumbnail.html
+share/examples/bins/templates.swigs/tree.html
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bins.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/bins.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/bins.mo
-@dirrm share/doc/html/bins
-@dirrm share/examples/bins/templates.default
-@dirrm share/examples/bins/templates.jab
-@dirrm share/examples/bins/templates.joi/static
-@dirrm share/examples/bins/templates.joi
-@dirrm share/examples/bins/templates.marc/static
-@dirrm share/examples/bins/templates.marc
-@dirrm share/examples/bins/templates.new
-@dirrm share/examples/bins/templates.petrus/static
-@dirrm share/examples/bins/templates.petrus
+@dirrm share/examples/bins/templates.swigs
 @dirrm share/examples/bins/templates.satyap/static
 @dirrm share/examples/bins/templates.satyap
+@dirrm share/examples/bins/templates.petrus/static
+@dirrm share/examples/bins/templates.petrus
+@dirrm share/examples/bins/templates.mwolson/static
+@dirrm share/examples/bins/templates.mwolson
+@dirrm share/examples/bins/templates.martin/static
+@dirrm share/examples/bins/templates.martin
+@dirrm share/examples/bins/templates.marc/static
+@dirrm share/examples/bins/templates.marc
+@dirrm share/examples/bins/templates.joi/static
+@dirrm share/examples/bins/templates.joi
 @dirrm share/examples/bins
+@dirrm share/doc/html/bins
diff --git a/www/bins/distinfo b/www/bins/distinfo
index 32a10c9387a..8a94ac59d95 100644
--- a/www/bins/distinfo
+++ b/www/bins/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.26 2005/02/24 14:08:29 wiz Exp $
+$NetBSD: distinfo,v 1.27 2005/10/04 19:12:01 wiz Exp $
 
-SHA1 (bins-1.1.27.tar.bz2) = 33b2c87a785e7878f729fad2ef785d1e62740f91
-RMD160 (bins-1.1.27.tar.bz2) = 072f48fa147f7d644a8d2e2178815a02a2aab45c
-Size (bins-1.1.27.tar.bz2) = 206986 bytes
+SHA1 (bins-1.1.29.tar.bz2) = ac55fa425c866e7229afa8841470df17e27abf84
+RMD160 (bins-1.1.29.tar.bz2) = f8c12fc26f89614e87cf4baec5fa57d20c7ab6b6
+Size (bins-1.1.29.tar.bz2) = 259270 bytes