5 files changed, 86 insertions, 30 deletions

diff --git a/devel/php5-ice/Makefile b/devel/php5-ice/Makefile
index 5864894f06ed..6c0a86b86752 100644
--- a/devel/php5-ice/Makefile
+++ b/devel/php5-ice/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	Ice
-PORTVERSION=	3.3.1
+PORTVERSION=	3.4.1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.zeroc.com/download/Ice/3.3/ \
-		http://www.dirk.sh/dirk/Ice/
+MASTER_SITES=	http://www.zeroc.com/download/Ice/3.4/
 PKGNAMEPREFIX=	php5-
 DISTNAME=	Ice-${PORTVERSION}
 
@@ -18,8 +17,6 @@ COMMENT=	An Ice (Internet Communications Engine) language mapping for PHP
 
 LIB_DEPENDS=	Ice.${LIB_VRS}:${PORTSDIR}/devel/ice
 
-BROKEN=		Port needs to be updated to new Ice version.
-
 USE_GMAKE=	yes
 MAKE_ARGS+=	PHP_EXT_DIR=${PHP_EXT_DIR}
 DEFAULT_PHP_VER=5
@@ -53,11 +50,11 @@ MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/php/config/Make.rules
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/php/config/Make.rules.php
 	${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
+		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/php/config/Make.rules.php
 post-install:
 	@${MKDIR} ${PREFIX}/etc/php
 	@${ECHO_CMD} extension=${PHP_MODNAME}.so \
diff --git a/devel/php5-ice/distinfo b/devel/php5-ice/distinfo
index a5d8186ba8c4..0ce935a9c857 100644
--- a/devel/php5-ice/distinfo
+++ b/devel/php5-ice/distinfo
@@ -1,3 +1,3 @@
-MD5 (Ice-3.3.1.tar.gz) = 1f37dfcec4662fcde030553fb447d064
-SHA256 (Ice-3.3.1.tar.gz) = 7b90477303ea2668e8f2cc7bb4506e3a596699e092c4e622746ea42d8286abd0
-SIZE (Ice-3.3.1.tar.gz) = 4455154
+MD5 (Ice-3.4.1.tar.gz) = 3aae42aa47dec74bb258c1a1b2847a1a
+SHA256 (Ice-3.4.1.tar.gz) = 83c76687ac2b1c16a7e51799668531ec794dc8bd81f0daec14765ad3c671b0e6
+SIZE (Ice-3.4.1.tar.gz) = 5263510
diff --git a/devel/php5-ice/files/patch-php+config+Make.rules b/devel/php5-ice/files/patch-php+config+Make.rules.php
index 2182467a3ada..a8d2db0d75a2 100644
--- a/devel/php5-ice/files/patch-php+config+Make.rules
+++ b/devel/php5-ice/files/patch-php+config+Make.rules.php
@@ -1,13 +1,13 @@
---- php/config/Make.rules.orig	2008-05-17 01:24:03.000000000 +0800
-+++ php/config/Make.rules	2008-08-02 08:20:17.000000000 +0800
+--- 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		= %%PREFIX%%
++ICE_HOME		= /usr/local
 +
-+prefix			?= %%PREFIX%%/lib/php/$(PHP_EXT_DIR)
++prefix			?= /usr/local/lib/php/$(PHP_EXT_DIR)
  
  #
  # The "root directory" for runpath embedded in executables. Can be unset
@@ -20,20 +20,22 @@
  
  #
  # Define LP64 as yes if you want to build in 64 bit mode on a platform
-@@ -48,7 +50,7 @@
+@@ -54,7 +56,7 @@
  # PHP_INCLUDE_DIR and PHP_LIB_DIR.
  #
  
 -PHP_HOME		?= /opt/php
-+PHP_HOME		?= %%PREFIX%%
++PHP_HOME		?= /usr/local
  
  #
  # Verifies the PHP_HOME is valid and attempts to adjust for platform variances
-@@ -94,7 +96,7 @@
+@@ -100,8 +102,8 @@
  endif
  
  libdir			= $(top_srcdir)/lib
--install_libdir		= $(prefix)/$(libsubdir)
+-install_phpdir		= $(prefix)/php
+-install_libdir		= $(prefix)/php
++install_phpdir		= $(prefix)
 +install_libdir		= $(prefix)
  
  #
diff --git a/devel/php5-ice/files/patch-php__src__IcePHP__Marshal.cpp b/devel/php5-ice/files/patch-php__src__IcePHP__Marshal.cpp
deleted file mode 100644
index 0c7a9d4a7fa5..000000000000
--- a/devel/php5-ice/files/patch-php__src__IcePHP__Marshal.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./php/src/IcePHP/Marshal.cpp.orig	2010-04-13 11:43:37.000000000 -0400
-+++ ./php/src/IcePHP/Marshal.cpp	2010-04-13 11:43:44.000000000 -0400
-@@ -1929,7 +1929,7 @@
-     this->TSRMLS_C = TSRMLS_C;
- #endif
- 
--    ZVAL_ADDREF(_value);
-+    Z_ADDREF_P(_value);
- 
-     _class = Z_OBJCE_P(_value);
- }
diff --git a/devel/php5-ice/pkg-plist b/devel/php5-ice/pkg-plist
index f1b56b771f9a..6f5ff91731ef 100644
--- a/devel/php5-ice/pkg-plist
+++ b/devel/php5-ice/pkg-plist
@@ -1,6 +1,64 @@
 lib/php/%%PHP_EXT_DIR%%/ICE_LICENSE
+lib/php/%%PHP_EXT_DIR%%/Ice.php
 lib/php/%%PHP_EXT_DIR%%/IcePHP.so
 lib/php/%%PHP_EXT_DIR%%/LICENSE
+lib/php/%%PHP_EXT_DIR%%/Glacier2.php
+lib/php/%%PHP_EXT_DIR%%/Glacier2/PermissionsVerifier.php
+lib/php/%%PHP_EXT_DIR%%/Glacier2/PermissionsVerifierF.php
+lib/php/%%PHP_EXT_DIR%%/Glacier2/Router.php
+lib/php/%%PHP_EXT_DIR%%/Glacier2/RouterF.php
+lib/php/%%PHP_EXT_DIR%%/Glacier2/SSLInfo.php
+lib/php/%%PHP_EXT_DIR%%/Glacier2/Session.php
+lib/php/%%PHP_EXT_DIR%%/Ice/BuiltinSequences.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Communicator.php
+lib/php/%%PHP_EXT_DIR%%/Ice/CommunicatorF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Connection.php
+lib/php/%%PHP_EXT_DIR%%/Ice/ConnectionF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Current.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Endpoint.php
+lib/php/%%PHP_EXT_DIR%%/Ice/EndpointF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/EndpointTypes.php
+lib/php/%%PHP_EXT_DIR%%/Ice/FacetMap.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Identity.php
+lib/php/%%PHP_EXT_DIR%%/Ice/ImplicitContext.php
+lib/php/%%PHP_EXT_DIR%%/Ice/ImplicitContextF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/LocalException.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Locator.php
+lib/php/%%PHP_EXT_DIR%%/Ice/LocatorF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Logger.php
+lib/php/%%PHP_EXT_DIR%%/Ice/LoggerF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/ObjectAdapterF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/ObjectFactory.php
+lib/php/%%PHP_EXT_DIR%%/Ice/ObjectFactoryF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Plugin.php
+lib/php/%%PHP_EXT_DIR%%/Ice/PluginF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Process.php
+lib/php/%%PHP_EXT_DIR%%/Ice/ProcessF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Properties.php
+lib/php/%%PHP_EXT_DIR%%/Ice/PropertiesF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Router.php
+lib/php/%%PHP_EXT_DIR%%/Ice/RouterF.php
+lib/php/%%PHP_EXT_DIR%%/Ice/SliceChecksumDict.php
+lib/php/%%PHP_EXT_DIR%%/Ice/Stats.php
+lib/php/%%PHP_EXT_DIR%%/Ice/StatsF.php
+lib/php/%%PHP_EXT_DIR%%/IceBox.php
+lib/php/%%PHP_EXT_DIR%%/IceBox/IceBox.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/Admin.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/Descriptor.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/Exception.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/FileParser.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/Locator.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/Observer.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/Query.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/Registry.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/Session.php
+lib/php/%%PHP_EXT_DIR%%/IceGrid/UserAccountMapper.php
+lib/php/%%PHP_EXT_DIR%%/IcePatch2.php
+lib/php/%%PHP_EXT_DIR%%/IcePatch2/FileInfo.php
+lib/php/%%PHP_EXT_DIR%%/IcePatch2/FileServer.php
+lib/php/%%PHP_EXT_DIR%%/IceStorm.php
+lib/php/%%PHP_EXT_DIR%%/IceStorm/IceStorm.php
 lib/php/%%PHP_EXT_DIR%%/slice/Freeze/BackgroundSaveEvictor.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Freeze/CatalogData.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Freeze/Connection.ice
@@ -18,7 +76,6 @@ lib/php/%%PHP_EXT_DIR%%/slice/Glacier2/Router.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Glacier2/RouterF.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Glacier2/SSLInfo.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Glacier2/Session.ice
-lib/php/%%PHP_EXT_DIR%%/slice/Glacier2/SessionF.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Ice/BuiltinSequences.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Ice/Communicator.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Ice/CommunicatorF.ice
@@ -26,6 +83,8 @@ lib/php/%%PHP_EXT_DIR%%/slice/Ice/Connection.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Ice/ConnectionF.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Ice/Current.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Ice/Endpoint.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/EndpointF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/EndpointTypes.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Ice/FacetMap.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Ice/Identity.ice
 lib/php/%%PHP_EXT_DIR%%/slice/Ice/ImplicitContext.ice
@@ -65,13 +124,22 @@ lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/Session.ice
 lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/UserAccountMapper.ice
 lib/php/%%PHP_EXT_DIR%%/slice/IcePatch2/FileInfo.ice
 lib/php/%%PHP_EXT_DIR%%/slice/IcePatch2/FileServer.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceSSL/ConnectionInfo.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceSSL/EndpointInfo.ice
 lib/php/%%PHP_EXT_DIR%%/slice/IceStorm/IceStorm.ice
+@dirrmtry lib/php/%%PHP_EXT_DIR%%/Glacier2
+@dirrmtry lib/php/%%PHP_EXT_DIR%%/Ice
+@dirrmtry lib/php/%%PHP_EXT_DIR%%/IceBox
+@dirrmtry lib/php/%%PHP_EXT_DIR%%/IceGrid
+@dirrmtry lib/php/%%PHP_EXT_DIR%%/IcePatch2
+@dirrmtry lib/php/%%PHP_EXT_DIR%%/IceStorm
 @dirrmtry lib/php/%%PHP_EXT_DIR%%/slice/Freeze
 @dirrmtry lib/php/%%PHP_EXT_DIR%%/slice/Glacier2
 @dirrmtry lib/php/%%PHP_EXT_DIR%%/slice/Ice
 @dirrmtry lib/php/%%PHP_EXT_DIR%%/slice/IceBox
 @dirrmtry lib/php/%%PHP_EXT_DIR%%/slice/IceGrid
 @dirrmtry lib/php/%%PHP_EXT_DIR%%/slice/IcePatch2
+@dirrmtry lib/php/%%PHP_EXT_DIR%%/slice/IceSSL
 @dirrmtry lib/php/%%PHP_EXT_DIR%%/slice/IceStorm
 @dirrmtry lib/php/%%PHP_EXT_DIR%%/slice
 @dirrmtry lib/php/%%PHP_EXT_DIR%%