"Any programmer who fails to comply with the standard naming, formatting,

or commenting conventions should be shot.  If it so happens that it is
inconvenient to shoot him, then he is to be politely requested to recode
his program in adherence to the above standard."
		-- Michael Spier, Digital Equipment Corporation

svn path=/branches/tk705/; revision=6152

1 files changed, 63 insertions, 63 deletions

diff --git a/buildtools/build-freebsd-ports.py b/buildtools/build-freebsd-ports.py
index b4031302..bf0b2c47 100644
--- a/buildtools/build-freebsd-ports.py
+++ b/buildtools/build-freebsd-ports.py
@@ -2,11 +2,11 @@
 #
 # Copyright (C) 2014  Dragon Research Labs ("DRL")
 # Portions copyright (C) 2012-2013  Internet Systems Consortium ("ISC")
-# 
+#
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notices and this permission notice appear in all copies.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS" AND DRL AND ISC DISCLAIM ALL
 # WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL DRL OR
@@ -33,9 +33,9 @@ import argparse
 import subprocess
 
 def check_dir(s):
-  if not os.path.isdir(s):
-    raise argparse.ArgumentTypeError("%r is not a directory" % s)
-  return s
+    if not os.path.isdir(s):
+        raise argparse.ArgumentTypeError("%r is not a directory" % s)
+    return s
 
 parser = argparse.ArgumentParser(description = __doc__,
                                  formatter_class = argparse.ArgumentDefaultsHelpFormatter)
@@ -57,15 +57,15 @@ args = parser.parse_args()
 svnversion = subprocess.check_output(("svnversion", "-c", args.svndir)).strip().split(":")[-1]
 
 if args.local_dist:
-  svnversion = svnversion.translate(None, "M")
+    svnversion = svnversion.translate(None, "M")
 
 if not svnversion.isdigit():
-  sys.exit("Sources don't look pristine, not building (%r)" % svnversion)
+    sys.exit("Sources don't look pristine, not building (%r)" % svnversion)
 
 branch  = os.path.basename(args.svndir.rstrip(os.path.sep))
 
 if branch != "trunk" and (branch[:2] != "tk" or not branch[2:].isdigit()):
-  sys.exit("Could not parse branch from working directory name, not building (%r)" % branch)
+    sys.exit("Could not parse branch from working directory name, not building (%r)" % branch)
 
 version = "0." + svnversion
 tarname = "rpki-%s-r%s" % (branch, svnversion)
@@ -74,39 +74,39 @@ tarball = tarname + ".tar.xz"
 portsdir_old = args.portsdir + ".old"
 
 if os.path.isdir(portsdir_old):
-  shutil.rmtree(portsdir_old)
+    shutil.rmtree(portsdir_old)
 
 if os.path.isdir(args.portsdir):
-  os.rename(args.portsdir, portsdir_old)
+    os.rename(args.portsdir, portsdir_old)
 
 shutil.copytree(os.path.join(args.svndir, "buildtools", "freebsd-skeleton"), args.portsdir)
 
 if args.local_dist:
-  subprocess.check_call(("svn", "export", args.svndir, os.path.join(args.portsdir, tarname)))
-  for fn, fmt in (("VERSION", "%s\n"), ("rpki/version.py", "VERSION = \"%s\"\n")):
-    with open(os.path.join(args.portsdir, tarname, fn), "w") as f:
-      f.write(fmt % version)
-  subprocess.check_call(("tar", "cJvvf", tarball, tarname), cwd = args.portsdir)
-  shutil.rmtree(os.path.join(args.portsdir, tarname))
+    subprocess.check_call(("svn", "export", args.svndir, os.path.join(args.portsdir, tarname)))
+    for fn, fmt in (("VERSION", "%s\n"), ("rpki/version.py", "VERSION = \"%s\"\n")):
+        with open(os.path.join(args.portsdir, tarname, fn), "w") as f:
+            f.write(fmt % version)
+    subprocess.check_call(("tar", "cJvvf", tarball, tarname), cwd = args.portsdir)
+    shutil.rmtree(os.path.join(args.portsdir, tarname))
 elif os.path.exists(os.path.join(portsdir_old, tarball)):
-  os.link(os.path.join(portsdir_old, tarball), os.path.join(args.portsdir, tarball))
+    os.link(os.path.join(portsdir_old, tarball), os.path.join(args.portsdir, tarball))
 elif os.path.exists(os.path.join("/usr/ports/distfiles", tarball)):
-  shutil.copy(os.path.join("/usr/ports/distfiles", tarball), os.path.join(args.portsdir, tarball))
+    shutil.copy(os.path.join("/usr/ports/distfiles", tarball), os.path.join(args.portsdir, tarball))
 
 if os.path.isdir(portsdir_old):
-  shutil.rmtree(portsdir_old)
+    shutil.rmtree(portsdir_old)
 
 if args.make_package or args.local_dist:
-  pkgdir = os.path.join(args.portsdir, "packages")
-  os.mkdir(pkgdir)
+    pkgdir = os.path.join(args.portsdir, "packages")
+    os.mkdir(pkgdir)
 
 py_lib     = re.compile(r"^lib/python\d+\.\d+")
 py_sitelib = re.compile(r"^lib/python\d+\.\d+/site-packages")
 
 if args.local_dist:
-  master_site = "file://" + args.portsdir + "/"
+    master_site = "file://" + args.portsdir + "/"
 else:
-  master_site = "http://download.rpki.net/"
+    master_site = "http://download.rpki.net/"
 
 formatdict = dict(SVNVERSION = svnversion, SVNBRANCH = branch, MASTER_SITE = master_site)
 
@@ -114,43 +114,43 @@ keepdirs = ("usr", "etc", "bin", "var", "lib", "libexec", "sbin", "share", "etc/
 
 for port in ("rpki-rp", "rpki-ca"):
 
-  base = os.path.join(args.portsdir, port)
-  stage = os.path.join(base, "work", "stage")
-  fn = os.path.join(args.portsdir, port, "Makefile")
-  with open(fn, "r") as f:
-    template = f.read()
-  with open(fn, "w") as f:
-    f.write(template % formatdict)
-
-  subprocess.check_call(("make", "makesum", "stage", "DISTDIR=" + args.portsdir, "NO_DEPENDS=yes"),
-                        cwd = base)
-
-  with open(os.path.join(base, "pkg-plist"), "w") as f:
-    usr_local = None
-    for dirpath, dirnames, filenames in os.walk(stage, topdown = False):
-      dn = dirpath[len(stage)+1:]
-      if dn.startswith("usr/local"):
-        if not usr_local and usr_local is not None:
-          f.write("@cwd\n")
-        usr_local = True
-        dn = dn[len("usr/local/"):]
-        dn = py_sitelib.sub("%%PYTHON_SITELIBDIR%%", dn)
-        if dn == "etc/rc.d":
-          continue
-      else:
-        if usr_local:
-          f.write("@cwd /\n")
-        usr_local = False
-      for fn in filenames:
-        f.write(os.path.join(dn, fn) + "\n")
-      if dn and dn not in keepdirs and not py_lib.match(dn):
-        f.write("@dirrm %s\n" % dn)
-
-  if args.make_package or args.local_dist:
-    subprocess.check_call(("make", "clean", "package", "DISTDIR=" + args.portsdir, "PKGREPOSITORY=" + pkgdir), cwd = base)
-
-  if not args.no_clean:
-    subprocess.check_call(("make", "clean"), cwd = base)
-
-  if not args.no_tarball and not args.no_clean:
-    subprocess.check_call(("tar", "czf", "%s-port.tgz" % port, port), cwd = args.portsdir)
+    base = os.path.join(args.portsdir, port)
+    stage = os.path.join(base, "work", "stage")
+    fn = os.path.join(args.portsdir, port, "Makefile")
+    with open(fn, "r") as f:
+        template = f.read()
+    with open(fn, "w") as f:
+        f.write(template % formatdict)
+
+    subprocess.check_call(("make", "makesum", "stage", "DISTDIR=" + args.portsdir, "NO_DEPENDS=yes"),
+                          cwd = base)
+
+    with open(os.path.join(base, "pkg-plist"), "w") as f:
+        usr_local = None
+        for dirpath, dirnames, filenames in os.walk(stage, topdown = False):
+            dn = dirpath[len(stage)+1:]
+            if dn.startswith("usr/local"):
+                if not usr_local and usr_local is not None:
+                    f.write("@cwd\n")
+                usr_local = True
+                dn = dn[len("usr/local/"):]
+                dn = py_sitelib.sub("%%PYTHON_SITELIBDIR%%", dn)
+                if dn == "etc/rc.d":
+                    continue
+            else:
+                if usr_local:
+                    f.write("@cwd /\n")
+                usr_local = False
+            for fn in filenames:
+                f.write(os.path.join(dn, fn) + "\n")
+            if dn and dn not in keepdirs and not py_lib.match(dn):
+                f.write("@dirrm %s\n" % dn)
+
+    if args.make_package or args.local_dist:
+        subprocess.check_call(("make", "clean", "package", "DISTDIR=" + args.portsdir, "PKGREPOSITORY=" + pkgdir), cwd = base)
+
+    if not args.no_clean:
+        subprocess.check_call(("make", "clean"), cwd = base)
+
+    if not args.no_tarball and not args.no_clean:
+        subprocess.check_call(("tar", "czf", "%s-port.tgz" % port, port), cwd = args.portsdir)