Remi Locherer <[email protected]> wrote:
> On Fri, Sep 18, 2020 at 06:47:44PM -0400, trondd wrote:
> > Looking around at RSS readers and thought I'd update snownews. Jumps us
> > ahead by like 10 years. Some significant changes to the configure process
> > I hope I worked around right. Moved to GitHub. They also dropped native
> > SSL support so I added a MESSAGE to notify any users.
> >
> > Tim.
>
> It works fine for the 2 feed I tested with. I think the message regarding
> HTTPS support makes sense.
>
> port-check says pkg/MESSAGE should not contain $OpenBSD$ tag.
>
> With that addressed OK remi.
Oops. Thanks. Thought of adding the MESSAGE at the last minute and didn't
think to rerun portcheck. Here is the fixed diff.
Tim.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/snownews/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 12 Jul 2019 20:51:05 -0000 1.39
+++ Makefile 19 Sep 2020 15:14:38 -0000
@@ -1,19 +1,22 @@
# $OpenBSD: Makefile,v 1.39 2019/07/12 20:51:05 sthen Exp $
COMMENT= text mode rss newsreader
-DISTNAME= snownews-1.5.12
-REVISION= 6
+DISTNAME= snownews-1.6.10
CATEGORIES= www
-MASTER_SITES= ${HOMEPAGE}download/
-HOMEPAGE= http://kiza.kcore.de/software/snownews/
+GH_ACCOUNT= kouya
+GH_PROJECT= snownews
+GH_TAGNAME= 1.6.10
+
+HOMEPAGE= https://github.com/kouya/snownews
# GPL
PERMIT_PACKAGE= Yes
-WANTLIB += c crypto curses iconv intl m lzma pthread xml2 z
+WANTLIB += c curses iconv intl xml2 z
NO_TEST= Yes
+
USE_GMAKE= Yes
BUILD_DEPENDS= devel/gettext,-tools
@@ -21,11 +24,11 @@ RUN_DEPENDS= textproc/p5-XML-LibXML
LIB_DEPENDS= devel/gettext,-runtime \
textproc/libxml
-MAKE_ENV+= EXTRA_CFLAGS="${CFLAGS}"
-MAKE_FLAGS+= CC="${CC}"
+CONFIGURE_STYLE= simple
+CONFIGURE_ARGS= --prefix="\$${PREFIX}" --mandir="\$${PREFIX}/man" \
+ --builddir=${WRKDIR}
-CONFIGURE_STYLE= simple
-CONFIGURE_ARGS= --prefix=${PREFIX}
+MESSAGE= ${PKGDIR}/MESSAGE
post-install:
ln -f ${PREFIX}/bin/opml2snow ${PREFIX}/bin/snow2opml
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/snownews/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 18 Jan 2015 03:15:50 -0000 1.16
+++ distinfo 19 Sep 2020 15:14:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (snownews-1.5.12.tar.gz) = Jt2W6TRdnLwcDJRwQXCA3Qw+sx5+qUT3jzMC1wYOy5A=
-SIZE (snownews-1.5.12.tar.gz) = 167944
+SHA256 (snownews-1.6.10.tar.gz) = jHgGeu914oPfSzzKHJZlh7ZlTp6Eo+bl64vdWCl5kkI=
+SIZE (snownews-1.6.10.tar.gz) = 189715
Index: patches/patch-Config_mk_in
===================================================================
RCS file: patches/patch-Config_mk_in
diff -N patches/patch-Config_mk_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Config_mk_in 19 Sep 2020 15:14:38 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: Config.mk.in
+--- Config.mk.in.orig
++++ Config.mk.in
+@@ -21,7 +21,7 @@ PREFIX := @prefix@
+ BINDIR := @bindir@
+ LOCALEPATH := @localedir@
+ MANPATH := @mandir@
+-BUILDDIR := @builddir@/${NAME}
++BUILDDIR := @builddir@/build
+ PKGDIR := @pkgdir@
+ O := .o/
+
+@@ -29,7 +29,7 @@ O := .o/
+
+ CFLAGS := -Wall -Wextra -Wredundant-decls -Wshadow \
+ -std=c11 -I/usr/include/libxml2
+-LDFLAGS := -liconv -lintl -lxml2 -lncurses -lz
++LDFLAGS := -liconv -lintl -lncursesw -lxml2 -lz
+ ifdef DEBUG
+ CFLAGS += -O0 -ggdb3
+ LDFLAGS += -g -rdynamic
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 18 Sep 2009 20:51:35 -0000 1.13
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.13 2009/09/18 20:51:35 martynas Exp $
---- Makefile.orig Thu Sep 17 09:44:27 2009
-+++ Makefile Thu Sep 17 11:10:11 2009
-@@ -2,7 +2,7 @@ CC= gcc
- MAKE= make
- INSTALL= install
- LOCALEPATH= $(PREFIX)/share/locale
--MANPATH= $(PREFIX)/share/man
-+MANPATH= $(PREFIX)/man
-
- ### Compiler/linker flags ###
- ### Generated via configure ###
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/snownews/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 18 Sep 2009 20:51:35 -0000 1.3
+++ patches/patch-configure 19 Sep 2020 15:14:38 -0000
@@ -1,12 +1,46 @@
-$OpenBSD: patch-configure,v 1.3 2009/09/18 20:51:35 martynas Exp $
---- configure.orig Thu Sep 17 09:44:27 2009
-+++ configure Thu Sep 17 11:10:45 2009
-@@ -12,7 +12,7 @@ my $xmlldflags = `xml2-config --libs`;
- chomp($xmlldflags);
+$OpenBSD$
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -36,9 +36,9 @@ seds=[s/^#undef \(USE_UNSUPPORTED_AND_BROKEN_CODE\)/#d
+ PROGS="CC=gcc CC=clang INSTALL=install MSGFMT=msgfmt"
- my $prefix = "/usr/local";
--my $cflags = "-Wall -Wno-format-y2k -O2
-DLOCALEPATH=\"\\\"\$(LOCALEPATH)\\\"\" -DOS=\\\"$os\\\" $xmlcflags
\$(EXTRA_CFLAGS) ";
-+my $cflags = "-Wall -Wno-format-y2k -DLOCALEPATH=\"\\\"\$(LOCALEPATH)\\\"\"
-DOS=\\\"$os\\\" $xmlcflags \$(EXTRA_CFLAGS) ";
- my $ldflags = "-lncurses -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
+ # Libs found using pkg-config
+-LIBS="libxml-2.0 ncurses zlib"
++LIBS="libxml-2.0 zlib"
+ # Defaults to substitute with pkg-config --libs output
+-DEFLIBS="-lxml2 -lncursesw -lz"
++DEFLIBS="-lxml2 -lz"
+ # Defaults to substitute with pkg-config --cflags output
+ DEFINCS="-I\/usr\/include\/libxml2"
- my $use_nls = 1;
+@@ -156,21 +156,21 @@ done
+ #### Set directory prefixes ##########################################
+
+ sub "s/@prefix@/${ac_var_prefix:=\/usr\/local}/g
+-s/@bindir@/${ac_var_bindir:=$ac_var_prefix\/bin}/g
+-s/@mandir@/${ac_var_mandir:=$ac_var_prefix\/share\/man}/g
+-s/@localedir@/${ac_var_localedir:=$ac_var_prefix\/share\/locale}/g
+-s/@builddir@/\/tmp\/$USER\/make/g
++s/@bindir@/${ac_var_bindir:=$ac_var_prefix\\/bin}/g
++s/@mandir@/${ac_var_mandir:=$ac_var_prefix\\/share\\/man}/g
++s/@localedir@/${ac_var_localedir:=$ac_var_prefix\\/share\\/locale}/g
++s/@builddir@/\\/tmp\\/$USER\\/make/g
+ s/@pkgdir@//g"
+
+ # Replace prefix variables, where available
+ if [ "$ac_var_bindir" = "$ac_var_prefix\/bin" ]; then
+- sub "s/$ac_var_bindir/\${PREFIX}\/bin/";
++ sub "s/$ac_var_bindir/\${PREFIX}\\/bin/";
+ fi
+ if [ "$ac_var_mandir" = "$ac_var_prefix\/share\/man" ]; then
+- sub "s/$ac_var_mandir/\${PREFIX}\/share\/man/";
++ sub "s/$ac_var_mandir/\${PREFIX}\\/share\\/man/";
+ fi
+ if [ "$ac_var_localedir" = "$ac_var_prefix\/share\/locale" ]; then
+- sub "s/ $ac_var_localedir/ \${PREFIX}\/share\/locale/";
++ sub "s/ $ac_var_localedir/ \${PREFIX}\\/share\\/locale/";
+ fi
+
+ #### Find programs and libs ##########################################
Index: patches/patch-doc_man_snownews_1_in
===================================================================
RCS file: patches/patch-doc_man_snownews_1_in
diff -N patches/patch-doc_man_snownews_1_in
--- patches/patch-doc_man_snownews_1_in 20 Jul 2008 17:09:26 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-doc_man_snownews_1_in,v 1.3 2008/07/20 17:09:26 martynas Exp $
---- doc/man/snownews.1.in.orig Sun Feb 17 14:43:57 2008
-+++ doc/man/snownews.1.in Sun Jul 20 18:09:54 2008
-@@ -186,14 +186,14 @@ variable "http_proxy". Snownews expects this variable
- .P
- .B Automatic update checking
- .P
--Once a week the program will automatically check for a new version when it
exits.
-+Once a week the program can automatically check for a new version when it
exits.
- It will request a file named "version" from my webserver and compare
- the returned value with the local program version. If they differ it
- notifies the user of a new version. It is done on exit to be least
- annoying I hope. This way you can easily ignore it if you don't want
- to upgrade for some reason or can't, because you're using a package
--that came with your distribution, etc. To disable this check, put the value
---1 into the file ~/.snownews/updatecheck. Snownews will
-+that came with your distribution, etc. To enable this check, create
-+an empty file ~/.snownews/updatecheck. Snownews will
- not transfer anything to my server. It will just download a file
- containing the version number and compare it locally.
- .P
Index: patches/patch-netio_c
===================================================================
RCS file: patches/patch-netio_c
diff -N patches/patch-netio_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-netio_c 19 Sep 2020 15:14:38 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: netio.c
+--- netio.c.orig
++++ netio.c
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <netdb.h>
+ #include <netinet/in.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
+ #include <syslog.h>
+ #include <unistd.h>
Index: patches/patch-updatecheck_c
===================================================================
RCS file: patches/patch-updatecheck_c
diff -N patches/patch-updatecheck_c
--- patches/patch-updatecheck_c 20 Jul 2008 17:09:26 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-updatecheck_c,v 1.1 2008/07/20 17:09:26 martynas Exp $
---- updatecheck.c.orig Sun Feb 17 14:43:58 2008
-+++ updatecheck.c Sun Jul 20 18:09:09 2008
-@@ -54,9 +54,7 @@ void AutoVersionCheck (void) {
- snprintf (file, sizeof(file), "%s/.snownews/updatecheck",
getenv("HOME"));
- lastupdated = fopen (file, "r+");
- if (lastupdated == NULL) {
-- lastupdated = fopen (file, "w+");
-- fputs (timestring, lastupdated);
-- fclose (lastupdated);
-+ return;
- } else {
- fgets (oldtimestring, sizeof(oldtimestring), lastupdated);
- oldtime = atoi(oldtimestring);
Index: pkg/MESSAGE
===================================================================
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE 19 Sep 2020 15:14:38 -0000
@@ -0,0 +1,2 @@
+Snownews no longer natively supports HTTPS. You should update your feeds
+to use ftp(1) with something like `exec:ftp -V -o - <FEED URL>`
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/snownews/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 20 Jul 2008 17:09:26 -0000 1.12
+++ pkg/PLIST 19 Sep 2020 15:14:38 -0000
@@ -16,9 +16,9 @@ man/it/man1/
man/nl/
man/nl/man1/
@man man/nl/man1/snownews.1
-man/ru_RU.KOI8-R/
-man/ru_RU.KOI8-R/man1/
-@man man/ru_RU.KOI8-R/man1/snownews.1
+man/ru.KOI8-R/
+man/ru.KOI8-R/man1/
+@man man/ru.KOI8-R/man1/snownews.1
share/locale/be@latin/
share/locale/be@latin/LC_MESSAGES/
share/locale/be@latin/LC_MESSAGES/snownews.mo
@@ -27,6 +27,7 @@ share/locale/es/LC_MESSAGES/snownews.mo
share/locale/fr/LC_MESSAGES/snownews.mo
share/locale/it/LC_MESSAGES/snownews.mo
share/locale/ja/LC_MESSAGES/snownews.mo
+share/locale/ko/LC_MESSAGES/snownews.mo
share/locale/nl/LC_MESSAGES/snownews.mo
share/locale/pl/LC_MESSAGES/snownews.mo
share/locale/pt_BR/LC_MESSAGES/snownews.mo
