Upgrade to 2.0.2

5 files changed, 238 insertions, 24 deletions

diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index 93a21f0843a2..9bb2bea971be 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -1,26 +1,21 @@
 # New ports collection makefile for:	scotty
-# Version required:	1.2.0
+# Version required:	2.0.2
 # Date created:		18 Februar 1995
 # Whom:			Gennady Sorokopud <gena@netvision.net.il>
 #
-# $Id: Makefile,v 1.7 1995/09/15 10:41:29 asami Exp $
+# $Id: Makefile,v 1.8 1995/11/27 04:05:32 asami Exp $
 #
 
-DISTNAME=	scotty-1.2.0
+DISTNAME=	scotty-2.0.2
 CATEGORIES+=	net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
-PATCHFILES=	scotty-1.2.0-1.2.1.diff.gz scotty-1.2.1-1.2.2.diff.gz
-PATCH_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
-PATCH_DIST_STRIP=	-p1
-
-LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk \
-		tcl\\.7\\.:${PORTSDIR}/lang/tcl
+LIB_DEPENDS=	tk40\\.1\\.:${PORTSDIR}/x11/tk \
+		tcl74\\.1\\.:${PORTSDIR}/lang/tcl
 EXEC_DEPENDS=	wishx:${PORTSDIR}/lang/tclX
 
 HAS_CONFIGURE=  yes
 GNU_CONFIGURE=  yes
-USE_GMAKE=	yes
 CONFIGURE_ARGS= --with-x --prefix=${PREFIX}
 
 pre-configure:
@@ -29,4 +24,16 @@ pre-configure:
 pre-install:
 	@cd ${WRKSRC};make sinstall
 
+post-install:
+.if !defined(NOMANCOMPRESS)
+	gzip -9nf ${PREFIX}/man/man1/scotty.1
+	gzip -9nf ${PREFIX}/man/man1/scwish.1
+	gzip -9nf ${PREFIX}/man/man8/ntping.8
+	gzip -9nf ${PREFIX}/man/man8/straps.8
+	gzip -9nf ${PREFIX}/man/mann/msqltcl.n
+	gzip -9nf ${PREFIX}/man/mann/cmiptcl.n
+	gzip -9nf ${PREFIX}/man/mann/gdmotcl.n
+.endif
+
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/scotty3/distinfo b/net-mgmt/scotty3/distinfo
index c33c771a111c..18d0698df19b 100644
--- a/net-mgmt/scotty3/distinfo
+++ b/net-mgmt/scotty3/distinfo
@@ -1,3 +1 @@
-MD5 (scotty-1.2.0.tar.gz) = bbbb9204559865e4faf3e874c66d2bb6
-MD5 (scotty-1.2.0-1.2.1.diff.gz) = b79a0aa88eaa40290d80c71e1f12da46
-MD5 (scotty-1.2.1-1.2.2.diff.gz) = 35eea98bd4696718c73422cce462d038
+MD5 (scotty-2.0.2.tar.gz) = cec44570d81a285869c77dc0322ff72f
diff --git a/net-mgmt/scotty3/files/patch-aa b/net-mgmt/scotty3/files/patch-aa
new file mode 100644
index 000000000000..163b9f8b840a
--- /dev/null
+++ b/net-mgmt/scotty3/files/patch-aa
@@ -0,0 +1,58 @@
+--- configure.orig	Wed Jun  5 08:06:34 1996
++++ configure	Wed Jun  5 11:27:59 1996
+@@ -938,7 +938,7 @@
+ 
+ dynamic=0
+ # Extract the first word of "tclsh", so it can be a program name with args.
+-set dummy tclsh; ac_word=$2
++set dummy tclsh7.4; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ if eval "test \"`echo '$''{'ac_cv_prog_have_tclsh'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1026,7 +1026,7 @@
+ echo $ac_n "checking for tcl version number""... $ac_c" 1>&6
+ tcl_major_version=`awk '/TCL_MAJOR_VERSION/ {print $3}' $f/tcl.h`
+ tcl_minor_version=`awk '/TCL_MINOR_VERSION/ {print $3}' $f/tcl.h`
+-tcl_version="$tcl_major_version.$tcl_minor_version"
++tcl_version="$tcl_major_version$tcl_minor_version"
+ echo "$ac_t"""$tcl_version"" 1>&6
+ 
+ if test 7 -ne $tcl_major_version ; then
+@@ -1038,9 +1038,9 @@
+ 
+ for f in $tcl_library $scotty_cv_path_tcl_lib $prefix/lib /usr/local/tk4.0/lib /usr/local/lib /usr/lib ; do
+     echo $ac_n "checking for libtcl$tcl_version in $f""... $ac_c" 1>&6
+-    if test -f "$f/libtcl$tcl_version.a" ; then
++    if test -f "$f/libtcl$tcl_version.so.1.0" ; then
+ 	scotty_cv_path_tcl_lib=$f
+-        TCL_LIB="$TCL_LIB $f/libtcl$tcl_version.a"
++        TCL_LIB="-L$f $TCL_LIB -ltcl$tcl_version"
+         echo "$ac_t""yes" 1>&6
+ 	break
+     else
+@@ -1112,21 +1112,21 @@
+ echo $ac_n "checking for tk version number""... $ac_c" 1>&6
+ tk_major_version=`awk '/TK_MAJOR_VERSION/ {print $3}' $f/tk.h`
+ tk_minor_version=`awk '/TK_MINOR_VERSION/ {print $3}' $f/tk.h`
+-tk_version="$tk_major_version.$tk_minor_version"
++tk_version="$tk_major_version$tk_minor_version"
+ echo "$ac_t"""$tk_version"" 1>&6
+ 
+ if test 4 -ne $tk_major_version ; then
+     { echo "configure: error: "tk 4.0 or later needed"" 1>&2; exit 1; }
+ fi
+ if test 0 -gt $tk_minor_version ; then
+-    { echo "configure: error: "tcl 4.0 or later needed"" 1>&2; exit 1; }
++    { echo "configure: error: "tk 4.0 or later needed"" 1>&2; exit 1; }
+ fi
+ 
+ for f in $tk_library $scotty_cv_path_tk_lib $tcl_library $prefix/lib /usr/local/tk4.0/lib /usr/local/lib /usr/lib /usr/X386/lib /usr/X11/lib ; do
+     echo $ac_n "checking for libtk$tk_version in $f""... $ac_c" 1>&6
+-    if test -f "$f/libtk$tk_version.a" ; then
++    if test -f "$f/libtk$tk_version.so.1.0" ; then
+ 	scotty_cv_path_tk_lib=$f
+-        TK_LIB="$f/libtk$tk_version.a"
++        TK_LIB="-L $f -ltk$tk_version"
+         echo "$ac_t""yes" 1>&6
+ 	break
+     else
diff --git a/net-mgmt/scotty3/pkg-comment b/net-mgmt/scotty3/pkg-comment
index 2dbef27b9187..26a525b455de 100644
--- a/net-mgmt/scotty3/pkg-comment
+++ b/net-mgmt/scotty3/pkg-comment
@@ -1 +1 @@
-scotty - network management extensions to tcl v1.2.0, patched to v1.2.2
+scotty - network management extensions to tcl v2.0.2
diff --git a/net-mgmt/scotty3/pkg-plist b/net-mgmt/scotty3/pkg-plist
index 55c4f13ebaa0..94b2c23e5bee 100644
--- a/net-mgmt/scotty3/pkg-plist
+++ b/net-mgmt/scotty3/pkg-plist
@@ -1,14 +1,165 @@
-@cwd /usr/local
+@cwd /usr/local/
 @mode 755
-bin/scotty
-bin/scwish
 bin/straps
 bin/ntping
-@mode 444
-man/man1/scotty.1
-man/man1/scwish.1
-man/man8/ntping.8
-man/man8/straps.8
+@owner root
+@mode 4755
+bin/scotty
+bin/scwish
+@owner
 @mode 644
-lib/tkined
-lib/scotty
+include/scotty.h
+lib/scotty/init.tcl
+lib/scotty/library/README
+lib/scotty/library/dialog.tcl
+lib/scotty/library/output.tcl
+lib/scotty/library/snmp.tcl
+lib/scotty/library/ifload.tcl
+lib/scotty/library/tclIndex
+lib/scotty/agents/README
+lib/scotty/agents/tclIndex
+lib/scotty/agents/tubs.tcl
+lib/scotty/agents/mlm.tcl
+lib/scotty/agents/mlm_scripts.tcl
+lib/scotty/agents/http.tcl
+lib/scotty/agents/www.tcl
+lib/scotty/gdmos/OIM.gdmo
+lib/scotty/gdmos/X721.gdmo
+lib/scotty/gdmos/X722.gdmo
+lib/scotty/gdmos/X739.gdmo
+lib/scotty/gdmos/README
+lib/scotty/mibs/cisco.mib
+lib/scotty/mibs/hp-unix.mib
+lib/scotty/mibs/mlm.mib
+lib/scotty/mibs/ncd.mib
+lib/scotty/mibs/rfc1213.mib
+lib/scotty/mibs/rfc1315.mib
+lib/scotty/mibs/rfc1406.mib
+lib/scotty/mibs/rfc1407.mib
+lib/scotty/mibs/rfc1414.mib
+lib/scotty/mibs/rfc1447.mib
+lib/scotty/mibs/rfc1450.mib
+lib/scotty/mibs/rfc1451.mib
+lib/scotty/mibs/rfc1471.mib
+lib/scotty/mibs/rfc1493.mib
+lib/scotty/mibs/rfc1512.mib
+lib/scotty/mibs/rfc1513.mib
+lib/scotty/mibs/rfc1514.mib
+lib/scotty/mibs/rfc1515.mib
+lib/scotty/mibs/rfc1516.mib
+lib/scotty/mibs/rfc1525.mib
+lib/scotty/mibs/rfc1565.mib
+lib/scotty/mibs/rfc1566.mib
+lib/scotty/mibs/rfc1567.mib
+lib/scotty/mibs/rfc1573.mib
+lib/scotty/mibs/README
+lib/scotty/mibs/rfc1595.mib
+lib/scotty/mibs/rfc1596.mib
+lib/scotty/mibs/rfc1611.mib
+lib/scotty/mibs/rfc1612.mib
+lib/scotty/mibs/rfc1650.mib
+lib/scotty/mibs/rfc1658.mib
+lib/scotty/mibs/rfc1659.mib
+lib/scotty/mibs/rfc1660.mib
+lib/scotty/mibs/rfc1694.mib
+lib/scotty/mibs/rfc1695.mib
+lib/scotty/mibs/rfc1696.mib
+lib/scotty/mibs/rfc1697.mib
+lib/scotty/mibs/rfc1724.mib
+lib/scotty/mibs/rfc1747.mib
+lib/scotty/mibs/rfc1748.mib
+lib/scotty/mibs/rfc1749.mib
+lib/scotty/mibs/rfc1757.mib
+lib/scotty/mibs/rfc1759.mib
+lib/scotty/mibs/rfc1792.mib
+lib/scotty/mibs/synoptics.mib
+lib/scotty/mibs/tubs.mib
+lib/scotty/mibs/unix.mib
+lib/scotty/mibs/usec.mib
+lib/scotty/mibs/wellfleet.mib
+lib/scotty/mibs/rfc1155.smi
+lib/scotty/mibs/rfc1442.smi
+lib/scotty/mibs/rfc1573.smi
+lib/scotty/mibs/rfc1443.tc
+lib/scotty/unknown-os/rfc1155.smi.idy
+lib/scotty/unknown-os/rfc1442.smi.idy
+lib/scotty/unknown-os/rfc1443.tc.idy
+lib/scotty/unknown-os/rfc1447.mib.idy
+lib/scotty/unknown-os/rfc1450.mib.idy
+lib/scotty/unknown-os/rfc1213.mib.idy
+lib/scotty/unknown-os/usec.mib.idy
+lib/scotty/unknown-os/rfc1315.mib.idy
+lib/scotty/unknown-os/rfc1406.mib.idy
+lib/scotty/unknown-os/rfc1407.mib.idy
+lib/scotty/unknown-os/rfc1414.mib.idy
+lib/scotty/unknown-os/rfc1451.mib.idy
+lib/scotty/unknown-os/rfc1471.mib.idy
+lib/scotty/unknown-os/rfc1493.mib.idy
+lib/scotty/unknown-os/rfc1757.mib.idy
+lib/scotty/unknown-os/rfc1512.mib.idy
+lib/scotty/unknown-os/rfc1513.mib.idy
+lib/scotty/unknown-os/rfc1514.mib.idy
+lib/scotty/unknown-os/rfc1515.mib.idy
+lib/scotty/unknown-os/rfc1516.mib.idy
+lib/scotty/unknown-os/rfc1525.mib.idy
+lib/scotty/unknown-os/rfc1565.mib.idy
+lib/scotty/unknown-os/rfc1566.mib.idy
+lib/scotty/unknown-os/rfc1567.mib.idy
+lib/scotty/unknown-os/rfc1573.smi.idy
+lib/scotty/unknown-os/rfc1573.mib.idy
+lib/scotty/unknown-os/rfc1595.mib.idy
+lib/scotty/unknown-os/rfc1596.mib.idy
+lib/scotty/unknown-os/rfc1611.mib.idy
+lib/scotty/unknown-os/rfc1612.mib.idy
+lib/scotty/unknown-os/rfc1650.mib.idy
+lib/scotty/unknown-os/rfc1658.mib.idy
+lib/scotty/unknown-os/rfc1659.mib.idy
+lib/scotty/unknown-os/rfc1660.mib.idy
+lib/scotty/unknown-os/rfc1694.mib.idy
+lib/scotty/unknown-os/rfc1695.mib.idy
+lib/scotty/unknown-os/rfc1696.mib.idy
+lib/scotty/unknown-os/rfc1697.mib.idy
+lib/scotty/unknown-os/rfc1724.mib.idy
+lib/scotty/unknown-os/rfc1747.mib.idy
+lib/scotty/unknown-os/rfc1748.mib.idy
+lib/scotty/unknown-os/rfc1749.mib.idy
+lib/scotty/unknown-os/rfc1759.mib.idy
+lib/scotty/unknown-os/rfc1792.mib.idy
+lib/scotty/unknown-os/tubs.mib.idy
+lib/scotty/unknown-os/mlm.mib.idy
+lib/tkined/apps/manager.tcl
+lib/tkined/apps/event.tcl
+lib/tkined/apps/movie.tcl
+lib/tkined/apps/bones.tcl
+lib/tkined/apps/ip_trouble.tcl
+lib/tkined/apps/ip_monitor.tcl
+lib/tkined/apps/ip_layout.tcl
+lib/tkined/apps/ip_discover.tcl
+lib/tkined/apps/ip_world.tcl
+lib/tkined/apps/snmp_trouble.tcl
+lib/tkined/apps/snmp_monitor.tcl
+lib/tkined/apps/snmp_browser.tcl
+lib/tkined/apps/snmp_host.tcl
+lib/tkined/apps/snmp_cisco.tcl
+lib/tkined/apps/snmp_hp.tcl
+lib/tkined/apps/snmp_tubs.tcl
+lib/tkined/apps/cmip_trouble.tcl
+lib/tkined/apps/clock.tcl
+lib/tkined/apps/game.tcl
+lib/tkined/apps/mibtree
+lib/tkined/apps/library.tcl
+lib/tkined/apps/tclIndex
+lib/tkined/apps/world-map.xbm
+lib/tkined/apps/usa-map.xbm
+lib/tkined/apps/germany-map.xbm
+lib/tkined/apps/locations
+lib/tkined/apps/README
+lib/libscotty.a
+@mode 444
+man/man1/scotty.1.gz
+man/man1/scwish.1.gz
+man/man8/ntping.8.gz
+man/man8/straps.8.gz
+man/mann/msqltcl.n.gz
+man/mann/cmiptcl.n.gz
+man/mann/gdmotcl.n.gz