Date: Sun, 16 Mar 2014 16:31:01 -0400 (EDT) From: Adam Weinberger <adamw@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/187640: [patch] update games/sl and remove nkf dependency Message-ID: <20140316203101.64F5811FAA5@apnoea.adamw.org> Resent-Message-ID: <201403162040.s2GKe0xY069717@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187640
>Category: ports
>Synopsis: [patch] update games/sl and remove nkf dependency
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 16 20:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Adam Weinberger
>Release: FreeBSD 10.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD apnoea.adamw.org 10.0-STABLE FreeBSD 10.0-STABLE #2: Fri Mar 14 08:04:59 EDT 2014 root@apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386
>Description:
The attached patch updates to the latest version in git (by the same guy
who wrote the original version). It also drops the old-style WITH_... and
avoids the need for japanese/nkf. Also it adds STAGE support.
>How-To-Repeat:
>Fix:
--- sl.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 348425)
+++ Makefile (working copy)
@@ -2,48 +2,29 @@
# $FreeBSD$
PORTNAME= sl
-PORTVERSION= 3.03${SLPATCHVERSION}
+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"
-BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
+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 -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>
Index: distinfo
===================================================================
--- distinfo (revision 348425)
+++ distinfo (working copy)
@@ -1,4 +1,2 @@
-SHA256 (sl.tar) = b2bcbd86acf2017c84b6aaf6161b3b24f97e34a2d70ab0204c9503f5d50965f4
-SIZE (sl.tar) = 20480
-SHA256 (sl5-1.patch) = 4943b6f000f518ed08755b36d9b753291989c4867e55d74bc4cc4502f6e9422f
-SIZE (sl5-1.patch) = 36035
+SHA256 (sl-3.03.193acb1.tar.gz) = 5ffa90f03cf0bbc0d180a259037810cdb31242e465074a9cd1555a7748684bcf
+SIZE (sl-3.03.193acb1.tar.gz) = 5212
Index: files/patch-sl.c
===================================================================
--- files/patch-sl.c (revision 348425)
+++ files/patch-sl.c (working copy)
@@ -1,28 +1,20 @@
---- 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"
++int add_sl(int);
++int add_C51(int);
++int add_D51(int);
+void add_man(int, int);
-+int add_D51(int);
-+int add_sl(int);
-+void add_smoke(int,int);
++void add_smoke(int, int);
+
int ACCIDENT = 0;
int LOGO = 0;
int FLY = 0;
-@@ -59,7 +64,7 @@
+@@ -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();
+
@@ -30,7 +22,7 @@
}
-@@ -129,7 +136,7 @@
+@@ -143,7 +151,7 @@
}
@@ -39,16 +31,25 @@
{
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 @@
+ }
+
-int add_man(int y, int x)
+void add_man(int y, int x)
{
static char *man[2][2] = {{"", "(O)"}, {"Help!", "\\O/"}};
int i;
-@@ -181,7 +188,7 @@
+@@ -235,7 +243,7 @@
}
Index: pkg-plist
===================================================================
--- pkg-plist (revision 348425)
+++ pkg-plist (working copy)
@@ -1,4 +1,7 @@
bin/sl
-%%DOCSDIR%%/README
-%%DOCSDIR%%/sl.txt
-@dirrm %%DOCSDIR%%
+man/man1/sl.1.gz
+man/ja/man1/sl.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/README.ja.md
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- sl.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140316203101.64F5811FAA5>