Re: [update] www/newsraft 0.12

On 2022/11/28 07:48, Juan Picca wrote:
> Please,
> consider update newsraft to 0.12

How about this diff instead? No need for the patch, now that it uses
make variables we can just override them, and...

> To use newsraft, copy the example configuration and feeds files
> -to $XDG_CONFIG_HOME or your home directory and modify as required:
> +to $XDG_CONFIG_HOME and modify as required:
>
> $ mkdir -p ~/.config/newsraft
> $ cp ${TRUEPREFIX}/share/examples/newsraft/{config,feeds} ~/.config/newsraft/
> +
> +If you want to use your home directory try instead:
> +
> +$ mkdir ~/.newsraft
> +$ cp ${TRUEPREFIX}/share/examples/newsraft/{config,feeds} ~/.newsraft/
> +$ touch ~/.newsraft/newsraft.sqlite3

...I don't think we need to talk about optional directory locations in
pkg-readme (users can check upstream docs if they want something more
complicated).

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/newsraft/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 4 Oct 2022 11:07:58 -0000 1.2
+++ Makefile 28 Nov 2022 11:27:13 -0000
@@ -1,6 +1,6 @@
COMMENT= lightweight feed reader for text terminals

-DISTNAME= newsraft-0.11
+DISTNAME= newsraft-0.12
WRKDIST= ${WRKDIR}/newsraft

CATEGORIES= www
@@ -26,5 +26,7 @@ MAKE_FILE= makefile
MAKE_FLAGS= CC="${CC}" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+FAKE_FLAGS= MANDIR=${PREFIX}/man \
+ EXAMPLES_DIR=${PREFIX}/share/examples/newsraft

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/newsraft/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 4 Oct 2022 11:07:58 -0000 1.2
+++ distinfo 28 Nov 2022 11:27:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (newsraft-0.11.tar.gz) = N7sB3Ua9pgzzcD2UJkYAPxZUSMRHbnwXk1S1sEIJA0Q=
-SIZE (newsraft-0.11.tar.gz) = 76318
+SHA256 (newsraft-0.12.tar.gz) = bxmMlZyOXrTOb6DDx46Zgp8VlYVXRrDEzsPpv9BgQGw=
+SIZE (newsraft-0.12.tar.gz) = 76081
Index: patches/patch-makefile
===================================================================
RCS file: patches/patch-makefile
diff -N patches/patch-makefile
--- patches/patch-makefile 10 Sep 2022 19:48:32 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-Index: makefile
---- makefile.orig
-+++ makefile
-@@ -29,11 +29,11 @@ install-newsraft: newsraft
- install -Dm755 newsraft $(DESTDIR)$(PREFIX)/bin/newsraft
-
- install-doc: doc
-- install -Dm644 newsraft.1 $(DESTDIR)$(PREFIX)/share/man/man1/newsraft.1
-+ install -Dm644 newsraft.1 $(DESTDIR)$(PREFIX)/man/man1/newsraft.1
-
- install-examples:
-- install -Dm644 examples/feeds $(DESTDIR)$(PREFIX)/share/newsraft/examples/feeds
-- install -Dm644 examples/config $(DESTDIR)$(PREFIX)/share/newsraft/examples/config
-+ install -Dm644 examples/feeds $(DESTDIR)$(PREFIX)/share/examples/newsraft/feeds
-+ install -Dm644 examples/config $(DESTDIR)$(PREFIX)/share/examples/newsraft/config
-
- newsraft: $(OBJECTS)
- $(CC) -std=c99 $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
Index: pkg/README
===================================================================
RCS file: /cvs/ports/www/newsraft/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- pkg/README 10 Sep 2022 19:48:32 -0000 1.1.1.1
+++ pkg/README 28 Nov 2022 11:27:13 -0000
@@ -3,7 +3,8 @@
+-------------------------------------------------------------------------------

To use newsraft, copy the example configuration and feeds files
-to $XDG_CONFIG_HOME or your home directory and modify as required:
+to $XDG_CONFIG_HOME/newsraft (typically ~/.config) and modify
+as required:

$ mkdir -p ~/.config/newsraft
$ cp ${TRUEPREFIX}/share/examples/newsraft/{config,feeds} ~/.config/newsraft/