news/flnews: Update to 0.18

- Searching for Unicode string in current article is now supported (case
  insensitive variant based on Unicode case folding algorithm)
- Unicode database updated to version 13.0.0 (CaseFolding.txt added)
- The new 'force_unicode' entry in configfile set to a nonzero value sends
  all outgoing articles in Unicode, if they contain non-ASCII characters
- Dark background color is now usable
- MIME conformance reached (as defined in RFC 2049 Section 2)
- If selected text is present, quote only selected text for followup
- XDG desktop entry and icon theme added (option CFG_XDG_DISABLE)
- Configuration window in GUI now allows to disable the "User-Agent" header
  field for outgoing articles
- It is now possible to enable AUTHINFO USER/PASS without encrypted connection
  (option CFG_NNTP_AUTH_UNENCRYPTED)
  This allows to use stunnel instead of the internal TLS module
- TLS module no longer calls deprecated functions HMAC*(), RSA_size() and
  SSL_get_peer_certificate() for OpenSSL API 3.0.0

5 files changed, 68 insertions, 27 deletions

diff --git a/news/flnews/Makefile b/news/flnews/Makefile
index aa45d8aa61e..c9642339ff6 100644
--- a/news/flnews/Makefile
+++ b/news/flnews/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2020/08/17 20:19:53 leot Exp $
+# $NetBSD: Makefile,v 1.11 2020/11/09 12:02:25 micha Exp $
 
-FLNEWS_VERSION=	0.17
+FLNEWS_VERSION=	0.18
 
 DISTNAME=	flnews-${FLNEWS_VERSION}
-PKGREVISION=	2
 CATEGORIES=	news
 MASTER_SITES=	http://micha.freeshell.org/flnews/src/
 MASTER_SITES+=	http://www.ybtra.de/flnews-mirror/src/
@@ -11,7 +10,7 @@ MASTER_SITES+=	http://www.southcity.de/flnews/src/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	micha@NetBSD.org
-HOMEPAGE=	http://micha.freeshell.org/flnews/
+HOMEPAGE=	https://micha.freeshell.org/flnews/
 COMMENT=	Fast and lightweight USENET newsreader with GUI
 LICENSE=	modified-bsd AND 2-clause-bsd AND unicode
 
@@ -24,9 +23,6 @@ FLNEWS_MAINTAINER=	${MAINTAINER}
 
 .include "options.mk"
 
-post-extract:
-	${CP} ${FILESDIR}/CONFIG ${WRKSRC}
-
 # Prepare CONFIG file
 SUBST_CLASSES+=			edit-config
 SUBST_STAGE.edit-config=	pre-configure
@@ -39,7 +35,12 @@ SUBST_SED.edit-config+=		-e 's,@IP6@,${FLNEWS_OPT_DISABLE_IP6},g'
 SUBST_SED.edit-config+=		-e 's,@NLS@,${FLNEWS_OPT_DISABLE_NLS},g'
 SUBST_SED.edit-config+=		-e 's,@XDBE@,${FLNEWS_OPT_DISABLE_XDBE},g'
 SUBST_SED.edit-config+=		-e 's,@MAN_PATH@,${PREFIX}/${PKGMANDIR},g'
-# NetBSD 7 reports X/Open XSI extension as not available using the POSIX
+.if ${FLNEWS_OPT_DISABLE_XDG} == 0
+SUBST_SED.edit-config+=		-e 's,@XDG@,0,g'
+.else
+SUBST_SED.edit-config+=		-e 's,@XDG@,1,g'
+.endif
+# NetBSD reports X/Open XSI extension as not available using the POSIX
 # sysconf(_SC_XOPEN_VERSION) call, but has a sufficient implementation
 # => Force using it
 .if ${OPSYS} == "NetBSD"
@@ -47,7 +48,7 @@ SUBST_SED.edit-config+=		-e 's,@FORCE_XSI@,1,g'
 .else
 SUBST_SED.edit-config+=		-e 's,@FORCE_XSI@,0,g'
 .endif
-# NetBSD 7 reports IPv6 as not available using the POSIX sysconf(_SC_IPV6)
+# NetBSD reports IPv6 as not available using the POSIX sysconf(_SC_IPV6)
 # call, but has a sufficient implementation
 # => Force using it if inet6 option of pkgsrc package is selected
 .if ${OPSYS} == "NetBSD" && ${FLNEWS_OPT_DISABLE_IP6} == 0
@@ -65,8 +66,12 @@ SUBST_SED.edit-config+=		-e 's,@DEP_MD@,\#,g'
 SUBST_SED.edit-config+=		-e 's,@DEP_COMP@,,g'
 .endif
 
+post-extract:
+	${CP} ${FILESDIR}/CONFIG ${WRKSRC}
+
 do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config
+	cd ${WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config
 
 .if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER:Msunpro}
 BUILD_DEPENDS+=			makedepend-[0-9]*:../../devel/makedepend
diff --git a/news/flnews/PLIST b/news/flnews/PLIST
index b2ac9cbca31..36ebd16b8dd 100644
--- a/news/flnews/PLIST
+++ b/news/flnews/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2019/12/16 12:27:53 micha Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/11/09 12:02:25 micha Exp $
 bin/flnews
 ${PLIST.nls}lib/flnews/nls/de_DE.cat
 man/man1/flnews.1
+${PLIST.xdg}share/applications/flnews.desktop
 share/flnews/license.txt
+${PLIST.xdg}share/icons/hicolor/48x48/apps/flnews.png
+${PLIST.xdg}share/icons/hicolor/64x64/apps/flnews.png
diff --git a/news/flnews/distinfo b/news/flnews/distinfo
index 9ba9e68d329..2810be93494 100644
--- a/news/flnews/distinfo
+++ b/news/flnews/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2019/12/16 12:27:53 micha Exp $
+$NetBSD: distinfo,v 1.4 2020/11/09 12:02:25 micha Exp $
 
-SHA1 (flnews-0.17.tar.bz2) = b2b678d23f10c44c2e6c36fa5f194df757c6d744
-RMD160 (flnews-0.17.tar.bz2) = d50455fdaeae37978b54485d4c4b3acacf7747f4
-SHA512 (flnews-0.17.tar.bz2) = 007a8a38ebac81e467e5709fdcede9e45462f0dd05416b867a5a24a05acd186d8a682f53ee202925dbaffa99838b6461af3016c8d8ab001fe122087b7f63cc22
-Size (flnews-0.17.tar.bz2) = 1073850 bytes
+SHA1 (flnews-0.18.tar.bz2) = c045d6674c0abf982bd6fc3fa2fbac4aad160fb3
+RMD160 (flnews-0.18.tar.bz2) = 97a082cc065e9beaa833f13025dc1c9e72ca2dd7
+SHA512 (flnews-0.18.tar.bz2) = f0b03834587d8566db831aa6653eec18845a6902225309a44e0e1fcc97898bc21b3903d10c3ea585f514e9498c54c09c08aa29d21d5bb0ec5b99b90f5a060a39
+Size (flnews-0.18.tar.bz2) = 1100419 bytes
diff --git a/news/flnews/files/CONFIG b/news/flnews/files/CONFIG
index 4358c73761e..543e9b1ee7c 100644
--- a/news/flnews/files/CONFIG
+++ b/news/flnews/files/CONFIG
@@ -23,7 +23,7 @@ CFG_IP6_DISABLE=@IP6@
 
 # Disable compression
 # Set this to 1 if NNTP COMPRESS extension should never be used, even if the
-# required libraries (currently libz) are installed and usable.
+# required libraries (currently libz) are installed and usable
 # Otherwise the compression negotiation can be enabled and disabled in the GUI
 # (disabled by default)
 CFG_CMPR_DISABLE=0
@@ -33,7 +33,7 @@ CFG_CMPR_DISABLE=0
 CFG_DB_DISABLE=@XDBE@
 
 # Disable National Language Support (NLS)
-# Set this to 1 to disable NLS even if system report it as available.
+# Set this to 1 to disable NLS even if system report it as available
 CFG_NLS_DISABLE=@NLS@
 
 # The TLS module can do some simple checks and generate warnings if it thinks
@@ -48,6 +48,21 @@ CFG_TLS_WARNING_DISABLE=1
 # Note: Not all CAs provide CRL distribution points in their certificates
 # Set this to 0 to check the whole chain for revoked certificates
 CFG_TLS_CRLS_DISABLE=0
+
+# Disable XDG support
+# Set this to 0 to install XDG conformant desktop entries and icon themes
+CFG_XDG_DISABLE=@XDG@
+
+# [For Apple macOS only] FLTK library must be compiled to use Cocoa backend
+# Setting this to 1 moves the menu bar to top of desktop
+CFG_COCOA_SYS_MENUBAR=0
+
+# Allow NNTP AUTHINFO USER/PASS client authentication without TLS
+# The default is 0 and requires TLS encryption for authentication
+# You can set this to 1 to use a local stunnel for the encryption
+# !!! Attention: Setting this to 1 may reveal your login data to the public !!!
+# !!!            An external program must encrypt the network connection !!!
+CFG_NNTP_AUTH_UNENCRYPTED=0
 # ==============================================================================
 
 
@@ -161,10 +176,18 @@ CFG_LICENSE_PATH="$CFG_PREFIX/share/$CFG_NAME"
 # (must be an absolute path without trailing slash)
 # The FHS defines "/usr[/local]/share/nls" for NLS catalogs but the whole
 # hierarchy below "share" is dedicated to files that are portable between
-# architectures - what our catalogs are not!
+# architectures - what our NLS catalogs are not!
 CFG_NLS_PATH="$CFG_PREFIX/lib/$CFG_NAME/nls"
 
-# If you require reproducible builds for a binary package of a distribution,
+# Installation path for desktop files
+# (must be an absolute path without trailing slash)
+CFG_XDG_DESKTOP_PATH="$CFG_PREFIX/share/applications"
+
+# Installation path for icons
+# (must be an absolute path without trailing slash)
+CFG_XDG_ICON_THEME_PATH="$CFG_PREFIX/share/icons"
+
+# If you need reproducible builds for a binary package of a distribution,
 # set this to '1'.
 CFG_REPRODUCIBLE=1
 # ==============================================================================
diff --git a/news/flnews/options.mk b/news/flnews/options.mk
index 6b4156c4e8e..a0af3b48b8e 100644
--- a/news/flnews/options.mk
+++ b/news/flnews/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/04 19:17:10 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2020/11/09 12:02:25 micha Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.flnews
 PKG_SUPPORTED_OPTIONS=	inet6 nls xdbe xdg-utils
@@ -21,12 +21,12 @@ FLNEWS_OPT_DISABLE_IP6=		1
 # nls: Optional support for National Language Support (NLS)
 # Requires an OS with X/Open XSI extension API (SUSv2) and the gencat utility
 # Note: Only locales with UTF-8, ISO-8859-1 or US-ASCII codeset are supported!
-PLIST_VARS+=		nls
+PLIST_VARS+=			nls
 .if !empty(PKG_OPTIONS:Mnls)
-PLIST.nls=		yes
-FLNEWS_OPT_DISABLE_NLS=	0
+PLIST.nls=			yes
+FLNEWS_OPT_DISABLE_NLS=		0
 .else
-FLNEWS_OPT_DISABLE_NLS=	1
+FLNEWS_OPT_DISABLE_NLS=		1
 .endif
 
 # xdbe: Optional support for X11 Double Buffer Extension (XDBE)
@@ -37,8 +37,18 @@ FLNEWS_OPT_DISABLE_XDBE=	0
 FLNEWS_OPT_DISABLE_XDBE=	1
 .endif
 
-# xdg-utils: Create dependency for xdg-utils (Portland project)
-# xdg-utils are used for WWW-Browser and eMail redirection
+# xdg: Optional support for XDG (Cross-Desktop Group, now freedesktop.org)
+# - Install desktop file
+# - Install icon-theme
+# - xdg-utils (Portland project) dependency
+#   Used for WWW browser and e-mail redirection
+PLIST_VARS+=			xdg
 .if !empty(PKG_OPTIONS:Mxdg-utils)
+PLIST.xdg=			yes
+FLNEWS_OPT_DISABLE_XDG=		0
 DEPENDS+=	xdg-utils>=1.1:../../misc/xdg-utils
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.else
+FLNEWS_OPT_DISABLE_XDG=		1
 .endif