[140914] trunk/dports/graphics/GraphicsMagick

[ryandesign at macports.org]

Revision: 140914
          https://trac.macports.org/changeset/140914
Author:   ryandesign at macports.org
Date:     2015-10-05 06:59:14 -0700 (Mon, 05 Oct 2015)
Log Message:
-----------
GraphicsMagick: update to 1.3.22

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

Added Paths:
-----------
    trunk/dports/graphics/GraphicsMagick/files/
    trunk/dports/graphics/GraphicsMagick/files/patch-configure.diff

Modified: trunk/dports/graphics/GraphicsMagick/Portfile
===================================================================
--- trunk/dports/graphics/GraphicsMagick/Portfile	2015-10-05 10:55:26 UTC (rev 140913)
+++ trunk/dports/graphics/GraphicsMagick/Portfile	2015-10-05 13:59:14 UTC (rev 140914)
@@ -4,7 +4,7 @@
 PortSystem              1.0
 
 name                    GraphicsMagick
-version                 1.3.21
+version                 1.3.22
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              graphics
 platforms               darwin
@@ -23,8 +23,8 @@
 master_sites            sourceforge:project/graphicsmagick/graphicsmagick/${version} \
                         ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${branch}/
 
-checksums               rmd160  3291684d741854fe5922bc6754a7457513233647 \
-                        sha256  9045304d991776b6a37e1b45b9b6ef152593ada0d49bc744263565617cbf3c1f
+checksums               rmd160  ee759b9a0f42752a0ff9e7dbfb5f98f12087fb06 \
+                        sha256  36931b97a78bb80c04c7bd66b44b6aacd5d9f7758cb72f03f232f5a1728f8dc6
 
 depends_lib             port:libxml2 \
                         port:bzip2 \
@@ -41,6 +41,8 @@
 
 use_xz                  yes
 
+patchfiles              patch-configure.diff
+
 # llvm-gcc-4.2 gives "Undefined symbols for architecture x86_64: ___builtin_object_size"
 compiler.blacklist      *llvm-gcc-4.2
 

Added: trunk/dports/graphics/GraphicsMagick/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/GraphicsMagick/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/graphics/GraphicsMagick/files/patch-configure.diff	2015-10-05 13:59:14 UTC (rev 140914)
@@ -0,0 +1,56 @@
+Remove CFLAGS and LDFLAGS deduplication code which prevents universal builds from succeeding.
+http://sourceforge.net/p/graphicsmagick/bugs/320/
+http://hg.code.sf.net/p/graphicsmagick/code/rev/62387f365b84
+--- configure.orig	Sun Oct 04 12:42:33 2015 -0500
++++ configure	Mon Oct 05 08:44:32 2015 -0500
+@@ -30328,50 +30328,6 @@
+ 
+ 
+ #
+-# Deduplicate LDFLAGS
+-#
+-LDFLAGS_NEW=''
+-for flag in $LDFLAGS
+-do
+-    add=yes
+-    for test_flag in $LDFLAGS_NEW
+-    do
+-        if test $flag = $test_flag
+-        then
+-            add=no
+-            break
+-        fi
+-    done
+-    if test $add = yes
+-    then
+-        LDFLAGS_NEW="$LDFLAGS_NEW $flag"
+-    fi
+-done
+-LDFLAGS=$LDFLAGS_NEW
+-
+-#
+-# Deduplicate CFLAGS
+-#
+-CFLAGS_NEW=''
+-for flag in $CFLAGS
+-do
+-    add=yes
+-    for test_flag in $CFLAGS_NEW
+-    do
+-        if test $flag = $test_flag
+-        then
+-            add=no
+-            break
+-        fi
+-    done
+-    if test $add = yes
+-    then
+-        CFLAGS_NEW="$CFLAGS_NEW $flag"
+-    fi
+-done
+-CFLAGS=$CFLAGS_NEW
+-
+-#
+ # Remove extraneous spaces from output variables (asthetic)
+ #
+ X_CFLAGS=`echo $X_CFLAGS | sed -e 's/  */ /g'`
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151005/7f11ed6d/attachment.html>