[114000] trunk/dports/graphics
ryandesign at macports.org
ryandesign at macports.org
Wed Nov 27 00:18:09 PST 2013
Revision: 114000
https://trac.macports.org/changeset/114000
Author: ryandesign at macports.org
Date: 2013-11-27 00:18:09 -0800 (Wed, 27 Nov 2013)
Log Message:
-----------
graphviz, graphviz-devel: use -replace where possible
Modified Paths:
--------------
trunk/dports/graphics/graphviz/Portfile
trunk/dports/graphics/graphviz-devel/Portfile
Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile 2013-11-27 08:08:37 UTC (rev 113999)
+++ trunk/dports/graphics/graphviz/Portfile 2013-11-27 08:18:09 UTC (rev 114000)
@@ -107,25 +107,25 @@
platform macosx {
if {${os.major} > 8} {
- configure.args-delete --without-quartz
- configure.args-append --with-quartz
+ configure.args-replace --without-quartz --with-quartz
}
}
variant guile description {Include Guile language bindings} {
depends_lib-append port:guile
depends_build-append port:swig-guile
- configure.args-delete --disable-swig \
- --disable-guile
- configure.args-append --enable-guile
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-guile --enable-guile
}
variant lua description {Include Lua language bindings} {
depends_lib-append port:lua
depends_build-append port:swig-lua
- configure.args-delete --disable-swig \
- --disable-lua
- configure.args-append --enable-lua
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-lua --enable-lua
+
post-patch {
reinplace "s|/usr/lib\$LIBPOSTFIX/lua|${prefix}/lib\$LIBPOSTFIX/lua|g" ${worksrcpath}/configure
}
@@ -134,27 +134,28 @@
variant ocaml description {Include Objective Caml language bindings} {
depends_lib-append port:ocaml
depends_build-append port:swig-ocaml
- configure.args-delete --disable-swig \
- --disable-ocaml
- configure.args-append --enable-ocaml
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-ocaml --enable-ocaml
configure.cppflags-append -I${prefix}/lib/ocaml
}
variant perl description {Include PERL 5 language bindings} {
depends_lib-append path:bin/perl:perl5
depends_build-append port:swig-perl
- configure.args-delete --disable-swig \
- --disable-perl
- configure.args-append --enable-perl
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-perl --enable-perl
configure.perl ${prefix}/bin/perl
}
variant php description {Include PHP language bindings} {
depends_lib-append path:bin/php:php5
depends_build-append port:swig-php5
- configure.args-delete --disable-swig \
- --disable-php
- configure.args-append --enable-php
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-php --enable-php
+
post-patch {
reinplace "s|/usr/include/php|${prefix}/include/php|g" ${worksrcpath}/configure
reinplace "s|/usr/lib\${LIBPOSTFIX}/php|${prefix}/lib\${LIBPOSTFIX}/php|g" ${worksrcpath}/configure
@@ -165,10 +166,11 @@
variant python24 description {Include Python 2.4 language bindings} conflicts python25 python26 {
depends_lib-append port:python24
depends_build-append port:swig-python
- configure.args-delete --disable-swig \
- --disable-python
- configure.args-append --enable-python
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python2.4
+
# The configure script asks python where to install
# This doesn't work for 2.4 and 2.5 (see #16334)
post-patch {
@@ -179,10 +181,11 @@
variant python25 description {Include Python 2.5 language bindings} conflicts python24 python26 {
depends_lib-append port:python25
depends_build-append port:swig-python
- configure.args-delete --disable-swig \
- --disable-python
- configure.args-append --enable-python
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python2.5
+
# The configure script asks python where to install
# This doesn't work for 2.4 and 2.5 (see #16334)
post-patch {
@@ -193,79 +196,76 @@
variant python26 description {Include Python 2.6 language bindings} conflicts python24 python25 {
depends_lib-append port:python26
depends_build-append port:swig-python
- configure.args-delete --disable-swig \
- --disable-python
- configure.args-append --enable-python
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python2.6
}
variant ruby description {Include Ruby language bindings} {
depends_lib-append port:ruby
depends_build-append port:swig-ruby
- configure.args-delete --disable-swig \
- --disable-ruby
- configure.args-append --enable-ruby
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-ruby --enable-ruby
}
variant tcl description {Include Tcl language bindings} {
depends_lib-append port:tcl
depends_build-append port:swig-tcl
- configure.args-delete --disable-swig \
- --disable-tcl
- configure.args-append --enable-tcl
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-tcl --enable-tcl
}
variant java description {Include Java language bindings} {
depends_build-append port:swig-java
- configure.args-delete --disable-swig \
- --disable-java
- configure.args-append --enable-java
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-java --enable-java
}
variant smyrna description {Include the Smyrna large graph viewer} {
- configure.args-delete --without-smyrna \
- --without-gtk \
- --without-gtkglext \
- --without-glade
- configure.args-append --with-smyrna \
- --with-gtk \
- --with-gtkglext \
- --with-glade
depends_lib-append port:freeglut \
port:gtk2 \
port:gtkglext \
port:libglade2
+
+ configure.args-replace --without-glade --with-glade
+ configure.args-replace --without-gtk --with-gtk
+ configure.args-replace --without-gtkglext --with-gtkglext
+ configure.args-replace --without-smyrna --with-smyrna
}
variant r description {Include R language bindings} {
depends_build-append port:swig-r
- configure.args-delete --disable-swig \
- --disable-r
- configure.args-append --enable-r
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-r --enable-r
}
variant rsvg description {enable the rsvg plugin} {
depends_lib-append port:librsvg
- configure.args-delete --without-rsvg
- configure.args-append --with-rsvg
+
+ configure.args-replace --without-rsvg --with-rsvg
}
variant gdk_pixbuf description {enable the gdk_pixbuf plugin} {
depends_lib-append port:gtk2
- configure.args-delete --without-gdk-pixbuf
- configure.args-append --with-gdk-pixbuf
+
+ configure.args-replace --without-gdk-pixbuf --with-gdk-pixbuf
}
variant glitz description {enable the incomplete glitz plugin} {
depends_lib-append port:glitz
- configure.args-delete --without-glitz
- configure.args-append --with-glitz
+
+ configure.args-replace --without-glitz --with-glitz
}
variant ming description {enable the incomplete ming plugin} {
depends_lib-append port:ming
- configure.args-delete --without-ming
- configure.args-append --with-ming
+
+ configure.args-replace --without-ming --with-ming
}
# Legacy no_pangocairo variant to be removed after February 2014
@@ -273,10 +273,9 @@
variant pangocairo conflicts no_pangocairo description {Add pangocairo support (antialiased bitmapped output; PDF output)} {
depends_lib-append path:lib/pkgconfig/pango.pc:pango \
port:libLASi
- configure.args-append --with-pangocairo \
- --with-lasi
- configure.args-delete --without-pangocairo \
- --without-lasi
+
+ configure.args-replace --without-lasi --with-lasi
+ configure.args-replace --without-pangocairo --with-pangocairo
}
if {[variant_isset no_pangocairo]} {
Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile 2013-11-27 08:08:37 UTC (rev 113999)
+++ trunk/dports/graphics/graphviz-devel/Portfile 2013-11-27 08:18:09 UTC (rev 114000)
@@ -108,25 +108,25 @@
platform macosx {
if {${os.major} > 8} {
- configure.args-delete --without-quartz
- configure.args-append --with-quartz
+ configure.args-replace --without-quartz --with-quartz
}
}
variant guile description {Include Guile language bindings} {
depends_lib-append port:guile
depends_build-append port:swig-guile
- configure.args-delete --disable-swig \
- --disable-guile
- configure.args-append --enable-guile
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-guile --enable-guile
}
variant lua description {Include Lua language bindings} {
depends_lib-append port:lua
depends_build-append port:swig-lua
- configure.args-delete --disable-swig \
- --disable-lua
- configure.args-append --enable-lua
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-lua --enable-lua
+
post-patch {
reinplace "s|/usr/lib\$LIBPOSTFIX/lua|${prefix}/lib\$LIBPOSTFIX/lua|g" ${worksrcpath}/configure
}
@@ -135,27 +135,28 @@
variant ocaml description {Include Objective Caml language bindings} {
depends_lib-append port:ocaml
depends_build-append port:swig-ocaml
- configure.args-delete --disable-swig \
- --disable-ocaml
- configure.args-append --enable-ocaml
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-ocaml --enable-ocaml
configure.cppflags-append -I${prefix}/lib/ocaml
}
variant perl description {Include PERL 5 language bindings} {
depends_lib-append path:bin/perl:perl5
depends_build-append port:swig-perl
- configure.args-delete --disable-swig \
- --disable-perl
- configure.args-append --enable-perl
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-perl --enable-perl
configure.perl ${prefix}/bin/perl
}
variant php description {Include PHP language bindings} {
depends_lib-append path:bin/php:php5
depends_build-append port:swig-php5
- configure.args-delete --disable-swig \
- --disable-php
- configure.args-append --enable-php
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-php --enable-php
+
post-patch {
reinplace "s|/usr/include/php|${prefix}/include/php|g" ${worksrcpath}/configure
reinplace "s|/usr/lib\${LIBPOSTFIX}/php|${prefix}/lib\${LIBPOSTFIX}/php|g" ${worksrcpath}/configure
@@ -166,10 +167,11 @@
variant python24 description {Include Python 2.4 language bindings} conflicts python25 python26 {
depends_lib-append port:python24
depends_build-append port:swig-python
- configure.args-delete --disable-swig \
- --disable-python
- configure.args-append --enable-python
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python2.4
+
# The configure script asks python where to install
# This doesn't work for 2.4 and 2.5 (see #16334)
post-patch {
@@ -180,10 +182,11 @@
variant python25 description {Include Python 2.5 language bindings} conflicts python24 python26 {
depends_lib-append port:python25
depends_build-append port:swig-python
- configure.args-delete --disable-swig \
- --disable-python
- configure.args-append --enable-python
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python2.5
+
# The configure script asks python where to install
# This doesn't work for 2.4 and 2.5 (see #16334)
post-patch {
@@ -194,79 +197,76 @@
variant python26 description {Include Python 2.6 language bindings} conflicts python24 python25 {
depends_lib-append port:python26
depends_build-append port:swig-python
- configure.args-delete --disable-swig \
- --disable-python
- configure.args-append --enable-python
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python2.6
}
variant ruby description {Include Ruby language bindings} {
depends_lib-append port:ruby
depends_build-append port:swig-ruby
- configure.args-delete --disable-swig \
- --disable-ruby
- configure.args-append --enable-ruby
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-ruby --enable-ruby
}
variant tcl description {Include Tcl language bindings} {
depends_lib-append port:tcl
depends_build-append port:swig-tcl
- configure.args-delete --disable-swig \
- --disable-tcl
- configure.args-append --enable-tcl
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-tcl --enable-tcl
}
variant java description {Include Java language bindings} {
depends_build-append port:swig-java
- configure.args-delete --disable-swig \
- --disable-java
- configure.args-append --enable-java
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-java --enable-java
}
variant smyrna description {Include the Smyrna large graph viewer} {
- configure.args-delete --without-smyrna \
- --without-gtk \
- --without-gtkglext \
- --without-glade
- configure.args-append --with-smyrna \
- --with-gtk \
- --with-gtkglext \
- --with-glade
depends_lib-append port:freeglut \
port:gtk2 \
port:gtkglext \
port:libglade2
+
+ configure.args-replace --without-glade --with-glade
+ configure.args-replace --without-gtk --with-gtk
+ configure.args-replace --without-gtkglext --with-gtkglext
+ configure.args-replace --without-smyrna --with-smyrna
}
variant r description {Include R language bindings} {
depends_build-append port:swig-r
- configure.args-delete --disable-swig \
- --disable-r
- configure.args-append --enable-r
+
+ configure.args-replace --disable-swig --enable-swig
+ configure.args-replace --disable-r --enable-r
}
variant rsvg description {enable the rsvg plugin} {
depends_lib-append port:librsvg
- configure.args-delete --without-rsvg
- configure.args-append --with-rsvg
+
+ configure.args-replace --without-rsvg --with-rsvg
}
variant gdk_pixbuf description {enable the gdk_pixbuf plugin} {
depends_lib-append port:gtk2
- configure.args-delete --without-gdk-pixbuf
- configure.args-append --with-gdk-pixbuf
+
+ configure.args-replace --without-gdk-pixbuf --with-gdk-pixbuf
}
variant glitz description {enable the incomplete glitz plugin} {
depends_lib-append port:glitz
- configure.args-delete --without-glitz
- configure.args-append --with-glitz
+
+ configure.args-replace --without-glitz --with-glitz
}
variant ming description {enable the incomplete ming plugin} {
depends_lib-append port:ming
- configure.args-delete --without-ming
- configure.args-append --with-ming
+
+ configure.args-replace --without-ming --with-ming
}
# Legacy no_pangocairo variant to be removed after February 2014
@@ -274,10 +274,9 @@
variant pangocairo conflicts no_pangocairo description {Add pangocairo support (antialiased bitmapped output; PDF output)} {
depends_lib-append path:lib/pkgconfig/pango.pc:pango \
port:libLASi
- configure.args-append --with-pangocairo \
- --with-lasi
- configure.args-delete --without-pangocairo \
- --without-lasi
+
+ configure.args-replace --without-lasi --with-lasi
+ configure.args-replace --without-pangocairo --with-pangocairo
}
if {[variant_isset no_pangocairo]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131127/1b54601f/attachment-0001.html>
More information about the macports-changes
mailing list