[92639] trunk/dports/net/gpsd

[ryandesign at macports.org]

Revision: 92639
          https://trac.macports.org/changeset/92639
Author:   ryandesign at macports.org
Date:     2012-05-02 16:06:25 -0700 (Wed, 02 May 2012)
Log Message:
-----------
gpsd: fix install_name of libraries; copy already-created lib symlinks in post-destroot instead of creating our own

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

Modified: trunk/dports/net/gpsd/Portfile
===================================================================
--- trunk/dports/net/gpsd/Portfile	2012-05-02 22:58:00 UTC (rev 92638)
+++ trunk/dports/net/gpsd/Portfile	2012-05-02 23:06:25 UTC (rev 92639)
@@ -9,7 +9,7 @@
 
 name                    gpsd
 version                 3.5
-revision                1
+revision                2
 license                 BSD
 categories              net
 maintainers             nomaintainer
@@ -50,8 +50,9 @@
 eval destroot.env-append ${destroot.destdir} ${build.env}
 
 post-destroot {
-    ln -s [glob -tails -directory ${destroot}${prefix}/lib libgps.*.dylib] ${destroot}${prefix}/lib/libgps.dylib
-    ln -s [glob -tails -directory ${destroot}${prefix}/lib libgpsd.*.dylib] ${destroot}${prefix}/lib/libgpsd.dylib
+    foreach lib {gps gpsd} {
+        copy ${worksrcpath}/lib${lib}.dylib ${destroot}${prefix}/lib
+    }
 }
 
 variant qt description {Build Qt bindings} {

Modified: trunk/dports/net/gpsd/files/SConstruct.patch
===================================================================
--- trunk/dports/net/gpsd/files/SConstruct.patch	2012-05-02 22:58:00 UTC (rev 92638)
+++ trunk/dports/net/gpsd/files/SConstruct.patch	2012-05-02 23:06:25 UTC (rev 92639)
@@ -1,5 +1,5 @@
 --- SConstruct.orig	2012-04-14 08:36:18.000000000 -0500
-+++ SConstruct	2012-05-02 16:46:09.000000000 -0500
++++ SConstruct	2012-05-02 17:56:26.000000000 -0500
 @@ -397,7 +397,7 @@
      # use chrpath to edit this out of RPATH.
      if env["shared"]:
@@ -9,7 +9,15 @@
      print "chrpath is not available, forcing static linking."
      env["shared"] = False
  
-@@ -1147,7 +1147,7 @@
+@@ -700,6 +700,7 @@
+         ilib_suffix = '.' + libgps_version + shlib_suffix
+         shlink_flags += [ '-current_version', '%s' % libgps_version,
+                           '-compatibility_version', '%s' % libgps_version,
++                          '-install_name', '%s/%s/lib%s.%s.dylib' % (env['prefix'], env['libdir'], libname, libgps_version),
+                           '-undefined', 'dynamic_lookup' ]
+ 
+     ilib = env.SharedLibrary(libname,lib_objs,
+@@ -1147,7 +1148,7 @@
      binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
  
  # We don't use installdir here in order to avoid having DESTDIR affect the rpath
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120502/45f4deac/attachment.html>