news/cleanscore: Update to 0.9.8.1nb10

The old source archive URL was no longer valid.
Switch to the source from the slrn archive (that has the former
required patch already applied).

OK from is@.

4 files changed, 23 insertions, 53 deletions

diff --git a/news/cleanscore/Makefile b/news/cleanscore/Makefile
index de840393336..846d1a3b96a 100644
--- a/news/cleanscore/Makefile
+++ b/news/cleanscore/Makefile
@@ -1,26 +1,30 @@
-# $NetBSD: Makefile,v 1.14 2020/03/20 11:58:13 nia Exp $
-#
+# $NetBSD: Makefile,v 1.15 2020/04/21 11:16:56 micha Exp $
 
-DISTNAME=		cleanscore-0.9.8.1
-PKGREVISION=		9
-LICENSE=		gnu-gpl-v2
+DISTNAME=		slrn-1.0.3a
+PKGNAME=		cleanscore-0.9.8.1
+PKGREVISION=		10
 CATEGORIES=		news
-MASTER_SITES=		http://slrn.sourceforge.net/cleanscore/
+MASTER_SITES=		http://jedsoft.org/releases/slrn/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		is@NetBSD.org
-HOMEPAGE=		http://slrn.sourceforge.net/cleanscore/
+HOMEPAGE=		http://slrn.sourceforge.net/
 COMMENT=		Clean SLRN's score file
+LICENSE=		gnu-gpl-v2
 
+EXTRACT_USING=		bsdtar
 USE_TOOLS=		perl
-REPLACE_PERL=		cleanscore
+REPLACE_PERL=		contrib/cleanscore
+
+WRKSRC=			${WRKDIR}/slrn-1.0.3
 
 NO_BUILD=		yes
 
 INSTALLATION_DIRS+=	bin share/doc/cleanscore
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/cleanscore ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cleanscore
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/cleanscore
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/cleanscore ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/contrib/README.cleanscore ${DESTDIR}${PREFIX}/share/doc/cleanscore
+	${INSTALL_DATA} ${WRKSRC}/contrib/NEWS.cleanscore ${DESTDIR}${PREFIX}/share/doc/cleanscore
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/cleanscore/PLIST b/news/cleanscore/PLIST
index 448bec7750e..9006f3b4655 100644
--- a/news/cleanscore/PLIST
+++ b/news/cleanscore/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/01/01 22:29:51 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/04/21 11:16:56 micha Exp $
 bin/cleanscore
-share/doc/cleanscore/COPYING
-share/doc/cleanscore/README
+share/doc/cleanscore/NEWS.cleanscore
+share/doc/cleanscore/README.cleanscore
diff --git a/news/cleanscore/distinfo b/news/cleanscore/distinfo
index fdbd8fdf0e8..83ef9f3bb48 100644
--- a/news/cleanscore/distinfo
+++ b/news/cleanscore/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/02 23:49:46 agc Exp $
+$NetBSD: distinfo,v 1.4 2020/04/21 11:16:56 micha Exp $
 
-SHA1 (cleanscore-0.9.8.1.tar.gz) = ae132707ee5e7e5805ee6a7051d34f605b8340cb
-RMD160 (cleanscore-0.9.8.1.tar.gz) = 575e1ac974ad23aa557ca2c67a28bbd07546f9ec
-SHA512 (cleanscore-0.9.8.1.tar.gz) = 46c4f392890f06ccbd1eeb829760b6c20fdd36b20a758b243b4e982b82aab88b8f78def5cfe16048a8a83b7efb7fb80111632040809ab3a1d336f0069a2708df
-Size (cleanscore-0.9.8.1.tar.gz) = 13439 bytes
-SHA1 (patch-aa) = 4622601fe21bacb1a775b28539ff477c1272ac9d
+SHA1 (slrn-1.0.3a.tar.bz2) = 898d09685f5fe159f23829cd21e15308f5dce822
+RMD160 (slrn-1.0.3a.tar.bz2) = dd5f5df5d508b8e0c5b136093f24121af31d3432
+SHA512 (slrn-1.0.3a.tar.bz2) = 11cef2dfe41f441af15acc22fb675cf607e932f0dd6d4a998e51ecda05c9a50d7abf10a3e693ffc857ad77e09634f460404e4d5b289169e7bbffdaf5d6d565a3
+Size (slrn-1.0.3a.tar.bz2) = 997138 bytes
diff --git a/news/cleanscore/patches/patch-aa b/news/cleanscore/patches/patch-aa
deleted file mode 100644
index d49083d7ed5..00000000000
--- a/news/cleanscore/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/12/09 14:59:37 is Exp $
-
---- cleanscore.orig	2010-12-09 12:33:33.000000000 +0000
-+++ cleanscore
-@@ -27,8 +27,8 @@ use Getopt::Std;
- 
- sub help();
- sub reset_vars(%);
--sub insert_comment(%%);
--sub end_of_score(%$);
-+sub insert_comment(%);
-+sub end_of_score(%);
- sub clean_file($);
- 
- # globals variables.
-@@ -323,7 +323,7 @@ sub clean_file($)
- 
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
- 
--sub end_of_score(%$)
-+sub end_of_score(%)
- {
-   my $entry = shift;
-   my $file_is_changed = shift;
-@@ -355,7 +355,7 @@ sub end_of_score(%$)
- 
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
- 
--sub insert_comment(%%)
-+sub insert_comment(%)
- {
-   my $comment=shift;
-   my $entry=shift;