Update to 5.02:

SL(1) 5.02 Release includes several fixes for compiler warnings,
indentation, typos, etc.

Based on patch in PR 49531 in Jonathan Buschmann.

4 files changed, 16 insertions, 57 deletions

diff --git a/games/sl/Makefile b/games/sl/Makefile
index 890481198a6..da73fcd051b 100644
--- a/games/sl/Makefile
+++ b/games/sl/Makefile
@@ -1,33 +1,26 @@
-# $NetBSD: Makefile,v 1.18 2012/10/06 11:54:55 asau Exp $
+# $NetBSD: Makefile,v 1.19 2015/01/03 15:42:58 wiz Exp $
 #
 
-DISTNAME=	sl
-PKGNAME=	sl-3.03p5
+DISTNAME=	sl-5.02
 CATEGORIES=	games
-MASTER_SITES=	http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/
-EXTRACT_SUFX=	.tar
-
-PATCH_SITES=	http://www.linet.gr.jp/~izumi/sl/
-PATCHFILES=	sl5.patch
-PATCH_DIST_STRIP= -p1
+MASTER_SITES=	-https://github.com/mtoyoda/sl/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
 MAINTAINER=	minoura@NetBSD.org
 HOMEPAGE=	http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/
 COMMENT=	Animated SL that runs across the terminal when you type `sl'
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
-
-BUILD_DEPENDS+=	nkf-[0-9]*:../../converters/nkf
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/ja_JP.EUC/man1
+DIST_SUBDIR=	${PKGNAME_NOREV}
+BUILD_TARGET=	sl
 
-post-build:
-	nkf -e ${WRKSRC}/sl.1 > ${WRKSRC}/sl.1.euc
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/ja_JP.EUC/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sl ${DESTDIR}${PREFIX}/bin/sl
-	${INSTALL_DATA} ${WRKSRC}/sl.1.euc \
+	${INSTALL_MAN} ${WRKSRC}/sl.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/sl.1.ja \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/sl.1
 
-.include "../../mk/curses.buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/sl/PLIST b/games/sl/PLIST
index 468fa7da671..1fd89c69939 100644
--- a/games/sl/PLIST
+++ b/games/sl/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:55:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/01/03 15:42:58 wiz Exp $
 bin/sl
 man/ja_JP.EUC/man1/sl.1
+man/man1/sl.1
diff --git a/games/sl/distinfo b/games/sl/distinfo
index 4978276a95a..2609b1bb839 100644
--- a/games/sl/distinfo
+++ b/games/sl/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/07/24 18:24:45 kristerw Exp $
+$NetBSD: distinfo,v 1.6 2015/01/03 15:42:58 wiz Exp $
 
-SHA1 (sl-3.03p5/sl.tar) = 57e18b4333e05be67faff58c42a06fcbc231def9
-RMD160 (sl-3.03p5/sl.tar) = 8bf03c727cafeb8873377a1bfd17c3ff8bd6dd29
-Size (sl-3.03p5/sl.tar) = 20480 bytes
-SHA1 (sl-3.03p5/sl5.patch) = b8be0db3a026ea4192557dbd9c5662521bdd3a29
-RMD160 (sl-3.03p5/sl5.patch) = 19829a2bb3fc7f4b702d6a9224c0e9c1d45ab594
-Size (sl-3.03p5/sl5.patch) = 32549 bytes
-SHA1 (patch-aa) = 60d53ea5afc1e2064bf2981beb72adbef8c1fe20
+SHA1 (sl-5.02/sl-5.02.tar.gz) = 8ea1ed978ed6738d6c510eceb329cb43616afb91
+RMD160 (sl-5.02/sl-5.02.tar.gz) = f3643055900b8a71dc9c18d59b0815c554298875
+Size (sl-5.02/sl-5.02.tar.gz) = 5353 bytes
diff --git a/games/sl/patches/patch-aa b/games/sl/patches/patch-aa
deleted file mode 100644
index 4dd66af7dae..00000000000
--- a/games/sl/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2000/06/06 03:10:21 minoura Exp $
-
---- sl.c.orig	Mon Jun  5 12:27:10 2000
-+++ sl.c	Mon Jun  5 22:15:07 2000
-@@ -232,7 +232,7 @@ int add_cross(int p)
-   }
-   ++tt;
- 
--  return 0;
-+  return OK;
- }
- 
- 
-@@ -634,6 +634,8 @@ int add_smoke(int y, int x)
- 				 2,  2, 2, 3, 3, 3             };
-     int i;
- 
-+    if (sum >= 1000)
-+	return 0;
-     if (x % 4 == 0) {
- 	for (i = 0; i < sum; ++i) {
- 	    my_mvaddstr(S[i].y, S[i].x, Eraser[S[i].ptrn]);
-@@ -679,6 +681,8 @@ int add_smoke_r(int y, int x)
- 				 2,  2, 2, 3, 3, 3             };
-     int i;
- 
-+    if (sum >= 1000)
-+	return 0;
-     if (x % 4 == 0) {
- 	for (i = 0; i < sum; ++i) {
- 	    my_mvaddstr_r(S[i].y, S[i].x, Eraser[S[i].ptrn]);