Wed May 26 01:32:34 2010 UTC ()
Fixes Bus error with --restrictions option.  PR#43340.
(sent and confirmed by upstream).


(obache)
diff -r1.107 -r1.108 pkgsrc/www/lynx/Makefile
diff -r1.26 -r1.27 pkgsrc/www/lynx/distinfo
diff -r1.3 -r1.4 pkgsrc/www/lynx/patches/patch-ac
cvs diff -r1.107 -r1.108 pkgsrc/www/lynx/Makefile (switch to unified diff)

--- pkgsrc/www/lynx/Makefile 2010/01/17 12:02:49 1.107
+++ pkgsrc/www/lynx/Makefile 2010/05/26 01:32:33 1.108
@@ -1,77 +1,77 @@ @@ -1,77 +1,77 @@
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
3DISTNAME= lynx2.8.7 3DISTNAME= lynx2.8.7
4PKGNAME= lynx-2.8.7 4PKGNAME= lynx-2.8.7
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://lynx.isc.org/${SUBDIR:Q}/ \ 7MASTER_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}/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://lynx.isc.org/ 12HOMEPAGE= http://lynx.isc.org/
13COMMENT= Alphanumeric display oriented World-Wide Web Client 13COMMENT= Alphanumeric display oriented World-Wide Web Client
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16# problem with WWW/Library/Implementation 16# problem with WWW/Library/Implementation
17MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
18 18
19PKG_INSTALLATION_TYPES= overwrite pkgviews 19PKG_INSTALLATION_TYPES= overwrite pkgviews
20PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
21 21
22SUBDIR= ${DISTNAME} 22SUBDIR= ${DISTNAME}
23WRKSRC= ${WRKDIR}/lynx2-8-7 23WRKSRC= ${WRKDIR}/lynx2-8-7
24USE_PKGLOCALEDIR= yes 24USE_PKGLOCALEDIR= yes
25GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
26BROKEN_GETTEXT_DETECTION= yes 26BROKEN_GETTEXT_DETECTION= yes
27INSTALL_TARGET= install-full 27INSTALL_TARGET= install-full
28MAKE_FILE= makefile 28MAKE_FILE= makefile
29 29
30CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q} 30CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q}
31CONFIGURE_ENV+= UNZIP=${TOOLS_PATH.unzip:Q} 31CONFIGURE_ENV+= UNZIP=${TOOLS_PATH.unzip:Q}
32USE_TOOLS+= gzip msgfmt unzip:run 32USE_TOOLS+= gzip msgfmt unzip:run
33 33
34CONF_FILES+= share/examples/lynx/lynx.cfg ${PKG_SYSCONFDIR}/lynx.cfg 34CONF_FILES+= share/examples/lynx/lynx.cfg ${PKG_SYSCONFDIR}/lynx.cfg
35CONF_FILES+= share/examples/lynx/lynx.lss ${PKG_SYSCONFDIR}/lynx.lss 35CONF_FILES+= share/examples/lynx/lynx.lss ${PKG_SYSCONFDIR}/lynx.lss
36 36
37# But no dependency on Perl. 37# But no dependency on Perl.
38REPLACE_PERL+= samples/mailto-form.pl 38REPLACE_PERL+= samples/mailto-form.pl
39CHECK_INTERPRETER_SKIP+= share/lynx/lynx_doc/samples/mailto-form.pl 39CHECK_INTERPRETER_SKIP+= share/lynx/lynx_doc/samples/mailto-form.pl
40 40
41.include "options.mk" 41.include "options.mk"
42 42
43# For nls/gettext 43# For nls/gettext
44CONFIGURE_ARGS+= --enable-nls 44CONFIGURE_ARGS+= --enable-nls
45CONFIGURE_ARGS+= --with-nls-datadir=${PREFIX}/${PKGLOCALEDIR} 45CONFIGURE_ARGS+= --with-nls-datadir=${PREFIX}/${PKGLOCALEDIR}
46CONFIGURE_ARGS+= --without-included-gettext 46CONFIGURE_ARGS+= --without-included-gettext
47 47
48# With SSL, lynx can get https:// and snews:// URL's. 48# With SSL, lynx can get https:// and snews:// URL's.
49CONFIGURE_ARGS+= --with-ssl 49CONFIGURE_ARGS+= --with-ssl
50 50
51# Note: --enable-{default-colors,scrollbar} are simply ignored 51# Note: --enable-{default-colors,scrollbar} are simply ignored
52# for certain settings of --with-screen. 52# for certain settings of --with-screen.
53CONFIGURE_ARGS+= --with-screen=${SCREENTYPE:Q} 53CONFIGURE_ARGS+= --with-screen=${SCREENTYPE:Q}
54CONFIGURE_ARGS+= --enable-default-colors 54CONFIGURE_ARGS+= --enable-default-colors
55CONFIGURE_ARGS+= --enable-scrollbar 55CONFIGURE_ARGS+= --enable-scrollbar
56 56
57# Install gzip'ed help files to ${PREFIX}/share/lynx 57# Install gzip'ed help files to ${PREFIX}/share/lynx
58CONFIGURE_ARGS+= --datadir="${PREFIX}/share/lynx" 58CONFIGURE_ARGS+= --datadir="${PREFIX}/share/lynx"
59CONFIGURE_ARGS+= --enable-gzip-help --with-zlib 59CONFIGURE_ARGS+= --enable-gzip-help --with-zlib
60 60
61# Miscellaneous 61# Miscellaneous
62CONFIGURE_ARGS+= --enable-externs 62CONFIGURE_ARGS+= --enable-externs
63CONFIGURE_ARGS+= --enable-source-cache 63CONFIGURE_ARGS+= --enable-source-cache
64CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 64CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
65 65
66# Experimental features 66# Experimental features
67CONFIGURE_ARGS+= --enable-file-upload 67CONFIGURE_ARGS+= --enable-file-upload
68CONFIGURE_ARGS+= --enable-justify-elts 68CONFIGURE_ARGS+= --enable-justify-elts
69CONFIGURE_ARGS+= --enable-kbd-layout 69CONFIGURE_ARGS+= --enable-kbd-layout
70CONFIGURE_ARGS+= --enable-nested-tables 70CONFIGURE_ARGS+= --enable-nested-tables
71CONFIGURE_ARGS+= --enable-prettysrc 71CONFIGURE_ARGS+= --enable-prettysrc
72CONFIGURE_ARGS+= --enable-read-eta 72CONFIGURE_ARGS+= --enable-read-eta
73 73
74.include "../../devel/gettext-lib/buildlink3.mk" 74.include "../../devel/gettext-lib/buildlink3.mk"
75.include "../../devel/zlib/buildlink3.mk" 75.include "../../devel/zlib/buildlink3.mk"
76.include "../../security/openssl/buildlink3.mk" 76.include "../../security/openssl/buildlink3.mk"
77.include "../../mk/bsd.pkg.mk" 77.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/www/lynx/distinfo (switch to unified diff)

--- pkgsrc/www/lynx/distinfo 2009/08/09 08:20:27 1.26
+++ pkgsrc/www/lynx/distinfo 2010/05/26 01:32:33 1.27
@@ -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
3SHA1 (lynx2.8.7.tar.bz2) = f5e67a298322b22fe0edcfba326c02eaa5edcb72 3SHA1 (lynx2.8.7.tar.bz2) = f5e67a298322b22fe0edcfba326c02eaa5edcb72
4RMD160 (lynx2.8.7.tar.bz2) = 0969f85b6776c5e426cea4b910271356f9193bf1 4RMD160 (lynx2.8.7.tar.bz2) = 0969f85b6776c5e426cea4b910271356f9193bf1
5Size (lynx2.8.7.tar.bz2) = 2432045 bytes 5Size (lynx2.8.7.tar.bz2) = 2432045 bytes
6SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9 6SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9
7SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a 7SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a
8SHA1 (patch-ac) = 863e5ddac0496caa0f9611c0794ced8006897439 8SHA1 (patch-ac) = f307eb078c9efccc7322262c9a7529f147eff78b
9SHA1 (patch-af) = 79188265d998d962675e221d170042cc35182e8e 9SHA1 (patch-af) = 79188265d998d962675e221d170042cc35182e8e
cvs diff -r1.3 -r1.4 pkgsrc/www/lynx/patches/Attic/patch-ac (switch to unified diff)

--- pkgsrc/www/lynx/patches/Attic/patch-ac 2009/08/09 08:20:27 1.3
+++ pkgsrc/www/lynx/patches/Attic/patch-ac 2010/05/26 01:32:33 1.4
@@ -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:
3LYMain.c: In function 'SetLocale': 4LYMain.c: In function 'SetLocale':
4LYMain.c:941: error: 'LC_ALL' undeclared (first use in this function) 5LYMain.c:941: error: 'LC_ALL' undeclared (first use in this function)
5LYMain.c:941: error: (Each undeclared identifier is reported only once 6LYMain.c:941: error: (Each undeclared identifier is reported only once
6LYMain.c:941: error: for each function it appears in.) 7LYMain.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) {