On Sat, Nov 27, 2021 at 11:03:55PM +0000, Stuart Henderson wrote: > This will need @conflict sfeed_curses-* and @pkgpath www/sfeed_curses to > handle the update > > -- > Sent from a phone, apologies for poor formatting. > > On 27 November 2021 10:49:17 Hiltjo Posthuma <hil...@codemadness.org> wrote: > > > Hi, > > > > This updated sfeed to 1.1. > > > > The formatting program sfeed_curses is now merged in the sfeed repo so the > > separate www/sfeed_curses port can be removed. > > > > > > The complete changelog from 1.0 is: > > > > * The formatting program sfeed_curses is now merged in the sfeed repo. > > This is a program for viewing items in a curses UI. > > sfeed can still be built without it if its considered bloat with: > > make SFEED_CURSES="". > > * sfeed_mbox: escape the link and enclosure text when using HTML content > > with the option SFEED_MBOX_CONTENT="1" > > * sfeed_mbox: add link as base URL for HTML content. > > * sfeed_mbox: use 64-bit for the checksum number on 32-bit systems. > > * sfeed_content: optimizations to the awk script for the UTF-8 locale and > > string replacements. > > * sfeed_content: add link as base URL for HTML content. > > * Documentation improvements and more examples in the man page. > > * Small code-style improvements. > > > > Patch: > > > > > > diff --git www/sfeed/Makefile www/sfeed/Makefile > > index 82c5214bcfb..ca47ede4b92 100644 > > --- www/sfeed/Makefile > > +++ www/sfeed/Makefile > > @@ -1,7 +1,7 @@ > > # $OpenBSD: Makefile,v 1.1.1.1 2021/09/08 08:05:37 fcambus Exp $ > > > > COMMENT = RSS/Atom newsreader and formatting programs > > -DISTNAME = sfeed-1.0 > > +DISTNAME = sfeed-1.1 > > CATEGORIES = www > > > > HOMEPAGE = https://codemadness.org/sfeed.html > > @@ -15,7 +15,7 @@ MASTER_SITES = > > https://codemadness.org/releases/sfeed/ > > > > # uses pledge() > > # uses unveil() > > -WANTLIB += c > > +WANTLIB += c curses > > > > MAKE_FLAGS = CC='${CC}' \ > > CFLAGS='${CFLAGS}' \ > > @@ -23,7 +23,10 @@ MAKE_FLAGS = CC='${CC}' \ > > COMPATOBJ='' > > > > # (optional) run-time dependencies for sfeed_update script: > > -# iconv: needed only for feeds that are not UTF-8 encoded. > > +# * iconv: needed only for feeds that are not UTF-8 encoded. > > +# * xdg-open: for opening links or enclosures in sfeed_curses. > > +# * xclip: for copying a link to the clipboard in sfeed_curses. > > +# * lynx: for converting HTML to plain-text in sfeed_content. > > RUN_DEPENDS = converters/libiconv > > > > NO_TEST = Yes > > diff --git www/sfeed/distinfo www/sfeed/distinfo > > index a97c3b67ba1..a24bb78be0d 100644 > > --- www/sfeed/distinfo > > +++ www/sfeed/distinfo > > @@ -1,2 +1,2 @@ > > -SHA256 (sfeed-1.0.tar.gz) = Rr8zNgRnieUAFUFYjCevkvUXoBfYzTd9D+62QmjlaHo= > > -SIZE (sfeed-1.0.tar.gz) = 39349 > > +SHA256 (sfeed-1.1.tar.gz) = hIHn3wfZ7mbW5Q9F9h/P9iue/pxGhhYO9wiD1gg6Je8= > > +SIZE (sfeed-1.1.tar.gz) = 60644 > > diff --git www/sfeed/pkg/PLIST www/sfeed/pkg/PLIST > > index 2b7f651d4ff..7d5e5d0c9d0 100644 > > --- www/sfeed/pkg/PLIST > > +++ www/sfeed/pkg/PLIST > > @@ -1,9 +1,12 @@ > > -@comment $OpenBSD: PLIST,v 1.1.1.1 2021/09/08 08:05:37 fcambus Exp $ > > +@comment $OpenBSD: PLIST,v$ > > @bin bin/sfeed > > @bin bin/sfeed_atom > > +bin/sfeed_content > > +@bin bin/sfeed_curses > > @bin bin/sfeed_frames > > @bin bin/sfeed_gopher > > @bin bin/sfeed_html > > +bin/sfeed_markread > > @bin bin/sfeed_mbox > > bin/sfeed_opml_export > > @bin bin/sfeed_opml_import > > @@ -14,9 +17,12 @@ bin/sfeed_update > > @bin bin/sfeed_xmlenc > > @man man/man1/sfeed.1 > > @man man/man1/sfeed_atom.1 > > +@man man/man1/sfeed_content.1 > > +@man man/man1/sfeed_curses.1 > > @man man/man1/sfeed_frames.1 > > @man man/man1/sfeed_gopher.1 > > @man man/man1/sfeed_html.1 > > +@man man/man1/sfeed_markread.1 > > @man man/man1/sfeed_mbox.1 > > @man man/man1/sfeed_opml_export.1 > > @man man/man1/sfeed_opml_import.1 > > > > -- > > Kind regards, > > Hiltjo >
Hi, Thanks for the feedback. Below is an updated patch with the @conflict and @pkgpath marker. diff --git www/sfeed/Makefile www/sfeed/Makefile index 82c5214bcfb..ca47ede4b92 100644 --- www/sfeed/Makefile +++ www/sfeed/Makefile @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.1.1.1 2021/09/08 08:05:37 fcambus Exp $ COMMENT = RSS/Atom newsreader and formatting programs -DISTNAME = sfeed-1.0 +DISTNAME = sfeed-1.1 CATEGORIES = www HOMEPAGE = https://codemadness.org/sfeed.html @@ -15,7 +15,7 @@ MASTER_SITES = https://codemadness.org/releases/sfeed/ # uses pledge() # uses unveil() -WANTLIB += c +WANTLIB += c curses MAKE_FLAGS = CC='${CC}' \ CFLAGS='${CFLAGS}' \ @@ -23,7 +23,10 @@ MAKE_FLAGS = CC='${CC}' \ COMPATOBJ='' # (optional) run-time dependencies for sfeed_update script: -# iconv: needed only for feeds that are not UTF-8 encoded. +# * iconv: needed only for feeds that are not UTF-8 encoded. +# * xdg-open: for opening links or enclosures in sfeed_curses. +# * xclip: for copying a link to the clipboard in sfeed_curses. +# * lynx: for converting HTML to plain-text in sfeed_content. RUN_DEPENDS = converters/libiconv NO_TEST = Yes diff --git www/sfeed/distinfo www/sfeed/distinfo index a97c3b67ba1..a24bb78be0d 100644 --- www/sfeed/distinfo +++ www/sfeed/distinfo @@ -1,2 +1,2 @@ -SHA256 (sfeed-1.0.tar.gz) = Rr8zNgRnieUAFUFYjCevkvUXoBfYzTd9D+62QmjlaHo= -SIZE (sfeed-1.0.tar.gz) = 39349 +SHA256 (sfeed-1.1.tar.gz) = hIHn3wfZ7mbW5Q9F9h/P9iue/pxGhhYO9wiD1gg6Je8= +SIZE (sfeed-1.1.tar.gz) = 60644 diff --git www/sfeed/pkg/PLIST www/sfeed/pkg/PLIST index 2b7f651d4ff..85c5caafa5b 100644 --- www/sfeed/pkg/PLIST +++ www/sfeed/pkg/PLIST @@ -1,9 +1,14 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2021/09/08 08:05:37 fcambus Exp $ +@comment $OpenBSD: PLIST,v$ +@conflict sfeed_curses-* +@pkgpath www/sfeed_curses @bin bin/sfeed @bin bin/sfeed_atom +bin/sfeed_content +@bin bin/sfeed_curses @bin bin/sfeed_frames @bin bin/sfeed_gopher @bin bin/sfeed_html +bin/sfeed_markread @bin bin/sfeed_mbox bin/sfeed_opml_export @bin bin/sfeed_opml_import @@ -14,9 +19,12 @@ bin/sfeed_update @bin bin/sfeed_xmlenc @man man/man1/sfeed.1 @man man/man1/sfeed_atom.1 +@man man/man1/sfeed_content.1 +@man man/man1/sfeed_curses.1 @man man/man1/sfeed_frames.1 @man man/man1/sfeed_gopher.1 @man man/man1/sfeed_html.1 +@man man/man1/sfeed_markread.1 @man man/man1/sfeed_mbox.1 @man man/man1/sfeed_opml_export.1 @man man/man1/sfeed_opml_import.1 -- Kind regards, Hiltjo
