[102579] trunk/dports/graphics
ryandesign at macports.org
ryandesign at macports.org
Mon Feb 4 15:39:58 PST 2013
Revision: 102579
https://trac.macports.org/changeset/102579
Author: ryandesign at macports.org
Date: 2013-02-04 15:39:58 -0800 (Mon, 04 Feb 2013)
Log Message:
-----------
graphviz, graphviz-devel: switch no_x11 variant to x11 variant; switch no_pangocairo variant to pangocairo variant; use of pangocairo no longer requires use of x11 (assuming pango and cairo are installed with their quartz variants and not their x11 variants); when not using pangocairo, don't try to use libLASi (#37865); do not try to use libgs anymore because the developers of ghostscript removed the API graphviz was using (see http://lists.research.att.com/pipermail/graphviz-interest/2012q3/007363.html and http://lists.research.att.com/pipermail/graphviz-interest/2013q1/007441.html)
graphviz-devel: update to 2.31.20130204.0546
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-02-04 23:23:40 UTC (rev 102578)
+++ trunk/dports/graphics/graphviz/Portfile 2013-02-04 23:39:58 UTC (rev 102579)
@@ -10,6 +10,7 @@
name graphviz
set my_name graphviz
version 2.30.0
+revision 1
set thisbranch [strsed ${name} "g/^${my_name}//"]
set otherbranch [expr {${thisbranch} == {} ? {-devel} : {}}]
categories graphics
@@ -44,18 +45,14 @@
depends_build port:pkgconfig
-depends_lib port:xorg-libXaw \
- path:lib/pkgconfig/pango.pc:pango \
- port:jpeg \
+depends_lib port:jpeg \
port:libpng \
port:webp \
- port:libLASi \
port:fontconfig \
port:freetype \
port:expat \
port:gd2 \
port:gts \
- port:ghostscript \
port:libtool \
port:zlib \
port:gettext
@@ -67,18 +64,20 @@
configure.args --disable-silent-rules \
--with-codegens \
- --with-x \
+ --without-x \
--without-devil \
--without-smyrna \
--with-digcola \
--with-ipsepcola \
--without-rsvg \
- --with-pangocairo \
+ --without-pangocairo \
+ --without-lasi \
--with-webp \
--without-glitz \
--with-freetype2 \
--with-fontconfig \
--without-gdk-pixbuf \
+ --without-ghostscript \
--without-gtk \
--without-gtkgl \
--without-gtkglext \
@@ -268,17 +267,36 @@
configure.args-append --with-ming
}
-variant no_pangocairo description {Remove pangocairo support (no antialiased bitmapped output; no PDF output)} {
- depends_lib-delete path:lib/pkgconfig/pango.pc:pango
- configure.args-delete --with-pangocairo
- configure.args-append --without-pangocairo
+# Legacy no_pangocairo variant to be removed after February 2014
+variant no_pangocairo conflicts pangocairo description {Legacy compatibility variant} {}
+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
}
-variant no_x11 requires no_pangocairo {
- depends_lib-delete port:xorg-libXaw
- configure.args-append --without-x
+if {[variant_isset no_pangocario]} {
+ default_variants -pangocairo
+} else {
+ default_variants +pangocairo
}
+# Legacy no_x11 variant to be removed after February 2014
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+variant x11 conflicts no_x11 {
+ depends_lib-append port:xorg-libXaw
+ configure.args-delete --without-x
+}
+
+if {[variant_isset no_x11]} {
+ default_variants -x11
+} else {
+ default_variants +x11
+}
+
post-destroot {
if {![variant_isset smyrna]} {
foreach f "${prefix}/share/graphviz/doc/pdf/smyrna.1.pdf ${prefix}/share/graphviz/doc/pdf/smyrna.pdf ${prefix}/share/man/man1/smyrna.1" {
Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile 2013-02-04 23:23:40 UTC (rev 102578)
+++ trunk/dports/graphics/graphviz-devel/Portfile 2013-02-04 23:39:58 UTC (rev 102579)
@@ -9,7 +9,7 @@
name graphviz-devel
set my_name graphviz
-version 2.31.20130123.0545
+version 2.31.20130204.0546
set thisbranch [strsed ${name} "g/^${my_name}//"]
set otherbranch [expr {${thisbranch} == {} ? {-devel} : {}}]
categories graphics
@@ -32,8 +32,8 @@
simple text language, and produce output in a \
variety of visual and text formats.
-checksums rmd160 c24592e93e85aa7cc9e7bc57575033cf584252ec \
- sha256 2446256b24395e48b557edf1e251456c449456073e0d466d5ff83283463e0781
+checksums rmd160 8b043718f7fab8745f9fb55963dcd030069e8b5b \
+ sha256 296ff2b5b709a44af80f93b5af02045af8e1ebda5b4fdaba338c102bf35a1ecd
# graphviz needs Xcode 3.1+ to avoid the libGL error when building the smyrna variant
# graphviz-gui needs Xcode 3.1.2+; see #18811
@@ -44,18 +44,14 @@
depends_build port:pkgconfig
-depends_lib port:xorg-libXaw \
- path:lib/pkgconfig/pango.pc:pango \
- port:jpeg \
+depends_lib port:jpeg \
port:libpng \
port:webp \
- port:libLASi \
port:fontconfig \
port:freetype \
port:expat \
port:gd2 \
port:gts \
- port:ghostscript \
port:libtool \
port:zlib \
port:gettext
@@ -67,18 +63,20 @@
configure.args --disable-silent-rules \
--with-codegens \
- --with-x \
+ --without-x \
--without-devil \
--without-smyrna \
--with-digcola \
--with-ipsepcola \
--without-rsvg \
- --with-pangocairo \
+ --without-pangocairo \
+ --without-lasi \
--with-webp \
--without-glitz \
--with-freetype2 \
--with-fontconfig \
--without-gdk-pixbuf \
+ --without-ghostscript \
--without-gtk \
--without-gtkgl \
--without-gtkglext \
@@ -268,17 +266,36 @@
configure.args-append --with-ming
}
-variant no_pangocairo description {Remove pangocairo support (no antialiased bitmapped output; no PDF output)} {
- depends_lib-delete path:lib/pkgconfig/pango.pc:pango
- configure.args-delete --with-pangocairo
- configure.args-append --without-pangocairo
+# Legacy no_pangocairo variant to be removed after February 2014
+variant no_pangocairo conflicts pangocairo description {Legacy compatibility variant} {}
+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
}
-variant no_x11 requires no_pangocairo {
- depends_lib-delete port:xorg-libXaw
- configure.args-append --without-x
+if {[variant_isset no_pangocario]} {
+ default_variants -pangocairo
+} else {
+ default_variants +pangocairo
}
+# Legacy no_x11 variant to be removed after February 2014
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+variant x11 conflicts no_x11 {
+ depends_lib-append port:xorg-libXaw
+ configure.args-delete --without-x
+}
+
+if {[variant_isset no_x11]} {
+ default_variants -x11
+} else {
+ default_variants +x11
+}
+
post-destroot {
if {![variant_isset smyrna]} {
foreach f "${prefix}/share/graphviz/doc/pdf/smyrna.1.pdf ${prefix}/share/graphviz/doc/pdf/smyrna.pdf ${prefix}/share/man/man1/smyrna.1" {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130204/d2a0d266/attachment.html>
More information about the macports-changes
mailing list