Wed Jan 4 14:49:38 2017 UTC ()
Use curses framework.


(roy)
diff -r1.124 -r1.125 pkgsrc/www/lynx/Makefile
diff -r1.16 -r1.17 pkgsrc/www/lynx/options.mk
cvs diff -r1.124 -r1.125 pkgsrc/www/lynx/Makefile (expand / switch to unified diff)

--- pkgsrc/www/lynx/Makefile 2016/12/22 17:30:51 1.124
+++ pkgsrc/www/lynx/Makefile 2017/01/04 14:49:38 1.125
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.124 2016/12/22 17:30:51 sevan Exp $ 1# $NetBSD: Makefile,v 1.125 2017/01/04 14:49:38 roy Exp $
2 2
3DISTNAME= lynx2.8.8rel.2 3DISTNAME= lynx2.8.8rel.2
4PKGNAME= ${DISTNAME:S/lynx/lynx-/:S/rel//} 4PKGNAME= ${DISTNAME:S/lynx/lynx-/:S/rel//}
5PKGREVISION= 6 5PKGREVISION= 7
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
cvs diff -r1.16 -r1.17 pkgsrc/www/lynx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/lynx/options.mk 2015/09/30 08:25:37 1.16
+++ pkgsrc/www/lynx/options.mk 2017/01/04 14:49:38 1.17
@@ -1,69 +1,55 @@ @@ -1,69 +1,55 @@
1# $NetBSD: options.mk,v 1.16 2015/09/30 08:25:37 tnn Exp $ 1# $NetBSD: options.mk,v 1.17 2017/01/04 14:49:38 roy Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.lynx 3PKG_OPTIONS_VAR= PKG_OPTIONS.lynx
4PKG_SUPPORTED_OPTIONS= inet6 4PKG_SUPPORTED_OPTIONS= inet6
5 5
6PKG_OPTIONS_OPTIONAL_GROUPS= socksproxy 6PKG_OPTIONS_OPTIONAL_GROUPS= socksproxy
7PKG_OPTIONS_GROUP.socksproxy= dante socks4 7PKG_OPTIONS_GROUP.socksproxy= dante socks4
8 8
9PKG_OPTIONS_REQUIRED_GROUPS= screen 9PKG_OPTIONS_REQUIRED_GROUPS= screen
10PKG_OPTIONS_GROUP.screen= ncurses ncursesw slang curses 10PKG_OPTIONS_GROUP.screen= curses wide-curses slang
 11PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses
11 12
12PKG_SUGGESTED_OPTIONS= curses inet6 13PKG_SUGGESTED_OPTIONS= curses inet6
13 14
14.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
15 16
16### 17###
17### We can't compile support for both the "slang" screen library and 18### We can't compile support for both the "slang" screen library and
18### SOCKS support. 19### SOCKS support.
19### 20###
20.if !empty(PKG_OPTIONS:Mslang) && !empty(PKG_OPTIONS:Msocks*) 21.if !empty(PKG_OPTIONS:Mslang) && !empty(PKG_OPTIONS:Msocks*)
21PKG_FAIL_REASON+= "SOCKS may not be enabled together with the \"slang\"" \ 22PKG_FAIL_REASON+= "SOCKS may not be enabled together with the \"slang\"" \
22 "screen library. If SOCKS support is desired," \ 23 "screen library. If SOCKS support is desired," \
23 "please change ${PKG_OPTIONS_VAR} to include" \ 24 "please change ${PKG_OPTIONS_VAR} to include" \
24 "\"curses\" or \"ncurses\" instead." 25 "\"curses\" instead."
25.endif 26.endif
26 27
27### 28###
28### Set the screen library to "slang", "ncurses", or plain "curses". 29### Set the screen library to "curses". "wide-curses" or "slang"
29### 30###
 31.if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
 32CONFIGURE_ARGS+= --enable-color-style
 33SCREENTYPE= ${CURSES_TYPE}
 34. include "../../mk/curses.buildlink3.mk"
 35.endif
30.if !empty(PKG_OPTIONS:Mslang) 36.if !empty(PKG_OPTIONS:Mslang)
31SCREENTYPE= slang 37SCREENTYPE= slang
32. include "../../devel/libslang/buildlink3.mk" 38. include "../../devel/libslang/buildlink3.mk"
33post-install: 39post-install:
34 ${INSTALL_DATA} ${WRKSRC}/samples/lynx.lss \ 40 ${INSTALL_DATA} ${WRKSRC}/samples/lynx.lss \
35 ${DESTDIR}${PREFIX}/share/examples/lynx/lynx.lss 41 ${DESTDIR}${PREFIX}/share/examples/lynx/lynx.lss
36.endif 42.endif
37.if !empty(PKG_OPTIONS:Mncurses) 
38SCREENTYPE= ncurses 
39USE_NCURSES= YES # color 
40. include "../../devel/ncurses/buildlink3.mk" 
41CONFIGURE_ARGS+= --enable-color-style 
42.endif 
43.if !empty(PKG_OPTIONS:Mncursesw) 
44SCREENTYPE= ncursesw 
45LIBS+= -lncursesw 
46BUILDLINK_ABI_DEPENDS.ncursesw+= ncursesw>=5.9nb1 
47. include "../../devel/ncursesw/buildlink3.mk" 
48CONFIGURE_ARGS+= --enable-color-style 
49.endif 
50.if !empty(PKG_OPTIONS:Mcurses) 
51SCREENTYPE= curses 
52. include "../../mk/curses.buildlink3.mk" 
53. if !empty(MACHINE_PLATFORM:MNetBSD-1.[56]*-i386) 
54CONFIGURE_ARGS+= --enable-color-style 
55. endif 
56.endif 
57 43
58### 44###
59### SOCKS support 45### SOCKS support
60### 46###
61.if !empty(PKG_OPTIONS:Msocks4) 47.if !empty(PKG_OPTIONS:Msocks4)
62CONFIGURE_ARGS+= --with-socks 48CONFIGURE_ARGS+= --with-socks
63. include "../../net/socks4/buildlink3.mk" 49. include "../../net/socks4/buildlink3.mk"
64.endif 50.endif
65.if !empty(PKG_OPTIONS:Mdante) 51.if !empty(PKG_OPTIONS:Mdante)
66CONFIGURE_ARGS+= --with-socks 52CONFIGURE_ARGS+= --with-socks
67. include "../../net/dante/buildlink3.mk" 53. include "../../net/dante/buildlink3.mk"
68.endif 54.endif
69 55