Attachment #140934 for bug #187640

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




# $FreeBSD$

PORTNAME=	sl
PORTVERSION=3.03.20140104
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"

USE_GITHUB=	yes
GH_ACCOUNT=	mtoyoda
GH_TAGNAME=	${GH_COMMIT}
GH_COMMIT=	193acb1

ALL_TARGET=	sl
MAN1=		sl.1
MANLANG=	ja

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

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

do-install:
	${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>

Lines 1-4 Link Here

(-)distinfo (-4 / +2 lines)
1	SHA256 (sl.tar) = b2bcbd86acf2017c84b6aaf6161b3b24f97e34a2d70ab0204c9503f5d50965f4	1	SHA256 (sl-3.03.193acb1.tar.gz) = 5ffa90f03cf0bbc0d180a259037810cdb31242e465074a9cd1555a7748684bcf
2	SIZE (sl.tar) = 20480	2	SIZE (sl-3.03.193acb1.tar.gz) = 5212
3	SHA256 (sl5-1.patch) = 4943b6f000f518ed08755b36d9b753291989c4867e55d74bc4cc4502f6e9422f
4	SIZE (sl5-1.patch) = 36035




--- 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 add_sl(int);
+void add_smoke(int,int);
+
 int ACCIDENT  = 0;
 int LOGO      = 0;
 int FLY       = 0;
@@ -99,6 +105,8 @@
     }
 }
 
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
     int x, i;
 
@@ -85,6 +90,8 @@
     }
     mvcur(0, COLS - 1, LINES - 1, 0);
     endwin();
+

 }
 
 
@@ -143,7 +151,7 @@
 }
 
 

 {
     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 @@
 }
 
 

Lines 1-4 Link Here

(-)pkg-plist (-3 / +6 lines)
1	bin/sl	1	bin/sl
2	%%DOCSDIR%%/README	2	man/man1/sl.1.gz
3	%%DOCSDIR%%/sl.txt	3	man/ja/man1/sl.1.gz
4	@dirrm %%DOCSDIR%%	4	%%PORTDOCS%%%%DOCSDIR%%/README.md
		5	%%PORTDOCS%%%%DOCSDIR%%/README.ja.md
		6	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
		7	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 187640

Lines 2-49 Link Here

(-)Makefile (-32 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sl	4	PORTNAME= sl
5	PORTVERSION= 3.03${SLPATCHVERSION}	5	PORTVERSION=3.03.20140104
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/
8	DISTNAME= ${PORTNAME}
9	EXTRACT_SUFX= .tar
10		7
11	.if defined(WITH_PERSISTENT)
12	SLPATCHVERSION= .5p1
13	PATCH_SITES= http://www.izumix.org.uk/sl/ \
14	http://www.SpringDaemons.com/stas/
15	PATCHFILES= sl5-1.patch
16	PATCH_DIST_STRIP= -p1
17	.endif
18
19	MAINTAINER= hym@cocoa.freemail.ne.jp	8	MAINTAINER= hym@cocoa.freemail.ne.jp
20	COMMENT= A steam locomotive runs across the screen if you type "sl" instead of "ls"	9	COMMENT= A steam locomotive runs across the screen if you type "sl" instead of "ls"
21		10
22	BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf	11	USE_GITHUB= yes
		12	GH_ACCOUNT= mtoyoda
		13	GH_TAGNAME= ${GH_COMMIT}
		14	GH_COMMIT= 193acb1
23		15
24	ALL_TARGET= sl	16	ALL_TARGET= sl
25	MAN1= sl.1
26	MANLANG= ja
27		17
28	NO_STAGE= yes
29	pre-everything::
30	.if !defined(WITH_PERSISTENT)
31	@${ECHO_MSG}
32	@${ECHO_MSG} " If you want to apply additional patch to make sl more annoying,"
33	@${ECHO_MSG} " hit Ctrl-C right now and use \"make WITH_PERSISTENT=yes\""
34	@${ECHO_MSG}
35	.endif
36
37	do-build:	18	do-build:
38	@${CC} ${CFLAGS} -I${WRKSRC} -o ${WRKSRC}/sl ${WRKSRC}/sl.c -lcurses -ltermcap	19	${CC} ${CFLAGS} -I${WRKSRC} -o ${WRKSRC}/sl ${WRKSRC}/sl.c -lncurses
39		20
40	do-install:	21	do-install:
41	${INSTALL_PROGRAM} ${WRKSRC}/sl ${PREFIX}/bin	22	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
42	${MV} ${WRKSRC}/sl.1 ${WRKSRC}/sl.man	23	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
43	nkf -e ${WRKSRC}/sl.man > ${WRKSRC}/sl.1	24	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.ja ${STAGEDIR}${MANPREFIX}/man/ja/man1/${PORTNAME}.1
44	${INSTALL_MAN} ${WRKSRC}/sl.1 ${PREFIX}/man/ja/man1	25	@${MKDIR} ${STAGEDIR}${DOCSDIR}
45	${MKDIR} ${PREFIX}/share/doc/sl	26	.for f in README.md README.ja.md LICENSE
46	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sl	27	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
47	${INSTALL_DATA} ${WRKSRC}/sl.txt ${PREFIX}/share/doc/sl	28	.endfor
48		29
49	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-28 Link Here

(-)files/patch-sl.c (-19 / +20 lines)
1	--- sl.c.orig 1998-07-22 16:01:01.000000000 +0200	1	--- sl.c.orig 2014-01-04 00:18:33.000000000 -0500
2	+++ sl.c 2011-11-01 18:53:45.000000000 +0100	2	+++ sl.c 2014-03-16 16:16:47.000000000 -0400
3	@@ -32,6 +32,11 @@	3	@@ -37,6 +37,12 @@
4	#include <unistd.h>	4	#include <unistd.h>
5	#include "sl.h"	5	#include "sl.h"
6		6
		7	+int add_sl(int);
		8	+int add_C51(int);
		9	+int add_D51(int);
7	+void add_man(int, int);	10	+void add_man(int, int);
8	+int add_D51(int);	11	+void add_smoke(int, int);
9	+int add_sl(int);
10	+void add_smoke(int,int);
11	+	12	+
12	int ACCIDENT = 0;	13	int ACCIDENT = 0;
13	int LOGO = 0;	14	int LOGO = 0;
14	int FLY = 0;	15	int FLY = 0;
15	@@ -59,7 +64,7 @@	16	@@ -99,6 +105,8 @@
16	}	17	}
17	}
18
19	-void main(int argc, char *argv[])
20	+int main(int argc, char *argv[])
21	{
22	int x, i;
23
24	@@ -85,6 +90,8 @@
25	}
26	mvcur(0, COLS - 1, LINES - 1, 0);	18	mvcur(0, COLS - 1, LINES - 1, 0);
27	endwin();	19	endwin();
28	+	20	+
Lines 30-36 Link Here
30	}	22	}
31		23
32		24
33	@@ -129,7 +136,7 @@	25	@@ -143,7 +151,7 @@
34	}	26	}
35		27
36		28
Lines 39-54 Link Here
39	{	31	{
40	static char *d51[D51PATTERNS][D51HIGHT + 1]	32	static char *d51[D51PATTERNS][D51HIGHT + 1]
41	= {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,	33	= {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
42	@@ -170,7 +177,7 @@	34	@@ -183,7 +191,7 @@
		35	return OK;
43	}	36	}
44		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		45
		46
46	-int add_man(int y, int x)	47	-int add_man(int y, int x)
47	+void add_man(int y, int x)	48	+void add_man(int y, int x)
48	{	49	{
49	static char *man[2][2] = {{"", "(O)"}, {"Help!", "\\O/"}};	50	static char *man[2][2] = {{"", "(O)"}, {"Help!", "\\O/"}};
50	int i;	51	int i;
51	@@ -181,7 +188,7 @@	52	@@ -235,7 +243,7 @@
52	}	53	}
53		54
54		55