slrn-0.9.9 uses slang2 and has much better character set support.

Other than that, mostly bug fixes.

6 files changed, 42 insertions, 55 deletions

diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 7af8ed0b95a..891f95cde2a 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2008/01/03 23:14:46 heinz Exp $
+# $NetBSD: Makefile,v 1.40 2008/09/04 16:15:34 is Exp $
 
-DISTNAME=	slrn-0.9.8.1
-PKGREVISION=	1
+DISTNAME=	slrn-0.9.9
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=slrn/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	ftp://space.mit.edu/pub/davis/slrn/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://slrn.sourceforge.net/
@@ -17,6 +16,9 @@ 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-localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 
 .include "../../mk/bsd.prefs.mk"
@@ -29,6 +31,6 @@ CONFIGURE_ENV+=		INSTALL=/usr/bin/install
 
 LDFLAGS.Linux+=	-ldl
 
-.include "../../devel/libslang/buildlink3.mk"
+.include "../../devel/libslang2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/slrn/PLIST b/news/slrn/PLIST
index a7b71c30c61..4e2054583c7 100644
--- a/news/slrn/PLIST
+++ b/news/slrn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/09/04 16:15:34 is Exp $
 bin/slrn
 bin/slrnpull
 man/man1/slrn.1
@@ -42,20 +42,21 @@ share/locale/pl/LC_MESSAGES/slrn.mo
 share/locale/ru/LC_MESSAGES/slrn.mo
 share/locale/sv/LC_MESSAGES/slrn.mo
 share/locale/tr/LC_MESSAGES/slrn.mo
-share/slrn/macros/color.sl
-share/slrn/macros/gsort.sl
-share/slrn/macros/ispell.sl
-share/slrn/macros/latin2.sl
-share/slrn/macros/multipart.sl
-share/slrn/macros/nn.sl
-share/slrn/macros/posthook.sl
-share/slrn/macros/search.sl
-share/slrn/macros/tin-art.sl
-share/slrn/macros/tin-group.sl
-share/slrn/macros/ttyprint.sl
-share/slrn/macros/util.sl
-share/slrn/macros/varset.sl
-share/slrn/macros/xcomment.sl
+share/slrn/slang/color.sl
+share/slrn/slang/gsort.sl
+share/slrn/slang/ispell.sl
+share/slrn/slang/latin2.sl
+share/slrn/slang/multipart.sl
+share/slrn/slang/nn.sl
+share/slrn/slang/posthook.sl
+share/slrn/slang/search.sl
+share/slrn/slang/slrn.sl
+share/slrn/slang/tin-art.sl
+share/slrn/slang/tin-group.sl
+share/slrn/slang/ttyprint.sl
+share/slrn/slang/util.sl
+share/slrn/slang/varset.sl
+share/slrn/slang/xcomment.sl
 @dirrm share/doc/slrn/slrnpull
 @dirrm share/doc/slrn
 @dirrm share/slrn/macros
diff --git a/news/slrn/distinfo b/news/slrn/distinfo
index a839ab46f80..5993be25643 100644
--- a/news/slrn/distinfo
+++ b/news/slrn/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/02/24 12:19:55 agc Exp $
+$NetBSD: distinfo,v 1.12 2008/09/04 16:15:34 is Exp $
 
-SHA1 (slrn-0.9.8.1.tar.bz2) = d8c3755403c9bb19b83123614cda05f94731027f
-RMD160 (slrn-0.9.8.1.tar.bz2) = 67f49dd88a8c9d4bbcf5646a1cfa9a998a3c4cbe
-Size (slrn-0.9.8.1.tar.bz2) = 1034332 bytes
-SHA1 (patch-aa) = 55b5bd4ce24365060b33d899473a128ba23d5656
-SHA1 (patch-ae) = 97fea500b602a68050fa6608e6ee4b328607bd96
+SHA1 (slrn-0.9.9.tar.gz) = bdd6cedca404cf590d9dfdf30967f12c2f488796
+RMD160 (slrn-0.9.9.tar.gz) = a69e33d1faeef376c3193837bf0f474d10171ff4
+Size (slrn-0.9.9.tar.gz) = 1532550 bytes
+SHA1 (patch-af) = 0dbe90431bf4f4e7b8cec6c23da1ce7458a2ca38
diff --git a/news/slrn/patches/patch-aa b/news/slrn/patches/patch-aa
deleted file mode 100644
index 49a47cdfdce..00000000000
--- a/news/slrn/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2004/11/19 13:35:44 adam Exp $
-
---- configure.orig	2004-11-19 14:26:18.000000000 +0000
-+++ configure
-@@ -6501,9 +6501,7 @@ else
- 
- 
-       opt_library_dirs="\
--	/usr/local/lib \
--        /usr/lib \
--	/usr/pkg/lib"
-+	$ev_libdir"
- 
-       if test "x$ac_optlib_home" != xno && test "x$ac_optlib_home" != xyes ; then
-         opt_library_dirs="$ac_optlib_home $ac_optlib_home/lib $opt_library_dirs"
diff --git a/news/slrn/patches/patch-ae b/news/slrn/patches/patch-ae
deleted file mode 100644
index 4eb62c0f465..00000000000
--- a/news/slrn/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/11/19 13:35:44 adam Exp $
-
---- po/Makefile.in.in.orig	2002-11-01 12:33:26.000000000 +0000
-+++ po/Makefile.in.in
-@@ -21,7 +21,7 @@ VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = @LOCALEDIR@
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/news/slrn/patches/patch-af b/news/slrn/patches/patch-af
new file mode 100644
index 00000000000..753fefc8f03
--- /dev/null
+++ b/news/slrn/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/09/04 16:15:34 is Exp $
+
+--- po/Makefile.in.in.orig	2008-02-11 19:04:23.000000000 +0100
++++ po/Makefile.in.in
+@@ -46,7 +46,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ # versions, $(mkinstalldirs) and $(install_sh) are unused.
+ #mkinstalldirs = $(SHELL) @install_sh@ -d
+ #install_sh = $(SHELL) @install_sh@
+-mkdir_p = @mkdir_p@
++mkdir_p = $(INSTALL_DATA) -m 755 -d
+ 
+ GMSGFMT_ = @GMSGFMT@
+ GMSGFMT_no = @GMSGFMT@