Changeset 79508

Timestamp:

06/15/11 21:31:50 (4 years ago)

Author:

mcalhoun@…

Message:

freeimage: Update Version 3.14.1 -> 3.15.0. Add support for build_arch.

Location:

trunk/dports/graphics/freeimage

Files:

• Portfile (modified) (5 diffs)
• files (deleted)

trunk/dports/graphics/freeimage/Portfile

@@ -5 +5 @@
 
 name                freeimage
-version             3.14.1
+version             3.15.0
 license             FreeImage-1.0 GPL-2
 categories          graphics
@@ -24 +24 @@
 worksrcdir          FreeImage
 
-checksums           md5     4b43112aa199d8a439e0535b9c25d8a4 \
-                    sha1    cc09671e16460c27242280c2b6100f39974c89e1 \
-                    rmd160  5432f0aa922992ac74e5fefc115c1442bb48ce76
-
-patchfiles          patch-Makefile.gnu.diff
+checksums           md5     3b4f08e4985b269beb29a2fced1ef888 \
+                    sha1    ec2faa01d1b312aab68d77afe62861759c790100 \
+                    rmd160  5d309d0d8335129d00d6b5455613c89a419ebcac
 
 post-patch {
@@ -42 +40 @@
     # Do not force installation as root
     reinplace {s/-o root -g root//} ${worksrcpath}/Makefile.gnu
+    
+    # Darwin requires different arguments to build dynamic libraries
+    reinplace "s|-Wl,-soname,\$(VERLIBNAME)|-dynamiclib -install_name \$(PREFIX)/lib/\$(VERLIBNAME) -compatibility_version \$(VER_MAJOR) -current_version \$(VER_MAJOR).\$(VER_MINOR)|g" ${worksrcpath}/Makefile.gnu
+
+    # Darwin does not have a command ldconfig
+    reinplace "s|ldconfig||g" ${worksrcpath}/Makefile.gnu
+}
+
+if { [variant_isset universal] } {
+    post-patch {
+        reinplace "s|CFLAGS ?= |CFLAGS ?= ${configure.universal_cflags} |g" ${worksrcpath}/Makefile.gnu
+        reinplace "s|CXXFLAGS ?= |CXXFLAGS ?= ${configure.universal_cxxflags} |g" ${worksrcpath}/Makefile.gnu
+    }
+} else {
+    post-patch {
+        reinplace "s|CFLAGS ?= |CFLAGS ?= -arch ${build_arch} |g" ${worksrcpath}/Makefile.gnu
+        reinplace "s|CXXFLAGS ?= |CXXFLAGS ?= -arch ${build_arch} |g" ${worksrcpath}/Makefile.gnu
+    }
 }
 
 use_configure       no
 
-set CC "${configure.cc} ${configure.cflags}"
-set CXX "${configure.cxx} ${configure.cxxflags}"
-set LDFLAGS ${configure.ldflags}
 set VERLIBNAME libfreeimage.[lindex [split ${version} .] 0].dylib
 
-build.target        FreeImage
 build.args          -f Makefile.gnu \
                     PREFIX=${prefix} \
-                    VERLIBNAME=${VERLIBNAME}
-
-pre-build {
-    build.args-append \
-        CC="${CC}" \
-        CXX="${CXX}" \
-        LDFLAGS="${LDFLAGS}"
-}
+                    VERLIBNAME=${VERLIBNAME} \
+                    CC="${configure.cc}" \
+                    CXX="${configure.cxx}" \
+                    LDFLAGS="${configure.ldflags}"
 
 destroot.args       -f Makefile.gnu \
@@ -84 +92 @@
 pre-test {
     # Use correct compiler and flags when compiling test
-    reinplace s:g++:${CXX}: ${test.dir}/Makefile
-
-    # Use headers and libraries in source directories as Dist is not used
-    reinplace s:-I../Dist/:-I../Source/: ${test.dir}/Makefile
-    reinplace s:Dist/:: ${test.dir}/Makefile
+    reinplace s:g++:${configure.cxx}: ${test.dir}/Makefile
 
     # Build the test
@@ -94 +98 @@
 }
 
-variant universal {
-    append CC " ${configure.universal_cflags}"
-    append CXX " ${configure.universal_cxxflags}"
-    append LDFLAGS " ${configure.universal_ldflags}"
-}
-
 livecheck.type      regex
 livecheck.regex     {FreeImage (\d+(?:\.\d+)*) released}