[63977] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Fri Feb 19 13:20:11 PST 2010
Revision: 63977
http://trac.macports.org/changeset/63977
Author: ryandesign at macports.org
Date: 2010-02-19 13:20:10 -0800 (Fri, 19 Feb 2010)
Log Message:
-----------
dependency version checks should happen in pre-configure, because by pre-extract time they haven't necessarily been installed or activated yet
Modified Paths:
--------------
trunk/dports/graphics/cairo/Portfile
trunk/dports/graphics/cairo-devel/Portfile
trunk/dports/lang/php4/Portfile
trunk/dports/lang/php5/Portfile
trunk/dports/lang/php5-devel/Portfile
trunk/dports/lang/php52/Portfile
trunk/dports/lang/pure/Portfile
trunk/dports/lang/pure-devel/Portfile
trunk/dports/www/spawn-fcgi/Portfile
trunk/dports/x11/pango/Portfile
trunk/dports/x11/pango-devel/Portfile
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/graphics/cairo/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -51,7 +51,7 @@
lib/libz.dylib \
lib/libexpat.dylib
-pre-extract {
+pre-configure {
if {"darwin" == ${os.platform} && 8 == ${os.major}} {
set minimum_xcodeversion 2.4.1
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/graphics/cairo-devel/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -53,7 +53,7 @@
patchfiles patch-src-cairo-quartz-image-surface.c.diff
-pre-extract {
+pre-configure {
if {"darwin" == ${os.platform} && 8 == ${os.major}} {
set minimum_xcodeversion 2.4.1
set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
Modified: trunk/dports/lang/php4/Portfile
===================================================================
--- trunk/dports/lang/php4/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/lang/php4/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -128,7 +128,7 @@
}
variant apache2 conflicts apache apache20 no_web description {Add Apache 2.2 web server module} {
- pre-extract {
+ pre-configure {
# Checking for mod_cgi.so is a convenient way to verify apache2 is using its
# +preforkmpm variant. (+eventmpm and +workermpm instead provide mod_cgid.so.)
if {![file exists ${prefix}/apache2/modules/mod_cgi.so]} {
@@ -144,7 +144,7 @@
}
variant apache20 conflicts apache apache2 no_web description {Add Apache 2.0 web server module} {
- pre-extract {
+ pre-configure {
# Checking for mod_cgi.so is a convenient way to verify apache20 is using its
# +preforkmpm variant. (+workermpm instead provides mod_cgid.so.)
if {![file exists ${prefix}/apache20/modules/mod_cgi.so]} {
Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/lang/php5/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -127,7 +127,7 @@
# Build an Apache 2.2 module. Keep the options here in sync with those in the
# relevant part of the post-destroot phase.
variant apache2 conflicts apache no_web description {Add Apache 2.2 web server module} {
- pre-extract {
+ pre-configure {
# Checking for mod_cgi.so is a convenient way to verify apache2 is using its
# +preforkmpm variant. (+eventmpm and +workermpm instead provide mod_cgid.so.)
if {![file exists ${prefix}/apache2/modules/mod_cgi.so]} {
Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/lang/php5-devel/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -129,7 +129,7 @@
# Build an Apache 2.2 module. Keep the options here in sync with those in the
# relevant part of the post-destroot phase.
variant apache2 conflicts apache no_web description {Add Apache 2.2 web server module} {
- pre-extract {
+ pre-configure {
# Checking for mod_cgi.so is a convenient way to verify apache2 is using its
# +preforkmpm variant. (+eventmpm and +workermpm instead provide mod_cgid.so.)
if {![file exists ${prefix}/apache2/modules/mod_cgi.so]} {
Modified: trunk/dports/lang/php52/Portfile
===================================================================
--- trunk/dports/lang/php52/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/lang/php52/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -143,7 +143,7 @@
# Build an Apache 2.2 module. Keep the options here in sync with those in the
# relevant part of the post-destroot phase.
variant apache2 conflicts apache no_web description {Add Apache 2.2 web server module} {
- pre-extract {
+ pre-configure {
# Checking for mod_cgi.so is a convenient way to verify apache2 is using its
# +preforkmpm variant. (+eventmpm and +workermpm instead provide mod_cgid.so.)
if {![file exists ${prefix}/apache2/modules/mod_cgi.so]} {
Modified: trunk/dports/lang/pure/Portfile
===================================================================
--- trunk/dports/lang/pure/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/lang/pure/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -58,7 +58,7 @@
configure.args-append --disable-fastcc
}
-pre-extract {
+pre-configure {
if {"i386" == ${os.arch}} {
set arch Intel
set llvm_minimum_version 2.4
Modified: trunk/dports/lang/pure-devel/Portfile
===================================================================
--- trunk/dports/lang/pure-devel/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/lang/pure-devel/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -61,7 +61,7 @@
configure.args-append --disable-fastcc
}
-pre-extract {
+pre-configure {
if {"i386" == ${os.arch}} {
set arch Intel
set llvm_minimum_version 2.4
Modified: trunk/dports/www/spawn-fcgi/Portfile
===================================================================
--- trunk/dports/www/spawn-fcgi/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/www/spawn-fcgi/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -21,7 +21,7 @@
use_parallel_build yes
-pre-extract {
+pre-configure {
# As of version 1.4.23, the lighttpd port depends on the spawn-fcgi port,
# but lighttpd 1.4.22 and earlier provided the same files spawn-fcgi now
# installs. If lighttpd 1.4.22 or earlier is installed and the user \
Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/x11/pango/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -31,7 +31,7 @@
sha1 a5aa40b78546a7ee59f21804b172e5d47ef776ad \
rmd160 7e436752734c55950ad5feced7c7d5c3f040a1b4
-depends_extract \
+depends_build \
port:pkgconfig
depends_lib \
@@ -58,7 +58,7 @@
# distinguish whether an installed pango has quartz support or not.
}
-pre-extract {
+pre-configure {
set glib_minimum_version 2.17.3
set glib_installed_version [exec pkg-config glib-2.0 --modversion]
if {[rpm-vercomp ${glib_installed_version} ${glib_minimum_version}] < 0} {
Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile 2010-02-19 20:53:59 UTC (rev 63976)
+++ trunk/dports/x11/pango-devel/Portfile 2010-02-19 21:20:10 UTC (rev 63977)
@@ -33,7 +33,7 @@
sha1 092a4650158bb8e022482f22f26190bb0c3309b8 \
rmd160 2cdfeb0d13e80f251babfef37e26e3c9203381de
-depends_extract \
+depends_build \
port:pkgconfig
depends_lib \
@@ -70,7 +70,7 @@
}
}
-pre-extract {
+pre-configure {
set glib_minimum_version 2.17.3
set glib_installed_version [exec pkg-config glib-2.0 --modversion]
if {[rpm-vercomp ${glib_installed_version} ${glib_minimum_version}] < 0} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100219/650a4f4d/attachment.html>
More information about the macports-changes
mailing list