Update to 3.0.7.

6 files changed, 37 insertions, 45 deletions

diff --git a/games/tads/Makefile b/games/tads/Makefile
index 361b14d0d8e..8ec90920b76 100644
--- a/games/tads/Makefile
+++ b/games/tads/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:14:46 tv Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/08 23:14:37 mycroft Exp $
 #
 
 DISTNAME=	tads23-unix
-PKGNAME=	tads-3.0.5
-PKGREVISION=	1
+PKGNAME=	tads-3.0.7
 CATEGORIES=	games
 MASTER_SITES=	http://www.tads.org/t3dl
 
@@ -14,12 +13,14 @@ COMMENT=	TADS compiler and interpreter
 # for other OSs, enable appropriate Makefile sections
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 
-WRKSRC=		${WRKDIR}/tads
+WRKSRC=		${WRKDIR}/tads-3.0.7
 USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 BUILD_DIRS=	${WRKSRC}/tads2 ${WRKSRC}/tads3
-MAKEFILE=	makefile
 USE_LANGUAGES=	c c++
 
+post-extract:
+	rm ${WRKSRC}/tads3/BSD/wchar.h
+
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/tads/PLIST b/games/tads/PLIST
index c50717ab8cb..9130ca7e85d 100644
--- a/games/tads/PLIST
+++ b/games/tads/PLIST
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/10/05 22:09:58 dillo Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/10/08 23:14:37 mycroft Exp $
 bin/t23run
 bin/t3make
 bin/t3run
 bin/tadsc
 bin/tadsr
 bin/tdb
+share/doc/html/tads3/articles.htm
 share/doc/html/tads3/changes.htm
-share/doc/html/tads3/changes_lib.htm
 share/doc/html/tads3/index.htm
 share/doc/html/tads3/lib_cont.htm
-share/doc/html/tads3/t3BigNum.htm
 share/doc/html/tads3/t3alone.htm
 share/doc/html/tads3/t3anonfn.htm
 share/doc/html/tads3/t3apiorg.htm
 share/doc/html/tads3/t3banner.htm
+share/doc/html/tads3/t3bignum.htm
 share/doc/html/tads3/t3build.htm
 share/doc/html/tads3/t3bytarr.htm
 share/doc/html/tads3/t3chars.htm
@@ -30,6 +30,7 @@ share/doc/html/tads3/t3export.htm
 share/doc/html/tads3/t3expr.htm
 share/doc/html/tads3/t3fctl.htm
 share/doc/html/tads3/t3file.htm
+share/doc/html/tads3/t3fmt.htm
 share/doc/html/tads3/t3frame.htm
 share/doc/html/tads3/t3gc.htm
 share/doc/html/tads3/t3gram.htm
@@ -90,6 +91,8 @@ share/tads3/libraries/adv3/actions.t
 share/tads3/libraries/adv3/actor.t
 share/tads3/libraries/adv3/adv3.h
 share/tads3/libraries/adv3/adv3.tl
+share/tads3/libraries/adv3/banner.t
+share/tads3/libraries/adv3/changes.htm
 share/tads3/libraries/adv3/disambig.t
 share/tads3/libraries/adv3/en_us/en_us.h
 share/tads3/libraries/adv3/en_us/en_us.t
@@ -101,8 +104,10 @@ share/tads3/libraries/adv3/exec.t
 share/tads3/libraries/adv3/exits.t
 share/tads3/libraries/adv3/extras.t
 share/tads3/libraries/adv3/footnote.t
+share/tads3/libraries/adv3/hintsys.t
 share/tads3/libraries/adv3/input.t
 share/tads3/libraries/adv3/lister.t
+share/tads3/libraries/adv3/menusys.t
 share/tads3/libraries/adv3/misc.t
 share/tads3/libraries/adv3/modid.t
 share/tads3/libraries/adv3/numbers.t
diff --git a/games/tads/distinfo b/games/tads/distinfo
index dda862ab298..3dee7e4d0b9 100644
--- a/games/tads/distinfo
+++ b/games/tads/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/08/04 18:55:40 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/10/08 23:14:37 mycroft Exp $
 
-SHA1 (tads23-unix.tar.gz) = 0d462f19087a257257acf5b57cab30eecd3bfb56
-Size (tads23-unix.tar.gz) = 3470301 bytes
-SHA1 (patch-aa) = 70e1acb58e7a15e05303e69cb77fa68fa454ce3d
+SHA1 (tads23-unix.tar.gz) = e81990782e82dc3c13ca5eedd22549201a92d096
+Size (tads23-unix.tar.gz) = 4029029 bytes
+SHA1 (patch-aa) = 45736a7c22777206a89f1381cf7fe130ee0897ad
 SHA1 (patch-ab) = b8e48ff15ef5fa1834c98a5bcc6df3d732dfe062
-SHA1 (patch-ac) = 43f30f1c1c2c52d3164cb8439b2bb86b5609f0cc
-SHA1 (patch-ad) = 6cd18579922421a17a84abdb93569a5720ca9dd9
+SHA1 (patch-ac) = f2292dda74a8986ffc85794a2f8c04683ebb42f7
diff --git a/games/tads/patches/patch-aa b/games/tads/patches/patch-aa
index 306fb80e809..67a80e727d6 100644
--- a/games/tads/patches/patch-aa
+++ b/games/tads/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/10/05 22:09:58 dillo Exp $
+$NetBSD: patch-aa,v 1.2 2004/10/08 23:14:38 mycroft Exp $
 
---- tads2/makefile.orig	Wed Sep 25 18:43:09 2002
-+++ tads2/makefile
+--- tads2/Makefile.orig	Wed Sep 25 18:43:09 2002
++++ tads2/Makefile
 @@ -50,7 +50,7 @@
  #
  
diff --git a/games/tads/patches/patch-ac b/games/tads/patches/patch-ac
index 943c57eecca..0afc1ca1136 100644
--- a/games/tads/patches/patch-ac
+++ b/games/tads/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/10/05 22:09:58 dillo Exp $
+$NetBSD: patch-ac,v 1.2 2004/10/08 23:14:38 mycroft Exp $
 
---- tads3/makefile.orig	Sat Sep 28 23:29:18 2002
-+++ tads3/makefile
+--- tads3/Makefile.orig	2004-07-13 19:43:38.000000000 +0000
++++ tads3/Makefile	2004-09-23 22:26:02.000000000 +0000
 @@ -14,9 +14,9 @@
  # Installation points for TADS3. Tailor these to your liking. If you install
  # manually, DATADIR must match where you actually put the libraries and
@@ -14,16 +14,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/10/05 22:09:58 dillo Exp $
  DATADIR = $(PREFIX)/share/tads3
  LIBDIR  = $(DATADIR)/libraries
  INCDIR  = $(DATADIR)/includes
-@@ -113,6 +113,25 @@ RESDIR  = $(DATADIR)/resources
+@@ -113,6 +113,25 @@
  #DISPLAY_LIB  = -ltermcap
  
  ###########################################################################
-+# NetBSD                                                                  #
-+# Compiled and tested on NetBSD 1.6                                       #
-+# Maintainer: 								  #
-+#                                                                         #
-+# Uncomment -fno-exceptions from CXX_OPTIMIZE if you have a reasonably    #
-+# current (> 2.7) version of g++.                                         #
++# NetBSD
++# Compiled and tested on NetBSD 1.6
++# Maintainer:
++#
++# Uncomment -fno-exceptions from CXX_OPTIMIZE if you have a reasonably
++# current (> 2.7) version of g++.
 +###########################################################################
 +#
 +.if ${OPSYS} == "NetBSD"
@@ -32,15 +32,15 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/10/05 22:09:58 dillo Exp $
 +IDENT        = -DOS_SYSTEM_NAME=\"NetBSD\"
 +OPTIMIZE     = -O2
 +CXX_OPTIMIZE = -fno-exceptions
-+OS_FLAGS     = -DOS_ANSI -DHAVE_STRCASECMP -Dmemicmp=strncasecmp
++OS_FLAGS     = -DOS_ANSI -DHAVE_STRCASECMP -Dmemicmp=strncasecmp -I./BSD
 +DISPLAY_LIB  = ${LDFLAGS} -lncurses
 +.endif
 +
 +###########################################################################
- # OpenBSD                                                                 #
- # Compiled and tested on OpenBSD 3.0                                      #
- # Maintainer: Mark Wickham (macwickham@attbi.com)                         #
-@@ -208,21 +227,27 @@ T3PRE_OBJS = test_pre.o std.o std_dbg.o 
+ # OpenBSD
+ # Compiled and tested on OpenBSD 3.0
+ # Maintainer: Mark Wickham (macwickham@attbi.com)
+@@ -208,21 +227,27 @@
  all: t3make t3run t23run t3pre
  
  install: all install-common
diff --git a/games/tads/patches/patch-ad b/games/tads/patches/patch-ad
deleted file mode 100644
index eafa3f9151d..00000000000
--- a/games/tads/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/08/04 18:55:40 agc Exp $
-
---- tads3/tcpndrv.h	2004/08/04 18:47:43	1.1
-+++ tads3/tcpndrv.h	2004/08/04 18:47:48
-@@ -1321,7 +1321,7 @@
-         class_obj_ = class_obj;
- 
-         /* we have no modification object yet */
--        mod_obj_ = TCTARG_INVALID_OBJ;
-+        mod_obj_ = (CTcSymObj*) TCTARG_INVALID_OBJ;
-     }
- 
-     /* add a property to my list */