summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/lynx/Makefile5
-rw-r--r--www/lynx/options.mk10
2 files changed, 8 insertions, 7 deletions
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index c0a2d603e36..a898200b279 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2021/12/08 16:06:58 adam Exp $
+# $NetBSD: Makefile,v 1.142 2022/07/23 14:41:52 wiz Exp $
DISTNAME= lynx2.8.9rel.1
PKGNAME= ${DISTNAME:S/lynx/lynx-/:S/rel//}
@@ -25,7 +25,7 @@ MAKE_FILE= makefile
CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q}
CONFIGURE_ENV+= UNZIP=${TOOLS_PATH.unzip:Q}
-USE_TOOLS+= gzip msgfmt msginit unzip:run
+USE_TOOLS+= gzip msgfmt unzip:run
CONF_FILES+= share/examples/lynx/lynx.cfg ${PKG_SYSCONFDIR}/lynx.cfg
CONF_FILES+= share/examples/lynx/lynx.lss ${PKG_SYSCONFDIR}/lynx.lss
@@ -33,6 +33,7 @@ CONF_FILES+= share/examples/lynx/lynx.lss ${PKG_SYSCONFDIR}/lynx.lss
# But no dependency on Perl.
REPLACE_PERL+= samples/mailto-form.pl
CHECK_INTERPRETER_SKIP+= share/lynx/lynx_doc/samples/mailto-form.pl
+CHECK_WRKREF_SKIP+= bin/lynx
.include "options.mk"
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index 7dbd7ceb0e2..99465a9018c 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.19 2020/04/30 09:35:09 nia Exp $
+# $NetBSD: options.mk,v 1.20 2022/07/23 14:41:52 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.lynx
PKG_SUPPORTED_OPTIONS= inet6
-PKG_OPTIONS_OPTIONAL_GROUPS= socksproxy
+PKG_OPTIONS_OPTIONAL_GROUPS+= socksproxy
PKG_OPTIONS_GROUP.socksproxy= dante socks4
-PKG_OPTIONS_OPTIONAL_GROUPS= ssl
+PKG_OPTIONS_OPTIONAL_GROUPS+= ssl
PKG_OPTIONS_GROUP.ssl= gnutls openssl
-PKG_OPTIONS_REQUIRED_GROUPS= screen
+PKG_OPTIONS_REQUIRED_GROUPS+= screen
PKG_OPTIONS_GROUP.screen= curses wide-curses slang
PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses
@@ -21,7 +21,7 @@ PKG_SUGGESTED_OPTIONS= inet6 openssl wide-curses
### We can't compile support for both the "slang" screen library and
### SOCKS support.
###
-.if !empty(PKG_OPTIONS:Mslang) && !empty(PKG_OPTIONS:Msocks*)
+.if !empty(PKG_OPTIONS:Mslang) && ${PKG_OPTIONS:Msocks*}
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" \