Index: modules/aes/aes.tcl
==================================================================
--- modules/aes/aes.tcl
+++ modules/aes/aes.tcl
@@ -21,13 +21,12 @@
 # -------------------------------------------------------------------------
 
 package require Tcl 8.5
 
 namespace eval ::aes {
-    variable version 1.2.1
-    variable rcsid {$Id: aes.tcl,v 1.7 2010/07/06 19:39:00 andreas_kupries Exp $}
-    variable uid ; if {![info exists uid]} { set uid 0 }
+    variable uid
+    if {![info exists uid]} { set uid 0 }
 
     namespace export aes
 
     # constants
 
@@ -615,12 +614,12 @@
     return $r
 }
 
 # -------------------------------------------------------------------------
 
-package provide aes $::aes::version
+package provide aes 1.2.1
 
 # -------------------------------------------------------------------------
 # Local variables:
 # mode: tcl
 # indent-tabs-mode: nil
 # End:

Index: modules/base64/uuencode.tcl
==================================================================
--- modules/base64/uuencode.tcl
+++ modules/base64/uuencode.tcl
@@ -4,22 +4,19 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-# @(#)$Id: uuencode.tcl,v 1.22 2009/05/07 01:10:37 patthoyts Exp $
 
 package require Tcl 8.2;                # tcl minimum version
 
 # Try and get some compiled helper package.
 if {[catch {package require tcllibc}]} {
     catch {package require Trf}
 }
 
 namespace eval ::uuencode {
-    variable version 1.1.5
-
     namespace export encode decode uuencode uudecode
 }
 
 proc ::uuencode::Enc {c} {
     return [format %c [expr {($c != 0) ? (($c & 0x3f) + 0x20) : 0x60}]]
@@ -325,14 +322,14 @@
     return $result
 }
 
 # -------------------------------------------------------------------------
 
-package provide uuencode $::uuencode::version
+package provide uuencode 1.1.5
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:
 

Index: modules/base64/yencode.tcl
==================================================================
--- modules/base64/yencode.tcl
+++ modules/base64/yencode.tcl
@@ -4,20 +4,18 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-# @(#)$Id: yencode.tcl,v 1.13 2009/05/07 01:10:37 patthoyts Exp $
 
 # FUTURE: Rework to allow switching between the tcl/critcl implementations.
 
 package require Tcl 8.2;                # tcl minimum version
 catch {package require crc32};          # tcllib 1.1
 catch {package require tcllibc};        # critcl enhancements for tcllib
 
 namespace eval ::yencode {
-    variable version 1.1.3
     namespace export encode decode yencode ydecode
 }
 
 # -------------------------------------------------------------------------
 
@@ -296,14 +294,14 @@
     return $result
 }
 
 # -------------------------------------------------------------------------
 
-package provide yencode $::yencode::version
+package provide yencode 1.1.3
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:
 

Index: modules/blowfish/blowfish.tcl
==================================================================
--- modules/blowfish/blowfish.tcl
+++ modules/blowfish/blowfish.tcl
@@ -18,14 +18,14 @@
 #
 
 package require Tcl 8.2
 
 namespace eval blowfish {
-    variable version 1.0.4
-    variable rcsid {$Id: blowfish.tcl,v 1.10 2007/09/17 14:19:07 patthoyts Exp $}
-    variable uid ; if {![info exists uid]} { set uid 0 }
-    variable accel
+    variable uid
+    if {![info exists uid]} { set uid 0 }
+
+    variable  accel
     array set accel {trf 0}
 
     namespace export blowfish
 
     variable ORIG_P {
@@ -712,13 +712,13 @@
         if {[LoadAccelerator $e]} break
     }
     unset e
 }
 
-package provide blowfish $::blowfish::version
+package provide blowfish 1.0.4
 
 # -------------------------------------------------------------------------
 #
 # Local Variables:
 # mode: tcl
 # indent-tabs-mode: nil
 # End:

Index: modules/calendar/calendar.tcl
==================================================================
--- modules/calendar/calendar.tcl
+++ modules/calendar/calendar.tcl
@@ -3,21 +3,16 @@
 # calendar.tcl --
 #
 #	This file is the main 'package provide' script for the
 #   	'calendar' package.  The package provides various commands for
 #	manipulating dates and times.
-#
-# RCS:$(@) $Id: calendar.tcl,v 1.5 2004/01/15 06:36:12 andreas_kupries Exp $
 
 package require Tcl 8.2
 
 namespace eval ::calendar {
-
-    variable version 0.2
-
     variable home [file join [pwd] [file dirname [info script]]]
     if { [lsearch -exact $::auto_path $home] == -1 } {
 	lappend ::auto_path $home
     }
 
-    package provide [namespace tail [namespace current]] $version
+    package provide [namespace tail [namespace current]] 0.2
 }

Index: modules/control/control.tcl
==================================================================
--- modules/control/control.tcl
+++ modules/control/control.tcl
@@ -1,17 +1,15 @@
 # control.tcl --
 #
 #	This is the main package provide script for the package
 #	"control".  It provides commands that govern the flow of
 #	control of a program.
-#
-# RCS: @(#) $Id: control.tcl,v 1.15 2005/09/30 05:36:38 andreas_kupries Exp $
 
 package require Tcl 8.2
 
 namespace eval ::control {
-    variable version 0.1.3
+    variable version
     namespace export assert control do no-op rswitch
 
     proc control {command args} {
 	# Need to add error handling here
 	namespace eval [list $command] $args
@@ -21,7 +19,7 @@
     variable home [file join [pwd] [file dirname [info script]]]
     if {[lsearch -exact $::auto_path $home] == -1} {
 	lappend ::auto_path $home
     }
 
-    package provide [namespace tail [namespace current]] $version
+    package provide [namespace tail [namespace current]] 0.1.3
 }

Index: modules/crc/cksum.tcl
==================================================================
--- modules/crc/cksum.tcl
+++ modules/crc/cksum.tcl
@@ -9,17 +9,14 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-# $Id: cksum.tcl,v 1.11 2009/04/21 20:06:19 andreas_kupries Exp $
 
 package require Tcl 8.2;                # tcl minimum version
 
 namespace eval ::crc {
-    variable cksum_version 1.1.4
-
     namespace export cksum
 
     variable cksum_tbl [list 0x0 \
            0x04C11DB7 0x09823B6E 0x0D4326D9 0x130476DC 0x17C56B6B \
            0x1A864DB2 0x1E475005 0x2608EDB8 0x22C9F00F 0x2F8AD6D6 \
@@ -192,12 +189,12 @@
     return [format $opts(-format) $r]
 }
 
 # -------------------------------------------------------------------------
 
-package provide cksum $::crc::cksum_version
+package provide cksum 1.1.4
 
 # -------------------------------------------------------------------------
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/crc/crc16.tcl
==================================================================
--- modules/crc/crc16.tcl
+++ modules/crc/crc16.tcl
@@ -37,22 +37,18 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-# $Id: crc16.tcl,v 1.16 2012/01/23 20:28:11 patthoyts Exp $
 
 # @mdgen EXCLUDE: crcc.tcl
 
 package require Tcl 8.2;                # tcl minimum version
 
 namespace eval ::crc {
-
     namespace export crc16 crc-ccitt crc-32
 
-    variable crc16_version 1.1.2
-
     # Standard CRC generator polynomials.
     variable polynomial
     set polynomial(crc16) [expr {(1<<16) | (1<<15) | (1<<2) | 1}]
     set polynomial(ccitt) [expr {(1<<16) | (1<<12) | (1<<5) | 1}]
     set polynomial(crc32) [expr {(1<<32) | (1<<26) | (1<<23) | (1<<22)
@@ -294,13 +290,13 @@
                 $args]
 }
 
 # -------------------------------------------------------------------------
 
-package provide crc16 $crc::crc16_version
+package provide crc16 1.1.2
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/crc/crc32.tcl
==================================================================
--- modules/crc/crc32.tcl
+++ modules/crc/crc32.tcl
@@ -8,17 +8,15 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-# $Id: crc32.tcl,v 1.22 2009/05/06 22:41:08 patthoyts Exp $
 
 package require Tcl 8.2
 
 namespace eval ::crc {
-    variable crc32_version 1.3.2
-    variable accel
+    variable  accel
     array set accel {critcl 0 trf 0}
 
     namespace export crc32
 
     variable crc32_tbl [list 0x00000000 0x77073096 0xEE0E612C 0x990951BA \
@@ -367,13 +365,13 @@
         if {[LoadAccelerator $e]} break
     }
     unset e
 }
 
-package provide crc32 $::crc::crc32_version
+package provide crc32 1.3.2
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/crc/sum.tcl
==================================================================
--- modules/crc/sum.tcl
+++ modules/crc/sum.tcl
@@ -11,19 +11,17 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-# $Id: sum.tcl,v 1.8 2009/05/07 00:39:49 patthoyts Exp $
 
 package require Tcl 8.2;                # tcl minimum version
 
 catch {package require tcllibc};        # critcl enhancements to tcllib
 #catch {package require crcc};           # critcl enhanced crc module
 
 namespace eval ::crc {
-    variable sum_version 1.1.1
     namespace export sum
 
     variable uid
     if {![info exists uid]} {
         set uid 0
@@ -267,12 +265,12 @@
     return [format $opts(-format) $r]
 }
 
 # -------------------------------------------------------------------------
 
-package provide sum $::crc::sum_version
+package provide sum 1.1.1
 
 # -------------------------------------------------------------------------    
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/des/des.tcl
==================================================================
--- modules/des/des.tcl
+++ modules/des/des.tcl
@@ -15,13 +15,12 @@
 if {[catch {package require tclDES 1.0.0}]} {
     package require tclDESjr 1.0.0
 }
 
 namespace eval DES {
-    variable version 1.1.0
-    variable rcsid {$Id: des.tcl,v 1.14 2007/08/20 19:58:54 andreas_kupries Exp $}
-    variable uid ; if {![info exists uid]} { set uid 0 }
+    variable uid
+    if {![info exists uid]} { set uid 0 }
 }
 
 proc ::DES::Init {mode key iv {weak 0}} {
     variable uid
     set Key [namespace current]::[incr uid]
@@ -261,13 +260,13 @@
     return $r
 }
 
 # -------------------------------------------------------------------------
 
-package provide des $DES::version
+package provide des 1.1.0
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/devtools/testutilities.tcl
==================================================================
--- modules/devtools/testutilities.tcl
+++ modules/devtools/testutilities.tcl
@@ -1,11 +1,10 @@
 # -*- tcl -*-
 # Testsuite utilities / boilerplate
 # Copyright (c) 2006, Andreas Kupries <andreas_kupries@users.sourceforge.net>
 
 namespace eval ::tcllib::testutils {
-    variable version 1.2
     variable self    [file dirname [file join [pwd] [info script]]]
     variable tcllib  [file dirname $self]
     variable tag     ""
     variable theEnv  ; # Saved environment.
 }
@@ -716,8 +715,8 @@
 ##
 
 ::tcllib::testutils::SaveEnvironment
 
 # ### ### ### ######### ######### #########
-package provide tcllib::testutils $::tcllib::testutils::version
+package provide tcllib::testutils 1.2
 puts "- tcllib::testutils [package present tcllib::testutils]"
 return

Index: modules/dns/dns.tcl
==================================================================
--- modules/dns/dns.tcl
+++ modules/dns/dns.tcl
@@ -26,23 +26,18 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: dns.tcl,v 1.36 2008/11/22 12:28:54 mic42 Exp $
 
 package require Tcl 8.2;                # tcl minimum version
 package require logger;                 # tcllib 1.3
 package require uri;                    # tcllib 1.1
 package require uri::urn;               # tcllib 1.2
 package require ip;                     # tcllib 1.7
 
 namespace eval ::dns {
-    variable version 1.3.4
-    variable rcsid {$Id: dns.tcl,v 1.36 2008/11/22 12:28:54 mic42 Exp $}
-
     namespace export configure resolve name address cname \
         status reset wait cleanup errorcode
 
     variable options
     if {![info exists options]} {
@@ -1412,11 +1407,11 @@
 
 # -------------------------------------------------------------------------
 
 catch {dns::configure -nameserver [lindex [dns::nameservers] 0]}
 
-package provide dns $dns::version
+package provide dns 1.3.4
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   indent-tabs-mode: nil
 # End:

Index: modules/dns/ip.tcl
==================================================================
--- modules/dns/ip.tcl
+++ modules/dns/ip.tcl
@@ -6,21 +6,16 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: ip.tcl,v 1.14 2010/08/16 17:35:18 andreas_kupries Exp $
 
 # @mdgen EXCLUDE: ipMoreC.tcl
 
 package require Tcl 8.2;                # tcl minimum version
 
 namespace eval ip {
-    variable version 1.2.2
-    variable rcsid {$Id: ip.tcl,v 1.14 2010/08/16 17:35:18 andreas_kupries Exp $}
-
     namespace export is version normalize equal type contract mask collapse subtract
     #catch {namespace ensemble create}
 
     variable IPv4Ranges
     if {![info exists IPv4Ranges]} {
@@ -548,11 +543,11 @@
 
 source [file join [file dirname [info script]] ipMore.tcl]
 
 # -------------------------------------------------------------------------
 
-package provide ip $::ip::version
+package provide ip 1.2.2
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   indent-tabs-mode: nil
 # End:

Index: modules/dns/resolv.tcl
==================================================================
--- modules/dns/resolv.tcl
+++ modules/dns/resolv.tcl
@@ -14,19 +14,14 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: resolv.tcl,v 1.9 2004/01/25 07:29:39 andreas_kupries Exp $
 
 package require dns 1.0;                # tcllib 1.3
 
 namespace eval ::resolv {
-    variable version 1.0.3
-    variable rcsid {$Id: resolv.tcl,v 1.9 2004/01/25 07:29:39 andreas_kupries Exp $}
-
     namespace export resolve init ignore hostname
 
     variable R
     if {![info exists R]} {
         array set R {
@@ -244,11 +239,11 @@
     return $ip
 }
 
 # -------------------------------------------------------------------------
 
-package provide resolv $::resolv::version
+package provide resolv 1.0.3
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   indent-tabs-mode: nil
 # End:

Index: modules/dns/spf.tcl
==================================================================
--- modules/dns/spf.tcl
+++ modules/dns/spf.tcl
@@ -17,24 +17,19 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: spf.tcl,v 1.5 2008/03/14 21:21:12 andreas_kupries Exp $
 
 package require Tcl 8.2;                # tcl minimum version
 package require dns;                    # tcllib 1.3
 package require logger;                 # tcllib 1.3
 package require ip;                     # tcllib 1.7
 package require struct::list;           # tcllib 1.7
 package require uri::urn;               # tcllib 1.3
 
 namespace eval spf {
-    variable version 1.1.1
-    variable rcsid {$Id: spf.tcl,v 1.5 2008/03/14 21:21:12 andreas_kupries Exp $}
-
     namespace export spf
 
     variable uid
     if {![info exists uid]} {set uid 0}
 
@@ -523,11 +518,11 @@
 }
 
     
 # -------------------------------------------------------------------------
 
-package provide spf $::spf::version
+package provide spf 1.1.1
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   indent-tabs-mode: nil
 # End:

Index: modules/http/autoproxy.tcl
==================================================================
--- modules/http/autoproxy.tcl
+++ modules/http/autoproxy.tcl
@@ -17,20 +17,16 @@
 #   http::data $tok
 #
 # To support https add:
 #   package require tls
 #   http::register https 443 ::autoproxy::tls_socket
-#
-# @(#)$Id: autoproxy.tcl,v 1.15 2012/05/28 20:30:32 andreas_kupries Exp $
 
 package require http;                   # tcl
 package require uri;                    # tcllib
 package require base64;                 # tcllib
 
 namespace eval ::autoproxy {
-    variable rcsid {$Id: autoproxy.tcl,v 1.15 2012/05/28 20:30:32 andreas_kupries Exp $}
-    variable version 1.5.3
     variable options
 
     if {! [info exists options]} {
         array set options {
             proxy_host ""
@@ -531,13 +527,13 @@
     return $s
 }
 
 # -------------------------------------------------------------------------
 
-package provide autoproxy $::autoproxy::version
+package provide autoproxy 1.5.3
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/irc/irc.tcl
==================================================================
--- modules/irc/irc.tcl
+++ modules/irc/irc.tcl
@@ -2,24 +2,20 @@
 #
 #	irc implementation for Tcl.
 #
 # Copyright (c) 2001-2003 by David N. Welton <davidw@dedasys.com>.
 # This code may be distributed under the same terms as Tcl.
-#
-# $Id: irc.tcl,v 1.27 2008/08/05 20:40:04 andreas_kupries Exp $
 
 package require Tcl 8.3
 
 namespace eval ::irc {
-    variable version 0.6.1
-
     # counter used to differentiate connections
     variable conn 0
     variable config
     variable irctclfile [info script]
     array set config {
-        debug 0
+        debug  0
         logger 0
     }
 }
 
 # ::irc::config --
@@ -520,8 +516,8 @@
     return $returncommand
 }
 
 # -------------------------------------------------------------------------
 
-package provide irc $::irc::version
+package provide irc 0.6.1
 
 # -------------------------------------------------------------------------

Index: modules/irc/picoirc.tcl
==================================================================
--- modules/irc/picoirc.tcl
+++ modules/irc/picoirc.tcl
@@ -11,16 +11,15 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: picoirc.tcl,v 1.4 2008/06/24 22:06:56 patthoyts Exp $
 
 namespace eval ::picoirc {
-    variable version 0.5.1
-    variable uid; if {![info exists uid]} { set uid 0 }
+    variable uid
+    if {![info exists uid]} { set uid 0 }
+
     variable defaults {
         server   "irc.freenode.net"
         port     6667
         channel  ""
         callback ""
@@ -265,8 +264,8 @@
     }
 }
 
 # -------------------------------------------------------------------------
 
-package provide picoirc $::picoirc::version
+package provide picoirc 0.5.1
 
 # -------------------------------------------------------------------------

Index: modules/math/math.tcl
==================================================================
--- modules/math/math.tcl
+++ modules/math/math.tcl
@@ -5,23 +5,18 @@
 # Copyright (c) 1998-2000 by Ajuba Solutions.
 # Copyright (c) 2002 by Kevin B. Kenny.  All rights reserved.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: math.tcl,v 1.23 2009/12/04 17:37:47 andreas_kupries Exp $
 
 package require Tcl 8.2		;# uses [lindex $l end-$integer]
 
 # @mdgen OWNER: tclIndex
 # @mdgen OWNER: misc.tcl
 # @mdgen OWNER: combinatorics.tcl
 
 namespace eval ::math {
-
-    variable version 1.2.5
-
     # misc.tcl
 
     namespace export	cov		fibonacci	integrate
     namespace export	max		mean		min
     namespace export	product		random		sigma
@@ -43,7 +38,7 @@
     } else {
 	source [file join [file dirname [info script]] misc.tcl]
 	source [file join [file dirname [info script]] combinatorics.tcl]
     }
 
-    package provide [namespace tail [namespace current]] $version
+    package provide [namespace tail [namespace current]] 1.2.5
 }

Index: modules/md4/md4.tcl
==================================================================
--- modules/md4/md4.tcl
+++ modules/md4/md4.tcl
@@ -5,22 +5,18 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: md4.tcl,v 1.20 2008/04/29 10:07:45 patthoyts Exp $
 
 package require Tcl 8.2;                # tcl minimum version
 catch {package require md4c 1.0};       # tcllib critcl alternative
 
 # @mdgen EXCLUDE: md4c.tcl
 
 namespace eval ::md4 {
-    variable version 1.0.6
-    variable rcsid {$Id: md4.tcl,v 1.20 2008/04/29 10:07:45 patthoyts Exp $}
-    variable accel
+    variable  accel
     array set accel {critcl 0 cryptkit 0}
 
     namespace export md4 hmac MD4Init MD4Update MD4Final
 
     variable uid
@@ -562,14 +558,14 @@
     variable e {}
     foreach e {critcl cryptkit} { if {[LoadAccelerator $e]} { break } }
     unset e
 }
 
-package provide md4 $::md4::version
+package provide md4 1.0.6
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:
 
 

Index: modules/md5/md5x.tcl
==================================================================
--- modules/md5/md5x.tcl
+++ modules/md5/md5x.tcl
@@ -13,19 +13,15 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: md5x.tcl,v 1.19 2008/07/04 18:27:00 andreas_kupries Exp $
 
 package require Tcl 8.2;                # tcl minimum version
 
 namespace eval ::md5 {
-    variable version 2.0.7
-    variable rcsid {$Id: md5x.tcl,v 1.19 2008/07/04 18:27:00 andreas_kupries Exp $}
-    variable accel
+    variable  accel
     array set accel {critcl 0 cryptkit 0 trf 0}
 
     namespace export md5 hmac MD5Init MD5Update MD5Final
 
     variable uid
@@ -704,14 +700,14 @@
     variable e
     foreach  e {critcl cryptkit trf} { if {[LoadAccelerator $e]} { break } }
     unset    e
 }
 
-package provide md5 $::md5::version
+package provide md5 2.0.7
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:
 
 

Index: modules/md5crypt/md5crypt.tcl
==================================================================
--- modules/md5crypt/md5crypt.tcl
+++ modules/md5crypt/md5crypt.tcl
@@ -6,11 +6,10 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-
 # @mdgen EXCLUDE: md5cryptc.tcl
 
 package require Tcl 8.2;                # tcl minimum version
 package require md5 2;                  # tcllib 1.5
 
@@ -18,12 +17,10 @@
 if {[catch {package require tcllibc}]} {
     catch {package require md5cryptc}
 }
 
 namespace eval md5crypt {
-    variable version 1.1.0
-    variable rcsid {$Id: md5crypt.tcl,v 1.5 2008/01/26 23:56:26 patthoyts Exp $}
     variable itoa64 \
         {./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz}
 
     namespace import -force ::md5::MD5Init ::md5::MD5Update ::md5::MD5Final
     namespace export md5crypt
@@ -144,12 +141,12 @@
     interp alias {} ::md5crypt::aprcrypt {} ::md5crypt::md5crypt_c {$apr1$}
 }
 
 # -------------------------------------------------------------------------
 
-package provide md5crypt $::md5crypt::version
+package provide md5crypt 1.1.0
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/mime/smtp.tcl
==================================================================
--- modules/mime/smtp.tcl
+++ modules/mime/smtp.tcl
@@ -28,15 +28,13 @@
 #    crP: just put a \r in the data
 #    nlP: just put a \n in the data
 #    size: number of octets sent in DATA
 #
 
-
 namespace eval ::smtp {
-    variable version 1.4.5
-    variable trf 1
-    variable smtp
+    variable  trf 1
+    variable  smtp
     array set smtp { uid 0 }
 
     namespace export sendmessage
 }
 
@@ -1500,11 +1498,11 @@
     }
 }
 
 # -------------------------------------------------------------------------
 
-package provide smtp $::smtp::version
+package provide smtp 1.4.5
 
 # -------------------------------------------------------------------------
 # Local variables:
 # indent-tabs-mode: nil
 # End:

Index: modules/ntp/time.tcl
==================================================================
--- modules/ntp/time.tcl
+++ modules/ntp/time.tcl
@@ -5,20 +5,15 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: time.tcl,v 1.19 2006/09/19 23:36:17 andreas_kupries Exp $
 
 package require Tcl 8.0;                # tcl minimum version
 package require log;                    # tcllib 1.3
 
 namespace eval ::time {
-    variable version 1.2.1
-    variable rcsid {$Id: time.tcl,v 1.19 2006/09/19 23:36:17 andreas_kupries Exp $}
-
     namespace export configure gettime server cleanup
 
     variable options
     if {![info exists options]} {
         array set options {
@@ -376,12 +371,12 @@
     return $r
 }
 
 # -------------------------------------------------------------------------
 
-package provide time $::time::version
+package provide time 1.2.1
 
 # -------------------------------------------------------------------------
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/otp/otp.tcl
==================================================================
--- modules/otp/otp.tcl
+++ modules/otp/otp.tcl
@@ -9,13 +9,10 @@
 
 
 package require Tcl 8.2;                # tcl minimum version
 
 namespace eval ::otp {
-    variable version 1.0.0
-    variable rcsid {$Id: otp.tcl,v 1.2 2006/09/02 22:30:17 patthoyts Exp $}
-
     namespace export otp-md4 otp-md5 otp-sha1 otp-rmd160
 
     variable Words {
         "A"     "ABE"   "ACE"   "ACT"   "AD"    "ADA"   "ADD"
         "AGO"   "AID"   "AIM"   "AIR"   "ALL"   "ALP"   "AM"    "AMY"
@@ -422,12 +419,12 @@
     return [eval [linsert $args 0 [namespace current]::otp -hash rmd160]]
 }
 
 # -------------------------------------------------------------------------
 
-package provide otp $::otp::version
+package provide otp 1.0.0
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/pop3d/pop3d.tcl
==================================================================
--- modules/pop3d/pop3d.tcl
+++ modules/pop3d/pop3d.tcl
@@ -5,16 +5,16 @@
 # Copyright (c) 2002-2009 by Andreas Kupries
 # Copyright (c) 2005      by Reinhard Max (-socket option)
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: pop3d.tcl,v 1.23 2009/04/14 20:35:43 andreas_kupries Exp $
 
 package require md5  ; # tcllib | APOP
 package require mime ; # tcllib | storage callback
 package require log  ; # tcllib | tracing
+
+package provide pop3d 1.1.0
 
 namespace eval ::pop3d {
     # Data storage in the pop3d module
     # -------------------------------
     #
@@ -62,11 +62,11 @@
 	    "destroy"		\
 	    "down"		\
 	    "up"		\
 	    ]
 
-    variable version ; set version 1.1.0
+    variable version [package present pop3d]
     variable server  "tcllib/pop3d-$version"
 
     variable cmdMap ; array set cmdMap {
 	CAPA H_capa
 	USER H_user
@@ -1142,7 +1142,6 @@
 }
 unset major
 
 ##########################
 # Module initialization
-
-package provide pop3d $::pop3d::version
+return

Index: modules/pop3d/pop3d_dbox.tcl
==================================================================
--- modules/pop3d/pop3d_dbox.tcl
+++ modules/pop3d/pop3d_dbox.tcl
@@ -8,12 +8,10 @@
 #
 # Copyright (c) 2002 by Andreas Kupries
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: pop3d_dbox.tcl,v 1.12 2005/09/28 04:51:23 andreas_kupries Exp $
 
 package require mime ; # tcllib | mime token is result of "get".
 package require log  ; # tcllib | Logging package
 
 namespace eval ::pop3d::dbox {
@@ -40,12 +38,10 @@
 	    "remove"	\
 	    "size"	\
 	    "stat"	\
 	    "unlock"	\
 	    ]
-
-    variable version ; set version 1.0.2
 }
 
 
 # ::pop3d::dbox::new --
 #
@@ -484,6 +480,6 @@
 }
 
 ##########################
 # Module initialization
 
-package provide pop3d::dbox $::pop3d::dbox::version
+package provide pop3d::dbox 1.0.2

Index: modules/pop3d/pop3d_udb.tcl
==================================================================
--- modules/pop3d/pop3d_udb.tcl
+++ modules/pop3d/pop3d_udb.tcl
@@ -5,12 +5,10 @@
 #
 # Copyright (c) 2002 by Andreas Kupries
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: pop3d_udb.tcl,v 1.6 2004/01/15 06:36:13 andreas_kupries Exp $
 
 namespace eval ::pop3d::udb {
     # Data storage in the pop3d::udb module
     # -------------------------------------
     # One array per object containing the db contents. Keyed by user name.
@@ -29,12 +27,10 @@
 	    "remove"		\
 	    "rename"		\
 	    "save"		\
 	    "who"		\
 	    ]
-
-    variable version ; set version 1.1
 }
 
 
 # ::pop3d::udb::new --
 #
@@ -299,6 +295,6 @@
 }
 
 ##########################
 # Module initialization
 
-package provide pop3d::udb $::pop3d::udb::version
+package provide pop3d::udb 1.1

Index: modules/rc4/rc4.tcl
==================================================================
--- modules/rc4/rc4.tcl
+++ modules/rc4/rc4.tcl
@@ -6,21 +6,16 @@
 # implementation is based on the description of the algorithm.
 #
 # The algorithm is a pseudo-random number generator with the output of
 # the PRNG being xored with the plaintext stream. Decryption is done
 # by feeding the ciphertext as input with the same key.
-#
-# $Id: rc4.tcl,v 1.7 2005/12/20 16:19:38 patthoyts Exp $
 
 package require Tcl 8.2
 
 # @mdgen EXCLUDE: rc4c.tcl
 
 namespace eval ::rc4 {
-    variable version 1.1.0
-    variable rcsid {$Id: rc4.tcl,v 1.7 2005/12/20 16:19:38 patthoyts Exp $}
-
     namespace export rc4
 
     variable uid
     if {![info exists uid]} {
         set uid 0
@@ -416,12 +411,12 @@
     } else {
         SelectImplementation list
     }
 }
 
-package provide rc4 $::rc4::version
+package provide rc4 1.1.0
 
 # -------------------------------------------------------------------------
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/ripemd/ripemd128.tcl
==================================================================
--- modules/ripemd/ripemd128.tcl
+++ modules/ripemd/ripemd128.tcl
@@ -20,20 +20,16 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: ripemd128.tcl,v 1.10 2009/05/07 01:12:59 patthoyts Exp $
 
 package require Tcl 8.2;                # tcl minimum version
 
 namespace eval ::ripemd {
     namespace eval ripemd128 {
-        variable version 1.0.5
-        variable rcsid {$Id: ripemd128.tcl,v 1.10 2009/05/07 01:12:59 patthoyts Exp $}
-        variable accel
+        variable  accel
         array set accel {trf 0}
 
         variable uid
         if {![info exists uid]} {
             set uid 0
@@ -724,12 +720,12 @@
         if {[LoadAccelerator $e]} break
     }
     unset e
 }
 
-package provide ripemd128 $::ripemd::ripemd128::version
+package provide ripemd128 1.0.5
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/ripemd/ripemd160.tcl
==================================================================
--- modules/ripemd/ripemd160.tcl
+++ modules/ripemd/ripemd160.tcl
@@ -20,21 +20,17 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: ripemd160.tcl,v 1.8 2009/05/07 01:12:59 patthoyts Exp $
 
 package require Tcl 8.2;                # tcl minimum version
 #catch {package require ripemdc 1.0};   # tcllib critcl alternative
 
 namespace eval ::ripemd {
     namespace eval ripemd160 {
-        variable version 1.0.5
-        variable rcsid {$Id: ripemd160.tcl,v 1.8 2009/05/07 01:12:59 patthoyts Exp $}
-        variable accel
+        variable  accel
         array set accel {cryptkit 0 trf 0}
 
         variable uid
         if {![info exists uid]} {
             set uid 0
@@ -857,14 +853,14 @@
         if {[LoadAccelerator $e]} break
     }
     unset e
 }
 
-package provide ripemd160 $::ripemd::ripemd160::version
+package provide ripemd160 1.0.5
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:
 
 

Index: modules/sasl/gtoken.tcl
==================================================================
--- modules/sasl/gtoken.tcl
+++ modules/sasl/gtoken.tcl
@@ -15,12 +15,10 @@
 package require http
 package require tls
 
 namespace eval ::SASL {
     namespace eval XGoogleToken {
-        variable version 1.0.1
-        variable rcsid {$Id: gtoken.tcl,v 1.4 2007/08/26 00:36:45 patthoyts Exp $}
         variable URLa https://www.google.com/accounts/ClientAuth
         variable URLb https://www.google.com/accounts/IssueAuthToken
 
         # Should use autoproxy and register autoproxy::tls_socket
         # Leave to application author?
@@ -83,12 +81,12 @@
 #
 if {[llength [package provide SASL]] != 0} {
     ::SASL::register X-GOOGLE-TOKEN 40 ::SASL::XGoogleToken::client
 }
 
-package provide SASL::XGoogleToken $::SASL::XGoogleToken::version
+package provide SASL::XGoogleToken 1.0.1
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 # indent-tabs-mode: nil
 # End:

Index: modules/sasl/ntlm.tcl
==================================================================
--- modules/sasl/ntlm.tcl
+++ modules/sasl/ntlm.tcl
@@ -16,12 +16,10 @@
 package require des 1.0;                # tcllib 1.8
 package require md4;                    # tcllib 1.4
 
 namespace eval ::SASL {
     namespace eval NTLM {
-        variable version 1.1.2
-        variable rcsid {$Id: ntlm.tcl,v 1.8 2007/08/26 00:36:45 patthoyts Exp $}
         array set NTLMFlags {
             unicode        0x00000001
             oem            0x00000002
             req_target     0x00000004
             unknown        0x00000008
@@ -366,12 +364,12 @@
 #
 if {[llength [package provide SASL]] != 0} {
     ::SASL::register NTLM 50 ::SASL::NTLM::NTLM
 }
 
-package provide SASL::NTLM $::SASL::NTLM::version
+package provide SASL::NTLM 1.1.2
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 # indent-tabs-mode: nil
 # End:

Index: modules/sasl/sasl.tcl
==================================================================
--- modules/sasl/sasl.tcl
+++ modules/sasl/sasl.tcl
@@ -14,13 +14,10 @@
 # -------------------------------------------------------------------------
 
 package require Tcl 8.2
 
 namespace eval ::SASL {
-    variable version 1.3.3
-    variable rcsid {$Id: sasl.tcl,v 1.12 2008/01/29 00:51:39 patthoyts Exp $}
-
     variable uid
     if {![info exists uid]} { set uid 0 }
 
     variable mechanisms
     if {![info exists mechanisms]} {
@@ -674,12 +671,12 @@
 
 ::SASL::register OTP 45 ::SASL::OTP:client
 
 # -------------------------------------------------------------------------
 
-package provide SASL $::SASL::version
+package provide SASL 1.3.3
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 #   indent-tabs-mode: nil
 # End:

Index: modules/sasl/scram.tcl
==================================================================
--- modules/sasl/scram.tcl
+++ modules/sasl/scram.tcl
@@ -11,13 +11,11 @@
 package require Tcl 8.2
 package require SASL
 package require sha1
 package require base64
 
-namespace eval ::SASL::SCRAM {
-    set version 0.1
-}
+namespace eval ::SASL::SCRAM {}
 
 # ::SASL::SCRAM::Map --
 #
 #       Map comma and equal sign to their codes in authzid and username
 #       (section 5.1, a and n attributes)
@@ -493,13 +491,13 @@
 
 ::SASL::register SCRAM-SHA-1 50 ::SASL::SCRAM::SHA-1:client ::SASL::SCRAM::SHA-1:server
 
 # -------------------------------------------------------------------------
 
-package provide SASL::SCRAM $::SASL::SCRAM::version
+package provide SASL::SCRAM 0.1
 
 # -------------------------------------------------------------------------
 #
 # Local variables:
 # indent-tabs-mode: nil
 # End:
 # vim:ts=8:sw=4:sts=4:et

Index: modules/sha1/sha1.tcl
==================================================================
--- modules/sha1/sha1.tcl
+++ modules/sha1/sha1.tcl
@@ -18,23 +18,18 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: sha1.tcl,v 1.22 2009/05/07 00:35:10 patthoyts Exp $
-
 # @mdgen EXCLUDE: sha1c.tcl
 
 package require Tcl 8.2;                # tcl minimum version
 
 namespace eval ::sha1 {
-    variable  version 2.0.3
-    variable  rcsid {$Id: sha1.tcl,v 1.22 2009/05/07 00:35:10 patthoyts Exp $}
-
     variable  accel
     array set accel {tcl 0 critcl 0 cryptkit 0 trf 0}
+
     variable  loaded {}
     variable  active
     array set active {tcl 0 critcl 0 cryptkit 0 trf 0}
 
     namespace export sha1 hmac SHA1Init SHA1Update SHA1Final
@@ -807,12 +802,12 @@
 	}
     }
     unset e
 }
 
-package provide sha1 $::sha1::version
+package provide sha1 2.0.3
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/sha1/sha1v1.tcl
==================================================================
--- modules/sha1/sha1v1.tcl
+++ modules/sha1/sha1v1.tcl
@@ -18,21 +18,16 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-# $Id: sha1v1.tcl,v 1.1 2006/03/12 22:46:13 andreas_kupries Exp $
-
 # @mdgen EXCLUDE: sha1c.tcl
 
 package require Tcl 8.2;                # tcl minimum version
 
 namespace eval ::sha1 {
-    variable version 1.1.1
-    variable rcsid {$Id: sha1v1.tcl,v 1.1 2006/03/12 22:46:13 andreas_kupries Exp $}
-    variable accel
+    variable  accel
     array set accel {critcl 0 cryptkit 0 trf 0}
 
     namespace export sha1 hmac SHA1Init SHA1Update SHA1Final
 
     variable uid
@@ -702,14 +697,14 @@
     variable e {}
     foreach e {critcl cryptkit trf} { if {[LoadAccelerator $e]} { break } }
     unset e
 }
 
-package provide sha1 $::sha1::version
+package provide sha1 1.1.1
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:
 
 

Index: modules/sha1/sha256.tcl
==================================================================
--- modules/sha1/sha256.tcl
+++ modules/sha1/sha256.tcl
@@ -18,20 +18,15 @@
 #
 # -------------------------------------------------------------------------
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # -------------------------------------------------------------------------
-#
-
 # @mdgen EXCLUDE: sha256c.tcl
 
 package require Tcl 8.2;                # tcl minimum version
 
 namespace eval ::sha2 {
-    variable version 1.0.3
-    variable rcsid {$Id: sha256.tcl,v 1.7 2010/07/06 20:16:39 andreas_kupries Exp $}
-
     variable  accel
     array set accel {tcl 0 critcl 0}
     variable  loaded {}
 
     namespace export sha256 hmac \
@@ -826,12 +821,12 @@
 	}
     }
     unset e
 }
 
-package provide sha256 $::sha2::version
+package provide sha256 1.0.3
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/smtpd/smtpd.tcl
==================================================================
--- modules/smtpd/smtpd.tcl
+++ modules/smtpd/smtpd.tcl
@@ -8,20 +8,20 @@
 # This software is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the file 'license.terms' for
 # more details.
 # -------------------------------------------------------------------------
+# @mdgen EXCLUDE: clients/mail-test.tcl
 
 package require Tcl 8.3;                # tcl minimum version
 package require logger;                 # tcllib 1.3
 package require mime;                   # tcllib
 
-# @mdgen EXCLUDE: clients/mail-test.tcl
+package provide smtpd 1.5
 
 namespace eval ::smtpd {
-    variable rcsid {$Id: smtpd.tcl,v 1.22 2011/11/17 08:00:45 andreas_kupries Exp $}
-    variable version 1.5
+    variable version [package present smtpd]
     variable stopped
 
     namespace export start stop configure
 
     variable commands
@@ -915,13 +915,10 @@
         }
     }
 }
 
 # -------------------------------------------------------------------------
-
-package provide smtpd $smtpd::version
-
 # -------------------------------------------------------------------------
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End:

Index: modules/tepam/tepam.tcl
==================================================================
--- modules/tepam/tepam.tcl
+++ modules/tepam/tepam.tcl
@@ -16,14 +16,10 @@
 ##########################################################################
 
 package require Tcl 8.3
 
 namespace eval tepam {
-
-   # This is the following TEPAM version:
-   variable version 0.5.0
-   
    # Exports the major commands from this package:
    namespace export procedure argument_dialogbox
 
 ##########################################################################
 #                            procedure                                   #
@@ -2711,11 +2707,11 @@
    }
 
 }; # End namespace tepam
 
 # Specify the TEPAM version that is provided by this file:
-package provide tepam $::tepam::version
+package provide tepam 0.5
 
 ##########################################################################
 # Id: tepam.tcl
 # Modifications:
 #

Index: modules/tepam/tepam_doc_gen.tcl
==================================================================
--- modules/tepam/tepam_doc_gen.tcl
+++ modules/tepam/tepam_doc_gen.tcl
@@ -13,14 +13,10 @@
 
 package require Tcl 8.3
 package require tepam 0.5
 
 namespace eval tepam::doc_gen {
-
-   # This is the following TEPAM doc generation version:
-   variable version 0.1.1
-   
    # Exports the major commands from this package:
    namespace export doc_gen
 
    # Format validation command (checks if a format is defined)
    proc ::tepam::Validate(tepam_doc_format) {v} {expr {[info proc ::tepam::doc_gen::gen($v,Begin)]!=""}}
@@ -735,11 +731,11 @@
    proc gen(DT,Footer) {Text}                  {return "\[manpage_end\]"}
 
 }; # End namespace tepam::doc
 
 # Specify the TEPAM version that is provided by this file:
-package provide tepam::doc_gen $::tepam::doc_gen::version
+package provide tepam::doc_gen 0.1.1
 
 ##########################################################################
 # Id: tepam_doc.tcl
 # Modifications:
 #

Index: modules/uri/urn-scheme.tcl
==================================================================
--- modules/uri/urn-scheme.tcl
+++ modules/uri/urn-scheme.tcl
@@ -9,13 +9,11 @@
 # -------------------------------------------------------------------------
 
 package require uri      1.1.2
 
 namespace eval ::uri {}
-namespace eval ::uri::urn {
-    variable version 1.0.3
-}
+namespace eval ::uri::urn {}
 
 # -------------------------------------------------------------------------
 
 # Description:
 #   Called by uri::split with a url to split into its parts.
@@ -135,11 +133,11 @@
 	variable url "urn:$NIDpart:$NSSpart"
 }
 
 # -------------------------------------------------------------------------
 
-package provide uri::urn $::uri::urn::version
+package provide uri::urn 1.0.3
 
 # -------------------------------------------------------------------------
 # Local Variables:
 #   indent-tabs-mode: nil
 # End:

Index: modules/uuid/uuid.tcl
==================================================================
--- modules/uuid/uuid.tcl
+++ modules/uuid/uuid.tcl
@@ -10,11 +10,10 @@
 #
 # Usage: uuid::uuid generate
 #        uuid::uuid equal $idA $idB
 
 namespace eval uuid {
-    variable version 1.0.4
     variable accel
     array set accel {critcl 0}
 
     namespace export uuid
 
@@ -224,12 +223,12 @@
         if {[LoadAccelerator $e]} break
     }
     unset e
 }
 
-package provide uuid $::uuid::version
+package provide uuid 1.0.4
 
 # -------------------------------------------------------------------------
 # Local variables:
 #   mode: tcl
 #   indent-tabs-mode: nil
 # End: