diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index 6da980364f59..75eeadcab0f1 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,59 +1,59 @@ PORTNAME= lynx -PORTVERSION= 2.9.0d10 +PORTVERSION= 2.9.0d12 CATEGORIES= www MASTER_SITES= http://invisible-mirror.net/archives/lynx/tarballs/ \ ftp://ftp.invisible-island.net/lynx/tarballs/ PKGNAMESUFFIX= -current DISTNAME= ${PORTNAME}${PORTVERSION:S/p/pre./:S/d/dev./} MAINTAINER= adamw@FreeBSD.org COMMENT= Console-based web browser (current/development version) WWW= https://lynx.invisible-island.net/current/ LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support CONFLICTS_INSTALL= lynx-2.8* ja-lynx USES= cpe iconv ncurses shebangfix tar:bzip2 WRKSRC= ${WRKDIR}/${DISTNAME} CPE_VERSION= ${PORTVERSION:C/[pd].+//} CPE_UPDATE= ${PORTVERSION:E:C/[0-9]+//:S/p/pre./:S/d/dev./} SHEBANG_FILES= samples/mailto-form.pl MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir="${PREFIX}/etc" \ --with-bzlib --with-zlib \ --with-mime-libdir=${PREFIX}/etc \ --with-screen=${NCURSES_IMPL} \ --enable-default-colors \ --enable-gzip-help \ --enable-ipv6 \ --enable-nested-tables \ --enable-nsl-fork \ ${ICONV_CONFIGURE_ARGS} MAKE_FLAGS= helpdir="${PREFIX}/share/lynx_help" docdir="${DOCSDIR}" MAKEFILE= makefile INSTALL_TARGET= install-full DOCSDIR= ${PREFIX}/share/doc/lynx OPTIONS_DEFINE= DOCS GNUTLS IDN NLS OPTIONS_DEFAULT=IDN OPTIONS_SUB= yes 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 IDN_CONFIGURE_ENABLE= idna IDN_LIB_DEPENDS= libidn.so:dns/libidn NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext .include diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo index 39642b9d5891..1203abcac003 100644 --- a/www/lynx-current/distinfo +++ b/www/lynx-current/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644283437 -SHA256 (lynx2.9.0dev.10.tar.bz2) = 898ac82bcfcbd4b20ea39afdf66fd659b8773c7549623b0f8802bf392a41a912 -SIZE (lynx2.9.0dev.10.tar.bz2) = 2748823 +TIMESTAMP = 1686666300 +SHA256 (lynx2.9.0dev.12.tar.bz2) = a6455b159d00776d8ec1051285c972dc1f0c552d0571a0cff02a23ec146ee8e5 +SIZE (lynx2.9.0dev.12.tar.bz2) = 2762036 diff --git a/www/lynx-current/files/patch-makefile.in b/www/lynx-current/files/patch-makefile.in index eb7da39b5351..fa6f397b3221 100644 --- a/www/lynx-current/files/patch-makefile.in +++ b/www/lynx-current/files/patch-makefile.in @@ -1,62 +1,62 @@ ---- 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 @@ +--- makefile.in.orig 2023-06-13 14:30:49 UTC ++++ makefile.in +@@ -327,7 +327,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 'set -x; \ case `id|sed -e "s/(.*//"` in \ -@@ -403,14 +403,10 @@ +@@ -405,14 +405,10 @@ install-help : htmlized_cfg 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.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_CC@sed -e '/^HELPFILE:http/s!^!#!' \ -e '/^#HELPFILE:file/s!#!!' \ $(SYSCONFDIR)/lynx.tmp | \ -@@ -418,8 +414,8 @@ +@@ -420,8 +416,8 @@ install-help : htmlized_cfg 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.sample; \ + chmod 644 $(SYSCONFDIR)/lynx.cfg.sample; \ rm -f $(SYSCONFDIR)/lynx.tmp LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin -@@ -442,17 +438,15 @@ - $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)' +@@ -444,17 +440,15 @@ cfg_defs.h : $(scripts_dir)/cfg_defs.sh $(scripts_dir) + @$(SHELL) -c 'SHELL=$(SHELL) FGREP="$(FGREP)" $(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.sample +- @$(SHELL) -c 'SHELL=$(SHELL) EGREP="$(EGREP)" FGREP="$(FGREP)" $(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg' ++ @$(SHELL) -c 'SHELL=$(SHELL) EGREP="$(EGREP)" FGREP="$(FGREP)" $(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.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 + rm -f $(MANDIR)/$(actual_PROG).1 uninstall \ uninstall-help ::