6 files changed, 158 insertions, 64 deletions
diff --git a/devel/php5-ice/Makefile b/devel/php5-ice/Makefile
index 4152b44a1a3d..8d4311bd3258 100644
--- a/devel/php5-ice/Makefile
+++ b/devel/php5-ice/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	Ice
-PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTVERSION=	3.3.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.zeroc.com/download/Ice/3.2/ \
-		http://www.dirk.sh/dirk/php/Ice/
+		http://www.dirk.sh/dirk/Ice/
 PKGNAMEPREFIX=	php5-
-DISTNAME=	IcePHP-${PORTVERSION}
+DISTNAME=	Ice-${PORTVERSION}
 
 MAINTAINER=	dirk.ye@gmail.com
 COMMENT=	An Ice (Internet Communications Engine) language mapping for PHP
@@ -25,8 +24,10 @@ DEFAULT_PHP_VER=5
 IGNORE_WITH_PHP=4
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
+BUILD_WRKSRC=	${WRKSRC}/php
+INSTALL_WRKSRC=	${WRKSRC}/php
 
-LIB_VRS=	${PORTVERSION:S|.||g:C|1$||}
+LIB_VRS=	${PORTVERSION:S|.||g:C|0$||}
 PHP_MODNAME?=	IcePHP
 
 CFLAGS+=	-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS}
@@ -37,24 +38,24 @@ CFLAGS+=	-DNDEBUG
 .endif
 
 .include <bsd.port.pre.mk>
-
 .if ${ARCH} == "ia64"
-BROKEN=		does not compile
+BROKEN=		does not compile on ia64
 .endif
 
 .if ((${ARCH} != i386) && (${ARCH} != powerpc))
 MAKE_ENV=	LP64=yes
 .endif
 
-post-extract:
-	${CP} ${WRKSRC}/config/Make.rules.Linux ${WRKSRC}/config/Make.rules.FreeBSD
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	NOPORTDOCS=yes
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/config/Make.rules.FreeBSD
+	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/php/config/Make.rules
 	${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/config/Make.rules
+		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/php/config/Make.rules
 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 acc9897abbd2..fb9ca254c9f9 100644
--- a/devel/php5-ice/distinfo
+++ b/devel/php5-ice/distinfo
@@ -1,3 +1,3 @@
-MD5 (IcePHP-3.2.1.tar.gz) = e32a8988dfae57775d9c71e7ace4c687
-SHA256 (IcePHP-3.2.1.tar.gz) = 6e1560ca2b344ff19f5a9c8f0b0777644b3dea60949b46a2fab202a71a891f8a
-SIZE (IcePHP-3.2.1.tar.gz) = 78072
+MD5 (Ice-3.3.0.tar.gz) = 0500306d9cdbc0fbb553fbb529de557a
+SHA256 (Ice-3.3.0.tar.gz) = 73330e29799d08605d51b9fc148fdc11eb01b6c55b7e4bf4dcb8fafd98ba7749
+SIZE (Ice-3.3.0.tar.gz) = 4260675
diff --git a/devel/php5-ice/files/patch-config+Make.rules b/devel/php5-ice/files/patch-config+Make.rules
deleted file mode 100644
index a6fc981bb6e3..000000000000
--- a/devel/php5-ice/files/patch-config+Make.rules
+++ /dev/null
@@ -1,50 +0,0 @@
---- config/Make.rules.orig	Wed Aug 22 16:32:59 2007
-+++ config/Make.rules	Wed Aug 22 21:34:34 2007
-@@ -7,6 +7,8 @@
- #
- # **********************************************************************
- 
-+ICE_HOME		= %%LOCALBASE%%
-+
- ifndef ICE_HOME
-    ifneq ($(shell test -f /usr/include/Ice/Ice.h && echo 0),0)
-       $(error Ice installation not found, please set ICE_HOME!)
-@@ -18,7 +20,7 @@ endif
- # if it does not exist.
- #
- 
--prefix			?= /opt/IcePHP-$(VERSION)
-+prefix			?= %%PREFIX%%/lib/php/$(PHP_EXT_DIR)
- 
- #
- # The "root directory" for runpath embedded in executables. Can be unset
-@@ -31,7 +33,7 @@ embedded_runpath_prefix  ?= /opt/Ice-$(V
- # 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 @@ embedded_runpath_prefix  ?= /opt/Ice-$(V
- # PHP_INCLUDE_DIR and PHP_LIB_DIR.
- #
- 
--PHP_HOME		?= /opt/php
-+PHP_HOME		?= /usr/local
- 
- UNAME			:= $(shell uname)
- 
-@@ -134,9 +136,9 @@ else
- endif
- 
- ifeq ($(LP64),yes)
--    install_libdir	= $(prefix)/lib$(lp64suffix)
-+    install_libdir	= $(prefix)$(lp64suffix)
- else
--    install_libdir	= $(prefix)/lib
-+    install_libdir	= $(prefix)
- endif
- 
- ifneq ($(embedded_runpath_prefix),)
diff --git a/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD b/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD
new file mode 100644
index 000000000000..41619d6da981
--- /dev/null
+++ b/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD
@@ -0,0 +1,31 @@
+--- 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_LIBS%% -L$(LOCALBASE)/lib -liconv
+ LIBS			= -lIce $(BASELIBS)
+ 
+-ICEUTIL_OS_LIBS		= 
+-ICE_OS_LIBS		= 
++ICEUTIL_OS_LIBS		= %%PTHREAD_LIBS%% 
++ICE_OS_LIBS		=
+ 
+ PLATFORM_HAS_READLINE	= yes
+ 
diff --git a/devel/php5-ice/files/patch-php+config+Make.rules b/devel/php5-ice/files/patch-php+config+Make.rules
new file mode 100644
index 000000000000..2182467a3ada
--- /dev/null
+++ b/devel/php5-ice/files/patch-php+config+Make.rules
@@ -0,0 +1,40 @@
+--- 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
+@@ -12,7 +12,9 @@
+ # if it does not exist.
+ #
+ 
+-prefix			?= /opt/Ice-$(VERSION)
++ICE_HOME		= %%PREFIX%%
++
++prefix			?= %%PREFIX%%/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
+@@ -48,7 +50,7 @@
+ # PHP_INCLUDE_DIR and PHP_LIB_DIR.
+ #
+ 
+-PHP_HOME		?= /opt/php
++PHP_HOME		?= %%PREFIX%%
+ 
+ #
+ # Verifies the PHP_HOME is valid and attempts to adjust for platform variances
+@@ -94,7 +96,7 @@
+ endif
+ 
+ libdir			= $(top_srcdir)/lib
+-install_libdir		= $(prefix)/$(libsubdir)
++install_libdir		= $(prefix)
+ 
+ #
+ # Platform specific definitions
diff --git a/devel/php5-ice/pkg-plist b/devel/php5-ice/pkg-plist
index 5fb26d4c49a8..f1b56b771f9a 100644
--- a/devel/php5-ice/pkg-plist
+++ b/devel/php5-ice/pkg-plist
@@ -1,5 +1,77 @@
 lib/php/%%PHP_EXT_DIR%%/ICE_LICENSE
 lib/php/%%PHP_EXT_DIR%%/IcePHP.so
 lib/php/%%PHP_EXT_DIR%%/LICENSE
+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
+lib/php/%%PHP_EXT_DIR%%/slice/Freeze/ConnectionF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Freeze/DB.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Freeze/Evictor.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Freeze/EvictorF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Freeze/EvictorStorage.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Freeze/Exception.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Freeze/Transaction.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Freeze/TransactionalEvictor.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Glacier2/PermissionsVerifier.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Glacier2/PermissionsVerifierF.ice
+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
+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/FacetMap.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/Identity.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/ImplicitContext.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/ImplicitContextF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/LocalException.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/Locator.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/LocatorF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/Logger.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/LoggerF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/ObjectAdapter.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/ObjectAdapterF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/ObjectFactory.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/ObjectFactoryF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/Plugin.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/PluginF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/Process.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/ProcessF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/Properties.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/PropertiesF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/Router.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/RouterF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/ServantLocator.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/ServantLocatorF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/SliceChecksumDict.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/Stats.ice
+lib/php/%%PHP_EXT_DIR%%/slice/Ice/StatsF.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceBox/IceBox.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/Admin.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/Descriptor.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/Exception.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/FileParser.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/Locator.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/Observer.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/Query.ice
+lib/php/%%PHP_EXT_DIR%%/slice/IceGrid/Registry.ice
+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/IceStorm/IceStorm.ice
+@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/IceStorm
 @dirrmtry lib/php/%%PHP_EXT_DIR%%/slice
 @dirrmtry lib/php/%%PHP_EXT_DIR%%