diff options
| author | miwi <miwi@FreeBSD.org> | 2008-08-15 06:28:54 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-08-15 06:28:54 +0800 |
| commit | ff9e0a0bc9e238b106af921bcb3fe20db9607afd (patch) | |
| tree | 375b44aedac3809f297db0ca71b9577bbf9ad1ef /devel | |
| parent | b0f4d0d85bac44b7d048a301037862d9e6f8502b (diff) | |
| download | freebsd-ports-gnome-ff9e0a0bc9e238b106af921bcb3fe20db9607afd.tar.gz freebsd-ports-gnome-ff9e0a0bc9e238b106af921bcb3fe20db9607afd.tar.zst freebsd-ports-gnome-ff9e0a0bc9e238b106af921bcb3fe20db9607afd.zip | |
- Update to 3.3.0
PR: 126195 126197 126198
Submitted by: Stefan Ehmann <shoesoft@gmx.net> (maintainer)
Diffstat (limited to 'devel')
24 files changed, 430 insertions, 287 deletions
diff --git a/devel/ice/Makefile b/devel/ice/Makefile index 79d6ebc3f216..4ca8739414d2 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -6,21 +6,25 @@ # PORTNAME= Ice -PORTVERSION= 3.2.1 +PORTVERSION= 3.3.0 CATEGORIES= devel -MASTER_SITES= http://www.zeroc.com/download/Ice/3.2/ +MASTER_SITES= http://www.zeroc.com/download/Ice/3.3/ MAINTAINER= shoesoft@gmx.net COMMENT= A modern alternative to object middleware such as CORBA/COM/DCOM/COM+ +BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_GMAKE= yes +USE_ICONV= yes USE_BDB= 42+ INVALID_BDB_VER= 2 3 40 41 USE_LDCONFIG= yes +BUILD_WRKSRC= ${WRKSRC}/cpp +INSTALL_WRKSRC= ${WRKSRC}/cpp -CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} +CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include .if defined(DEBUG) CFLAGS+= -g .else @@ -51,14 +55,21 @@ post-patch: s|%%DOCSDIR%%|${DOCSDIR}|g; \ s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g' \ - ${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/config/Make.rules.FreeBSD + ${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD ${REINPLACE_CMD} 's|%%BDB_LIB_CXX_NAME%%|${BDB_LIB_CXX_NAME}|g; \ s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g; \ - s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g' \ - ${WRKSRC}/config/Make.rules - ${REINPLACE_CMD} 's|prefix|install_slicedir|g' ${WRKSRC}/config/Makefile - ${REINPLACE_CMD} 's|prefix|install_slicedir|g; \ - s|INSTALL_PROGRAM|INSTALL_DATA|g' ${WRKSRC}/src/ca/Makefile - ${FIND} ${WRKSRC} -name Makefile -exec ${REINPLACE_CMD} 's|-lIceSSL|-lIceSSL -lIceXML|' {} \; + s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g; \ + /install_docdir/d' \ + ${WRKSRC}/cpp/config/Make.rules + ${REINPLACE_CMD} '/install_configdir/d' \ + ${WRKSRC}/cpp/config/Make.rules + ${REINPLACE_CMD} 's|INSTALL_PROGRAM|INSTALL_DATA|g' \ + ${WRKSRC}/cpp/src/ca/Makefile + ${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/' \ + ${WRKSRC}/config/Make.common.rules +.if ${OSVERSION} < 700000 + ${REINPLACE_CMD} 's|__APPLE__|__FreeBSD__|' \ + ${WRKSRC}/cpp/src/IceUtil/Cond.cpp +.endif .include <bsd.port.post.mk> diff --git a/devel/ice/distinfo b/devel/ice/distinfo index a8561e3b4ec5..fb9ca254c9f9 100644 --- a/devel/ice/distinfo +++ b/devel/ice/distinfo @@ -1,3 +1,3 @@ -MD5 (Ice-3.2.1.tar.gz) = 77bb04788747d0f4f7ef35f7a4c2800f -SHA256 (Ice-3.2.1.tar.gz) = bd24cfe0296d81e2b04ea8d97b32a4f13fdd949d0f038f4c7e0922b395075149 -SIZE (Ice-3.2.1.tar.gz) = 2090576 +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/ice/files/Make.rules.FreeBSD b/devel/ice/files/Make.rules.FreeBSD index 88b32dd96100..00b9543ba1cf 100644 --- a/devel/ice/files/Make.rules.FreeBSD +++ b/devel/ice/files/Make.rules.FreeBSD @@ -1,6 +1,6 @@ mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -BASELIBS = -lIceUtil %%PTHREAD_LIBS%% +BASELIBS = -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv LIBS = -lIce $(BASELIBS) ICEUTIL_OS_LIBS = %%PTHREAD_LIBS%% @@ -10,9 +10,12 @@ 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/ice/files/patch-IconvStringConverter.h b/devel/ice/files/patch-IconvStringConverter.h new file mode 100644 index 000000000000..454f9e8bf99d --- /dev/null +++ b/devel/ice/files/patch-IconvStringConverter.h @@ -0,0 +1,11 @@ +--- cpp/include/Ice/IconvStringConverter.h.orig 2008-05-22 19:27:55.000000000 +0200 ++++ cpp/include/Ice/IconvStringConverter.h 2008-05-22 19:28:22.000000000 +0200 +@@ -19,7 +19,7 @@ + #include <langinfo.h> + #endif + +-#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || (defined(__sun) && !defined(_XPG6)) ++#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || (defined(__sun) && !defined(_XPG6)) || defined(__FreeBSD__) + // + // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962 + // diff --git a/devel/ice/files/patch-Make.rules b/devel/ice/files/patch-Make.rules index 8ff7446b840c..6808d132034d 100644 --- a/devel/ice/files/patch-Make.rules +++ b/devel/ice/files/patch-Make.rules @@ -1,5 +1,5 @@ ---- config/Make.rules.orig Fri Mar 9 00:16:54 2007 -+++ config/Make.rules Fri Apr 13 20:05:04 2007 +--- cpp/config/Make.rules.orig Fri Mar 9 00:16:54 2007 ++++ cpp/config/Make.rules Fri Apr 13 20:05:04 2007 @@ -188,7 +188,9 @@ DB_FLAGS = -I/usr/include/db45 DB_LIBS = -L/usr/$(libsubdir)/db45 -ldb_cxx @@ -10,4 +10,3 @@ + DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%) endif endif - diff --git a/devel/ice/files/patch-Makefile b/devel/ice/files/patch-Makefile index d6dda1c87496..ae1aa81e0b31 100644 --- a/devel/ice/files/patch-Makefile +++ b/devel/ice/files/patch-Makefile @@ -1,31 +1,12 @@ ---- Makefile.orig Wed Aug 8 21:00:54 2007 -+++ Makefile Fri Sep 14 12:30:38 2007 -@@ -11,7 +11,10 @@ - +--- cpp/Makefile.bak 2008-05-16 19:24:00.000000000 +0200 ++++ cpp/Makefile 2008-07-31 13:37:25.000000000 +0200 +@@ -12,6 +12,9 @@ include $(top_srcdir)/config/Make.rules --SUBDIRS = config src include test demo slice doc -+SUBDIRS = config src include test demo slice -+ifndef NOPORTDOCS + SUBDIRS = config src include test demo ++ifneq ($(NOPORTDOCS),yes) +SUBDIRS += doc +endif - INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir) - -@@ -51,12 +54,14 @@ - @( cd doc && $(MAKE) ) || exit 1 - - install:: -+ifndef NOPORTDOCS - @if test -d doc ; \ - then \ - ( cd doc && $(MAKE) install ) || exit 1 ; \ - fi -- $(call installdata,ICE_LICENSE,$(prefix)) -- $(call installdata,LICENSE,$(prefix)) -+ $(call installdata,ICE_LICENSE,$(install_docdir)) -+ $(call installdata,LICENSE,$(install_docdir)) -+endif + INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir) - clean:: - @if test -d doc ; \ diff --git a/devel/ice/files/patch-SignalHandler.cpp b/devel/ice/files/patch-SignalHandler.cpp new file mode 100644 index 000000000000..34c70d5a1879 --- /dev/null +++ b/devel/ice/files/patch-SignalHandler.cpp @@ -0,0 +1,28 @@ +--- cpp/src/Slice/SignalHandler.cpp.orig 2008-05-22 18:55:20.000000000 +0200 ++++ cpp/src/Slice/SignalHandler.cpp 2008-05-22 18:55:38.000000000 +0200 +@@ -52,9 +52,9 @@ + #ifdef _WIN32 + SetConsoleCtrlHandler(signalHandler, TRUE); + #else +- sigset(SIGHUP, signalHandler); +- sigset(SIGINT, signalHandler); +- sigset(SIGQUIT, signalHandler); ++ signal(SIGHUP, signalHandler); ++ signal(SIGINT, signalHandler); ++ signal(SIGQUIT, signalHandler); + #endif + } + +@@ -63,9 +63,9 @@ + #ifdef _WIN32 + SetConsoleCtrlHandler(signalHandler, FALSE); + #else +- sigset(SIGHUP, SIG_DFL); +- sigset(SIGINT, SIG_DFL); +- sigset(SIGQUIT, SIG_DFL); ++ signal(SIGHUP, SIG_DFL); ++ signal(SIGINT, SIG_DFL); ++ signal(SIGQUIT, SIG_DFL); + #endif + + _fileList.clear(); diff --git a/devel/ice/files/patch-src::Ice::Network.cpp b/devel/ice/files/patch-src::Ice::Network.cpp deleted file mode 100644 index 3bba8098706f..000000000000 --- a/devel/ice/files/patch-src::Ice::Network.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/Ice/Network.cpp.orig Tue Oct 18 16:18:39 2005 -+++ src/Ice/Network.cpp Thu Nov 17 15:00:25 2005 -@@ -275,7 +275,7 @@ - { - return; - } --#elif defined(__APPLE__) -+#elif (defined(__APPLE__) || defined(__FreeBSD__)) - if(errno == ENOTCONN || errno == EINVAL) - { - return; -@@ -306,7 +306,7 @@ - { - return; - } --#elif defined(__APPLE__) -+#elif (defined(__APPLE__) || defined(__FreeBSD__)) - if(errno == ENOTCONN || errno == EINVAL) - { - return; diff --git a/devel/ice/pkg-plist b/devel/ice/pkg-plist index 1ede781eb7c2..6e5da7975f12 100644 --- a/devel/ice/pkg-plist +++ b/devel/ice/pkg-plist @@ -1,10 +1,8 @@ -bin/ImportKey.class bin/dumpdb bin/glacier2router bin/icebox bin/iceboxadmin bin/iceca -bin/icecpp bin/icegridadmin bin/icegridnode bin/icegridregistry @@ -12,6 +10,7 @@ bin/icepatch2calc bin/icepatch2client bin/icepatch2server bin/icestormadmin +bin/icestormmigrate bin/slice2cpp bin/slice2cs bin/slice2docbook @@ -21,10 +20,11 @@ bin/slice2html bin/slice2java bin/slice2py bin/slice2rb -bin/slice2vb bin/transformdb +include/Freeze/BackgroundSaveEvictor.h include/Freeze/Catalog.h include/Freeze/CatalogData.h +include/Freeze/CatalogIndexList.h include/Freeze/Connection.h include/Freeze/ConnectionF.h include/Freeze/DB.h @@ -38,6 +38,7 @@ include/Freeze/Initialize.h include/Freeze/Map.h include/Freeze/Transaction.h include/Freeze/TransactionHolder.h +include/Freeze/TransactionalEvictor.h include/Glacier2/Glacier2.h include/Glacier2/PermissionsVerifier.h include/Glacier2/PermissionsVerifierF.h @@ -58,6 +59,7 @@ include/Ice/ConnectionIF.h include/Ice/ConnectionMonitorF.h include/Ice/Current.h include/Ice/Direct.h +include/Ice/DispatchInterceptor.h include/Ice/DynamicLibrary.h include/Ice/DynamicLibraryF.h include/Ice/Endpoint.h @@ -73,8 +75,8 @@ include/Ice/GCCountMap.h include/Ice/GCShared.h include/Ice/Handle.h include/Ice/Ice.h +include/Ice/IconvStringConverter.h include/Ice/Identity.h -include/Ice/IdentityUtil.h include/Ice/ImplicitContext.h include/Ice/ImplicitContextF.h include/Ice/Incoming.h @@ -114,6 +116,7 @@ include/Ice/ProxyF.h include/Ice/ProxyFactoryF.h include/Ice/ProxyHandle.h include/Ice/ReferenceF.h +include/Ice/RequestHandlerF.h include/Ice/Router.h include/Ice/RouterF.h include/Ice/ServantLocator.h @@ -135,6 +138,7 @@ include/IceGrid/Admin.h include/IceGrid/Descriptor.h include/IceGrid/Exception.h include/IceGrid/FileParser.h +include/IceGrid/IceGrid.h include/IceGrid/Locator.h include/IceGrid/Observer.h include/IceGrid/Perf.h @@ -145,14 +149,10 @@ include/IceGrid/UserAccountMapper.h include/IcePatch2/ClientUtil.h include/IcePatch2/FileInfo.h include/IcePatch2/FileServer.h -include/IcePatch2/Util.h include/IceSSL/Plugin.h include/IceStorm/IceStorm.h -include/IceStorm/Service.h include/IceUtil/AbstractMutex.h -include/IceUtil/Algorithm.h include/IceUtil/ArgVector.h -include/IceUtil/Base64.h include/IceUtil/Cache.h include/IceUtil/Cond.h include/IceUtil/Config.h @@ -166,7 +166,6 @@ include/IceUtil/IceUtil.h include/IceUtil/InputUtil.h include/IceUtil/Iterator.h include/IceUtil/Lock.h -include/IceUtil/MD5.h include/IceUtil/Monitor.h include/IceUtil/Mutex.h include/IceUtil/Options.h @@ -181,6 +180,7 @@ include/IceUtil/StringUtil.h include/IceUtil/Thread.h include/IceUtil/ThreadException.h include/IceUtil/Time.h +include/IceUtil/Timer.h include/IceUtil/UUID.h include/IceUtil/Unicode.h include/IceXML/Parser.h @@ -193,43 +193,54 @@ include/Slice/Parser.h include/Slice/Preprocessor.h include/Slice/PythonUtil.h include/Slice/RubyUtil.h -include/Slice/VbUtil.h +include/Slice/SignalHandler.h +include/Slice/Util.h +lib/ImportKey.class lib/libFreeze.so -lib/libFreeze.so.3.2.1 -lib/libFreeze.so.32 +lib/libFreeze.so.3.3.0 +lib/libFreeze.so.33 lib/libGlacier2.so -lib/libGlacier2.so.3.2.1 -lib/libGlacier2.so.32 +lib/libGlacier2.so.3.3.0 +lib/libGlacier2.so.33 lib/libIce.so -lib/libIce.so.3.2.1 -lib/libIce.so.32 +lib/libIce.so.3.3.0 +lib/libIce.so.33 lib/libIceBox.so -lib/libIceBox.so.3.2.1 -lib/libIceBox.so.32 +lib/libIceBox.so.3.3.0 +lib/libIceBox.so.33 lib/libIceGrid.so -lib/libIceGrid.so.3.2.1 -lib/libIceGrid.so.32 +lib/libIceGrid.so.3.3.0 +lib/libIceGrid.so.33 lib/libIcePatch2.so -lib/libIcePatch2.so.3.2.1 -lib/libIcePatch2.so.32 +lib/libIcePatch2.so.3.3.0 +lib/libIcePatch2.so.33 lib/libIceSSL.so -lib/libIceSSL.so.3.2.1 -lib/libIceSSL.so.32 +lib/libIceSSL.so.3.3.0 +lib/libIceSSL.so.33 lib/libIceStorm.so -lib/libIceStorm.so.3.2.1 -lib/libIceStorm.so.32 +lib/libIceStorm.so.3.3.0 +lib/libIceStorm.so.33 lib/libIceStormService.so -lib/libIceStormService.so.3.2.1 -lib/libIceStormService.so.32 +lib/libIceStormService.so.3.3.0 +lib/libIceStormService.so.33 lib/libIceUtil.so -lib/libIceUtil.so.3.2.1 -lib/libIceUtil.so.32 +lib/libIceUtil.so.3.3.0 +lib/libIceUtil.so.33 lib/libIceXML.so -lib/libIceXML.so.3.2.1 -lib/libIceXML.so.32 +lib/libIceXML.so.3.3.0 +lib/libIceXML.so.33 lib/libSlice.so -lib/libSlice.so.3.2.1 -lib/libSlice.so.32 +lib/libSlice.so.3.3.0 +lib/libSlice.so.33 +%%DATADIR%%/ICE_LICENSE +%%DATADIR%%/LICENSE +%%DATADIR%%/config/convertssl.py +%%DATADIR%%/config/icegrid-slice.3.1.ice.gz +%%DATADIR%%/config/icegrid-slice.3.2.ice.gz +%%DATADIR%%/config/icegrid-slice.3.3.ice.gz +%%DATADIR%%/config/templates.xml +%%DATADIR%%/config/upgradeicegrid.py +%%DATADIR%%/Freeze/BackgroundSaveEvictor.ice %%DATADIR%%/Freeze/CatalogData.ice %%DATADIR%%/Freeze/Connection.ice %%DATADIR%%/Freeze/ConnectionF.ice @@ -239,6 +250,7 @@ lib/libSlice.so.32 %%DATADIR%%/Freeze/EvictorStorage.ice %%DATADIR%%/Freeze/Exception.ice %%DATADIR%%/Freeze/Transaction.ice +%%DATADIR%%/Freeze/TransactionalEvictor.ice %%DATADIR%%/Glacier2/PermissionsVerifier.ice %%DATADIR%%/Glacier2/PermissionsVerifierF.ice %%DATADIR%%/Glacier2/Router.ice @@ -293,14 +305,17 @@ lib/libSlice.so.32 %%DATADIR%%/IcePatch2/FileInfo.ice %%DATADIR%%/IcePatch2/FileServer.ice %%DATADIR%%/IceStorm/IceStorm.ice -%%DATADIR%%/config/convertssl.py -%%DATADIR%%/config/icegrid-slice.3.1.ice.gz -%%DATADIR%%/config/templates.xml -%%DATADIR%%/config/upgradeicegrid.py -%%DATADIR%%/config/upgradeicestorm.py -%%PORTDOCS%%%%DOCSDIR%%/ICE_LICENSE -%%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze.html +%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2.html +%%PORTDOCS%%%%DOCSDIR%%/reference/Ice.html +%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox.html +%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid.html +%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2.html +%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm.html +%%PORTDOCS%%%%DOCSDIR%%/reference/_sindex.html +%%PORTDOCS%%%%DOCSDIR%%/reference/index.html +%%PORTDOCS%%%%DOCSDIR%%/reference/symboltree.js +%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/BackgroundSaveEvictor.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/CatalogData.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/Connection.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/DatabaseException.html @@ -308,6 +323,7 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/Evictor.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/EvictorDeactivatedException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/EvictorIterator.html +%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/IndexNotFoundException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/InvalidPositionException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/NoSuchElementException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/NotFoundException.html @@ -316,7 +332,7 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/Statistics.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/Transaction.html %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/TransactionAlreadyInProgressException.html -%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2.html +%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/TransactionalEvictor.html %%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/Admin.html %%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/CannotCreateSessionException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/IdentitySet.html @@ -331,7 +347,6 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/SessionManager.html %%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/SessionNotExistException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/StringSet.html -%%PORTDOCS%%%%DOCSDIR%%/reference/Ice.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/AdapterAlreadyActiveException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/AdapterNotFoundException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/AlreadyRegisteredException.html @@ -344,6 +359,7 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/CommunicatorDestroyedException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/CompressionException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectFailedException.html +%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Logger.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectTimeoutException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Connection.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ConnectionLostException.html @@ -371,9 +387,9 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ImplicitContext.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/InitializationException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/InvalidReplicaGroupIdException.html +%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Plugin.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Locator.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/LocatorRegistry.html -%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Logger.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/MarshalException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/MemoryLimitException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/NegativeSizeException.html @@ -388,20 +404,21 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ObjectNotFoundException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/OperationMode.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/OperationNotExistException.html -%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Plugin.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/PluginInitializationException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/PluginManager.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Process.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Properties.html +%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/PropertiesAdmin.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProtocolException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProxyParseException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProxyUnmarshalException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/RequestFailedException.html +%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ResponseSentException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Router.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/SecurityException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ServantLocator.html -%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ServerNotFoundException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/SocketException.html +%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ServerNotFoundException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Stats.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/StringConversionException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/SyscallException.html @@ -418,14 +435,13 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnsupportedEncodingException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnsupportedProtocolException.html %%PORTDOCS%%%%DOCSDIR%%/reference/Ice/VersionMismatchException.html -%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/AlreadyStartedException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/AlreadyStoppedException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/FailureException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/NoSuchServiceException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/Service.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/ServiceManager.html -%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid.html +%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/ServiceObserver.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AccessDeniedException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AdapterDescriptor.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/AdapterDynamicInfo.html @@ -454,8 +470,8 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/FileNotAvailableException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/FileParser.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/IceBoxDescriptor.html -%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/LoadBalancingPolicy.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/LoadInfo.html +%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/LoadBalancingPolicy.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/LoadSample.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/Locator.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/NodeDescriptor.html @@ -470,8 +486,8 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObjectInfo.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObjectNotRegisteredException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObjectObserver.html -%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObserverAlreadyRegisteredException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/OrderedLoadBalancingPolicy.html +%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ObserverAlreadyRegisteredException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ParseException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/PatchException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/PermissionDeniedException.html @@ -485,8 +501,8 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RegistryObserver.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RegistryUnreachableException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ReplicaGroupDescriptor.html -%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RoundRobinLoadBalancingPolicy.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerDescriptor.html +%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/RoundRobinLoadBalancingPolicy.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerDynamicInfo.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerInfo.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerInstanceDescriptor.html @@ -494,19 +510,18 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerStartException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerState.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerStopException.html +%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServerUnreachableException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServiceDescriptor.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/ServiceInstanceDescriptor.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/Session.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/TemplateDescriptor.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/UserAccountMapper.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/UserAccountNotFoundException.html -%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2.html %%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/Admin.html %%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/FileAccessException.html %%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/FileInfo.html %%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/FileServer.html %%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/PartitionOutOfRangeException.html -%%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/AlreadySubscribed.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/BadQoS.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/LinkExists.html @@ -516,7 +531,6 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/Topic.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/TopicExists.html %%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm/TopicManager.html -%%PORTDOCS%%%%DOCSDIR%%/reference/_sindex.html %%PORTDOCS%%%%DOCSDIR%%/reference/images/caution.gif %%PORTDOCS%%%%DOCSDIR%%/reference/images/closed.gif %%PORTDOCS%%%%DOCSDIR%%/reference/images/collapseAll.gif @@ -535,18 +549,6 @@ lib/libSlice.so.32 %%PORTDOCS%%%%DOCSDIR%%/reference/images/up.gif %%PORTDOCS%%%%DOCSDIR%%/reference/images/upx.gif %%PORTDOCS%%%%DOCSDIR%%/reference/images/warning.gif -%%PORTDOCS%%%%DOCSDIR%%/reference/index.html -%%PORTDOCS%%%%DOCSDIR%%/reference/symboltree.js -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/images -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceStorm -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IcePatch2 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceGrid -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceBox -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Ice -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Glacier2 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Freeze -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/config @dirrm %%DATADIR%%/IceStorm @dirrm %%DATADIR%%/IcePatch2 @@ -556,6 +558,16 @@ lib/libSlice.so.32 @dirrm %%DATADIR%%/Glacier2 @dirrm %%DATADIR%%/Freeze @dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Freeze +%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Glacier2 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Ice +%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceBox +%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceGrid +%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IcePatch2 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceStorm +%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/images +%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/Slice @dirrm include/IceXML @dirrm include/IceUtil 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/py-ice/files/patch-config+Make.rules.FreeBSD b/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD index 329ad4fd06fc..41619d6da981 100644 --- a/devel/py-ice/files/patch-config+Make.rules.FreeBSD +++ b/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD @@ -1,6 +1,6 @@ ---- config/Make.rules.FreeBSD.orig Wed Nov 16 03:51:31 2005 -+++ config/Make.rules.FreeBSD Thu Nov 17 16:19:46 2005 -@@ -20,7 +20,7 @@ +--- 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) @@ -9,7 +9,7 @@ else CXXFLAGS += -g endif -@@ -30,14 +30,14 @@ +@@ -37,15 +37,15 @@ # CXXLIBS = @@ -19,11 +19,13 @@ mklib = ar cr $(1) $(2) -BASELIBS = -lIceUtil -lc_r -+BASELIBS = -lIceUtil %%PTHREAD_LIBS%% ++BASELIBS = -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv LIBS = -lIce $(BASELIBS) -ICEUTIL_OS_LIBS = -+ICEUTIL_OS_LIBS = %%PTHREAD_LIBS%% - ICE_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%% diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile index bea9ccc6a936..1b29bae7ac8f 100644 --- a/devel/py-ice/Makefile +++ b/devel/py-ice/Makefile @@ -6,21 +6,25 @@ # PORTNAME= Ice -PORTVERSION= 3.2.1 +PORTVERSION= 3.3.0 CATEGORIES= devel python -MASTER_SITES= http://www.zeroc.com/download/Ice/3.2/ +MASTER_SITES= http://www.zeroc.com/download/Ice/3.3/ \ + http://www.dirk.sh/dirk/Ice/ PKGNAMEPREFIX= py- -DISTNAME= IcePy-${PORTVERSION} +DISTNAME= Ice-${PORTVERSION} MAINTAINER= dirk.ye@gmail.com COMMENT= An Ice (Internet Communications Engine) language mapping for Python +BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp LIB_DEPENDS= Ice.${LIB_VRS}:${PORTSDIR}/devel/ice USE_GMAKE= yes USE_PYTHON= yes +BUILD_WRKSRC= ${WRKSRC}/py +INSTALL_WRKSRC= ${WRKSRC}/py -LIB_VRS= ${PORTVERSION:S|.||g:C|1$||} +LIB_VRS= ${PORTVERSION:S|.||g:C|0$||} PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}" CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} @@ -31,21 +35,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 +.if defined(NOPORTDOCS) +MAKE_ENV+= NOPORTDOCS=yes +.endif + post-patch: ${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \ s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g; \ s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/config/Make.rules + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/py/config/Make.rules post-install: ${ECHO} "Ice" > ${PYTHON_SITELIBDIR}/Ice.pth diff --git a/devel/py-ice/distinfo b/devel/py-ice/distinfo index 0ea538ccdb33..fb9ca254c9f9 100644 --- a/devel/py-ice/distinfo +++ b/devel/py-ice/distinfo @@ -1,3 +1,3 @@ -MD5 (IcePy-3.2.1.tar.gz) = 2fdd8add2ea6271894392645f768e147 -SHA256 (IcePy-3.2.1.tar.gz) = 2a9ea57a370b8c0a4f3a880cbea03092f76efb417e27061f465278d95b720701 -SIZE (IcePy-3.2.1.tar.gz) = 166696 +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/py-ice/files/patch-Makefile b/devel/py-ice/files/patch-Makefile deleted file mode 100644 index 262924e5898d..000000000000 --- a/devel/py-ice/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig Thu Mar 1 20:11:25 2007 -+++ Makefile Sat Mar 24 13:52:25 2007 -@@ -40,8 +40,8 @@ - done - - install:: -- $(call installdata,ICE_LICENSE,$(prefix)) -- $(call installdata,LICENSE,$(prefix)) -+ $(call installdata,ICE_LICENSE,$(install_libdir)) -+ $(call installdata,LICENSE,$(install_libdir)) - - test:: - @python $(top_srcdir)/allTests.py diff --git a/devel/py-ice/files/patch-config+Make.common.rules b/devel/py-ice/files/patch-config+Make.common.rules new file mode 100644 index 000000000000..efa36bde452d --- /dev/null +++ b/devel/py-ice/files/patch-config+Make.common.rules @@ -0,0 +1,46 @@ +--- config/Make.common.rules.orig 2008-05-17 01:24:00.000000000 +0800 ++++ config/Make.common.rules 2008-08-14 17:48:05.000000000 +0800 +@@ -307,24 +307,24 @@ + $(call mkdir,$(prefix)) ; \ + fi + +- @if test ! -d $(install_slicedir) ; \ +- then \ +- echo "Creating $(install_slicedir)..." ; \ +- $(call mkdir,$(install_slicedir)) ; \ +- cd $(top_srcdir)/../slice ; \ +- for subdir in * ; \ +- do \ +- echo "Copying slice/$$subdir to $(install_slicedir)..." ; \ +- cp -fpr $$subdir $(install_slicedir) ; \ +- done ; \ +- fi ++# @if test ! -d $(install_slicedir) ; \ ++# then \ ++# echo "Creating $(install_slicedir)..." ; \ ++# $(call mkdir,$(install_slicedir)) ; \ ++# cd $(top_srcdir)/../slice ; \ ++# for subdir in * ; \ ++# do \ ++# echo "Copying slice/$$subdir to $(install_slicedir)..." ; \ ++# cp -fpr $$subdir $(install_slicedir) ; \ ++# done ; \ ++# fi + +- @if test ! -f $(prefix)/ICE_LICENSE ; \ +- then \ +- $(call installdata,$(top_srcdir)/../ICE_LICENSE,$(prefix)) ; \ +- fi ++# @if test ! -f $(prefix)/ICE_LICENSE ; \ ++# then \ ++# $(call installdata,$(top_srcdir)/../ICE_LICENSE,$(prefix)) ; \ ++# fi + +- @if test ! -f $(prefix)/LICENSE ; \ +- then \ +- $(call installdata,$(top_srcdir)/../LICENSE,$(prefix)) ; \ +- fi ++# @if test ! -f $(prefix)/LICENSE ; \ ++# then \ ++# $(call installdata,$(top_srcdir)/../LICENSE,$(prefix)) ; \ ++# fi diff --git a/devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD b/devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD new file mode 100644 index 000000000000..41619d6da981 --- /dev/null +++ b/devel/py-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/py-ice/files/patch-config+Make.rules b/devel/py-ice/files/patch-py+config+Make.rules index 0c79c78e3bc7..5e574ee56654 100644 --- a/devel/py-ice/files/patch-config+Make.rules +++ b/devel/py-ice/files/patch-py+config+Make.rules @@ -1,24 +1,17 @@ ---- config/Make.rules.orig Thu Mar 1 20:11:25 2007 -+++ config/Make.rules Fri Apr 13 19:42:32 2007 -@@ -7,6 +7,8 @@ +--- py/config/Make.rules.orig 2008-05-17 01:24:03.000000000 +0800 ++++ py/config/Make.rules 2008-08-02 09:05:42.000000000 +0800 +@@ -12,7 +12,9 @@ + # if it does not exist. # - # ********************************************************************** +-prefix ?= /opt/Ice-$(VERSION) +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 @@ - # if it does not exist. - # - --prefix = /opt/IcePy-$(VERSION) -+prefix = %%PREFIX%% ++prefix ?= %%PREFIX%% # # The "root directory" for runpath embedded in executables. Can be unset -@@ -69,13 +71,13 @@ +@@ -63,13 +65,13 @@ # version used for building the Ice extension, then set PYTHON_VERSION # to "python2.3" or "python2.4". # @@ -35,32 +28,23 @@ endif ifeq ($(PYTHON_VERSION),) -@@ -102,10 +104,10 @@ - libdir = $(top_srcdir)/python +@@ -102,8 +104,8 @@ + endif - install_slicedir = $(prefix)/slice + libdir = $(top_srcdir)/python -install_pythondir = $(prefix)/python +-install_libdir = $(prefix)/python +install_pythondir = %%PYTHON_SITELIBDIR%%/Ice ++install_libdir = %%PYTHON_SITELIBDIR%%/Ice --INSTALL = cp -fp --INSTALL_PROGRAM = ${INSTALL} -+INSTALL = install -C -o root -g wheel -m 444 -+INSTALL_PROGRAM = install -C -s -o root -g wheel -m 555 - INSTALL_LIBRARY = ${INSTALL} - INSTALL_DATA = ${INSTALL} - -@@ -136,12 +138,12 @@ - endif - - ifneq ($(ICE_HOME),) -- slicedir = $(ICE_HOME)/slice -+ slicedir = $(ICE_HOME)/share/Ice - else - slicedir = /usr/share/Ice-$(VERSION)/slice + # + # Platform specific definitions +@@ -128,7 +130,7 @@ + ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) + ICE_FLAGS = -I$(ice_dir)/include endif - --install_libdir = $(prefix)/python -+install_libdir = %%PYTHON_SITELIBDIR%%/Ice +-ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil ++ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil -liconv ifneq ($(embedded_runpath_prefix),) - ifeq ($(LP64),yes) + runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir) diff --git a/devel/py-ice/files/patch-python+Makefile b/devel/py-ice/files/patch-py+python+Makefile index 2bd86a81ace4..33d41fae561c 100644 --- a/devel/py-ice/files/patch-python+Makefile +++ b/devel/py-ice/files/patch-py+python+Makefile @@ -1,6 +1,6 @@ ---- python/Makefile.orig Thu Feb 17 00:48:17 2005 -+++ python/Makefile Tue Aug 30 19:16:53 2005 -@@ -94,7 +94,8 @@ +--- py/python/Makefile.orig 2008-08-01 16:33:15.000000000 +0800 ++++ py/python/Makefile 2008-08-01 16:33:45.000000000 +0800 +@@ -230,7 +230,8 @@ $(INSTALL_DATA) *.py $(install_pythondir) @for i in $(PACKAGES) ; \ do \ diff --git a/devel/py-ice/pkg-descr b/devel/py-ice/pkg-descr index 2bb829f7edec..5195f7b479fa 100644 --- a/devel/py-ice/pkg-descr +++ b/devel/py-ice/pkg-descr @@ -9,5 +9,5 @@ This Ice distribution is released under the GNU General Public License (GPL). WWW: http://www.zeroc.com/ -- Boris B. Samorodov -bsam@ipt.ru +- DIrk Ye +dirk.ye@gmail.com diff --git a/devel/py-ice/pkg-plist b/devel/py-ice/pkg-plist index 29231f951065..f1d2b9355273 100644 --- a/devel/py-ice/pkg-plist +++ b/devel/py-ice/pkg-plist @@ -2,11 +2,21 @@ %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.py +%%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SessionF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.py -%%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice.py %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.py %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.py %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.py @@ -18,16 +28,6 @@ %%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.py @@ -56,17 +56,15 @@ %%PYTHON_SITELIBDIR%%/Ice/IcePy.so %%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VERSION%% %%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VRS%% -%%PYTHON_SITELIBDIR%%/Ice/LICENSE -%%PYTHON_SITELIBDIR%%/Ice/ICE_LICENSE -%%PYTHON_SITELIBDIR%%/Ice/Glacier2/__init__.py -%%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.py -%%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.py -%%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.py %%PYTHON_SITELIBDIR%%/Ice.pth -@dirrm %%PYTHON_SITELIBDIR%%/Ice/Glacier2 -@dirrm %%PYTHON_SITELIBDIR%%/Ice/IceBox -@dirrm %%PYTHON_SITELIBDIR%%/Ice/IceGrid -@dirrm %%PYTHON_SITELIBDIR%%/Ice/IcePatch2 -@dirrm %%PYTHON_SITELIBDIR%%/Ice/IceStorm -@dirrm %%PYTHON_SITELIBDIR%%/Ice +@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2 +@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox +@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid +@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2 +@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm +@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2 +@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox +@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid +@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2 +@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm +@dirrmtry %%PYTHON_SITELIBDIR%%/Ice |