Date: Mon, 4 Nov 2019 22:43:07 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516749 - in head/www/lynx-current: . files Message-ID: <201911042243.xA4Mh7Vt010018@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Nov 4 22:43:07 2019 New Revision: 516749 URL: https://svnweb.freebsd.org/changeset/ports/516749 Log: lynx-current: Update to 2.9.0.dev4 and take maintainership This also adds an option to use GNUTLS as the TLS backend. Deleted: head/www/lynx-current/files/patch-WWW_Library_Implementation_HTTP.c Modified: head/www/lynx-current/Makefile head/www/lynx-current/distinfo head/www/lynx-current/files/patch-makefile.in head/www/lynx-current/pkg-plist Modified: head/www/lynx-current/Makefile ============================================================================== --- head/www/lynx-current/Makefile Mon Nov 4 22:20:30 2019 (r516748) +++ head/www/lynx-current/Makefile Mon Nov 4 22:43:07 2019 (r516749) @@ -2,15 +2,14 @@ # $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 @@ -20,11 +19,11 @@ RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-sup 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 \ @@ -32,34 +31,31 @@ CONFIGURE_ARGS= --with-zlib --libdir="${L_LIB}" \ --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 <bsd.port.mk> Modified: head/www/lynx-current/distinfo ============================================================================== --- head/www/lynx-current/distinfo Mon Nov 4 22:20:30 2019 (r516748) +++ head/www/lynx-current/distinfo Mon Nov 4 22:43:07 2019 (r516749) @@ -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 Modified: head/www/lynx-current/files/patch-makefile.in ============================================================================== --- head/www/lynx-current/files/patch-makefile.in Mon Nov 4 22:20:30 2019 (r516748) +++ head/www/lynx-current/files/patch-makefile.in Mon Nov 4 22:43:07 2019 (r516749) @@ -1,6 +1,15 @@ ---- 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' @@ -12,37 +21,41 @@ - 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 :: Modified: head/www/lynx-current/pkg-plist ============================================================================== --- head/www/lynx-current/pkg-plist Mon Nov 4 22:20:30 2019 (r516748) +++ head/www/lynx-current/pkg-plist Mon Nov 4 22:43:07 2019 (r516749) @@ -106,6 +106,7 @@ man/man1/lynx.1.gz %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911042243.xA4Mh7Vt010018>