From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 13 Jun 2007 21:30:38 +0000 (+0100)
Subject: Prepare for SIMPLEROUTE merge (more files)
X-Git-Tag: 1.55~160^2~15
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=7b9256ceade8b18b48f848c9ac659c2de7322b0b;p=spider.git

Prepare for SIMPLEROUTE merge (more files)
---

diff --git a/Changes b/Changes
index 97c59b53..899cc366 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+13Jun06=======================================================================
+1. start using git.
+2. change all the version / build numbering.
 15Jan06=======================================================================
 1. added CTY-1701
 07Jan06=======================================================================
diff --git a/cmd/links.pl b/cmd/links.pl
index 3487d891..207bf7a7 100644
--- a/cmd/links.pl
+++ b/cmd/links.pl
@@ -7,7 +7,7 @@
 # and subsequently plagerized by K1XX.
 #
 # 16-Jun-2000
-# $Id: links.pl
+# $Id$
 #
 
 my $self = shift;
diff --git a/perl/AGWMsg.pm b/perl/AGWMsg.pm
index cb64177e..1888ac6f 100644
--- a/perl/AGWMsg.pm
+++ b/perl/AGWMsg.pm
@@ -45,12 +45,6 @@ $hpolltime = 300 unless defined $hpolltime;
 %circuit = ();
 $total_in = $total_out = 0;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub init
 {
 	return unless $enable;
diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 63f2512b..443e7442 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -38,12 +38,6 @@ $filterdef = bless ([
 			  ['origin_state', 'nz', 14],
 			 ], 'Filter::Cmd');
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {
diff --git a/perl/BBS.pm b/perl/BBS.pm
index 9e899874..9785876f 100644
--- a/perl/BBS.pm
+++ b/perl/BBS.pm
@@ -26,12 +26,6 @@ $lastbidclean = time;			# the last time the bid file was cleaned
 $bidcleanint = 86400;			# the time between bid cleaning intervals
 $maxbidage = 60;				# the maximum age of a stored bid
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub init
 {
 	tie %hash, 'DB_File', $bidfn;
diff --git a/perl/BadWords.pm b/perl/BadWords.pm
index c21fe975..59f516e8 100644
--- a/perl/BadWords.pm
+++ b/perl/BadWords.pm
@@ -29,12 +29,6 @@ filecopy("$bwfn.issue", $bwfn) unless -e $bwfn;
 
 $badword = new DXHash "badword";
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 # load the badwords file
 sub load
 {
diff --git a/perl/Bands.pm b/perl/Bands.pm
index 728bb615..7563e927 100644
--- a/perl/Bands.pm
+++ b/perl/Bands.pm
@@ -35,12 +35,6 @@ $bandsfn = "$main::data/bands.pl";
 		  band => '0,BAND,parraypairs',
 		 );
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 # load the band data
 sub load
 {
diff --git a/perl/Buck.pm b/perl/Buck.pm
index 2c2fc590..abcb083a 100644
--- a/perl/Buck.pm
+++ b/perl/Buck.pm
@@ -8,12 +8,6 @@ use DXUtil;
 
 @ISA = qw( HTML::Parser );
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use strict;
 
 sub new
diff --git a/perl/Chain.pm b/perl/Chain.pm
index 60266c75..27b966c8 100644
--- a/perl/Chain.pm
+++ b/perl/Chain.pm
@@ -3,12 +3,6 @@ package Chain;
 use strict;
 use Carp;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use constant NEXT => 0;
 use constant PREV => 1;
 use constant OBJ => 2;
diff --git a/perl/CmdAlias.pm b/perl/CmdAlias.pm
index 803f762f..fc10ebe9 100644
--- a/perl/CmdAlias.pm
+++ b/perl/CmdAlias.pm
@@ -32,12 +32,6 @@ use vars qw(%alias %newalias $fn $localfn);
 $fn = "$main::cmd/Aliases";
 $localfn = "$main::localcmd/Aliases";
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub load
 {
 	my $ref = shift;
diff --git a/perl/DB0SDX.pm b/perl/DB0SDX.pm
index 174d313d..eef5ed66 100644
--- a/perl/DB0SDX.pm
+++ b/perl/DB0SDX.pm
@@ -9,12 +9,6 @@ use Data::Dumper;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub new
 {
     my $pkg = shift;
diff --git a/perl/DXBearing.pm b/perl/DXBearing.pm
index e3aac65e..637a6aa8 100644
--- a/perl/DXBearing.pm
+++ b/perl/DXBearing.pm
@@ -21,12 +21,6 @@ use vars qw($pi);
 
 $pi = 3.14159265358979;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 # convert a qra locator into lat/long in DEGREES
 sub qratoll
 {
diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 2337d959..e386d084 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -124,9 +124,6 @@ $count = 0;
 		 );
 
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 # object destruction
 sub DESTROY
 {
diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 71efaef7..f2899786 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -54,9 +54,6 @@ $cmdimportdir = "$main::root/cmd_import"; # the base directory for importing com
                                           # this does not exist as default, you need to create it manually
 					  #
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 #
 # obtain a new connection this is derived from dxchannel
 #
diff --git a/perl/DXConnect.pm b/perl/DXConnect.pm
index b904e14c..a98c0c82 100644
--- a/perl/DXConnect.pm
+++ b/perl/DXConnect.pm
@@ -16,12 +16,6 @@ use DXDebug;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub init
 {
 
diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 2a9913f1..1d3dcc6d 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -26,12 +26,6 @@ $lastmin = 0;
 my $fn = "$main::cmd/crontab";
 my $localfn = "$main::localcmd/crontab";
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 # cron initialisation / reading in cronjobs
 sub init
 {
diff --git a/perl/DXDb.pm b/perl/DXDb.pm
index 833640f5..81d21928 100644
--- a/perl/DXDb.pm
+++ b/perl/DXDb.pm
@@ -49,12 +49,6 @@ $lastprocesstime = time;
 $nextstream = 0;
 %stream = ();
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 # allocate a new stream for this request
 sub newstream
 {
diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 416dea0a..40cb3a25 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -26,12 +26,6 @@ $callback = undef;
 $keepdays = 10;
 $cleandays = 100;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 # Avoid generating "subroutine redefined" warnings with the following
 # hack (from CGI::Carp):
 if (!defined $DB::VERSION) {
diff --git a/perl/DXDupe.pm b/perl/DXDupe.pm
index a5bb8a1b..851e3a69 100644
--- a/perl/DXDupe.pm
+++ b/perl/DXDupe.pm
@@ -19,9 +19,6 @@ $default = 48*24*60*60;
 $lasttime = 0;
 $fn = "$main::data/dupefile";
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 sub init
 {
 	$dbm = tie (%d, 'DB_File', $fn);
diff --git a/perl/DXHash.pm b/perl/DXHash.pm
index 2dcb8679..36f882eb 100644
--- a/perl/DXHash.pm
+++ b/perl/DXHash.pm
@@ -25,12 +25,6 @@ use DXDebug;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub new
 {
 	my ($pkg, $name) = @_;
diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index 44abd5b6..bdf441bb 100644
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -38,9 +38,6 @@ use Carp;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 use vars qw($log);
 
 $log = new('log', 'dat', 'm');
diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm
index 356c7cd1..326d564e 100644
--- a/perl/DXLogPrint.pm
+++ b/perl/DXLogPrint.pm
@@ -18,12 +18,7 @@ use RingBuf;
 
 use strict;
 
-use vars qw($VERSION $BRANCH $maxmonths);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw($maxmonths);
 $maxmonths = 36;
 
 #
diff --git a/perl/DXM.pm b/perl/DXM.pm
index b6d191bb..72cbab1b 100644
--- a/perl/DXM.pm
+++ b/perl/DXM.pm
@@ -24,12 +24,6 @@ use DXDebug;
 my $localfn = "$main::root/local/Messages";
 my $fn = "$main::root/perl/Messages";
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw(%msgs);
 
 sub msg
diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index fe65cdb3..7a433e21 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -32,12 +32,6 @@ eval {
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean $residencetime
 			@badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
 			$email_server $email_prog $email_from
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index b1c084fd..0cf46bb9 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -37,7 +37,6 @@ use DXProtHandle;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
 use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
 			$pingint $obscount %pc19list $chatdupeage $chatimportfn
@@ -48,8 +47,6 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			%pc92_find $pc92_find_timeout
 		   );
 
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc23
 
diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 99157462..cc223148 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -37,9 +37,6 @@ use RouteDB;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
 			$pingint $obscount %pc19list $chatdupeage $chatimportfn
diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index e42c4ef2..e00e1d72 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -19,9 +19,6 @@ use DXDebug;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 use vars qw($sentencelth);
 
 $sentencelth = 180;
diff --git a/perl/DXSql.pm b/perl/DXSql.pm
index 8ce3cb5a..1a4fee81 100644
--- a/perl/DXSql.pm
+++ b/perl/DXSql.pm
@@ -14,12 +14,7 @@ use DXSql::SQLite;
 use DXSql::mysql;
 use DXDebug;
 
-use vars qw($VERSION $BRANCH $active);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw($active);
 $active = 0;
 
 sub init
diff --git a/perl/DXSql/SQLite.pm b/perl/DXSql/SQLite.pm
index 9447505a..834b4b66 100644
--- a/perl/DXSql/SQLite.pm
+++ b/perl/DXSql/SQLite.pm
@@ -12,12 +12,6 @@ package DXSql::SQLite;
 
 use DXDebug;
 
-use vars qw($VERSION $BRANCH @ISA);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 @ISA = qw{DXSql};
 
 sub show_tables
diff --git a/perl/DXSql/mysql.pm b/perl/DXSql/mysql.pm
index 5197adb1..3a638443 100644
--- a/perl/DXSql/mysql.pm
+++ b/perl/DXSql/mysql.pm
@@ -12,12 +12,6 @@ package DXSql::mysql;
 
 use DXDebug;
 
-use vars qw($VERSION $BRANCH @ISA);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 @ISA = qw{DXSql};
 
 sub show_tables
diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 840498c0..ab0be7a2 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -19,12 +19,6 @@ use LRU;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3);
 
 %u = ();
diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 2b308407..2e7536ac 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -15,7 +15,6 @@ use Data::Dumper;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
 use vars qw(@month %patmap @ISA @EXPORT);
 
 require Exporter;
@@ -25,7 +24,7 @@ require Exporter;
 			 filecopy ptimelist
              print_all_fields cltounix unpad is_callsign is_latlong
 			 is_qra is_freq is_digits is_pctext is_pcflag insertitem deleteitem
-			 is_prefix dd dxver
+			 is_prefix dd
             );
 
 
@@ -436,20 +435,3 @@ sub deleteitem
 	return $n - @$list;
 }
 
-sub dxver
-{
-	my $s = shift;
-	my ($a, $b, $c, $d) = $s =~ /(\d+)\.(\d+)\.(?:(\d+)\.(\d+))?/;
-	
-	my $v = sprintf( "%d.%03d", $a, $b) || 0;
-	my $br = sprintf( "%d.%03d", $c, $d) if defined $c;
-	$br ||= 0;
-
-	$main::build += $v;
-	$main::branch += $br;
-	return ($v, $br);
-}
-
-INIT {
-	($VERSION, $BRANCH) = dxver(q$Revision$);
-}
diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index 6bf1fa59..1b4d2e83 100644
--- a/perl/DXXml.pm
+++ b/perl/DXXml.pm
@@ -22,11 +22,6 @@ use DXXml::Text;
 use DXXml::Cmd;
 
 use vars qw($VERSION $BRANCH $xs $id $max_old_age $max_future_age $dupeage);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 $xs = undef;					# the XML::Simple parser instance
 $id = 0;						# the next ID to be used
 $max_old_age = 3600;			# how old a sentence we will accept
diff --git a/perl/DXXml/Cmd.pm b/perl/DXXml/Cmd.pm
index f56c270e..7369d40d 100644
--- a/perl/DXXml/Cmd.pm
+++ b/perl/DXXml/Cmd.pm
@@ -17,12 +17,7 @@ use Investigate;
 use DXXml::Text;
 use DXLog;
 
-use vars qw($VERSION $BRANCH @ISA %pings);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw(@ISA);
 @ISA = qw(DXXml);
 
 sub handle_input
diff --git a/perl/DXXml/Dx.pm b/perl/DXXml/Dx.pm
index d8bba23b..14ea595b 100644
--- a/perl/DXXml/Dx.pm
+++ b/perl/DXXml/Dx.pm
@@ -14,12 +14,7 @@ use DXDebug;
 use DXProt;
 use IsoTime;
 
-use vars qw($VERSION $BRANCH @ISA);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw(@ISA);
 @ISA = qw(DXXml);
 
 sub handle_input
diff --git a/perl/DXXml/IM.pm b/perl/DXXml/IM.pm
index d0a18470..1a3c1fff 100644
--- a/perl/DXXml/IM.pm
+++ b/perl/DXXml/IM.pm
@@ -16,12 +16,7 @@ use IsoTime;
 use Investigate;
 use Time::HiRes qw(gettimeofday tv_interval);
 
-use vars qw($VERSION $BRANCH @ISA %pings);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw(@ISA);
 @ISA = qw(DXXml);
 
 #
diff --git a/perl/DXXml/Ping.pm b/perl/DXXml/Ping.pm
index 59c8ff3e..d2a07b73 100644
--- a/perl/DXXml/Ping.pm
+++ b/perl/DXXml/Ping.pm
@@ -16,12 +16,7 @@ use IsoTime;
 use Investigate;
 use Time::HiRes qw(gettimeofday tv_interval);
 
-use vars qw($VERSION $BRANCH @ISA %pings);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw(@ISA %pings);
 @ISA = qw(DXXml);
 %pings = ();                    # outstanding ping requests outbound
 
diff --git a/perl/DXXml/Text.pm b/perl/DXXml/Text.pm
index adec20e8..b4a95b44 100644
--- a/perl/DXXml/Text.pm
+++ b/perl/DXXml/Text.pm
@@ -14,12 +14,7 @@ use DXDebug;
 use DXProt;
 use DXLog;
 
-use vars qw($VERSION $BRANCH @ISA %pings);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw(@ISA);
 @ISA = qw(DXXml);
 
 sub handle_input
diff --git a/perl/Editable.pm b/perl/Editable.pm
index f4bea483..28c676ec 100644
--- a/perl/Editable.pm
+++ b/perl/Editable.pm
@@ -15,12 +15,6 @@ package Editable;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use DXChannel;
 use DXDebug;
 use BadWords;
diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 133a1513..8602da3d 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -21,12 +21,6 @@ use IO::File;
 use IO::Socket;
 use IPC::Open3;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw(@ISA $deftimeout);
 
 @ISA = qw(Msg);
diff --git a/perl/Filter.pm b/perl/Filter.pm
index b3c0dbfa..78792919 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -34,12 +34,6 @@ use Prefix;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw ($filterbasefn $in);
 
 $filterbasefn = "$main::root/filter";
diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index a2477821..6bc925b8 100644
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -20,12 +20,6 @@ use DXDupe;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from 
             $dirprefix $param
             $duplth $dupage $filterdef);
diff --git a/perl/IntMsg.pm b/perl/IntMsg.pm
index 0318c2b3..a50d9a1e 100644
--- a/perl/IntMsg.pm
+++ b/perl/IntMsg.pm
@@ -11,12 +11,6 @@ package IntMsg;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use Msg;
 
 use vars qw(@ISA);
diff --git a/perl/Investigate.pm b/perl/Investigate.pm
index 811d6380..d827d61c 100644
--- a/perl/Investigate.pm
+++ b/perl/Investigate.pm
@@ -21,12 +21,6 @@ use DXDebug;
 use DXUtil;
 
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw (%list %valid $pingint $maxpingwait);
 
 $pingint = 5;					# interval between pings for each investigation
diff --git a/perl/IsoTime.pm b/perl/IsoTime.pm
index 0bcf7995..0980db7a 100644
--- a/perl/IsoTime.pm
+++ b/perl/IsoTime.pm
@@ -12,12 +12,7 @@ package IsoTime;
 
 use Date::Parse;
 
-use vars qw($VERSION $BRANCH $year $month $day $hour $min $sec @days @ldays);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw($year $month $day $hour $min $sec @days @ldays);
 @days = (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 @ldays = (31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
diff --git a/perl/Julian.pm b/perl/Julian.pm
index 5351aa27..78dd8d29 100644
--- a/perl/Julian.pm
+++ b/perl/Julian.pm
@@ -11,12 +11,7 @@ use strict;
 package Julian;
 
 
-use vars qw($VERSION $BRANCH @days @ldays @month);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
+use vars qw(@days @ldays @month);
 @days = (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 @ldays = (31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
diff --git a/perl/K4UTE.pm b/perl/K4UTE.pm
index 174d313d..eef5ed66 100644
--- a/perl/K4UTE.pm
+++ b/perl/K4UTE.pm
@@ -9,12 +9,6 @@ use Data::Dumper;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub new
 {
     my $pkg = shift;
diff --git a/perl/LRU.pm b/perl/LRU.pm
index 30b264a5..58b8be3b 100644
--- a/perl/LRU.pm
+++ b/perl/LRU.pm
@@ -26,12 +26,6 @@ use DXDebug;
 use vars qw(@ISA);
 @ISA = qw(Chain);
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub newbase
 {
 	my $pkg = shift;
diff --git a/perl/Minimuf.pm b/perl/Minimuf.pm
index 7f309979..bc5887a7 100644
--- a/perl/Minimuf.pm
+++ b/perl/Minimuf.pm
@@ -48,12 +48,6 @@ use strict;
 use DXDebug;
 use POSIX qw(:math_h);
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($pi $d2r $r2d $halfpi $pi2 $VOFL $R $hE $hF $GAMMA $LN10
 		    $MINBETA $BOLTZ $NTEMP $DELTAF $MPATH $GLOSS $SLOSS
             $noise);
diff --git a/perl/Mrtg.pm b/perl/Mrtg.pm
index e2d7c022..25527a8b 100644
--- a/perl/Mrtg.pm
+++ b/perl/Mrtg.pm
@@ -14,12 +14,6 @@ use DXDebug;
 use DXUtil;
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub new
 {
 	my $pkg = shift;
diff --git a/perl/Msg.pm b/perl/Msg.pm
index 5ac71b42..2e568bb6 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -14,9 +14,6 @@ use strict;
 
 use DXUtil;
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 use IO::Select;
 use IO::Socket;
 use DXDebug;
diff --git a/perl/PC.pm b/perl/PC.pm
index 5bce28b1..daf348a9 100644
--- a/perl/PC.pm
+++ b/perl/PC.pm
@@ -9,12 +9,6 @@
 #
 
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 package PC10;
 
 @ISA = qw(Prot);
diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index da173ce1..2572cb87 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -19,12 +19,6 @@ use LRU;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($db %prefix_loc %pre $lru $lrusize $misses $hits $matchtotal);
 
 $db = undef;					# the DB_File handle
diff --git a/perl/Prot.pm b/perl/Prot.pm
index 23de1538..27416735 100644
--- a/perl/Prot.pm
+++ b/perl/Prot.pm
@@ -7,12 +7,6 @@ package Prot;
 use strict;
 
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use DXUtil;
 use DXDebug;
 use vars qw(%valid);
diff --git a/perl/QRZ.pm b/perl/QRZ.pm
index 87731185..ecc56e7a 100644
--- a/perl/QRZ.pm
+++ b/perl/QRZ.pm
@@ -10,12 +10,6 @@ use Data::Dumper;
 use strict;
 
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub new
 {
     my $pkg = shift;
diff --git a/perl/QSL.pm b/perl/QSL.pm
index d7dc8b2c..9ed00f30 100644
--- a/perl/QSL.pm
+++ b/perl/QSL.pm
@@ -14,12 +14,6 @@ use DB_File;
 use DXDebug;
 use Prefix;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($qslfn $dbm);
 $qslfn = 'qsl';
 $dbm = undef;
diff --git a/perl/RingBuf.pm b/perl/RingBuf.pm
index b55c19aa..ae36dab7 100644
--- a/perl/RingBuf.pm
+++ b/perl/RingBuf.pm
@@ -10,12 +10,6 @@ use strict;
 
 package RingBuf;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 
 sub new
 {
diff --git a/perl/Route.pm b/perl/Route.pm
index 5681e039..c2627c9c 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -22,9 +22,6 @@ use DXUtil;
 use strict;
 
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 use vars qw(%list %valid $filterdef);
 
 %valid = (
diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index d27efbf8..4b08de3b 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -15,9 +15,6 @@ use DXUtil;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver( q$Revision$);
-
 use vars qw(%list %valid @ISA $max $filterdef $obscount);
 @ISA = qw(Route);
 
diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index cc1e2d7e..551b32e6 100644
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -14,9 +14,6 @@ use DXUtil;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 
diff --git a/perl/RouteDB.pm b/perl/RouteDB.pm
index bff21fb4..6a23a827 100644
--- a/perl/RouteDB.pm
+++ b/perl/RouteDB.pm
@@ -25,10 +25,8 @@ use Prefix;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
 use vars qw(%list %valid $default);
 
-($VERSION, $BRANCH) = dxver(q$Revision$);
 
 %list = ();
 $default = 99;					# the number of hops to use if we don't know
diff --git a/perl/Script.pm b/perl/Script.pm
index 4c8d0f3b..05f408ec 100644
--- a/perl/Script.pm
+++ b/perl/Script.pm
@@ -17,12 +17,6 @@ use DXCommandmode;
 use DXVars;
 use IO::File;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 my $base = "$main::root/scripts";
 
 sub clean
diff --git a/perl/Spot.pm b/perl/Spot.pm
index 0df68917..ed78b40c 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -21,10 +21,6 @@ use QSL;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-
-($VERSION, $BRANCH) = dxver(q$Revision$);
-
 use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth);
 
 $fp = undef;
diff --git a/perl/Sun.pm b/perl/Sun.pm
index 301fa4a5..6469df8c 100644
--- a/perl/Sun.pm
+++ b/perl/Sun.pm
@@ -33,12 +33,6 @@ require Exporter;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($pi $d2r $r2d);
  
 $pi = 3.141592653589;
diff --git a/perl/Thingy.pm b/perl/Thingy.pm
index 61068e06..f1046798 100644
--- a/perl/Thingy.pm
+++ b/perl/Thingy.pm
@@ -12,12 +12,6 @@ use strict;
 
 package Thingy;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use DXChannel;
 use DXDebug;
 
diff --git a/perl/Timer.pm b/perl/Timer.pm
index 168dd3f5..60ef3877 100644
--- a/perl/Timer.pm
+++ b/perl/Timer.pm
@@ -16,12 +16,6 @@ use DXDebug;
 @timerchain = ();
 $notimers = 0;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 $lasttime = 0;
 
 sub new
diff --git a/perl/UDPMsg.pm b/perl/UDPMsg.pm
index 72e53de8..07703148 100644
--- a/perl/UDPMsg.pm
+++ b/perl/UDPMsg.pm
@@ -32,12 +32,6 @@ $noports = 0;
 %circuit = ();
 $total_in = $total_out = 0;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub init
 {
 	return unless $enable;
diff --git a/perl/USDB.pm b/perl/USDB.pm
index 4957539e..042e9190 100644
--- a/perl/USDB.pm
+++ b/perl/USDB.pm
@@ -15,12 +15,6 @@ use File::Copy;
 use DXDebug;
 #use Compress::Zlib;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw(%db $present $dbfn);
 
 $dbfn = "$main::data/usdb.v1";
diff --git a/perl/VE7CC.pm b/perl/VE7CC.pm
index 58964c5a..c0138cd7 100644
--- a/perl/VE7CC.pm
+++ b/perl/VE7CC.pm
@@ -19,12 +19,6 @@ use DXUser;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub dx_spot
 {
 	my $self = shift;			# this may be useful some day
diff --git a/perl/Verify.pm b/perl/Verify.pm
index 5e0fffe1..96009c4c 100644
--- a/perl/Verify.pm
+++ b/perl/Verify.pm
@@ -15,12 +15,6 @@ use DXUtil;
 use DXDebug;
 use Digest::SHA1 qw(sha1_base64);
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub new
 {
 	my $class = shift;
diff --git a/perl/WCY.pm b/perl/WCY.pm
index 657a49cb..1c499e52 100644
--- a/perl/WCY.pm
+++ b/perl/WCY.pm
@@ -19,12 +19,6 @@ use Data::Dumper;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ||  (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($date $sfi $k $expk $a $r $sa $gmf $au  @allowed @denied $fp $node $from 
             $dirprefix $param
             $duplth $dupage $filterdef);
diff --git a/perl/cluster.pl b/perl/cluster.pl
index 2c8b5f65..c517a231 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -107,13 +107,14 @@ use Data::Dumper;
 use IO::File;
 use Fcntl ':flock'; 
 use POSIX ":sys_wait_h";
+use Version;
 
 use Local;
 
 package main;
 
 use strict;
-use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
+use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects 
 			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
 			$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
 			$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
@@ -121,7 +122,6 @@ use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.53";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
@@ -130,12 +130,6 @@ $bumpexisting = 1;				# 1 = allow new connection to disconnect old, 0 - don't al
 $allowdxby = 0;					# 1 = allow "dx by <othercall>", 0 - don't allow it
 
 
-use vars qw($VERSION $BRANCH $build $branch);
-($VERSION, $BRANCH) = dxver( q$Revision$);
-$main::build -= 2;				# fudge (put back for now)
-
-
-      
 # send a message to call on conn and disconnect
 sub already_conn
 {
@@ -344,10 +338,6 @@ foreach (@debug) {
 }
 STDOUT->autoflush(1);
 
-# calculate build number
-$build += $main::version;
-$build = "$build.$branch" if $branch;
-
 # try to load the database
 if (DXSql::init($dsn)) {
 	$dbh = DXSql->new($dsn);
diff --git a/perl/create_usdb.pl b/perl/create_usdb.pl
index f7242cf7..241258b7 100755
--- a/perl/create_usdb.pl
+++ b/perl/create_usdb.pl
@@ -20,12 +20,6 @@ BEGIN {
 	unshift @INC, "$root/local";
 }
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use DXVars;
 use USDB;
 
diff --git a/perl/gen_usdb_data.pl b/perl/gen_usdb_data.pl
index edd74dab..a59d4340 100755
--- a/perl/gen_usdb_data.pl
+++ b/perl/gen_usdb_data.pl
@@ -40,12 +40,6 @@ BEGIN {
 	unshift @INC, "$root/local";
 }
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use DXVars;
 use Archive::Zip qw(:ERROR_CODES);
 use Archive::Zip::MemberRead;