[142975] trunk/dports/graphics/gimp-gap-devel

[devans at macports.org]

Revision: 142975
          https://trac.macports.org/changeset/142975
Author:   devans at macports.org
Date:     2015-11-30 10:54:27 -0800 (Mon, 30 Nov 2015)
Log Message:
-----------
gimp-gap-devel: update to git branch gap-2-8 as of 20151108, configuration, add +quartz variant and use active_variants to check for correct flavor of gimp2.

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

Removed Paths:
-------------
    trunk/dports/graphics/gimp-gap-devel/files/patch-autogen.sh.diff

Modified: trunk/dports/graphics/gimp-gap-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp-gap-devel/Portfile	2015-11-30 18:37:20 UTC (rev 142974)
+++ trunk/dports/graphics/gimp-gap-devel/Portfile	2015-11-30 18:54:27 UTC (rev 142975)
@@ -2,12 +2,13 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       active_variants 1.1
 
 name            gimp-gap-devel
 conflicts       gimp-gap
 set git_name    gimp-gap
-set git_commit  cf82e0e665cc6a0c8e4ce1bca67a93d9e15a95c7
-set git_date    20150207
+set git_commit  dc902cc25d103e5602a114f69a6932587cf3ea52
+set git_date    20151108
 version         2.7.0-${git_date}
 license         GPL-2+
 categories      graphics
@@ -32,15 +33,14 @@
 
 distname        ${git_name}-${git_commit}
 
-checksums       rmd160  6ed7dd2ef1def5d311a06648cc4bd9f6a141d54e \
-                sha256  5138d573110c6be05432ac8430782950d08212a1aabe5cdb0241ab38ac761bfe
+checksums       rmd160  a400caec0a761d2fc74f6dc6f30707d6b8ad1d21 \
+                sha256  9e628bd896b7a33c7445ef32d46a212817877e43b5f89a91eb96b24e118b6cfb
 
 pre-patch       {
                     system "cd ${worksrcpath}/extern_libs && gzip -dc ffmpeg.tar.gz | tar -xf -"
                 }
 
 patchfiles      patch-extern_libs-configure_options_ffmpeg.txt.diff \
-                patch-autogen.sh.diff \
                 patch-automake-1.13.diff
 
 post-patch     {
@@ -74,11 +74,6 @@
                 port:sox \
                 port:ufraw
 
-# TODO: Fix the actual bug.  This just masks the problem to build successfully
-if {[string match *clang* ${configure.compiler}]} {
-    configure.cflags-append -Wno-return-type
-}
-
 configure.cmd    ./autogen.sh
 
 configure.args  --enable-audio-support-sdl \
@@ -100,4 +95,12 @@
     }
 }
 
+variant quartz {}
+
+if {[variant_isset quartz]} {
+    require_active_variants gimp2 quartz
+} else {
+    require_active_variants gimp2 "" quartz
+}
+
 livecheck.type  none

Deleted: trunk/dports/graphics/gimp-gap-devel/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/graphics/gimp-gap-devel/files/patch-autogen.sh.diff	2015-11-30 18:37:20 UTC (rev 142974)
+++ trunk/dports/graphics/gimp-gap-devel/files/patch-autogen.sh.diff	2015-11-30 18:54:27 UTC (rev 142975)
@@ -1,17 +0,0 @@
---- autogen.sh.orig	2015-02-11 06:21:07.000000000 -0800
-+++ autogen.sh	2015-02-11 06:23:56.000000000 -0800
-@@ -88,7 +88,13 @@
- 
- 
- echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
--if (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then
-+if (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-1.15
-+   ACLOCAL=aclocal-1.15
-+elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-1.14
-+   ACLOCAL=aclocal-1.14
-+elif (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-1.13
-    ACLOCAL=aclocal-1.13
- elif (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/2d269ce7/attachment.html>