[50173] trunk/dports/lang
ryandesign at macports.org
ryandesign at macports.org
Mon Apr 27 02:06:25 PDT 2009
Revision: 50173
http://trac.macports.org/changeset/50173
Author: ryandesign at macports.org
Date: 2009-04-27 02:06:23 -0700 (Mon, 27 Apr 2009)
Log Message:
-----------
php4, php5, php5-devel:
* move php.ini from ${prefix}/etc to ${prefix}/etc/php${major}
* read additional .ini files from ${prefix}/var/db/php${major}; php extensions will put their files there
php5-devel:
* increase epoch instead of revision because otherwise MacPorts doesn't realize 5.3.0RC1 is newer than 5.3.0beta1
Modified Paths:
--------------
trunk/dports/lang/php4/Portfile
trunk/dports/lang/php5/Portfile
trunk/dports/lang/php5-devel/Portfile
Modified: trunk/dports/lang/php4/Portfile
===================================================================
--- trunk/dports/lang/php4/Portfile 2009-04-27 08:02:40 UTC (rev 50172)
+++ trunk/dports/lang/php4/Portfile 2009-04-27 09:06:23 UTC (rev 50173)
@@ -4,7 +4,7 @@
name php4
version 4.4.9
-revision 5
+revision 6
set major [lindex [split ${version} .] 0]
set my_name php${major}
dist_subdir ${my_name}
@@ -58,13 +58,19 @@
port:libpng \
port:freetype
+set phpinidir ${prefix}/etc/${my_name}
+set extraphpinidir ${prefix}/var/db/${my_name}
+
+destroot.keepdirs ${extraphpinidir}
+
configure.args \
--mandir=${prefix}/share/man \
--infodir=${prefix}/share/info \
--includedir=${prefix}/include/php4 \
--libdir=${prefix}/lib/php4 \
--sysconfdir=${prefix}/etc/php4 \
- --with-config-file-path=${prefix}/etc \
+ --with-config-file-path=${phpinidir} \
+ --with-config-file-scan-dir=${extraphpinidir} \
--with-pear=${prefix}/lib/php4 \
--program-suffix=4 \
--enable-mbstring \
@@ -271,8 +277,6 @@
destroot.target \
install-cli install-pear install-build install-headers install-programs
-set phpinidir ${prefix}/etc
-
post-destroot {
#copy module
if { [variant_isset apache] } {
@@ -319,7 +323,12 @@
system "if \[ -d ${prefix}/lib/php4/.channels \]; then rm -rf ${destroot}${prefix}/lib/php4/.channels; fi"
}
-post-install {
+post-activate {
+ if {[file exists ${prefix}/etc/php.ini] && ![file exists ${phpinidir}/php.ini]} {
+ move ${prefix}/etc/php.ini ${phpinidir}
+ ui_msg "Your ${prefix}/etc/php.ini has been moved to ${phpinidir}/php.ini"
+ ui_msg ""
+ }
if {![file exists ${phpinidir}/php.ini]} {
ui_msg "To customize php, copy"
ui_msg "${phpinidir}/php.ini-dist (if this is a development server) or"
Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile 2009-04-27 08:02:40 UTC (rev 50172)
+++ trunk/dports/lang/php5/Portfile 2009-04-27 09:06:23 UTC (rev 50173)
@@ -5,7 +5,7 @@
name php5
epoch 1
version 5.2.9
-revision 1
+revision 2
set major [lindex [split ${version} .] 0]
set my_name php${major}
dist_subdir ${my_name}
@@ -69,10 +69,16 @@
use_autoconf yes
autoconf.cmd ${prefix}/bin/autoconf213
+set phpinidir ${prefix}/etc/${my_name}
+set extraphpinidir ${prefix}/var/db/${my_name}
+
+destroot.keepdirs ${extraphpinidir}
+
configure.args \
--mandir=${prefix}/share/man \
--infodir=${prefix}/share/info \
- --with-config-file-path=${prefix}/etc \
+ --with-config-file-path=${phpinidir} \
+ --with-config-file-scan-dir=${extraphpinidir} \
--enable-calendar \
--with-iconv=${prefix} \
--enable-exif \
@@ -384,8 +390,6 @@
destroot.target \
install-cli install-build install-headers install-programs
-set phpinidir ${prefix}/etc
-
post-destroot {
# Copy the Apache 1 module.
if { [variant_isset apache] } {
@@ -450,7 +454,12 @@
${destroot}${phpinidir}
}
-post-install {
+post-activate {
+ if {[file exists ${prefix}/etc/php.ini] && ![file exists ${phpinidir}/php.ini]} {
+ move ${prefix}/etc/php.ini ${phpinidir}
+ ui_msg "Your ${prefix}/etc/php.ini has been moved to ${phpinidir}/php.ini"
+ ui_msg ""
+ }
if {![file exists ${phpinidir}/php.ini]} {
ui_msg "To customize php, copy"
ui_msg "${phpinidir}/php.ini-dist (if this is a development server) or"
Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile 2009-04-27 08:02:40 UTC (rev 50172)
+++ trunk/dports/lang/php5-devel/Portfile 2009-04-27 09:06:23 UTC (rev 50173)
@@ -3,8 +3,8 @@
PortSystem 1.0
name php5-devel
+epoch 1
version 5.3.0RC1
-revision 1
set major [lindex [split ${version} .] 0]
set my_name php${major}
dist_subdir ${my_name}
@@ -63,10 +63,16 @@
use_autoconf yes
autoconf.cmd ${prefix}/bin/autoconf213
+set phpinidir ${prefix}/etc/${my_name}
+set extraphpinidir ${prefix}/var/db/${my_name}
+
+destroot.keepdirs ${extraphpinidir}
+
configure.args \
--mandir=${prefix}/share/man \
--infodir=${prefix}/share/info \
- --with-config-file-path=${prefix}/etc \
+ --with-config-file-path=${phpinidir} \
+ --with-config-file-scan-dir=${extraphpinidir} \
--enable-calendar \
--with-iconv=${prefix} \
--enable-exif \
@@ -388,8 +394,6 @@
destroot.target \
install-cli install-build install-headers install-programs
-set phpinidir ${prefix}/etc
-
post-destroot {
# Copy the Apache 1 module.
if { [variant_isset apache] } {
@@ -454,7 +458,12 @@
${destroot}${phpinidir}
}
-post-install {
+post-activate {
+ if {[file exists ${prefix}/etc/php.ini] && ![file exists ${phpinidir}/php.ini]} {
+ move ${prefix}/etc/php.ini ${phpinidir}
+ ui_msg "Your ${prefix}/etc/php.ini has been moved to ${phpinidir}/php.ini"
+ ui_msg ""
+ }
if {![file exists ${phpinidir}/php.ini]} {
ui_msg "To customize php, copy"
ui_msg "${phpinidir}/php.ini-development (if this is a development server) or"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090427/91e2a1a4/attachment.html>
More information about the macports-changes
mailing list