Attachment #174727 for bug #212656

View | Details | Raw Unified | Return to bug 212656
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	sl
PORTVERSION=	5.02
CATEGORIES=	games

MAINTAINER=	hym@cocoa.freemail.ne.jp
COMMENT=	Steam locomotive runs across the screen if you type "sl" instead of "ls"

USES=		ncurses
USE_GITHUB=	yes
GH_ACCOUNT=	mtoyoda

USES=		ncurses
PLIST_FILES=	bin/${PORTNAME} \
		man/man1/${PORTNAME}.1.gz \
		man/ja/man1/${PORTNAME}.1.gz
PORTDOCS=	*

OPTIONS_DEFINE=	DOCS

do-build:
	${CC} ${CFLAGS} -I${WRKSRC} -o ${WRKSRC}/sl ${WRKSRC}/sl.c \
		${LDFLAGS} -lncurses

	${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

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in README.md README.ja.md LICENSE
	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (mtoyoda-sl-5.01_GH0.tar.gz) = b16fcaa40cb195105e97f86280e3f37a9011d0c01d7e534946386d126408f6da	1	TIMESTAMP = 1473706488
2	SIZE (mtoyoda-sl-5.01_GH0.tar.gz) = 5251	2	SHA256 (mtoyoda-sl-5.02_GH0.tar.gz) = 1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb5563a
		3	SIZE (mtoyoda-sl-5.02_GH0.tar.gz) = 5353




--- 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"
 
+int add_sl(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;
@@ -99,6 +105,8 @@
     }
     mvcur(0, COLS - 1, LINES - 1, 0);
     endwin();
+
+    return 0;
 }
 
 
@@ -143,7 +151,7 @@
 }
 
 
-add_D51(int x)
+int add_D51(int x)
 {
     static char *d51[D51PATTERNS][D51HIGHT + 1]
 	= {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
@@ -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 @@
 }
 
 
-int add_man(int y, int x)
+void add_man(int y, int x)
 {
     static char *man[2][2] = {{"", "(O)"}, {"Help!", "\\O/"}};
     int i;
@@ -235,7 +243,7 @@
 }
 
 
-int add_smoke(int y, int x)
+void add_smoke(int y, int x)
 #define SMOKEPTNS	16
 {
     static struct smokes {

Lines 4-7 Link Here

(-)pkg-descr (-1 / +1 lines)
4		4
5	This program was written by TOYODA Masashi	5	This program was written by TOYODA Masashi
6		6
7	WWW: http://www.is.titech.ac.jp/~toyoda/	7	WWW: http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html

Return to bug 212656

Lines 2-22 Link Here

(-)Makefile (-2 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sl	4	PORTNAME= sl
5	PORTVERSION=5.01	5	PORTVERSION= 5.02
6	CATEGORIES= games	6	CATEGORIES= games
7		7
8	MAINTAINER= hym@cocoa.freemail.ne.jp	8	MAINTAINER= hym@cocoa.freemail.ne.jp
9	COMMENT= Steam locomotive runs across the screen if you type "sl" instead of "ls"	9	COMMENT= Steam locomotive runs across the screen if you type "sl" instead of "ls"
10		10
11	USES= ncurses
12	USE_GITHUB= yes	11	USE_GITHUB= yes
13	GH_ACCOUNT= mtoyoda	12	GH_ACCOUNT= mtoyoda
14		13
		14	USES= ncurses
15	PLIST_FILES= bin/${PORTNAME} \	15	PLIST_FILES= bin/${PORTNAME} \
16	man/man1/${PORTNAME}.1.gz \	16	man/man1/${PORTNAME}.1.gz \
17	man/ja/man1/${PORTNAME}.1.gz	17	man/ja/man1/${PORTNAME}.1.gz
18	PORTDOCS= *	18	PORTDOCS= *
19		19
		20	OPTIONS_DEFINE= DOCS
		21
20	do-build:	22	do-build:
21	${CC} ${CFLAGS} -I${WRKSRC} -o ${WRKSRC}/sl ${WRKSRC}/sl.c \	23	${CC} ${CFLAGS} -I${WRKSRC} -o ${WRKSRC}/sl ${WRKSRC}/sl.c \
22	${LDFLAGS} -lncurses	24	${LDFLAGS} -lncurses
Lines 25-30 Link Here
25	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	27	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
26	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1	28	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
27	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.ja ${STAGEDIR}${MANPREFIX}/man/ja/man1/${PORTNAME}.1	29	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.ja ${STAGEDIR}${MANPREFIX}/man/ja/man1/${PORTNAME}.1
		30
		31	do-install-DOCS-on:
28	@${MKDIR} ${STAGEDIR}${DOCSDIR}	32	@${MKDIR} ${STAGEDIR}${DOCSDIR}
29	.for f in README.md README.ja.md LICENSE	33	.for f in README.md README.ja.md LICENSE
30	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}	34	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}

Lines 1-60 Link Here

(-)files/patch-sl.c (-60 lines)
1	--- sl.c.orig 2014-01-04 00:18:33.000000000 -0500
2	+++ sl.c 2014-03-16 16:16:47.000000000 -0400
3	@@ -37,6 +37,12 @@
4	#include <unistd.h>
5	#include "sl.h"
6
7	+int add_sl(int);
8	+int add_C51(int);
9	+int add_D51(int);
10	+void add_man(int, int);
11	+void add_smoke(int, int);
12	+
13	int ACCIDENT = 0;
14	int LOGO = 0;
15	int FLY = 0;
16	@@ -99,6 +105,8 @@
17	}
18	mvcur(0, COLS - 1, LINES - 1, 0);
19	endwin();
20	+
21	+ return 0;
22	}
23
24
25	@@ -143,7 +151,7 @@
26	}
27
28
29	-add_D51(int x)
30	+int add_D51(int x)
31	{
32	static char *d51[D51PATTERNS][D51HIGHT + 1]
33	= {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
34	@@ -183,7 +191,7 @@
35	return OK;
36	}
37
38	-add_C51(int x)
39	+int add_C51(int x)
40	{
41	static char *c51[C51PATTERNS][C51HIGHT + 1]
42	= {{C51STR1, C51STR2, C51STR3, C51STR4, C51STR5, C51STR6, C51STR7,
43	@@ -224,7 +232,7 @@
44	}
45
46
47	-int add_man(int y, int x)
48	+void add_man(int y, int x)
49	{
50	static char *man[2][2] = {{"", "(O)"}, {"Help!", "\\O/"}};
51	int i;
52	@@ -235,7 +243,7 @@
53	}
54
55
56	-int add_smoke(int y, int x)
57	+void add_smoke(int y, int x)
58	#define SMOKEPTNS 16
59	{
60	static struct smokes {