Update to 0.9.6.2. Change are mostly bugfixes and minor

cosmetic changes.

7 files changed, 55 insertions, 71 deletions

diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 23c236193a7..52bbc5d1027 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 1999/10/16 00:10:08 mjl Exp $
+# $NetBSD: Makefile,v 1.9 2000/01/01 18:24:30 mjl Exp $
 #
 
-DISTNAME=		slrn-0.9.5.7
+DISTNAME=		slrn-0.9.6.2
 CATEGORIES=		news
 MASTER_SITES=		ftp://space.mit.edu/pub/davis/slrn/ \
 			ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/slrn/
@@ -9,7 +9,7 @@ MASTER_SITES=		ftp://space.mit.edu/pub/davis/slrn/ \
 MAINTAINER=		mjl@netbsd.org
 HOMEPAGE=		http://space.mit.edu/%7Edavis/slrn.html
 
-DEPENDS+=		libslang-1.3.9:../../devel/libslang
+DEPENDS+=		libslang-*:../../devel/libslang
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-X
diff --git a/news/slrn/files/md5 b/news/slrn/files/md5
index 347935d4ff8..3876561d424 100644
--- a/news/slrn/files/md5
+++ b/news/slrn/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/10/16 00:10:08 mjl Exp $
+$NetBSD: md5,v 1.5 2000/01/01 18:24:32 mjl Exp $
 
-MD5 (slrn-0.9.5.7.tar.gz) = 1d3b29a68ad9a79ee442dcaba2bb7939
+MD5 (slrn-0.9.6.2.tar.gz) = 7ce442af03aeafb88a636183955c270e
diff --git a/news/slrn/files/patch-sum b/news/slrn/files/patch-sum
index 0c5d078ec20..1fb9c3810ac 100644
--- a/news/slrn/files/patch-sum
+++ b/news/slrn/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/12/17 10:30:15 pooka Exp $
+$NetBSD: patch-sum,v 1.3 2000/01/01 18:24:32 mjl Exp $
 
-MD5 (patch-aa) = 2dcb73943942a9765b0165ff6c4833ab
-MD5 (patch-ab) = 98899c0f99f77839997c404df6063f9b
-MD5 (patch-ac) = 9ec34a78965ed658f96f7b954c987d53
+MD5 (patch-aa) = 48fa2b733d050a7967a32bd236280687
+MD5 (patch-ab) = 443c43142238633733cc43913e088907
+MD5 (patch-ac) = 5e9c1069fde9eebf90ba3e7dc1b035c6
 MD5 (patch-ad) = 64a682627c658a7293a98f048be582bf
diff --git a/news/slrn/patches/patch-aa b/news/slrn/patches/patch-aa
index ca8dd58928d..786de9cca08 100644
--- a/news/slrn/patches/patch-aa
+++ b/news/slrn/patches/patch-aa
@@ -1,21 +1,12 @@
-$NetBSD: patch-aa,v 1.3 1999/05/18 22:01:36 mjl Exp $
+$NetBSD: patch-aa,v 1.4 2000/01/01 18:24:32 mjl Exp $
 
---- configure.orig	Mon May 17 07:26:54 1999
-+++ configure	Tue May 18 23:40:36 1999
-@@ -2401,6 +2401,8 @@
+--- configure.orig	Sat Jan  1 18:35:22 2000
++++ configure	Sat Jan  1 18:37:45 2000
+@@ -2554,6 +2554,7 @@
  
- fi
- 
-+slrn_cv_domain=no
-+
- echo "$ac_t""$slrn_cv_domain" 1>&6
- 
- if test "$slrn_cv_domain" != no; then
-@@ -2487,6 +2489,7 @@
- 
- JD_Search_Dirs="$JD_Search_Dirs \
-                 $includedir,$libdir \
+ # This list consists of "include,lib include,lib ..."
+ JD_Search_Dirs="$JD_Above_Dir2/slang/libsrc,$JD_Above_Dir2/slang/libsrc/"$ARCH"objs \
 +					 $prefix/include,$prefix/lib \
-                 /usr/local/include,/usr/local/lib \
- 		/usr/include,/usr/lib \
- 		/usr/include/slang,/usr/lib \
+                 $JD_Above_Dir/slang/libsrc,$JD_Above_Dir/slang/libsrc/"$ARCH"objs \
+ 		$JD_Above_Dir2/slang/src,$JD_Above_Dir2/slang/src/"$ARCH"objs \
+                 $JD_Above_Dir/slang/src,$JD_Above_Dir/slang/src/"$ARCH"objs \
diff --git a/news/slrn/patches/patch-ab b/news/slrn/patches/patch-ab
index e2bdcc0c70c..6c8e21007d1 100644
--- a/news/slrn/patches/patch-ab
+++ b/news/slrn/patches/patch-ab
@@ -1,43 +1,37 @@
-$NetBSD: patch-ab,v 1.3 1999/05/18 22:01:36 mjl Exp $
+$NetBSD: patch-ab,v 1.4 2000/01/01 18:24:32 mjl Exp $
 
---- src/Makefile.in.orig	Tue May 18 23:42:20 1999
-+++ src/Makefile.in	Tue May 18 23:44:24 1999
-@@ -61,7 +61,7 @@
- prefix = @prefix@
+--- src/Makefile.in.orig	Thu Dec 23 18:24:38 1999
++++ src/Makefile.in	Sat Jan  1 19:04:34 2000
+@@ -62,7 +62,7 @@
  exec_prefix = @exec_prefix@
+ 
  BINDIR = @bindir@
 -DOCDIR = $(prefix)/doc/slrn
 +DOCDIR = $(prefix)/share/slrn
  MANDIR = @mandir@
  MACRODIR = @datadir@/slrn
- 
-@@ -128,19 +128,16 @@
- distclean: clean
- 	/bin/rm -rf $(OBJDIR) Makefile sysconf.h
- install: all $(BINDIR)
--	$(INSTALL) -m 755 $(INSTALL_OWNER) $(OBJDIR)/slrn $(BINDIR)
--	-$(INSTALL) -m 755 $(INSTALL_OWNER) $(OBJDIR)/slrnpull $(BINDIR)
--	$(INSTALL) -d $(DOCDIR) -m 755 $(INSTALL_OWNER)
--	cd ../doc; $(INSTALL) -m 644 $(INSTALL_OWNER) $(README_FILES) $(DOCDIR)
--	$(INSTALL) -m 644 $(INSTALL_OWNER) ../COPYRIGHT $(DOCDIR)
--	$(INSTALL) -m 644 $(INSTALL_OWNER) ../COPYING $(DOCDIR)
--	$(INSTALL) -m 644 $(INSTALL_OWNER) ../README $(DOCDIR)
--	$(INSTALL) -m 644 $(INSTALL_OWNER) ../changes.txt $(DOCDIR)
--	$(INSTALL) -m 644 $(INSTALL_OWNER) ../doc/slrn.1 $(MANDIR)/man1
--	$(INSTALL) -d $(DOCDIR)/slrnpull -m 755 $(INSTALL_OWNER)
--	$(INSTALL) -m 644 $(INSTALL_OWNER) ../slrnpull/* $(DOCDIR)/slrnpull
--	$(INSTALL) -d $(MACRODIR) -m 755 $(INSTALL_OWNER)
--	$(INSTALL) -m 644 $(INSTALL_OWNER) ../macros/*.sl $(MACRODIR)
-+	$(INSTALL) -c -m 755  $(OBJDIR)/slrn $(BINDIR)
-+	$(INSTALL) -d $(DOCDIR) -m 755 
-+	-$(INSTALL) -c -m 644 ../doc/* $(DOCDIR)
-+	$(INSTALL) -c -m 644  ../COPYRIGHT $(DOCDIR)
-+	$(INSTALL) -c -m 644  ../COPYING $(DOCDIR)
-+	$(INSTALL) -c -m 644  ../README $(DOCDIR)
-+	$(INSTALL) -c -m 644  ../changes.txt $(DOCDIR)
-+	$(INSTALL) -c -m 644  ../doc/slrn.1 $(MANDIR)/man1
-+	$(INSTALL) -d $(MACRODIR) -m 755
-+	$(INSTALL) -c -m 644 ../macros/*.sl $(MACRODIR)
- $(BINDIR):
- 	- ../mkinsdir.sh $(BINDIR)
- # The symlinks target is for my own private use.  It simply creates the object
+ MKINSDIR = ../autoconf/mkinsdir.sh
+@@ -98,7 +98,7 @@
+ CONFIG_H = config.h
+ ALL_CFLAGS = $(CFLAGS) -Dunix -I$(SLANGINC) \
+  $(MISCINCLUDES) $(NNTPSERVERFILE) $(SLRNLIBDIR) $(SLRN_MACRO_DIR)
+-EXECLIBS = -L$(SLANGLIB) -lslang $(MISCLIBS) -lm
++EXECLIBS = -L$(SLANGLIB) -Wl,-R$(prefix)/lib -lslang $(MISCLIBS) -lm
+ DOT_O_DEPS = slrnfeat.h
+ server_O_DEP = clientlib.c spool.c nntp.c sltcp.c nntplib.c
+ chmap_O_DEP = chmap.h charmaps.h
+@@ -181,14 +181,6 @@
+ 	do \
+ 		echo $(INSTALL_DATA) $$i $(DEST_MANDIR)/man1/; \
+ 		$(INSTALL_DATA) $$i $(DEST_MANDIR)/man1/; \
+-		if [ "$$?" != "0" ]; then \
+-		  exit 1; \
+-		fi; \
+-	done
+-	@for i in $(SLRNPULL_DOCS); \
+-	do \
+-		echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/slrnpull; \
+-		$(INSTALL_DATA) $$i $(DEST_DOCDIR)/slrnpull; \
+ 		if [ "$$?" != "0" ]; then \
+ 		  exit 1; \
+ 		fi; \
diff --git a/news/slrn/patches/patch-ac b/news/slrn/patches/patch-ac
index db1298b6c84..d2edc310025 100644
--- a/news/slrn/patches/patch-ac
+++ b/news/slrn/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 1999/05/18 22:01:36 mjl Exp $
+$NetBSD: patch-ac,v 1.4 2000/01/01 18:24:32 mjl Exp $
 
---- src/slrnfeat.h.orig	Tue May 18 23:45:48 1999
-+++ src/slrnfeat.h	Tue May 18 23:48:42 1999
+--- src/slrnfeat.h.orig	Sat Jan  1 18:42:08 2000
++++ src/slrnfeat.h	Sat Jan  1 18:45:21 2000
 @@ -14,10 +14,10 @@
   * NOTE: if you intend to use slrnpull, make sure you enable SPOOL_SUPPORT
   *       in addition to PULL_SUPPORT.
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.3 1999/05/18 22:01:36 mjl Exp $
  /* Set this to 1 to force the user to use INEWS for posting.  This also means
   * that slrn will use the hardcoded inews program pathname.
   */
-@@ -54,7 +54,7 @@
+@@ -65,7 +65,7 @@
  #define SLRN_HAS_SLANG		1
  
  /* Set this to 0 if you do not want slrn to generate message-id header. */
@@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.3 1999/05/18 22:01:36 mjl Exp $
  
  /* If you want mapping ISO Latin <--> native character set, set this to 1.
   * Supported character sets: isolatin, ibm850, and next
-@@ -203,9 +203,9 @@
+@@ -214,9 +214,9 @@
  #   define SLRN_ARTICLE_FILENAME	".article"
  #   define SLRN_FOLLOWUP_FILENAME	".followup"
  #   define SLRN_SIGNATURE_FILE		".signature"
diff --git a/news/slrn/pkg/PLIST b/news/slrn/pkg/PLIST
index 83d85afe867..75934a206ea 100644
--- a/news/slrn/pkg/PLIST
+++ b/news/slrn/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/05/18 22:01:36 mjl Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/01/01 18:24:33 mjl Exp $
 bin/slrn
 man/man1/slrn.1
 share/slrn/FAQ
@@ -9,13 +9,11 @@ share/slrn/README.os2
 share/slrn/README.vms
 share/slrn/README.w95
 share/slrn/SCORE_FAQ
-share/slrn/VMS-SLRN.HLP
 share/slrn/help.txt
 share/slrn/pc-keys.txt
 share/slrn/score.sl
 share/slrn/score.txt
 share/slrn/slrn-doc.html
-share/slrn/slrn.1
 share/slrn/slrn.rc
 share/slrn/slrnfuns.txt
 share/slrn/COPYRIGHT
@@ -32,4 +30,5 @@ share/slrn/tin-art.sl
 share/slrn/tin-group.sl
 share/slrn/ttyprint.sl
 share/slrn/xcomment.sl
+@dirrm share/slrn/slrnpull
 @dirrm share/slrn