[135655] trunk/dports/graphics/gimp-gap

devans at macports.org devans at macports.org
Tue Apr 28 21:26:27 PDT 2015


Revision: 135655
          https://trac.macports.org/changeset/135655
Author:   devans at macports.org
Date:     2015-04-28 21:26:26 -0700 (Tue, 28 Apr 2015)
Log Message:
-----------
gimp-gap: apply ccache patch to configure.in rather than configure to be effective, increment revision.

Modified Paths:
--------------
    trunk/dports/graphics/gimp-gap/Portfile

Added Paths:
-----------
    trunk/dports/graphics/gimp-gap/files/patch-configure.in-ccache.diff

Removed Paths:
-------------
    trunk/dports/graphics/gimp-gap/files/patch-configure-ccache.diff

Modified: trunk/dports/graphics/gimp-gap/Portfile
===================================================================
--- trunk/dports/graphics/gimp-gap/Portfile	2015-04-29 03:35:37 UTC (rev 135654)
+++ trunk/dports/graphics/gimp-gap/Portfile	2015-04-29 04:26:26 UTC (rev 135655)
@@ -6,7 +6,7 @@
 name            gimp-gap
 conflicts       gimp-gap-devel
 version         2.6.0
-revision        7
+revision        8
 license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 set ffmpeg-vers 0.5.6
@@ -47,7 +47,7 @@
 patchfiles      patch-extern_libs-configure_options_ffmpeg.txt.diff \
                 patch-extern_libs-Makefile.in.diff \
                 patch-ffmpeg-Makefile.diff \
-                patch-configure-ccache.diff
+                patch-configure.in-ccache.diff
 
 post-patch     {
                    if {${build_arch} ne ""} {

Deleted: trunk/dports/graphics/gimp-gap/files/patch-configure-ccache.diff
===================================================================
--- trunk/dports/graphics/gimp-gap/files/patch-configure-ccache.diff	2015-04-29 03:35:37 UTC (rev 135654)
+++ trunk/dports/graphics/gimp-gap/files/patch-configure-ccache.diff	2015-04-29 04:26:26 UTC (rev 135655)
@@ -1,12 +0,0 @@
-$CC needs to be quoted to allow "ccache /usr/bin/gcc-4.2"
---- gimp-gap-2.6.0/configure.orig	2010-10-20 03:30:54.000000000 +0200
-+++ gimp-gap-2.6.0/configure	2010-10-20 03:31:08.000000000 +0200
-@@ -7738,7 +7738,7 @@
-       fi
- 
-       if test "x$CC" != "x"; then
--      	 ff_pass_through_flags=" $ff_pass_through_flags --cc=$CC "
-+      	 ff_pass_through_flags=" $ff_pass_through_flags --cc=\"$CC\" "
-       fi
- 
-       FFMPEG_CONFIGURE_OPTIONS=" $ff_pass_through_flags $FFMPEG_CONFIGURE_OPTIONS"

Copied: trunk/dports/graphics/gimp-gap/files/patch-configure.in-ccache.diff (from rev 135654, trunk/dports/graphics/gimp-gap/files/patch-configure-ccache.diff)
===================================================================
--- trunk/dports/graphics/gimp-gap/files/patch-configure.in-ccache.diff	                        (rev 0)
+++ trunk/dports/graphics/gimp-gap/files/patch-configure.in-ccache.diff	2015-04-29 04:26:26 UTC (rev 135655)
@@ -0,0 +1,11 @@
+--- gimp-gap-2.6.0/configure.in.orig	2009-06-04 13:40:33.000000000 -0700
++++ gimp-gap-2.6.0/configure.in	2015-04-28 21:15:16.000000000 -0700
+@@ -447,7 +447,7 @@
+       fi
+ 
+       if test "x$CC" != "x"; then
+-      	 ff_pass_through_flags=" $ff_pass_through_flags --cc=$CC "
++      	 ff_pass_through_flags=" $ff_pass_through_flags --cc=\"$CC\" "
+       fi
+       
+       FFMPEG_CONFIGURE_OPTIONS=" $ff_pass_through_flags $FFMPEG_CONFIGURE_OPTIONS"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150428/0a380859/attachment-0001.html>


More information about the macports-changes mailing list