CVS commit: pkgsrc/www/lynx

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 30 09:35:10 UTC 2020

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

Log Message:
lynx: Default to wide-curses. Add gnutls option.

Note that the license of this is GPLv2 with an exception for OpenSSL.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/www/lynx/Makefile
cvs rdiff -u -r1.18 -r1.19 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.135 pkgsrc/www/lynx/Makefile:1.136
--- pkgsrc/www/lynx/Makefile:1.135      Sat Jan 18 21:51:08 2020
+++ pkgsrc/www/lynx/Makefile    Thu Apr 30 09:35:09 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.135 2020/01/18 21:51:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.136 2020/04/30 09:35:09 nia Exp $
 
 DISTNAME=      lynx2.8.9rel.1
 PKGNAME=       ${DISTNAME:S/lynx/lynx-/:S/rel//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  https://invisible-mirror.net/archives/lynx/tarballs/
 MASTER_SITES+= ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.bz2
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://lynx.invisible-island.net/
 COMMENT=       Alphanumeric display oriented World-Wide Web Client
-LICENSE=       gnu-gpl-v2
+LICENSE=       gnu-gpl-v2 # OpenSSL exception
 
 # problem with WWW/Library/Implementation
 MAKE_JOBS_SAFE=                no
@@ -41,10 +41,6 @@ CONFIGURE_ARGS+=     --enable-nls
 CONFIGURE_ARGS+=       --with-nls-datadir=${PREFIX}/${PKGLOCALEDIR}
 CONFIGURE_ARGS+=       --without-included-gettext
 
-# With SSL, lynx can get https:// and snews:// URL's.
-CONFIGURE_ARGS+=       --with-ssl
-CPPFLAGS+=             -I${BUILDLINK_PREFIX.openssl}/include/openssl
-
 # Note: --enable-{default-colors,scrollbar} are simply ignored
 # for certain settings of --with-screen.
 CONFIGURE_ARGS+=       --with-screen=${SCREENTYPE:Q}
@@ -77,5 +73,4 @@ CONFIGURE_ENV.SunOS+= cf_cv_xopen_source
 .include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/lynx/options.mk
diff -u pkgsrc/www/lynx/options.mk:1.18 pkgsrc/www/lynx/options.mk:1.19
--- pkgsrc/www/lynx/options.mk:1.18     Mon Nov  4 22:09:57 2019
+++ pkgsrc/www/lynx/options.mk  Thu Apr 30 09:35:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2019/11/04 22:09:57 rillig Exp $
+# $NetBSD: options.mk,v 1.19 2020/04/30 09:35:09 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS= inet6
@@ -6,11 +6,14 @@ PKG_SUPPORTED_OPTIONS=        inet6
 PKG_OPTIONS_OPTIONAL_GROUPS=   socksproxy
 PKG_OPTIONS_GROUP.socksproxy=  dante socks4
 
+PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
+PKG_OPTIONS_GROUP.ssl=         gnutls openssl
+
 PKG_OPTIONS_REQUIRED_GROUPS=   screen
 PKG_OPTIONS_GROUP.screen=      curses wide-curses slang
 PKG_OPTIONS_LEGACY_OPTS+=      ncurses:curses ncursesw:wide-curses
 
-PKG_SUGGESTED_OPTIONS= curses inet6
+PKG_SUGGESTED_OPTIONS=         inet6 openssl wide-curses
 
 .include "../../mk/bsd.options.mk"
 
@@ -59,3 +62,17 @@ CONFIGURE_ARGS+=     --with-socks
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 .endif
+
+
+###
+### TLS support
+###
+.if !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+=       --with-gnutls=${BUILDLINK_PREFIX.gnutls}
+.  include "../../security/gnutls/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mopenssl)
+CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
+.  include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-ssl
+.endif