From 8d8d88b145dc833747fb16a250a3295640810b84 Mon Sep 17 00:00:00 2001
From: dillo <dillo>
Date: Tue, 22 Mar 2005 20:02:11 +0000
Subject: update to 3.0.8: - fix crash when displaying banner in newer TADS 3
 games - fix screen redraw before waiting for event - install TADS 2 library
 files - add t3res (TADS 3 resource compiler) - add mkchrtab (TADS 3 character
 table generator)

---
 games/tads/Makefile         |  6 ++--
 games/tads/PLIST            |  8 ++++-
 games/tads/distinfo         | 12 ++++----
 games/tads/patches/patch-aa | 27 ++++++++---------
 games/tads/patches/patch-ac | 74 ++++++++++++++++++++++++++++-----------------
 5 files changed, 76 insertions(+), 51 deletions(-)

(limited to 'games')

diff --git a/games/tads/Makefile b/games/tads/Makefile
index 9173fff79a9..723153a279b 100644
--- a/games/tads/Makefile
+++ b/games/tads/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/10/12 20:38:09 dillo Exp $
+# $NetBSD: Makefile,v 1.9 2005/03/22 20:02:11 dillo Exp $
 #
 
 DISTNAME=	tads23-unix
-PKGNAME=	tads-3.0.7
+PKGNAME=	tads-3.0.8
 CATEGORIES=	games
 MASTER_SITES=	http://www.tads.org/t3dl/
 
@@ -14,7 +14,7 @@ COMMENT=	TADS compiler and interpreter
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/tads-3.0.7
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK3=	yes
 NO_CONFIGURE=	yes
 BUILD_DIRS=	${WRKSRC}/tads2 ${WRKSRC}/tads3
diff --git a/games/tads/PLIST b/games/tads/PLIST
index 9130ca7e85d..10938277f86 100644
--- a/games/tads/PLIST
+++ b/games/tads/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/08 23:14:37 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/03/22 20:02:11 dillo Exp $
+bin/mkchrtab
 bin/t23run
 bin/t3make
+bin/t3res
 bin/t3run
 bin/tadsc
 bin/tadsr
@@ -68,6 +70,9 @@ share/doc/html/tads3/t3type.htm
 share/doc/html/tads3/t3undef.htm
 share/doc/html/tads3/t3vector.htm
 share/doc/html/tads3/tads3.htm
+share/tads2/adv.t
+share/tads2/gameinfo.t
+share/tads2/std.t
 share/tads3/includes/bignum.h
 share/tads3/includes/bytearr.h
 share/tads3/includes/charset.h
@@ -140,4 +145,5 @@ share/tads3/resources/charmap/us-ascii.txt
 @dirrm share/tads3/libraries
 @dirrm share/tads3/includes
 @dirrm share/tads3
+@dirrm share/tads2
 @dirrm share/doc/html/tads3
diff --git a/games/tads/distinfo b/games/tads/distinfo
index 8d5c0ad2289..9f2769f3ca6 100644
--- a/games/tads/distinfo
+++ b/games/tads/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 23:12:03 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/22 20:02:11 dillo Exp $
 
-SHA1 (tads-3.0.7/tads23-unix.tar.gz) = e81990782e82dc3c13ca5eedd22549201a92d096
-RMD160 (tads-3.0.7/tads23-unix.tar.gz) = 85e1fcc8a7311529c9a2213bffcca96c7d5d7d49
-Size (tads-3.0.7/tads23-unix.tar.gz) = 4029029 bytes
-SHA1 (patch-aa) = 45736a7c22777206a89f1381cf7fe130ee0897ad
+SHA1 (tads-3.0.8/tads23-unix.tar.gz) = 77d5180dca1651dbd61b24a5704bb238aa66320e
+RMD160 (tads-3.0.8/tads23-unix.tar.gz) = 9ad1776477502b4e220ca93cd1ff52707a3c36f4
+Size (tads-3.0.8/tads23-unix.tar.gz) = 4072600 bytes
+SHA1 (patch-aa) = feaf4e03e097f44b7831d85219745cac6c403051
 SHA1 (patch-ab) = b8e48ff15ef5fa1834c98a5bcc6df3d732dfe062
-SHA1 (patch-ac) = f2292dda74a8986ffc85794a2f8c04683ebb42f7
+SHA1 (patch-ac) = 67271de4c54c49a7e3c3d37950ee0fd134abf7da
diff --git a/games/tads/patches/patch-aa b/games/tads/patches/patch-aa
index 67a80e727d6..5ec275f6334 100644
--- a/games/tads/patches/patch-aa
+++ b/games/tads/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/10/08 23:14:38 mycroft Exp $
+$NetBSD: patch-aa,v 1.3 2005/03/22 20:02:11 dillo Exp $
 
---- tads2/Makefile.orig	Wed Sep 25 18:43:09 2002
+--- tads2/Makefile.orig	2004-11-05 14:34:49.000000000 +0100
 +++ tads2/Makefile
-@@ -50,7 +50,7 @@
- #
- 
- # Install point for the tadsc, tadsr, and tdb executables
--BINDIR=/usr/local/bin
-+BINDIR=${PREFIX}/bin
- 
- #
- # Places to look for include files.
-@@ -270,16 +270,18 @@ MATT=Matt Herberg <meherberg@earthlink.n
+@@ -278,16 +278,18 @@ MATT=Matt Herberg <meherberg@earthlink.n
  # No testing has been done on pre 1.5 or a.out systems
  # HAVE_TPARM is set in osunixt.h
  #
@@ -40,14 +31,22 @@ $NetBSD: patch-aa,v 1.2 2004/10/08 23:14:38 mycroft Exp $
  
  #
  # i386+ running DOS/Windows, using DJGPP 2.X
-@@ -374,8 +376,8 @@ TDBOBJS= $(DBGOBJS) osgen.o osunixt.o tp
+@@ -382,10 +384,14 @@ TDBOBJS= $(DBGOBJS) osgen.o osunixt.o tp
  all: tadsr tadsc tdb
  
  install: all
 -	install -d $(BINDIR)
+-	install -d $(DATADIR)
 -	install -s -m755 tadsc tadsr tdb $(BINDIR)
+-	install -m644 adv.t std.t gameinfo.t $(DATADIR)
 +	#install -d $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} tadsc tadsr tdb $(BINDIR)
++	${BSD_INSTALL_DATA_DIR} $(DATADIR)
++	${BSD_INSTALL_PROGRAM} tadsc $(BINDIR)
++	${BSD_INSTALL_PROGRAM} tadsr $(BINDIR)
++	${BSD_INSTALL_PROGRAM} tdb $(BINDIR)
++	${BSD_INSTALL_DATA} adv.t $(DATADIR)
++	${BSD_INSTALL_DATA} std.t $(DATADIR)
++	${BSD_INSTALL_DATA} gameinfo.t $(DATADIR)
  
  tadsr: $(TROBJS)
  	$(CC) $(CFLAGS) $(TROBJS) -o tadsr $(LIBS)
diff --git a/games/tads/patches/patch-ac b/games/tads/patches/patch-ac
index 0afc1ca1136..245b9e05a82 100644
--- a/games/tads/patches/patch-ac
+++ b/games/tads/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2004/10/08 23:14:38 mycroft Exp $
+$NetBSD: patch-ac,v 1.3 2005/03/22 20:02:11 dillo Exp $
 
---- tads3/Makefile.orig	2004-07-13 19:43:38.000000000 +0000
-+++ tads3/Makefile	2004-09-23 22:26:02.000000000 +0000
+--- tads3/Makefile.orig	2005-03-05 11:44:48.000000000 +0100
++++ tads3/Makefile
 @@ -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,7 +14,7 @@ $NetBSD: patch-ac,v 1.2 2004/10/08 23:14:38 mycroft Exp $
  DATADIR = $(PREFIX)/share/tads3
  LIBDIR  = $(DATADIR)/libraries
  INCDIR  = $(DATADIR)/includes
-@@ -113,6 +113,25 @@
+@@ -117,6 +117,25 @@ RESDIR  = $(DATADIR)/resources
  #DISPLAY_LIB  = -ltermcap
  
  ###########################################################################
@@ -40,40 +40,60 @@ $NetBSD: patch-ac,v 1.2 2004/10/08 23:14:38 mycroft Exp $
  # OpenBSD
  # Compiled and tested on OpenBSD 3.0
  # Maintainer: Mark Wickham (macwickham@attbi.com)
-@@ -208,21 +227,27 @@
- all: t3make t3run t23run t3pre
+@@ -216,18 +235,47 @@ MKCHRTAB_OBJS = mkchrtab.o $(T2_DIR)/osu
+ all: t3make t3run t23run t3pre t3res mkchrtab
  
  install: all install-common
--	install -m755 t3make t3run t23run $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} t3make t3run t23run $(BINDIR)
- 
- install-strip: all install-common
- 	install -s -m755 t3make t3run $(BINDIR)
+-	install -s -m755 t3make t3run t23run t3res mkchrtab $(BINDIR)
++	${BSD_INSTALL_PROGRAM} t3make $(BINDIR)
++	${BSD_INSTALL_PROGRAM} t3run $(BINDIR)
++	${BSD_INSTALL_PROGRAM} t23run $(BINDIR)
++	${BSD_INSTALL_PROGRAM} t3res $(BINDIR)
++	${BSD_INSTALL_PROGRAM} mkchrtab $(BINDIR)
  
  install-common: all
 -	install -d $(BINDIR)
 -	install -d $(DOCDIR)
 -	install -d $(DATADIR)
++	${BSD_INSTALL_DATA_DIR} $(DOCDIR)
++	${BSD_INSTALL_DATA_DIR} $(DATADIR)
  	rm -rf $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR)
 -	cp -rp t3include $(INCDIR)
 -	cp -rp t3library $(LIBDIR)
 -	cp -rp t3resource $(RESDIR)
 -	cp -rp doc $(DOCDIR)
--	-chown -R root.root $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR)
-+	${BSD_INSTALL_DATA_DIR} $(DOCDIR)
-+	${BSD_INSTALL_DATA_DIR} $(DATADIR)
-+	${BSD_INSTALL_DATA_DIR} $(INCDIR)
-+	${BSD_INSTALL_DATA_DIR} $(LIBDIR)
-+	${BSD_INSTALL_DATA_DIR} $(LIBDIR)/adv3
-+	${BSD_INSTALL_DATA_DIR} $(LIBDIR)/adv3/en_us
-+	${BSD_INSTALL_DATA_DIR} $(RESDIR)
-+	${BSD_INSTALL_DATA_DIR} $(RESDIR)/charmap
-+	${BSD_INSTALL_DATA} t3include/* $(INCDIR)
-+	${BSD_INSTALL_DATA} t3library/*.* $(LIBDIR)
-+	${BSD_INSTALL_DATA} t3library/adv3/*.* $(LIBDIR)/adv3
-+	${BSD_INSTALL_DATA} t3library/adv3/en_us/*.* $(LIBDIR)/adv3/en_us
-+	${BSD_INSTALL_DATA} t3resource/charmap/* $(RESDIR)/charmap
-+	${BSD_INSTALL_DATA} doc/* $(DOCDIR)
+-	-chown -fR root.root $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR)
++	${BSD_INSTALL_DATA_DIR} ${INCDIR}
++	for f in t3include/*; \
++	do \
++		${BSD_INSTALL_DATA} $$f ${INCDIR}; \
++	done
++	${BSD_INSTALL_DATA_DIR} ${LIBDIR}
++	${BSD_INSTALL_DATA_DIR} ${LIBDIR}/adv3
++	${BSD_INSTALL_DATA_DIR} ${LIBDIR}/adv3/en_us
++	for f in t3library/*.*; \
++	do \
++		${BSD_INSTALL_DATA} $$f ${LIBDIR}; \
++	done
++	for f in t3library/adv3/*.*; \
++	do \
++		${BSD_INSTALL_DATA} $$f ${LIBDIR}/adv3; \
++	done
++	for f in t3library/adv3/en_us/*.*; \
++	do \
++		${BSD_INSTALL_DATA} $$f ${LIBDIR}/adv3/en_us; \
++	done
++	${BSD_INSTALL_DATA_DIR} ${RESDIR}
++	${BSD_INSTALL_DATA_DIR} ${RESDIR}/charmap
++	for f in t3resource/charmap/*; \
++	do \
++		${BSD_INSTALL_DATA} $$f ${RESDIR}/charmap; \
++	done
++	${BSD_INSTALL_DATA_DIR} ${DOCDIR}
++	for f in doc/*; \
++	do \
++		${BSD_INSTALL_DATA} $$f ${DOCDIR}; \
++	done
  
  clean:
- 	rm -f *.o t3make t3run t23run t3pre test_utf8 test_chr test_pool test_err test_obj test_write test_exec test_gets test_tok test_prs test_sym test_prs_top test_comp_obj test_link test_regex test_sort iter.t3s test.t3v
+ 	rm -f *.o t3make t3run t23run t3pre t3res mkchrtab test_utf8 test_chr test_pool test_err test_obj test_write test_exec test_gets test_tok test_prs test_sym test_prs_top test_comp_obj test_link test_regex test_sort iter.t3s test.t3v
-- 
cgit v1.2.3