Fixes Bus error with --restrictions option. PR#43340. (sent and confirmed by upstream).diff -r1.107 -r1.108 pkgsrc/www/lynx/Makefile
(obache)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.107 2010/01/17 12:02:49 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.108 2010/05/26 01:32:33 obache Exp $ | |
2 | 2 | |||
3 | DISTNAME= lynx2.8.7 | 3 | DISTNAME= lynx2.8.7 | |
4 | PKGNAME= lynx-2.8.7 | 4 | PKGNAME= lynx-2.8.7 | |
5 | PKGREVISION= 1 | 5 | PKGREVISION= 2 | |
6 | CATEGORIES= www | 6 | CATEGORIES= www | |
7 | MASTER_SITES= http://lynx.isc.org/${SUBDIR:Q}/ \ | 7 | MASTER_SITES= http://lynx.isc.org/${SUBDIR:Q}/ \ | |
8 | ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/ | 8 | ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/ | |
9 | EXTRACT_SUFX= .tar.bz2 | 9 | EXTRACT_SUFX= .tar.bz2 | |
10 | 10 | |||
11 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
12 | HOMEPAGE= http://lynx.isc.org/ | 12 | HOMEPAGE= http://lynx.isc.org/ | |
13 | COMMENT= Alphanumeric display oriented World-Wide Web Client | 13 | COMMENT= Alphanumeric display oriented World-Wide Web Client | |
14 | LICENSE= gnu-gpl-v2 | 14 | LICENSE= gnu-gpl-v2 | |
15 | 15 | |||
16 | # problem with WWW/Library/Implementation | 16 | # problem with WWW/Library/Implementation | |
17 | MAKE_JOBS_SAFE= no | 17 | MAKE_JOBS_SAFE= no | |
18 | 18 |
@@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.26 2009/08/09 08:20:27 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.27 2010/05/26 01:32:33 obache Exp $ | |
2 | 2 | |||
3 | SHA1 (lynx2.8.7.tar.bz2) = f5e67a298322b22fe0edcfba326c02eaa5edcb72 | 3 | SHA1 (lynx2.8.7.tar.bz2) = f5e67a298322b22fe0edcfba326c02eaa5edcb72 | |
4 | RMD160 (lynx2.8.7.tar.bz2) = 0969f85b6776c5e426cea4b910271356f9193bf1 | 4 | RMD160 (lynx2.8.7.tar.bz2) = 0969f85b6776c5e426cea4b910271356f9193bf1 | |
5 | Size (lynx2.8.7.tar.bz2) = 2432045 bytes | 5 | Size (lynx2.8.7.tar.bz2) = 2432045 bytes | |
6 | SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9 | 6 | SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9 | |
7 | SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a | 7 | SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a | |
8 | SHA1 (patch-ac) = 863e5ddac0496caa0f9611c0794ced8006897439 | 8 | SHA1 (patch-ac) = f307eb078c9efccc7322262c9a7529f147eff78b | |
9 | SHA1 (patch-af) = 79188265d998d962675e221d170042cc35182e8e | 9 | SHA1 (patch-af) = 79188265d998d962675e221d170042cc35182e8e |
@@ -1,18 +1,30 @@ | @@ -1,18 +1,30 @@ | |||
1 | $NetBSD: patch-ac,v 1.3 2009/08/09 08:20:27 wiz Exp $ | 1 | $NetBSD: patch-ac,v 1.4 2010/05/26 01:32:33 obache Exp $ | |
2 | 2 | |||
3 | * fixes build failure: | |||
3 | LYMain.c: In function 'SetLocale': | 4 | LYMain.c: In function 'SetLocale': | |
4 | LYMain.c:941: error: 'LC_ALL' undeclared (first use in this function) | 5 | LYMain.c:941: error: 'LC_ALL' undeclared (first use in this function) | |
5 | LYMain.c:941: error: (Each undeclared identifier is reported only once | 6 | LYMain.c:941: error: (Each undeclared identifier is reported only once | |
6 | LYMain.c:941: error: for each function it appears in.) | 7 | LYMain.c:941: error: for each function it appears in.) | |
7 | 8 | |||
9 | * fixes PR#43340 | |||
10 | ||||
8 | --- src/LYMain.c.orig 2009-07-05 23:52:33.000000000 +0000 | 11 | --- src/LYMain.c.orig 2009-07-05 23:52:33.000000000 +0000 | |
9 | +++ src/LYMain.c | 12 | +++ src/LYMain.c | |
10 | @@ -57,7 +57,7 @@ | 13 | @@ -57,7 +57,7 @@ | |
11 | #include <io.h> | 14 | #include <io.h> | |
12 | #endif | 15 | #endif | |
13 | 16 | |||
14 | -#if defined(LOCALE) && !defined(HAVE_LIBINTL_H) | 17 | -#if defined(LOCALE) && !defined(HAVE_LIBINTL_H) | |
15 | +#if defined(LOCALE) | 18 | +#if defined(LOCALE) | |
16 | #undef gettext /* Solaris locale.h prototypes gettext() */ | 19 | #undef gettext /* Solaris locale.h prototypes gettext() */ | |
17 | #include <locale.h> | 20 | #include <locale.h> | |
18 | #ifndef HAVE_GETTEXT | 21 | #ifndef HAVE_GETTEXT | |
22 | @@ -3079,7 +3079,7 @@ G)oto's" }, | |||
23 | if (first) { | |||
24 | printf("Other restrictions (see the user's guide):\n"); | |||
25 | } | |||
26 | - value = show_restriction(table[j].name); | |||
27 | + value = show_restriction(name); | |||
28 | printf("%s%s (%s)", column ? ", " : " ", name, value); | |||
29 | column += 5 + strlen(name) + strlen(value); | |||
30 | if (column > 50) { |