[55041] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Thu Aug 6 02:41:05 PDT 2009
Revision: 55041
http://trac.macports.org/changeset/55041
Author: ryandesign at macports.org
Date: 2009-08-06 02:41:03 -0700 (Thu, 06 Aug 2009)
Log Message:
-----------
php5extension-1.0.tcl: Now use phpize even for bundled extensions by default. This makes them configure faster and, more importantly, lets us make ports for several extensions which you can't build shared with the main configure script.
php5-curl, php5-gd, php5-gmp, php5-imap, php5-mcrypt, php5-pspell, php5-readline, php5-sqlite, php5-tidy, php5-xsl, php5-zlib: simplify configure arguments to match
php5-mssql, php5-mysql, php5-oracle, php5-postgresql: these still need to use the main configure script so they can build multiple extensions
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl
trunk/dports/php/php5-curl/Portfile
trunk/dports/php/php5-gd/Portfile
trunk/dports/php/php5-gmp/Portfile
trunk/dports/php/php5-imap/Portfile
trunk/dports/php/php5-mcrypt/Portfile
trunk/dports/php/php5-mssql/Portfile
trunk/dports/php/php5-mysql/Portfile
trunk/dports/php/php5-oracle/Portfile
trunk/dports/php/php5-postgresql/Portfile
trunk/dports/php/php5-pspell/Portfile
trunk/dports/php/php5-readline/Portfile
trunk/dports/php/php5-sqlite/Portfile
trunk/dports/php/php5-tidy/Portfile
trunk/dports/php/php5-xsl/Portfile
trunk/dports/php/php5-zlib/Portfile
Modified: trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl 2009-08-06 09:41:03 UTC (rev 55041)
@@ -46,18 +46,27 @@
# php5extension.type zend
+default build.dir {[php5extension.build_dir_proc]}
+default build.target {[php5extension.build_target_proc]}
+default configure.args {[php5extension.configure_args_proc]}
+default configure.dir {[php5extension.build_dir_proc]}
options php5extension.extension_dir
default php5extension.extension_dir {[php5extension.extension_dir_proc]}
options php5extension.type
default php5extension.type php
+options php5extension.source
+default php5extension.source standalone
+options php5extension.use_phpize
+default php5extension.use_phpize yes
proc php5extension.setup {extension version {source ""}} {
- global php5extension.extension php5extension.ini php5extension.inidir
- global destroot prefix workpath worksrcpath
+ global php5extension.extension php5extension.ini php5extension.inidir php5extension.source
+ global build.dir destroot prefix
set php5extension.extension ${extension}
set php5extension.ini ${extension}.ini
set php5extension.inidir ${prefix}/var/db/php5
+ php5extension.source ${source}
name php5-${php5extension.extension}
version ${version}
@@ -66,9 +75,9 @@
depends_lib path:bin/phpize:php5
- if {"bundled" != ${source}} {
- pre-configure {
- system "cd ${worksrcpath} && ${prefix}/bin/phpize"
+ pre-configure {
+ if {"yes" == ${php5extension.use_phpize}} {
+ system "cd ${configure.dir} && ${prefix}/bin/phpize"
}
}
@@ -140,15 +149,9 @@
distname php-${version}
use_bzip2 yes
- configure.args --disable-all \
- --disable-cgi \
- --without-pear
-
- build.target build-modules
-
destroot {
xinstall -d ${destroot}${php5extension.extension_dir}
- eval xinstall -m 644 [glob ${worksrcpath}/modules/*.so] ${destroot}${php5extension.extension_dir}
+ eval xinstall -m 644 [glob ${build.dir}/modules/*.so] ${destroot}${php5extension.extension_dir}
}
livecheck.check regex
@@ -157,6 +160,40 @@
}
}
+proc php5extension.build_dir_proc {} {
+ global php5extension.extension php5extension.source php5extension.use_phpize worksrcpath
+ if {"bundled" == ${php5extension.source}} {
+ if {"yes" == ${php5extension.use_phpize}} {
+ return ${worksrcpath}/ext/${php5extension.extension}
+ }
+ }
+ return ${worksrcpath}
+}
+
+proc php5extension.build_target_proc {} {
+ global php5extension.source php5extension.use_phpize
+ if {"bundled" == ${php5extension.source}} {
+ if {"yes" != ${php5extension.use_phpize}} {
+ return build-modules
+ }
+ }
+ return all
+}
+
+proc php5extension.configure_args_proc {} {
+ global php5extension.source php5extension.use_phpize
+ if {"bundled" == ${php5extension.source}} {
+ if {"yes" != ${php5extension.use_phpize}} {
+ return {
+ --disable-all
+ --disable-cgi
+ --without-pear
+ }
+ }
+ }
+ return {}
+}
+
proc php5extension.extension_dir_proc {} {
global prefix
return [exec ${prefix}/bin/php-config --extension-dir]
Modified: trunk/dports/php/php5-curl/Portfile
===================================================================
--- trunk/dports/php/php5-curl/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-curl/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -19,6 +19,4 @@
depends_lib-append port:curl
-configure.args-append --with-curl=shared,${prefix}
-
use_parallel_build yes
Modified: trunk/dports/php/php5-gd/Portfile
===================================================================
--- trunk/dports/php/php5-gd/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-gd/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -21,8 +21,7 @@
port:libpng \
port:zlib
-configure.args-append --with-gd=shared \
- --with-freetype-dir=${prefix} \
+configure.args-append --with-freetype-dir=${prefix} \
--with-jpeg-dir=${prefix} \
--with-png-dir=${prefix} \
--with-zlib-dir=${prefix} \
Modified: trunk/dports/php/php5-gmp/Portfile
===================================================================
--- trunk/dports/php/php5-gmp/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-gmp/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -20,6 +20,6 @@
depends_lib-append port:gmp
-configure.args-append --with-gmp=shared,${prefix}
+configure.args-append --with-gmp=${prefix}
use_parallel_build yes
Modified: trunk/dports/php/php5-imap/Portfile
===================================================================
--- trunk/dports/php/php5-imap/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-imap/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -18,7 +18,7 @@
depends_build-append port:cclient
-configure.args-append --with-imap=shared,${prefix} \
+configure.args-append --with-imap=${prefix} \
--with-imap-ssl=${prefix}
platform macosx {
Modified: trunk/dports/php/php5-mcrypt/Portfile
===================================================================
--- trunk/dports/php/php5-mcrypt/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-mcrypt/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -19,6 +19,6 @@
depends_lib-append port:libmcrypt
-configure.args-append --with-mcrypt=shared,${prefix}
+configure.args-append --with-mcrypt=${prefix}
use_parallel_build yes
Modified: trunk/dports/php/php5-mssql/Portfile
===================================================================
--- trunk/dports/php/php5-mssql/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-mssql/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -4,6 +4,7 @@
PortGroup php5extension 1.0
php5extension.setup mssql 5.3.0 bundled
+php5extension.use_phpize no
categories-append databases
platforms darwin
maintainers ryandesign
Modified: trunk/dports/php/php5-mysql/Portfile
===================================================================
--- trunk/dports/php/php5-mysql/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-mysql/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -4,6 +4,7 @@
PortGroup php5extension 1.0
php5extension.setup mysql 5.3.0 bundled
+php5extension.use_phpize no
categories-append databases
platforms darwin
maintainers ryandesign
Modified: trunk/dports/php/php5-oracle/Portfile
===================================================================
--- trunk/dports/php/php5-oracle/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-oracle/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -4,6 +4,7 @@
PortGroup php5extension 1.0
php5extension.setup oracle 5.3.0 bundled
+php5extension.use_phpize no
categories-append databases
platforms darwin
maintainers ryandesign
Modified: trunk/dports/php/php5-postgresql/Portfile
===================================================================
--- trunk/dports/php/php5-postgresql/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-postgresql/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -4,6 +4,7 @@
PortGroup php5extension 1.0
php5extension.setup postgresql 5.3.0 bundled
+php5extension.use_phpize no
categories-append databases
platforms darwin
maintainers ryandesign
Modified: trunk/dports/php/php5-pspell/Portfile
===================================================================
--- trunk/dports/php/php5-pspell/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-pspell/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -19,6 +19,6 @@
depends_lib-append port:aspell
-configure.args-append --with-pspell=shared,${prefix}
+configure.args-append --with-pspell=${prefix}
use_parallel_build yes
Modified: trunk/dports/php/php5-readline/Portfile
===================================================================
--- trunk/dports/php/php5-readline/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-readline/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -19,6 +19,4 @@
depends_lib-append port:readline
-configure.args-append --with-readline=shared,${prefix}
-
use_parallel_build yes
Modified: trunk/dports/php/php5-sqlite/Portfile
===================================================================
--- trunk/dports/php/php5-sqlite/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-sqlite/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -4,6 +4,7 @@
PortGroup php5extension 1.0
php5extension.setup sqlite 5.3.0 bundled
+php5extension.use_phpize no
categories-append databases
platforms darwin
maintainers ryandesign
Modified: trunk/dports/php/php5-tidy/Portfile
===================================================================
--- trunk/dports/php/php5-tidy/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-tidy/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -19,6 +19,6 @@
depends_lib-append port:tidy
-configure.args-append --with-tidy=shared,${prefix}
+configure.args-append --with-tidy=${prefix}
use_parallel_build yes
Modified: trunk/dports/php/php5-xsl/Portfile
===================================================================
--- trunk/dports/php/php5-xsl/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-xsl/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -20,7 +20,6 @@
depends_lib-append port:libxslt
configure.args-append --enable-libxml \
- --enable-dom \
- --with-xsl=shared,${prefix}
+ --enable-dom
use_parallel_build yes
Modified: trunk/dports/php/php5-zlib/Portfile
===================================================================
--- trunk/dports/php/php5-zlib/Portfile 2009-08-06 08:55:57 UTC (rev 55040)
+++ trunk/dports/php/php5-zlib/Portfile 2009-08-06 09:41:03 UTC (rev 55041)
@@ -18,6 +18,8 @@
depends_lib-append port:zlib
-configure.args-append --with-zlib=shared,${prefix}
+post-extract {
+ move ${build.dir}/config0.m4 ${build.dir}/config.m4
+}
use_parallel_build yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090806/45694c63/attachment-0001.html>
More information about the macports-changes
mailing list