A number of changes and fixes:

	. build with or without TK (triggered by the NO_X knob)
	. build against TCL-8.3 -- with or without stubs
	. fix some bugs in the core Scotty code -- most notably
	  a bug in the icmp-command implementation, where an off-by-one
	  error in the argument processing loop resulted in random
	  crashes; all this fixes are grouped into a single file
	  patch-fixes
	. make scotty executable itself as small as it needs to be

Approved by:	maintainer

Perhaps, some  day the security officer  will tell me what  _exactly_ is
wrong with  regular Scotty (this  one is beta  of the new  version), and
I'll be able to freshen that one up too and remove the FORBIDDEN.

6 files changed, 345 insertions, 196 deletions

diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index 1b03289..bb9ae82 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -7,28 +7,60 @@
 
 PORTNAME=	scotty
 PORTVERSION=	20000221
-CATEGORIES=	net tk82
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/devel/
 DISTNAME=	${PORTNAME}-00-02-21
 
 MAINTAINER=	ozz@FreeBSD.org.ru
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
+.ifdef (NO_X)
+PKGNAMESUFFIX=	-nox11
+LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
+.else
+LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
+.endif
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.2 \
-		--with-tk=${PREFIX}/lib/tk8.2
+CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.3 \
+		--enable-multicast
+
+.ifdef (NO_X)
+CONFIGURE_ARGS+=--with-tk=no
+.else
+CONFIGURE_ARGS+=--with-tk=${PREFIX}/lib/tk8.3
+CONFIGURE_ENV+=	wish=${PREFIX}/bin/wish8.3
+.endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-MAN1=		tkined.1 scotty.1
+MAN1=		scotty.1
 MAN8=		nmicmpd.8 nmtrapd.8
 MANN=		Tnm.n TnmDialog.n TnmDisman.n TnmEther.n TnmIetf.n\
 		TnmInet.n TnmMap.n TnmMib.n TnmSnmp.n TnmTerm.n\
-		dns.n icmp.n ined.n job.n map.n mib.n netdb.n \
+		dns.n icmp.n job.n map.n mib.n netdb.n \
 		ntp.n snmp.n sunrpc.n syslog.n udp.n
 PLIST_SUB=	SCOTTY_VERSION=3.0.0 TKINED_VERSION=1.5.0
 
-pre-install:
-	@cd ${WRKSRC}; make sinstall
+MAKE_ARGS+=	-j2	# better than -j1 on all machines...
+INSTALL_TARGET=	tnm-install sinstall
+
+.if !defined(NO_X)
+MAN1+=		tkined.1
+MANN+=		ined.n
+PLIST_SUB+=	X11=''
+INSTALL_TARGET+=tki-install
+.else
+PLIST_SUB+=	X11='@comment '
+.endif
+
+post-patch:
+	${MV} ${WRKSRC}/scotty.c ${WRKSRC}/scotty.c.orig
+	${CP} -p ${FILESDIR}/scotty.c ${WRKSRC}/scotty.c
+
+post-install:
+	${RM} -f ${PREFIX}/bin/scotty ${PREFIX}/bin/tkined
+	${LN} -s scotty3.0.0 ${PREFIX}/bin/scotty
+.ifndef NO_X
+	${LN} -s tkined1.5.0 ${PREFIX}/bin/tkined
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/scotty3/files/patch-ac b/net/scotty3/files/patch-ac
index 777ab9f..cc56459 100644
--- a/net/scotty3/files/patch-ac
+++ b/net/scotty3/files/patch-ac
@@ -1,22 +1,23 @@
---- Makefile.in.orig	Thu Feb 17 01:08:00 2000
-+++ Makefile.in	Wed Jun  7 16:07:39 2000
-@@ -500,11 +500,11 @@
- 	pwd=`pwd`; cd $(TNM_TEST_DIR); $$pwd/scotty all.tcl
+--- Makefile.in	Wed Feb 16 11:08:00 2000
++++ Makefile.in	Thu Mar  8 19:20:25 2001
+@@ -56,7 +56,7 @@
  
- install: @INSTALL_TARGETS@
--	@echo ""
--	@echo "The Tnm extension includes two programs (nmicmpd, nmtrapd)"
--	@echo "which require root permissions. Please get root permissions"
--	@echo "and type >> make sinstall << to install them setuid root."
--	@echo ""
-+#	@echo ""
-+#	@echo "The Tnm extension includes two programs (nmicmpd, nmtrapd)"
-+#	@echo "which require root permissions. Please get root permissions"
-+#	@echo "and type >> make sinstall << to install them setuid root."
-+#	@echo ""
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+-CFLAGS = -O
++CFLAGS = @CFLAGS@
  
- install-bin: tnm-install-bin tki-install-bin
+ # NMICMPD should contain the full path to the installed nmicmpd binary.
+ NMICMPD = $(BIN_INSTALL_DIR)/nmicmpd
+@@ -473,7 +473,7 @@
+ 	$(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
  
+ tnm$(SHLIB_SUFFIX): $(TNM_OBJS)
+-	$(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) $(LIBS)
++	$(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) @NEED_TCL_LIB@ $(LIBS)
+ 
+ tkined: tkined$(SHLIB_SUFFIX) $(UNIX_DIR)/tkined.in
+ 	@sed -e 's+%WISH%+$(TK_WISH)+' \
 @@ -528,7 +528,7 @@
  	@$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
  	@$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
diff --git a/net/scotty3/files/patch-ad b/net/scotty3/files/patch-ad
index 4b43418..e09d45d 100644
--- a/net/scotty3/files/patch-ad
+++ b/net/scotty3/files/patch-ad
@@ -1,6 +1,6 @@
---- configure.orig     Wed Feb 16 19:08:00 2000
-+++ configure  Tue Jun  6 03:36:37 2000
-@@ -749,7 +749,7 @@
+--- configure	Wed Feb 16 11:08:00 2000
++++ configure	Thu Mar  8 19:22:52 2001
+@@ -749,9 +749,14 @@
  LD_FLAGS=$TCL_LD_FLAGS
  LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
  TCL_EXEC_PREFIX=$TCL_EXEC_PREFIX
@@ -8,8 +8,34 @@
 +TCL_INCLUDES=-I$TCL_PREFIX/include/tcl$TCL_VERSION
  TK_EXEC_PREFIX=$TK_EXEC_PREFIX
  
++if /usr/bin/ldd ${prefix}/bin/tclsh$TCL_VERSION | fgrep -qv libtcl; then
++	CFLAGS="$CFLAGS -DUSE_TCL_STUBS"
++	NEED_TCL_LIB=$TCL_LIB_SPEC
++fi
++
  if test $TCL_SHARED_BUILD -ne 1 ; then
-@@ -842,7 +842,7 @@
+     { echo "configure: error: Tcl is not configured with --enable-shared" 1>&2; exit 1; }
+ fi
+@@ -763,8 +767,8 @@
+ echo $ac_n "checking for tcl version""... $ac_c" 1>&6
+ echo "configure:765: checking for tcl version" >&5
+ echo "$ac_t"""$TCL_VERSION"" 1>&6
+-if test "$TCL_VERSION" != "8.2" ; then
+-    { echo "configure: error: "Tcl version 8.2 needed"" 1>&2; exit 1; }
++if test "$TCL_VERSION" \< "8.2" ; then
++    { echo "configure: error: "Tcl version at least 8.2 needed"" 1>&2; exit 1; }
+ fi
+ 
+ BUILD_TARGETS="$BUILD_TARGETS scotty"
+@@ -821,6 +825,7 @@
+ fi
+ 
+ 
++if test x$tnm_path_tk_config != xno; then
+ dirs="$tnm_path_tk_config $wish_prefix/lib $prefix/lib /usr/local/lib"
+ 
+ found=0
+@@ -842,7 +847,7 @@
      echo "configure: warning: "will not build tkined"" 1>&2
  else
      . $tnm_cv_path_tk_config/tkConfig.sh
@@ -18,3 +44,28 @@
      if test "$TK_INCLUDES" = "$TCL_INCLUDES" ; then
          TK_INCLUDES=""
      fi
+@@ -850,13 +855,14 @@
+     echo $ac_n "checking for tk version""... $ac_c" 1>&6
+ echo "configure:852: checking for tk version" >&5
+     echo "$ac_t"""$TK_VERSION"" 1>&6
+-    if test "$TK_VERSION" != "8.2" ; then
+-        { echo "configure: error: "Tk version 8.2 needed"" 1>&2; exit 1; }
++    if test "$TK_VERSION" \< "8.2" ; then
++        { echo "configure: error: "Tk version at least 8.2 needed"" 1>&2; exit 1; }
+     fi
+ 
+     BUILD_TARGETS="$BUILD_TARGETS tkined"
+     INSTALL_TARGETS="$INSTALL_TARGETS tki-install"
+ fi
++fi	# --with-tk=<something other than ``no''>
+ 
+ #----------------------------------------------------------------------------
+ #       Check for some basic stuff. We don't check for the compiler.
+@@ -3318,6 +3324,7 @@
+ s%@DEFS@%$DEFS%g
+ s%@LDFLAGS@%$LDFLAGS%g
+ s%@LIBS@%$LIBS%g
++s%@NEED_TCL_LIB@%$NEED_TCL_LIB%g
+ s%@exec_prefix@%$exec_prefix%g
+ s%@prefix@%$prefix%g
+ s%@program_transform_name@%$program_transform_name%g
diff --git a/net/scotty3/files/patch-fixes b/net/scotty3/files/patch-fixes
new file mode 100644
index 0000000..0940c7e
--- /dev/null
+++ b/net/scotty3/files/patch-fixes
@@ -0,0 +1,38 @@
+This patches fix actual BUGS in the Scotty code:
+	. any Tcl above 8.2 will also work fine;
+	. icmp.test no longer causes crashes -- an off-by-one
+	  error in argument parsing code was the reason for
+	  occasional segfaults
+	. TUBS-REGISTRATION was renamed to TUBS-SMI, but the
+	  mibs.test did not know about it
+There still are some test failures, but  I think (hope), they are due to
+mistakes in the tests themselves.
+
+	-mi
+
+--- ../tnm/generic/tnmInit.c	Wed Oct  6 05:35:57 1999
++++ ../tnm/generic/tnmInit.c	Thu Mar  8 19:49:33 2001
+@@ -431,3 +431,3 @@
+ #ifdef USE_TCL_STUBS
+-    if (Tcl_InitStubs(interp, "8.2", 1) == NULL) {
++    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
+ 	return TCL_ERROR;
+--- ../tnm/generic/tnmIcmp.c	Wed Oct  6 05:07:04 1999
++++ ../tnm/generic/tnmIcmp.c	Fri Mar  9 17:58:05 2001
+@@ -273,6 +273,6 @@
+      * Parse the options.
+      */
+ 
+-    while (1) {
++    while (x < objc) {
+ 	code = TnmGetTableKeyFromObj(interp, icmpOptionTable,
+ 				     objv[x], "option");
+--- ../tnm/tests/mib.test	Fri Feb 11 14:43:38 2000
++++ ../tnm/tests/mib.test	Fri Mar  9 18:25:48 2001
+@@ -30,1 +30,1 @@
+-lappend tnm(mibs) TUBS-REGISTRATION TUBS-IBR-TEST-MIB
++lappend tnm(mibs) TUBS-SMI TUBS-IBR-TEST-MIB
+@@ -689,2 +689,2 @@
+     mib info files *SMI
+-} {RFC1155-SMI SNMPv2-SMI}
++} {RFC1155-SMI SNMPv2-SMI TUBS-SMI}
diff --git a/net/scotty3/files/scotty.c b/net/scotty3/files/scotty.c
new file mode 100644
index 0000000..375cd2a
--- /dev/null
+++ b/net/scotty3/files/scotty.c
@@ -0,0 +1,27 @@
+/* All that's needed for bin/scotty, really...	-mi */
+
+#include "tnmInt.h"
+
+static int
+Tcl_AppInit(interp)
+	Tcl_Interp *interp;
+{
+	if (Tcl_Init(interp) != TCL_OK) {
+		return TCL_ERROR;
+	}
+
+	if (Tcl_PkgRequire(interp, "Tnm", TNM_VERSION, 1) == NULL) {
+		return TCL_ERROR;
+	}
+
+	Tcl_SetVar(interp, "tcl_rcFileName", "~/.tclshrc", TCL_GLOBAL_ONLY);
+	return TCL_OK;
+}
+
+int
+main(argc, argv)
+	int argc;
+	char **argv;
+{
+	Tcl_Main(argc, argv, Tcl_AppInit);
+}
diff --git a/net/scotty3/pkg-plist b/net/scotty3/pkg-plist
index 484c0f9..600a909 100644
--- a/net/scotty3/pkg-plist
+++ b/net/scotty3/pkg-plist
@@ -1,9 +1,9 @@
 bin/nmicmpd
 bin/nmtrapd
-bin/scotty
 bin/scotty%%SCOTTY_VERSION%%
-bin/tkined
-bin/tkined%%TKINED_VERSION%%
+bin/scotty
+%%X11%%bin/tkined
+%%X11%%bin/tkined%%TKINED_VERSION%%
 lib/tnm%%SCOTTY_VERSION%%/mibs/ACCOUNTING-CONTROL-MIB
 lib/tnm%%SCOTTY_VERSION%%/mibs/ADSL-LINE-MIB
 lib/tnm%%SCOTTY_VERSION%%/mibs/ADSL-TC-MIB
@@ -201,171 +201,171 @@ lib/tnm%%SCOTTY_VERSION%%/examples/yanny
 lib/tnm%%SCOTTY_VERSION%%/examples/yanny.n
 lib/tnm%%SCOTTY_VERSION%%/site/init.tcl
 lib/tnm%%SCOTTY_VERSION%%.so
-lib/tkined%%TKINED_VERSION%%/pkgIndex.tcl
-lib/tkined%%TKINED_VERSION%%/tkined.defaults
-lib/tkined%%TKINED_VERSION%%/library/Command.tcl
-lib/tkined%%TKINED_VERSION%%/library/Diagram.tcl
-lib/tkined%%TKINED_VERSION%%/library/Dialog.tcl
-lib/tkined%%TKINED_VERSION%%/library/Editor.tcl
-lib/tkined%%TKINED_VERSION%%/library/Event.tcl
-lib/tkined%%TKINED_VERSION%%/library/Help.tcl
-lib/tkined%%TKINED_VERSION%%/library/Misc.tcl
-lib/tkined%%TKINED_VERSION%%/library/Objects.tcl
-lib/tkined%%TKINED_VERSION%%/library/Tool.tcl
-lib/tkined%%TKINED_VERSION%%/library/pkgIndex.tcl
-lib/tkined%%TKINED_VERSION%%/bitmaps/Box.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/BoxMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/DEC-Server.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/DEC-ServerMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/DEC.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/DECMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/HP.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/HP7550.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/HP7550Mask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/HPMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/HPdj.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/HPdjMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/HPsj.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/HPsjMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/IPC.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/IPCMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-client.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-clientMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-server.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-serverMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/RS6000.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/RS6000Mask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/SLC.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/SLCMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/SUN-Server.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/SUN-ServerMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/SUN3.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/SUN3Mask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/SparcStation.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/SparcStationMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/Xstation.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/XstationMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/action.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/actionMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/backbone.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/backboneMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/bigBox.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/bigBoxMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/bone.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/boneMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/bridge.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/bridgeMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/bus.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/busMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/cisco.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/ciscoMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/clock.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/clockMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/concent.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/concentMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/connector.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/connectorMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/corner.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/explode.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/explodeMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/graph.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/group.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/groupMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/hand.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/handMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/hyper.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/hyperMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/icon.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/ined.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/inedMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/laser.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/laserMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/link.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/linkMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/locker.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/lockerMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/mac.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/macMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/machine.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/machineMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/modem.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/modemMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/mx.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/mxMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/network.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/networkMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/node.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/nodeMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/noicon.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/octane.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/octaneMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/parsytec.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/parsytecMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/pc.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/pcMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/phone.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/phoneMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/pointer.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/pointerMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/printer.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/printerMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/pserver.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/pserverMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/reference.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/referenceMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/ring.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/ringMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/router.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/routerMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/smallBox.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/smallBoxMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/spock.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/switch.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/switchMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/text.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/textMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/tkined.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/tkinedMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/tserver.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/tserverMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/unixpc.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/unixpcMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/world.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/worldMask.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/zoomin.xbm
-lib/tkined%%TKINED_VERSION%%/bitmaps/zoomout.xbm
-lib/tkined%%TKINED_VERSION%%/apps/README
-lib/tkined%%TKINED_VERSION%%/apps/clock.tcl
-lib/tkined%%TKINED_VERSION%%/apps/event.tcl
-lib/tkined%%TKINED_VERSION%%/apps/game.tcl
-lib/tkined%%TKINED_VERSION%%/apps/germany-map.xbm
-lib/tkined%%TKINED_VERSION%%/apps/ip_discover.tcl
-lib/tkined%%TKINED_VERSION%%/apps/ip_layout.tcl
-lib/tkined%%TKINED_VERSION%%/apps/ip_monitor.tcl
-lib/tkined%%TKINED_VERSION%%/apps/ip_trouble.tcl
-lib/tkined%%TKINED_VERSION%%/apps/ip_world.tcl
-lib/tkined%%TKINED_VERSION%%/apps/library.tcl
-lib/tkined%%TKINED_VERSION%%/apps/locations
-lib/tkined%%TKINED_VERSION%%/apps/manager.tcl
-lib/tkined%%TKINED_VERSION%%/apps/mibtree
-lib/tkined%%TKINED_VERSION%%/apps/movie.tcl
-lib/tkined%%TKINED_VERSION%%/apps/netherlands-map.xbm
-lib/tkined%%TKINED_VERSION%%/apps/snmp_browser.tcl
-lib/tkined%%TKINED_VERSION%%/apps/snmp_cisco.tcl
-lib/tkined%%TKINED_VERSION%%/apps/snmp_config.tcl
-lib/tkined%%TKINED_VERSION%%/apps/snmp_disman.tcl
-lib/tkined%%TKINED_VERSION%%/apps/snmp_host.tcl
-lib/tkined%%TKINED_VERSION%%/apps/snmp_hp.tcl
-lib/tkined%%TKINED_VERSION%%/apps/snmp_monitor.tcl
-lib/tkined%%TKINED_VERSION%%/apps/snmp_trouble.tcl
-lib/tkined%%TKINED_VERSION%%/apps/usa-map.xbm
-lib/tkined%%TKINED_VERSION%%/apps/world-map.xbm
-lib/tkined%%TKINED_VERSION%%/apps/tclIndex
-lib/tkined%%TKINED_VERSION%%.so
-@dirrm lib/tkined%%TKINED_VERSION%%/library
-@dirrm lib/tkined%%TKINED_VERSION%%/bitmaps
-@dirrm lib/tkined%%TKINED_VERSION%%/apps
-@dirrm lib/tkined%%TKINED_VERSION%%
+%%X11%%lib/tkined%%TKINED_VERSION%%/pkgIndex.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/tkined.defaults
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/Command.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/Diagram.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/Dialog.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/Editor.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/Event.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/Help.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/Misc.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/Objects.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/Tool.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/library/pkgIndex.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/Box.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/BoxMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/DEC-Server.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/DEC-ServerMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/DEC.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/DECMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HP.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HP7550.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HP7550Mask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPdj.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPdjMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPsj.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/HPsjMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/IPC.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/IPCMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-client.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-clientMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-server.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/NFS-serverMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/RS6000.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/RS6000Mask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SLC.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SLCMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SUN-Server.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SUN-ServerMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SUN3.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SUN3Mask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SparcStation.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/SparcStationMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/Xstation.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/XstationMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/action.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/actionMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/backbone.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/backboneMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bigBox.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bigBoxMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bone.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/boneMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bridge.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bridgeMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/bus.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/busMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/cisco.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/ciscoMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/clock.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/clockMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/concent.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/concentMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/connector.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/connectorMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/corner.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/explode.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/explodeMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/graph.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/group.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/groupMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/hand.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/handMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/hyper.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/hyperMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/icon.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/ined.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/inedMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/laser.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/laserMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/link.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/linkMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/locker.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/lockerMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/mac.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/macMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/machine.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/machineMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/modem.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/modemMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/mx.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/mxMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/network.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/networkMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/node.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/nodeMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/noicon.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/octane.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/octaneMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/parsytec.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/parsytecMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pc.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pcMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/phone.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/phoneMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pointer.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pointerMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/printer.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/printerMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pserver.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/pserverMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/reference.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/referenceMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/ring.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/ringMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/router.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/routerMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/smallBox.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/smallBoxMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/spock.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/switch.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/switchMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/text.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/textMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/tkined.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/tkinedMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/tserver.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/tserverMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/unixpc.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/unixpcMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/world.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/worldMask.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/zoomin.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/bitmaps/zoomout.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/README
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/clock.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/event.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/game.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/germany-map.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_discover.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_layout.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_monitor.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_trouble.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/ip_world.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/library.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/locations
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/manager.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/mibtree
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/movie.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/netherlands-map.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_browser.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_cisco.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_config.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_disman.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_host.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_hp.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_monitor.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/snmp_trouble.tcl
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/usa-map.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/world-map.xbm
+%%X11%%lib/tkined%%TKINED_VERSION%%/apps/tclIndex
+%%X11%%lib/tkined%%TKINED_VERSION%%.so
+%%X11%%@dirrm lib/tkined%%TKINED_VERSION%%/library
+%%X11%%@dirrm lib/tkined%%TKINED_VERSION%%/bitmaps
+%%X11%%@dirrm lib/tkined%%TKINED_VERSION%%/apps
+%%X11%%@dirrm lib/tkined%%TKINED_VERSION%%
 @dirrm lib/tnm%%SCOTTY_VERSION%%/mibs
 @dirrm lib/tnm%%SCOTTY_VERSION%%/icons
 @dirrm lib/tnm%%SCOTTY_VERSION%%/library