From 358148ce9efbdfa7da10f136188f9e543950af11 Mon Sep 17 00:00:00 2001 From: obache Date: Sat, 23 Aug 2014 09:34:48 +0000 Subject: [PATCH] Update slrn to 1.0.1. Based on PR pkg/49129 by Leonardo Taccari. Changes since 1.0.0 1. An issue with the wrap_width variable was fixed. Changes since 0.9.9p1 1. src/charset.c: Avoid using CODESET if it is not defined. 2. doc/slrn.1: Remove blank line at top of file. (Ignatios Souvatzis) 3. src/Makefile.in: /bin/sh on solaris does not like empty lists in a for loop causing make install to fail. Workaround added (Petr Sumbera). 4. src/mime.c: rewrote much of the email address encoding/decoding so that only comment fields in email addresses are encoded/decoded. slrn is also smarted in encoding/decoding other headers (based on patch from Robert Grimm). 5. autoconf/Makefile.in: Added dependencies such that if the Makefile.in and config.in files have been modified, the user is told to re-run the configure script. 6. Updated the copyright years to 2009. 7. src/mime.c: Omit the mime headers if the content is pure 7bit. Also, if mime-headers already exist, do not add append additional ones. 8. configure: Added the configuration option --with-non-gnu-iconv that can be used to indicate that local version of iconv is not compatible with GNU iconv (Piotr 'aniou' Meyer). 9. src/charset.c: Upon failure, slrn_test_convert_lines will return the line that caused it to fail. 10. src/charset.c: If the --debug option is given, slrn will write the strings that iconv failed to convert to the log file. 11. src/post.c: Skip long line checks between verbatim marks. (Robert Grimm). 12. src/nntplib.h: Removed duplicate declarations of nntp_server_cmd and nntp_server_vcmd. (Li Hong). 13. src/decode.c: If an output file already exists, create a new one by appending an integer to the name. 14. src/slrn.c: work around a SLang_getkey bug that arises when the underlying read system call is interrupted, and the interrupt hook creates a different read descriptor. 15. src/misc.c: All error messages (including slang tracebacks) are logged to the --debug output file. 16. src/art.c,etc: If an article has invalid headers, clear the error but give the article an initial score of -1000. This number may be customized using the "invalid_header_score" variable. 17. src/mime.c: In slrn_mime_process_article, decode headers even if Content-Type is not understood and metamail is needed. 18. src/art.c: Avoid a buffer overflow when reconstructing huge threads. Thanks to Robert Grimm for finding the problem. 19. src/version.c: %d format was used to print a long integer. 20. src/nntplib.c: slrn user "narke" discovered that his server will disconnect if an attempt is made to post an empty body. slrn does this after authenticating with the server to verify that posting is possible. As a work-around, the response comment from the AUTHINFO command is parsed. 21. src/sltcp.c: Add support for gnutls logging functions. 22. src/chkslang.c: Fixed a sscanf format issue involving long long integers. 23. src/sltcp.c: Change 21 needed #ifdef SLTCP_HAS_GNUTLS_SUPPORT. 24. src/nntplib.c: A comparison in #20 should have used != instead of ==. 25. doc/slrn.rc: "utf8" changed to "utf-8" (Thomas Wiegner). 26. src/art_misc.c: Increased the search range for a pgp signature. 27. src/misc.c: The rline_update callback function was not handling the case where no prompt (prompt==NULL) was associated with the readline object. (M. G. Berberich) 28. src/vfile.c: Add explicit void* to char* cast for better C++ compliance. 29. doc/tm/: Updated the Makefile and rebuilt the docs 30. src/interp.c, art.c: Added support for an optional argument to the replace_article function that dictates if the article should be mime processed. 31. src/*: Updated copyright year and trimmed extra whitespace. 32. macros/mime.sl: Added initial support for multipart mime messages. See macros/mime.sl for additional information. 33. macros/mime.sl;src/*.c: More support for processing multipart mime messages, including the ability to save/view the various parts of a message. 34. src/misc.c:generic_read_input: If point is negative, regard it as an offset from the end of the string. Changes were also made to the callers of this function accordingly. 35. macros/mailcap.sl: If an executable does not exist on the search path, skip the mailcap entry. 36. src/interp.c: Added "replace_cooked_article", which is like to "replace_article", but does not affect the raw lines. mime.sl was updated to use this. 37. macros/mime.sl: Added an option to the browse menu that permits the full raw article to be viewed. 38. macros/mime.sl: Added a more informative message when a mime article is encountered. 39. src/mime.c: A couple of strncmp calls used the wrong length (Patched by Thomas Wiegner). 40. macros/mime.sl: The boundary subkeyword was not being detected in a case-insensitive way. Also the wrong filename was mentioned in the usage comments. (Christian Ebert) 41. macros/mime.sl: Add an option to view all parts of a mime multipart message. 42. Added a top-level win32 directory containing scripts for building slrn using MinGW on a Windows system. See doc/INSTALL.w32 for details. 43. src/*.c: Various win32-specific tweaks to avoid some warnings generated by MinGW's gcc. 44. win32/msinstall.sl: Use $prefix/share/man instead of $prefix/man for the directory where man pages are installed. 45. doc/THANKS updated. 46. updated autoconf/config.guess and autoconf/config.sub 47. doc/THANKS rearranged. 48. src/art_misc.c: New config variable: "wrap_width", which sets the width that will trigger wrapping. 49. doc/: Updated txt docs from slrn doc project's svn repos. 50. Version 1.0 released [Dec 21, 2012]. --- news/slrn/DESCR | 13 +++++++++---- news/slrn/Makefile | 21 ++++----------------- news/slrn/PLIST | 4 +++- news/slrn/distinfo | 13 ++++++------- news/slrn/options.mk | 6 +++--- news/slrn/patches/patch-af | 4 +++- news/slrn/patches/patch-ag | 9 --------- news/slrn/patches/patch-src_slrnfeat.hin | 5 ++++- 8 files changed, 32 insertions(+), 43 deletions(-) delete mode 100644 news/slrn/patches/patch-ag diff --git a/news/slrn/DESCR b/news/slrn/DESCR index be32cad40d47..af299fc6ee6a 100644 --- a/news/slrn/DESCR +++ b/news/slrn/DESCR @@ -1,4 +1,9 @@ -Slrn is a terminal based newsreader by John E. Davis . -It supports threads and is highly customizable through S-Lang functions. - -In this package, there is only support for NNTP, not for local spool. +slrn ('S-Lang read news') is a newsreader, i.e. a program that accesses a +newsserver to read messages from the Internet News service (also known as +'Usenet'). It runs in console mode on various Unix-like systems (including +Linux), 32-bit Windows, OS/2, BeOS and VMS. Beside the usual features of a +newsreader slrn supports scoring rules to highlight, sort or kill articles +based on information from their header. It is highly customizable, allows +free key-bindings and can easily be extended using the sophisticated +S-Lang macro language. Offline reading is possible by using either +slrnpull (shipped with slrn) or a local newsserver (like leafnode or INN). diff --git a/news/slrn/Makefile b/news/slrn/Makefile index e3051dcaed06..db018b607d37 100644 --- a/news/slrn/Makefile +++ b/news/slrn/Makefile @@ -1,37 +1,24 @@ -# $NetBSD: Makefile,v 1.58 2014/02/12 23:18:28 tron Exp $ +# $NetBSD: Makefile,v 1.59 2014/08/23 09:34:48 obache Exp $ -DISTNAME= slrn-0.9.9p1 -PKGREVISION= 10 +DISTNAME= slrn-1.0.1 CATEGORIES= news -MASTER_SITES= ftp://space.mit.edu/pub/davis/slrn/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slrn/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://slrn.sourceforge.net/ COMMENT= Highly customizable threaded newsreader LICENSE= gnu-gpl-v2 -MAKE_JOBS_SAFE= no - USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-inews --with-slrnpull --enable-spool \ --enable-grouplens --with-libdir=${PREFIX}/lib/slrn \ --enable-mid-cache \ - --with-slang=${PREFIX} \ - --with-slanglib=-lslang2 \ - --with-slanginc=slang2/slang.h \ + --with-slang=${BUILDLINK_PREFIX.libslang2} \ --with-localedir=${PREFIX}/${PKGLOCALEDIR}/locale .include "options.mk" -.include "../../mk/bsd.prefs.mk" -# the next is a workaround, as 1.3.2 install doesn't like -c and -d -# together -.if ${OPSYS} == "NetBSD" && ${OS_VERSION} == "1.3.2" -CONFIGURE_ENV+= INSTALL=/usr/bin/install -.endif - -LDFLAGS.Linux+= -ldl LDFLAGS.SunOS+= -lsocket -lnsl .include "../../devel/libslang2/buildlink3.mk" diff --git a/news/slrn/PLIST b/news/slrn/PLIST index bfbaa0ae0088..f8b1d4715840 100644 --- a/news/slrn/PLIST +++ b/news/slrn/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:10:07 joerg Exp $ +@comment $NetBSD: PLIST,v 1.11 2014/08/23 09:34:48 obache Exp $ bin/slrn bin/slrnpull man/man1/slrn.1 @@ -46,6 +46,8 @@ share/slrn/slang/color.sl share/slrn/slang/gsort.sl share/slrn/slang/ispell.sl share/slrn/slang/latin2.sl +share/slrn/slang/mailcap.sl +share/slrn/slang/mime.sl share/slrn/slang/multipart.sl share/slrn/slang/nn.sl share/slrn/slang/posthook.sl diff --git a/news/slrn/distinfo b/news/slrn/distinfo index 6331b9f609de..81b7424006bf 100644 --- a/news/slrn/distinfo +++ b/news/slrn/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.15 2013/02/18 23:29:23 dholland Exp $ +$NetBSD: distinfo,v 1.16 2014/08/23 09:34:48 obache Exp $ -SHA1 (slrn-0.9.9p1.tar.gz) = f14d88eda39b78bd2f098f211d4a1c363c0fe924 -RMD160 (slrn-0.9.9p1.tar.gz) = 9e614d12c30f72a4ccde90fe557495d86d44b368 -Size (slrn-0.9.9p1.tar.gz) = 1535032 bytes -SHA1 (patch-af) = 0dbe90431bf4f4e7b8cec6c23da1ce7458a2ca38 -SHA1 (patch-ag) = 81f1b6d75d707049726d5b8dbedec1b7a4ded9ac -SHA1 (patch-src_slrnfeat.hin) = 9d6fd3419146c264eed35bdb607f8fd1bb3bb656 +SHA1 (slrn-1.0.1.tar.gz) = 9ad41ec3894d2b6b1ae8f158e994a8f138540baa +RMD160 (slrn-1.0.1.tar.gz) = 4a1aa5b3a209e8aac50df0e5557eabfe22b13622 +Size (slrn-1.0.1.tar.gz) = 1529545 bytes +SHA1 (patch-af) = 7b9507c68cefa913ebeb0e44c4ca0ad70956a3bd +SHA1 (patch-src_slrnfeat.hin) = a115a2f7de61acd5c296fb3696a3cb97226ea121 diff --git a/news/slrn/options.mk b/news/slrn/options.mk index 456357662475..7d4489e872bf 100644 --- a/news/slrn/options.mk +++ b/news/slrn/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2011/03/23 21:44:24 shattered Exp $ +# $NetBSD: options.mk,v 1.2 2014/08/23 09:34:48 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.slrn PKG_SUPPORTED_OPTIONS= ssl uulib @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --without-ssl ### .if !empty(PKG_OPTIONS:Muulib) . include "../../converters/uulib/buildlink3.mk" -CONFIGURE_ARGS+= --with-uudeview +CONFIGURE_ARGS+= --with-uu=${BUILDLINK_PREFIX.uulib} .else -CONFIGURE_ARGS+= --without-uudeview +CONFIGURE_ARGS+= --without-uu .endif diff --git a/news/slrn/patches/patch-af b/news/slrn/patches/patch-af index 753fefc8f032..2aba5fa768a4 100644 --- a/news/slrn/patches/patch-af +++ b/news/slrn/patches/patch-af @@ -1,4 +1,6 @@ -$NetBSD: patch-af,v 1.1 2008/09/04 16:15:34 is Exp $ +$NetBSD: patch-af,v 1.2 2014/08/23 09:34:48 obache Exp $ + +Directly use INSTALL_DATA as ${mkdir_p}. --- po/Makefile.in.in.orig 2008-02-11 19:04:23.000000000 +0100 +++ po/Makefile.in.in diff --git a/news/slrn/patches/patch-ag b/news/slrn/patches/patch-ag deleted file mode 100644 index 5dd41e6efedd..000000000000 --- a/news/slrn/patches/patch-ag +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2008/11/21 14:43:56 is Exp $ - ---- doc/slrn.1.orig 2008-02-10 18:01:00.000000000 +0100 -+++ doc/slrn.1 -@@ -1,4 +1,3 @@ -- - .\" - .\" This manpage has been completely rewritten by Matthias Friedrich - .\" based on the slrn reference manual diff --git a/news/slrn/patches/patch-src_slrnfeat.hin b/news/slrn/patches/patch-src_slrnfeat.hin index 8934b8d94bbb..3dceb4509284 100644 --- a/news/slrn/patches/patch-src_slrnfeat.hin +++ b/news/slrn/patches/patch-src_slrnfeat.hin @@ -1,4 +1,7 @@ -$NetBSD: patch-src_slrnfeat.hin,v 1.1 2013/02/18 23:29:23 dholland Exp $ +$NetBSD: patch-src_slrnfeat.hin,v 1.2 2014/08/23 09:34:48 obache Exp $ + +Fix compiled-in default path to sendmail; it should be /usr/sbin/sendmail +on essentially all even halfway modern systems. --- src/slrnfeat.hin~ 2008-02-09 18:32:17.000000000 +0000 +++ src/slrnfeat.hin