diff -Naur tf-40s1old/unix/Config tf-40s1/unix/Config --- tf-40s1old/unix/Config Sat Mar 6 14:43:28 1999 +++ tf-40s1/unix/Config Fri Apr 19 00:19:26 2002 @@ -33,9 +33,9 @@ # even if an old version is currently in use. You can remove # the old version manually later when it is no longer in use. -# TF="/usr/local/bin/tf-${TFVER}" -# LIBDIR="/usr/local/lib/tf-${TFVER}-lib" -# SYMLINK="/usr/local/bin/tf" +TF="${FINK_BUILD}/bin/tf-${TFVER}" +LIBDIR="${FINK_BUILD}/lib/tf-${TFVER}-lib" +#SYMLINK="${FINK_BUILD}/bin/tf" ### Manual Page. @@ -44,8 +44,8 @@ # uses nroff format; set MANTYPE=cat if your man uses pre-formatted # vt100 "catman" pages. Default is "cat". -# MANTYPE="nroff" -# MANPAGE="/usr/local/man/man1/tf.1" +MANTYPE="nroff" +MANPAGE="${FINK_BUILD}/share/man/man1/tf.1" ### Flags. @@ -109,8 +109,8 @@ # If unixmake told you to set CC=cc, be sure to uncomment the line below # by removing the leading "#". -# CC=cc -# CCFLAGS="-g" +CC=cc +CCFLAGS="-g -no-cpp-precomp" ### Stripping. diff -Naur tf-40s1old/unix/tfconfig tf-40s1/unix/tfconfig --- tf-40s1old/unix/tfconfig Sat Mar 6 14:43:28 1999 +++ tf-40s1/unix/tfconfig Fri Apr 19 01:18:01 2002 @@ -45,7 +45,7 @@ TF="${TFDEV_TF}" FLAGS='' GNU_C=0 -LIBDIR="${TFDEV_LIBDIR}" +LIBDIR="${FINK_LIBDIR}" LIBS='' MAILDIR='' # MAKE='' ;# Use the value from the environment if there is one. @@ -224,6 +224,7 @@ echo 'To change these locations type "n" now and edit the unix/Config file.' while [ -z "$ans" ]; do + break echo 'Continue? (y/n)' read ans; case "$ans" in @@ -238,7 +239,7 @@ rm -f ../src/Makefile ${AOUT} -echo "#define LIBDIR \"${LIBDIR}\"" >&4 +echo "#define LIBDIR \"${FINK_LIBDIR}\"" >&4 if [ -n "$MAILDIR" ]; then echo "#define MAILDIR \"${MAILDIR}\"" >&4 else diff -ur tf-40s1.bak/src/history.c tf-40s1/src/history.c --- tf-40s1.bak/src/history.c 1999-03-06 14:43:24.000000000 -0800 +++ tf-40s1/src/history.c 2005-06-13 16:28:37.000000000 -0700 @@ -38,18 +38,6 @@ #define LOCALSIZE 100 /* local history size */ #define INPUTSIZE 100 /* command history buffer size */ -typedef struct History { /* circular list of Alines, and logfile */ - struct Aline **alines; - int size; /* actual number of lines currently saved */ - int maxsize; /* maximum number of lines that can be saved */ - int first; /* position of first line in circular array */ - int last; /* position of last line in circular array */ - int index; /* current recall position */ - int total; /* total number of lines ever saved */ - TFILE *logfile; - CONST char *logname; -} History; - #define empty(hist) (!(hist)->alines || !(hist)->size) static void FDECL(alloc_history,(History *hist, int maxsize)); diff -ur tf-40s1.bak/src/history.h tf-40s1/src/history.h --- tf-40s1.bak/src/history.h 1999-03-06 14:43:24.000000000 -0800 +++ tf-40s1/src/history.h 2005-06-13 16:28:47.000000000 -0700 @@ -12,6 +12,18 @@ # ifndef NO_HISTORY +typedef struct History { /* circular list of Alines, and logfile */ + struct Aline **alines; + int size; /* actual number of lines currently saved */ + int maxsize; /* maximum number of lines that can be saved */ + int first; /* position of first line in circular array */ + int last; /* position of last line in circular array */ + int index; /* current recall position */ + int total; /* total number of lines ever saved */ + TFILE *logfile; + CONST char *logname; +} History; + extern void NDECL(init_histories); extern struct History *FDECL(init_history,(struct History *hist, int maxsize)); extern void FDECL(free_history,(struct History *hist));