<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/8c81fcd3c790750d3180979e21552deff3f00c99">https://github.com/macports/macports-ports/commit/8c81fcd3c790750d3180979e21552deff3f00c99</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8c81fcd3c790750d3180979e21552deff3f00c99
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Dec 28 11:54:51 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> php-geoip: Add php80-geoip & php81-geoip subports
</span>---
php/php-geoip/Portfile | 6 ++-
php/php-geoip/files/php8.patch | 95 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 100 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-geoip/Portfile b/php/php-geoip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fde59cf9344..5637dd9d07e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-geoip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-geoip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ categories php devel
</span> platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
<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 7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1
</span> php.pecl yes
if {[vercmp ${php.branch} 7] >= 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,6 +19,10 @@ if {[vercmp ${php.branch} 7] >= 0} {
</span> checksums rmd160 60c128064decb959b497bd2f627712b7be32fa79 \
sha256 b2d05c03019d46135c249b5a7fa0dbd43ca5ee98aea8ed807bc7aa90ac8c0f06 \
size 13004
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${php.branch} 8.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php8.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
version 1.0.8
revision 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-geoip/files/php8.patch b/php/php-geoip/files/php8.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..38553cbc9fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-geoip/files/php8.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,95 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with php 8.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/pecl-networking-geoip/commit/4f7c46c98eadc7bae9cc39c942ee626ecae7539e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- geoip.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ geoip.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,41 +34,72 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ext/standard/info.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "php_geoip.h"
</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;'>++/* For PHP 8 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef TSRMLS_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define TSRMLS_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZEND_DECLARE_MODULE_GLOBALS(geoip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_void, 0, 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_END_ARG_INFO()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database_opt, 0, 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ZEND_ARG_INFO(0, database)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_END_ARG_INFO()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database, 0, 0, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ZEND_ARG_INFO(0, database)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_END_ARG_INFO()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_host, 0, 0, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ZEND_ARG_INFO(0, host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_END_ARG_INFO()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_region, 0, 0, 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ZEND_ARG_INFO(0, country_code)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ZEND_ARG_INFO(0, region_code)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_END_ARG_INFO()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_directory, 0, 0, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ZEND_ARG_INFO(0, directory)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ZEND_END_ARG_INFO()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int le_geoip;
</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;'>+ zend_function_entry geoip_functions[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_database_info, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_database_info, arginfo_geoip_database_opt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GEOIPDEF(php_func, c_func, db_type) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(php_func, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(php_func, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "geoip.def"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef GEOIPDEF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_continent_code_by_name, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_org_by_name, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_record_by_name, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_id_by_name, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_region_by_name, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_isp_by_name, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_db_avail, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_db_get_all_info, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_db_filename, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_continent_code_by_name, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_org_by_name, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_record_by_name, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_id_by_name, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_region_by_name, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_isp_by_name, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_db_avail, arginfo_geoip_database)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_db_get_all_info, arginfo_geoip_void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_db_filename, arginfo_geoip_database)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if LIBGEOIP_VERSION >= 1004001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_region_name_by_code, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_time_zone_by_country_and_region, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_region_name_by_code, arginfo_geoip_region)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_time_zone_by_country_and_region, arginfo_geoip_region)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CUSTOM_DIRECTORY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_setup_custom_directory, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_setup_custom_directory, arginfo_geoip_directory)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_asnum_by_name, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_domain_by_name, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_asnum_by_name, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_domain_by_name, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if LIBGEOIP_VERSION >= 1004008
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_FE(geoip_netspeedcell_by_name, NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE(geoip_netspeedcell_by_name, arginfo_geoip_host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef PHP_FE_END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_FE_END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {NULL, NULL, NULL}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+
</span></pre><pre style='margin:0'>
</pre>