Update to version 2.1.10.

PR:		10806
Submitted by:	Dima Sivachecko <dima@Chg.RU>

12 files changed, 42 insertions, 48 deletions

diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index 1b24aa63aa23..83a647ca22b4 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -6,11 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	scotty-2.1.9
+DISTNAME=	scotty-2.1.10
 CATEGORIES=	net tk82
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
-MAINTAINER=	phk@freebsd.org
+MAINTAINER=	dima@Chg.RU
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
@@ -23,10 +23,10 @@ WRKSRC=${WRKDIR}/${DISTNAME}/unix
 MAN1=		tkined.1 scotty.1
 MAN8=		ntping.8 straps.8
 MANN=		Tnm.n cmip.n dns.n gdmo.n http.n icmp.n ined.n job.n \
-		mib.n msqltcl.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
+		mib.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
 		syslog.n udp.n
 PLIST_SUB=	FREEBSD_VERSION=${FREEBSD_VERSION} \
-		SCOTTY_VERSION=2.1.9 TKINED_VERSION=1.4.9
+		SCOTTY_VERSION=2.1.10 TKINED_VERSION=1.4.10
 FREEBSD_VERSION!=	echo `uname -m`-`uname`-`uname -r`
 
 pre-install:
diff --git a/net-mgmt/scotty3/distinfo b/net-mgmt/scotty3/distinfo
index baf6535aa8e8..cf3327bdd1b9 100644
--- a/net-mgmt/scotty3/distinfo
+++ b/net-mgmt/scotty3/distinfo
@@ -1 +1 @@
-MD5 (scotty-2.1.9.tar.gz) = e05307f54f3cf0a56eea39cf1fe73b0c
+MD5 (scotty-2.1.10.tar.gz) = e885c33ac4ba9cf17ca09886ca4046b1
diff --git a/net-mgmt/scotty3/files/patch-aa b/net-mgmt/scotty3/files/patch-aa
index 0b0a5ed3c4ec..e2d3263e9800 100644
--- a/net-mgmt/scotty3/files/patch-aa
+++ b/net-mgmt/scotty3/files/patch-aa
@@ -2,11 +2,11 @@
 +++ tkined.sh.in	Fri Sep 13 09:26:21 1996
 @@ -0,0 +1,3 @@
 +#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.9 @PREFIX@/lib/tnm2.1.9"
-+exec @PREFIX@/bin/tkined1.4.9 $*
++export TCLLIBPATH="@PREFIX@/lib/tkined1.4.10 @PREFIX@/lib/tnm2.1.10"
++exec @PREFIX@/bin/tkined1.4.10 $*
 --- 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.9"
-+exec @PREFIX@/bin/scotty2.1.9
++export TCLLIBPATH="@PREFIX@/lib/tnm2.1.10"
++exec @PREFIX@/bin/scotty2.1.10
diff --git a/net-mgmt/scotty3/files/patch-ac b/net-mgmt/scotty3/files/patch-ac
index da052c31d3cd..47141f9d54fe 100644
--- a/net-mgmt/scotty3/files/patch-ac
+++ b/net-mgmt/scotty3/files/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Jun  4 12:15:55 1998
-+++ Makefile.in	Thu Jun  4 12:22:39 1998
-@@ -490,7 +490,7 @@
+--- Makefile.in.orig	Fri Mar 26 20:12:11 1999
++++ Makefile.in	Fri Mar 26 20:20:58 1999
+@@ -509,7 +509,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)
@@ -9,13 +9,11 @@
  
  tnm-install-mibs:
  	@for i in $(TNM_INSTALL_DIR)/mibs ; \
-@@ -589,11 +590,15 @@
- 		else true; \
+@@ -608,10 +608,14 @@
  		fi; \
  	    done;
--	@echo "Installing tkined$(TNM_VERSION) and tkined$(TNM_VERSION)$(SHLIB_SUFFIX)"
+ 	@echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
 -	@$(INSTALL_PROGRAM) tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
-+	@echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
 +	@$(INSTALL_DATA) -m 555 tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
 +	@sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
 +	@sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index 1b24aa63aa23..83a647ca22b4 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -6,11 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	scotty-2.1.9
+DISTNAME=	scotty-2.1.10
 CATEGORIES=	net tk82
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
-MAINTAINER=	phk@freebsd.org
+MAINTAINER=	dima@Chg.RU
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
@@ -23,10 +23,10 @@ WRKSRC=${WRKDIR}/${DISTNAME}/unix
 MAN1=		tkined.1 scotty.1
 MAN8=		ntping.8 straps.8
 MANN=		Tnm.n cmip.n dns.n gdmo.n http.n icmp.n ined.n job.n \
-		mib.n msqltcl.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
+		mib.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
 		syslog.n udp.n
 PLIST_SUB=	FREEBSD_VERSION=${FREEBSD_VERSION} \
-		SCOTTY_VERSION=2.1.9 TKINED_VERSION=1.4.9
+		SCOTTY_VERSION=2.1.10 TKINED_VERSION=1.4.10
 FREEBSD_VERSION!=	echo `uname -m`-`uname`-`uname -r`
 
 pre-install:
diff --git a/net/scotty/distinfo b/net/scotty/distinfo
index baf6535aa8e8..cf3327bdd1b9 100644
--- a/net/scotty/distinfo
+++ b/net/scotty/distinfo
@@ -1 +1 @@
-MD5 (scotty-2.1.9.tar.gz) = e05307f54f3cf0a56eea39cf1fe73b0c
+MD5 (scotty-2.1.10.tar.gz) = e885c33ac4ba9cf17ca09886ca4046b1
diff --git a/net/scotty/files/patch-aa b/net/scotty/files/patch-aa
index 0b0a5ed3c4ec..e2d3263e9800 100644
--- a/net/scotty/files/patch-aa
+++ b/net/scotty/files/patch-aa
@@ -2,11 +2,11 @@
 +++ tkined.sh.in	Fri Sep 13 09:26:21 1996
 @@ -0,0 +1,3 @@
 +#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.9 @PREFIX@/lib/tnm2.1.9"
-+exec @PREFIX@/bin/tkined1.4.9 $*
++export TCLLIBPATH="@PREFIX@/lib/tkined1.4.10 @PREFIX@/lib/tnm2.1.10"
++exec @PREFIX@/bin/tkined1.4.10 $*
 --- 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.9"
-+exec @PREFIX@/bin/scotty2.1.9
++export TCLLIBPATH="@PREFIX@/lib/tnm2.1.10"
++exec @PREFIX@/bin/scotty2.1.10
diff --git a/net/scotty/files/patch-ac b/net/scotty/files/patch-ac
index da052c31d3cd..47141f9d54fe 100644
--- a/net/scotty/files/patch-ac
+++ b/net/scotty/files/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Jun  4 12:15:55 1998
-+++ Makefile.in	Thu Jun  4 12:22:39 1998
-@@ -490,7 +490,7 @@
+--- Makefile.in.orig	Fri Mar 26 20:12:11 1999
++++ Makefile.in	Fri Mar 26 20:20:58 1999
+@@ -509,7 +509,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)
@@ -9,13 +9,11 @@
  
  tnm-install-mibs:
  	@for i in $(TNM_INSTALL_DIR)/mibs ; \
-@@ -589,11 +590,15 @@
- 		else true; \
+@@ -608,10 +608,14 @@
  		fi; \
  	    done;
--	@echo "Installing tkined$(TNM_VERSION) and tkined$(TNM_VERSION)$(SHLIB_SUFFIX)"
+ 	@echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
 -	@$(INSTALL_PROGRAM) tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
-+	@echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
 +	@$(INSTALL_DATA) -m 555 tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
 +	@sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
 +	@sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index 1b24aa63aa23..83a647ca22b4 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -6,11 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	scotty-2.1.9
+DISTNAME=	scotty-2.1.10
 CATEGORIES=	net tk82
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
-MAINTAINER=	phk@freebsd.org
+MAINTAINER=	dima@Chg.RU
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
@@ -23,10 +23,10 @@ WRKSRC=${WRKDIR}/${DISTNAME}/unix
 MAN1=		tkined.1 scotty.1
 MAN8=		ntping.8 straps.8
 MANN=		Tnm.n cmip.n dns.n gdmo.n http.n icmp.n ined.n job.n \
-		mib.n msqltcl.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
+		mib.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
 		syslog.n udp.n
 PLIST_SUB=	FREEBSD_VERSION=${FREEBSD_VERSION} \
-		SCOTTY_VERSION=2.1.9 TKINED_VERSION=1.4.9
+		SCOTTY_VERSION=2.1.10 TKINED_VERSION=1.4.10
 FREEBSD_VERSION!=	echo `uname -m`-`uname`-`uname -r`
 
 pre-install:
diff --git a/net/scotty3/distinfo b/net/scotty3/distinfo
index baf6535aa8e8..cf3327bdd1b9 100644
--- a/net/scotty3/distinfo
+++ b/net/scotty3/distinfo
@@ -1 +1 @@
-MD5 (scotty-2.1.9.tar.gz) = e05307f54f3cf0a56eea39cf1fe73b0c
+MD5 (scotty-2.1.10.tar.gz) = e885c33ac4ba9cf17ca09886ca4046b1
diff --git a/net/scotty3/files/patch-aa b/net/scotty3/files/patch-aa
index 0b0a5ed3c4ec..e2d3263e9800 100644
--- a/net/scotty3/files/patch-aa
+++ b/net/scotty3/files/patch-aa
@@ -2,11 +2,11 @@
 +++ tkined.sh.in	Fri Sep 13 09:26:21 1996
 @@ -0,0 +1,3 @@
 +#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.9 @PREFIX@/lib/tnm2.1.9"
-+exec @PREFIX@/bin/tkined1.4.9 $*
++export TCLLIBPATH="@PREFIX@/lib/tkined1.4.10 @PREFIX@/lib/tnm2.1.10"
++exec @PREFIX@/bin/tkined1.4.10 $*
 --- 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.9"
-+exec @PREFIX@/bin/scotty2.1.9
++export TCLLIBPATH="@PREFIX@/lib/tnm2.1.10"
++exec @PREFIX@/bin/scotty2.1.10
diff --git a/net/scotty3/files/patch-ac b/net/scotty3/files/patch-ac
index da052c31d3cd..47141f9d54fe 100644
--- a/net/scotty3/files/patch-ac
+++ b/net/scotty3/files/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Jun  4 12:15:55 1998
-+++ Makefile.in	Thu Jun  4 12:22:39 1998
-@@ -490,7 +490,7 @@
+--- Makefile.in.orig	Fri Mar 26 20:12:11 1999
++++ Makefile.in	Fri Mar 26 20:20:58 1999
+@@ -509,7 +509,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)
@@ -9,13 +9,11 @@
  
  tnm-install-mibs:
  	@for i in $(TNM_INSTALL_DIR)/mibs ; \
-@@ -589,11 +590,15 @@
- 		else true; \
+@@ -608,10 +608,14 @@
  		fi; \
  	    done;
--	@echo "Installing tkined$(TNM_VERSION) and tkined$(TNM_VERSION)$(SHLIB_SUFFIX)"
+ 	@echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
 -	@$(INSTALL_PROGRAM) tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
-+	@echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
 +	@$(INSTALL_DATA) -m 555 tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
 +	@sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
 +	@sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh