# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	scotty-local-2.1.0-v0.ChangeLog
#	scotty-local-2.1.0-v0.diffs
#
echo x - scotty-local-2.1.0-v0.ChangeLog
sed 's/^X//' >scotty-local-2.1.0-v0.ChangeLog << 'END-of-scotty-local-2.1.0-v0.ChangeLog'
XTue Jun 18 13:03:28 1996  Greg A. Woods  <woods@planix.com>
X
X	* unix/.cvsignore: - first time in
X
X	* unix/configure.in:
X	- add PACKAGE and VERSION ala what automake would want
X	- use "test $foo -eq 0" not "test $foo = 0" when doing numeric
X	comparisons (XXX FIXME not done globally)
X	- add TKI_VERSION_NO_MINOR for the benefit of tkined.in
X	- fix detection and configuration of -lresolv for SunOS-4 + BIND
X	- add tkined to list of files in AC_OUTPUT
X
X	* unix/Makefile.in:
X	- collapse some continued lines to prevent weirdness by make on blank
X	continuations (some makes can't handle empty continued lines)
X	- remove tkined -- generated by configure now
X	- define TKINEDLIB and TNMLIB for the scotty.c compile
X
X	* unix/scotty.c: - add TKINEDLIB and TNMLIB to auto_path on startup
X
X	* unix/tkined.in: - first time in, with edits to make it configurable
X
X	* Attic/tkined: - renamed tkined.in
X
X	* Attic/configure:
X	- don't keep this in the repository -- generate as needed, we have autoconf
X
END-of-scotty-local-2.1.0-v0.ChangeLog
echo x - scotty-local-2.1.0-v0.diffs
sed 's/^X//' >scotty-local-2.1.0-v0.diffs << 'END-of-scotty-local-2.1.0-v0.diffs'
XIndex: misc/scotty/unix/.cvsignore
Xdiff -c /dev/null misc/scotty/unix/.cvsignore:1.1
X*** /dev/null	Tue Jun 18 09:49:21 1996
X--- misc/scotty/unix/.cvsignore	Tue Jun 18 09:02:23 1996
X***************
X*** 0 ****
X--- 1,25 ----
X+ Makefile
X+ config.cache
X+ config.h
X+ config.log
X+ config.status
X+ ether.h
X+ ether.x
X+ ether_clnt.c
X+ ether_xdr.c
X+ mount.h
X+ mount.x
X+ mount_clnt.c
X+ mount_xdr.c
X+ ntping
X+ pcnfsd.h
X+ pcnfsd.x
X+ pcnfsd_clnt.c
X+ pcnfsd_xdr.c
X+ rstat.h
X+ rstat.x
X+ rstat_clnt.c
X+ rstat_xdr.c
X+ scotty
X+ straps
X+ tkined
XIndex: misc/scotty/unix/Makefile.in
Xdiff -c misc/scotty/unix/Makefile.in:1.1.1.1 misc/scotty/unix/Makefile.in:1.2
X*** misc/scotty/unix/Makefile.in:1.1.1.1	Fri Jun 14 12:43:01 1996
X--- misc/scotty/unix/Makefile.in	Tue Jun 18 08:54:59 1996
X***************
X*** 348,357 ****
X  		tkiUtil.o \
X  		tkiInit.o @TKI_NCC_O@
X  
X! TNM_SRCS =	$(TNM_GENERIC_SRCS)  $(SNMP_SRCS)  @GDMO_SRCS@  @CMIP_SRCS@ \
X! 		@MSQL_SRCS@
X! TNM_OBJS =	$(TNM_GENERIC_OBJS)  $(SNMP_OBJS)  @GDMO_OBJS@  @CMIP_OBJS@ \
X! 		@MSQL_OBJS@
X  TKI_SRCS =	$(TKI_GENERIC_SRCS)
X  
X  TKI_OBJS =	$(TKI_GENERIC_OBJS)
X--- 348,355 ----
X  		tkiUtil.o \
X  		tkiInit.o @TKI_NCC_O@
X  
X! TNM_SRCS =	$(TNM_GENERIC_SRCS) $(SNMP_SRCS) @GDMO_SRCS@ @CMIP_SRCS@ @MSQL_SRCS@
X! TNM_OBJS =	$(TNM_GENERIC_OBJS) $(SNMP_OBJS) @GDMO_OBJS@ @CMIP_OBJS@ @MSQL_OBJS@
X  TKI_SRCS =	$(TKI_GENERIC_SRCS)
X  
X  TKI_OBJS =	$(TKI_GENERIC_OBJS)
X***************
X*** 681,687 ****
X  clean:
X  	@rm -f $(TNM_OBJS) $(TKI_OBJS) scotty.o ntping.o straps.o
X  	@rm -f tnmGdmoScan.c tnmGdmoParser.c tnmGdmoParser.h
X! 	@rm -f scotty ntping straps 
X  	@rm -f tnm$(SHLIB_SUFFIX) tkined$(SHLIB_SUFFIX)
X  	@rm -f core *_svc.c *~ *.bak so_locations lmake.???
X  
X--- 679,685 ----
X  clean:
X  	@rm -f $(TNM_OBJS) $(TKI_OBJS) scotty.o ntping.o straps.o
X  	@rm -f tnmGdmoScan.c tnmGdmoParser.c tnmGdmoParser.h
X! 	@rm -f scotty ntping straps tkined
X  	@rm -f tnm$(SHLIB_SUFFIX) tkined$(SHLIB_SUFFIX)
X  	@rm -f core *_svc.c *~ *.bak so_locations lmake.???
X  
X***************
X*** 760,766 ****
X  	$(LD) $(LD_FLAGS) -o straps straps.o $(LIBS)
X  
X  scotty.o: $(UNIX_DIR)/scotty.c
X! 	$(CC) -c $(TNM_CC_SWITCHES) -I. -I$(TNM_GENERIC_DIR) $(TCL_INCLUDES) $(UNIX_DIR)/scotty.c
X  
X  tnmEvent.o: $(TNM_GENERIC_DIR)/tnmEvent.c
X  	$(CC) -c $(TNM_CC_SWITCHES) $(TNM_GENERIC_DIR)/tnmEvent.c
X--- 758,764 ----
X  	$(LD) $(LD_FLAGS) -o straps straps.o $(LIBS)
X  
X  scotty.o: $(UNIX_DIR)/scotty.c
X! 	$(CC) -c $(TNM_CC_SWITCHES) -I. -I$(TNM_GENERIC_DIR) $(TCL_INCLUDES) -DTNMLIB=\"$(TNM_INSTALL_DIR)\" -DTKINEDLIB=\"$(TKI_INSTALL_DIR)\" $(UNIX_DIR)/scotty.c
X  
X  tnmEvent.o: $(TNM_GENERIC_DIR)/tnmEvent.c
X  	$(CC) -c $(TNM_CC_SWITCHES) $(TNM_GENERIC_DIR)/tnmEvent.c
XIndex: misc/scotty/unix/configure.in
Xdiff -c misc/scotty/unix/configure.in:1.1.1.1 misc/scotty/unix/configure.in:1.2
X*** misc/scotty/unix/configure.in:1.1.1.1	Fri Jun 14 12:43:01 1996
X--- misc/scotty/unix/configure.in	Tue Jun 18 08:58:58 1996
X***************
X*** 4,9 ****
X--- 4,12 ----
X  AC_INIT(scotty.c)
X  AC_CONFIG_HEADER(config.h)
X  
X+ PACKAGE=scotty
X+ VERSION=2.1.0
X+ 
X  #----------------------------------------------------------------------------
X  #       Check if we should use gcc if available on this machine.
X  #----------------------------------------------------------------------------
X***************
X*** 14,19 ****
X--- 17,23 ----
X  
X  TNM_VERSION=2.1.0
X  TKI_VERSION=1.4.0
X+ TKI_VERSION_NO_MINOR=1.4
X  
X  AC_PREFIX_PROGRAM(scotty)
X  if test "$prefix" = "NONE" ; then
X***************
X*** 236,242 ****
X  LIBS="$LIBS -lsocket"
X  AC_CHECK_LIB(nsl, main, , tk_both=0)
X  LIBS=$tk_oldLibs
X! if test "$tk_both" = 1; then
X      echo "need -lsocket and -lnsl together"
X      LIBS="$LIBS -lsocket -lnsl"
X  else
X--- 240,246 ----
X  LIBS="$LIBS -lsocket"
X  AC_CHECK_LIB(nsl, main, , tk_both=0)
X  LIBS=$tk_oldLibs
X! if test "$tk_both" -eq 1; then
X      echo "need -lsocket and -lnsl together"
X      LIBS="$LIBS -lsocket -lnsl"
X  else
X***************
X*** 247,254 ****
X  AC_CHECK_LIB(ieee, main, [LIBS="$LIBS -lieee"])
X  AC_CHECK_LIB(rpc, main, [LIBS="$LIBS -lrpc"])
X  AC_CHECK_LIB(rpcsvc, main, [LIBS="$LIBS -lrpcsvc"])
X  AC_CHECK_FUNC(res_mkquery, ,
X! 	AC_CHECK_LIB(resolv, res_mkquery, [LIBS="$LIBS -lresolv"]))
X  
X  #----------------------------------------------------------------------------
X  #	Checks for various include files missing on some machines.
X--- 251,284 ----
X  AC_CHECK_LIB(ieee, main, [LIBS="$LIBS -lieee"])
X  AC_CHECK_LIB(rpc, main, [LIBS="$LIBS -lrpc"])
X  AC_CHECK_LIB(rpcsvc, main, [LIBS="$LIBS -lrpcsvc"])
X+ 
X+ # The BIND 4.9.3/4.9.4 shared library for SunOS-4.1 doesn't make _res
X+ # publicly available, so if we don't find it we need to link with
X+ # -lresolv statically.
X+ #
X+ AC_CACHE_CHECK(_res without -lresolv, tk_cv_var__res, [
X+ 	AC_TRY_LINK([#include <sys/types.h>
X+ #include <netinet/in.h>
X+ #include <arpa/nameser.h>
X+ #include <resolv.h>], [_res.options = RES_INIT;],
X+ 		tk_cv_var__res=yes, tk_cv_var__res=no)
X+ ])
X+ if test "$tk_cv_var__res" = "no"; then
X+     LIBS="$LIBS -lresolv"
X+     #
X+     # Check again verbosely and make sure it is really there now...
X+     #
X+     AC_CACHE_CHECK(-lresolv, tk_cv_var__res_lresolv, [
X+ 	AC_TRY_LINK([#include <sys/types.h>
X+ #include <netinet/in.h>
X+ #include <arpa/nameser.h>
X+ #include <resolv.h>], [_res.options = RES_INIT;],
X+ 		tk_cv_var__res_lresolv=yes,
X+ 		AC_MSG_ERROR(need resolver _res global but not in -lresolv; giving up))
X+     ])
X+ fi
X  AC_CHECK_FUNC(res_mkquery, ,
X! 	AC_MSG_ERROR(bizzare -- _res but no res_mkquery; giving up))
X  
X  #----------------------------------------------------------------------------
X  #	Checks for various include files missing on some machines.
X***************
X*** 317,322 ****
X--- 347,353 ----
X  
X  AC_SUBST(TNM_VERSION)
X  AC_SUBST(TKI_VERSION)
X+ AC_SUBST(TKI_VERSION_NO_MINOR)
X  AC_SUBST(TKI_NCC_O)
X  AC_SUBST(TARGET)
X  
X***************
X*** 325,331 ****
X  AC_SUBST(TCL_VERSION)
X  AC_SUBST(TK_INCLUDES)
X  AC_SUBST(TK_LIB_SPEC)
X  AC_SUBST(TK_XINCLUDES)
X  AC_SUBST(TK_XLIBSW)
X  
X! AC_OUTPUT(Makefile)
X--- 356,363 ----
X  AC_SUBST(TCL_VERSION)
X  AC_SUBST(TK_INCLUDES)
X  AC_SUBST(TK_LIB_SPEC)
X+ AC_SUBST(TK_VERSION)
X  AC_SUBST(TK_XINCLUDES)
X  AC_SUBST(TK_XLIBSW)
X  
X! AC_OUTPUT([Makefile tkined])
XIndex: misc/scotty/unix/scotty.c
Xdiff -c misc/scotty/unix/scotty.c:1.1.1.1 misc/scotty/unix/scotty.c:1.2
X*** misc/scotty/unix/scotty.c:1.1.1.1	Fri Jun 14 12:42:59 1996
X--- misc/scotty/unix/scotty.c	Tue Jun 18 08:52:53 1996
X***************
X*** 14,19 ****
X--- 14,31 ----
X  #include "tnmInt.h"
X  #include "tnmPort.h"
X  
X+ /*
X+  * Define some default places where we expect our own files.
X+  */
X+ 
X+ #ifndef TKINEDLIB
X+ # define TKINEDLIB	"/usr/local/lib/tkined"
X+ #endif
X+ 
X+ #ifndef TNMLIB
X+ # define TNMLIB		"/usr/local/lib/tnm"
X+ #endif
X+ 
X  static Tcl_Interp *interp;      /* Interpreter for this application. */
X  static Tcl_DString command;	/* Used to assemble lines of terminal input
X  				 * into Tcl commands. */
X***************
X*** 92,97 ****
X--- 104,114 ----
X      if (Tcl_Init(interp) != TCL_OK) {
X          return TCL_ERROR;
X      }
X+ 
X+     Tcl_SetVar(interp, "auto_path", TKINEDLIB,
X+ 	       TCL_GLOBAL_ONLY | TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
X+     Tcl_SetVar(interp, "auto_path", TNMLIB,
X+ 	       TCL_GLOBAL_ONLY | TCL_APPEND_VALUE | TCL_LIST_ELEMENT);
X  
X      if (Tcl_PkgRequire(interp, "scotty", "2.1.0", 1) == NULL) {
X  	Tcl_AppendResult(interp, "\n",
XIndex: misc/scotty/unix/tkined
Xdiff -c misc/scotty/unix/tkined:1.1.1.1 misc/scotty/unix/tkined:removed
X*** misc/scotty/unix/tkined:1.1.1.1	Fri Jun 14 12:43:02 1996
X--- misc/scotty/unix/tkined	Tue Jun 18 09:49:38 1996
X***************
X*** 1,52 ****
X- #!/bin/sh
X- # the next line restarts using wish \
X- exec wish4.1 "$0" "$@"
X- 
X- # Load all the packages that make up Tkined. Note, the order is
X- # important here because the Tkined package initializes the search
X- # path so that the Tcl modules are found automatically.
X- 
X- package require Tcl 7.5
X- package require Tk 4.1 
X- 
X- package require Tkined 1.4
X- package require TkinedCommand 1.4
X- package require TkinedDiagram 1.4
X- package require TkinedDialog 1.4
X- package require TkinedEditor 1.4
X- package require TkinedEvent 1.4
X- package require TkinedHelp 1.4
X- package require TkinedMisc 1.4
X- package require TkinedObjects 1.4
X- package require TkinedTool 1.4
X- 
X- # I dont like the fat font Tk uses per default. So here 
X- # is good old fixed font.
X- 
X- option add Tkined*Text.font        fixed startupFile
X- 
X- # Read the site specific initialization file.
X- 
X- if [file exists $tkined(library)/site/init.tcl] {
X-     source $tkined(library)/site/init.tcl
X- }
X- 
X- # And here we start. Unmap the . widget and start an editor
X- # for each file metioned in the command line.
X- 
X- wm withdraw .
X- 
X- foreach f $argv {
X-     if [file readable $f] {
X-         lappend views [EDITOR $f]
X-     }
X- }
X- if {! [info exists views]} {
X-     set views [EDITOR]
X- }
X- 
X- if {[info exists geometry]} {
X-     foreach view $views {
X- 	puts "should set geometry of $view to $geometry"
X-     }
X- }
X--- 0 ----
XIndex: misc/scotty/unix/tkined.in
Xdiff -c /dev/null misc/scotty/unix/tkined.in:1.1
X*** /dev/null	Tue Jun 18 09:49:42 1996
X--- misc/scotty/unix/tkined.in	Tue Jun 18 08:51:19 1996
X***************
X*** 0 ****
X--- 1,55 ----
X+ #! /bin/sh
X+ # the next line restarts using wish \
X+ exec wish@TK_VERSION@ "$0" "$@"
X+ 
X+ # Load all the packages that make up Tkined.  Note, the order is
X+ # important here because the Tkined package initializes the search
X+ # path so that the Tcl modules are found automatically.
X+ 
X+ package require Tcl @TCL_VERSION@
X+ package require Tk @TK_VERSION@
X+ 
X+ lappend auto_path @prefix@/lib/tnm@TNM_VERSION@
X+ lappend auto_path @prefix@/lib/tkined@TKI_VERSION@
X+ 
X+ package require Tkined @TKI_VERSION_NO_MINOR@
X+ package require TkinedCommand @TKI_VERSION_NO_MINOR@
X+ package require TkinedDiagram @TKI_VERSION_NO_MINOR@
X+ package require TkinedDialog @TKI_VERSION_NO_MINOR@
X+ package require TkinedEditor @TKI_VERSION_NO_MINOR@
X+ package require TkinedEvent @TKI_VERSION_NO_MINOR@
X+ package require TkinedHelp @TKI_VERSION_NO_MINOR@
X+ package require TkinedMisc @TKI_VERSION_NO_MINOR@
X+ package require TkinedObjects @TKI_VERSION_NO_MINOR@
X+ package require TkinedTool @TKI_VERSION_NO_MINOR@
X+ 
X+ # I dont like the fat font Tk uses per default. So here 
X+ # is good old fixed font.
X+ 
X+ option add Tkined*Text.font        fixed startupFile
X+ 
X+ # Read the site specific initialization file.
X+ 
X+ if [file exists $tkined(library)/site/init.tcl] {
X+     source $tkined(library)/site/init.tcl
X+ }
X+ 
X+ # And here we start. Unmap the . widget and start an editor
X+ # for each file metioned in the command line.
X+ 
X+ wm withdraw .
X+ 
X+ foreach f $argv {
X+     if [file readable $f] {
X+         lappend views [EDITOR $f]
X+     }
X+ }
X+ if {! [info exists views]} {
X+     set views [EDITOR]
X+ }
X+ 
X+ if {[info exists geometry]} {
X+     foreach view $views {
X+ 	puts "should set geometry of $view to $geometry"
X+     }
X+ }
END-of-scotty-local-2.1.0-v0.diffs
exit