diff -ruN tads-3.0.8/tads2/Makefile tads-3.0.8-/tads2/Makefile --- tads-3.0.8/tads2/Makefile 2004-11-05 08:34:49.000000000 -0500 +++ tads-3.0.8-/tads2/Makefile 2010-09-27 20:37:35.000000000 -0400 @@ -56,7 +56,7 @@ # # DATADIR is where the TADS 2 development libraries (adv.t, std.t and # gameinfo.t) will get installed. -PREFIX=/usr/local +PREFIX=@PREFIX@ BINDIR=$(PREFIX)/bin DATADIR=$(PREFIX)/share/tads2 @@ -321,16 +321,16 @@ # # Mac OS X / Darwin # -#CC=cc -#OPTIMIZE=-O2 -#UNIXFLAGS= -g -DOSANSI -DUNIX -DHAVE_STRCASECMP -#SYSFLAGS= -DOS_SYSTEM_NAME=\""Darwin"\" -DSYSNAME=\""Darwin"\" -DSYSPL=\"1\" -DPORTER=\""$(MATT)"\" -DSYSMAINTAINER=\""Darwin port maintained by $(MATT)\n"\" -#CFLAGS= $(UNIXFLAGS) $(SYSFLAGS) -DDARWIN -#AFLAGS= -#OVFLG= -#MACHDEP= -#LIBS=-lncurses -#MAKEXEC=touch +CC=cc +OPTIMIZE=-O2 +UNIXFLAGS= -g -DOSANSI -DUNIX -DHAVE_STRCASECMP +SYSFLAGS= -DOS_SYSTEM_NAME=\""Darwin"\" -DSYSNAME=\""Darwin"\" -DSYSPL=\"1\" -DPORTER=\""$(MATT)"\" -DSYSMAINTAINER=\""Darwin port maintained by $(MATT)\n"\" +CFLAGS= $(UNIXFLAGS) $(SYSFLAGS) -DDARWIN +AFLAGS= +OVFLG= +MACHDEP= +LIBS=-L@PREFIX@/lib -lncurses +MAKEXEC=touch # # Don't change stuff below this line unless you really know what you're doing. diff -ruN tads-3.0.8/tads2/osunixt.h tads-3.0.8-/tads2/osunixt.h --- tads-3.0.8/tads2/osunixt.h 2004-02-16 21:20:41.000000000 -0500 +++ tads-3.0.8-/tads2/osunixt.h 2010-09-27 20:37:35.000000000 -0400 @@ -21,7 +21,7 @@ #define OSUNIXT_INCLUDED #include - +#include /* Use UNIXPATCHLEVEL, as defined in the makefile, for the port patch level */ #define TADS_OEM_VERSION UNIXPATCHLEVEL @@ -161,8 +161,8 @@ * routine instead. */ void *our_memcpy(void *dst, const void *src, size_t size); -#define memcpy our_memcpy -#define memmove our_memcpy +//#define memcpy our_memcpy +//#define memmove our_memcpy /* display lines on which errors occur */ /* # define OS_ERRLINE 1 */ diff -ruN tads-3.0.8/tads3/Makefile tads-3.0.8-/tads3/Makefile --- tads-3.0.8/tads3/Makefile 2005-03-05 05:44:48.000000000 -0500 +++ tads-3.0.8-/tads3/Makefile 2010-09-28 10:03:03.000000000 -0400 @@ -14,7 +14,7 @@ # Installation points for TADS3. Tailor these to your liking. If you install # manually, DATADIR must match where you actually put the libraries and # resources, or the TADS3 compiler will not be able to find them. -PREFIX = /usr/local +PREFIX = @PREFIX@ BINDIR = $(PREFIX)/bin DOCDIR = $(PREFIX)/doc/tads3 DATADIR = $(PREFIX)/share/tads3 @@ -173,13 +173,13 @@ # Maintainer: Matt Herberg (meherberg@earthlink.net) ########################################################################### # -#CXX = c++ -#CC = cc -#IDENT = -DDARWIN -DOS_SYSTEM_NAME=\"Darwin\" -#OPTIMIZE = -O2 -#CXX_OPTIMIZE = -#OS_FLAGS = -DOS_ANSI -DHAVE_STRCASECMP -Dmemicmp=strncasecmp -I./BSD -#DISPLAY_LIB = -lncurses +CXX = c++ +CC = cc +IDENT = -DDARWIN -DOS_SYSTEM_NAME=\"Darwin\" +OPTIMIZE = -O2 +CXX_OPTIMIZE = +OS_FLAGS = -DOS_ANSI -DHAVE_STRCASECMP -Dmemicmp=strncasecmp -I./BSD +DISPLAY_LIB = -L@PREFIX@/lib -lncurses ########################################################################### # You shouldn't need to change anything beyond this line. @@ -216,18 +216,18 @@ all: t3make t3run t23run t3pre t3res mkchrtab install: all install-common - install -s -m755 t3make t3run t23run t3res mkchrtab $(BINDIR) + install -s -m755 t3make t3run t23run t3res mkchrtab @INST@/bin install-common: all - install -d $(BINDIR) - install -d $(DOCDIR) - install -d $(DATADIR) - rm -rf $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR) - cp -rp t3include $(INCDIR) - cp -rp t3library $(LIBDIR) - cp -rp t3resource $(RESDIR) - cp -rp doc $(DOCDIR) - -chown -fR root.root $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR) + install -d @INST@/bin + install -d @INST@/share/doc/tads3 + install -d @INST@/share/tads3 + #rm -rf $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR) + cp -rp t3include @INST@/share/tads3/includes + cp -rp t3library @INST@/share/tads3/libraries + cp -rp t3resource @INST@/share/tads3/res + cp -rp doc @INST@/share/doc/tads3 + #-chown -fR root.root $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR) clean: 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 diff -ruN tads-3.0.8/tads3/mkchrtab.cpp tads-3.0.8-/tads3/mkchrtab.cpp --- tads-3.0.8/tads3/mkchrtab.cpp 2003-02-28 01:18:36.000000000 -0500 +++ tads-3.0.8-/tads3/mkchrtab.cpp 2010-09-27 20:37:35.000000000 -0400 @@ -685,7 +685,7 @@ if (dstp >= buf + sizeof(buf)) { printf("%s: line %d: entity mapping is too long " - "(maximum of %d characters are allowed\n", + "(maximum of %lu characters are allowed\n", infile, linenum, sizeof(buf)); return 0; } @@ -719,7 +719,7 @@ if (dstp + 1 > buf + sizeof(buf)) { printf("%s: line %d: entity mapping is too long " - "(maximum of %d characters are allowed\n", + "(maximum of %lu characters are allowed\n", infile, linenum, sizeof(buf)/sizeof(buf[0])); return 0; } @@ -773,7 +773,7 @@ if (entp->ename == 0) { printf("%s: line %d: unknown entity name \"%.*s\"\n", - infile, linenum, p - start, start); + infile, linenum, (int)(p - start), start); return 0; }