Date: Fri, 30 Jul 2010 16:52:48 +0200 From: "Stefan Ehmann" <shoesoft@gmx.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/149114: update devel/php5-ice to 3.4.1 Message-ID: <1280501568.83334@walrus.pepperland> Resent-Message-ID: <201007301520.o6UFK2DD081690@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149114 >Category: ports >Synopsis: update devel/php5-ice to 3.4.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 30 15:20:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Stefan Ehmann >Release: FreeBSD 8.1-RELEASE i386 >Organization: >Environment: System: FreeBSD 8.1-RELEASE #3: Mon Jul 19 20:37:37 CEST 2010 stefan@walrus.pepperland:/usr/obj/usr/src/sys/WALRUS >Description: updates devel/php5-ice to 3.4.1 This update needs to be coordinated with PRs 146633 (ice) and 148492 (py-ice) I just checked that it builds fine. Since I'm not familiar with php, I could not test whether the new version actually works. But without this update devel/ice would be stuck with version 3.3.1. The py/php-ice maintainer hasn't responsed to any of my mails or to any GNATS mails. Deleted files: files/patch-php+config+Make.rules files/patch-php__src__IcePHP__Marshal.cpp Added files: files/patch-php+config+Make.rules.php >How-To-Repeat: >Fix: --- php5-ice-diff begins here --- diff -ruN php5-ice.bak/Makefile php5-ice/Makefile --- php5-ice.bak/Makefile 2010-07-30 15:41:34.000000000 +0200 +++ php5-ice/Makefile 2010-07-30 15:43:34.000000000 +0200 @@ -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} @@ -51,11 +50,11 @@ .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 -ruN php5-ice.bak/distinfo php5-ice/distinfo --- php5-ice.bak/distinfo 2010-07-30 15:41:34.000000000 +0200 +++ php5-ice/distinfo 2010-07-30 13:35:19.000000000 +0200 @@ -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 -ruN php5-ice.bak/files/patch-php+config+Make.rules php5-ice/files/patch-php+config+Make.rules --- php5-ice.bak/files/patch-php+config+Make.rules 2010-07-30 15:41:34.000000000 +0200 +++ php5-ice/files/patch-php+config+Make.rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ ---- 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 -ruN php5-ice.bak/files/patch-php+config+Make.rules.php php5-ice/files/patch-php+config+Make.rules.php --- php5-ice.bak/files/patch-php+config+Make.rules.php 1970-01-01 01:00:00.000000000 +0100 +++ php5-ice/files/patch-php+config+Make.rules.php 2010-07-30 14:44:45.000000000 +0200 @@ -0,0 +1,42 @@ +--- 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 -ruN php5-ice.bak/files/patch-php__src__IcePHP__Marshal.cpp php5-ice/files/patch-php__src__IcePHP__Marshal.cpp --- php5-ice.bak/files/patch-php__src__IcePHP__Marshal.cpp 2010-07-30 15:41:34.000000000 +0200 +++ php5-ice/files/patch-php__src__IcePHP__Marshal.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -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 -ruN php5-ice.bak/pkg-plist php5-ice/pkg-plist --- php5-ice.bak/pkg-plist 2010-07-30 15:41:34.000000000 +0200 +++ php5-ice/pkg-plist 2010-07-30 15:23:43.000000000 +0200 @@ -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/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/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/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%% --- php5-ice-diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1280501568.83334>