[142776] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 142776
          https://trac.macports.org/changeset/142776
Author:   ryandesign at macports.org
Date:     2015-11-22 18:21:45 -0800 (Sun, 22 Nov 2015)
Log Message:
-----------
graphviz, graphviz-devel: fix configure failure with nawk rather than declaring a conflict

Modified Paths:
--------------
    trunk/dports/graphics/graphviz/Portfile
    trunk/dports/graphics/graphviz-devel/Portfile

Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile	2015-11-23 02:11:03 UTC (rev 142775)
+++ trunk/dports/graphics/graphviz/Portfile	2015-11-23 02:21:45 UTC (rev 142776)
@@ -2,7 +2,6 @@
 # $Id$
 
 PortSystem                      1.0
-PortGroup                       conflicts_build 1.0
 PortGroup                       xcodeversion 1.0
 
 # Please keep the graphviz and graphviz-devel ports as similar as possible.
@@ -60,9 +59,6 @@
 
 depends_run                     port:urw-fonts
 
-# nawk: illegal jump type 339
-conflicts_build                 nawk
-
 configure.args                  --disable-silent-rules \
                                 --with-codegens \
                                 --without-x \
@@ -104,7 +100,8 @@
                                 --disable-python25 \
                                 --disable-r \
                                 --disable-ruby \
-                                --disable-tcl
+                                --disable-tcl \
+                                ac_cv_prog_AWK=/usr/bin/awk
 
 # Teach glibtool about -stdlib=libc++
 use_autoreconf  yes
@@ -361,11 +358,9 @@
     
     patchfiles                  patch-cmd-gvedit-Makefile.in.diff
     
-    # nawk: illegal jump type 339
-    conflicts_build             nawk
-    
     configure.args              --disable-silent-rules \
-                                --with-qt
+                                --with-qt \
+                                ac_cv_prog_AWK=/usr/bin/awk
     
     build.dir                   ${worksrcpath}/cmd/gvedit
     

Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile	2015-11-23 02:11:03 UTC (rev 142775)
+++ trunk/dports/graphics/graphviz-devel/Portfile	2015-11-23 02:21:45 UTC (rev 142776)
@@ -2,7 +2,6 @@
 # $Id$
 
 PortSystem                      1.0
-PortGroup                       conflicts_build 1.0
 PortGroup                       xcodeversion 1.0
 
 # Please keep the graphviz and graphviz-devel ports as similar as possible.
@@ -61,9 +60,6 @@
 
 depends_run                     port:urw-fonts
 
-# nawk: illegal jump type 339
-conflicts_build                 nawk
-
 configure.args                  --disable-silent-rules \
                                 --with-codegens \
                                 --without-x \
@@ -105,7 +101,8 @@
                                 --disable-python25 \
                                 --disable-r \
                                 --disable-ruby \
-                                --disable-tcl
+                                --disable-tcl \
+                                ac_cv_prog_AWK=/usr/bin/awk
 
 # Teach glibtool about -stdlib=libc++
 use_autoreconf  yes
@@ -362,11 +359,9 @@
     
     patchfiles                  patch-cmd-gvedit-Makefile.in.diff
     
-    # nawk: illegal jump type 339
-    conflicts_build             nawk
-    
     configure.args              --disable-silent-rules \
-                                --with-qt
+                                --with-qt \
+                                ac_cv_prog_AWK=/usr/bin/awk
     
     build.dir                   ${worksrcpath}/cmd/gvedit
     
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/0e63b31c/attachment.html>