summaryrefslogtreecommitdiff
path: root/devel/php5-ice
diff options
context:
space:
mode:
Diffstat (limited to 'devel/php5-ice')
-rw-r--r--devel/php5-ice/Makefile65
-rw-r--r--devel/php5-ice/distinfo2
-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.rules13
-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
-rw-r--r--devel/php5-ice/pkg-plist3
15 files changed, 14 insertions, 303 deletions
diff --git a/devel/php5-ice/Makefile b/devel/php5-ice/Makefile
index 9a79fcbda985..67d89e8c399d 100644
--- a/devel/php5-ice/Makefile
+++ b/devel/php5-ice/Makefile
@@ -1,10 +1,7 @@
# Created by: DIrk Ye <dirk.ye@gmail.com>
# $FreeBSD$
-PORTNAME= Ice
-PORTVERSION= 3.5.0
CATEGORIES= devel
-MASTER_SITES= http://download.zeroc.com/Ice/3.5/
PKGNAMEPREFIX= php5-
MAINTAINER= freebsd@grem.de
@@ -12,15 +9,20 @@ COMMENT= Ice (Internet Communications Engine) language mapping for PHP
LICENSE= GPLv2
-BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp
+BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp \
+ slice2php:${PORTSDIR}/devel/ice
LIB_DEPENDS= Ice.${LIB_VRS}:${PORTSDIR}/devel/ice
OPTIONS_DEFINE= DEBUG DOCS NAMESPACES
+OPTIONS_DEFAULT=
NAMESPACES_DESC= Use PHP namespaces (recommended)
-USE_GMAKE= yes
-MAKE_ARGS+= PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${PREFIX} \
- PHP_HOME=${PREFIX} OPTIMIZE=yes
+SLAVE_PORT= yes
+MASTERDIR= ${.CURDIR}/../ice
+PLIST= ${.CURDIR}/pkg-plist
+
+MAKE_ARGS+= PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${LOCALBASE} \
+ PHP_HOME=${LOCALBASE} OPTIMIZE=yes
USE_PHP= yes
USE_PHP_BUILD= yes
DEFAULT_PHP_VER=5
@@ -31,53 +33,8 @@ INSTALL_WRKSRC= ${WRKSRC}/php
LIB_VRS= ${PORTVERSION:S|.||g:C|0$||}
PHP_MODNAME?= IcePHP
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT
-.if ${PORT_OPTIONS:MDEBUG}
-CFLAGS+= -g
-.else
-CFLAGS+= -DNDEBUG
-.endif
-
-.if ${ARCH} == "ia64"
-BROKEN= does not compile on ia64
-.endif
-
-.if ((${ARCH} != i386) && (${ARCH} != powerpc))
-MAKE_ENV= LP64=yes
-.endif
-
-.if ${PORT_OPTIONS:MNAMESPACES}
-MAKE_ARGS+= USE_NAMESPACES=yes
-PLIST_SUB+= NAMESPACES=""
-PLIST_SUB+= NONAMESPACES="@comment "
-.else
-PLIST_SUB+= NAMESPACES="@comment "
-PLIST_SUB+= NONAMESPACES=""
-.endif
-
-.if empty(PORT_OPTIONS:MDOCS)
-MAKE_ENV+= NOPORTDOCS=yes
-.endif
-
-post-patch:
- @${SED} 's|%%PREFIX%%|${PREFIX}|g; \
- s|%%DATADIR%%|${DATADIR}|g; \
- s|%%DOCSDIR%%|${DOCSDIR}|g; \
- s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
- s|%%INSTALL_DATA%%|${INSTALL_DATA}|g' \
- ${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD
- @${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
- s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
- s|%%PREFIX%%|${PREFIX}|g ; \
- s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/php/config/Make.rules.php
-
post-install:
- @${MKDIR} ${PREFIX}/etc/php
- @${ECHO_CMD} extension=${PHP_MODNAME}.so \
- >> ${PREFIX}/etc/php/extensions.ini
+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
add-plist-info:
@${ECHO_CMD} "@exec mkdir -p %D/etc/php" \
@@ -105,4 +62,4 @@ security-check:
@${ECHO_CMD} ""
@${ECHO_CMD} "****************************************************************************"
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php5-ice/distinfo b/devel/php5-ice/distinfo
deleted file mode 100644
index 75e0cfcd0e10..000000000000
--- a/devel/php5-ice/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Ice-3.5.0.tar.gz) = bbde6b5a87f5abc8d9105468731f1419829bc22b5d23b8fdef553967a2eebdb0
-SIZE (Ice-3.5.0.tar.gz) = 4790555
diff --git a/devel/php5-ice/files/Make.rules.FreeBSD b/devel/php5-ice/files/Make.rules.FreeBSD
deleted file mode 100644
index 03ca1908b79b..000000000000
--- a/devel/php5-ice/files/Make.rules.FreeBSD
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 85e29a0ae950..000000000000
--- a/devel/php5-ice/files/patch-config_Make.common.rules
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./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 b/devel/php5-ice/files/patch-cpp-config-Make.rules
deleted file mode 100644
index 85f52f5ddfa5..000000000000
--- a/devel/php5-ice/files/patch-cpp-config-Make.rules
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 a22c79dc2e64..000000000000
--- a/devel/php5-ice/files/patch-php-config-Make.rules.php
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
deleted file mode 100644
index 876fe82c4304..000000000000
--- a/devel/php5-ice/files/patch-php-lib-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 127dadc35f1e..000000000000
--- a/devel/php5-ice/files/patch-php-src-IcePHP-Communicator.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index e5928998985a..000000000000
--- a/devel/php5-ice/files/patch-php-src-IcePHP-Connection.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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
deleted file mode 100644
index 65d6e2d9f618..000000000000
--- a/devel/php5-ice/files/patch-php-src-IcePHP-Endpoint.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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
deleted file mode 100644
index 080bae0d60e6..000000000000
--- a/devel/php5-ice/files/patch-php-src-IcePHP-Init.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 98d634e072b0..000000000000
--- a/devel/php5-ice/files/patch-php-src-IcePHP-Logger.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 4245e7f71ed4..000000000000
--- a/devel/php5-ice/files/patch-php-src-IcePHP-Properties.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 4e15ee48a7bc..000000000000
--- a/devel/php5-ice/files/patch-php-src-IcePHP-Proxy.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/devel/php5-ice/pkg-plist b/devel/php5-ice/pkg-plist
index bf0d1a3acb26..690b823d6a16 100644
--- a/devel/php5-ice/pkg-plist
+++ b/devel/php5-ice/pkg-plist
@@ -38,6 +38,7 @@ share/pear/Ice/PluginF.php
share/pear/Ice/Process.php
share/pear/Ice/ProcessF.php
share/pear/Ice/Properties.php
+share/pear/Ice/PropertiesAdmin.php
share/pear/Ice/PropertiesF.php
share/pear/Ice/Router.php
share/pear/Ice/RouterF.php
@@ -72,3 +73,5 @@ share/pear/IceStorm/Metrics.php
@dirrmtry share/pear/IceStorm
@dirrmtry share/pear
@dirrmtry lib/php/%%PHP_EXT_DIR%%
+@dirrmtry lib/php
+@dirrmtry etc/php