CVS commit: pkgsrc/www/lynx

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Wed Jan  4 14:49:38 UTC 2017

Modified Files:
        pkgsrc/www/lynx: Makefile options.mk

Log Message:
Use curses framework.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 pkgsrc/www/lynx/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/lynx/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/lynx/Makefile
diff -u pkgsrc/www/lynx/Makefile:1.124 pkgsrc/www/lynx/Makefile:1.125
--- pkgsrc/www/lynx/Makefile:1.124      Thu Dec 22 17:30:51 2016
+++ pkgsrc/www/lynx/Makefile    Wed Jan  4 14:49:38 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.124 2016/12/22 17:30:51 sevan Exp $
+# $NetBSD: Makefile,v 1.125 2017/01/04 14:49:38 roy Exp $
 
 DISTNAME=      lynx2.8.8rel.2
 PKGNAME=       ${DISTNAME:S/lynx/lynx-/:S/rel//}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    www
 MASTER_SITES=  http://lynx.isc.org/${SUBDIR:Q}/ \
                ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/

Index: pkgsrc/www/lynx/options.mk
diff -u pkgsrc/www/lynx/options.mk:1.16 pkgsrc/www/lynx/options.mk:1.17
--- pkgsrc/www/lynx/options.mk:1.16     Wed Sep 30 08:25:37 2015
+++ pkgsrc/www/lynx/options.mk  Wed Jan  4 14:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.17 2017/01/04 14:49:38 roy Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS= inet6
@@ -7,7 +7,8 @@ PKG_OPTIONS_OPTIONAL_GROUPS=    socksproxy
 PKG_OPTIONS_GROUP.socksproxy=  dante socks4
 
 PKG_OPTIONS_REQUIRED_GROUPS=   screen
-PKG_OPTIONS_GROUP.screen=      ncurses ncursesw slang curses
+PKG_OPTIONS_GROUP.screen=      curses wide-curses slang
+PKG_OPTIONS_LEGACY_OPTS+=      ncurses:curses ncursesw:wide-curses
 
 PKG_SUGGESTED_OPTIONS= curses inet6
 
@@ -21,12 +22,17 @@ PKG_SUGGESTED_OPTIONS=      curses inet6
 PKG_FAIL_REASON+=      "SOCKS may not be enabled together with the \"slang\"" \
                        "screen library.  If SOCKS support is desired," \
                        "please change ${PKG_OPTIONS_VAR} to include" \
-                       "\"curses\" or \"ncurses\" instead."
+                       "\"curses\" instead."
 .endif
 
 ###
-### Set the screen library to "slang", "ncurses", or plain "curses".
+### Set the screen library to "curses". "wide-curses" or "slang"
 ###
+.if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
+CONFIGURE_ARGS+=       --enable-color-style
+SCREENTYPE=            ${CURSES_TYPE}
+.  include "../../mk/curses.buildlink3.mk"
+.endif
 .if !empty(PKG_OPTIONS:Mslang)
 SCREENTYPE=            slang
 .  include "../../devel/libslang/buildlink3.mk"
@@ -34,26 +40,6 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/samples/lynx.lss \
                ${DESTDIR}${PREFIX}/share/examples/lynx/lynx.lss
 .endif
-.if !empty(PKG_OPTIONS:Mncurses)
-SCREENTYPE=            ncurses
-USE_NCURSES=           YES # color
-.  include "../../devel/ncurses/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-color-style
-.endif
-.if !empty(PKG_OPTIONS:Mncursesw)
-SCREENTYPE=            ncursesw
-LIBS+=                 -lncursesw
-BUILDLINK_ABI_DEPENDS.ncursesw+=       ncursesw>=5.9nb1
-.  include "../../devel/ncursesw/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-color-style
-.endif
-.if !empty(PKG_OPTIONS:Mcurses)
-SCREENTYPE=            curses
-.  include "../../mk/curses.buildlink3.mk"
-.  if !empty(MACHINE_PLATFORM:MNetBSD-1.[56]*-i386)
-CONFIGURE_ARGS+=       --enable-color-style
-.  endif
-.endif
 
 ###
 ### SOCKS support