4 files changed, 36 insertions, 60 deletions

diff --git a/games/sl/Makefile b/games/sl/Makefile
index f729a7b7e634..7484e8e059cf 100644
--- a/games/sl/Makefile
+++ b/games/sl/Makefile
@@ -2,48 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	sl
-PORTVERSION=	3.03${SLPATCHVERSION}
+PORTVERSION=5.01
 CATEGORIES=	games
-MASTER_SITES=	http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/
-DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.tar
-
-.if defined(WITH_PERSISTENT)
-SLPATCHVERSION=	.5p1
-PATCH_SITES=	http://www.izumix.org.uk/sl/ \
-		http://www.SpringDaemons.com/stas/
-PATCHFILES=	sl5-1.patch
-PATCH_DIST_STRIP=	-p1
-.endif
 
 MAINTAINER=	hym@cocoa.freemail.ne.jp
 COMMENT=	A steam locomotive runs across the screen if you type "sl" instead of "ls"
 
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
-
-ALL_TARGET=	sl
-MAN1=		sl.1
-MANLANG=	ja
+USE_GITHUB=	yes
+GH_ACCOUNT=	mtoyoda
+GH_COMMIT=	5891c2d
 
-NO_STAGE=	yes
-pre-everything::
-.if !defined(WITH_PERSISTENT)
-	@${ECHO_MSG}
-	@${ECHO_MSG} " If you want to apply additional patch to make sl more annoying,"
-	@${ECHO_MSG} " hit Ctrl-C right now and use \"make WITH_PERSISTENT=yes\""
-	@${ECHO_MSG}
-.endif
+PLIST_FILES=bin/${PORTNAME} man/man1/${PORTNAME}.1.gz man/ja/man1/${PORTNAME}.1.gz
+PORTDOCS=	*
 
 do-build:
-	@${CC} ${CFLAGS} -I${WRKSRC} -o ${WRKSRC}/sl ${WRKSRC}/sl.c -lcurses -ltermcap
+	${CC} ${CFLAGS} -I${WRKSRC} -o ${WRKSRC}/sl ${WRKSRC}/sl.c -lncurses
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sl ${PREFIX}/bin
-	${MV} ${WRKSRC}/sl.1 ${WRKSRC}/sl.man
-	nkf -e ${WRKSRC}/sl.man > ${WRKSRC}/sl.1
-	${INSTALL_MAN} ${WRKSRC}/sl.1 ${PREFIX}/man/ja/man1
-	${MKDIR} ${PREFIX}/share/doc/sl
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sl
-	${INSTALL_DATA} ${WRKSRC}/sl.txt ${PREFIX}/share/doc/sl
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.ja ${STAGEDIR}${MANPREFIX}/man/ja/man1/${PORTNAME}.1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in README.md README.ja.md LICENSE
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/games/sl/distinfo b/games/sl/distinfo
index 2c4098916e04..7c5b340bd97e 100644
--- a/games/sl/distinfo
+++ b/games/sl/distinfo
@@ -1,4 +1,2 @@
-SHA256 (sl.tar) = b2bcbd86acf2017c84b6aaf6161b3b24f97e34a2d70ab0204c9503f5d50965f4
-SIZE (sl.tar) = 20480
-SHA256 (sl5-1.patch) = 4943b6f000f518ed08755b36d9b753291989c4867e55d74bc4cc4502f6e9422f
-SIZE (sl5-1.patch) = 36035
+SHA256 (sl-5.01.tar.gz) = 5619fe87e3a3135126ca2a83bf47904fff2448ad57aec6f2d2017716488d3bf4
+SIZE (sl-5.01.tar.gz) = 5259
diff --git a/games/sl/files/patch-sl.c b/games/sl/files/patch-sl.c
index a995219bf969..6282cd1c8b74 100644
--- a/games/sl/files/patch-sl.c
+++ b/games/sl/files/patch-sl.c
@@ -1,27 +1,19 @@
---- sl.c.orig	1998-07-22 16:01:01.000000000 +0200
-+++ sl.c	2011-11-01 18:53:45.000000000 +0100
-@@ -32,6 +32,11 @@
+--- sl.c.orig	2014-01-04 00:18:33.000000000 -0500
++++ sl.c	2014-03-16 16:16:47.000000000 -0400
+@@ -37,6 +37,12 @@
  #include <unistd.h>
  #include "sl.h"
  
-+void add_man(int, int);
-+int add_D51(int);
 +int add_sl(int);
-+void add_smoke(int,int);
++int add_C51(int);
++int add_D51(int);
++void add_man(int, int);
++void add_smoke(int, int);
 +
  int ACCIDENT  = 0;
  int LOGO      = 0;
  int FLY       = 0;
-@@ -59,7 +64,7 @@
-     }
- }
- 
--void main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
-     int x, i;
- 
-@@ -85,6 +90,8 @@
+@@ -99,6 +105,8 @@
      }
      mvcur(0, COLS - 1, LINES - 1, 0);
      endwin();
@@ -30,7 +22,7 @@
  }
  
  
-@@ -129,7 +136,7 @@
+@@ -143,7 +151,7 @@
  }
  
  
@@ -39,7 +31,16 @@
  {
      static char *d51[D51PATTERNS][D51HIGHT + 1]
  	= {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
-@@ -170,7 +177,7 @@
+@@ -183,7 +191,7 @@
+     return OK;
+ }
+ 
+-add_C51(int x)
++int add_C51(int x)
+ {
+     static char *c51[C51PATTERNS][C51HIGHT + 1]
+ 	= {{C51STR1, C51STR2, C51STR3, C51STR4, C51STR5, C51STR6, C51STR7,
+@@ -224,7 +232,7 @@
  }
  
  
@@ -48,7 +49,7 @@
  {
      static char *man[2][2] = {{"", "(O)"}, {"Help!", "\\O/"}};
      int i;
-@@ -181,7 +188,7 @@
+@@ -235,7 +243,7 @@
  }
  
  
diff --git a/games/sl/pkg-plist b/games/sl/pkg-plist
deleted file mode 100644
index ab1fac924e83..000000000000
--- a/games/sl/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/sl
-%%DOCSDIR%%/README
-%%DOCSDIR%%/sl.txt
-@dirrm %%DOCSDIR%%