[41011] trunk/dports/graphics/openjpeg

[mcalhoun at macports.org]

Revision: 41011
          http://trac.macports.org/changeset/41011
Author:   mcalhoun at macports.org
Date:     2008-10-20 15:03:42 -0700 (Mon, 20 Oct 2008)
Log Message:
-----------
openjpeg: Fixes mallformed current_version passed to ld and sets correct version number in Makefile.osx (fixes #16931).

Modified Paths:
--------------
    trunk/dports/graphics/openjpeg/Portfile
    trunk/dports/graphics/openjpeg/files/patch-Makefile.osx.diff

Modified: trunk/dports/graphics/openjpeg/Portfile
===================================================================
--- trunk/dports/graphics/openjpeg/Portfile	2008-10-20 21:58:19 UTC (rev 41010)
+++ trunk/dports/graphics/openjpeg/Portfile	2008-10-20 22:03:42 UTC (rev 41011)
@@ -5,7 +5,7 @@
 
 name             openjpeg
 version          1.3
-revision         1
+revision         2
 categories       graphics
 maintainers      mcalhoun
 description      Library for manipulating JPEG-2000 images
@@ -34,6 +34,9 @@
     reinplace \
         "s| -o root -g wheel | -o ${install.user} -g ${install.group} |g" \
         ${worksrcpath}/Makefile.osx
+    reinplace \
+        "s|VER_MINOR = 1.2|VER_MINOR = ${version}|g" \
+        ${worksrcpath}/Makefile.osx
 }
 
 post-configure {

Modified: trunk/dports/graphics/openjpeg/files/patch-Makefile.osx.diff
===================================================================
--- trunk/dports/graphics/openjpeg/files/patch-Makefile.osx.diff	2008-10-20 21:58:19 UTC (rev 41010)
+++ trunk/dports/graphics/openjpeg/files/patch-Makefile.osx.diff	2008-10-20 22:03:42 UTC (rev 41011)
@@ -5,7 +5,7 @@
  
  $(SHAREDLIB): $(MODULES)
 -	$(LIBTOOLDYN) -dynamiclib -o $@ $(MODULES)
-+	$(LIBTOOLDYN) -dynamiclib -install_name $(INSTALL_LIBDIR)/$@  -current_version $(VER_MAJOR).$(VER_MINOR) -compatibility_version $(VER_MAJOR) -o $@ $(MODULES)
++	$(LIBTOOLDYN) -dynamiclib -install_name $(INSTALL_LIBDIR)/$@  -current_version $(VER_MAJOR).$(basename $(VER_MINOR)) -compatibility_version $(VER_MAJOR) -o $@ $(MODULES)
  
  install:
  	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081020/5230b4f5/attachment.html