SConstruct: sort global constants, remove a redundant impot.

1 files changed, 16 insertions, 18 deletions

diff --git a/SConstruct b/SConstruct
index 609753b0..b310721f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -45,30 +45,30 @@ libgps_version_age = 0
 # Each variable foo has a corresponding @FOO@ expanded in .in files.
 # There are no project-dependent URLs or references to the hosting site
 # anywhere else in the distribution; preserve this property!
-sitename = "Savannah"
-sitesearch = "catb.org"
-website = "http://catb.org/gpsd"
-mainpage = "https://savannah.nongnu.org/projects/gpsd/"
-webupload = "login.ibiblio.org:/public/html/catb/gpsd"
-cgiupload = "root@thyrsus.com:/var/www/cgi-bin/"
-scpupload = "dl.sv.nongnu.org:/releases/gpsd/"
-mailman = "https://lists.nongnu.org/mailman/listinfo/"
 admin = "https://savannah.nongnu.org/project/admin/?group=gpsd"
-download = "http://download-mirror.savannah.gnu.org/releases/gpsd/"
-bugtracker = "https://savannah.nongnu.org/bugs/?group=gpsd"
+annmail = "gpsd-announce@nongnu.org"
 browserepo = "http://git.savannah.gnu.org/cgit/gpsd.git"
+bugtracker = "https://savannah.nongnu.org/bugs/?group=gpsd"
+cgiupload = "root@thyrsus.com:/var/www/cgi-bin/"
 clonerepo = "https://savannah.nongnu.org/git/?group=gpsd"
-gitrepo = "git://git.savannah.nongnu.org/gpsd.git"
-webform = "http://www.thyrsus.com/cgi-bin/gps_report.cgi"
-formserver = "www@thyrsus.com"
 devmail = "gpsd-dev@lists.nongnu.org"
-usermail = "gpsd-users@lists.nongnu.org"
-annmail = "gpsd-announce@nongnu.org"
+download = "http://download-mirror.savannah.gnu.org/releases/gpsd/"
+formserver = "www@thyrsus.com"
+gitrepo = "git://git.savannah.nongnu.org/gpsd.git"
 ircchan = "irc://chat.freenode.net/#gpsd"
+mailman = "https://lists.nongnu.org/mailman/listinfo/"
+mainpage = "https://savannah.nongnu.org/projects/gpsd/"
+scpupload = "dl.sv.nongnu.org:/releases/gpsd/"
+sitename = "Savannah"
+sitesearch = "catb.org"
 tiplink = "<a href='https://www.patreon.com/esr'>" \
           "leave a remittance at Patreon</a>"
 tipwidget = '<p><a href="https://www.patreon.com/esr">' \
             'Donate here to support continuing development.</a></p>'
+usermail = "gpsd-users@lists.nongnu.org"
+webform = "http://www.thyrsus.com/cgi-bin/gps_report.cgi"
+website = "http://catb.org/gpsd"
+webupload = "login.ibiblio.org:/public/html/catb/gpsd"
 # Hosting information ends here
 
 EnsureSConsVersion(2, 3, 0)
@@ -80,6 +80,7 @@ import operator
 import os
 import platform
 import re
+# replacement for functions from the commands module, which is deprecated.
 import subprocess
 import sys
 import time
@@ -90,9 +91,6 @@ import SCons
 
 PYTHON_SYSCONFIG_IMPORT = 'from distutils import sysconfig'
 
-# replacement for functions from the commands module, which is deprecated.
-import subprocess
-
 
 def _getstatusoutput(cmd, input=None, shell=True, cwd=None, env=None):
     pipe = subprocess.Popen(cmd, shell=shell, cwd=cwd, env=env,