pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
xrn: Updated to version 10.1
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By: micha
Date: Fri Aug 24 13:33:32 2018 +0200
Changeset: 956fe2e4d25072caf051dd48620ac03aa40521e6
Modified Files:
xrn/DESCR
xrn/Makefile
xrn/README
xrn/distinfo
xrn/patches/patch-config.h
Added Files:
xrn/files/xrn.spec.in
Removed Files:
xrn/patches/patch-clientlib.c
xrn/patches/patch-compose.c
xrn/patches/patch-error__hnds.c
xrn/patches/patch-file__cache.c
xrn/patches/patch-getdate.y
xrn/patches/patch-internals.c
xrn/patches/patch-news.h
xrn/patches/patch-refile.c
xrn/patches/patch-resources.c
xrn/patches/patch-save.c
xrn/patches/patch-server.c
xrn/patches/patch-tempnam.c
Log Message:
xrn: Updated to version 10.1
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=956fe2e4d25072caf051dd48620ac03aa40521e6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
xrn/DESCR | 22 +++++++++++---------
xrn/Makefile | 37 ++++++++++++++++-----------------
xrn/README | 10 +++++----
xrn/distinfo | 24 ++++++----------------
xrn/files/xrn.spec.in | 33 ++++++++++++++++++++++++++++++
xrn/patches/patch-clientlib.c | 14 -------------
xrn/patches/patch-compose.c | 34 -------------------------------
xrn/patches/patch-config.h | 45 ++++++++++++-----------------------------
xrn/patches/patch-error__hnds.c | 14 -------------
xrn/patches/patch-file__cache.c | 14 -------------
xrn/patches/patch-getdate.y | 14 -------------
xrn/patches/patch-internals.c | 23 ---------------------
xrn/patches/patch-news.h | 14 -------------
xrn/patches/patch-refile.c | 15 --------------
xrn/patches/patch-resources.c | 14 -------------
xrn/patches/patch-save.c | 15 --------------
xrn/patches/patch-server.c | 15 --------------
xrn/patches/patch-tempnam.c | 15 --------------
18 files changed, 89 insertions(+), 283 deletions(-)
diffs:
diff --git a/xrn/DESCR b/xrn/DESCR
index 6890d33d4e..25ff09f674 100644
--- a/xrn/DESCR
+++ b/xrn/DESCR
@@ -1,15 +1,17 @@
- 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@localhost.
+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 <http://www.xs4all.nl/~js/gnksa/> for more information
+about the GNKSA. XRN's GNKSA review can be viewed at
+<http://www.xs4all.nl/~js/gnksa/Evaluations/xrn-9.02beta4.txt>.
+
+XRN is maintained by Jonathan Kamens. Bug reports or comments about
+it should be sent to <mailto:bug-xrn%kamens.brookline.ma.us@localhost>.
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.
diff --git a/xrn/Makefile b/xrn/Makefile
index 8d8eb5d154..03a27e6af6 100644
--- a/xrn/Makefile
+++ b/xrn/Makefile
@@ -1,7 +1,6 @@
# $NetBSD$
-DISTNAME= 10.00
-PKGNAME= xrn-10.00-beta-3
+DISTNAME= xrn-10.1
CATEGORIES= news
MASTER_SITES= ftp://rtfm.mit.edu/pub/xrn/
@@ -10,34 +9,36 @@ HOMEPAGE= http://www.mit.edu/people/jik/software/xrn.html
COMMENT= USENET Newsreader for the X window system
LICENSE= modified-bsd
-WRKSRC= ${WRKDIR}/xrn-10.00-beta-3
-DIST_SUBDIR= xrn
-
GNU_CONFIGURE= yes
+# Note for gmake: Recent NetBSD make should work too, bmake-20150505 fails
USE_TOOLS+= gmake lex pkg-config yacc
DOCDIR= share/doc/xrn
INSTALLATION_DIRS+= ${DOCDIR}
.include "../../mk/bsd.prefs.mk"
-# 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
-.else
+
+# Standard Xaw is the only variant supported by upstream
XAW_TYPE= standard
-.endif
+
+# 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
+
+post-patch:
+ ${CP} ${FILESDIR}/xrn.spec.in ${WRKSRC}
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 ChangeLog; do \
+ ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/share/doc/xrn; \
done
-# Select implementation of the Athena Widgets via XAW_TYPE
.include "../../mk/xaw.buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/xrn/README b/xrn/README
index 334f3a7097..bb27c89853 100644
--- a/xrn/README
+++ b/xrn/README
@@ -1,6 +1,8 @@
-Modifications compared to current pkgsrc package:
+Modifications compared to current pkgsrc package
+================================================
+(this file should be removed before import)
+
- Master site updated
-- Updated to version 10.00beta3
+- Updated to version 10.1
- Makefile rewritten for new autotools build system
-- Sent some patches required to built on NetBSD to upstream
-- Let pkgsrc select implementation of the Athena Widgets via XAW_TYPE
+- Patches required to built on NetBSD sent to upstream
diff --git a/xrn/distinfo b/xrn/distinfo
index 36657703e6..cccdc22da5 100644
--- a/xrn/distinfo
+++ b/xrn/distinfo
@@ -1,19 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/02 23:49:48 agc Exp $
+$NetBSD$
-SHA1 (xrn/10.00.tar.gz) = 1f54457b9fb544a7b88a1b0dc8e1f7f1c1c137da
-RMD160 (xrn/10.00.tar.gz) = 99d30371be693a8c5edde6f562e8e87d6f1f8954
-SHA512 (xrn/10.00.tar.gz) = a6aa2547add7198936f91ea67738ecc42f46c8caacffb94d14ab1b83180eafb856d1646e908a2bbbcb8f589002d110331760d1d6e5513bc24ed1a9077d4925e3
-Size (xrn/10.00.tar.gz) = 439107 bytes
-SHA1 (patch-clientlib.c) = b0f4f7b4c4c66b526f67d3f7ba1e2a1334ffa166
-SHA1 (patch-compose.c) = d3760e0bca4cea9a55631796c6e59c1a5420e942
-SHA1 (patch-config.h) = 6b32ec0ce14c4cfc99d2c940e895fd5ab343816f
-SHA1 (patch-error__hnds.c) = 1ec3ceb6731f626a25ffacdf46f98254c237b91e
-SHA1 (patch-file__cache.c) = ab8f2eb0f542319b32240d70adee5f14ce17ea4a
-SHA1 (patch-getdate.y) = a508f2206432b6238b202e3c6e27a401328c49b6
-SHA1 (patch-internals.c) = 721ada641f172e2483884aacc60a5791fb354d14
-SHA1 (patch-news.h) = 2b0a7fc36c61484d0cb9d45edfd31f0e53c09ee2
-SHA1 (patch-refile.c) = 208b277391475e4d97a897cc98eebc58bb8e9027
-SHA1 (patch-resources.c) = 04992241f39ab01784883182d19425cd8c254bc2
-SHA1 (patch-save.c) = b5b61a3461687b4d813aba8f6a57d48738a4755a
-SHA1 (patch-server.c) = 902fe2dea7492a7b8e9ddf94bdadcef318061ef5
-SHA1 (patch-tempnam.c) = 60de971e125f11003bcd4b1c4320c740d366f639
+SHA1 (xrn-10.1.tar.gz) = 05066b8e3ac8746d618f554654aaf024776d2898
+RMD160 (xrn-10.1.tar.gz) = 59f11586feb56b82ebb7d680a7bfabad0dd7a476
+SHA512 (xrn-10.1.tar.gz) = ca70d6d99aa8ffba52fd1278f153f2eec2f510a0cc963acdbb7442294cc393039b8eae877579e8736688e7b7891c7f2d873fdda1eb7595f694c5a559064533f0
+Size (xrn-10.1.tar.gz) = 470505 bytes
+SHA1 (patch-config.h) = e1386011fe2c1f7fb518f0f5a7b3b4a9b93a00f1
diff --git a/xrn/files/xrn.spec.in b/xrn/files/xrn.spec.in
new file mode 100644
index 0000000000..b5983a702d
--- /dev/null
+++ b/xrn/files/xrn.spec.in
@@ -0,0 +1,33 @@
+%define tgz_version xPACKAGE_VERSIONx
+%define rpm_version xPACKAGE_VERSIONx
+
+Summary: An X Windows System news reader.
+Name: xrn
+Version: %{rpm_version}
+Release: 6jik
+License: UCB
+Group: Applications/Internet
+Source: xrn-%{tgz_version}.tar.gz
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libXaw-devel
+%description
+A simple Usenet News reader for the X Window System. Xrn allows you to
+point and click your way through reading, replying and posting news
+messages.
+
+Install the xrn package if you need a simple news reader for X.
+
+%prep
+%setup -n xrn-%{tgz_version}
+%build
+%configure
+make
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+%files
+%defattr(-,root,root)
+%doc COMMON-PROBLMS COPYRIGHT CREDITS README
+%{_bindir}/*
+%{_sysconfdir}/X11/app-defaults/*
+%{_mandir}/man1/*
diff --git a/xrn/patches/patch-clientlib.c b/xrn/patches/patch-clientlib.c
deleted file mode 100644
index 310a9825a5..0000000000
--- a/xrn/patches/patch-clientlib.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header file.
-
---- clientlib.c.orig 2008-11-28 19:48:24.000000000 +0000
-+++ clientlib.c
-@@ -30,6 +30,7 @@ static char XRNrcsid[] = "$Id: clientlib
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-+#include <stdlib.h>
- #include "config.h"
- #include "utils.h"
- #include <X11/Xos.h>
diff --git a/xrn/patches/patch-compose.c b/xrn/patches/patch-compose.c
deleted file mode 100644
index 64adffd396..0000000000
--- a/xrn/patches/patch-compose.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header file.
-Don't use data as format string in sprintf().
-Typecast parameter of variadic function execl().
-
---- compose.c.orig 2010-02-03 17:54:24.000000000 +0000
-+++ compose.c
-@@ -40,6 +40,7 @@ static char XRNrcsid[] = "$Id: compose.c
- #include <ctype.h>
- #include <errno.h>
- #include <sys/file.h>
-+#include <stdlib.h>
- #include <signal.h>
- #include <assert.h>
- #include "error_hnds.h"
-@@ -1936,7 +1937,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 */
-@@ -2369,7 +2370,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);
- }
diff --git a/xrn/patches/patch-config.h b/xrn/patches/patch-config.h
index f1a05751bb..52e31fc24e 100644
--- a/xrn/patches/patch-config.h
+++ b/xrn/patches/patch-config.h
@@ -1,42 +1,23 @@
$NetBSD$
-Insert correct path for sendmail.
-Extend list of OS so that system regex functions can be used on NetBSD.
+Insert pkgsrc default configuration.
---- config.h.orig 2008-11-28 19:48:24.000000000 +0000
+--- config.h.orig 2018-08-23 17:17:58.000000000 +0000
+++ config.h
-@@ -33,6 +33,7 @@
- /*
+@@ -30,6 +30,16 @@
* config.h: configurable defaults
*/
-+#define CONFIG_H_IS_OK
++/* 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!"
-@@ -442,7 +443,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 +452,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"
-@@ -501,7 +502,7 @@
- */
-
- /* POSIX regex routines */
--#if defined(linux) || defined(hpux) || defined(__hpux) || defined(__osf__) || defined(__CYGWIN__)
-+#if defined(linux) || defined(hpux) || defined(__hpux) || defined(__osf__) || defined(__CYGWIN__) || defined(__NetBSD__)
- #define POSIX_REGEX
- #endif
-
diff --git a/xrn/patches/patch-error__hnds.c b/xrn/patches/patch-error__hnds.c
deleted file mode 100644
index f9cc809472..0000000000
--- a/xrn/patches/patch-error__hnds.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header file.
-
---- error_hnds.c.orig 2008-11-28 19:48:24.000000000 +0000
-+++ error_hnds.c
-@@ -36,6 +36,7 @@ static char XRNrcsid[] = "$Id: error_hnd
- #include "copyright.h"
- #include "config.h"
- #include "utils.h"
-+#include <stdlib.h>
- #include <X11/Xos.h>
- #include <signal.h>
- #include <X11/Intrinsic.h>
diff --git a/xrn/patches/patch-file__cache.c b/xrn/patches/patch-file__cache.c
deleted file mode 100644
index 88ab038ed4..0000000000
--- a/xrn/patches/patch-file__cache.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header file.
-
---- file_cache.c.orig 2008-11-28 19:42:06.000000000 +0000
-+++ file_cache.c
-@@ -2,6 +2,7 @@
- A file cache implementation.
- */
-
-+#include <unistd.h>
- #include <assert.h>
-
- #ifdef XRN
diff --git a/xrn/patches/patch-getdate.y b/xrn/patches/patch-getdate.y
deleted file mode 100644
index cc1c932858..0000000000
--- a/xrn/patches/patch-getdate.y
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header file.
-
---- getdate.y.orig 2008-11-28 19:42:06.000000000 +0000
-+++ getdate.y
-@@ -58,6 +58,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <time.h>
-+#include <stdlib.h>
-
- #include "config.h"
- #include "utils.h"
diff --git a/xrn/patches/patch-internals.c b/xrn/patches/patch-internals.c
deleted file mode 100644
index ec28107bf3..0000000000
--- a/xrn/patches/patch-internals.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header file.
-Don't declare own errno.
-
---- internals.c.orig 2008-11-28 19:48:24.000000000 +0000
-+++ internals.c
-@@ -36,6 +36,7 @@ static char XRNrcsid[] = "$Id: internals
- #include "copyright.h"
- #include "config.h"
- #include "utils.h"
-+#include <stdlib.h>
- #include <X11/Xos.h>
- #include <errno.h>
- #include <assert.h>
-@@ -142,7 +143,6 @@ void checkLock()
- char myhost[64];
- int pid;
- FILE *fp;
-- extern int errno;
-
- if (!buffer) {
- /* silently ignore this condition */
diff --git a/xrn/patches/patch-news.h b/xrn/patches/patch-news.h
deleted file mode 100644
index c78b634b9e..0000000000
--- a/xrn/patches/patch-news.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header file.
-
---- news.h.orig 2008-11-28 19:48:24.000000000 +0000
-+++ news.h
-@@ -35,6 +35,7 @@
- *
- */
-
-+#include <stdlib.h>
- #include "avl.h"
- #include "hash.h"
- #include "file_cache.h"
diff --git a/xrn/patches/patch-refile.c b/xrn/patches/patch-refile.c
deleted file mode 100644
index bf61c6ce11..0000000000
--- a/xrn/patches/patch-refile.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header files.
-
---- refile.c.orig 2008-11-28 19:48:24.000000000 +0000
-+++ refile.c
-@@ -36,6 +36,8 @@ static char XRNrcsid[] = "$Id: refile.c
-
- #include "config.h"
- #include "utils.h"
-+#include <stdlib.h>
-+#include <unistd.h>
- #include <ctype.h>
- #if defined(SYSV) || defined(SVR4)
- #include <fcntl.h>
diff --git a/xrn/patches/patch-resources.c b/xrn/patches/patch-resources.c
deleted file mode 100644
index 88c8b79e6d..0000000000
--- a/xrn/patches/patch-resources.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header file.
-
---- resources.c.orig 2008-11-28 19:48:24.000000000 +0000
-+++ resources.c
-@@ -34,6 +34,7 @@ static char XRNrcsid[] = "$Id: resources
- #include "copyright.h"
- #include "config.h"
- #include "utils.h"
-+#include <stdlib.h>
- #include <X11/Xos.h>
- #ifdef MOTIF
- # include <Xm/Xm.h>
diff --git a/xrn/patches/patch-save.c b/xrn/patches/patch-save.c
deleted file mode 100644
index 477022f073..0000000000
--- a/xrn/patches/patch-save.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Don't declare own errno.
-
---- save.c.orig 2008-11-28 19:48:24.000000000 +0000
-+++ save.c
-@@ -50,8 +50,6 @@ static char XRNrcsid[] = "$Id: save.c 23
- #include "refile.h"
- #include "file_cache.h"
-
--extern int errno;
--
- #define BUFFER_SIZE 1024
-
- #ifndef S_ISDIR
diff --git a/xrn/patches/patch-server.c b/xrn/patches/patch-server.c
deleted file mode 100644
index 23414b5754..0000000000
--- a/xrn/patches/patch-server.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Don't declare own errno.
-
---- server.c.orig 2009-03-02 15:12:09.000000000 +0000
-+++ server.c
-@@ -70,8 +70,6 @@ static char XRNrcsid[] = "$Id: server.c
- #include <vfork.h>
- #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/xrn/patches/patch-tempnam.c b/xrn/patches/patch-tempnam.c
deleted file mode 100644
index 2e8120772c..0000000000
--- a/xrn/patches/patch-tempnam.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Inlcude missing system header files.
-
---- tempnam.c.orig 2008-11-28 19:42:06.000000000 +0000
-+++ tempnam.c
-@@ -7,6 +7,8 @@
-
- #include "utils.h"
- #include <sys/file.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-
- #ifndef P_tmpdir
- #define P_tmpdir "/usr/tmp/"
Home |
Main Index |
Thread Index |
Old Index