<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e18cb4fc4cd7b3fdc68eaf1d231f2829bd9171c6">https://github.com/macports/macports-ports/commit/e18cb4fc4cd7b3fdc68eaf1d231f2829bd9171c6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e18cb4fc4cd7b3fdc68eaf1d231f2829bd9171c6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 8 17:49:37 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> php-phalcon: Split into php-phalcon2/php-phalcon3
</span>---
php/php-phalcon/Portfile | 84 ++++++++++++++----------------
php/{php-phalcon => php-phalcon2}/Portfile | 24 ++++-----
php/{php-phalcon => php-phalcon3}/Portfile | 29 ++++-------
3 files changed, 57 insertions(+), 80 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-phalcon/Portfile b/php/php-phalcon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 44fd1f3..7cf5586 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-phalcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-phalcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +1,51 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup php 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Though this port is "obsolete", it provides a way for a user to find out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the current major version of Phalcon for a given PHP version, so please
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# keep it updated and don't delete it.
</span>
name php-phalcon
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories php
</span> platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${php.branch} 5.5] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup phalcon cphalcon 3.4.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 745e5eaed58fa32cc6d44a748d8a2a9505eba34c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3e1204105e10d94759ad51dae36aebcd5a2a3634dd753eb46f3c55f46d7bc4b0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6707908
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[vercmp ${php.branch} 5.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup phalcon cphalcon 2.0.13 phalcon-v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c94dadcf628d8611cbcb44f35b1b536c9b0e3fc9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 00f7e45282e6e793c37c75742da696ebb031cf5b880d324eefd19039bd27b74e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5226597
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup phalcon cphalcon 2.0.9 phalcon-v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3955e097b18c3ea8b29264bb184b70ad2a7eebd7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d4607491b801da973796c44eaed9f909787d9a588ec5a7ea7c84d74d43106a46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5072670
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport php73-phalcon {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport php72-phalcon {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport php71-phalcon {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport php70-phalcon {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport php56-phalcon {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport php55-phalcon {
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport php54-phalcon {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.0.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport php53-phalcon {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.0.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set major [lindex [split ${version} .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by ${subport}${major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description full stack PHP framework written as an extension
long_description Phalcon is an open source full stack framework for \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,27 +58,4 @@ long_description Phalcon is an open source full stack framework for \
</span>
homepage https://phalconphp.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The build/install script makes all sorts of assumptions I don't like
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so I'm ignoring it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set build build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${version} 3] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set phpmajor [lindex [split ${php.branch} .] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set build ${build}/php${phpmajor}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match *64 ${build_arch}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set build ${build}/64bits
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set build ${build}/32bits
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${worksrcdir}/${build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Separate dir for each arch means using the muniversal portgroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # but it doesn't get along with the php portgroup.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --enable-phalcon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-phalcon/Portfile b/php/php-phalcon2/Portfile
</span>similarity index 78%
copy from php/php-phalcon/Portfile
copy to php/php-phalcon2/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 44fd1f3..67f4841 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-phalcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-phalcon2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,26 +4,24 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup php 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name php-phalcon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name php-phalcon2
</span> platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+php.branches 5.3 5.4 5.5 5.6
</span>
if {[vercmp ${php.branch} 5.5] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup phalcon cphalcon 3.4.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 745e5eaed58fa32cc6d44a748d8a2a9505eba34c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3e1204105e10d94759ad51dae36aebcd5a2a3634dd753eb46f3c55f46d7bc4b0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6707908
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[vercmp ${php.branch} 5.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append ${php}-phalcon3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${php.branch} 5.4] >= 0} {
</span> github.setup phalcon cphalcon 2.0.13 phalcon-v
revision 0
checksums rmd160 c94dadcf628d8611cbcb44f35b1b536c9b0e3fc9 \
sha256 00f7e45282e6e793c37c75742da696ebb031cf5b880d324eefd19039bd27b74e \
size 5226597
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[vercmp ${php.branch} 5.3] >= 0} {
</span> github.setup phalcon cphalcon 2.0.9 phalcon-v
revision 0
checksums rmd160 3955e097b18c3ea8b29264bb184b70ad2a7eebd7 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,17 +40,13 @@ long_description Phalcon is an open source full stack framework for \
</span> PHP frameworks employ.
homepage https://phalconphp.com
<span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir php-phalcon
</span>
if {${name} ne ${subport}} {
# The build/install script makes all sorts of assumptions I don't like
# so I'm ignoring it.
set build build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${version} 3] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set phpmajor [lindex [split ${php.branch} .] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set build ${build}/php${phpmajor}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[string match *64 ${build_arch}]} {
set build ${build}/64bits
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,3 +61,5 @@ if {${name} ne ${subport}} {
</span>
configure.args --enable-phalcon
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-phalcon/Portfile b/php/php-phalcon3/Portfile
</span>similarity index 66%
copy from php/php-phalcon/Portfile
copy to php/php-phalcon3/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 44fd1f3..5421f88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-phalcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-phalcon3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,16 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup php 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name php-phalcon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name php-phalcon3
</span> platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+php.branches 5.5 5.6 7.0 7.1 7.2 7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${php.branch} 7.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append ${php}-phalcon2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {[vercmp ${php.branch} 5.5] >= 0} {
github.setup phalcon cphalcon 3.4.4 v
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,18 +21,6 @@ if {[vercmp ${php.branch} 5.5] >= 0} {
</span> checksums rmd160 745e5eaed58fa32cc6d44a748d8a2a9505eba34c \
sha256 3e1204105e10d94759ad51dae36aebcd5a2a3634dd753eb46f3c55f46d7bc4b0 \
size 6707908
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[vercmp ${php.branch} 5.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup phalcon cphalcon 2.0.13 phalcon-v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c94dadcf628d8611cbcb44f35b1b536c9b0e3fc9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 00f7e45282e6e793c37c75742da696ebb031cf5b880d324eefd19039bd27b74e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5226597
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup phalcon cphalcon 2.0.9 phalcon-v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3955e097b18c3ea8b29264bb184b70ad2a7eebd7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d4607491b801da973796c44eaed9f909787d9a588ec5a7ea7c84d74d43106a46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5072670
</span> }
description full stack PHP framework written as an extension
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,17 +34,14 @@ long_description Phalcon is an open source full stack framework for \
</span> PHP frameworks employ.
homepage https://phalconphp.com
<span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir php-phalcon
</span>
if {${name} ne ${subport}} {
# The build/install script makes all sorts of assumptions I don't like
# so I'm ignoring it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set build build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${version} 3] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set phpmajor [lindex [split ${php.branch} .] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set build ${build}/php${phpmajor}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set phpmajor [lindex [split ${php.branch} .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build build/php${phpmajor}
</span> if {[string match *64 ${build_arch}]} {
set build ${build}/64bits
} else {
</pre><pre style='margin:0'>
</pre>