ports/misc/gpsd3/patches/patch-SConstruct - diff

Return to patch-SConstruct CVS log

Up to [local] / ports / misc / gpsd3 / patches

Diff for /ports/misc/gpsd3/patches/Attic/patch-SConstruct between version 1.1 and 1.2

-version 1.1, 2017/12/05 09:21:57
+version 1.2, 2017/12/05 14:54:35
 Line 1
 Line 1
 Line 1
- --- SConstruct.orig     Fri Jan  8 22:25:48 2016
+ Index: SConstruct
- +++ SConstruct  Fri Mar 11 20:19:33 2016
+ --- SConstruct.orig
- @@ -390,7 +390,7 @@ def CheckPKG(context, name):
+ +++ SConstruct
+ @@ -483,7 +483,7 @@ def CheckPKG(context, name):
       return ret
   # Stylesheet URLs for making HTML and man pages from DocBook XML.
-Line 9
+Line 10
 Line 9
 Line 10
   docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
   docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
- @@ -550,7 +550,7 @@ else:
+ @@ -679,7 +679,7 @@ else:
           elif sys.platform.startswith('freebsd'):
-              ncurseslibs= [ '-lncurses' ]
+              ncurseslibs = ['-lncurses']
           elif sys.platform.startswith('openbsd'):
- -            ncurseslibs= [ '-lcurses' ]
+ -            ncurseslibs = ['-lcurses']
- +            ncurseslibs= [ '-lncurses' ]
+ +            ncurseslibs = ['-lncurses']
           elif sys.platform.startswith('darwin'):
-              ncurseslibs= [ '-lcurses' ]
+              ncurseslibs = ['-lcurses']
+          else:
+ @@ -1044,8 +1044,7 @@ if env['coveraging'] and env['python_coverage'] and no
+  # Two shared libraries provide most of the code for the C programs
- @@ -584,7 +584,7 @@ else:
-      if env['dbus_export'] and config.CheckPKG('dbus-1'):
-          confdefs.append("#define HAVE_DBUS 1\n")
- -        dbusflags = ["-ldbus-1"]
- +        dbusflags = pkg_config('dbus-1')
-          env.MergeFlags(pkg_config("dbus-1"))
-      else:
-          confdefs.append("/* #undef HAVE_DBUS */\n")
- @@ -823,7 +823,7 @@ int clock_gettime(clockid_t, struct timespec *);
-  ## Two shared libraries provide most of the code for the C programs
   libgps_version_soname = libgps_version_current - libgps_version_age
- -libgps_version = "%d.%d.%d" %(libgps_version_soname, libgps_version_age, libgps_version_revision)
+ -libgps_version = "%d.%d.%d" % (libgps_version_soname, libgps_version_age,
+ -                               libgps_version_revision)
  +libgps_version = "%d.%d" %(libgps_version_soname, libgps_version_revision)
   libgps_sources = [
       "ais_json.c",
- @@ -1134,7 +1134,7 @@ else:
+ @@ -1377,9 +1376,7 @@ else:
               python_objects[ext].append(
                   python_env.NoCache(
                       python_env.SharedObject(
- -                        src.split(".")[0] + '-py_' + '_'.join(['%s' %(x) for x in sys.version_info]) + so_ext, src
+ -                        src.split(".")[0] + '-py_'
- +                        src.split(".")[0] + so_ext, src
+ -                        + '_'.join(['%s' % (x) for x in sys.version_info])
+ -                        + python_config['SO'], src
+ +                        src.split(".")[0] + python_config['SO'], src
                       )
                   )
               )
- @@ -1309,7 +1309,6 @@ python_manpages = {
+ @@ -1597,7 +1594,6 @@ python_manpages = {
-      "gpscat.1" : "gpscat.xml",
+      "gpsprof.1": "gpsprof.xml",
-      "xgpsspeed.1" : "gps.xml",
+      "gpsfake.1": "gpsfake.xml",
-      "xgps.1" : "gps.xml",
+      "gpscat.1": "gpscat.xml",
- -    "gegps.1" : "gps.xml",
+ -    "gegps.1": "gps.xml",
-      }
+  }
+  if env['xgps']:
-  manpage_targets = []
+      python_manpages.update({

CVSweb