[94192] trunk/dports/php

pixilla at macports.org pixilla at macports.org
Mon Jun 11 16:12:55 PDT 2012


Revision: 94192
          https://trac.macports.org/changeset/94192
Author:   pixilla at macports.org
Date:     2012-06-11 16:12:55 -0700 (Mon, 11 Jun 2012)
Log Message:
-----------
php/pear-install-phar:
- Copy php5-pear to pear-install-phar.
- Pear-install-phar contains subports for php5, php53 and php54.
php/php5-pear:
- Move port to pear-install-phar subport.

Modified Paths:
--------------
    trunk/dports/php/pear-install-phar/Portfile

Added Paths:
-----------
    trunk/dports/php/pear-install-phar/

Removed Paths:
-------------
    trunk/dports/php/pear-install-phar/Portfile.new
    trunk/dports/php/php5-pear/

Modified: trunk/dports/php/pear-install-phar/Portfile
===================================================================
--- trunk/dports/php/php5-pear/Portfile	2012-06-06 21:36:29 UTC (rev 94017)
+++ trunk/dports/php/pear-install-phar/Portfile	2012-06-11 23:12:55 UTC (rev 94192)
@@ -3,14 +3,12 @@
 
 PortSystem          1.0
 
-name                php5-pear
+name                pear-install-phar
 version             20110901
-revision            2
+revision            3
 categories          php www
 platforms           darwin
 maintainers         pixilla
-description         PEAR build and repository support for php5
-long_description    ${description}
 homepage            http://pear.php.net
 master_sites        http://pear.php.net
 livecheck.type      moddate
@@ -25,35 +23,72 @@
 
 set buildpath       ${worksrcpath}/build
 set libpath         /lib/php/pear
-set dbpath          /var/db/php5
 
-extract.mkdir       yes
-extract {
-    xinstall -d ${buildpath}${libpath}
-    file copy ${distpath}/install-pear-nozlib.phar ${buildpath}${libpath}
+subport php5-pear {
+
+    set dbpath          /var/db/php5
 }
-use_configure       no
-build {
-    xinstall -d ${buildpath}${libpath}
-    set fp [open ${buildpath}${libpath}/pear-ini.php w]
-    puts $fp "<?php"
-    puts $fp "# Automatically add the PEAR repository path to PHP's include_path."
-    puts $fp "set_include_path ( get_include_path (  ) . PATH_SEPARATOR . '${prefix}/lib/php/pear' ) ;"
-    close $fp
 
-    xinstall -d ${buildpath}${dbpath}
-    set fp [open ${buildpath}${dbpath}/pear.ini w]
-    puts $fp "; Do not edit this file; it is automatically generated by MacPorts."
-    puts $fp "; Any changes you make will be lost if you upgrade or uninstall php5-pear."
-    puts $fp "; To configure PHP, edit ${prefix}/etc/php5/php.ini."
-    puts $fp "auto_prepend_file = '${prefix}/lib/php/pear/pear-ini.php'"
-    close $fp
+subport php53-pear {
+
+    set dbpath          /var/db/php53
 }
 
-destroot {
-    xinstall -d ${destroot}${prefix}${libpath}
-    xinstall -d ${destroot}${prefix}${dbpath}
-    file copy ${buildpath}${libpath}/pear-ini.php ${destroot}${prefix}${libpath}/pear-ini.php
-    file copy ${buildpath}${dbpath}/pear.ini ${destroot}${prefix}${dbpath}/pear.ini
-    file copy ${buildpath}${libpath}/install-pear-nozlib.phar ${destroot}${prefix}${libpath}
+subport php54-pear {
+
+    set dbpath          /var/db/php54
 }
+
+use_configure       no
+
+if {${name} == ${subport}} {
+
+    description         PEAR installer phar
+    long_description    ${description}
+
+    extract.mkdir       yes
+    extract {
+
+        xinstall -d ${buildpath}${libpath}
+        file copy ${distpath}/install-pear-nozlib.phar ${buildpath}${libpath}
+    }
+
+    build {}
+    destroot {
+
+        xinstall -d ${destroot}${prefix}${libpath}
+        file copy ${buildpath}${libpath}/install-pear-nozlib.phar ${destroot}${prefix}${libpath}
+    }
+} else {
+
+    description         PEAR build and repository support for php
+    long_description    ${description}
+
+    depends_lib         port:pear-install-phar
+
+    distfiles
+
+    build {
+
+        xinstall -d ${buildpath}${dbpath}
+        set fp [open ${buildpath}${dbpath}/pear-ini.php w]
+        puts $fp "<?php"
+        puts $fp "# Automatically add the PEAR repository path to PHP's include_path."
+        puts $fp "set_include_path ( get_include_path (  ) . PATH_SEPARATOR . '${prefix}/lib/php/pear' ) ;"
+        close $fp
+    
+        set fp [open ${buildpath}${dbpath}/pear.ini w]
+        puts $fp "; Do not edit this file; it is automatically generated by MacPorts."
+        puts $fp "; Any changes you make will be lost if you upgrade or uninstall ${subport}-pear."
+        puts $fp "; To configure PHP, edit ${prefix}/etc/${subport}/php.ini."
+        puts $fp "auto_prepend_file = '${prefix}${dbpath}/pear/pear-ini.php'"
+        close $fp
+    }
+
+    destroot {
+
+        xinstall -d ${destroot}${prefix}${dbpath}/pear
+        file copy ${buildpath}${dbpath}/pear-ini.php ${destroot}${prefix}${dbpath}/pear/pear-ini.php
+        file copy ${buildpath}${dbpath}/pear.ini ${destroot}${prefix}${dbpath}/pear.ini
+    }
+}

Deleted: trunk/dports/php/pear-install-phar/Portfile.new
===================================================================
--- trunk/dports/php/php5-pear/Portfile.new	2012-06-06 21:36:29 UTC (rev 94017)
+++ trunk/dports/php/pear-install-phar/Portfile.new	2012-06-11 23:12:55 UTC (rev 94192)
@@ -1,59 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 84512 2011-09-27 14:19:06Z snc at macports.org $
-
-PortSystem          1.0
-
-name                php5-pear
-version             20110901
-categories          php www
-platforms           darwin
-maintainers         pixilla
-description         PEAR build and repository support for php5
-long_description    ${description}
-homepage            http://pear.php.net
-master_sites        http://pear.php.net
-livecheck.type      moddate
-
-depends_lib         port:php5
-
-dist_subdir         ${name}-${version}
-distfiles           install-pear-nozlib.phar
-
-checksums           rmd160  1eef5e3a68b5521e2d42e68d031fd79828709923 \
-                    sha256  06757ae34c93d4aad8a3abc63958106ca11bb1a9a5f85e7e013d70077e4aafa1
-
-set buildpath       ${worksrcpath}/build
-set libpath         /lib/php/pear
-set dbpath          /var/db/php5
-
-extract.mkdir       yes
-extract {
-    xinstall -d ${buildpath}/${libpath}
-    file copy ${distpath}/install-pear-nozlib.phar ${buildpath}/${libpath}
-}
-use_configure       no
-build {
-    xinstall -d ${buildpath}/${libpath}
-    set fp [open ${buildpath}/${libpath}/pear-ini.php w]
-    puts $fp "<?php"
-    puts $fp "# Automatically add the PEAR repository path to PHP's include_path."
-    puts $fp "set_include_path ( get_include_path (  ) . PATH_SEPARATOR . '${prefix}/lib/php/pear' ) ;"
-    puts $fp "?>"
-    close $fp
-
-    xinstall -d ${buildpath}/${dbpath}
-    set fp [open ${buildpath}/${dbpath}/pear.ini w]
-    puts $fp "; Do not edit this file; it is automatically generated by MacPorts."
-    puts $fp "; Any changes you make will be lost if you upgrade or uninstall php5-pear."
-    puts $fp "; To configure PHP, edit ${prefix}/etc/php5/php.ini."
-    puts $fp "auto_prepend_file = '${prefix}/lib/php/pear/pear-ini.php'"
-    close $fp
-}
-
-destroot {
-    xinstall -d ${destroot}${prefix}/${libpath}
-    xinstall -d ${destroot}${prefix}/${dbpath}
-    file copy ${buildpath}/${libpath}/pear-ini.php ${destroot}${prefix}/${libpath}/pear-ini.php
-    file copy ${buildpath}/${dbpath}/pear.ini ${destroot}${prefix}/${dbpath}/pear.ini
-    file copy ${buildpath}/${libpath}/install-pear-nozlib.phar ${destroot}${prefix}/${libpath}
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120611/22088f25/attachment-0001.html>


More information about the macports-changes mailing list