Index: head/net/scotty/files/patch-aa
===================================================================
--- head/net/scotty/files/patch-aa	(revision 7708)
+++ head/net/scotty/files/patch-aa	(revision 7709)
@@ -1,40 +1,40 @@
 --- Makefile.in~	Fri Sep 13 07:42:06 1996
 +++ Makefile.in	Fri Sep 13 09:28:45 1996
 @@ -469,7 +469,7 @@
  	@$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
  	@$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
  	@chmod 555 $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
 -	@echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
 +	@echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION).so"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
  
  tnm-install-mibs:
  	@for i in $(TNM_INSTALL_DIR)/mibs ; \
 @@ -567,10 +567,14 @@
  		fi; \
  	    done;
  	@echo "Installing tkined$(TNM_VERSION) and tkined$(TNM_VERSION)$(SHLIB_SUFFIX)"
 -	@$(INSTALL_PROGRAM) $(UNIX_DIR)/tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
 +	@sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
 +	@$(INSTALL) -m 555 ${UNIX_DIR}/tkined.sh ${BIN_INSTALL_DIR}/tkined
 +	@$(INSTALL) -m 555 $(UNIX_DIR)/tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
 +	@sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
 +	@$(INSTALL) -m 555 ${UNIX_DIR}/scotty.sh ${BIN_INSTALL_DIR}/scotty
  	@$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
  	@chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
 -	@echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
 +	@echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION).so"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
  	@$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
  
  tki-install-library:
 --- tkined.sh.in~	Fri Sep 13 09:30:41 1996
 +++ tkined.sh.in	Fri Sep 13 09:26:21 1996
 @@ -0,0 +1,3 @@
 +#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.5 @PREFIX@/lib/tnm2.1.5"
-+exec @PREFIX@/bin/tkined1.4.5
++export TCLLIBPATH="@PREFIX@/lib/tkined1.4.6 @PREFIX@/lib/tnm2.1.6"
++exec @PREFIX@/bin/tkined1.4.6
 --- scotty.sh.in~	Fri Sep 13 09:30:41 1996
 +++ scotty.sh.in	Fri Sep 13 09:26:21 1996
 @@ -0,0 +1,3 @@
 +#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tnm2.1.5"
-+exec @PREFIX@/bin/scotty2.1.5
++export TCLLIBPATH="@PREFIX@/lib/tnm2.1.6"
++exec @PREFIX@/bin/scotty2.1.6

Property changes on: head/net/scotty/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/net/scotty/files/patch-af
===================================================================
--- head/net/scotty/files/patch-af	(nonexistent)
+++ head/net/scotty/files/patch-af	(revision 7709)
@@ -0,0 +1,20 @@
+--- configure	Tue Jul 22 15:21:27 1997
++++ configure	Sat Aug 23 04:14:43 1997
+@@ -1402,7 +1402,7 @@
+ DL_LIBS=$TCL_DL_LIBS
+ LD_FLAGS=$TCL_LD_FLAGS
+ LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
+-TCL_INCLUDES=-I$TCL_PREFIX/include
++TCL_INCLUDES=-I$TCL_PREFIX/include/tcl$TCL_VERSION
+ 
+ if test -z "$SHLIB_LD" ; then
+     { echo "configure: error: no shared linker definition (TCL_SHLIB_LD) in tclConfig.sh" 1>&2; exit 1; }
+@@ -1486,7 +1486,7 @@
+ fi
+ 
+ . $tnm_cv_path_tk_config/tkConfig.sh
+-TK_INCLUDES=-I$TK_PREFIX/include
++TK_INCLUDES=-I$TK_PREFIX/include/tk$TK_VERSION
+ if test "$TK_INCLUDES" = "$TCL_INCLUDES" ; then
+     TK_INCLUDES=""
+ fi

Property changes on: head/net/scotty/files/patch-af
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net/scotty3/files/patch-aa
===================================================================
--- head/net/scotty3/files/patch-aa	(revision 7708)
+++ head/net/scotty3/files/patch-aa	(revision 7709)
@@ -1,40 +1,40 @@
 --- Makefile.in~	Fri Sep 13 07:42:06 1996
 +++ Makefile.in	Fri Sep 13 09:28:45 1996
 @@ -469,7 +469,7 @@
  	@$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
  	@$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
  	@chmod 555 $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
 -	@echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
 +	@echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION).so"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
  
  tnm-install-mibs:
  	@for i in $(TNM_INSTALL_DIR)/mibs ; \
 @@ -567,10 +567,14 @@
  		fi; \
  	    done;
  	@echo "Installing tkined$(TNM_VERSION) and tkined$(TNM_VERSION)$(SHLIB_SUFFIX)"
 -	@$(INSTALL_PROGRAM) $(UNIX_DIR)/tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
 +	@sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
 +	@$(INSTALL) -m 555 ${UNIX_DIR}/tkined.sh ${BIN_INSTALL_DIR}/tkined
 +	@$(INSTALL) -m 555 $(UNIX_DIR)/tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
 +	@sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
 +	@$(INSTALL) -m 555 ${UNIX_DIR}/scotty.sh ${BIN_INSTALL_DIR}/scotty
  	@$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
  	@chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
 -	@echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
 +	@echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION).so"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
  	@$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
  
  tki-install-library:
 --- tkined.sh.in~	Fri Sep 13 09:30:41 1996
 +++ tkined.sh.in	Fri Sep 13 09:26:21 1996
 @@ -0,0 +1,3 @@
 +#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.5 @PREFIX@/lib/tnm2.1.5"
-+exec @PREFIX@/bin/tkined1.4.5
++export TCLLIBPATH="@PREFIX@/lib/tkined1.4.6 @PREFIX@/lib/tnm2.1.6"
++exec @PREFIX@/bin/tkined1.4.6
 --- scotty.sh.in~	Fri Sep 13 09:30:41 1996
 +++ scotty.sh.in	Fri Sep 13 09:26:21 1996
 @@ -0,0 +1,3 @@
 +#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tnm2.1.5"
-+exec @PREFIX@/bin/scotty2.1.5
++export TCLLIBPATH="@PREFIX@/lib/tnm2.1.6"
++exec @PREFIX@/bin/scotty2.1.6

Property changes on: head/net/scotty3/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/net-mgmt/scotty3/files/patch-aa
===================================================================
--- head/net-mgmt/scotty3/files/patch-aa	(revision 7708)
+++ head/net-mgmt/scotty3/files/patch-aa	(revision 7709)
@@ -1,40 +1,40 @@
 --- Makefile.in~	Fri Sep 13 07:42:06 1996
 +++ Makefile.in	Fri Sep 13 09:28:45 1996
 @@ -469,7 +469,7 @@
  	@$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
  	@$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
  	@chmod 555 $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
 -	@echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
 +	@echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION).so"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
  
  tnm-install-mibs:
  	@for i in $(TNM_INSTALL_DIR)/mibs ; \
 @@ -567,10 +567,14 @@
  		fi; \
  	    done;
  	@echo "Installing tkined$(TNM_VERSION) and tkined$(TNM_VERSION)$(SHLIB_SUFFIX)"
 -	@$(INSTALL_PROGRAM) $(UNIX_DIR)/tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
 +	@sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
 +	@$(INSTALL) -m 555 ${UNIX_DIR}/tkined.sh ${BIN_INSTALL_DIR}/tkined
 +	@$(INSTALL) -m 555 $(UNIX_DIR)/tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
 +	@sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
 +	@$(INSTALL) -m 555 ${UNIX_DIR}/scotty.sh ${BIN_INSTALL_DIR}/scotty
  	@$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
  	@chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
 -	@echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
 +	@echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION).so"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
  	@$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
  
  tki-install-library:
 --- tkined.sh.in~	Fri Sep 13 09:30:41 1996
 +++ tkined.sh.in	Fri Sep 13 09:26:21 1996
 @@ -0,0 +1,3 @@
 +#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.5 @PREFIX@/lib/tnm2.1.5"
-+exec @PREFIX@/bin/tkined1.4.5
++export TCLLIBPATH="@PREFIX@/lib/tkined1.4.6 @PREFIX@/lib/tnm2.1.6"
++exec @PREFIX@/bin/tkined1.4.6
 --- scotty.sh.in~	Fri Sep 13 09:30:41 1996
 +++ scotty.sh.in	Fri Sep 13 09:26:21 1996
 @@ -0,0 +1,3 @@
 +#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tnm2.1.5"
-+exec @PREFIX@/bin/scotty2.1.5
++export TCLLIBPATH="@PREFIX@/lib/tnm2.1.6"
++exec @PREFIX@/bin/scotty2.1.6

Property changes on: head/net-mgmt/scotty3/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property