Update to ToME 2.2.1

5 files changed, 97 insertions, 63 deletions

diff --git a/games/tome/Makefile b/games/tome/Makefile
index fe45c32aeadf..fb4b75736910 100644
--- a/games/tome/Makefile
+++ b/games/tome/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	tome
-PORTVERSION=	2.1.2
+PORTVERSION=	2.2.1
 CATEGORIES=	games
 MASTER_SITES=	http://t-o-m-e.net/dl/src/
-DISTNAME=	tome-212-src
+DISTNAME=	tome-221-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kris@FreeBSD.org
diff --git a/games/tome/distinfo b/games/tome/distinfo
index 442700795264..3041cf58c22a 100644
--- a/games/tome/distinfo
+++ b/games/tome/distinfo
@@ -1 +1 @@
-MD5 (tome-212-src.tgz) = f335c4ebd0318b912f70a3ee849e1a4f
+MD5 (tome-221-src.tgz) = 93324048f3c9a9cd43a367ef41bba30b
diff --git a/games/tome/files/patch-aa b/games/tome/files/patch-aa
index 94f213dcb483..5a492b7bfa2a 100644
--- a/games/tome/files/patch-aa
+++ b/games/tome/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.std.orig	Sun Nov 24 15:42:24 2002
-+++ makefile.std	Thu Jan 16 18:04:47 2003
+--- makefile.std.orig	Mon Apr 21 15:44:23 2003
++++ makefile.std	Sat Jul  5 18:53:04 2003
 @@ -81,18 +81,19 @@
  # Sysadmins of commercial Unix and/or BSD might prefer this
  #LIBDIR = /usr/local/lib/tome/
@@ -30,9 +30,9 @@
 -CC = gcc
 +CC ?= cc
  
- #
- # Standard version (see main-x11.c and main-gcu.c)
-@@ -148,12 +149,12 @@
+ # Profiling options
+ # PROFILECOPTS = -pg
+@@ -152,14 +153,12 @@
  # including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
  # attempt to "guess" at many of these flags based on your system.
  #
@@ -42,22 +42,24 @@
 +INCLUDES = -I$(X11BASE)/include
  DEFINES = -DUSE_X11 -DUSE_GCU \
  	-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA \
-         -DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK
+ 	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK
 -LIBS = -lX11 -lcurses -L/usr/X11R6/lib
+-
+-
 +LIBS = -lX11 -lcurses -L$(X11BASE)/lib
  
- 
  ##
-@@ -369,7 +370,7 @@
+ ## Variation -- Only support "main-gtk.c" (not "main-gcu.c, main-x11.c")
+@@ -383,7 +382,7 @@
  # Compiler options
  #
  
--CFLAGS = $(COPTS) $(INCLUDES) $(DEFINES) -DDEFAULT_PATH=\"$(LIBDIR)\"
+-CFLAGS = $(COPTS) $(PROFILECOPTS) $(INCLUDES) $(DEFINES) -DDEFAULT_PATH=\"$(LIBDIR)\"
 +CFLAGS += $(COPTS) $(INCLUDES) $(DEFINES) -DDEFAULT_PATH=\"$(LIBDIR)\"
  
  
  #
-@@ -443,10 +444,12 @@
+@@ -457,10 +456,12 @@
  	[ -d $(DESTDIR)$(LIBDIR) ] || mkdir -p $(DESTDIR)$(LIBDIR)
  	[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
  	cp -r ../lib/* $(DESTDIR)$(LIBDIR)
diff --git a/games/tome/files/patch-ab b/games/tome/files/patch-ab
index 29a6c4186a7f..611071801815 100644
--- a/games/tome/files/patch-ab
+++ b/games/tome/files/patch-ab
@@ -1,6 +1,6 @@
---- init2.c.orig	Sat Jan  4 19:57:53 2003
-+++ init2.c	Sat Jan  4 20:00:35 2003
-@@ -410,7 +410,7 @@
+--- init2.c.orig	Sat Jun  7 22:36:23 2003
++++ init2.c	Sat Jul  5 18:54:23 2003
+@@ -428,7 +428,7 @@
  {
  	int fd;
  
@@ -9,7 +9,7 @@
  
  	errr err = 0;
  
-@@ -693,7 +693,7 @@
+@@ -711,7 +711,7 @@
  {
  	int fd;
  
@@ -18,7 +18,7 @@
  
  	errr err = 0;
  
-@@ -1079,7 +1079,7 @@
+@@ -1150,7 +1150,7 @@
  {
  	int fd;
  
@@ -27,7 +27,7 @@
  
  	errr err = 0;
  
-@@ -1303,7 +1303,7 @@
+@@ -1374,7 +1374,7 @@
  {
  	int fd;
  
@@ -36,7 +36,7 @@
  
  	errr err = 0;
  
-@@ -1529,7 +1529,7 @@
+@@ -1600,7 +1600,7 @@
  
  	/* int i; */
  
@@ -45,7 +45,16 @@
  
  	errr err = 0;
  
-@@ -1809,7 +1809,7 @@
+@@ -1822,7 +1822,7 @@
+ 
+ 	/* int i; */
+ 
+-	int mode = 0644;
++	int mode = 0664;
+ 
+ 	errr err = 0;
+ 
+@@ -2102,7 +2102,7 @@
  {
  	int fd;
  
@@ -54,7 +63,7 @@
  
  	errr err = 0;
  
-@@ -2075,7 +2075,7 @@
+@@ -2368,7 +2368,7 @@
  {
  	int fd;
  
@@ -63,7 +72,7 @@
  
  	errr err = 0;
  
-@@ -2780,7 +2780,7 @@
+@@ -3073,7 +3073,7 @@
  {
  	int fd;
  
@@ -72,7 +81,7 @@
  
  	errr err = 0;
  
-@@ -3004,7 +3004,7 @@
+@@ -3297,7 +3297,7 @@
  {
  	int fd;
  
@@ -81,7 +90,7 @@
  
  	errr err = 0;
  
-@@ -3221,7 +3221,7 @@
+@@ -3514,7 +3514,7 @@
  {
  	int fd;
  
@@ -90,7 +99,7 @@
  
  	errr err = 0;
  
-@@ -3447,7 +3447,7 @@
+@@ -3740,7 +3740,7 @@
  
  	int i;
  
@@ -99,7 +108,7 @@
  
  	errr err = 0;
  
-@@ -3801,7 +3801,7 @@
+@@ -4094,7 +4094,7 @@
  {
  	int fd;
  
@@ -108,7 +117,7 @@
  
  	errr err = 0;
  
-@@ -4018,7 +4018,7 @@
+@@ -4311,7 +4311,7 @@
  {
  	int fd;
  
@@ -117,7 +126,7 @@
  
  	errr err = 0;
  
-@@ -4235,7 +4235,7 @@
+@@ -4528,7 +4528,7 @@
  {
  	int fd;
  
@@ -126,7 +135,7 @@
  
  	errr err = 0;
  
-@@ -4452,7 +4452,7 @@
+@@ -4745,7 +4745,7 @@
  {
  	int fd;
  
@@ -135,7 +144,7 @@
  
  	errr err = 0;
  
-@@ -4734,7 +4734,7 @@
+@@ -5027,7 +5027,7 @@
  {
  	int fd;
  
@@ -144,7 +153,7 @@
  
  	errr err = 0;
  
-@@ -4998,7 +4998,7 @@
+@@ -5291,7 +5291,7 @@
  {
  	int fd;
  
@@ -153,7 +162,7 @@
  
  	errr err;
  
-@@ -5286,7 +5286,7 @@
+@@ -5579,7 +5579,7 @@
  {
  	int fd;
  
@@ -162,7 +171,7 @@
  
  	errr err;
  
-@@ -6199,7 +6199,7 @@
+@@ -6545,7 +6545,7 @@
  {
  	int fd = -1;
  
diff --git a/games/tome/pkg-plist b/games/tome/pkg-plist
index b7282c866652..e63493dc13c6 100644
--- a/games/tome/pkg-plist
+++ b/games/tome/pkg-plist
@@ -12,10 +12,32 @@ share/tome/bone/bone004.008
 share/tome/bone/bone004.009
 share/tome/bone/bone004.010
 share/tome/cmov/delete.me
-share/tome/data/delete.me
+share/tome/core/auto.lua
+share/tome/core/building.lua
+share/tome/core/crpt_aux.lua
+share/tome/core/dungeon.lua
+share/tome/core/gen_idx.lua
+share/tome/core/gods.lua
+share/tome/core/help.lua
+share/tome/core/init.lua
+share/tome/core/load.lua
+share/tome/core/load2.lua
+share/tome/core/mimc_aux.lua
+share/tome/core/monsters.lua
+share/tome/core/objects.lua
+share/tome/core/player.lua
+share/tome/core/powers.lua
+share/tome/core/quests.lua
+share/tome/core/s_aux.lua
+share/tome/core/stores.lua
+share/tome/core/util.lua
+share/tome/core/xml.lua
 share/tome/data/.cvsignore
+share/tome/data/delete.me
 share/tome/dngn/dun1.14
 share/tome/dngn/dun10.0
+share/tome/dngn/dun11.20
+share/tome/dngn/dun11.22
 share/tome/dngn/dun18.0
 share/tome/dngn/dun18.1
 share/tome/dngn/dun19.11
@@ -28,13 +50,18 @@ share/tome/dngn/dun3.28
 share/tome/dngn/dun3.3
 share/tome/dngn/dun5.0
 share/tome/dngn/dun5.14
+share/tome/dngn/dun6.0
 share/tome/edit/a_info.txt
+share/tome/edit/ab_info.txt
 share/tome/edit/al_info.txt
 share/tome/edit/ba_info.txt
 share/tome/edit/between.map
 share/tome/edit/d_info.txt
+share/tome/edit/dragons.map
 share/tome/edit/e_info.txt
+share/tome/edit/evil.map
 share/tome/edit/f_info.txt
+share/tome/edit/haunted.map
 share/tome/edit/k_info.txt
 share/tome/edit/maeglin.map
 share/tome/edit/misc.txt
@@ -87,6 +114,7 @@ share/tome/edit/volcano.txt
 share/tome/edit/w_info.txt
 share/tome/edit/wf_info.txt
 share/tome/edit/wights.map
+share/tome/edit/wolves.map
 share/tome/file/book-0.txt
 share/tome/file/book-1.txt
 share/tome/file/book-10.txt
@@ -147,6 +175,7 @@ share/tome/file/speakpet.txt
 share/tome/file/timefun.txt
 share/tome/file/timenorm.txt
 share/tome/help/TANG.txt
+share/tome/help/ability.txt
 share/tome/help/attack.txt
 share/tome/help/automat.txt
 share/tome/help/birth.txt
@@ -155,11 +184,11 @@ share/tome/help/c_alchem.txt
 share/tome/help/c_archer.txt
 share/tome/help/c_assass.txt
 share/tome/help/c_axemas.txt
+share/tome/help/c_bard.txt
 share/tome/help/c_demono.txt
 share/tome/help/c_druid.txt
-share/tome/help/c_elemen.txt
+share/tome/help/c_geoman.txt
 share/tome/help/c_hafted.txt
-share/tome/help/c_harper.txt
 share/tome/help/c_lorema.txt
 share/tome/help/c_mage.txt
 share/tome/help/c_merch.txt
@@ -223,10 +252,13 @@ share/tome/help/m_demono.txt
 share/tome/help/m_divin.txt
 share/tome/help/m_earth.txt
 share/tome/help/m_fire.txt
+share/tome/help/m_geoman.txt
 share/tome/help/m_mana.txt
 share/tome/help/m_meta.txt
+share/tome/help/m_mimic.txt
 share/tome/help/m_mind.txt
 share/tome/help/m_mindcr.txt
+share/tome/help/m_music.txt
 share/tome/help/m_nature.txt
 share/tome/help/m_necrom.txt
 share/tome/help/m_symbio.txt
@@ -235,6 +267,7 @@ share/tome/help/m_thaum.txt
 share/tome/help/m_udun.txt
 share/tome/help/m_water.txt
 share/tome/help/macrofaq.txt
+share/tome/help/magic.hlp
 share/tome/help/magic.txt
 share/tome/help/newbie.hlp
 share/tome/help/option.txt
@@ -275,7 +308,13 @@ share/tome/help/tome_faq.txt
 share/tome/help/version.txt
 share/tome/help/wishing.txt
 share/tome/info/delete.me
+share/tome/mods/.cvsignore
+share/tome/mods/mods_aux.lua
+share/tome/mods/modules.lua
+share/tome/module.lua
 share/tome/note/delete.me
+share/tome/patch/.cvsignore
+share/tome/patch/delete.me
 share/tome/pref/422color.prf
 share/tome/pref/colors.prf
 share/tome/pref/font-ami.prf
@@ -313,32 +352,29 @@ share/tome/pref/xtra-gcu.prf
 share/tome/pref/xtra-new.prf
 share/tome/pref/xtra-xxx.prf
 share/tome/save/delete.me
-share/tome/scpt/auto.lua
+share/tome/scpt/.cvsignore
 share/tome/scpt/bounty.lua
-share/tome/scpt/building.lua
 share/tome/scpt/corrupt.lua
-share/tome/scpt/crpt_aux.lua
-share/tome/scpt/dungeon.lua
+share/tome/scpt/drunk.lua
 share/tome/scpt/fireprof.lua
-share/tome/scpt/gen_idx.lua
 share/tome/scpt/god.lua
 share/tome/scpt/help.lua
 share/tome/scpt/init.lua
 share/tome/scpt/intro.lua
-share/tome/scpt/monsters.lua
-share/tome/scpt/objects.lua
+share/tome/scpt/joke.lua
+share/tome/scpt/library.lua
+share/tome/scpt/mimic.lua
+share/tome/scpt/mkeys.lua
 share/tome/scpt/player.lua
 share/tome/scpt/powers.lua
-share/tome/scpt/quests.lua
-share/tome/scpt/quests2.lua
 share/tome/scpt/s_air.lua
-share/tome/scpt/s_aux.lua
 share/tome/scpt/s_convey.lua
 share/tome/scpt/s_demon.lua
 share/tome/scpt/s_divin.lua
 share/tome/scpt/s_earth.lua
 share/tome/scpt/s_eru.lua
 share/tome/scpt/s_fire.lua
+share/tome/scpt/s_geom.lua
 share/tome/scpt/s_mana.lua
 share/tome/scpt/s_manwe.lua
 share/tome/scpt/s_melkor.lua
@@ -355,17 +391,12 @@ share/tome/scpt/s_yavann.lua
 share/tome/scpt/spells.lua
 share/tome/scpt/stores.lua
 share/tome/scpt/test.lua
-share/tome/scpt/util.lua
-share/tome/scpt/xml.lua
 share/tome/user/automat.atm
 share/tome/user/delete.me
 share/tome/xtra/ang16.bdf
 share/tome/xtra/angband.fnt
 share/tome/xtra/font/10X20.FON
 share/tome/xtra/font/12X24.FON
-share/tome/xtra/font/12x24-blah-jis.hex
-share/tome/xtra/font/18x25-b&h-lucidatypewriter.hex
-share/tome/xtra/font/3x5.hex
 share/tome/xtra/font/5X8.FON
 share/tome/xtra/font/6X10.FON
 share/tome/xtra/font/6X12.FON
@@ -376,7 +407,6 @@ share/tome/xtra/font/7X13.FON
 share/tome/xtra/font/7X13B.FON
 share/tome/xtra/font/8X13.FON
 share/tome/xtra/font/8X13B.FON
-share/tome/xtra/font/8x16kana-jisx0201.1976.hex
 share/tome/xtra/font/9X15.FON
 share/tome/xtra/font/9X15B.FON
 share/tome/xtra/font/XM10X17.FNT
@@ -389,16 +419,6 @@ share/tome/xtra/font/XM5X8.FNT
 share/tome/xtra/font/XM6X12.FNT
 share/tome/xtra/font/XM6X12B.FNT
 share/tome/xtra/font/XM8X16B.FNT
-share/tome/xtra/font/comic20x24.hex
-share/tome/xtra/font/def8x16.hex
-share/tome/xtra/font/jmk8x12-modd-bold-r-semicond.hex
-share/tome/xtra/font/marumoji-8x14.hex
-share/tome/xtra/font/misc5x7.hex
-share/tome/xtra/font/misc6x13.hex
-share/tome/xtra/font/nethack10x19-10.hex
-share/tome/xtra/font/symbadobe.hex
-share/tome/xtra/font/vga11x19.hex
-share/tome/xtra/font/vga8x16.hex
 share/tome/xtra/font/xm4x6.fnt
 share/tome/xtra/font/xm8x13.fnt
 share/tome/xtra/font/xm8x13b.fnt
@@ -412,13 +432,16 @@ share/tome/xtra/sound/readme.txt
 @dirrm share/tome/apex
 @dirrm share/tome/bone
 @dirrm share/tome/cmov
+@dirrm share/tome/core
 @dirrm share/tome/data
 @dirrm share/tome/dngn
 @dirrm share/tome/edit
 @dirrm share/tome/file
 @dirrm share/tome/help
 @dirrm share/tome/info
+@dirrm share/tome/mods
 @dirrm share/tome/note
+@dirrm share/tome/patch
 @dirrm share/tome/pref
 @dirrm share/tome/save
 @dirrm share/tome/scpt