Index: head/www/lynx-current/Makefile =================================================================== --- head/www/lynx-current/Makefile (revision 516748) +++ head/www/lynx-current/Makefile (revision 516749) @@ -1,65 +1,61 @@ # Created by: ache # $FreeBSD$ PORTNAME= lynx -PORTVERSION= 2.8.9d16 -PORTREVISION= 1 +PORTVERSION= 2.9.0d4 CATEGORIES= www MASTER_SITES= http://invisible-mirror.net/archives/lynx/tarballs/ \ ftp://invisible-island.net/lynx/tarballs/ PKGNAMESUFFIX= -current DISTNAME= ${PORTNAME}${PORTVERSION:S/p/pre./:S/d/dev./} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= adamw@FreeBSD.org COMMENT= Non-graphical, text-based World-Wide Web client LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support CONFLICTS_INSTALL= lynx-2.8.[0-8].* ja-lynx-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME} -USES= cpe iconv ncurses shebangfix ssl tar:bzip2 +USES= cpe iconv ncurses shebangfix tar:bzip2 SHEBANG_FILES= samples/mailto-form.pl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-zlib --libdir="${L_LIB}" \ - --enable-nsl-fork --with-bzlib \ +CONFIGURE_ARGS= --with-zlib --libdir="${PREFIX}/etc" \ + --enable-nsl-fork --with-bzlib --with-zlib \ --enable-nested-tables --enable-default-colors \ --enable-addrlist-page \ --enable-gzip-help \ --enable-idna \ --enable-ipv6 \ --with-mime-libdir=${PREFIX}/etc \ ${ICONV_CONFIGURE_ARG} \ - --with-screen=ncursesw \ - --with-ssl=${OPENSSLBASE} + --with-screen=ncursesw CPE_VERSION= ${PORTVERSION:C/[pd].+//} CPE_UPDATE= ${PORTVERSION:E:C/[0-9]+//:S/p/pre./:S/d/dev./} MAKE_JOBS_UNSAFE= yes -MAKE_FLAGS= helpdir=${L_HELP} docdir=${L_DOC} -f +MAKE_FLAGS= helpdir="${PREFIX}/share/lynx_help" docdir="${DOCSDIR}" -f MAKEFILE= makefile INSTALL_TARGET= install-full -L_LIB= ${PREFIX}/etc -L_DOC= ${PREFIX}/share/doc/lynx -L_HELP= ${PREFIX}/share/lynx_help -DOCSDIR= ${L_DOC} +DOCSDIR= ${PREFIX}/share/doc/lynx -OPTIONS_DEFINE= IDN NLS DOCS +OPTIONS_DEFINE= GNUTLS IDN NLS DOCS OPTIONS_DEFAULT=IDN OPTIONS_SUB= yes -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls - -IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_CONFIGURE_ENABLE= idna +IDN_LIB_DEPENDS= libidn.so:dns/libidn -post-patch: - ${REINPLACE_CMD} -Ee 's/lynx\.(cfg|lss)\.default/lynx.\1.sample/g' \ - -e '/SYSCONFDIR)\/lynx\.(cfg|lss)$$/d' ${WRKSRC}/makefile.in +GNUTLS_CONFIGURE_ON= --with-gnutls --without-ssl +GNUTLS_CONFIGURE_OFF= --with-ssl=${OPENSSLBASE} --without-gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_USES_OFF= ssl + +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext .include Index: head/www/lynx-current/distinfo =================================================================== --- head/www/lynx-current/distinfo (revision 516748) +++ head/www/lynx-current/distinfo (revision 516749) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500197310 -SHA256 (lynx2.8.9dev.16.tar.bz2) = 04318a100b052d079d0018fa371aa28cfb41ab68db3a959f3b75c2170eea1bc8 -SIZE (lynx2.8.9dev.16.tar.bz2) = 2674662 +TIMESTAMP = 1572905013 +SHA256 (lynx2.9.0dev.4.tar.bz2) = 043aaf753de917687094bc80c37db93390904b573c13e82dbd1756de4c00af00 +SIZE (lynx2.9.0dev.4.tar.bz2) = 2723001 Index: head/www/lynx-current/files/patch-WWW_Library_Implementation_HTTP.c =================================================================== --- head/www/lynx-current/files/patch-WWW_Library_Implementation_HTTP.c (revision 516748) +++ head/www/lynx-current/files/patch-WWW_Library_Implementation_HTTP.c (nonexistent) @@ -1,11 +0,0 @@ ---- WWW/Library/Implementation/HTTP.c.orig 2016-11-23 16:45:25 UTC -+++ WWW/Library/Implementation/HTTP.c -@@ -926,7 +926,7 @@ static int HTLoadHTTP(const char *arg, - #elif SSLEAY_VERSION_NUMBER >= 0x0900 - #ifndef USE_NSS_COMPAT_INCL - if (!try_tls) { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_set_min_proto_version(handle, TLS1_1_VERSION); - #else - SSL_set_options(handle, SSL_OP_NO_TLSv1); Property changes on: head/www/lynx-current/files/patch-WWW_Library_Implementation_HTTP.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/lynx-current/files/patch-makefile.in =================================================================== --- head/www/lynx-current/files/patch-makefile.in (revision 516748) +++ head/www/lynx-current/files/patch-makefile.in (revision 516749) @@ -1,48 +1,61 @@ ---- makefile.in.orig 2009-11-25 13:56:48.000000000 +0300 -+++ makefile.in 2010-03-26 11:13:46.000000000 +0300 -@@ -384,14 +384,10 @@ +--- makefile.in.orig 2019-08-26 20:21:48 UTC ++++ makefile.in +@@ -324,7 +324,7 @@ install-doc : $(DOCDIR) $(HELPDIR) + cd $(HELPDIR) && rm -f $$name ;\ + r= ;\ + test "$(LN_S)" = "ln -s" || r=`echo $(helpdir)|sed -e "s%[^/]\+%..%g" -e "s%^.%%"`; \ +- cd $(HELPDIR) && ( $(LN_S) $$r$(docdir)/$$name . || cp $(DOCDIR)/$$name . );\ ++ cd $(HELPDIR) && ( $(LN_S) ../doc/lynx/$$name . || cp $(DOCDIR)/$$name . );\ + done' + -$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac' + +@@ -393,14 +393,10 @@ install-help : $(CFG2HTML) help_files.sed $(HELPDIR) $ if test "$(COMPRESS_PROG)" != "" ; then \ (cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \ fi' - @echo Updating $(sysconfdir)/lynx.cfg - @ECHO_CC@$(SHELL) -c \ - 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \ - mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \ - else \ - cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \ - fi' - @echo Updating $(sysconfdir)/lynx.cfg to point to installed help-files -+ @echo Updating $(sysconfdir)/lynx.cfg.default ++ @echo Updating $(sysconfdir)/lynx.cfg.sample + cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp -+ rm -f $(SYSCONFDIR)/lynx.cfg.default -+ @echo Updating $(sysconfdir)/lynx.cfg.default to point to installed help-files ++ rm -f $(SYSCONFDIR)/lynx.cfg.sample ++ @echo Updating $(sysconfdir)/lynx.cfg.sample to point to installed help-files @ECHO_CC@sed -e '/^HELPFILE:http/s!^!#!' \ -e '/^#HELPFILE:file/s!#!!' \ $(SYSCONFDIR)/lynx.tmp | \ -@@ -399,9 +394,10 @@ +@@ -408,8 +404,8 @@ install-help : $(CFG2HTML) help_files.sed $(HELPDIR) $ $(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc $(helpdir) | \ sed -e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \ -e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \ - >$(SYSCONFDIR)/lynx.cfg - chmod 644 $(SYSCONFDIR)/lynx.cfg -+ >$(SYSCONFDIR)/lynx.cfg.default -+ chmod 644 $(SYSCONFDIR)/lynx.cfg.default ++ >$(SYSCONFDIR)/lynx.cfg.sample ++ chmod 644 $(SYSCONFDIR)/lynx.cfg.sample -rm -f $(SYSCONFDIR)/lynx.tmp -+ -[ ! -f $(SYSCONFDIR)/lynx.cfg ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.cfg.default $(SYSCONFDIR)/lynx.cfg LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin - @echo Creating $@ -@@ -423,10 +419,11 @@ +@@ -432,17 +428,15 @@ cfg_defs.h : $(scripts_dir)/cfg_defs.sh $(scripts_dir) $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)' install-cfg : $(SYSCONFDIR) - @$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg -+ @$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg.default ++ @$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg.sample install-lss : $(SYSCONFDIR) - @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss -+ @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.default -+ -[ ! -f $(SYSCONFDIR)/lynx.lss ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.lss.default $(SYSCONFDIR)/lynx.lss ++ @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.sample uninstall :: @MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall + -rm -f $(BINDIR)/$(binary_PROG) + -rm -f $(MANDIR)/$(actual_PROG).1 +- -rm -f $(SYSCONFDIR)/lynx.cfg +- -rm -f $(SYSCONFDIR)/lynx.lss + + uninstall \ + uninstall-help :: Index: head/www/lynx-current/pkg-plist =================================================================== --- head/www/lynx-current/pkg-plist (revision 516748) +++ head/www/lynx-current/pkg-plist (revision 516749) @@ -1,142 +1,143 @@ bin/lynx man/man1/lynx.1.gz @sample etc/lynx.cfg.sample @sample etc/lynx.lss.sample %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYHEADER %%PORTDOCS%%%%DOCSDIR%%/COPYHEADER.asc %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYING.asc %%PORTDOCS%%%%DOCSDIR%%/PROBLEMS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.3.gz %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.4.gz %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.5.gz %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.6.gz %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.7.gz %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.8.gz %%PORTDOCS%%%%DOCSDIR%%/docs/CRAWL.announce.gz %%PORTDOCS%%%%DOCSDIR%%/docs/FM.announce.gz %%PORTDOCS%%%%DOCSDIR%%/docs/IBMPC-charsets.announce.gz %%PORTDOCS%%%%DOCSDIR%%/docs/OS-390.announce.gz %%PORTDOCS%%%%DOCSDIR%%/docs/README.TRST %%PORTDOCS%%%%DOCSDIR%%/docs/README.chartrans %%PORTDOCS%%%%DOCSDIR%%/docs/README.cookies %%PORTDOCS%%%%DOCSDIR%%/docs/README.defines %%PORTDOCS%%%%DOCSDIR%%/docs/README.jp %%PORTDOCS%%%%DOCSDIR%%/docs/README.metrics %%PORTDOCS%%%%DOCSDIR%%/docs/README.options %%PORTDOCS%%%%DOCSDIR%%/docs/README.release %%PORTDOCS%%%%DOCSDIR%%/docs/README.rootcerts %%PORTDOCS%%%%DOCSDIR%%/docs/README.ssl %%PORTDOCS%%%%DOCSDIR%%/docs/README.sslcerts %%PORTDOCS%%%%DOCSDIR%%/docs/SOCKETSHR.announce.gz %%PORTDOCS%%%%DOCSDIR%%/docs/TCPWARE.announce.gz %%PORTDOCS%%%%DOCSDIR%%/docs/VMSWAIS.announce.gz %%PORTDOCS%%%%DOCSDIR%%/docs/djgpp.key %%PORTDOCS%%%%DOCSDIR%%/docs/pdcurses.key %%PORTDOCS%%%%DOCSDIR%%/docs/slang.key %%PORTDOCS%%%%DOCSDIR%%/docs/win-386.announce.gz %%PORTDOCS%%%%DOCSDIR%%/samples/blue-background.lss %%PORTDOCS%%%%DOCSDIR%%/samples/bright-blue.lss %%PORTDOCS%%%%DOCSDIR%%/samples/cernrules.txt %%PORTDOCS%%%%DOCSDIR%%/samples/home.htm %%PORTDOCS%%%%DOCSDIR%%/samples/installdirs.html %%PORTDOCS%%%%DOCSDIR%%/samples/jumps.htm %%PORTDOCS%%%%DOCSDIR%%/samples/jumpsUnix.html %%PORTDOCS%%%%DOCSDIR%%/samples/jumpsVMS.html %%PORTDOCS%%%%DOCSDIR%%/samples/keepviewer %%PORTDOCS%%%%DOCSDIR%%/samples/lynx-demo.cfg %%PORTDOCS%%%%DOCSDIR%%/samples/lynx-keymaps %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.bat %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.com %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.ico %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.lss %%PORTDOCS%%%%DOCSDIR%%/samples/lynx_bookmarks.htm %%PORTDOCS%%%%DOCSDIR%%/samples/lynxdump %%PORTDOCS%%%%DOCSDIR%%/samples/mailcap %%PORTDOCS%%%%DOCSDIR%%/samples/mailto-form.pl %%PORTDOCS%%%%DOCSDIR%%/samples/midnight.lss %%PORTDOCS%%%%DOCSDIR%%/samples/mild-colors.lss %%PORTDOCS%%%%DOCSDIR%%/samples/mime.types %%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx %%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx.bat %%PORTDOCS%%%%DOCSDIR%%/samples/opaque.lss %%PORTDOCS%%%%DOCSDIR%%/test/ALT88592.html %%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html %%PORTDOCS%%%%DOCSDIR%%/test/README.txt %%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html %%PORTDOCS%%%%DOCSDIR%%/test/X %%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html %%PORTDOCS%%%%DOCSDIR%%/test/c1.html %%PORTDOCS%%%%DOCSDIR%%/test/circle.html %%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html %%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html %%PORTDOCS%%%%DOCSDIR%%/test/image.jpg %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2a.html %%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html %%PORTDOCS%%%%DOCSDIR%%/test/nobody %%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html %%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html %%PORTDOCS%%%%DOCSDIR%%/test/sgml.html %%PORTDOCS%%%%DOCSDIR%%/test/spaces.html %%PORTDOCS%%%%DOCSDIR%%/test/special_urls.html %%PORTDOCS%%%%DOCSDIR%%/test/square.html %%PORTDOCS%%%%DOCSDIR%%/test/tabtest.html %%PORTDOCS%%%%DOCSDIR%%/test/tags.html %%PORTDOCS%%%%DOCSDIR%%/test/test-styles.html %%PORTDOCS%%%%DOCSDIR%%/test/triangle.html %%PORTDOCS%%%%DOCSDIR%%/test/unicode.html %%PORTDOCS%%%%DOCSDIR%%/test/utf-8-demo.html %%NLS%%share/locale/ca/LC_MESSAGES/lynx.mo %%NLS%%share/locale/cs/LC_MESSAGES/lynx.mo %%NLS%%share/locale/da/LC_MESSAGES/lynx.mo %%NLS%%share/locale/de/LC_MESSAGES/lynx.mo %%NLS%%share/locale/en/LC_MESSAGES/lynx.mo %%NLS%%share/locale/eo/LC_MESSAGES/lynx.mo %%NLS%%share/locale/et/LC_MESSAGES/lynx.mo %%NLS%%share/locale/fi/LC_MESSAGES/lynx.mo %%NLS%%share/locale/fr/LC_MESSAGES/lynx.mo %%NLS%%share/locale/hu/LC_MESSAGES/lynx.mo %%NLS%%share/locale/id/LC_MESSAGES/lynx.mo %%NLS%%share/locale/it/LC_MESSAGES/lynx.mo %%NLS%%share/locale/ja/LC_MESSAGES/lynx.mo %%NLS%%share/locale/nl/LC_MESSAGES/lynx.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/lynx.mo +%%NLS%%share/locale/ro/LC_MESSAGES/lynx.mo %%NLS%%share/locale/ru/LC_MESSAGES/lynx.mo %%NLS%%share/locale/sl/LC_MESSAGES/lynx.mo %%NLS%%share/locale/sv/LC_MESSAGES/lynx.mo %%NLS%%share/locale/tr/LC_MESSAGES/lynx.mo %%NLS%%share/locale/uk/LC_MESSAGES/lynx.mo %%NLS%%share/locale/vi/LC_MESSAGES/lynx.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/lynx.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/lynx.mo share/lynx_help/COPYHEADER share/lynx_help/COPYING share/lynx_help/Lynx_users_guide.html.gz share/lynx_help/about_lynx.html.gz share/lynx_help/keystrokes/alt_edit_help.html.gz share/lynx_help/keystrokes/bashlike_edit_help.html.gz share/lynx_help/keystrokes/bookmark_help.html.gz share/lynx_help/keystrokes/cookie_help.html.gz share/lynx_help/keystrokes/dired_help.html.gz share/lynx_help/keystrokes/edit_help.html.gz share/lynx_help/keystrokes/environments.html.gz share/lynx_help/keystrokes/follow_help.html.gz share/lynx_help/keystrokes/gopher_types_help.html.gz share/lynx_help/keystrokes/history_help.html.gz share/lynx_help/keystrokes/keystroke_help.html.gz share/lynx_help/keystrokes/movement_help.html.gz share/lynx_help/keystrokes/option_help.html.gz share/lynx_help/keystrokes/other_help.html.gz share/lynx_help/keystrokes/print_help.html.gz share/lynx_help/keystrokes/scrolling_help.html.gz share/lynx_help/keystrokes/test_display.html.gz share/lynx_help/keystrokes/visited_help.html.gz share/lynx_help/keystrokes/xterm_help.html.gz share/lynx_help/lynx-dev.html.gz share/lynx_help/lynx_help_main.html.gz share/lynx_help/lynx_url_support.html.gz