>Number:         21073
>Category:       pkg
>Synopsis:       Bugfixes for slrn-0.9.7.4
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 09 05:53:00 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Quentin Garnier
>Release:        NetBSD 1.6Q
>Organization:
Quentin Garnier - cube@cubidou.net
"Feels like I'm fiddling while Rome is burning down.
Should I lay my fiddle down and take a rifle from the ground ?"
Leigh Nash/Sixpence None The Richer, Paralyzed, Divine Discontents, 2002.
>Environment:
System: NetBSD padme 1.6Q NetBSD 1.6Q (NVIDIA_ACPI-$Revision: 1.3 $) #31: Thu Mar 20 13:54:34 CET 2003 cube@padme:/home/cube/src/nv-netbsd/netvidia/src/sys/arch/i386/compile/NVIDIA_ACPI i386
Architecture: i386
Machine: i386
>Description:
	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).
>How-To-Repeat:
	Speak french, killfile someone on a newsgroup and see slrn be
	killed the next time you open that newsgroup. Mumble something
	about soviet russia that killfiles you.
>Fix:
	patches/patch-ab addresses the second point described above.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/news/slrn/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile	2003/03/15 00:00:42	1.24
+++ Makefile	2003/04/09 12:41:02
@@ -6,16 +6,26 @@
 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
 
-USE_BUILDLINK2=	yes
-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
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+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 \
+			--with-localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 
 .include "../../mk/bsd.prefs.mk"
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/news/slrn/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	2002/03/28 13:05:11	1.3
+++ PLIST	2003/04/09 12:41:02
@@ -30,15 +30,15 @@
 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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/news/slrn/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	2002/03/28 13:05:11	1.7
+++ distinfo	2003/04/09 12:41:02
@@ -2,4 +2,15 @@
 
 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-ab) = bbb8ad6f12cc8ed5a7006bc57fec13aa9d0daa08
--- /dev/null	2003-04-09 14:34:10.000000000 +0200
+++ patches/patch-ab	2003-04-09 14:29:48.000000000 +0200
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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@
>Release-Note:
>Audit-Trail:
>Unformatted: