[36623] trunk/dports/x11/gtk2/Portfile
nox at macports.org
nox at macports.org
Thu May 8 08:38:22 PDT 2008
Revision: 36623
http://trac.macosforge.org/projects/macports/changeset/36623
Author: nox at macports.org
Date: 2008-05-08 08:38:21 -0700 (Thu, 08 May 2008)
Log Message:
-----------
gtk2:
* The check for Leopard is not anymore in a platform block.
* Fixed CUPS support in universal build (closes #15132).
* gtk-doc removed from the list of the build dependencies, it's not even needed at all to install the documentation (closes #14892).
Modified Paths:
--------------
trunk/dports/x11/gtk2/Portfile
Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile 2008-05-08 15:34:39 UTC (rev 36622)
+++ trunk/dports/x11/gtk2/Portfile 2008-05-08 15:38:21 UTC (rev 36623)
@@ -32,6 +32,10 @@
default_variants +x11
}
+if {[variant_isset universal]} {
+ configure.env-append CUPS_CONFIG="${configure.universal_sysroot}/usr/bin/cups-config"
+}
+
pre-fetch {
if {![variant_isset quartz] && ![variant_isset x11]} {
error "Either +x11 or +quartz is required"
@@ -53,8 +57,7 @@
reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/gtk/xdgmime/xdgmime.c
}
-depends_build port:gtk-doc \
- port:pkgconfig
+depends_build port:pkgconfig
depends_lib port:cairo \
port:fontconfig \
@@ -76,9 +79,12 @@
--disable-glibtest \
--with-included-loaders
+configure.ccache no
configure.cppflags-append -no-cpp-precomp -DX_LOCALE
configure.cflags-append -funroll-loops -fstrict-aliasing
+use_parallel_build yes
+
test.run yes
test.target check
@@ -102,16 +108,6 @@
depends_build-append port:cups-headers
}
-platform darwin 9 {
- pre-fetch {
- if {[variant_isset x11] && ![file exists /usr/X11/lib/libXrandr.2.0.0.dylib]} {
- ui_error "Some libs are missing from your X11 installation. Please run this command:"
- ui_msg "sudo ln -s libXrandr.2.dylib /usr/X11/lib/libXrandr.2.0.0.dylib"
- error "missing /usr/X11/lib/libXrandr.2.0.0.dylib"
- }
- }
-}
-
variant no_x11 description {Same as +quartz} {
pre-fetch {
if {[file exists ${prefix}/lib/libpangox-1.0.dylib]} {
@@ -133,6 +129,16 @@
}
variant x11 conflicts quartz description {Enable rendering in X11 (default)} {
+ pre-fetch {
+ if {${os.platform} == "darwin" && [lindex [split ${os.version} .] 0] eq 9} {
+ if {![file exists /usr/X11/lib/libXrandr.2.0.0.dylib]} {
+ ui_error "Some libs are missing from your X11 installation. Please run this command:"
+ ui_error "sudo ln -s libXrandr.2.dylib /usr/X11/lib/libXrandr.2.0.0.dylib"
+ error "missing /usr/X11/lib/libXrandr.2.0.0.dylib"
+ }
+ }
+ }
+
depends_lib-append port:xrender \
lib:libX11.6:xorg
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080508/3e4ea39a/attachment.html
More information about the macports-changes
mailing list