4 files changed, 46 insertions, 49 deletions

diff --git a/www/bins/Makefile b/www/bins/Makefile
index ea6f042024e..7316528e797 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/09/13 17:58:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/24 02:01:29 dmcmahill Exp $
 #
 
-DISTNAME=	bins-1.1.15
-PKGREVISION=	1
+DISTNAME=	bins-1.1.17
 CATEGORIES=	www graphics
 MASTER_SITES=	http://jsautret.free.fr/BINS/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/bins/distinfo b/www/bins/distinfo
index 62b01b105d1..705ba5f4231 100644
--- a/www/bins/distinfo
+++ b/www/bins/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/09/13 17:58:26 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/09/24 02:01:29 dmcmahill Exp $
 
-SHA1 (bins-1.1.15.tar.bz2) = c07631718436b1e1e577dbc5c4804331582d7b7e
-Size (bins-1.1.15.tar.bz2) = 118221 bytes
-SHA1 (patch-aa) = d0dd6b07207d5b0e71fab7953fb5372af927d9b8
-SHA1 (patch-ab) = 3507afb9e5e709642f18454f4b5737b4abd6d99a
+SHA1 (bins-1.1.17.tar.bz2) = d493f19e90a3959244fd799b52485f3c3f479040
+Size (bins-1.1.17.tar.bz2) = 135718 bytes
+SHA1 (patch-aa) = ea3bd4353b1834374b065af1224bcbdfeb4f7d2d
+SHA1 (patch-ab) = 6fdeb381b0aa1adabe7e0a8a0b1ff440a40d9a46
diff --git a/www/bins/patches/patch-aa b/www/bins/patches/patch-aa
index 1c18e5bf7e2..5197664e652 100644
--- a/www/bins/patches/patch-aa
+++ b/www/bins/patches/patch-aa
@@ -1,8 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2002/08/31 04:34:22 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2002/09/24 02:01:30 dmcmahill Exp $
 
---- bins.orig	Sat Aug 24 11:31:58 2002
+
+no 'locale' command on netbsd so deal with `locale charmap` not returning
+correctly.
+
+--- bins.orig	Sat Sep 21 09:50:14 2002
 +++ bins
-@@ -275,7 +275,7 @@ my %defaultConfig =
+@@ -301,7 +301,7 @@ my %defaultConfig =
     # any new options need corresponding new documentation.
  
     # The following parameters cannot be set in config files for now :
@@ -11,26 +15,12 @@ $NetBSD: patch-aa,v 1.5 2002/08/31 04:34:22 dmcmahill Exp $
                                         # configuration directory.
     userConfigDir    => "~/.bins",      # User configuration directory
     configFileName   => "binsrc",       # Configuration file.
-@@ -294,14 +294,15 @@ my %defaultConfig =
- 
- );
- 
--# normally, you don't have to touch that...
--my $localEncoding = `locale charmap`;
-+# XXX no "locale" command in NetBSD
-+# # normally, you don't have to touch that...
-+#my $localEncoding = `locale charmap`;
+@@ -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")) {
--  chop($localEncoding);
--  $defaultConfig{defaultEncoding} = $localEncoding;
--  beVerboseN("Forcing encoding to $localEncoding", 2);
--}
-+#if ($localEncoding && ($localEncoding ne "ANSI_X3.4-1968")) {
-+#  chop($localEncoding);
-+#  $defaultConfig{defaultEncoding} = $localEncoding;
-+#  beVerboseN("Forcing encoding to $localEncoding", 2);
-+#}
- my $local2htmlConverter;
- if ($defaultConfig{defaultEncoding} ne $defaultConfig{htmlEncoding}){
-   $local2htmlConverter = Text::Iconv->new($defaultConfig{defaultEncoding},
++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
index 9b13daf9487..f0b37bc1422 100644
--- a/www/bins/patches/patch-ab
+++ b/www/bins/patches/patch-ab
@@ -1,26 +1,34 @@
-$NetBSD: patch-ab,v 1.3 2002/09/13 17:58:27 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2002/09/24 02:01:30 dmcmahill Exp $
 
---- bins_edit.orig	Sat Aug 24 17:31:58 2002
+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,13 +42,14 @@ use HTML::Entities;
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/pkg/bin/perl -w
+ 
+ #    bins_edit for BINS Photo Album version 1.1.17
+ #    Copyright (C) 2001,2002 Jérôme Sautret (Jerome@Sautret.org)
+@@ -42,12 +42,18 @@ use HTML::Entities;
  my $verbose = 1;
  my $html=0;
  
 -my $localEncoding = `locale charmap`;
 -chop($localEncoding);
--if (! $localEncoding or ($localEncoding eq "ANSI_X3.4-1968")) {
--  # ANSI is unspeakably primitive, promote it.
--  $localEncoding = "LATIN1";
--  print "Forcing encoding to $localEncoding\n" if ($verbose >=2);
--}
-+# XXX no "locale" command in NetBSD
-+#my $localEncoding = `locale charmap`;
-+#chop($localEncoding);
-+#if (! $localEncoding or ($localEncoding eq "ANSI_X3.4-1968")) {
-+#  # ANSI is unspeakably primitive, promote it.
-+my  $localEncoding = "LATIN1";
-+#  print "Forcing encoding to $localEncoding\n" if ($verbose >=2);
-+#}
++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");
  
- # decode HTML entites which doesn't exist in XML