From 3883523a1866972c357c1f11b57ae84b286398ef Mon Sep 17 00:00:00 2001
From: kyak <bas@bmail.ru>
Date: Thu, 12 Aug 2010 12:24:54 +0400
Subject: [PATCH] kbd: install dumpkeys; bsd-games: change tetris keymap, fix
 primes

---
 bsd-games/Makefile                 |  2 +-
 bsd-games/patches/001-tetris.patch | 11 ++++++++++-
 bsd-games/patches/002-primes.patch |  9 ---------
 kbd/Makefile                       |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bsd-games/Makefile b/bsd-games/Makefile
index 57e0133..580f6ab 100644
--- a/bsd-games/Makefile
+++ b/bsd-games/Makefile
@@ -29,7 +29,7 @@ CFLAGS:=
 define Build/Compile
 #Building tetris
 	cd $(PKG_BUILD_DIR)/tetris; \
-	mv pathnames.h.in pathnames.h; \
+	cp pathnames.h.in pathnames.h; \
 	$(TARGET_CC) -c -O2 -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -I$(STAGING_DIR)/usr/include input.c screen.c shapes.c scores.c tetris.c; \
 	$(TARGET_CC) -lncurses -L$(STAGING_DIR)/usr/lib -o tetris input.o screen.o shapes.o scores.o tetris.o
 
diff --git a/bsd-games/patches/001-tetris.patch b/bsd-games/patches/001-tetris.patch
index a155537..a23bc16 100644
--- a/bsd-games/patches/001-tetris.patch
+++ b/bsd-games/patches/001-tetris.patch
@@ -62,7 +62,7 @@ diff -u bsd-games-2.17/tetris/shapes.c bsd-games-2.17-p/tetris/shapes.c
  	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-07-26 22:04:34.430557133 +0400
++++ bsd-games-2.17-p/tetris/tetris.c	2010-08-12 12:21:29.685301361 +0400
 @@ -35,10 +35,10 @@
   */
  
@@ -76,3 +76,12 @@ diff -u bsd-games-2.17/tetris/tetris.c bsd-games-2.17-p/tetris/tetris.c
  
  /*
   * Tetris (or however it is spelled).
+@@ -145,7 +145,7 @@
+ 		exit(1);
+ 	close(fd);
+ 
+-	keys = "jkl pq";
++	keys = "aks pq";
+ 
+ 	while ((ch = getopt(argc, argv, "k:l:ps")) != -1)
+ 		switch(ch) {
diff --git a/bsd-games/patches/002-primes.patch b/bsd-games/patches/002-primes.patch
index b030c43..2ad32c6 100644
--- a/bsd-games/patches/002-primes.patch
+++ b/bsd-games/patches/002-primes.patch
@@ -43,15 +43,6 @@ diff -u bsd-games-2.17/primes/primes.c bsd-games-2.17-p/primes/primes.c
  
  /*
   * primes - generate a table of primes between two values
-diff -u bsd-games-2.17/primes/primes.h bsd-games-2.17-p/primes/primes.h
---- bsd-games-2.17/primes/primes.h	2003-12-17 05:47:37.000000000 +0300
-+++ bsd-games-2.17-p/primes/primes.h	2010-07-27 10:03:25.333608205 +0400
-@@ -48,3 +48,5 @@
- 
- /* bytes in sieve table (must be > 3*5*7*11) */
- #define	TABSIZE		256*1024
-+
-+int isblank(int c);
 diff -u bsd-games-2.17/primes/pr_tbl.c bsd-games-2.17-p/primes/pr_tbl.c
 --- bsd-games-2.17/primes/pr_tbl.c	2003-12-17 05:47:37.000000000 +0300
 +++ bsd-games-2.17-p/primes/pr_tbl.c	2010-07-27 09:08:15.198301714 +0400
diff --git a/kbd/Makefile b/kbd/Makefile
index 089acdf..4b35a89 100644
--- a/kbd/Makefile
+++ b/kbd/Makefile
@@ -32,9 +32,9 @@ define Build/Configure
 endef
 
 define Package/kbd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	for f in setfont psfxtable setmetamode unicode_stop kbdrate loadkeys kbd_mode showconsolefont loadunimap unicode_start deallocvt openvt getkeycodes showkey setleds cad chvt mapscrn fgconsole setkeycodes; do \
-            $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$$$$f $(1)/usr/sbin;\
+	$(INSTALL_DIR) $(1)/usr/bin
+	for f in setfont psfxtable setmetamode unicode_stop kbdrate loadkeys kbd_mode showconsolefont loadunimap unicode_start deallocvt openvt getkeycodes showkey setleds cad chvt mapscrn fgconsole setkeycodes dumpkeys; do \
+            $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$$$$f $(1)/usr/bin;\
 	done
 endef