NetBSD Problem Report #49200
From www@NetBSD.org Fri Sep 12 17:46:54 2014
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
by mollari.NetBSD.org (Postfix) with ESMTPS id 11BC2CD6DB
for <gnats-bugs@gnats.NetBSD.org>; Fri, 12 Sep 2014 17:46:54 +0000 (UTC)
Message-Id: <20140912174652.38447CD740@mollari.NetBSD.org>
Date: Fri, 12 Sep 2014 17:46:52 +0000 (UTC)
From: lems@mailbox.org
Reply-To: lems@mailbox.org
To: gnats-bugs@NetBSD.org
Subject: www/lynx: enable wide-char support
X-Send-Pr-Version: www-1.0
>Number: 49200
>Category: pkg
>Synopsis: www/lynx: enable wide-char support
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Fri Sep 12 17:50:00 +0000 2014
>Closed-Date: Fri Sep 12 21:29:41 +0000 2014
>Last-Modified: Fri Sep 12 21:30:01 +0000 2014
>Originator: Leonard Schmidt
>Release: NetBSD 7.99.1 with pkgsrc -current as of today (20140912)
>Organization:
>Environment:
NetBSD zettel.klingsor.lan 7.99.1 NetBSD 7.99.1 (GENERIC) #0: Fri Sep 12 14:50:58 CEST 2014 root@zettel.klingsor.lan:/usr/obj/sys/arch/amd64/compile/GENERIC amd64
>Description:
Hello,
the lynx package has an ncursesw option, but --with-screen=ncurses is used, not ncursesw. I also had to patch a file (src/LYStrings.c) because it did not know about strnames or so. No idea if the patch is correct, it worked for me, lynx finally displays umlauts and unicode characters correctly.
Leonard
>How-To-Repeat:
>Fix:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/lynx/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo 12 Mar 2014 10:13:15 -0000 1.30
+++ distinfo 12 Sep 2014 17:19:45 -0000
@@ -5,4 +5,5 @@ RMD160 (lynx2.8.8rel.2.tar.bz2) = a683f9
Size (lynx2.8.8rel.2.tar.bz2) = 2587120 bytes
SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9
SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a
+SHA1 (patch-ac) = 598cea75484ecffb71b6f150a186c062701ce35a
SHA1 (patch-af) = 31399c0c3394b90c0680708fff06f6f9e19674b3
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/lynx/options.mk,v
retrieving revision 1.13
diff -u -p -r1.13 options.mk
--- options.mk 12 Jun 2012 15:46:04 -0000 1.13
+++ options.mk 12 Sep 2014 17:19:45 -0000
@@ -41,7 +41,7 @@ USE_NCURSES= YES # color
CONFIGURE_ARGS+= --enable-color-style
.endif
.if !empty(PKG_OPTIONS:Mncursesw)
-SCREENTYPE= ncurses
+SCREENTYPE= ncursesw
LIBS+= -lncursesw
. include "../../devel/ncursesw/buildlink3.mk"
CONFIGURE_ARGS+= --enable-color-style
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ac 12 Sep 2014 17:19:45 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/LYStrings.c.orig 2013-11-29 00:52:56.000000000 +0000
++++ src/LYStrings.c
+@@ -40,6 +40,10 @@
+ #include <LYrcFile.h>
+ #endif
+
++#ifdef NCURSES
++#include <ncurses/term.h>
++#endif
++
+ #include <LYShowInfo.h>
+ #include <LYLeaks.h>
+
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Fri, 12 Sep 2014 21:29:41 +0000
State-Changed-Why:
Committed, thank you!
From: "Thomas Klausner" <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/49200 CVS commit: pkgsrc/www/lynx
Date: Fri, 12 Sep 2014 21:29:22 +0000
Module Name: pkgsrc
Committed By: wiz
Date: Fri Sep 12 21:29:22 UTC 2014
Modified Files:
pkgsrc/www/lynx: distinfo options.mk
Added Files:
pkgsrc/www/lynx/patches: patch-src_LYStrings.c
Log Message:
Correct and fix build with ncursesw.
From Leonard Schmidt in PR 49200.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/www/lynx/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/lynx/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/lynx/patches/patch-src_LYStrings.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2014
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.