From owner-dev-commits-ports-all@freebsd.org Sun Aug 15 05:01:25 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 83DC7659B25; Sun, 15 Aug 2021 05:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GnQ9x3BRlz4YZl; Sun, 15 Aug 2021 05:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 558A91048D; Sun, 15 Aug 2021 05:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17F51PoQ022621; Sun, 15 Aug 2021 05:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17F51PEh022620; Sun, 15 Aug 2021 05:01:25 GMT (envelope-from git) Date: Sun, 15 Aug 2021 05:01:25 GMT Message-Id: <202108150501.17F51PEh022620@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: a48d43a45f5f - main - www/lynx-current: Update to 2.9.0d9 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a48d43a45f5f77b77b4f9a8d2827bcfd23b33e77 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Aug 2021 05:01:25 -0000 The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=a48d43a45f5f77b77b4f9a8d2827bcfd23b33e77 commit a48d43a45f5f77b77b4f9a8d2827bcfd23b33e77 Author: Piotr Smyrak AuthorDate: 2021-08-15 04:59:43 +0000 Commit: Adam Weinberger CommitDate: 2021-08-15 04:59:43 +0000 www/lynx-current: Update to 2.9.0d9 PR: 257812 --- www/lynx-current/Makefile | 5 ++-- www/lynx-current/distinfo | 4 +-- www/lynx-current/files/patch-makefile.in | 47 ++++++++++++++++---------------- www/lynx-current/pkg-plist | 1 + 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index 9eba9d3f8ecd..7e9746b5245f 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,10 +1,11 @@ # Created by: ache PORTNAME= lynx -PORTVERSION= 2.9.0d6 +PORTVERSION= 2.9.0d9 CATEGORIES= www MASTER_SITES= http://invisible-mirror.net/archives/lynx/tarballs/ \ - ftp://invisible-island.net/lynx/tarballs/ + ftp://ftp.invisible-island.net/lynx/tarballs/ + PKGNAMESUFFIX= -current DISTNAME= ${PORTNAME}${PORTVERSION:S/p/pre./:S/d/dev./} diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo index 50e721bd581e..1ab218f1bc0d 100644 --- a/www/lynx-current/distinfo +++ b/www/lynx-current/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1605020628 -SHA256 (lynx2.9.0dev.6.tar.bz2) = 78f0be7f81f4b84d8d33b45a05145f015e35355109be350e461de5c03abf53b2 -SIZE (lynx2.9.0dev.6.tar.bz2) = 2730690 +SHA256 (lynx2.9.0dev.9.tar.bz2) = 6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a +SIZE (lynx2.9.0dev.9.tar.bz2) = 2746988 diff --git a/www/lynx-current/files/patch-makefile.in b/www/lynx-current/files/patch-makefile.in index 878e2fa37243..eb7da39b5351 100644 --- a/www/lynx-current/files/patch-makefile.in +++ b/www/lynx-current/files/patch-makefile.in @@ -1,45 +1,45 @@ ---- makefile.in.orig 2019-08-26 20:21:48 UTC -+++ makefile.in -@@ -324,7 +324,7 @@ install-doc : $(DOCDIR) $(HELPDIR) +--- makefile.in.orig 2021-08-01 20:50:51.000000000 +0200 ++++ makefile.in 2021-08-13 17:31:19.742347000 +0200 +@@ -325,7 +325,7 @@ 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) $ + done';\ + $(SHELL) -c 'set -x; \ + case `id|sed -e "s/(.*//"` in \ +@@ -403,14 +403,10 @@ if test "$(COMPRESS_PROG)" != "" ; then \ (cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \ fi' -- @echo Updating $(sysconfdir)/lynx.cfg +- @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.sample +- @echo "Updating $(sysconfdir)/lynx.cfg to point to installed help-files" ++ @echo "Updating $(sysconfdir)/lynx.cfg.sample" + cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp + rm -f $(SYSCONFDIR)/lynx.cfg.sample -+ @echo Updating $(sysconfdir)/lynx.cfg.sample to point to installed help-files ++ @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 | \ -@@ -408,8 +404,8 @@ install-help : $(CFG2HTML) help_files.sed $(HELPDIR) $ +@@ -418,8 +414,8 @@ $(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.sample -+ chmod 644 $(SYSCONFDIR)/lynx.cfg.sample - -rm -f $(SYSCONFDIR)/lynx.tmp +- >$(SYSCONFDIR)/lynx.cfg ;\ +- chmod 644 $(SYSCONFDIR)/lynx.cfg ;\ ++ >$(SYSCONFDIR)/lynx.cfg.sample; \ ++ chmod 644 $(SYSCONFDIR)/lynx.cfg.sample; \ + rm -f $(SYSCONFDIR)/lynx.tmp LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin -@@ -432,17 +428,15 @@ cfg_defs.h : $(scripts_dir)/cfg_defs.sh $(scripts_dir) +@@ -442,17 +438,15 @@ $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)' install-cfg : $(SYSCONFDIR) @@ -51,11 +51,12 @@ + @$(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 + @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 ++ rm -f $(MANDIR)/$(actual_PROG).1 uninstall \ uninstall-help :: diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist index b04edc0b4c03..39b0e8f4e170 100644 --- a/www/lynx-current/pkg-plist +++ b/www/lynx-current/pkg-plist @@ -73,6 +73,7 @@ man/man1/lynx.1.gz %%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html %%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html %%PORTDOCS%%%%DOCSDIR%%/test/image.jpg +%%PORTDOCS%%%%DOCSDIR%%/test/idna-tr46.html %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html