update to bins-1.1.18. Changes are:

BINS 1.1.18
-----------

- joi templates has been updated by Joachim Kohlhammer :
* The Albumtree works now correctly, even the thumbnail for the
  root-album works, i.e. no more broken images.
* New icon for the albumtree.
* Redesign of the image-view. The icons moved to the left border.
* Leave was renamed to Home; the variable in the template is now called
  HOME_LINK. The icon was changed to a little house. The old icon is
  still included.
* If the option pathImgNum is set, the image-view shows
  (Image/Imagecount) in the path.
* The path contains a icon for each level (corresponding to the type of
  the level (albumtree, album, image)) if the variable pathShowIcon is
  set to 1.
* In the Thumbnailview the bar with the next/prev-buttons shows only if
  there are two or more pages. If the bar shows, it now has a grey
  background.
* The "cycling" of the thumbnailpages and the imageviews can be disabled
  by setting the options thumbnailPageCycling and imagePageCycling to 1.

- If only one Thumbnailpage exists, the navigation bar shows
"Thumbnail Page" instead of "Thumbnail Page 1".
(from Joachim Kohlhammer's patch)

- select LATIN1 as default encoding on systems lacking the locale
command (like *BSD systems)
(patch from Dan <mcmahill at mtl.mit.edu>).

- added new parameter emptyAlbumDesc to get rid of the "No long/short
description available" message if no description was set.

- added Spanish translation.
(thanks to David Barroso).

5 files changed, 14 insertions, 70 deletions

diff --git a/www/bins/Makefile b/www/bins/Makefile
index b526b784075..5b938a1b0f2 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2002/10/19 18:16:40 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/26 19:38:12 dmcmahill Exp $
 #
 
-DISTNAME=	bins-1.1.17
-PKGREVISION=	2
+DISTNAME=	bins-1.1.18
 CATEGORIES=	www graphics
 MASTER_SITES=	http://jsautret.free.fr/BINS/
 EXTRACT_SUFX=	.tar.bz2
@@ -34,8 +33,8 @@ REPLACE_PERL=	bins bins_edit bins-edit-gui bins_txt2xml
 
 post-patch:
 	${MV} ${WRKSRC}/bins ${WRKSRC}/bins.bak
-	${SED}	-e 's;@pkgsysconfdir@;${PKG_SYSCONFDIR};g' \
-		-e 's;@pkglocaledir@;${PREFIX}/${PKGLOCALEDIR}/locale;g' \
+	${SED}	-e 's;/etc/bins;${PKG_SYSCONFDIR}/bins;g' \
+		-e 's;/usr/local/share/locale;${PREFIX}/${PKGLOCALEDIR}/locale;g' \
 		${WRKSRC}/bins.bak > ${WRKSRC}/bins
 
 do-install:
diff --git a/www/bins/PLIST b/www/bins/PLIST
index 96a0fed7b48..6db3d3216b0 100644
--- a/www/bins/PLIST
+++ b/www/bins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/09/25 00:09:32 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/10/26 19:38:12 dmcmahill Exp $
 bin/bins
 bin/bins_edit
 man/man1/bins.1
@@ -44,11 +44,15 @@ share/examples/bins/templates.joi/path.html
 share/examples/bins/templates.joi/subalbum.html
 share/examples/bins/templates.joi/subjectpath.html
 share/examples/bins/templates.joi/thumbnail.html
+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/static/actthumb.png
 share/examples/bins/templates.joi/static/albumtree.png
 share/examples/bins/templates.joi/static/back.png
 share/examples/bins/templates.joi/static/contact.png
 share/examples/bins/templates.joi/static/exit.png
+share/examples/bins/templates.joi/static/home.png
 share/examples/bins/templates.joi/static/imagelist.png
 share/examples/bins/templates.joi/static/info.png
 share/examples/bins/templates.joi/static/large.png
@@ -57,7 +61,9 @@ share/examples/bins/templates.joi/static/medium.png
 share/examples/bins/templates.joi/static/mediumActive.png
 share/examples/bins/templates.joi/static/meshman.css
 share/examples/bins/templates.joi/static/next.png
+share/examples/bins/templates.joi/static/nextInactive.png
 share/examples/bins/templates.joi/static/prev.png
+share/examples/bins/templates.joi/static/prevInactive.png
 share/examples/bins/templates.joi/static/preview.js
 share/examples/bins/templates.joi/static/small.png
 share/examples/bins/templates.joi/static/smallActive.png
diff --git a/www/bins/distinfo b/www/bins/distinfo
index f6eb6e55092..a4cc279088e 100644
--- a/www/bins/distinfo
+++ b/www/bins/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/10/19 18:16:40 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2002/10/26 19:38:12 dmcmahill Exp $
 
-SHA1 (bins-1.1.17.tar.bz2) = d493f19e90a3959244fd799b52485f3c3f479040
-Size (bins-1.1.17.tar.bz2) = 135718 bytes
-SHA1 (patch-aa) = 4b8462d133f55af9c927786b9957398427a122d7
-SHA1 (patch-ab) = e0150b689057e09641c9f87f75cf0da99f20bbe6
+SHA1 (bins-1.1.18.tar.bz2) = 51e4aa38a79227bbc418c55c5e1833b8503cee57
+Size (bins-1.1.18.tar.bz2) = 140612 bytes
diff --git a/www/bins/patches/patch-aa b/www/bins/patches/patch-aa
deleted file mode 100644
index 43b4cf49e7b..00000000000
--- a/www/bins/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2002/10/19 18:16:40 dmcmahill Exp $
-
---- bins.orig	Sat Sep 21 09:50:14 2002
-+++ bins
-@@ -86,7 +86,7 @@ sub _; # alias for Getext, if present
- ############################################################################
- 
- # I18N
--my $localePath = "/usr/local/share/locale"; # Base locale path  (for I18N)
-+my $localePath = "@pkglocaledir@"; # Base locale path  (for I18N)
- 
- my $I18N = have_package("Locale::gettext");
- if ($I18N) {
-@@ -301,7 +301,7 @@ my %defaultConfig =
-    # any new options need corresponding new documentation.
- 
-    # 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
-    configFileName   => "binsrc",       # Configuration file.
-@@ -322,7 +322,7 @@ my %defaultConfig =
- # normally, you don't have to touch that...
- my $localEncoding = `locale charmap`;
- # ANSI is unspeakably primitive, keep LATIN1 instead
--if ($localEncoding && ($localEncoding ne "ANSI_X3.4-1968")) {
-+if ($? == 0 && $localEncoding && ($localEncoding ne "ANSI_X3.4-1968")) {
-   chop($localEncoding);
-   $defaultConfig{defaultEncoding} = $localEncoding;
-   beVerboseN("Forcing encoding to $localEncoding", 2);
diff --git a/www/bins/patches/patch-ab b/www/bins/patches/patch-ab
deleted file mode 100644
index ea226c3b8b5..00000000000
--- a/www/bins/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2002/09/25 00:28:27 wiz Exp $
-
-no 'locale' command on netbsd so deal with `locale charmap` not returning
-correctly.
-
---- bins_edit.orig	Sat Sep 21 09:50:14 2002
-+++ bins_edit
-@@ -42,12 +42,18 @@ use HTML::Entities;
- my $verbose = 1;
- my $html=0;
- 
--my $localEncoding = `locale charmap`;
--chop($localEncoding);
-+my $localEncoding;
-+$localEncoding = `locale charmap`;
-+if ($? != 0 ) {
-+  $localEncoding = "LATIN1";
-+}
-+else {
- if (! $localEncoding or ($localEncoding eq "ANSI_X3.4-1968")) {
-+  chop($localEncoding);
-   # ANSI is unspeakably primitive, promote it.
-   $localEncoding = "LATIN1";
-   print "Forcing encoding to $localEncoding\n" if ($verbose >=2);
-+}
- }
- my $converter = Text::Iconv->new($localEncoding, "UTF-8");
-