Date: Sat, 2 Aug 2008 17:41:51 +0200 From: "Stefan Ehmann" <shoesoft@gmx.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/126195: update devel/ice to 3.3.0 Message-ID: <1217691711.85030@taxman.pepperland> Resent-Message-ID: <200808021550.m72Fo2pF078393@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126195
>Category: ports
>Synopsis: update devel/ice to 3.3.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 02 15:50:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Stefan Ehmann
>Release: FreeBSD 7.0-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD 7.0-RELEASE-p3 #52: Sat Jul 26 11:50:29 CEST 2008
stefan@taxman.pepperland:/usr/obj/usr/src/sys/TAXMAN
>Description:
update for ice from 3.2.1 to 3.3.0
The updates dependent port py-ice and php5-ice should be submitted shortly.
All three ports should be updated at once because they only build when all have the same version.
>How-To-Repeat:
>Fix:
--- ice-diff begins here ---
diff -ruN ice.bak/Makefile ice/Makefile
--- ice.bak/Makefile 2008-08-02 17:37:26.000000000 +0200
+++ ice/Makefile 2008-08-02 10:10:01.000000000 +0200
@@ -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 @@
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 -ruN ice.bak/distinfo ice/distinfo
--- ice.bak/distinfo 2008-08-02 17:37:26.000000000 +0200
+++ ice/distinfo 2008-05-22 18:45:40.000000000 +0200
@@ -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 -ruN ice.bak/files/Make.rules.FreeBSD ice/files/Make.rules.FreeBSD
--- ice.bak/files/Make.rules.FreeBSD 2008-08-02 17:37:26.000000000 +0200
+++ ice/files/Make.rules.FreeBSD 2008-07-31 03:20:26.000000000 +0200
@@ -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%%
@@ -12,7 +12,9 @@
lp64suffix =
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 -ruN ice.bak/files/patch-IconvStringConverter.h ice/files/patch-IconvStringConverter.h
--- ice.bak/files/patch-IconvStringConverter.h 1970-01-01 01:00:00.000000000 +0100
+++ ice/files/patch-IconvStringConverter.h 2008-05-22 19:43:34.000000000 +0200
@@ -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 -ruN ice.bak/files/patch-Make.rules ice/files/patch-Make.rules
--- ice.bak/files/patch-Make.rules 2008-08-02 17:37:26.000000000 +0200
+++ ice/files/patch-Make.rules 2008-05-22 20:19:55.000000000 +0200
@@ -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 -ruN ice.bak/files/patch-Makefile ice/files/patch-Makefile
--- ice.bak/files/patch-Makefile 2008-08-02 17:37:26.000000000 +0200
+++ ice/files/patch-Makefile 2008-07-31 13:41:55.000000000 +0200
@@ -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 -ruN ice.bak/files/patch-SignalHandler.cpp ice/files/patch-SignalHandler.cpp
--- ice.bak/files/patch-SignalHandler.cpp 1970-01-01 01:00:00.000000000 +0100
+++ ice/files/patch-SignalHandler.cpp 2008-05-22 18:55:45.000000000 +0200
@@ -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 -ruN ice.bak/files/patch-src::Ice::Network.cpp ice/files/patch-src::Ice::Network.cpp
--- ice.bak/files/patch-src::Ice::Network.cpp 2008-08-02 17:37:26.000000000 +0200
+++ ice/files/patch-src::Ice::Network.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN ice.bak/pkg-plist ice/pkg-plist
--- ice.bak/pkg-plist 2008-08-02 17:37:26.000000000 +0200
+++ ice/pkg-plist 2008-07-31 14:01:03.000000000 +0200
@@ -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/icepatch2client
bin/icepatch2server
bin/icestormadmin
+bin/icestormmigrate
bin/slice2cpp
bin/slice2cs
bin/slice2docbook
@@ -21,10 +20,11 @@
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/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/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/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/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/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/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/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/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/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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
@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
--- 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?1217691711.85030>