From bd76a032d33271e1e0ebf896a4c8226a5e79af42 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 10 Nov 2018 20:03:40 +0000 Subject: xrn: update to 10.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update provided by Michael Bäuerle via wip. Changes: too many to list here, previous distfile is from 1998(!). --- news/xrn/DESCR | 25 +++++++++--------- news/xrn/Makefile | 53 +++++++++++++++++++++++++------------- news/xrn/PLIST | 5 ++-- news/xrn/distinfo | 21 +++++---------- news/xrn/patches/patch-aa | 31 ---------------------- news/xrn/patches/patch-ab | 15 ----------- news/xrn/patches/patch-ac | 19 -------------- news/xrn/patches/patch-ad | 46 --------------------------------- news/xrn/patches/patch-ae | 12 --------- news/xrn/patches/patch-af | 13 ---------- news/xrn/patches/patch-ag | 13 ---------- news/xrn/patches/patch-clientlib.c | 32 ----------------------- news/xrn/patches/patch-compose.c | 43 ------------------------------- news/xrn/patches/patch-config.h | 23 +++++++++++++++++ news/xrn/patches/patch-rclex.l | 20 -------------- 15 files changed, 79 insertions(+), 292 deletions(-) delete mode 100644 news/xrn/patches/patch-aa delete mode 100644 news/xrn/patches/patch-ab delete mode 100644 news/xrn/patches/patch-ac delete mode 100644 news/xrn/patches/patch-ad delete mode 100644 news/xrn/patches/patch-ae delete mode 100644 news/xrn/patches/patch-af delete mode 100644 news/xrn/patches/patch-ag delete mode 100644 news/xrn/patches/patch-clientlib.c delete mode 100644 news/xrn/patches/patch-compose.c create mode 100644 news/xrn/patches/patch-config.h delete mode 100644 news/xrn/patches/patch-rclex.l (limited to 'news') diff --git a/news/xrn/DESCR b/news/xrn/DESCR index 6890d33d4e0..b8ddbb0e9d5 100644 --- a/news/xrn/DESCR +++ b/news/xrn/DESCR @@ -1,15 +1,16 @@ - XRN is a Usenet News reader for the X window system. It requires an -NNTP server to talk to (i.e., it cannot read news from local disk -files), and the NNTP server must support the XHDR command (most -servers nowadays do; if yours doesn't, XRN will complain when you try -to run it). +XRN is a Usenet News reader for the X window system. - XRN is currently maintained by Jonathan Kamens. Bug reports or -comments about it should be sent to bug-xrn@kamens.brookline.ma.us. +XRN strives to adhere to all relevant standards (except MIME) and to +help users avoid the common pitfalls of participation in the Usenet. +To that end, all releases of XRN starting with 9.02 are compliant with +the Good Net-Keeping Seal of Approval (GNKSA), a standard which defines +how News readers should behave to make the Usenet a better place for +everyone. See for more information +about the GNKSA. XRN's GNKSA review can be viewed at +. + +XRN is maintained by Jonathan Kamens. Bug reports or comments about +it should be sent to . Please do *not* write to that address with basic questions about compiling the program; if you are unfamiliar with compiling X -applications and the instructions below are not sufficient, you should -seek help at your site. - - Versions of XRN prior to 7.00 were maintained by Ellen Santovich and -Rick Spickelmier. +applications, you should seek help at your site. diff --git a/news/xrn/Makefile b/news/xrn/Makefile index 7f6226e1916..699be179e61 100644 --- a/news/xrn/Makefile +++ b/news/xrn/Makefile @@ -1,30 +1,47 @@ -# $NetBSD: Makefile,v 1.19 2012/10/08 12:27:42 asau Exp $ -# +# $NetBSD: Makefile,v 1.20 2018/11/10 20:03:40 wiz Exp $ -DISTNAME= 9.01 -PKGNAME= xrn-9.01 -PKGREVISION= 4 -CATEGORIES= news x11 -MASTER_SITES= ftp://sipb.mit.edu/pub/xrn/ -EXTRACT_SUFX= .tgz +DISTNAME= xrn-10.11 +CATEGORIES= news +MASTER_SITES= ftp://rtfm.mit.edu/pub/xrn/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.mit.edu/people/jik/software/xrn.html -COMMENT= Usenet News reader for the X window system +HOMEPAGE= https://stuff.mit.edu/~jik/software/xrn.html +COMMENT= USENET Newsreader for the X window system +LICENSE= modified-bsd + +GNU_CONFIGURE= yes +# Note for gmake: Recent NetBSD make should work too, bmake-20150505 fails +USE_TOOLS+= gmake lex pkg-config yacc -WRKSRC= ${WRKDIR} -DIST_SUBDIR= xrn +DOCDIR= share/doc/xrn +INSTALLATION_DIRS+= ${DOCDIR} +INSTALLATION_DIRS+= lib/X11/app-defaults -USE_TOOLS+= lex yacc -USE_IMAKE= yes +.include "../../mk/bsd.prefs.mk" -INSTALLATION_DIRS+= share/doc/xrn +# Standard Xaw is the only variant supported by upstream +XAW_TYPE= standard + +# Experimental Xaw3d support for NetBSD +#.if ${OPSYS} == "NetBSD" && ${XAW_TYPE} == "3d" +#BUILDLINK_TRANSFORM+= l:Xaw7:Xaw3d +#.PHONY: buildlink-Xaw3d-inc-hack +#post-wrapper: buildlink-Xaw3d-inc-hack +# +#buildlink-Xaw3d-inc-hack: buildlink-directories +# cd ${BUILDLINK_DIR}/include/X11 && mv Xaw Xaw.standard && ln -s Xaw3d Xaw +#.endif pre-install: - for f in COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/share/doc/xrn; \ + for f in COMMON-PROBLMS COPYRIGHT CREDITS; do \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/share/doc/xrn; \ done -.include "../../x11/libXaw/buildlink3.mk" +post-install: + mv ${DESTDIR}${PREFIX}/etc/X11/app-defaults/XRn ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XRn + +.include "../../mk/xaw.buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xorgproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/xrn/PLIST b/news/xrn/PLIST index 879cb4f2f15..36542a3069c 100644 --- a/news/xrn/PLIST +++ b/news/xrn/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:10:07 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2018/11/10 20:03:40 wiz Exp $ bin/xrn lib/X11/app-defaults/XRn -${IMAKE_MAN_DIR}/xrn.${IMAKE_MANNEWSUFFIX} +man/man1/xrn.1 share/doc/xrn/COMMON-PROBLMS share/doc/xrn/COPYRIGHT share/doc/xrn/CREDITS -share/doc/xrn/ChangeLog diff --git a/news/xrn/distinfo b/news/xrn/distinfo index 3f168e29bd1..11cd7aaef99 100644 --- a/news/xrn/distinfo +++ b/news/xrn/distinfo @@ -1,16 +1,7 @@ -$NetBSD: distinfo,v 1.9 2015/11/02 23:49:48 agc Exp $ +$NetBSD: distinfo,v 1.10 2018/11/10 20:03:40 wiz Exp $ -SHA1 (xrn/9.01.tgz) = a560d07629efaa907ae01527192dd474e11555ad -RMD160 (xrn/9.01.tgz) = c98d26e17fd8c511d9272378a54943ef9a453d3a -SHA512 (xrn/9.01.tgz) = 05baa1e2aa15c6e284482026a81ac37724e024af97218ebf0e1bd7d0209922bf1a32e0bf337c6216d5face5a607bba5274fee0a67f1dd72d6e1fd6a9286a3a11 -Size (xrn/9.01.tgz) = 357098 bytes -SHA1 (patch-aa) = 5560da41c2ef1d077fcc696f954bca7528d577af -SHA1 (patch-ab) = 8e44803fcbffc0985a68479bf8f177793c1d857f -SHA1 (patch-ac) = 4113548f1b957aef9748571b05f4ee03a8c302ca -SHA1 (patch-ad) = b4b88f463cfab63500d284620fb32a6a418fd6ca -SHA1 (patch-ae) = 3a1eef86f89acaa3b0bb6a78bfbd8d7c4be969d2 -SHA1 (patch-af) = 849b86cac73328cf2a773bc289f97c3e21456f71 -SHA1 (patch-ag) = f42c743a45c68b7702494399dbf40c3ac9cefd13 -SHA1 (patch-clientlib.c) = 21ed52e3648803572be6b7ddb6c67fb546418364 -SHA1 (patch-compose.c) = 3f98c97236401aeb8db9e7c560a9c12d46d2a95e -SHA1 (patch-rclex.l) = 9fa36815375c1d389cbf286cd15a8322d7006209 +SHA1 (xrn-10.11.tar.gz) = 4dfe8063b1356c74f2e92ab84d93ff464a174e70 +RMD160 (xrn-10.11.tar.gz) = 7bb29af447efcb4197be2f780d7bd9733f5523a5 +SHA512 (xrn-10.11.tar.gz) = e65def882d2bfbf376fa903d35007091d94ba0a927bc75bfd988d6f7f9826949db777344fd539c294c0f0af3a15ab02e470279491cca12c9314f901061fe09a7 +Size (xrn-10.11.tar.gz) = 469671 bytes +SHA1 (patch-config.h) = e1386011fe2c1f7fb518f0f5a7b3b4a9b93a00f1 diff --git a/news/xrn/patches/patch-aa b/news/xrn/patches/patch-aa deleted file mode 100644 index d813364833b..00000000000 --- a/news/xrn/patches/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-aa,v 1.1 1998/08/29 21:54:50 frueauf Exp $ - ---- config.h-orig Mon Mar 23 04:21:34 1998 -+++ config.h Sat Aug 29 23:02:04 1998 -@@ -34,6 +34,8 @@ - * config.h: configurable defaults - */ - -+#define CONFIG_H_IS_OK -+ - #ifdef OV_CAMBRIDGE - #define CONFIG_H_IS_OK - #endif -@@ -442,7 +444,7 @@ - #endif /* ! PRINTCOMMAND */ - - #ifndef SENDMAIL --#define SENDMAIL "/usr/lib/sendmail -oi -t" -+#define SENDMAIL "/usr/sbin/sendmail -oi -t" - #endif - /* The command to use to verify that an E-mail address is valid. it - should exit with status 0 if the address is valid. It shouldn't -@@ -451,7 +453,7 @@ - If you don't want XRN to ever attempt to verify sender addresses in - postings and messages, don't define this. */ - #ifndef SENDMAIL_VERIFY --#define SENDMAIL_VERIFY "/usr/lib/sendmail -bv >/dev/null" -+#define SENDMAIL_VERIFY "/usr/sbin/sendmail -bv >/dev/null" - #endif - - #define SAVEMODE "normal,headers,onedir" diff --git a/news/xrn/patches/patch-ab b/news/xrn/patches/patch-ab deleted file mode 100644 index a4d4fdb756e..00000000000 --- a/news/xrn/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1 1999/07/23 15:48:16 frueauf Exp $ - ---- Imakefile-orig Thu Jan 29 04:06:12 1998 -+++ Imakefile Wed Jul 21 19:44:31 1999 -@@ -158,6 +158,10 @@ - # endif - #endif - -+#if defined(NetBSDArchitecture) -+XRN_DEFINES = -Dunix -+#endif -+ - /* - * You probably don't need to change anything in this block. - */ diff --git a/news/xrn/patches/patch-ac b/news/xrn/patches/patch-ac deleted file mode 100644 index b7a37ec5910..00000000000 --- a/news/xrn/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2014/09/12 04:17:38 dholland Exp $ - -Use strerror, not sys_errlist. - ---- error_hnds.h.orig 1997-12-18 13:04:04.000000000 +0000 -+++ error_hnds.h -@@ -54,11 +54,6 @@ extern void ehInstallErrorHandlers _ARGU - /* install the signal handlers */ - extern void ehInstallSignalHandlers _ARGUMENTS((void)); - --#if !defined(__GNU_LIBRARY__) && !defined(__NetBSD__) && !defined(__FreeBSD__) --extern int errno, sys_nerr; --extern char *sys_errlist[]; --#endif -- --#define errmsg(a) ((a < sys_nerr) ? sys_errlist[a] : "unknown error") -+#define errmsg(a) strerror(a) - - #endif /* ERROR_HANDLERS_H */ diff --git a/news/xrn/patches/patch-ad b/news/xrn/patches/patch-ad deleted file mode 100644 index f25b2cea34d..00000000000 --- a/news/xrn/patches/patch-ad +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2012/04/16 04:33:30 dholland Exp $ - -- use standard headers -- don't declare own errno -- don't declare own strpbrk() either - ---- refile.c.orig 1997-07-04 17:30:10.000000000 +0000 -+++ refile.c -@@ -42,11 +42,8 @@ static char XRNrcsid[] = "$Id: refile.c, - #else - #include - #endif --#if defined(_XOPEN_SOURCE) - #include --#else -- char *getenv(); --#endif -+#include - #include - - #include "xrn.h" -@@ -57,8 +54,6 @@ static char XRNrcsid[] = "$Id: refile.c, - #include "mesg_strings.h" - #include "refile.h" - --extern char *strpbrk(); -- - #ifndef S_ISDIR - #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) - #endif -@@ -125,7 +120,6 @@ int MHrefile(folder, artfile) - char newfolders[512]; - char msg[512]; - struct stat st; -- extern int errno; - - - p = getenv("HOME"); -@@ -202,7 +196,6 @@ int RMAILrefile(fullpath, folder, artfil - { - char msg[512]; - struct stat st; -- extern int errno; - FILE * fp; - int artfd, rv, n; - diff --git a/news/xrn/patches/patch-ae b/news/xrn/patches/patch-ae deleted file mode 100644 index 6001e7be9dd..00000000000 --- a/news/xrn/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2006/01/02 23:33:41 joerg Exp $ - ---- internals.c.orig 2006-01-02 23:29:30.000000000 +0000 -+++ internals.c -@@ -140,7 +140,6 @@ void checkLock() - char myhost[64]; - int pid; - FILE *fp; -- extern int errno; - - if (!buffer) { - /* silently ignore this condition */ diff --git a/news/xrn/patches/patch-af b/news/xrn/patches/patch-af deleted file mode 100644 index ac3b5ac02f8..00000000000 --- a/news/xrn/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2006/01/02 23:33:41 joerg Exp $ - ---- save.c.orig 2006-01-02 23:30:05.000000000 +0000 -+++ save.c -@@ -50,8 +50,6 @@ static char XRNrcsid[] = "$Id: save.c,v - #include "refile.h" - #include "file_cache.h" - --extern int errno; -- - #define BUFFER_SIZE 1024 - - #ifndef S_ISDIR diff --git a/news/xrn/patches/patch-ag b/news/xrn/patches/patch-ag deleted file mode 100644 index 0a4477c3ce3..00000000000 --- a/news/xrn/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2006/01/02 23:33:41 joerg Exp $ - ---- server.c.orig 2006-01-02 23:30:35.000000000 +0000 -+++ server.c -@@ -65,8 +65,6 @@ static char XRNrcsid[] = "$Id: server.c, - #include - #endif - --extern int errno; -- - #define BUFFER_SIZE 1024 - /* This constant must be a 2^x times BUFFER_SIZE, for some x. */ - #define MAX_BUFFER_SIZE (8*BUFFER_SIZE) diff --git a/news/xrn/patches/patch-clientlib.c b/news/xrn/patches/patch-clientlib.c deleted file mode 100644 index 20aa9a9b965..00000000000 --- a/news/xrn/patches/patch-clientlib.c +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-clientlib.c,v 1.1 2014/09/12 04:17:38 dholland Exp $ - -- Use standard headers. -- Silence compiler warning about braces. - ---- clientlib.c~ 1997-06-05 11:11:40.000000000 +0000 -+++ clientlib.c -@@ -30,6 +30,7 @@ static char XRNrcsid[] = "$Id: clientlib - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#include - #include "config.h" - #include "utils.h" - #include -@@ -308,7 +309,7 @@ static int get_tcp_socket(machine) - - (void) memset((char *) &sin, 0, sizeof(sin)); - -- if (! port) -+ if (! port) { - if (nntp_port) - port = htons(atoi(nntp_port)); - else { -@@ -318,6 +319,7 @@ static int get_tcp_socket(machine) - } - port = sp->s_port; - } -+ } - sin.sin_port = port; - - if ((sin.sin_addr.s_addr = inet_addr(machine)) != -1) { diff --git a/news/xrn/patches/patch-compose.c b/news/xrn/patches/patch-compose.c deleted file mode 100644 index 0f81fd8001b..00000000000 --- a/news/xrn/patches/patch-compose.c +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-compose.c,v 1.1 2014/09/12 04:17:38 dholland Exp $ - -- Use standard headers. -- Silence compiler warning about format string. -- Call varargs functions correctly. - ---- compose.c~ 1998-05-14 01:29:15.000000000 +0000 -+++ compose.c -@@ -38,6 +38,7 @@ static char XRNrcsid[] = "$Id: compose.c - #include - #include - #include -+#include - #include - #include - #include "error_hnds.h" -@@ -1907,7 +1908,7 @@ getIncludedArticleText() - - if (PostingMode == FORWARD) { - int line_size; -- (void) sprintf(input, FORWARDED_ARTICLE_END_MSG); -+ (void) sprintf(input, "%s", FORWARDED_ARTICLE_END_MSG); - line_size = strlen(input); - if (prefix_size + line_size > size - cur_size - 1) { - /* See above */ -@@ -2334,7 +2335,7 @@ Call_Editor( - for (i = 3; i < maxdesc; i++) { - (void) close(i); - } -- (void) execl("/bin/sh", "sh", "-c", buffer, 0); -+ (void) execl("/bin/sh", "sh", "-c", buffer, (const char *)NULL); - (void) fprintf(stderr, ERROR_EXEC_FAILED_MSG, buffer); - (void) _exit(127); - } -@@ -2902,7 +2903,7 @@ static void switch_message_type(Header) - return; - - title = followup_or_reply_title(Header, followup, reply); -- XtVaSetValues(ComposeLabel, XtNlabel, title, 0); -+ XtVaSetValues(ComposeLabel, XtNlabel, title, (const void *)NULL); - - headers = update_headers(Header, False, followup, reply); - addField(headers); diff --git a/news/xrn/patches/patch-config.h b/news/xrn/patches/patch-config.h new file mode 100644 index 00000000000..c72657ef70d --- /dev/null +++ b/news/xrn/patches/patch-config.h @@ -0,0 +1,23 @@ +$NetBSD: patch-config.h,v 1.1 2018/11/10 20:03:40 wiz Exp $ + +Insert pkgsrc default configuration. + +--- config.h.orig 2018-08-23 17:17:58.000000000 +0000 ++++ config.h +@@ -30,6 +30,16 @@ + * config.h: configurable defaults + */ + ++/* pkgsrc configuration */ ++/* -------------------------------------------------------------------- */ ++#define ALLOW_RESOURCE_PASSWORDS 0 ++#define CROSSPOST_CONFIRM 5 ++#define FOLLOWUPTO_CONFIRM 2 ++#define SENDMAIL "/usr/sbin/sendmail -oi -t" ++#define SENDMAIL_VERIFY "/usr/sbin/sendmail -bv >/dev/null" ++/* -------------------------------------------------------------------- */ ++ ++ + #ifndef CONFIG_H_IS_OK + #error "You must edit config.h appropriately for your site!" + #endif diff --git a/news/xrn/patches/patch-rclex.l b/news/xrn/patches/patch-rclex.l deleted file mode 100644 index c63237ff26e..00000000000 --- a/news/xrn/patches/patch-rclex.l +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-rclex.l,v 1.2 2012/05/03 09:08:11 obache Exp $ - -* yylineno is present in all scanners by flex>=2.5.20 - ---- rclex.l.orig 1997-06-05 11:11:42.000000000 +0000 -+++ rclex.l -@@ -15,7 +15,12 @@ - * the Makefile from the Imakefile (with "xmkmf" or whatever else you - * used the first time), and (d) trying to compile again. - */ --int yylineno = 1; -+#if !defined(YY_FLEX_MAJOR_VERSION) || \ -+ (YY_FLEX_MAJOR_VERSION == 2 && (YY_FLEX_MINOR_VERSION < 5) || \ -+ (YY_FLEX_MINOR_VERSION == 5 && (!defined(YY_FLEX_SUBMINOR_VERSION) || \ -+ YY_FLEX_SUBMINOR_VERSION < 20))) -+int yylineno = 0; -+#endif - #define YYLINE yylineno++ - #undef yywrap - #else -- cgit v1.2.3