[28266] trunk/dports/x11/gtk2/Portfile

[source_changes at macosforge.org]

Revision: 28266
          http://trac.macosforge.org/projects/macports/changeset/28266
Author:   rhwood at macports.org
Date:     2007-08-26 18:41:47 -0700 (Sun, 26 Aug 2007)

Log Message:
-----------
Possible fix for Mac OS X 10.3.x build failures

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2007-08-27 00:19:23 UTC (rev 28265)
+++ trunk/dports/x11/gtk2/Portfile	2007-08-27 01:41:47 UTC (rev 28266)
@@ -53,7 +53,7 @@
 			return -code 1 "\nYou must first build cairo with the quartz variant enabled.  Please\nuninstall (or deactivate) the cairo port and reinstall by running:\n\n\"port install cairo +quartz\"\n"
 		}
 	}
-	if {[file exists ${prefix}/bin/cups-config]} {
+	if {${os.platform} == "darwin" && [rpm-vercomp ${os.version} 8.0] < 0 && [file exists ${prefix}/bin/cups-config]} {
 		return -code 1 "\nThe cups-headers port may prevent building this port.  Please uninstall\n(or deactivate) cups-headers and restart the build.\n"
 	}
 }
@@ -71,6 +71,11 @@
 
 platform darwin 6 { patchfiles-append patch-gtk-xdgmime-xdgmimemagic.c }
 
+platform darwin 7 {
+	depends_build-append \
+		port:cups-headers
+}
+
 variant quartz { configure.args-append --with-gdktarget=quartz }
 
 post-patch	{ reinplace "s|xdg_data_dirs = \"/usr|xdg_data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/gtk/xdgmime/xdgmime.c

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070826/9a017333/attachment.html