Update to slrn-0.9.5.6

5 files changed, 40 insertions, 40 deletions

diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index d1586c33198..e6871ddd4e5 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1999/04/12 22:30:39 mjl Exp $
+# $NetBSD: Makefile,v 1.4 1999/05/18 22:01:36 mjl Exp $
 #
 
-DISTNAME=		slrn0.9.5.4
-PKGNAME=		slrn-0.9.5.4
+DISTNAME=		slrn-0.9.5.6
 CATEGORIES=		news
 MASTER_SITES=		ftp://space.mit.edu/pub/davis/slrn/ \
 			ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/slrn/
@@ -19,6 +18,4 @@ CONFIGURE_ARGS+=	--without-X --prefix=${PREFIX}
 # together
 CONFIGURE_ENV+=		INSTALL=/usr/bin/install
 
-WRKSRC=			${WRKDIR}/slrn
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/slrn/files/md5 b/news/slrn/files/md5
index a3b778ee488..0bb071c4539 100644
--- a/news/slrn/files/md5
+++ b/news/slrn/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/04/12 22:30:40 mjl Exp $
+$NetBSD: md5,v 1.3 1999/05/18 22:01:36 mjl Exp $
 
-MD5 (slrn0.9.5.4.tar.gz) = f28a183a378c8d80e1d1ec3d4ab1e591
+MD5 (slrn-0.9.5.6.tar.gz) = bb08c839ff04ac9d30771d9d383c46ef
diff --git a/news/slrn/patches/patch-aa b/news/slrn/patches/patch-aa
index 82e44272004..ca8dd58928d 100644
--- a/news/slrn/patches/patch-aa
+++ b/news/slrn/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1998/10/31 23:06:31 frueauf Exp $
+$NetBSD: patch-aa,v 1.3 1999/05/18 22:01:36 mjl Exp $
 
---- configure.orig	Tue Sep  8 14:59:16 1998
-+++ configure	Sat Oct 31 21:26:18 1998
+--- configure.orig	Mon May 17 07:26:54 1999
++++ configure	Tue May 18 23:40:36 1999
 @@ -2401,6 +2401,8 @@
  
  fi
@@ -11,11 +11,11 @@ $NetBSD: patch-aa,v 1.2 1998/10/31 23:06:31 frueauf Exp $
  echo "$ac_t""$slrn_cv_domain" 1>&6
  
  if test "$slrn_cv_domain" != no; then
-@@ -2486,6 +2488,7 @@
- # version.
+@@ -2487,6 +2489,7 @@
  
  JD_Search_Dirs="$JD_Search_Dirs \
-+		$prefix/include,$prefix/lib \
+                 $includedir,$libdir \
++					 $prefix/include,$prefix/lib \
                  /usr/local/include,/usr/local/lib \
  		/usr/include,/usr/lib \
  		/usr/include/slang,/usr/lib \
diff --git a/news/slrn/patches/patch-ab b/news/slrn/patches/patch-ab
index 7584ffe7eff..e2bdcc0c70c 100644
--- a/news/slrn/patches/patch-ab
+++ b/news/slrn/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 1998/10/31 23:06:31 frueauf Exp $
+$NetBSD: patch-ab,v 1.3 1999/05/18 22:01:36 mjl Exp $
 
---- src/Makefile.in.orig	Tue Sep  8 14:59:21 1998
-+++ src/Makefile.in	Sat Oct 31 21:27:37 1998
-@@ -62,7 +62,7 @@
+--- 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@
  exec_prefix = @exec_prefix@
  BINDIR = @bindir@
@@ -10,27 +10,27 @@ $NetBSD: patch-ab,v 1.2 1998/10/31 23:06:31 frueauf Exp $
 +DOCDIR = $(prefix)/share/slrn
  MANDIR = @mandir@
  MACRODIR = @datadir@/slrn
- #----------------------------------------------------------------------------
-@@ -118,19 +118,16 @@
+ 
+@@ -128,19 +128,16 @@
  distclean: clean
  	/bin/rm -rf $(OBJDIR) Makefile sysconf.h
  install: all $(BINDIR)
--	$(INSTALL) -m 755 -o root -g root $(OBJDIR)/slrn $(BINDIR)
--	-$(INSTALL) -m 755 -o root -g root $(OBJDIR)/slrnpull $(BINDIR)
--	$(INSTALL) -d $(DOCDIR) -m 755 -o root -g root
--	$(INSTALL) -m 644 -o root -g root ../doc/* $(DOCDIR)
--	$(INSTALL) -m 644 -o root -g root ../COPYRIGHT $(DOCDIR)
--	$(INSTALL) -m 644 -o root -g root ../COPYING $(DOCDIR)
--	$(INSTALL) -m 644 -o root -g root ../README $(DOCDIR)
--	$(INSTALL) -m 644 -o root -g root ../changes.txt $(DOCDIR)
--	$(INSTALL) -m 644 -o root -g root ../doc/slrn.1 $(MANDIR)/man1
--	$(INSTALL) -d $(DOCDIR)/slrnpull -m 755 -o root -g root
--	$(INSTALL) -m 644 -o root -g root ../slrnpull/* $(DOCDIR)/slrnpull
--	$(INSTALL) -d $(MACRODIR) -m 755 -o root -g root
--	$(INSTALL) -m 644 -o root -g root ../macros/*.sl $(MACRODIR)
+-	$(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 ../doc/* $(DOCDIR)
 +	$(INSTALL) -c -m 644  ../COPYRIGHT $(DOCDIR)
 +	$(INSTALL) -c -m 644  ../COPYING $(DOCDIR)
 +	$(INSTALL) -c -m 644  ../README $(DOCDIR)
diff --git a/news/slrn/patches/patch-ac b/news/slrn/patches/patch-ac
index d4e515c656e..db1298b6c84 100644
--- a/news/slrn/patches/patch-ac
+++ b/news/slrn/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1999/02/09 01:06:47 hubertf Exp $
+$NetBSD: patch-ac,v 1.3 1999/05/18 22:01:36 mjl Exp $
 
---- src/slrnfeat.h.orig	Tue Sep  8 14:59:21 1998
-+++ src/slrnfeat.h	Tue Feb  9 02:03:45 1999
-@@ -7,10 +7,10 @@
+--- src/slrnfeat.h.orig	Tue May 18 23:45:48 1999
++++ src/slrnfeat.h	Tue May 18 23:48:42 1999
+@@ -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.2 1999/02/09 01:06:47 hubertf 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.
   */
-@@ -48,7 +48,7 @@
+@@ -54,7 +54,7 @@
  #define SLRN_HAS_SLANG		1
  
  /* Set this to 0 if you do not want slrn to generate message-id header. */
@@ -25,12 +25,15 @@ $NetBSD: patch-ac,v 1.2 1999/02/09 01:06:47 hubertf Exp $
  
  /* If you want mapping ISO Latin <--> native character set, set this to 1.
   * Supported character sets: isolatin, ibm850, and next
-@@ -196,7 +196,7 @@
+@@ -203,9 +203,9 @@
  #   define SLRN_ARTICLE_FILENAME	".article"
  #   define SLRN_FOLLOWUP_FILENAME	".followup"
  #   define SLRN_SIGNATURE_FILE		".signature"
 -#   define SLRN_SENDMAIL_COMMAND	"/usr/lib/sendmail -oi -t -oem -odb"
 +#   define SLRN_SENDMAIL_COMMAND	"/usr/sbin/sendmail -oi -t -oem -odb"
  #   ifndef SLRN_LIB_DIR
- #    define SLRN_LIB_DIR		"/usr/local/lib/slrn"
+-#    define SLRN_LIB_DIR		"/usr/local/lib/slrn"
++#    define SLRN_LIB_DIR		"/usr/pkg/lib/slrn"
  #   endif
+ #  endif			       /* unix */
+ # endif				       /* os2 */