[66142] trunk/dports/graphics/ImageMagick

[ryandesign at macports.org]

Revision: 66142
          http://trac.macports.org/changeset/66142
Author:   ryandesign at macports.org
Date:     2010-04-05 23:31:59 -0700 (Mon, 05 Apr 2010)
Log Message:
-----------
ImageMagick: rewrite multiword flag -framework

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

Added Paths:
-----------
    trunk/dports/graphics/ImageMagick/files/
    trunk/dports/graphics/ImageMagick/files/patch-m4_ax_opencl.m4.diff

Modified: trunk/dports/graphics/ImageMagick/Portfile
===================================================================
--- trunk/dports/graphics/ImageMagick/Portfile	2010-04-06 06:19:04 UTC (rev 66141)
+++ trunk/dports/graphics/ImageMagick/Portfile	2010-04-06 06:31:59 UTC (rev 66142)
@@ -6,6 +6,7 @@
 name                        ImageMagick
 conflicts                   cryptlib
 version                     6.6.1-0
+revision                    1
 set reasonable_version      [lindex [split ${version} -] 0]
 homepage                    http://www.imagemagick.org/
 categories                  graphics devel
@@ -43,6 +44,8 @@
                             sha1    ad85735bff97c02573e0e714ab727348182b2ff9 \
                             rmd160  4fcf809e4a483acb82081851a57c2d35f989be10
 
+patchfiles                  patch-m4_ax_opencl.m4.diff
+
 depends_build               port:pkgconfig
 
 depends_lib                 port:xorg-libXext \
@@ -72,6 +75,8 @@
                             lib/libexpat.dylib \
                             lib/libxml2.dylib
 
+use_autoconf                yes
+
 pre-configure {
     if {[file exists ${prefix}/lib/libcl.dylib]} {
         ui_error "ImageMagick cannot be built while cryptlib is active. Pleease deactivate"

Added: trunk/dports/graphics/ImageMagick/files/patch-m4_ax_opencl.m4.diff
===================================================================
--- trunk/dports/graphics/ImageMagick/files/patch-m4_ax_opencl.m4.diff	                        (rev 0)
+++ trunk/dports/graphics/ImageMagick/files/patch-m4_ax_opencl.m4.diff	2010-04-06 06:31:59 UTC (rev 66142)
@@ -0,0 +1,18 @@
+--- m4/ax_opencl.m4.orig	2010-01-22 01:51:24.000000000 +0900
++++ m4/ax_opencl.m4	2010-04-06 03:54:50.000000000 +0900
+@@ -93,13 +93,13 @@
+                  [ax_check_cl_nvidia_flags="-L/usr/$ax_check_cl_libdir/nvidia" LIBS="$ax_try_lib $ax_check_cl_nvidia_flags $CL_LIBS $ax_save_LIBS"
+                  AC_LINK_IFELSE([AX_OPENCL_PROGRAM],
+                                 [ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_nvidia_flags"; break],
+-                                [ax_check_cl_dylib_flag='-framework OpenCL -L/System/Library/Frameworks/OpenCL.framework/Versions/A/Libraries' LIBS="$ax_try_lib $ax_check_cl_dylib_flag $CL_LIBS $ax_save_LIBS"
++                                [ax_check_cl_dylib_flag='-Wl,-framework,OpenCL -L/System/Library/Frameworks/OpenCL.framework/Versions/A/Libraries' LIBS="$ax_try_lib $ax_check_cl_dylib_flag $CL_LIBS $ax_save_LIBS"
+                                 AC_LINK_IFELSE([AX_OPENCL_PROGRAM],
+                                                [ax_cv_check_cl_libcl="$ax_try_lib $ax_check_cl_dylib_flag"; break])])])
+   done
+   
+   AS_IF([test "X$ax_cv_check_cl_libcl" = Xno -a X$no_x = Xyes],
+-        [LIBS='-framework OpenCL'
++        [LIBS='-Wl,-framework,OpenCL'
+         AC_LINK_IFELSE([AX_OPENCL_PROGRAM],
+                        [ax_cv_check_cl_libcl=$LIBS])])
+   
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100405/0b3e6dd0/attachment.html>