Updated bins to 1.1.24

- Added anti_bins program, to create a clean image files tree for each
  image size from a BINS album.
- Added jpegProgressify config option. Now, generated jpeg can be
  progressive (instead of baseline) using jpegtran.  Usually progressive
  jpegs save space, but by default it only makes them progressive if it
  does save space. See bins man page for usage detail.
- Added prev/next link element (to enable Mozilla's link prefetching
  feature and site navigation toolbar) in joi templates .
- Added JavaScript image pre-loading in satyap templates.
- Bug fixes
- New templates
- Translation updates

3 files changed, 78 insertions, 20 deletions

diff --git a/www/bins/Makefile b/www/bins/Makefile
index 9b8e11f7f5d..705d405c3c2 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/10/05 12:03:33 martti Exp $
+# $NetBSD: Makefile,v 1.22 2003/12/07 15:17:08 martti Exp $
 #
 
-DISTNAME=	bins-1.1.23
+DISTNAME=	bins-1.1.24
 CATEGORIES=	www graphics
 MASTER_SITES=	http://jsautret.free.fr/BINS/
 EXTRACT_SUFX=	.tar.bz2
@@ -39,28 +39,53 @@ post-patch:
 		${WRKSRC}/bins.bak > ${WRKSRC}/bins
 
 do-install:
+	# Programs and manual pages
+	${INSTALL_SCRIPT} ${WRKSRC}/anti_bins ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bins ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/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
+	# HTML documentation
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bins
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html \
-		${PREFIX}/share/doc/html/bins
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/html/bins/
+	# Example configuration file
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins
+	${INSTALL_DATA} ${WRKSRC}/binsrc ${PREFIX}/share/examples/bins/
+	# template: default
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.default
-	${INSTALL_DATA} ${WRKSRC}/templates/*.html \
-		${PREFIX}/share/examples/bins/templates.default
-	${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 \
+	${INSTALL_DATA} ${WRKSRC}/templates/*.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		\
 		${PREFIX}/share/examples/bins/templates.joi/static
-	${INSTALL_DATA} ${WRKSRC}/binsrc \
-		${PREFIX}/share/examples/bins
-	for lang in es de fr it nl pl ru zh; do \
+	${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: new
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.new
+	${INSTALL_DATA} ${WRKSRC}/templates.new/*.html			\
+		${PREFIX}/share/examples/bins/templates.new/
+	# template: satyap
+	${INSTALL_DATA_DIR}						\
+		${PREFIX}/share/examples/bins/templates.satyap		\
+		${PREFIX}/share/examples/bins/templates.satyap/static
+	${INSTALL_DATA} ${WRKSRC}/templates.satyap/*.html		\
+		${PREFIX}/share/examples/bins/templates.satyap/
+	${INSTALL_DATA}							\
+		${WRKSRC}/templates.satyap/static/*.css			\
+		${PREFIX}/share/examples/bins/templates.satyap/static/
+	# Translations
+	for lang in de eo es fi fr it ja nl pl ru zh; do \
 		${INSTALL_DATA} ${WRKSRC}/intl/$$lang.mo \
 		${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES/bins.mo; \
 	done
diff --git a/www/bins/PLIST b/www/bins/PLIST
index ee581f4884d..206579a833d 100644
--- a/www/bins/PLIST
+++ b/www/bins/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.11 2003/10/05 12:03:33 martti Exp $
+@comment $NetBSD: PLIST,v 1.12 2003/12/07 15:17:08 martti Exp $
+bin/anti_bins
 bin/bins
 bin/bins_cleanupgallery
 bin/bins_edit
@@ -26,6 +27,7 @@ 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/doc/html/bins/usage_httpd.html
 share/examples/bins/binsrc
 share/examples/bins/templates.default/details.html
 share/examples/bins/templates.default/footer.html
@@ -36,6 +38,15 @@ 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
@@ -79,16 +90,38 @@ share/examples/bins/templates.joi/thumbnav.html
 share/examples/bins/templates.joi/thumbnavrow.html
 share/examples/bins/templates.joi/tree.html
 share/examples/bins/templates.joi/xlink.html
+share/examples/bins/templates.new/th.html
+share/examples/bins/templates.new/thubnail.html
+share/examples/bins/templates.satyap/bodyheader.html
+share/examples/bins/templates.satyap/details.html
+share/examples/bins/templates.satyap/footer.html
+share/examples/bins/templates.satyap/header.html
+share/examples/bins/templates.satyap/image.html
+share/examples/bins/templates.satyap/imagelist.html
+share/examples/bins/templates.satyap/navbar.html
+share/examples/bins/templates.satyap/path.html
+share/examples/bins/templates.satyap/static/style.css
+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
 ${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/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/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.new
+@dirrm share/examples/bins/templates.satyap/static
+@dirrm share/examples/bins/templates.satyap
 @dirrm share/examples/bins
diff --git a/www/bins/distinfo b/www/bins/distinfo
index 3064764c0a6..6cff8a352c8 100644
--- a/www/bins/distinfo
+++ b/www/bins/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2003/10/05 12:03:33 martti Exp $
+$NetBSD: distinfo,v 1.20 2003/12/07 15:17:08 martti Exp $
 
-SHA1 (bins-1.1.23.tar.bz2) = b72bead94d29564c2c314657c32be1523bd3e1d9
-Size (bins-1.1.23.tar.bz2) = 171397 bytes
+SHA1 (bins-1.1.24.tar.bz2) = 85a6e8063f7a8301ca8d874b745f3401e92f3625
+Size (bins-1.1.24.tar.bz2) = 181499 bytes