Subject: pkg/17984: www/bins port is 1.1.10, current version is 1.1.14
To: None <gnats-bugs@gnats.netbsd.org>
From: None <jaco@scrogneugneu.org>
List: netbsd-bugs
Date: 08/19/2002 01:30:47
>Number:         17984
>Category:       pkg
>Synopsis:       www/bins port is 1.1.10, current version is 1.1.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Aug 18 16:31:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Eric Jacoboni
>Release:        NetBSD 1.6F
>Organization:
None
>Environment:
System: NetBSD titine.scrogneugneu.org 1.6F NetBSD 1.6F (TITINE-$Revision: 1.502 $) #1: Tue Aug 13 23:29:28 CEST 2002 root@titine.scrogneugneu.org:/usr/src.cvsup/sys/arch/i386/compile/TITINE i386
Architecture: i386
Machine: i386
>Description:
Bins package version is still 1.1.10, but current version is 1.1.14
>How-To-Repeat:
  N/A
>Fix:
Change Makefile to read: DISTNAME=       bins-1.1.14
Also update the PKGREVISION and add a extra DEPENDS line:
DEPENDS+=       p5-HTML-Clean>=0.8:../../www/p5-HTML-Clean

Update the distinfo file:
SHA1 (bins-1.1.14.tar.bz2) = 3e3a97e3790aa300cc278b3234334297f8b4972b
Size (bins-1.1.14.tar.bz2) = 116489 bytes
SHA1 (patch-aa) = e0c139ac78dd50ed69df7f6fcc7c1a1b20d0dc0f
SHA1 (patch-ab) = 34978d254c52bbe0c14720e977aa70650756c12a

Change the two patch files :

patch-aa:

--- bins.orig   Mon Aug 19 01:04:31 2002
+++ bins        Mon Aug 19 01:10:17 2002
@@ -258,7 +258,7 @@
    # 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.
@@ -277,13 +277,14 @@

 );

+# XXX no "locale" command in NetBSD
 # normally, you don't have to touch that...
-my $localEncoding = `locale charmap`;
+# 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")) {
+#  $defaultConfig{defaultEncoding} = $localEncoding;
+#  beVerboseN("Forcing encoding to $localEncoding", 2);
+# }
 my $local2htmlConverter;
 if ($defaultConfig{defaultEncoding} ne $defaultConfig{htmlEncoding}){
   $local2htmlConverter = Text::Iconv->new($defaultConfig{defaultEncoding},


patch-ab:

--- bins_edit.orig      Mon Aug 19 01:12:37 2002
+++ bins_edit   Mon Aug 19 01:13:41 2002
@@ -42,12 +42,13 @@
 my $verbose = 1;
 my $html=0;

-my $localEncoding = `locale charmap`;
-if (! $localEncoding or ($localEncoding eq "ANSI_X3.4-1968")) {
+# 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.
-  $localEncoding = "LATIN1";
-  print "Forcing encoding to $localEncoding\n" if ($verbose >=2);
-}
+#  $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

>Release-Note:
>Audit-Trail:
>Unformatted: