Prepare for SIMPLEROUTE merge (more files)

diff --git a/Changes b/Changes
index 97c59b53f4cf2ca7fb2cd23dcdb4ff73045fe8a6..899cc36645c101235a737934eacef90f41ce5c30 100644 (file)
--- 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 3487d891f468ac28df467968ac9f1d416f24e08e..207bf7a7155609a083afcdedeed20b4f3f6d81ec 100644 (file)
--- 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 cb64177e20931cf5bb5c067bc36a26f13c4e235c..1888ac6f2dcdf9e5026528c9e8449418cb06fed9 100644 (file)
--- 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 63f2512b697356dd60c5f989a87556c7889446e2..443e7442169c705344a1c2c4fe8af5529eb52dfa 100644 (file)
--- 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 9e8998748f6ee89ea884bc7b76babef1f609c2c1..9785876fee1e4814c50443049cee76e660b62675 100644 (file)
--- 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 c21fe975d68c00d625f447629472eb8563561f24..59f516e8fe480293841a354291655277b78df64d 100644 (file)
--- 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 728bb615538cdb7a6d8cdfbeac1bf74babf21c77..7563e9274f713f64ae93dc3284a61ed1b125f425 100644 (file)
--- 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 2c2fc5907f7b1ce8be88cf279546588976a5a941..abcb083a6ae6703d067adacef5fc6571941195e6 100644 (file)
--- 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 60266c755716d84d3aa625c90ad2b8a25e84b671..27b966c869e823e8f879fcf45501af0c70803922 100644 (file)
--- 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 803f762f729a4ea7b1aa54f49dc6261f498b3503..fc10ebe9a3b70fe5f1018a1215d166194dc8f49d 100644 (file)
--- 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 174d313d24c686edd1ceefff42616d5e3a0148c1..eef5ed66a7ad30be6ccdda99f7c1bcd33d2478ec 100644 (file)
--- 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 e3aac65e9ffee4ae8b18ae308104fcc7b9601769..637a6aa889642b33d3a04c3b62656312b3f9e4c2 100644 (file)
--- 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 2337d959a84f6820c1c0e03370f1fe7856019f96..e386d0849e2b5330c53a8727d1511d0eb065640f 100644 (file)
--- 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 71efaef733d2db6d0c0f68b51384bb74d0b87535..f28997860f1399a16e782abfcf5970303f159280 100644 (file)
--- 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 b904e14cf7f1023bd1b808ae20fa9b4a56843356..a98c0c82f345f0c942be1a7f7c0afe52116302b9 100644 (file)
--- 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 2a9913f1f9682a4a20bb62b84850c7dbbacadf96..1d3dcc6d00b5d3bc1a5aa271f6977f8da7ed1a7d 100644 (file)
--- 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 833640f5862b2d5dfa75a7b1666a35e53336ab6e..81d21928334ea81e15848eed639f58b3225cb062 100644 (file)
--- 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 416dea0a9e79caadb7e923c2e2d2585b5ca04f09..40cb3a257e1128651683a59dfe6fe0830d3334e3 100644 (file)
--- 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 a5bb8a1b9cd762f9d4bdd0e1e2208f07743ba244..851e3a6953eef03450020f399a9efa2b4b17f42f 100644 (file)
--- 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 2dcb86794f65bea05fa247b4ee0f0771c4c78061..36f882eba0c61180b5e4fb72acd80b280b2618e6 100644 (file)
--- 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 44abd5b6a6a73acf0798b969fae6ca21d0adec69..bdf441bb56c5ae16735bb896aa035bb5c0fb1091 100644 (file)
--- 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 356c7cd1efb3dd44c9904dd587a35aaa9087e5bd..326d564e9d2207c524aa2a02522801c185edda91 100644 (file)
--- 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 b6d191bbd30a03f1c019c8ae35303e226d3ed08a..72cbab1b9a4bf3b992e610e25b7c894fd96be7fb 100644 (file)
--- 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 fe65cdb3b204667d1931113c4036f6583fcd56a8..7a433e2175f8170d1f883be2a2aef13613807803 100644 (file)
--- 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 b1c084fd52d6712e3af3eb5247cce33e69c3becb..0cf46bb9ce3a2f425f67cca568ae0131778eb464 100644 (file)
--- 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 99157462e9566759782c3d8bbd4a4cb98862d7a9..cc22314851b15182de57bc43e1ca7cb63f723704 100644 (file)
--- 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 e42c4ef2bde1df0a7e9d983683d482a1f84fdbd7..e00e1d724f3e44618b782a249bea0a172ca0fee9 100644 (file)
--- 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 8ce3cb5ae97b4208774d830d30c809570731a96c..1a4fee810718c8c1ddcba4506007482f04638035 100644 (file)
--- 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 9447505a56795f6536bd90f9865cd9736db1fc3f..834b4b66e798447a423b6ca246f704041949520c 100644 (file)
--- 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 5197adb1e454eeac7db1794c98867959809cdbc7..3a638443276c92c73d2ffa5524706a241b38e5a8 100644 (file)
--- 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 840498c041d3e4d20c707e398c0b0a8028ef625a..ab0be7a2365fab82ac8745ee36c22fa65ef76d9f 100644 (file)
--- 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 2b308407bfe591a9fee4badf0fdc5d39db9eeb78..2e7536accabbbfd749f68f20ac20b907df231d3f 100644 (file)
--- 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 6bf1fa5967a5bbb4bc248312355899a2b9407e59..1b4d2e83cf10cb27e2ee9436c08094d3e24f8e15 100644 (file)
--- 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 f56c270e80f478444c36957da15bbed5976b36f0..7369d40d3592cf063e935b6b1228ef77ad9f44ad 100644 (file)
--- 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 d8bba23b6fcf2e2c401a953df18bf568aedf5c49..14ea595b68d9cd147b2b41e84c3e149af423c466 100644 (file)
--- 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 d0a184705ff2bdc3b598a8a9b7af902111cf59fe..1a3c1fffb9231afaf4b06b488a84dc326b0a22c6 100644 (file)
--- 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 59c8ff3e6ee9067c0f16378b7660c82d820e08fd..d2a07b73aedf06870ad51a136ffba1d24383399f 100644 (file)
--- 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 adec20e84704e66a44d2d8d95bb7639d99d270a6..b4a95b44a850d3c8dfc52fc4654829e309b18147 100644 (file)
--- 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 f4bea483e68bd14ec79aa51aec20b17c25084c7d..28c676ec59d2f45310ce0f05d3bfe0e184616053 100644 (file)
--- 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 133a1513acdef46cba5bb2cefc808f601e104716..8602da3d59c638d663777c549bb9c148cae6b86b 100644 (file)
--- 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 b3c0dbfac04e2abb9e406e4599918b447390b033..7879291968fd13fe1d154abd088c7a22a72a2718 100644 (file)
--- 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 a247782199c7c3e12a05676596395c86d5aef6e1..6bc925b8bd3fa2bedd3f2af0f86ea4958a618a9b 100644 (file)
--- 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 0318c2b3bddb3a26b3f0525573f102c246132d58..a50d9a1e93c7830ae6f3b1174d410c16d30628d4 100644 (file)
--- 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 811d6380386f5ede159e0aac4b7c4b3ba0f54f09..d827d61cc4d8d37628b14a13287f981ce49106b4 100644 (file)
--- 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 0bcf7995a8b43b16acea58debac6b4ffab68524b..0980db7abef3bea43d9bc64bf018799620bb041c 100644 (file)
--- 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 5351aa278c98bec968dabe03e20339284c8321f8..78dd8d29d0ed29179c49fdff8e39dc88436bcb6a 100644 (file)
--- 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 174d313d24c686edd1ceefff42616d5e3a0148c1..eef5ed66a7ad30be6ccdda99f7c1bcd33d2478ec 100644 (file)
--- 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 30b264a525c1ec4afb17d4705d91f8e90ca136de..58b8be3befd3d734aeac7d221366416cfdcad9d1 100644 (file)
--- 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 7f309979d7c30e8b89ae52249f6a50026933be26..bc5887a7ebbb0d4d00df31123f50bf0baf7b130a 100644 (file)
--- 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 e2d7c0222dfde2e9bf898d92d68afc25dc4224db..25527a8bbb2a94cd4c51a0e2e5d31507f22ef997 100644 (file)
--- 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 5ac71b428e44d793bc74f49e1dfb569bc4f04311..2e568bb60da46f61f3a12e89f8b43f33e4b6ac22 100644 (file)
--- 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 5bce28b1f5bea78e7dda2209ce29228ece0c578e..daf348a9e2823f51e36a1ebfe0a5848541f5cc8e 100644 (file)
--- 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 da173ce175eb631a55bdfe50cf245869c9542279..2572cb8794f5a2b801ab97d904fd30cadcc4309f 100644 (file)
--- 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 23de1538198bf2c72aa3764d7f3856c41e7868a5..27416735580647632a56daaed1f24072eff2be09 100644 (file)
--- 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 87731185b22fc27b1b4696cd914235454b000b1f..ecc56e7a92e0de97a17992d9f9cd4326fc43462a 100644 (file)
--- 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 d7dc8b2c0fced88746f56db95bd98de9c994160c..9ed00f30d1c37ec2049d89d63d662db1fac7dffa 100644 (file)
--- 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 b55c19aae908c7a74c5fdea3339bfac97557f7a2..ae36dab715123d4917dc5ec59f54486dd07f5e4b 100644 (file)
--- 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 5681e0394e620ea54f78f986724ed8b117746cc0..c2627c9c09c1495d7ea610328437e0a69893ea68 100644 (file)
--- 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 d27efbf8a1d62e52ded6081669ea05d035dced01..4b08de3b09d1852c29af2fdb4db03580b7a171b1 100644 (file)
--- 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 cc1e2d7e7bbe9953cf31ed967ccb93802a90898e..551b32e61dd512dc9fc445068a29b8ee2b45ee44 100644 (file)
--- 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 bff21fb4ac96e86c442a9745eaaa925be1d84e6f..6a23a827856c38d9bfaedfd058ff78be45a31435 100644 (file)
--- 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 4c8d0f3bf3f3af1a55b3dc699e22375068fe0bc1..05f408eca6daa26e82289de97da5ac29233e7e6c 100644 (file)
--- 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 0df6891799dd8a3006da9c2a1c1880fcc16a86b6..ed78b40cefb7e22e8c55ffd546c95d50bca344bc 100644 (file)
--- 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 301fa4a5b862906b55409d8025c64ae3915afe36..6469df8c135dab130712487f9a4644438ed7bec8 100644 (file)
--- 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 61068e06b2f7e5df80cd4275b33627eca633edd6..f10467986dcb0d4215f591bfa4b881b61ef3567b 100644 (file)
--- 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 168dd3f5fcb5490fe65e7d636b7ba401d32c34eb..60ef387717f74700569c72efcb3a88b6f3e2932a 100644 (file)
--- 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 72e53de813cfd462c7459c4b276adf37f88d75bf..07703148e414065f616c0d84e734295121a97bb2 100644 (file)
--- 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 4957539e6cf556214c5c0c5ebb83b48393a25582..042e9190f4538ac64e26b3171904c309a220986d 100644 (file)
--- 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 58964c5a67304d5ccbd46c38b32a4717083f913c..c0138cd73bb31eac30d811594160a7d2737d1aff 100644 (file)
--- 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 5e0fffe1d7e38e3a38927d23caf5f09b262b5a1d..96009c4c1532dc30478682db4f06635fd10bc544 100644 (file)
--- 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 657a49cb172c32142983077ae6620ed0ccda835c..1c499e5251dca6e900fd8cf5b782ed235dd1307e 100644 (file)
--- 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 2c8b5f65128fa53c4c17599d5f0aa29488fff14e..c517a23179d9d2eb35c8849bde6d57490bca12e0 100755 (executable)
--- 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 f7242cf75f1b07e497a4f1f6db67077457966e61..241258b758e69803ef90b8106c61b360a89ee6ae 100755 (executable)
--- 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 edd74dab2ea0cebcb8aae788bcee022d16fcb291..a59d4340ae931129d48f01825005150b5c00528b 100755 (executable)
--- 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;