Add patches as suggested in PR/21073 by Quentin Garnier:

 o Bugfixes were published on the slrn website since the release
   of 0.9.7.4 last year. Even though no new version was released,
   they are quite needed for normal operation (specifically, I was
   hit by a locale bug that makes slrn segfault when scoring).
 o ${PKGLOCALEDIR} needs to be enforced both in package's Makefile
   and PLIT, and in the source (po Makefile has a hard-coded path
   that may not match the path used in other parts of the source
   tree).

4 files changed, 47 insertions, 13 deletions

diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 78c5f88c3c1..c090b8b5c74 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/03/15 00:00:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.25 2003/04/10 18:17:48 mjl Exp $
 #
 
 DISTNAME=	slrn-0.9.7.4
@@ -6,6 +6,14 @@ CATEGORIES=	news
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=slrn/}
 EXTRACT_SUFX=	.tar.bz2
 
+PATCH_SITES=	http://slrn.sourceforge.net/patches/
+PATCHFILES=	slrn-0.9.7.4-po.diff \
+		slrn-0.9.7.4-popup_win.diff \
+		slrn-0.9.7.4-mem_leak.diff \
+		slrn-0.9.7.4-link_subjects.diff \
+		slrn-0.9.7.4-strcasecmp.diff
+PATCH_DIST_STRIP=      -p1
+
 MAINTAINER=	mjl@netbsd.org
 HOMEPAGE=	http://slrn.sourceforge.net/
 COMMENT=	Highly customizable threaded newsreader
@@ -15,7 +23,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--without-X --disable-inews --with-slrnpull \
 		--enable-spool --enable-grouplens \
 		--with-gen-mid --with-libdir=${PREFIX}/lib/slrn \
-		--enable-mid-cache
+		--enable-mid-cache \
+		--with-localedir=${PREFIX}/${PKGLOCALEDIR}/locale
+
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/news/slrn/PLIST b/news/slrn/PLIST
index 70cd6348ab5..1fe96e747ba 100644
--- a/news/slrn/PLIST
+++ b/news/slrn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/03/28 13:05:11 grant Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/04/10 18:17:48 mjl Exp $
 bin/slrn
 bin/slrnpull
 man/man1/slrn.1
@@ -30,15 +30,15 @@ share/doc/slrn/slrnpull/setgid.txt
 share/doc/slrn/slrnpull/slrn.rc
 share/doc/slrn/slrnpull/slrnpull.conf
 share/doc/slrn/slrnpull/slrnpull.sh
-share/locale/da/LC_MESSAGES/slrn.mo
-share/locale/de/LC_MESSAGES/slrn.mo
-share/locale/es/LC_MESSAGES/slrn.mo
-share/locale/fr/LC_MESSAGES/slrn.mo
-share/locale/it/LC_MESSAGES/slrn.mo
-share/locale/ko/LC_MESSAGES/slrn.mo
-share/locale/nl/LC_MESSAGES/slrn.mo
-share/locale/pl/LC_MESSAGES/slrn.mo
-share/locale/ru/LC_MESSAGES/slrn.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/slrn.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/slrn.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/slrn.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/slrn.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/slrn.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/slrn.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/slrn.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/slrn.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/slrn.mo
 share/slrn/macros/color.sl
 share/slrn/macros/gsort.sl
 share/slrn/macros/ispell.sl
diff --git a/news/slrn/distinfo b/news/slrn/distinfo
index 0daf7e6931d..90d7eddc244 100644
--- a/news/slrn/distinfo
+++ b/news/slrn/distinfo
@@ -1,5 +1,16 @@
-$NetBSD: distinfo,v 1.7 2002/03/28 13:05:11 grant Exp $
+$NetBSD: distinfo,v 1.8 2003/04/10 18:17:48 mjl Exp $
 
 SHA1 (slrn-0.9.7.4.tar.bz2) = b6b6a4940131c6ef3da4d55d7e466ba254b8a751
 Size (slrn-0.9.7.4.tar.bz2) = 824593 bytes
+SHA1 (slrn-0.9.7.4-po.diff) = ebb0b7fa6b1f63932db1fb0931fd2baba490a64e
+Size (slrn-0.9.7.4-po.diff) = 20240 bytes
+SHA1 (slrn-0.9.7.4-popup_win.diff) = ed18c451af4a27382d7d6cc5988e74c8d097d68f
+Size (slrn-0.9.7.4-popup_win.diff) = 329 bytes
+SHA1 (slrn-0.9.7.4-mem_leak.diff) = 8740d1a109be6e23715ff9935076b06e00533f1f
+Size (slrn-0.9.7.4-mem_leak.diff) = 3463 bytes
+SHA1 (slrn-0.9.7.4-link_subjects.diff) = 2a6340621d042ab6654d04d4cf0f83d943b8bd1b
+Size (slrn-0.9.7.4-link_subjects.diff) = 1282 bytes
+SHA1 (slrn-0.9.7.4-strcasecmp.diff) = 234869c2eb9fbc70e952a3d348de2cbf9ad50763
+Size (slrn-0.9.7.4-strcasecmp.diff) = 2217 bytes
 SHA1 (patch-aa) = 2fe15ab7455f366554e530a0bb2e25758440af4c
+SHA1 (patch-ae) = 2b32d4f5c3cc6b5f703119e202349aff7d979b4b
diff --git a/news/slrn/patches/patch-ae b/news/slrn/patches/patch-ae
new file mode 100644
index 00000000000..643ced10364
--- /dev/null
+++ b/news/slrn/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/04/10 18:17:49 mjl Exp $
+
+--- po/Makefile.in.in.orig     2001-11-03 16:35:01.000000000 +0100
++++ po/Makefile.in.in
+@@ -23,7 +23,7 @@ VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = @LOCALEDIR@
+ gettextsrcdir = $(datadir)/gettext/po
+
+ INSTALL = @INSTALL@