Add a subdir for geo codes and a subdir for games

malaise · Nov 7, 2023 · 0277401 · 0277401
1 parent 11aa814
commit 0277401
Show file tree

Hide file tree

Showing 223 changed files with 22 additions and 10 deletions.
diff --git a/usr/battleship/Afpx.xml → usr/games/battleship/Afpx.xml b/usr/battleship/Afpx.xml → usr/games/battleship/Afpx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.1"?>
-<!DOCTYPE Afpx_Descriptors SYSTEM "../../reposit/Afpx.dtd">
+<!DOCTYPE Afpx_Descriptors SYSTEM "../../../reposit/Afpx.dtd">
 <!-- For Battle Ships -->
 
 <Afpx_Descriptors Width="85" Height="34">

diff --git a/usr/battleship/Autobus.dtd → usr/games/battleship/Autobus.dtd b/usr/battleship/Autobus.dtd → usr/games/battleship/Autobus.dtd
diff --git a/usr/battleship/Autobus.xml → usr/games/battleship/Autobus.xml b/usr/battleship/Autobus.xml → usr/games/battleship/Autobus.xml
diff --git a/usr/battleship/BattleShip.txt → usr/games/battleship/BattleShip.txt b/usr/battleship/BattleShip.txt → usr/games/battleship/BattleShip.txt
diff --git a/usr/battleship/battle.adb → usr/games/battleship/battle.adb b/usr/battleship/battle.adb → usr/games/battleship/battle.adb
diff --git a/usr/battleship/battle.ads → usr/games/battleship/battle.ads b/usr/battleship/battle.ads → usr/games/battleship/battle.ads
diff --git a/usr/battleship/battleship.adb → usr/games/battleship/battleship.adb b/usr/battleship/battleship.adb → usr/games/battleship/battleship.adb
diff --git a/usr/battleship/bs → usr/games/battleship/bs b/usr/battleship/bs → usr/games/battleship/bs
diff --git a/usr/battleship/communication.adb → usr/games/battleship/communication.adb b/usr/battleship/communication.adb → usr/games/battleship/communication.adb
diff --git a/usr/battleship/communication.ads → usr/games/battleship/communication.ads b/usr/battleship/communication.ads → usr/games/battleship/communication.ads
diff --git a/usr/battleship/fleet.ads → usr/games/battleship/fleet.ads b/usr/battleship/fleet.ads → usr/games/battleship/fleet.ads
diff --git a/usr/battleship/makefile → usr/games/battleship/makefile b/usr/battleship/makefile → usr/games/battleship/makefile
diff --git a/usr/battleship/setup.adb → usr/games/battleship/setup.adb b/usr/battleship/setup.adb → usr/games/battleship/setup.adb
diff --git a/usr/battleship/setup.ads → usr/games/battleship/setup.ads b/usr/battleship/setup.ads → usr/games/battleship/setup.ads
diff --git a/usr/battleship/t_bs → usr/games/battleship/t_bs b/usr/battleship/t_bs → usr/games/battleship/t_bs
diff --git a/usr/battleship/utils.adb → usr/games/battleship/utils.adb b/usr/battleship/utils.adb → usr/games/battleship/utils.adb
diff --git a/usr/battleship/utils.ads → usr/games/battleship/utils.ads b/usr/battleship/utils.ads → usr/games/battleship/utils.ads
diff --git a/usr/chess/chess.adb → usr/games/chess/chess.adb b/usr/chess/chess.adb → usr/games/chess/chess.adb
diff --git a/usr/chess/connection.adb → usr/games/chess/connection.adb b/usr/chess/connection.adb → usr/games/chess/connection.adb
diff --git a/usr/chess/connection.ads → usr/games/chess/connection.ads b/usr/chess/connection.ads → usr/games/chess/connection.ads
diff --git a/usr/chess/debug.adb → usr/games/chess/debug.adb b/usr/chess/debug.adb → usr/games/chess/debug.adb
diff --git a/usr/chess/debug.ads → usr/games/chess/debug.ads b/usr/chess/debug.ads → usr/games/chess/debug.ads
diff --git a/usr/chess/file.adb → usr/games/chess/file.adb b/usr/chess/file.adb → usr/games/chess/file.adb
diff --git a/usr/chess/file.ads → usr/games/chess/file.ads b/usr/chess/file.ads → usr/games/chess/file.ads
diff --git a/usr/chess/game.adb → usr/games/chess/game.adb b/usr/chess/game.adb → usr/games/chess/game.adb
diff --git a/usr/chess/game.ads → usr/games/chess/game.ads b/usr/chess/game.ads → usr/games/chess/game.ads
diff --git a/usr/chess/human.adb → usr/games/chess/human.adb b/usr/chess/human.adb → usr/games/chess/human.adb
diff --git a/usr/chess/human.ads → usr/games/chess/human.ads b/usr/chess/human.ads → usr/games/chess/human.ads
diff --git a/usr/chess/image.adb → usr/games/chess/image.adb b/usr/chess/image.adb → usr/games/chess/image.adb
diff --git a/usr/chess/image.ads → usr/games/chess/image.ads b/usr/chess/image.ads → usr/games/chess/image.ads
diff --git a/usr/chess/makefile → usr/games/chess/makefile b/usr/chess/makefile → usr/games/chess/makefile
diff --git a/usr/chess/pieces-actions_of_bishop.adb → usr/games/chess/pieces-actions_of_bishop.adb b/usr/chess/pieces-actions_of_bishop.adb → usr/games/chess/pieces-actions_of_bishop.adb
diff --git a/usr/chess/pieces-actions_of_king.adb → usr/games/chess/pieces-actions_of_king.adb b/usr/chess/pieces-actions_of_king.adb → usr/games/chess/pieces-actions_of_king.adb
diff --git a/usr/chess/pieces-actions_of_knight.adb → usr/games/chess/pieces-actions_of_knight.adb b/usr/chess/pieces-actions_of_knight.adb → usr/games/chess/pieces-actions_of_knight.adb
diff --git a/usr/chess/pieces-actions_of_pawn.adb → usr/games/chess/pieces-actions_of_pawn.adb b/usr/chess/pieces-actions_of_pawn.adb → usr/games/chess/pieces-actions_of_pawn.adb
diff --git a/usr/chess/pieces-actions_of_queen.adb → usr/games/chess/pieces-actions_of_queen.adb b/usr/chess/pieces-actions_of_queen.adb → usr/games/chess/pieces-actions_of_queen.adb
diff --git a/usr/chess/pieces-actions_of_rook.adb → usr/games/chess/pieces-actions_of_rook.adb b/usr/chess/pieces-actions_of_rook.adb → usr/games/chess/pieces-actions_of_rook.adb
diff --git a/usr/chess/pieces.adb → usr/games/chess/pieces.adb b/usr/chess/pieces.adb → usr/games/chess/pieces.adb
diff --git a/usr/chess/pieces.ads → usr/games/chess/pieces.ads b/usr/chess/pieces.ads → usr/games/chess/pieces.ads
diff --git a/usr/chess/players.adb → usr/games/chess/players.adb b/usr/chess/players.adb → usr/games/chess/players.adb
diff --git a/usr/chess/players.ads → usr/games/chess/players.ads b/usr/chess/players.ads → usr/games/chess/players.ads
diff --git a/usr/chess/screen-graphic-bitmaps.adb → usr/games/chess/screen-graphic-bitmaps.adb b/usr/chess/screen-graphic-bitmaps.adb → usr/games/chess/screen-graphic-bitmaps.adb
diff --git a/usr/chess/screen-graphic.adb → usr/games/chess/screen-graphic.adb b/usr/chess/screen-graphic.adb → usr/games/chess/screen-graphic.adb
diff --git a/usr/chess/screen-moves.adb → usr/games/chess/screen-moves.adb b/usr/chess/screen-moves.adb → usr/games/chess/screen-moves.adb
diff --git a/usr/chess/screen-text.adb → usr/games/chess/screen-text.adb b/usr/chess/screen-text.adb → usr/games/chess/screen-text.adb
diff --git a/usr/chess/screen.adb → usr/games/chess/screen.adb b/usr/chess/screen.adb → usr/games/chess/screen.adb
diff --git a/usr/chess/screen.ads → usr/games/chess/screen.ads b/usr/chess/screen.ads → usr/games/chess/screen.ads
diff --git a/usr/chess/set_up.adb → usr/games/chess/set_up.adb b/usr/chess/set_up.adb → usr/games/chess/set_up.adb
diff --git a/usr/chess/set_up.ads → usr/games/chess/set_up.ads b/usr/chess/set_up.ads → usr/games/chess/set_up.ads
diff --git a/usr/chess/space-board.adb → usr/games/chess/space-board.adb b/usr/chess/space-board.adb → usr/games/chess/space-board.adb
diff --git a/usr/chess/space-board.ads → usr/games/chess/space-board.ads b/usr/chess/space-board.ads → usr/games/chess/space-board.ads
diff --git a/usr/chess/space.adb → usr/games/chess/space.adb b/usr/chess/space.adb → usr/games/chess/space.adb
diff --git a/usr/chess/space.ads → usr/games/chess/space.ads b/usr/chess/space.ads → usr/games/chess/space.ads
diff --git a/usr/chess/t_chess → usr/games/chess/t_chess b/usr/chess/t_chess → usr/games/chess/t_chess
diff --git a/usr/chess/team.adb → usr/games/chess/team.adb b/usr/chess/team.adb → usr/games/chess/team.adb
diff --git a/usr/chess/team.ads → usr/games/chess/team.ads b/usr/chess/team.ads → usr/games/chess/team.ads
diff --git a/usr/chess/try.chs → usr/games/chess/try.chs b/usr/chess/try.chs → usr/games/chess/try.chs
diff --git a/usr/fourtwentyone/FourTwentyOne.txt → usr/games/fourtwentyone/FourTwentyOne.txt b/usr/fourtwentyone/FourTwentyOne.txt → usr/games/fourtwentyone/FourTwentyOne.txt
diff --git a/usr/fourtwentyone/fourtwentyone.adb → usr/games/fourtwentyone/fourtwentyone.adb b/usr/fourtwentyone/fourtwentyone.adb → usr/games/fourtwentyone/fourtwentyone.adb
diff --git a/usr/fourtwentyone/makefile → usr/games/fourtwentyone/makefile b/usr/fourtwentyone/makefile → usr/games/fourtwentyone/makefile
diff --git a/usr/freecell/Freecell.txt → usr/games/freecell/Freecell.txt b/usr/freecell/Freecell.txt → usr/games/freecell/Freecell.txt
diff --git a/usr/freecell/FreecellInit.png → usr/games/freecell/FreecellInit.png b/usr/freecell/FreecellInit.png → usr/games/freecell/FreecellInit.png
diff --git a/usr/freecell/cards.adb → usr/games/freecell/cards.adb b/usr/freecell/cards.adb → usr/games/freecell/cards.adb
diff --git a/usr/freecell/cards.ads → usr/games/freecell/cards.ads b/usr/freecell/cards.ads → usr/games/freecell/cards.ads
diff --git a/usr/freecell/freecell.adb → usr/games/freecell/freecell.adb b/usr/freecell/freecell.adb → usr/games/freecell/freecell.adb
diff --git a/usr/freecell/makefile → usr/games/freecell/makefile b/usr/freecell/makefile → usr/games/freecell/makefile
diff --git a/usr/freecell/memory.adb → usr/games/freecell/memory.adb b/usr/freecell/memory.adb → usr/games/freecell/memory.adb
diff --git a/usr/freecell/memory.ads → usr/games/freecell/memory.ads b/usr/freecell/memory.ads → usr/games/freecell/memory.ads
diff --git a/usr/freecell/movements.adb → usr/games/freecell/movements.adb b/usr/freecell/movements.adb → usr/games/freecell/movements.adb
diff --git a/usr/freecell/movements.ads → usr/games/freecell/movements.ads b/usr/freecell/movements.ads → usr/games/freecell/movements.ads
diff --git a/usr/freecell/table.adb → usr/games/freecell/table.adb b/usr/freecell/table.adb → usr/games/freecell/table.adb
diff --git a/usr/freecell/table.ads → usr/games/freecell/table.ads b/usr/freecell/table.ads → usr/games/freecell/table.ads
diff --git a/usr/lapeau/Lapeau.txt → usr/games/lapeau/Lapeau.txt b/usr/lapeau/Lapeau.txt → usr/games/lapeau/Lapeau.txt
diff --git a/usr/lapeau/LapeauFullAlt.png → usr/games/lapeau/LapeauFullAlt.png b/usr/lapeau/LapeauFullAlt.png → usr/games/lapeau/LapeauFullAlt.png
diff --git a/usr/lapeau/LapeauFullMono.png → usr/games/lapeau/LapeauFullMono.png b/usr/lapeau/LapeauFullMono.png → usr/games/lapeau/LapeauFullMono.png
diff --git a/usr/lapeau/LapeauInit.png → usr/games/lapeau/LapeauInit.png b/usr/lapeau/LapeauInit.png → usr/games/lapeau/LapeauInit.png
diff --git a/usr/lapeau/LapeauPartial.png → usr/games/lapeau/LapeauPartial.png b/usr/lapeau/LapeauPartial.png → usr/games/lapeau/LapeauPartial.png
diff --git a/usr/lapeau/cards.adb → usr/games/lapeau/cards.adb b/usr/lapeau/cards.adb → usr/games/lapeau/cards.adb
diff --git a/usr/lapeau/cards.ads → usr/games/lapeau/cards.ads b/usr/lapeau/cards.ads → usr/games/lapeau/cards.ads
diff --git a/usr/lapeau/lapeau.adb → usr/games/lapeau/lapeau.adb b/usr/lapeau/lapeau.adb → usr/games/lapeau/lapeau.adb
diff --git a/usr/lapeau/makefile → usr/games/lapeau/makefile b/usr/lapeau/makefile → usr/games/lapeau/makefile
diff --git a/usr/lapeau/memory.adb → usr/games/lapeau/memory.adb b/usr/lapeau/memory.adb → usr/games/lapeau/memory.adb
diff --git a/usr/lapeau/memory.ads → usr/games/lapeau/memory.ads b/usr/lapeau/memory.ads → usr/games/lapeau/memory.ads
diff --git a/usr/lapeau/movements.adb → usr/games/lapeau/movements.adb b/usr/lapeau/movements.adb → usr/games/lapeau/movements.adb
diff --git a/usr/lapeau/movements.ads → usr/games/lapeau/movements.ads b/usr/lapeau/movements.ads → usr/games/lapeau/movements.ads
diff --git a/usr/lapeau/table.adb → usr/games/lapeau/table.adb b/usr/lapeau/table.adb → usr/games/lapeau/table.adb
diff --git a/usr/lapeau/table.ads → usr/games/lapeau/table.ads b/usr/lapeau/table.ads → usr/games/lapeau/table.ads
diff --git a/usr/lem/Lem.png → usr/games/lem/Lem.png b/usr/lem/Lem.png → usr/games/lem/Lem.png
diff --git a/usr/lem/Lem.txt → usr/games/lem/Lem.txt b/usr/lem/Lem.txt → usr/games/lem/Lem.txt
diff --git a/usr/lem/debug.adb → usr/games/lem/debug.adb b/usr/lem/debug.adb → usr/games/lem/debug.adb
diff --git a/usr/lem/debug.ads → usr/games/lem/debug.ads b/usr/lem/debug.ads → usr/games/lem/debug.ads
diff --git a/usr/lem/flight.adb → usr/games/lem/flight.adb b/usr/lem/flight.adb → usr/games/lem/flight.adb
diff --git a/usr/lem/flight.ads → usr/games/lem/flight.ads b/usr/lem/flight.ads → usr/games/lem/flight.ads
diff --git a/usr/lem/game.adb → usr/games/lem/game.adb b/usr/lem/game.adb → usr/games/lem/game.adb
diff --git a/usr/lem/game.ads → usr/games/lem/game.ads b/usr/lem/game.ads → usr/games/lem/game.ads
diff --git a/usr/lem/land_lem.adb → usr/games/lem/land_lem.adb b/usr/lem/land_lem.adb → usr/games/lem/land_lem.adb
diff --git a/usr/lem/lem → usr/games/lem/lem b/usr/lem/lem → usr/games/lem/lem
diff --git a/usr/lem/lem.adb → usr/games/lem/lem.adb b/usr/lem/lem.adb → usr/games/lem/lem.adb
diff --git a/usr/lem/lem.ads → usr/games/lem/lem.ads b/usr/lem/lem.ads → usr/games/lem/lem.ads
diff --git a/usr/lem/makefile → usr/games/lem/makefile b/usr/lem/makefile → usr/games/lem/makefile
diff --git a/usr/lem/moon.adb → usr/games/lem/moon.adb b/usr/lem/moon.adb → usr/games/lem/moon.adb
diff --git a/usr/lem/moon.ads → usr/games/lem/moon.ads b/usr/lem/moon.ads → usr/games/lem/moon.ads
diff --git a/usr/lem/screen-get_event.adb → usr/games/lem/screen-get_event.adb b/usr/lem/screen-get_event.adb → usr/games/lem/screen-get_event.adb
diff --git a/usr/lem/screen.adb → usr/games/lem/screen.adb b/usr/lem/screen.adb → usr/games/lem/screen.adb
diff --git a/usr/lem/screen.ads → usr/games/lem/screen.ads b/usr/lem/screen.ads → usr/games/lem/screen.ads
diff --git a/usr/lem/space.ads → usr/games/lem/space.ads b/usr/lem/space.ads → usr/games/lem/space.ads
diff --git a/usr/games/makefile b/usr/games/makefile
@@ -0,0 +1,7 @@
+include $(if $(MAKFILES_DIR), $(MAKFILES_DIR), $(HOME)/Makefiles)/common.mk
+SUBDIRS := battleship chess fourtwentyone freecell lapeau lem mmind nimmari \
+  renardeau sokoban
+
+
+include $(TEMPLATES)/dir.mk
+
diff --git a/usr/mmind/Mmind.png → usr/games/mmind/Mmind.png b/usr/mmind/Mmind.png → usr/games/mmind/Mmind.png
diff --git a/usr/mmind/Mmind.txt → usr/games/mmind/Mmind.txt b/usr/mmind/Mmind.txt → usr/games/mmind/Mmind.txt
diff --git a/usr/mmind/action-clock.adb → usr/games/mmind/action-clock.adb b/usr/mmind/action-clock.adb → usr/games/mmind/action-clock.adb
diff --git a/usr/mmind/action-treat_click.adb → usr/games/mmind/action-treat_click.adb b/usr/mmind/action-treat_click.adb → usr/games/mmind/action-treat_click.adb
diff --git a/usr/mmind/action-treat_release.adb → usr/games/mmind/action-treat_release.adb b/usr/mmind/action-treat_release.adb → usr/games/mmind/action-treat_release.adb
diff --git a/usr/mmind/action.adb → usr/games/mmind/action.adb b/usr/mmind/action.adb → usr/games/mmind/action.adb
diff --git a/usr/mmind/action.ads → usr/games/mmind/action.ads b/usr/mmind/action.ads → usr/games/mmind/action.ads
diff --git a/usr/mmind/common.adb → usr/games/mmind/common.adb b/usr/mmind/common.adb → usr/games/mmind/common.adb
diff --git a/usr/mmind/common.ads → usr/games/mmind/common.ads b/usr/mmind/common.ads → usr/games/mmind/common.ads
diff --git a/usr/mmind/makefile → usr/games/mmind/makefile b/usr/mmind/makefile → usr/games/mmind/makefile
diff --git a/usr/mmind/mmind.adb → usr/games/mmind/mmind.adb b/usr/mmind/mmind.adb → usr/games/mmind/mmind.adb
diff --git a/usr/mmind/mmind_asc.adb → usr/games/mmind/mmind_asc.adb b/usr/mmind/mmind_asc.adb → usr/games/mmind/mmind_asc.adb
diff --git a/usr/mmind/response.adb → usr/games/mmind/response.adb b/usr/mmind/response.adb → usr/games/mmind/response.adb
diff --git a/usr/mmind/response.ads → usr/games/mmind/response.ads b/usr/mmind/response.ads → usr/games/mmind/response.ads
diff --git a/usr/mmind/screen.adb → usr/games/mmind/screen.adb b/usr/mmind/screen.adb → usr/games/mmind/screen.adb
diff --git a/usr/mmind/screen.ads → usr/games/mmind/screen.ads b/usr/mmind/screen.ads → usr/games/mmind/screen.ads
diff --git a/usr/nimmari/Afpx.xml → usr/games/nimmari/Afpx.xml b/usr/nimmari/Afpx.xml → usr/games/nimmari/Afpx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.1"?>
-<!DOCTYPE Afpx_Descriptors SYSTEM "../../reposit/Afpx.dtd">
+<!DOCTYPE Afpx_Descriptors SYSTEM "../../../reposit/Afpx.dtd">
 <!-- Afpx.xml file for Nimmari -->
 
 <Afpx_Descriptors>

diff --git a/usr/nimmari/common.adb → usr/games/nimmari/common.adb b/usr/nimmari/common.adb → usr/games/nimmari/common.adb
diff --git a/usr/nimmari/common.ads → usr/games/nimmari/common.ads b/usr/nimmari/common.ads → usr/games/nimmari/common.ads
diff --git a/usr/nimmari/compute.adb → usr/games/nimmari/compute.adb b/usr/nimmari/compute.adb → usr/games/nimmari/compute.adb
diff --git a/usr/nimmari/compute.ads → usr/games/nimmari/compute.ads b/usr/nimmari/compute.ads → usr/games/nimmari/compute.ads
diff --git a/usr/nimmari/makefile → usr/games/nimmari/makefile b/usr/nimmari/makefile → usr/games/nimmari/makefile
diff --git a/usr/nimmari/nimmari.adb → usr/games/nimmari/nimmari.adb b/usr/nimmari/nimmari.adb → usr/games/nimmari/nimmari.adb
diff --git a/usr/nimmari/screen.adb → usr/games/nimmari/screen.adb b/usr/nimmari/screen.adb → usr/games/nimmari/screen.adb
diff --git a/usr/nimmari/screen.ads → usr/games/nimmari/screen.ads b/usr/nimmari/screen.ads → usr/games/nimmari/screen.ads
diff --git a/usr/nimmari/text.adb → usr/games/nimmari/text.adb b/usr/nimmari/text.adb → usr/games/nimmari/text.adb
diff --git a/usr/nimmari/text.ads → usr/games/nimmari/text.ads b/usr/nimmari/text.ads → usr/games/nimmari/text.ads
diff --git a/usr/renardeau/Afpx.xml → usr/games/renardeau/Afpx.xml b/usr/renardeau/Afpx.xml → usr/games/renardeau/Afpx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.1" encoding="UTF-8"?>
-<!DOCTYPE Afpx_Descriptors SYSTEM "../../reposit/Afpx.dtd">
+<!DOCTYPE Afpx_Descriptors SYSTEM "../../../reposit/Afpx.dtd">
 <!-- For renardeau -->
 
 <Afpx_Descriptors Height="25" Width="40">

diff --git a/usr/renardeau/makefile → usr/games/renardeau/makefile b/usr/renardeau/makefile → usr/games/renardeau/makefile
diff --git a/usr/renardeau/renardeau-x.adb → usr/games/renardeau/renardeau-x.adb b/usr/renardeau/renardeau-x.adb → usr/games/renardeau/renardeau-x.adb
diff --git a/usr/renardeau/renardeau.adb → usr/games/renardeau/renardeau.adb b/usr/renardeau/renardeau.adb → usr/games/renardeau/renardeau.adb
diff --git a/usr/sokoban/.gitignore.ref → usr/games/sokoban/.gitignore.ref b/usr/sokoban/.gitignore.ref → usr/games/sokoban/.gitignore.ref
diff --git a/usr/sokoban/SCORES.DAT → usr/games/sokoban/SCORES.DAT b/usr/sokoban/SCORES.DAT → usr/games/sokoban/SCORES.DAT
diff --git a/usr/sokoban/SOKOBAN.ASC → usr/games/sokoban/SOKOBAN.ASC b/usr/sokoban/SOKOBAN.ASC → usr/games/sokoban/SOKOBAN.ASC
diff --git a/usr/sokoban/SOKOBAN.DAT → usr/games/sokoban/SOKOBAN.DAT b/usr/sokoban/SOKOBAN.DAT → usr/games/sokoban/SOKOBAN.DAT
diff --git a/usr/sokoban/dump_sav.adb → usr/games/sokoban/dump_sav.adb b/usr/sokoban/dump_sav.adb → usr/games/sokoban/dump_sav.adb
diff --git a/usr/sokoban/dump_sav.ads → usr/games/sokoban/dump_sav.ads b/usr/sokoban/dump_sav.ads → usr/games/sokoban/dump_sav.ads
diff --git a/usr/sokoban/makefile → usr/games/sokoban/makefile b/usr/sokoban/makefile → usr/games/sokoban/makefile
diff --git a/usr/sokoban/scores.adb → usr/games/sokoban/scores.adb b/usr/sokoban/scores.adb → usr/games/sokoban/scores.adb
diff --git a/usr/sokoban/sok_display.adb → usr/games/sokoban/sok_display.adb b/usr/sokoban/sok_display.adb → usr/games/sokoban/sok_display.adb
diff --git a/usr/sokoban/sok_display.ads → usr/games/sokoban/sok_display.ads b/usr/sokoban/sok_display.ads → usr/games/sokoban/sok_display.ads
diff --git a/usr/sokoban/sok_file.adb → usr/games/sokoban/sok_file.adb b/usr/sokoban/sok_file.adb → usr/games/sokoban/sok_file.adb
diff --git a/usr/sokoban/sok_file.ads → usr/games/sokoban/sok_file.ads b/usr/sokoban/sok_file.ads → usr/games/sokoban/sok_file.ads
diff --git a/usr/sokoban/sok_input.adb → usr/games/sokoban/sok_input.adb b/usr/sokoban/sok_input.adb → usr/games/sokoban/sok_input.adb
diff --git a/usr/sokoban/sok_input.ads → usr/games/sokoban/sok_input.ads b/usr/sokoban/sok_input.ads → usr/games/sokoban/sok_input.ads
diff --git a/usr/sokoban/sok_manager-sok_menu.adb → usr/games/sokoban/sok_manager-sok_menu.adb b/usr/sokoban/sok_manager-sok_menu.adb → usr/games/sokoban/sok_manager-sok_menu.adb
diff --git a/usr/sokoban/sok_manager.adb → usr/games/sokoban/sok_manager.adb b/usr/sokoban/sok_manager.adb → usr/games/sokoban/sok_manager.adb
diff --git a/usr/sokoban/sok_manager.ads → usr/games/sokoban/sok_manager.ads b/usr/sokoban/sok_manager.ads → usr/games/sokoban/sok_manager.ads
diff --git a/usr/sokoban/sok_movement.adb → usr/games/sokoban/sok_movement.adb b/usr/sokoban/sok_movement.adb → usr/games/sokoban/sok_movement.adb
diff --git a/usr/sokoban/sok_movement.ads → usr/games/sokoban/sok_movement.ads b/usr/sokoban/sok_movement.ads → usr/games/sokoban/sok_movement.ads
diff --git a/usr/sokoban/sok_save.adb → usr/games/sokoban/sok_save.adb b/usr/sokoban/sok_save.adb → usr/games/sokoban/sok_save.adb
diff --git a/usr/sokoban/sok_save.ads → usr/games/sokoban/sok_save.ads b/usr/sokoban/sok_save.ads → usr/games/sokoban/sok_save.ads
diff --git a/usr/sokoban/sok_time.adb → usr/games/sokoban/sok_time.adb b/usr/sokoban/sok_time.adb → usr/games/sokoban/sok_time.adb
diff --git a/usr/sokoban/sok_time.ads → usr/games/sokoban/sok_time.ads b/usr/sokoban/sok_time.ads → usr/games/sokoban/sok_time.ads
diff --git a/usr/sokoban/sok_types.ads → usr/games/sokoban/sok_types.ads b/usr/sokoban/sok_types.ads → usr/games/sokoban/sok_types.ads
diff --git a/usr/sokoban/sokoban.adb → usr/games/sokoban/sokoban.adb b/usr/sokoban/sokoban.adb → usr/games/sokoban/sokoban.adb
diff --git a/usr/sokoban/t_input.adb → usr/games/sokoban/t_input.adb b/usr/sokoban/t_input.adb → usr/games/sokoban/t_input.adb
diff --git a/usr/sokoban/trans.adb → usr/games/sokoban/trans.adb b/usr/sokoban/trans.adb → usr/games/sokoban/trans.adb
diff --git a/usr/geohash/LoopRndTest → usr/geo_codes/geohash/LoopRndTest b/usr/geohash/LoopRndTest → usr/geo_codes/geohash/LoopRndTest
diff --git a/usr/geohash/Test → usr/geo_codes/geohash/Test b/usr/geohash/Test → usr/geo_codes/geohash/Test
diff --git a/usr/geohash/geohash.adb → usr/geo_codes/geohash/geohash.adb b/usr/geohash/geohash.adb → usr/geo_codes/geohash/geohash.adb
diff --git a/usr/geohash/geohash.ads → usr/geo_codes/geohash/geohash.ads b/usr/geohash/geohash.ads → usr/geo_codes/geohash/geohash.ads
diff --git a/usr/geohash/makefile → usr/geo_codes/geohash/makefile b/usr/geohash/makefile → usr/geo_codes/geohash/makefile
diff --git a/usr/geohash/t_geohash.adb → usr/geo_codes/geohash/t_geohash.adb b/usr/geohash/t_geohash.adb → usr/geo_codes/geohash/t_geohash.adb
diff --git a/usr/geohash36/LoopRndTest → usr/geo_codes/geohash36/LoopRndTest b/usr/geohash36/LoopRndTest → usr/geo_codes/geohash36/LoopRndTest
diff --git a/usr/geohash36/Test → usr/geo_codes/geohash36/Test b/usr/geohash36/Test → usr/geo_codes/geohash36/Test
diff --git a/usr/geohash36/geohash36.adb → usr/geo_codes/geohash36/geohash36.adb b/usr/geohash36/geohash36.adb → usr/geo_codes/geohash36/geohash36.adb
diff --git a/usr/geohash36/geohash36.ads → usr/geo_codes/geohash36/geohash36.ads b/usr/geohash36/geohash36.ads → usr/geo_codes/geohash36/geohash36.ads
diff --git a/usr/geohash36/makefile → usr/geo_codes/geohash36/makefile b/usr/geohash36/makefile → usr/geo_codes/geohash36/makefile
diff --git a/usr/geohash36/t_geohash36.adb → usr/geo_codes/geohash36/t_geohash36.adb b/usr/geohash36/t_geohash36.adb → usr/geo_codes/geohash36/t_geohash36.adb
@@ -11,6 +11,7 @@ procedure T_Geohash36 is
       & " | <checksup> | <help>");
     Basic_Proc.Put_Line_Output ("  <encode>    ::= -c <coord> <precision>");
     Basic_Proc.Put_Line_Output ("  <coord>     ::= <lat> <lon>");
+    Basic_Proc.Put_Line_Output ("  <decode>    ::= -d <code>");
     Basic_Proc.Put_Line_Output ("  <precision> ::= -P <precision>");
     Basic_Proc.Put_Line_Output ("  <neighbors> ::= -N <code>");
     Basic_Proc.Put_Line_Output ("  <checksum>  ::= -C <code>");

diff --git a/usr/geo_codes/makefile b/usr/geo_codes/makefile
@@ -0,0 +1,4 @@
+include $(if $(MAKFILES_DIR), $(MAKFILES_DIR), $(HOME)/Makefiles)/common.mk
+SUBDIRS := mapcode olc geohash geohash36
+include $(TEMPLATES)/dir.mk
+
diff --git a/usr/mapcode/LoopRndTest → usr/geo_codes/mapcode/LoopRndTest b/usr/mapcode/LoopRndTest → usr/geo_codes/mapcode/LoopRndTest
diff --git a/usr/mapcode/Test → usr/geo_codes/mapcode/Test b/usr/mapcode/Test → usr/geo_codes/mapcode/Test
diff --git a/usr/mapcode/countries.ads → usr/geo_codes/mapcode/countries.ads b/usr/mapcode/countries.ads → usr/geo_codes/mapcode/countries.ads
diff --git a/usr/mapcode/export2mapcode → usr/geo_codes/mapcode/export2mapcode b/usr/mapcode/export2mapcode → usr/geo_codes/mapcode/export2mapcode
diff --git a/usr/mapcode/fullaccuracy → usr/geo_codes/mapcode/fullaccuracy b/usr/mapcode/fullaccuracy → usr/geo_codes/mapcode/fullaccuracy
diff --git a/usr/mapcode/fulltest → usr/geo_codes/mapcode/fulltest b/usr/mapcode/fulltest → usr/geo_codes/mapcode/fulltest
diff --git a/usr/mapcode/js2ada → usr/geo_codes/mapcode/js2ada b/usr/mapcode/js2ada → usr/geo_codes/mapcode/js2ada
diff --git a/usr/mapcode/language_defs.ads → usr/geo_codes/mapcode/language_defs.ads b/usr/mapcode/language_defs.ads → usr/geo_codes/mapcode/language_defs.ads
diff --git a/usr/mapcode/language_utils.adb → usr/geo_codes/mapcode/language_utils.adb b/usr/mapcode/language_utils.adb → usr/geo_codes/mapcode/language_utils.adb
diff --git a/usr/mapcode/language_utils.ads → usr/geo_codes/mapcode/language_utils.ads b/usr/mapcode/language_utils.ads → usr/geo_codes/mapcode/language_utils.ads
diff --git a/usr/mapcode/makefile → usr/geo_codes/mapcode/makefile b/usr/mapcode/makefile → usr/geo_codes/mapcode/makefile
diff --git a/usr/mapcode/mapcode_utils-as_u.adb → usr/geo_codes/mapcode/mapcode_utils-as_u.adb b/usr/mapcode/mapcode_utils-as_u.adb → usr/geo_codes/mapcode/mapcode_utils-as_u.adb
diff --git a/usr/mapcode/mapcode_utils-as_u.ads → usr/geo_codes/mapcode/mapcode_utils-as_u.ads b/usr/mapcode/mapcode_utils-as_u.ads → usr/geo_codes/mapcode/mapcode_utils-as_u.ads
diff --git a/usr/mapcode/mapcode_utils-bits.adb → usr/geo_codes/mapcode/mapcode_utils-bits.adb b/usr/mapcode/mapcode_utils-bits.adb → usr/geo_codes/mapcode/mapcode_utils-bits.adb
diff --git a/usr/mapcode/mapcode_utils-bits.ads → usr/geo_codes/mapcode/mapcode_utils-bits.ads b/usr/mapcode/mapcode_utils-bits.ads → usr/geo_codes/mapcode/mapcode_utils-bits.ads
diff --git a/usr/mapcode/mapcode_utils-str_tools.adb → ...codes/mapcode/mapcode_utils-str_tools.adb b/usr/mapcode/mapcode_utils-str_tools.adb → ...codes/mapcode/mapcode_utils-str_tools.adb
diff --git a/usr/mapcode/mapcode_utils-str_tools.ads → ...codes/mapcode/mapcode_utils-str_tools.ads b/usr/mapcode/mapcode_utils-str_tools.ads → ...codes/mapcode/mapcode_utils-str_tools.ads
diff --git a/usr/mapcode/mapcode_utils.ads → usr/geo_codes/mapcode/mapcode_utils.ads b/usr/mapcode/mapcode_utils.ads → usr/geo_codes/mapcode/mapcode_utils.ads
diff --git a/usr/mapcode/mapcodes-languages.adb → usr/geo_codes/mapcode/mapcodes-languages.adb b/usr/mapcode/mapcodes-languages.adb → usr/geo_codes/mapcode/mapcodes-languages.adb
diff --git a/usr/mapcode/mapcodes-languages.ads → usr/geo_codes/mapcode/mapcodes-languages.ads b/usr/mapcode/mapcodes-languages.ads → usr/geo_codes/mapcode/mapcodes-languages.ads
diff --git a/usr/mapcode/mapcodes.adb → usr/geo_codes/mapcode/mapcodes.adb b/usr/mapcode/mapcodes.adb → usr/geo_codes/mapcode/mapcodes.adb
diff --git a/usr/mapcode/mapcodes.ads → usr/geo_codes/mapcode/mapcodes.ads b/usr/mapcode/mapcodes.ads → usr/geo_codes/mapcode/mapcodes.ads
diff --git a/usr/mapcode/ndata.ads → usr/geo_codes/mapcode/ndata.ads b/usr/mapcode/ndata.ads → usr/geo_codes/mapcode/ndata.ads
diff --git a/usr/mapcode/t_accuracy.adb → usr/geo_codes/mapcode/t_accuracy.adb b/usr/mapcode/t_accuracy.adb → usr/geo_codes/mapcode/t_accuracy.adb
diff --git a/usr/mapcode/t_mapcode.apb → usr/geo_codes/mapcode/t_mapcode.apb b/usr/mapcode/t_mapcode.apb → usr/geo_codes/mapcode/t_mapcode.apb
diff --git a/usr/mapcode/test/Alphabets → usr/geo_codes/mapcode/test/Alphabets b/usr/mapcode/test/Alphabets → usr/geo_codes/mapcode/test/Alphabets
diff --git a/usr/mapcode/test/DecodeFailures → usr/geo_codes/mapcode/test/DecodeFailures b/usr/mapcode/test/DecodeFailures → usr/geo_codes/mapcode/test/DecodeFailures
diff --git a/usr/mapcode/test/DecodeOk → usr/geo_codes/mapcode/test/DecodeOk b/usr/mapcode/test/DecodeOk → usr/geo_codes/mapcode/test/DecodeOk
diff --git a/usr/mapcode/test/EncodeOk → usr/geo_codes/mapcode/test/EncodeOk b/usr/mapcode/test/EncodeOk → usr/geo_codes/mapcode/test/EncodeOk
diff --git a/usr/mapcode/test/Scenario → usr/geo_codes/mapcode/test/Scenario b/usr/mapcode/test/Scenario → usr/geo_codes/mapcode/test/Scenario
diff --git a/usr/mapcode/test/TerritoryFailures → usr/geo_codes/mapcode/test/TerritoryFailures b/usr/mapcode/test/TerritoryFailures → usr/geo_codes/mapcode/test/TerritoryFailures
diff --git a/usr/olc/LoopRndTest → usr/geo_codes/olc/LoopRndTest b/usr/olc/LoopRndTest → usr/geo_codes/olc/LoopRndTest
diff --git a/usr/olc/README.md → usr/geo_codes/olc/README.md b/usr/olc/README.md → usr/geo_codes/olc/README.md
diff --git a/usr/olc/Test → usr/geo_codes/olc/Test b/usr/olc/Test → usr/geo_codes/olc/Test
diff --git a/usr/olc/makefile → usr/geo_codes/olc/makefile b/usr/olc/makefile → usr/geo_codes/olc/makefile
diff --git a/usr/olc/olc.adb → usr/geo_codes/olc/olc.adb b/usr/olc/olc.adb → usr/geo_codes/olc/olc.adb
diff --git a/usr/olc/olc.ads → usr/geo_codes/olc/olc.ads b/usr/olc/olc.ads → usr/geo_codes/olc/olc.ads
diff --git a/usr/olc/t_olc.adb → usr/geo_codes/olc/t_olc.adb b/usr/olc/t_olc.adb → usr/geo_codes/olc/t_olc.adb
diff --git a/usr/olc/test/Decode → usr/geo_codes/olc/test/Decode b/usr/olc/test/Decode → usr/geo_codes/olc/test/Decode
diff --git a/usr/olc/test/Encode → usr/geo_codes/olc/test/Encode b/usr/olc/test/Encode → usr/geo_codes/olc/test/Encode
diff --git a/usr/olc/test/Short → usr/geo_codes/olc/test/Short b/usr/olc/test/Short → usr/geo_codes/olc/test/Short
diff --git a/usr/olc/test/Status → usr/geo_codes/olc/test/Status b/usr/olc/test/Status → usr/geo_codes/olc/test/Status
diff --git a/usr/great_circle/LoopRndHpgc b/usr/great_circle/LoopRndHpgc
@@ -18,7 +18,7 @@ export ACCEPTABLE=600
 
 # Path to random, to mapcode and to high precision great circle
 export RAND="$HOME/ada/usr/misc/random"
-export MAPCODE="$HOME/ada/usr/mapcode/t_mapcode"
+export MAPCODE="$HOME/ada/usr/geo_codes/mapcode/t_mapcode"
 export HPGC="$HOME/ada/usr/great_circle/hp_gc"
 
 # Syntax error / help message

diff --git a/usr/great_circle/makefile b/usr/great_circle/makefile
@@ -1,6 +1,7 @@
 include $(if $(MAKFILES_DIR), $(MAKFILES_DIR), $(HOME)/Makefiles)/common.mk
 
-ADAVIEW := $(USR)/mapcode $(USR)/olc $(USR)/geohash36 $(USR)/geohash $(REPOSIT)
+GEO := $(USR)/geo_codes
+ADAVIEW := $(GEO)/mapcode $(GEO)/olc $(GEO)/geohash36 $(GEO)/geohash $(REPOSIT)
 ADACTL := true
 
 SUBUNITS := intercept.fpl

diff --git a/usr/makefile b/usr/makefile
@@ -1,9 +1,8 @@
 include $(if $(MAKFILES_DIR), $(MAKFILES_DIR), $(HOME)/Makefiles)/common.mk
-SUBDIRS := dictio fifos pipe mapcode olc geohash geohash36 \
- account agite als approx astub asubst battleship c_magic chess code enigma fl \
- freecell great_circle heart hungar lapeau lem logrotator \
- lsadeps mcd misc mmind navig nimmari pexec regex renardeau sensor simusi \
- sokoban tasks tcpchat tcpipe tests xml xwords
+SUBDIRS := dictio fifos pipe geo_codes \
+ account agite als approx astub asubst c_magic code enigma fl games geo_codes \
+ great_circle heart hungar logrotator lsadeps mcd misc navig pexec regex \
+ sensor simusi tasks tcpchat tcpipe tests xml xwords
 
 include $(TEMPLATES)/dir.mk