Merge branch 'master' of git://projects.qi-hardware.com/openwrt-packagesHEADmaster

Conflicts:
	links/Makefile

2 files changed, 24 insertions, 17 deletions

diff --git a/bsd-games/Makefile b/bsd-games/Makefile
index 580f6ab..24e762a 100644
--- a/bsd-games/Makefile
+++ b/bsd-games/Makefile
@@ -1,5 +1,3 @@
-# 
-# kyak@freenode/#qi-hardware
 #
 # This is free software, licensed under the GNU General Public License v2.
 #
diff --git a/bsd-games/patches/001-tetris.patch b/bsd-games/patches/001-tetris.patch
index a23bc16..b193d8a 100644
--- a/bsd-games/patches/001-tetris.patch
+++ b/bsd-games/patches/001-tetris.patch
@@ -1,6 +1,6 @@
-diff -u bsd-games-2.17/tetris/input.c bsd-games-2.17-p/tetris/input.c
---- bsd-games-2.17/tetris/input.c	2003-12-17 05:47:37.000000000 +0300
-+++ bsd-games-2.17-p/tetris/input.c	2010-07-26 22:04:34.422302192 +0400
+diff -ur bsd-games-2.17-p/tetris/input.c bsd-games-2.17/tetris/input.c
+--- bsd-games-2.17-p/tetris/input.c	2010-11-14 21:46:54.909025861 +0300
++++ bsd-games-2.17/tetris/input.c	2010-11-14 21:48:17.830025444 +0300
 @@ -85,7 +85,7 @@
  		endtv = *tvp;
  		timeout = tvp->tv_sec * 1000 + tvp->tv_usec / 1000;
@@ -10,18 +10,18 @@ diff -u bsd-games-2.17/tetris/input.c bsd-games-2.17-p/tetris/input.c
  again:
  	set[0].fd = STDIN_FILENO;
  	set[0].events = POLLIN;
-diff -u bsd-games-2.17/tetris/pathnames.h.in bsd-games-2.17-p/tetris/pathnames.h.in
---- bsd-games-2.17/tetris/pathnames.h.in	2003-12-17 05:47:37.000000000 +0300
-+++ bsd-games-2.17-p/tetris/pathnames.h.in	2010-07-27 11:42:20.386554141 +0400
+diff -ur bsd-games-2.17-p/tetris/pathnames.h.in bsd-games-2.17/tetris/pathnames.h.in
+--- bsd-games-2.17-p/tetris/pathnames.h.in	2010-11-14 21:46:54.908027310 +0300
++++ bsd-games-2.17/tetris/pathnames.h.in	2010-11-14 21:48:17.830025444 +0300
 @@ -34,4 +34,4 @@
   *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
   */
  
 -#define _PATH_SCOREFILE	"@tetris_scorefile@"
 +#define _PATH_SCOREFILE	"/usr/share/games/tetris-bsd.scores"
-diff -u bsd-games-2.17/tetris/screen.c bsd-games-2.17-p/tetris/screen.c
---- bsd-games-2.17/tetris/screen.c	2004-01-27 23:52:07.000000000 +0300
-+++ bsd-games-2.17-p/tetris/screen.c	2010-07-26 22:04:34.422151495 +0400
+diff -ur bsd-games-2.17-p/tetris/screen.c bsd-games-2.17/tetris/screen.c
+--- bsd-games-2.17-p/tetris/screen.c	2010-11-14 21:46:54.908027310 +0300
++++ bsd-games-2.17/tetris/screen.c	2010-11-14 22:09:58.510150197 +0300
 @@ -73,7 +73,7 @@
  extern char	PC, *BC, *UP;	/* tgoto requires globals: ugh! */
  static char BCdefault[] = "\b";
@@ -39,9 +39,9 @@ diff -u bsd-games-2.17/tetris/screen.c bsd-games-2.17-p/tetris/screen.c
  	newtt.c_oflag &= ~OXTABS;
  	newtt.c_cc[VMIN] = 1;
  	newtt.c_cc[VTIME] = 0;
-diff -u bsd-games-2.17/tetris/shapes.c bsd-games-2.17-p/tetris/shapes.c
---- bsd-games-2.17/tetris/shapes.c	2003-12-17 05:47:37.000000000 +0300
-+++ bsd-games-2.17-p/tetris/shapes.c	2010-07-27 09:30:41.267111585 +0400
+diff -ur bsd-games-2.17-p/tetris/shapes.c bsd-games-2.17/tetris/shapes.c
+--- bsd-games-2.17-p/tetris/shapes.c	2010-11-14 21:46:54.908027310 +0300
++++ bsd-games-2.17/tetris/shapes.c	2010-11-14 21:48:17.831024977 +0300
 @@ -83,7 +83,7 @@
  	const struct shape *shape;
  	int pos;
@@ -60,9 +60,9 @@ diff -u bsd-games-2.17/tetris/shapes.c bsd-games-2.17-p/tetris/shapes.c
  
  	board[pos] = onoff;
  	board[pos + *o++] = onoff;
-diff -u bsd-games-2.17/tetris/tetris.c bsd-games-2.17-p/tetris/tetris.c
---- bsd-games-2.17/tetris/tetris.c	2004-01-27 23:52:07.000000000 +0300
-+++ bsd-games-2.17-p/tetris/tetris.c	2010-08-12 12:21:29.685301361 +0400
+diff -ur bsd-games-2.17-p/tetris/tetris.c bsd-games-2.17/tetris/tetris.c
+--- bsd-games-2.17-p/tetris/tetris.c	2010-11-14 21:46:54.909025861 +0300
++++ bsd-games-2.17/tetris/tetris.c	2010-11-14 22:15:43.958150419 +0300
 @@ -35,10 +35,10 @@
   */
  
@@ -85,3 +85,12 @@ diff -u bsd-games-2.17/tetris/tetris.c bsd-games-2.17-p/tetris/tetris.c
  
  	while ((ch = getopt(argc, argv, "k:l:ps")) != -1)
  		switch(ch) {
+@@ -194,7 +194,7 @@
+ 	}
+ 
+ 	sprintf(key_msg,
+-"%s - left   %s - rotate   %s - right   %s - drop   %s - pause   %s - quit",
++"%s:<- %s:rotate %s:-> %s:drop %s:pause %s:quit",
+ 		key_write[0], key_write[1], key_write[2], key_write[3],
+ 		key_write[4], key_write[5]);
+