[pkgsrc/trunk]: pkgsrc/www/lynx Fixes Bus error with --restrictions option. ...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/684f9c84a824
branches:  trunk
changeset: 575907:684f9c84a824
user:      obache <obache%pkgsrc.org@localhost>
date:      Wed May 26 01:32:33 2010 +0000

description:
Fixes Bus error with --restrictions option.  PR#43340.
(sent and confirmed by upstream).

diffstat:

 www/lynx/Makefile         |   4 ++--
 www/lynx/distinfo         |   4 ++--
 www/lynx/patches/patch-ac |  14 +++++++++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r e21db7adb850 -r 684f9c84a824 www/lynx/Makefile
--- a/www/lynx/Makefile Tue May 25 21:06:29 2010 +0000
+++ b/www/lynx/Makefile Wed May 26 01:32:33 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2010/01/17 12:02:49 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2010/05/26 01:32:33 obache Exp $
 
 DISTNAME=      lynx2.8.7
 PKGNAME=       lynx-2.8.7
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://lynx.isc.org/${SUBDIR:Q}/ \
                ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/
diff -r e21db7adb850 -r 684f9c84a824 www/lynx/distinfo
--- a/www/lynx/distinfo Tue May 25 21:06:29 2010 +0000
+++ b/www/lynx/distinfo Wed May 26 01:32:33 2010 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2009/08/09 08:20:27 wiz Exp $
+$NetBSD: distinfo,v 1.27 2010/05/26 01:32:33 obache Exp $
 
 SHA1 (lynx2.8.7.tar.bz2) = f5e67a298322b22fe0edcfba326c02eaa5edcb72
 RMD160 (lynx2.8.7.tar.bz2) = 0969f85b6776c5e426cea4b910271356f9193bf1
 Size (lynx2.8.7.tar.bz2) = 2432045 bytes
 SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9
 SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a
-SHA1 (patch-ac) = 863e5ddac0496caa0f9611c0794ced8006897439
+SHA1 (patch-ac) = f307eb078c9efccc7322262c9a7529f147eff78b
 SHA1 (patch-af) = 79188265d998d962675e221d170042cc35182e8e
diff -r e21db7adb850 -r 684f9c84a824 www/lynx/patches/patch-ac
--- a/www/lynx/patches/patch-ac Tue May 25 21:06:29 2010 +0000
+++ b/www/lynx/patches/patch-ac Wed May 26 01:32:33 2010 +0000
@@ -1,10 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2009/08/09 08:20:27 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2010/05/26 01:32:33 obache Exp $
 
+* fixes build failure:
 LYMain.c: In function 'SetLocale':
 LYMain.c:941: error: 'LC_ALL' undeclared (first use in this function)
 LYMain.c:941: error: (Each undeclared identifier is reported only once
 LYMain.c:941: error: for each function it appears in.)
 
+* fixes PR#43340
+
 --- src/LYMain.c.orig  2009-07-05 23:52:33.000000000 +0000
 +++ src/LYMain.c
 @@ -57,7 +57,7 @@
@@ -16,3 +19,12 @@
  #undef gettext                        /* Solaris locale.h prototypes gettext() */
  #include <locale.h>
  #ifndef HAVE_GETTEXT
+@@ -3079,7 +3079,7 @@ G)oto's" },
+               if (first) {
+                   printf("Other restrictions (see the user's guide):\n");
+               }
+-              value = show_restriction(table[j].name);
++              value = show_restriction(name);
+               printf("%s%s (%s)", column ? ", " : "  ", name, value);
+               column += 5 + strlen(name) + strlen(value);
+               if (column > 50) {