summaryrefslogtreecommitdiff
path: root/devel/php5-ice/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/php5-ice/files')
-rw-r--r--devel/php5-ice/files/Make.rules.FreeBSD21
-rw-r--r--devel/php5-ice/files/patch-config_Make.common.rules16
-rw-r--r--devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD31
-rw-r--r--devel/php5-ice/files/patch-cpp-config-Make.rules13
-rw-r--r--devel/php5-ice/files/patch-php+config+Make.rules.php42
-rw-r--r--devel/php5-ice/files/patch-php-config-Make.rules.php23
-rw-r--r--devel/php5-ice/files/patch-php-lib-Makefile12
-rw-r--r--devel/php5-ice/files/patch-php-src-IcePHP-Communicator.cpp11
-rw-r--r--devel/php5-ice/files/patch-php-src-IcePHP-Connection.cpp47
-rw-r--r--devel/php5-ice/files/patch-php-src-IcePHP-Endpoint.cpp56
-rw-r--r--devel/php5-ice/files/patch-php-src-IcePHP-Init.cpp15
-rw-r--r--devel/php5-ice/files/patch-php-src-IcePHP-Logger.cpp11
-rw-r--r--devel/php5-ice/files/patch-php-src-IcePHP-Properties.cpp11
-rw-r--r--devel/php5-ice/files/patch-php-src-IcePHP-Proxy.cpp11
14 files changed, 247 insertions, 73 deletions
diff --git a/devel/php5-ice/files/Make.rules.FreeBSD b/devel/php5-ice/files/Make.rules.FreeBSD
new file mode 100644
index 000000000000..03ca1908b79b
--- /dev/null
+++ b/devel/php5-ice/files/Make.rules.FreeBSD
@@ -0,0 +1,21 @@
+mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
+
+BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv
+LIBS = -lIce $(BASELIBS)
+
+ICEUTIL_OS_LIBS = -pthread
+
+PLATFORM_HAS_READLINE := yes
+
+export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH)
+
+lp64suffix =
+create_runpath_symlink = no
+prefix = %%PREFIX%%
+install_slicedir = %%DATADIR%%
+install_configdir = %%DATADIR%%/config
+install_docdir = %%DOCSDIR%%
+EXPAT_HOME = $(LOCALBASE)
+INSTALL = %%INSTALL_DATA%%
+INSTALL_PROGRAM = %%INSTALL_PROGRAM%%
+MCPP_HOME = $(LOCALBASE)
diff --git a/devel/php5-ice/files/patch-config_Make.common.rules b/devel/php5-ice/files/patch-config_Make.common.rules
new file mode 100644
index 000000000000..85e29a0ae950
--- /dev/null
+++ b/devel/php5-ice/files/patch-config_Make.common.rules
@@ -0,0 +1,16 @@
+--- ./config/Make.common.rules.orig 2013-06-05 13:13:29.000000000 +0400
++++ ./config/Make.common.rules 2013-06-17 09:45:21.000000000 +0400
+@@ -385,13 +385,3 @@
+ cp -fpr $$subdir $(install_slicedir) ; \
+ done ; \
+ fi
+-
+- @if test ! -f $(prefix)/ICE_LICENSE$(TEXT_EXTENSION) ; \
+- then \
+- $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(prefix)) ; \
+- fi
+-
+- @if test ! -f $(prefix)/LICENSE$(TEXT_EXTENSION) ; \
+- then \
+- $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(prefix)) ; \
+- fi
diff --git a/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD b/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD
deleted file mode 100644
index 3a724bb9dcc1..000000000000
--- a/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD
+++ /dev/null
@@ -1,31 +0,0 @@
---- cpp/config/Make.rules.FreeBSD.orig 2008-08-02 08:12:53.000000000 +0800
-+++ cpp/config/Make.rules.FreeBSD 2008-08-02 08:14:46.000000000 +0800
-@@ -27,7 +27,7 @@
- endif
-
- ifeq ($(OPTIMIZE),yes)
-- CXXFLAGS += -O3 -DNDEBUG
-+ CXXFLAGS += -O2 -DNDEBUG
- else
- CXXFLAGS += -g
- endif
-@@ -37,15 +37,15 @@
- #
- CXXLIBS =
-
--mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lc_r
-+mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
-
- mklib = ar cr $(1) $(2)
-
--BASELIBS = -lIceUtil -lc_r
-+BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv
- LIBS = -lIce $(BASELIBS)
-
--ICEUTIL_OS_LIBS =
--ICE_OS_LIBS =
-+ICEUTIL_OS_LIBS = -pthread
-+ICE_OS_LIBS =
-
- PLATFORM_HAS_READLINE = yes
-
diff --git a/devel/php5-ice/files/patch-cpp-config-Make.rules b/devel/php5-ice/files/patch-cpp-config-Make.rules
new file mode 100644
index 000000000000..85f52f5ddfa5
--- /dev/null
+++ b/devel/php5-ice/files/patch-cpp-config-Make.rules
@@ -0,0 +1,13 @@
+--- cpp.orig/config/Make.rules Fri Mar 11 16:19:00 2013
++++ cpp/config/Make.rules Fri May 19 22:00:09 2013
+@@ -233,7 +233,9 @@
+ DB_FLAGS = -I/usr/local/include/db53
+ DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
+ else
+- DB_LIBS = -ldb_cxx
++ DB_FLAGS = -I%%BDB_INCLUDE_DIR%%
++ DB_LIBS = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
++ DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%)
+ endif
+ endif
+ endif
diff --git a/devel/php5-ice/files/patch-php+config+Make.rules.php b/devel/php5-ice/files/patch-php+config+Make.rules.php
deleted file mode 100644
index a8d2db0d75a2..000000000000
--- a/devel/php5-ice/files/patch-php+config+Make.rules.php
+++ /dev/null
@@ -1,42 +0,0 @@
---- php/config/Make.rules.php.orig 2010-06-03 18:48:34.000000000 +0200
-+++ php/config/Make.rules.php 2010-07-30 14:43:46.000000000 +0200
-@@ -12,7 +12,9 @@
- # if it does not exist.
- #
-
--prefix ?= /opt/Ice-$(VERSION)
-+ICE_HOME = /usr/local
-+
-+prefix ?= /usr/local/lib/php/$(PHP_EXT_DIR)
-
- #
- # The "root directory" for runpath embedded in executables. Can be unset
-@@ -25,7 +27,7 @@
- # Otherwise the Ice extension is built with debug information.
- #
-
--#OPTIMIZE = yes
-+OPTIMIZE = yes
-
- #
- # Define LP64 as yes if you want to build in 64 bit mode on a platform
-@@ -54,7 +56,7 @@
- # PHP_INCLUDE_DIR and PHP_LIB_DIR.
- #
-
--PHP_HOME ?= /opt/php
-+PHP_HOME ?= /usr/local
-
- #
- # Verifies the PHP_HOME is valid and attempts to adjust for platform variances
-@@ -100,8 +102,8 @@
- endif
-
- libdir = $(top_srcdir)/lib
--install_phpdir = $(prefix)/php
--install_libdir = $(prefix)/php
-+install_phpdir = $(prefix)
-+install_libdir = $(prefix)
-
- #
- # Platform specific definitions
diff --git a/devel/php5-ice/files/patch-php-config-Make.rules.php b/devel/php5-ice/files/patch-php-config-Make.rules.php
new file mode 100644
index 000000000000..a22c79dc2e64
--- /dev/null
+++ b/devel/php5-ice/files/patch-php-config-Make.rules.php
@@ -0,0 +1,23 @@
+--- php/config/Make.rules.php.orig 2013-03-11 15:19:47.000000000 +0000
++++ php/config/Make.rules.php 2013-06-02 14:36:13.744196194 +0000
+@@ -100,8 +100,8 @@
+ endif
+
+ libdir = $(top_srcdir)/lib
+-install_phpdir = $(prefix)/php
+-install_libdir = $(prefix)/php
++install_phpdir = $(prefix)/share/pear
++install_libdir = $(prefix)/lib/php/$(PHP_EXT_DIR)
+
+ #
+ # Platform specific definitions
+@@ -155,7 +155,8 @@
+ endif
+
+ ifeq ($(installphplib),)
+- installphplib = $(INSTALL) $(1) $(2); \
++ installphplib = mkdir -p $(2) ; \
++ $(INSTALL) $(1) $(2); \
+ chmod a+rx $(2)/$(notdir $(1))
+ endif
+
diff --git a/devel/php5-ice/files/patch-php-lib-Makefile b/devel/php5-ice/files/patch-php-lib-Makefile
new file mode 100644
index 000000000000..876fe82c4304
--- /dev/null
+++ b/devel/php5-ice/files/patch-php-lib-Makefile
@@ -0,0 +1,12 @@
+--- php/lib/Makefile.orig 2013-06-02 12:11:06.451195440 +0000
++++ php/lib/Makefile 2013-06-02 12:16:29.249191742 +0000
+@@ -167,7 +167,8 @@
+ @echo "Installing generated code"
+ @for i in $(MODULES) ; \
+ do \
+- $(INSTALL_DATA) -r $$i $(install_phpdir) ; \
++ mkdir -p $(install_phpdir)/$$i ; \
++ $(INSTALL_DATA) $$i/*.php $(install_phpdir)/$$i ; \
+ done
+ @for i in $(MODULE_SRCS) ; \
+ do \
diff --git a/devel/php5-ice/files/patch-php-src-IcePHP-Communicator.cpp b/devel/php5-ice/files/patch-php-src-IcePHP-Communicator.cpp
new file mode 100644
index 000000000000..127dadc35f1e
--- /dev/null
+++ b/devel/php5-ice/files/patch-php-src-IcePHP-Communicator.cpp
@@ -0,0 +1,11 @@
+--- php/src/IcePHP/Communicator.cpp.orig 2013-06-02 11:48:21.990197196 +0000
++++ php/src/IcePHP/Communicator.cpp 2013-06-02 11:48:29.692195174 +0000
+@@ -1341,7 +1341,7 @@
+ //
+ zend_class_entry ce;
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Communicator"), _interfaceMethods);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "Communicator", _interfaceMethods);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_Communicator", _interfaceMethods);
+ #endif
diff --git a/devel/php5-ice/files/patch-php-src-IcePHP-Connection.cpp b/devel/php5-ice/files/patch-php-src-IcePHP-Connection.cpp
new file mode 100644
index 000000000000..e5928998985a
--- /dev/null
+++ b/devel/php5-ice/files/patch-php-src-IcePHP-Connection.cpp
@@ -0,0 +1,47 @@
+--- php/src/IcePHP/Connection.cpp.orig 2013-06-02 11:48:58.022196354 +0000
++++ php/src/IcePHP/Connection.cpp 2013-06-02 11:50:59.494195380 +0000
+@@ -360,7 +360,7 @@
+ //
+ zend_class_entry ce;
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Connection"), _interfaceMethods);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "Connection", _interfaceMethods);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_Connection", _interfaceMethods);
+ #endif
+@@ -380,7 +380,7 @@
+ // Register the ConnectionInfo class.
+ //
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("ConnectionInfo"), _connectionInfoClassMethods);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "ConnectionInfo", _connectionInfoClassMethods);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_ConnectionInfo", _connectionInfoClassMethods);
+ #endif
+@@ -396,7 +396,7 @@
+ // Register the IPConnectionInfo class.
+ //
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPConnectionInfo"), NULL);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "IPConnectionInfo", NULL);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_IPConnectionInfo", NULL);
+ #endif
+@@ -415,7 +415,7 @@
+ // Register the TCPConnectionInfo class.
+ //
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPConnectionInfo"), NULL);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPConnectionInfo", NULL);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_TCPConnectionInfo", NULL);
+ #endif
+@@ -426,7 +426,7 @@
+ // Register the UDPConnectionInfo class.
+ //
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPConnectionInfo"), NULL);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPConnectionInfo", NULL);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_UDPConnectionInfo", NULL);
+ #endif
diff --git a/devel/php5-ice/files/patch-php-src-IcePHP-Endpoint.cpp b/devel/php5-ice/files/patch-php-src-IcePHP-Endpoint.cpp
new file mode 100644
index 000000000000..65d6e2d9f618
--- /dev/null
+++ b/devel/php5-ice/files/patch-php-src-IcePHP-Endpoint.cpp
@@ -0,0 +1,56 @@
+--- php/src/IcePHP/Endpoint.cpp.orig 2013-06-02 11:51:19.569193334 +0000
++++ php/src/IcePHP/Endpoint.cpp 2013-06-02 11:52:06.348197336 +0000
+@@ -274,7 +274,7 @@
+ //
+ zend_class_entry ce;
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Endpoint"), _interfaceMethods);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "Endpoint", _interfaceMethods);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_Endpoint", _interfaceMethods);
+ #endif
+@@ -293,7 +293,7 @@
+ // Register the EndpointInfo class.
+ //
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("EndpointInfo"), _endpointInfoMethods);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "EndpointInfo", _endpointInfoMethods);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_EndpointInfo", _endpointInfoMethods);
+ #endif
+@@ -309,7 +309,7 @@
+ // Register the IPEndpointInfo class.
+ //
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPEndpointInfo"), NULL);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "IPEndpointInfo", NULL);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_IPEndpointInfo", NULL);
+ #endif
+@@ -324,7 +324,7 @@
+ // Register the TCPEndpointInfo class.
+ //
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPEndpointInfo"), NULL);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPEndpointInfo", NULL);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_TCPEndpointInfo", NULL);
+ #endif
+@@ -335,7 +335,7 @@
+ // Register the UDPEndpointInfo class.
+ //
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPEndpointInfo"), NULL);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPEndpointInfo", NULL);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_UDPEndpointInfo", NULL);
+ #endif
+@@ -350,7 +350,7 @@
+ // Register the OpaqueEndpointInfo class.
+ //
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("OpaqueEndpointInfo"), NULL);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "OpaqueEndpointInfo", NULL);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_OpaqueEndpointInfo", NULL);
+ #endif
diff --git a/devel/php5-ice/files/patch-php-src-IcePHP-Init.cpp b/devel/php5-ice/files/patch-php-src-IcePHP-Init.cpp
new file mode 100644
index 000000000000..080bae0d60e6
--- /dev/null
+++ b/devel/php5-ice/files/patch-php-src-IcePHP-Init.cpp
@@ -0,0 +1,15 @@
+--- php/src/IcePHP/Init.cpp.orig 2013-03-11 15:19:47.000000000 +0000
++++ php/src/IcePHP/Init.cpp 2013-06-02 11:44:16.052196522 +0000
+@@ -22,10 +22,10 @@
+
+ ZEND_DECLARE_MODULE_GLOBALS(ice)
+
+-ZEND_BEGIN_ARG_INFO(Ice_initialize_arginfo, 1)
++ZEND_BEGIN_ARG_INFO_EX(Ice_initialize_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1))
+ ZEND_END_ARG_INFO()
+
+-ZEND_BEGIN_ARG_INFO(Ice_createProperties_arginfo, 1)
++ZEND_BEGIN_ARG_INFO_EX(Ice_createProperties_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1))
+ ZEND_END_ARG_INFO()
+
+ #define ICEPHP_COMMUNICATOR_FUNCTIONS \
diff --git a/devel/php5-ice/files/patch-php-src-IcePHP-Logger.cpp b/devel/php5-ice/files/patch-php-src-IcePHP-Logger.cpp
new file mode 100644
index 000000000000..98d634e072b0
--- /dev/null
+++ b/devel/php5-ice/files/patch-php-src-IcePHP-Logger.cpp
@@ -0,0 +1,11 @@
+--- php/src/IcePHP/Logger.cpp.orig 2013-06-02 11:52:25.727195546 +0000
++++ php/src/IcePHP/Logger.cpp 2013-06-02 11:52:39.876195038 +0000
+@@ -269,7 +269,7 @@
+ //
+ zend_class_entry ce;
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Logger"), _interfaceMethods);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "Logger", _interfaceMethods);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_Logger", _interfaceMethods);
+ #endif
diff --git a/devel/php5-ice/files/patch-php-src-IcePHP-Properties.cpp b/devel/php5-ice/files/patch-php-src-IcePHP-Properties.cpp
new file mode 100644
index 000000000000..4245e7f71ed4
--- /dev/null
+++ b/devel/php5-ice/files/patch-php-src-IcePHP-Properties.cpp
@@ -0,0 +1,11 @@
+--- php/src/IcePHP/Properties.cpp.orig 2013-06-02 11:52:55.531198249 +0000
++++ php/src/IcePHP/Properties.cpp 2013-06-02 11:53:07.786227648 +0000
+@@ -641,7 +641,7 @@
+ //
+ zend_class_entry ce;
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Properties"), _interfaceMethods);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "Properties", _interfaceMethods);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_Properties", _interfaceMethods);
+ #endif
diff --git a/devel/php5-ice/files/patch-php-src-IcePHP-Proxy.cpp b/devel/php5-ice/files/patch-php-src-IcePHP-Proxy.cpp
new file mode 100644
index 000000000000..4e15ee48a7bc
--- /dev/null
+++ b/devel/php5-ice/files/patch-php-src-IcePHP-Proxy.cpp
@@ -0,0 +1,11 @@
+--- php/src/IcePHP/Proxy.cpp.orig 2013-06-02 11:54:02.594196824 +0000
++++ php/src/IcePHP/Proxy.cpp 2013-06-02 11:53:46.793198453 +0000
+@@ -1702,7 +1702,7 @@
+ //
+ zend_class_entry ce;
+ #ifdef ICEPHP_USE_NAMESPACES
+- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("ObjectPrx"), _proxyMethods);
++ INIT_NS_CLASS_ENTRY(ce, "Ice", "ObjectPrx", _proxyMethods);
+ #else
+ INIT_CLASS_ENTRY(ce, "Ice_ObjectPrx", _proxyMethods);
+ #endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 22:42:19 +0000