games: Move all games into games subdir

Moved all games into a subdir called games and
then updated makefiles as necessary.

If not one objects to this one then I will
probably do the same for audio next.

Daniel Laird

25 files changed, 24 insertions, 30 deletions

diff --git a/package/Config.in b/package/Config.in
index 72fd03d3d..cccd455a2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -485,20 +485,7 @@ endif
 # java support
 source "package/java/Config.in"
 
-menuconfig BR2_GAMES
-	bool "Games"
-	default y
-	help
-	  Support for games
-
-if BR2_GAMES
-source "package/lxdoom/Config.in"
-source "package/ace_of_penguins/Config.in"
-source "package/gnuchess/Config.in"
-source "package/xboard/Config.in"
-source "package/rubix/Config.in"
-source "package/magiccube4d/Config.in"
-source "package/vice/Config.in"
-endif
+# various games packages
+source "package/games/Config.in"
 
 endmenu
diff --git a/package/games/Config.in b/package/games/Config.in
new file mode 100644
index 000000000..45d3c8266
--- /dev/null
+++ b/package/games/Config.in
@@ -0,0 +1,15 @@
+menuconfig BR2_GAMES
+	bool "Games"
+	default y
+	help
+	  Support for games
+
+if BR2_GAMES
+source "package/games/ace_of_penguins/Config.in"
+source "package/games/gnuchess/Config.in"
+source "package/games/lxdoom/Config.in"
+source "package/games/magiccube4d/Config.in"
+source "package/games/rubix/Config.in"
+source "package/games/vice/Config.in"
+source "package/games/xboard/Config.in"
+endif
diff --git a/package/ace_of_penguins/Config.in b/package/games/ace_of_penguins/Config.in
index 3e1a9db2f..3e1a9db2f 100644
--- a/package/ace_of_penguins/Config.in
+++ b/package/games/ace_of_penguins/Config.in
diff --git a/package/ace_of_penguins/ace_of_penguins-1.2-update.patch b/package/games/ace_of_penguins/ace_of_penguins-1.2-update.patch
index 180863f5e..180863f5e 100644
--- a/package/ace_of_penguins/ace_of_penguins-1.2-update.patch
+++ b/package/games/ace_of_penguins/ace_of_penguins-1.2-update.patch
diff --git a/package/ace_of_penguins/ace_of_penguins.mk b/package/games/ace_of_penguins/ace_of_penguins.mk
index b067fa8b6..2aaf7aac8 100644
--- a/package/ace_of_penguins/ace_of_penguins.mk
+++ b/package/games/ace_of_penguins/ace_of_penguins.mk
@@ -3,7 +3,6 @@
 # ace_of_penguins
 #
 #############################################################
-
 ACE_OF_PENGUINS_VERSION = 1.2
 ACE_OF_PENGUINS_SOURCE = ace-$(ACE_OF_PENGUINS_VERSION).tar.gz
 ACE_OF_PENGUINS_SITE = http://www.delorie.com/store/ace/
@@ -13,4 +12,4 @@ ACE_OF_PENGUINS_TARGET = YES
 
 ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng $(XSERVER)
 
-$(eval $(call AUTOTARGETS,package,ace_of_penguins))
\ No newline at end of file
+$(eval $(call AUTOTARGETS,package/games,ace_of_penguins))
diff --git a/package/gnuchess/Config.in b/package/games/gnuchess/Config.in
index cae05cbbb..cae05cbbb 100644
--- a/package/gnuchess/Config.in
+++ b/package/games/gnuchess/Config.in
diff --git a/package/gnuchess/gnuchess-5.07.patch b/package/games/gnuchess/gnuchess-5.07.patch
index 18979b68c..18979b68c 100644
--- a/package/gnuchess/gnuchess-5.07.patch
+++ b/package/games/gnuchess/gnuchess-5.07.patch
diff --git a/package/gnuchess/gnuchess.mk b/package/games/gnuchess/gnuchess.mk
index f8f18e0a3..b1ff3b73a 100644
--- a/package/gnuchess/gnuchess.mk
+++ b/package/games/gnuchess/gnuchess.mk
@@ -6,7 +6,6 @@
 GNUCHESS_VERSION = 5.07
 GNUCHESS_SOURCE = gnuchess-$(GNUCHESS_VERSION).tar.gz
 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
-GNUCHESS_AUTORECONF = NO
 GNUCHESS_INSTALL_STAGING = NO
 GNUCHESS_INSTALL_TARGET = YES
 
@@ -14,5 +13,5 @@ GNUCHESS_CONF_ENV = ac_cv_func_realloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull
 
 GNUCHESS_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,gnuchess))
+$(eval $(call AUTOTARGETS,package/games,gnuchess))
 
diff --git a/package/lxdoom/Config.in b/package/games/lxdoom/Config.in
index 892e45c8f..892e45c8f 100644
--- a/package/lxdoom/Config.in
+++ b/package/games/lxdoom/Config.in
diff --git a/package/lxdoom/lxdoom-1.4.4-updated.patch b/package/games/lxdoom/lxdoom-1.4.4-updated.patch
index cbb4a0a4f..cbb4a0a4f 100644
--- a/package/lxdoom/lxdoom-1.4.4-updated.patch
+++ b/package/games/lxdoom/lxdoom-1.4.4-updated.patch
diff --git a/package/lxdoom/lxdoom-wad.mk b/package/games/lxdoom/lxdoom-wad.mk
index 0f7d79911..0f7d79911 100644
--- a/package/lxdoom/lxdoom-wad.mk
+++ b/package/games/lxdoom/lxdoom-wad.mk
diff --git a/package/lxdoom/lxdoom.mk b/package/games/lxdoom/lxdoom.mk
index bc688eb78..71d36f498 100644
--- a/package/lxdoom/lxdoom.mk
+++ b/package/games/lxdoom/lxdoom.mk
@@ -3,11 +3,9 @@
 # lxdoom
 #
 #############################################################
-
 LXDOOM_VERSION = 1.4.4
 LXDOOM_SOURCE = lxdoom-$(LXDOOM_VERSION).tar.gz
 LXDOOM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lxdoom
-LXDOOM_AUTORECONF = NO
 LXDOOM_INSTALL_STAGING = NO
 LXDOOM_INSTALL_TARGET = YES
 LXDOOM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
@@ -19,4 +17,4 @@ LXDOOM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
 
 LXDOOM_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,lxdoom))
\ No newline at end of file
+$(eval $(call AUTOTARGETS,package/games,lxdoom))
diff --git a/package/magiccube4d/Config.in b/package/games/magiccube4d/Config.in
index ba4bceb01..ba4bceb01 100644
--- a/package/magiccube4d/Config.in
+++ b/package/games/magiccube4d/Config.in
diff --git a/package/magiccube4d/magiccube4d-2_2-add-installer.patch b/package/games/magiccube4d/magiccube4d-2_2-add-installer.patch
index afe543ba3..afe543ba3 100644
--- a/package/magiccube4d/magiccube4d-2_2-add-installer.patch
+++ b/package/games/magiccube4d/magiccube4d-2_2-add-installer.patch
diff --git a/package/magiccube4d/magiccube4d-2_2-no-warn-err.patch b/package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch
index 8bbc483ab..8bbc483ab 100644
--- a/package/magiccube4d/magiccube4d-2_2-no-warn-err.patch
+++ b/package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch
diff --git a/package/magiccube4d/magiccube4d.mk b/package/games/magiccube4d/magiccube4d.mk
index b6f11f814..fa36be289 100644
--- a/package/magiccube4d/magiccube4d.mk
+++ b/package/games/magiccube4d/magiccube4d.mk
@@ -6,12 +6,11 @@
 MAGICCUBE4D_VERSION = 2_2
 MAGICCUBE4D_SOURCE = magiccube4d-src-$(MAGICCUBE4D_VERSION).tar.gz
 MAGICCUBE4D_SITE = http://avr32linux.org/twiki/pub/Main/MagicCube4D
-MAGICCUBE4D_AUTORECONF = NO
 MAGICCUBE4D_INSTALL_STAGING = NO
 MAGICCUBE4D_INSTALL_TARGET = YES
 MAGICCUBE4D_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
 
 MAGICCUBE4D_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,magiccube4d))
+$(eval $(call AUTOTARGETS,package/games,magiccube4d))
 
diff --git a/package/rubix/Config.in b/package/games/rubix/Config.in
index 46dc5ec4c..46dc5ec4c 100644
--- a/package/rubix/Config.in
+++ b/package/games/rubix/Config.in
diff --git a/package/rubix/rubix-1.0.5.patch b/package/games/rubix/rubix-1.0.5.patch
index 3ce6dad22..3ce6dad22 100644
--- a/package/rubix/rubix-1.0.5.patch
+++ b/package/games/rubix/rubix-1.0.5.patch
diff --git a/package/rubix/rubix.mk b/package/games/rubix/rubix.mk
index e9c1e063d..586f9cf60 100644
--- a/package/rubix/rubix.mk
+++ b/package/games/rubix/rubix.mk
@@ -6,7 +6,6 @@
 RUBIX_VERSION = 1.0.5
 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
 RUBIX_SITE = http://avr32linux.org/twiki/pub/Main/Rubix
-RUBIX_AUTORECONF = NO
 RUBIX_INSTALL_STAGING = NO
 RUBIX_INSTALL_TARGET = YES
 RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
@@ -15,5 +14,5 @@ RUBIX_MAKE_OPT = CC=$(TARGET_CC) XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-
 
 RUBIX_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,rubix))
+$(eval $(call AUTOTARGETS,package/games,rubix))
 
diff --git a/package/vice/Config.in b/package/games/vice/Config.in
index 48967e466..48967e466 100644
--- a/package/vice/Config.in
+++ b/package/games/vice/Config.in
diff --git a/package/vice/vice-1.22-remove-bzero.patch b/package/games/vice/vice-1.22-remove-bzero.patch
index 5836a9fce..5836a9fce 100644
--- a/package/vice/vice-1.22-remove-bzero.patch
+++ b/package/games/vice/vice-1.22-remove-bzero.patch
diff --git a/package/vice/vice.mk b/package/games/vice/vice.mk
index b595dd336..e59c6bfa1 100644
--- a/package/vice/vice.mk
+++ b/package/games/vice/vice.mk
@@ -6,7 +6,6 @@
 VICE_VERSION = 1.22
 VICE_SOURCE = vice-$(VICE_VERSION).tar.gz
 VICE_SITE = http://www.viceteam.org/online
-VICE_AUTORECONF = NO
 VICE_INSTALL_STAGING = NO
 VICE_INSTALL_TARGET = YES
 
@@ -14,5 +13,5 @@ VICE_CONF_OPT = --without-resid --with-alsa CFLAGS="-O0"
 
 VICE_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,vice))
+$(eval $(call AUTOTARGETS,package/games,vice))
 
diff --git a/package/xboard/Config.in b/package/games/xboard/Config.in
index bb7e00104..bb7e00104 100644
--- a/package/xboard/Config.in
+++ b/package/games/xboard/Config.in
diff --git a/package/xboard/xboard-4.2.7-installer.patch b/package/games/xboard/xboard-4.2.7-installer.patch
index 477b8a238..477b8a238 100644
--- a/package/xboard/xboard-4.2.7-installer.patch
+++ b/package/games/xboard/xboard-4.2.7-installer.patch
diff --git a/package/xboard/xboard.mk b/package/games/xboard/xboard.mk
index 100726639..b14aaf5ca 100644
--- a/package/xboard/xboard.mk
+++ b/package/games/xboard/xboard.mk
@@ -6,7 +6,6 @@
 XBOARD_VERSION = 4.2.7
 XBOARD_SOURCE = xboard-$(XBOARD_VERSION).tar.gz
 XBOARD_SITE = $(BR2_GNU_MIRROR)/xboard
-XBOARD_AUTORECONF = NO
 XBOARD_INSTALL_STAGING = NO
 XBOARD_INSTALL_TARGET = YES
 XBOARD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
@@ -15,5 +14,5 @@ XBOARD_CONF_OPT --prefix=/usr
 
 XBOARD_DEPENDENCIES = uclibc gnuchess
 
-$(eval $(call AUTOTARGETS,package,xboard))
+$(eval $(call AUTOTARGETS,package/games,xboard))