Pileus Git - ~andy/sunrise/blob - media-radio/xastir/files/xastir-1.9.4-scripts.diff

   1 diff -u scripts.orig/Makefile.am scripts/Makefile.am
   2 --- scripts.orig/Makefile.am    2008-06-24 17:48:59.000000000 +0200
   3 +++ scripts/Makefile.am 2008-08-16 07:47:00.000000000 +0200
   4 @@ -8,9 +8,7 @@
   5      coord-convert.pl \
   6      get-fcc-rac.pl \
   7      get-gnis \
   8 -    get-maptools.sh \
   9      get-NWSdata \
  10 -    get_shapelib.sh \
  11      gpx2shape \
  12      icontable.pl \
  13      inf2geo.pl \
  14 @@ -29,8 +27,6 @@
  15      track-get.pl \
  16      update_langfile.pl \
  17      waypoint-get.pl \
  18 -    xastir-fixcfg.sh \
  19 -    xastir-migrate.sh \
  20      Xastir_tigerpoly.py
  21
  22
  23 diff -u scripts.orig/coord-convert.pl scripts/coord-convert.pl
  24 --- scripts.orig/coord-convert.pl       2002-08-26 23:52:03.000000000 +0200
  25 +++ scripts/coord-convert.pl    2008-08-16 07:47:00.000000000 +0200
  26 @@ -26,7 +26,7 @@
  27  #
  28
  29
  30 -use lib "/usr/local/lib";
  31 +use lib "/usr/lib";
  32  use Coordinate;         # WE7U's Coordinate.pm module
  33
  34
  35 diff -u scripts.orig/get-NWSdata scripts/get-NWSdata
  36 --- scripts.orig/get-NWSdata    2008-07-18 17:26:39.000000000 +0200
  37 +++ scripts/get-NWSdata 2008-08-16 07:47:00.000000000 +0200
  38 @@ -40,7 +40,7 @@
  39  FILE6="fz25jn08"  # NWSM Libraries: Fire Weather Zone Boundaries
  40  FILE7="c_11mr07"  # County Libraries: AWIPS Counties
  41
  42 -cd /usr/local/share/xastir/Counties
  43 +cd /usr/share/xastir/Counties
  44
  45
  46  # Remove any old zip files hanging around in this directory
  47 diff -u scripts.orig/get-fcc-rac.pl scripts/get-fcc-rac.pl
  48 --- scripts.orig/get-fcc-rac.pl 2008-06-24 17:48:59.000000000 +0200
  49 +++ scripts/get-fcc-rac.pl      2008-08-16 08:07:57.000000000 +0200
  50 @@ -9,7 +9,7 @@
  51  #
  52  # Note: Run this script as root in order to write the files into the
  53  # destination directory listed below, or change directory write access.
  54 -my $XASTIR_BASE="/usr/local/share/xastir";
  55 +my $XASTIR_BASE="/usr/share/xastir";
  56
  57
  58  # This script uses temporary storage space in /var/tmp to do its work.
  59 diff -u scripts.orig/get-gnis scripts/get-gnis
  60 --- scripts.orig/get-gnis       2008-07-01 03:47:48.000000000 +0200
  61 +++ scripts/get-gnis    2008-08-16 08:07:12.000000000 +0200
  62 @@ -55,8 +55,8 @@
  63
  64      if ( [ -f ${MYSTATE}_DECI.txt ] )
  65      then
  66 -        printf "File successfully downloaded. Moving to /usr/local/share/xastir/GNIS\n"
  67 -        sudo mv ${MYSTATE}_DECI.txt /usr/local/share/xastir/GNIS/${MYSTATE}.gnis
  68 +        printf "File successfully downloaded. Moving to /usr/share/xastir/GNIS\n"
  69 +        sudo mv ${MYSTATE}_DECI.txt /usr/share/xastir/GNIS/${MYSTATE}.gnis
  70      else
  71          printf "File for %s not successfully downloaded.\n" ${MYSTATE}
  72      fi
  73 diff -u scripts.orig/get-maptools.sh scripts/get-maptools.sh
  74 --- scripts.orig/get-maptools.sh        2008-01-16 20:33:59.000000000 +0100
  75 +++ scripts/get-maptools.sh     2008-08-16 07:47:00.000000000 +0200
  76 @@ -135,11 +135,11 @@
  77         fi
  78      fi
  79
  80 -    if touch -a /usr/local/lib
  81 +    if touch -a /usr/lib
  82      then
  83 -        printf "We can modify /usr/local/lib\n"
  84 +        printf "We can modify /usr/lib\n"
  85      else
  86 -        printf "ERROR: We cannot modify /usr/local/lib - aborting\n"
  87 +        printf "ERROR: We cannot modify /usr/lib - aborting\n"
  88          exit
  89      fi
  90  fi
  91 @@ -163,22 +163,22 @@
  92         sudo touch $LDCONF_FILE
  93      fi
  94
  95 -    if (! grep /usr/local/lib $LDCONF_FILE 2>&1 > /dev/null)
  96 +    if (! grep /usr/lib $LDCONF_FILE 2>&1 > /dev/null)
  97      then
  98 -        printf "Warning: /usr/local/lib not in %s - adding it\n" $LDCONF_FILE
  99 +        printf "Warning: /usr/lib not in %s - adding it\n" $LDCONF_FILE
 100         if [ -f $LDCONF_FILE ]
 101         then
 102                 cp $LDCONF_FILE /tmp/ldconfig.tmp
 103                 $SUDO cp $LDCONF_FILE $LDCONF_FILE.orig.$$
 104         fi
 105 -        printf "/usr/local/lib\n" >> /tmp/ldconf.tmp
 106 +        printf "/usr/lib\n" >> /tmp/ldconf.tmp
 107          $SUDO cp /tmp/ldconf.tmp $LDCONF_FILE
 108
 109      fi
 110
 111 -    if (! grep /usr/local/lib $LDCONF_FILE 2>&1 > /dev/null)
 112 +    if (! grep /usr/lib $LDCONF_FILE 2>&1 > /dev/null)
 113      then
 114 -        printf "ERROR: could not add /usr/local/lib to %s - aborting\n " $LDCONFIG_FILE
 115 +        printf "ERROR: could not add /usr/lib to %s - aborting\n " $LDCONFIG_FILE
 116          exit
 117      fi
 118
 119 diff -u scripts.orig/icontable.pl scripts/icontable.pl
 120 --- scripts.orig/icontable.pl   2003-07-07 19:17:54.000000000 +0200
 121 +++ scripts/icontable.pl        2008-08-16 07:47:00.000000000 +0200
 122 @@ -29,7 +29,7 @@
 123  #--------------------------------------------------------------------------
 124
 125  # symbols file from XASTIR V2.1, change the path for your environment
 126 -$SYMBFILE = "/usr/local/share/xastir/symbols/symbols.dat";
 127 +$SYMBFILE = "/usr/share/xastir/symbols/symbols.dat";
 128
 129  #--------------------------------------------------------------------------
 130  %sympix = ();
 131 diff -u scripts.orig/permutations.pl scripts/permutations.pl
 132 --- scripts.orig/permutations.pl        2005-03-25 21:53:04.000000000 +0100
 133 +++ scripts/permutations.pl     2008-08-16 07:47:00.000000000 +0200
 134 @@ -34,7 +34,7 @@
 135  #
 136
 137
 138 -use lib "/usr/local/lib";
 139 +use lib "/usr/lib";
 140  use Coordinate;         # WE7U's Coordinate.pm module
 141
 142
 143 diff -u scripts.orig/test_coord.pl scripts/test_coord.pl
 144 --- scripts.orig/test_coord.pl  2003-01-06 23:42:17.000000000 +0100
 145 +++ scripts/test_coord.pl       2008-08-16 07:47:00.000000000 +0200
 146 @@ -33,7 +33,7 @@
 147
 148  #------------------------------------------------------------------------------------------------
 149
 150 -use lib "/usr/local/lib";
 151 +use lib "/usr/lib";
 152  use Coordinate;                # Snag WE7U's Coordinate module
 153
 154
 155 diff -u scripts.orig/toporama250k.pl scripts/toporama250k.pl
 156 --- scripts.orig/toporama250k.pl        2008-08-16 07:42:13.000000000 +0200
 157 +++ scripts/toporama250k.pl     2008-08-16 08:03:08.000000000 +0200
 158 @@ -28,14 +28,14 @@
 159  # map files for the whole of Canada!
 160  #
 161  #
 162 -# - "cd /usr/local/share/xastir/maps"
 163 +# - "cd /usr/share/xastir/maps"
 164  #
 165  # - Assure you have write privileges in the directory above either
 166  #   by becoming root using the "su" command, using "sudo", or
 167  #   temporarily changing ownership and/or privileges on the
 168  #   "maps" directory.
 169  #
 170 -# - "/usr/local/lib/xastir/toporama250k.pl"
 171 +# - "/usr/lib/xastir/toporama250k.pl"
 172  #
 173  # - The script will create/populate this directory heirarchy:
 174  #   .../maps/toporama/images/
 175 diff -u scripts.orig/toporama50k.pl scripts/toporama50k.pl
 176 --- scripts.orig/toporama50k.pl 2008-08-16 07:42:13.000000000 +0200
 177 +++ scripts/toporama50k.pl      2008-08-16 08:02:48.000000000 +0200
 178 @@ -27,14 +27,14 @@
 179  # map files for the whole of Canada!
 180  #
 181  #
 182 -# - "cd /usr/local/share/xastir/maps"
 183 +# - "cd /usr/share/xastir/maps"
 184  #
 185  # - Assure you have write privileges in the directory above either
 186  #   by becoming root using the "su" command, using "sudo", or
 187  #   temporarily changing ownership and/or privileges on the
 188  #   "maps" directory.
 189  #
 190 -# - "/usr/local/lib/xastir/toporama50k.pl"
 191 +# - "/usr/lib/xastir/toporama50k.pl"
 192  #
 193  # - The script will create/populate this directory heirarchy:
 194  #   .../maps/toporama/images/