4 files changed, 36 insertions, 30 deletions
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 99c338d37fc..08ba7b6978e 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/08/24 11:24:55 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/31 04:34:21 dmcmahill Exp $
 #
 
-DISTNAME=	bins-1.1.14
+DISTNAME=	bins-1.1.15
 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 4653dfab35f..1081e0d8700 100644
--- a/www/bins/distinfo
+++ b/www/bins/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/08/24 11:24:55 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2002/08/31 04:34:22 dmcmahill Exp $
 
-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
+SHA1 (bins-1.1.15.tar.bz2) = c07631718436b1e1e577dbc5c4804331582d7b7e
+Size (bins-1.1.15.tar.bz2) = 118221 bytes
+SHA1 (patch-aa) = d0dd6b07207d5b0e71fab7953fb5372af927d9b8
+SHA1 (patch-ab) = a36d3e78e8b4d1f1f1574cbf6a2c1aff76b6c0dd
diff --git a/www/bins/patches/patch-aa b/www/bins/patches/patch-aa
index d4fd07be5dd..1c18e5bf7e2 100644
--- a/www/bins/patches/patch-aa
+++ b/www/bins/patches/patch-aa
@@ -1,31 +1,36 @@
-$NetBSD: patch-aa,v 1.4 2002/08/24 11:24:56 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2002/08/31 04:34:22 dmcmahill Exp $
 
---- bins.orig	Mon Aug 19 01:04:31 2002
-+++ bins	Mon Aug 19 01:04:31 2002
-@@ -259,5 +259,5 @@
+--- bins.orig	Sat Aug 24 11:31:58 2002
++++ bins
+@@ -275,7 +275,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
-@@ -278,11 +278,12 @@
+    configFileName   => "binsrc",       # Configuration file.
+@@ -294,14 +294,15 @@ my %defaultConfig =
+ 
  );
  
 -# normally, you don't have to touch that...
 -my $localEncoding = `locale charmap`;
--# ANSI is unspeakably primitive, keep LATIN1 instead
++# XXX no "locale" command in NetBSD
++# # 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);
 -}
-+# XXX no "locale" command in NetBSD
-+# # 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")) {
-+#   $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},
diff --git a/www/bins/patches/patch-ab b/www/bins/patches/patch-ab
index 3828aa8ecbc..acf05260293 100644
--- a/www/bins/patches/patch-ab
+++ b/www/bins/patches/patch-ab
@@ -1,24 +1,25 @@
-$NetBSD: patch-ab,v 1.1 2002/07/07 13:21:53 simonb Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/31 04:34:22 dmcmahill Exp $
 
---- bins_edit.orig	Mon Jun 10 05:54:13 2002
+--- bins_edit.orig	Sat Aug 24 11:31:58 2002
 +++ bins_edit
-@@ -42,12 +42,14 @@
+@@ -42,13 +42,14 @@ 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.
 +# XXX no "locale" command in NetBSD
-+# my $localEncoding = `locale charmap`;
-+# if (! $localEncoding or ($localEncoding eq "ANSI_X3.4-1968")) {
-+#   # ANSI is unspeakably primitive, promote it.
-+my
++#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);
 -}
-+#   print "Forcing encoding to $localEncoding\n" if ($verbose >=2);
-+# }
++#  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