[96299] trunk/dports/graphics/freeimage

[ryandesign at macports.org]

Revision: 96299
          https://trac.macports.org/changeset/96299
Author:   ryandesign at macports.org
Date:     2012-08-06 23:51:08 -0700 (Mon, 06 Aug 2012)
Log Message:
-----------
freeimage: fix install_name of libfreeimageplus; add libfreeimageplus symlinks (#35521)

Modified Paths:
--------------
    trunk/dports/graphics/freeimage/Portfile

Added Paths:
-----------
    trunk/dports/graphics/freeimage/files/
    trunk/dports/graphics/freeimage/files/patch-Makefile.fip.diff

Modified: trunk/dports/graphics/freeimage/Portfile
===================================================================
--- trunk/dports/graphics/freeimage/Portfile	2012-08-07 06:32:20 UTC (rev 96298)
+++ trunk/dports/graphics/freeimage/Portfile	2012-08-07 06:51:08 UTC (rev 96299)
@@ -5,6 +5,8 @@
 
 name                freeimage
 version             3.15.3
+set major           [lindex [split ${version} .] 0]
+revision            1
 license             {FreeImage-1 GPL-2 GPL-3}
 categories          graphics
 platforms           macosx
@@ -26,8 +28,11 @@
 checksums           rmd160  f788023f12969b576630deff4a4daf741d10ae0f \
                     sha256  4618d59f2d9a20583b0f5fec99dcf832ccc3f317897b10592b85e7648375c044
 
-set VERLIBNAME libfreeimage.[lindex [split ${version} .] 0].dylib
+set libfreeimage libfreeimage.${major}.dylib
+set libfreeimageplus libfreeimageplus.${major}.dylib
 
+patchfiles          patch-Makefile.fip.diff
+
 post-patch {
     # Libraries extension is ".dylib" on Darwin, not ".so"
     reinplace {s/\.so/.dylib/} ${worksrcpath}/Makefile.gnu \
@@ -60,7 +65,7 @@
 
 build.args          -f Makefile.gnu \
                     PREFIX=${prefix} \
-                    VERLIBNAME=${VERLIBNAME} \
+                    VERLIBNAME=${libfreeimage} \
                     CC="${configure.cc} ${configure.cflags} [get_canonical_archflags cc]" \
                     CXX="${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]" \
                     LDFLAGS="${configure.ldflags}"
@@ -69,7 +74,7 @@
     # build FreeImagePlus
     system -W ${worksrcpath} "${build.cmd} -f Makefile.fip \
         PREFIX=${prefix} \
-        VERLIBNAME=${VERLIBNAME} \
+        VERLIBNAME=${libfreeimageplus} \
         CC='${configure.cc} ${configure.cflags} [get_canonical_archflags cc]' \
         CXX='${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]' \
         LDFLAGS='${configure.ldflags}'"
@@ -79,12 +84,12 @@
                     INCDIR=${destroot}${prefix}/include \
                     INSTALLDIR=${destroot}${prefix}/lib \
                     PREFIX=${prefix} \
-                    VERLIBNAME=${VERLIBNAME}
+                    VERLIBNAME=${libfreeimage}
 
 post-destroot {
     # install FreeImagePlus
     system -W ${worksrcpath} "${destroot.cmd} -f Makefile.fip install \
-        VERLIBNAME=${VERLIBNAME} \
+        VERLIBNAME=${libfreeimageplus} \
         CC='${configure.cc} ${configure.cflags} [get_canonical_archflags cc]' \
         CXX='${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]' \
         LDFLAGS='${configure.ldflags}' \

Added: trunk/dports/graphics/freeimage/files/patch-Makefile.fip.diff
===================================================================
--- trunk/dports/graphics/freeimage/files/patch-Makefile.fip.diff	                        (rev 0)
+++ trunk/dports/graphics/freeimage/files/patch-Makefile.fip.diff	2012-08-07 06:51:08 UTC (rev 96299)
@@ -0,0 +1,11 @@
+--- Makefile.fip.orig	2010-12-09 00:12:12.000000000 -0600
++++ Makefile.fip	2012-08-07 01:35:53.000000000 -0500
+@@ -67,6 +67,8 @@
+ 	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
+ 	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+ 	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
++	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
+ 
+ clean:
+ 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120806/fa3b6c2f/attachment-0001.html>