[97136] trunk/dports/graphics/lensfun

[ryandesign at macports.org]

Revision: 97136
          https://trac.macports.org/changeset/97136
Author:   ryandesign at macports.org
Date:     2012-08-27 17:34:47 -0700 (Mon, 27 Aug 2012)
Log Message:
-----------
lensfun: fix "ld: malformed version number: 0.2.6.0" with older ld (#35864)

Modified Paths:
--------------
    trunk/dports/graphics/lensfun/Portfile
    trunk/dports/graphics/lensfun/files/patch-build-tibs-target-mac-mak.diff

Modified: trunk/dports/graphics/lensfun/Portfile
===================================================================
--- trunk/dports/graphics/lensfun/Portfile	2012-08-27 23:50:00 UTC (rev 97135)
+++ trunk/dports/graphics/lensfun/Portfile	2012-08-28 00:34:47 UTC (rev 97136)
@@ -30,9 +30,14 @@
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2
 
 # Ensure lensfun.pc is created
-patchfiles          patch-pkgconfig.diff \
-                    patch-build-tibs-target-mac-mak.diff
+patchfiles          patch-pkgconfig.diff
 
+# Set the correct library install_name and current_version
+patchfiles-append   patch-build-tibs-target-mac-mak.diff
+post-patch {
+    reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/build/tibs/target/mac.mak
+}
+
 configure.args      -v
 configure.env       LD="${configure.cxx}"
 

Modified: trunk/dports/graphics/lensfun/files/patch-build-tibs-target-mac-mak.diff
===================================================================
--- trunk/dports/graphics/lensfun/files/patch-build-tibs-target-mac-mak.diff	2012-08-27 23:50:00 UTC (rev 97135)
+++ trunk/dports/graphics/lensfun/files/patch-build-tibs-target-mac-mak.diff	2012-08-28 00:34:47 UTC (rev 97136)
@@ -5,6 +5,6 @@
  
  # Flag to tell Darwin linker to set the library name:
 -GCC.LDFLAGS.SHARED = -dynamiclib -Wl,"-dylib_install_name,$1"
-+GCC.LDFLAGS.SHARED = -dynamiclib -Wl,"-install_name,$(CONF_LIBDIR)$1" -Wl,"-current_version,$(CONF_VERSION)"
++GCC.LDFLAGS.SHARED = -dynamiclib -Wl,"-install_name,$(CONF_LIBDIR)$1" -Wl,"-current_version, at VERSION@"
  # Set to non-empty if platform supports versioned shared libraries
  SO.VERSION = 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120827/3e0051a9/attachment.html>