[136795] trunk/dports/net/gpsd

[ryandesign at macports.org]

Revision: 136795
          https://trac.macports.org/changeset/136795
Author:   ryandesign at macports.org
Date:     2015-05-27 00:15:41 -0700 (Wed, 27 May 2015)
Log Message:
-----------
gpsd: fix build on Mac OS X 10.4 Tiger

Modified Paths:
--------------
    trunk/dports/net/gpsd/Portfile
    trunk/dports/net/gpsd/files/patch-SConstruct.diff

Modified: trunk/dports/net/gpsd/Portfile
===================================================================
--- trunk/dports/net/gpsd/Portfile	2015-05-27 07:03:53 UTC (rev 136794)
+++ trunk/dports/net/gpsd/Portfile	2015-05-27 07:15:41 UTC (rev 136795)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 if {[variant_isset qt]} {
-PortGroup               qt4 1.0
+    PortGroup           qt4 1.0
 }
 
 name                    gpsd

Modified: trunk/dports/net/gpsd/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/net/gpsd/files/patch-SConstruct.diff	2015-05-27 07:03:53 UTC (rev 136794)
+++ trunk/dports/net/gpsd/files/patch-SConstruct.diff	2015-05-27 07:15:41 UTC (rev 136795)
@@ -1,5 +1,5 @@
---- SConstruct.orig	2015-03-14 22:24:41.000000000 +1100
-+++ SConstruct	2015-04-30 17:40:03.000000000 +1000
+--- SConstruct.orig	2015-03-14 06:24:41.000000000 -0500
++++ SConstruct	2015-05-27 01:49:59.000000000 -0500
 @@ -522,7 +522,7 @@
              # here; it's a security risk.  At install time we use
              # chrpath to edit this out of RPATH.
@@ -9,7 +9,7 @@
              print "chrpath is not available; please build with chrpath=no."
  
      confdefs = ["/* gpsd_config.h.  Generated by scons, do not hand-hack.  */\n"]
-@@ -747,8 +747,9 @@
+@@ -747,16 +747,19 @@
  # ifdef __cplusplus
  extern "C" {
  # endif
@@ -18,9 +18,21 @@
  typedef int clockid_t;
 +#define CLOCKID_T_DEFINED
  # endif
- /* OS X uses _STRUCT_TIMESPEC, but no clock_gettime */
- #ifndef _STRUCT_TIMESPEC
-@@ -922,6 +923,7 @@
+-/* OS X uses _STRUCT_TIMESPEC, but no clock_gettime */
+-#ifndef _STRUCT_TIMESPEC
++/* OS X 10.5 and later use _STRUCT_TIMESPEC; 10.4 uses _TIMESPEC; 10.3 and earlier use _TIMESPEC_DEFINED */
++#if !defined _STRUCT_TIMESPEC && !defined _TIMESPEC && !defined _TIMESPEC_DEFINED
+ struct timespec {
+     time_t  tv_sec;
+     long    tv_nsec;
+ };
++#define _STRUCT_TIMESPEC
+ #endif
++/* OS X does not have clock_gettime */
+ #define CLOCK_REALTIME	0
+ int clock_gettime(clockid_t, struct timespec *);
+ # ifdef __cplusplus
+@@ -922,6 +925,7 @@
          ilib_suffix = '.' + version + shlib_suffix
          shlink_flags += [ '-current_version', '%s' % version,
                            '-compatibility_version', '%s' % version,
@@ -28,7 +40,7 @@
                            '-undefined', 'dynamic_lookup' ]
  
      ilib = env.SharedLibrary(libname,lib_objs,
-@@ -1148,17 +1150,8 @@
+@@ -1148,17 +1152,8 @@
          basecflags += ' -coverage'
          ldflags += ' -coverage'
          ldshared += ' -coverage'
@@ -47,7 +59,7 @@
      ldshared=ldshared.replace('-fPIE', '')
      ldshared=ldshared.replace('-pie', '')
      python_env.Replace(SHLINKFLAGS=[],
-@@ -1397,7 +1390,7 @@
+@@ -1397,7 +1392,7 @@
  if qt_env:
      binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150527/5876a04e/attachment.html>