- Update to 2.3.12

9 files changed, 75 insertions, 1160 deletions

diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 7c34f3923092..e19c0900df14 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -6,14 +6,17 @@
 #
 
 PORTNAME=	mico
-PORTVERSION=	2.3.11
-PORTREVISION=	3
+PORTVERSION=	2.3.12
 CATEGORIES=	devel
-MASTER_SITES=	http://www.mico.org/:src \
+MASTER_SITES=	http://www.mico.org/
+
+PATCH_SITES=	http://mico.org/errata/
+PATCHFILES=	mico-2.3.12-secfix1.diff
 
 MAINTAINER=	sem@FreeBSD.org
-COMMENT=	Fully compliant implementation of CORBA2.4 with some CORBA3 features
+COMMENT=	Secure, reliable, production-quality, standards-based CORBA middleware
 
+PATCH_DIST_STRIP=-p1
 WRKSRC=			${WRKDIR}/${PORTNAME}
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
@@ -23,15 +26,14 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 #CONFIGURE_ENV+=		CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} \
 #			CXXFLAGS="${CXXFLAGS}" CPP=${CPP}
 
-OPTIONS=	SERVICES "Build with all services, not only ORB" on \
+OPTIONS=	NOSERVICES "Without services, plain ORB" off \
 		SSL "Build with SSL" on \
 		X11 "Build with X11 support" off \
 		QT "Build with QT support" off \
 		GTK "Build with GTK support" off \
-		SYSTEM_GCC "Build with system gcc. (Only for 4.x)" off \
 		DEBUG "Build debug version" off
 
-# stolen from bsd.port.mk (for OPTIONS works)
+# need for OPTIONS work
 PORT_DBDIR?=	/var/db/ports
 
 OPTIONSFILE?=	${PORT_DBDIR}/${PORTNAME}/options
@@ -43,17 +45,15 @@ OPTIONSFILE?=	${PORT_DBDIR}/${PORTNAME}/options
 .endif
 # ================
 
-.if !defined(WITH_SYSTEM_GCC)
 USE_GCC=		3.4
-.endif
 
 CONFIGURE_ARGS=		--enable-cd --disable-mini-stl --enable-threads
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
-.if !defined(WITHOUT_SERVICES)
-CONFIGURE_ARGS+=	--enable-ccm --enable-life --enable-externalize
+.if !defined(WITH_NOSERVICES)
+CONFIGURE_ARGS+=	--enable-ccm
 .else
 CONFIGURE_ARGS+=	--disable-coss
 MICO_SERVICE=		"@comment "
@@ -90,7 +90,7 @@ CONFIGURE_ENV+=		CPPFLAGS=${CPPFLAGS}
 MICO_TCL=		"@comment "
 .endif
 
-.if defined(WITHOUT_SSL) || defined(WITHOUT_SERVICES)
+.if defined(WITHOUT_SSL) || defined(WITH_NOSERVICES)
 MICO_SSL=		"@comment "
 .else
 USE_OPENSSL=		yes
diff --git a/devel/mico/distinfo b/devel/mico/distinfo
index ff72d140c6d2..22f823f5a774 100644
--- a/devel/mico/distinfo
+++ b/devel/mico/distinfo
@@ -1,3 +1,6 @@
-MD5 (mico-2.3.11.tar.gz) = 669d98ec5da2f6c50937a2a25e797eec
-SHA256 (mico-2.3.11.tar.gz) = 8a6323abd118f131b330cd614d9d53c1cc14fd3256ecaed1067484941ad3d6b5
-SIZE (mico-2.3.11.tar.gz) = 2523850
+MD5 (mico-2.3.12.tar.gz) = b94252f78da414cc0c7122cdd2a4b2be
+SHA256 (mico-2.3.12.tar.gz) = f67663962c0fabfb459e0c14027fcd3ab9d809ba69cabdf9399abe467b9bbf4f
+SIZE (mico-2.3.12.tar.gz) = 2837502
+MD5 (mico-2.3.12-secfix1.diff) = 6248a4fbbdd542f062a515be03de0db9
+SHA256 (mico-2.3.12-secfix1.diff) = c1127b2afebb57bec2f89cd6ea427038c3667c2a39ffbf8243d1de1b0ccc9457
+SIZE (mico-2.3.12-secfix1.diff) = 547
diff --git a/devel/mico/files/patch-configure.in b/devel/mico/files/patch-configure.in
new file mode 100644
index 000000000000..5201e9abc8e1
--- /dev/null
+++ b/devel/mico/files/patch-configure.in
@@ -0,0 +1,20 @@
+--- configure.in.orig	Sat Jul 22 15:43:10 2006
++++ configure.in	Sat Jul 22 15:43:37 2006
+@@ -605,7 +605,7 @@
+ # System dependencies.
+ #
+ 
+-CONF_OPT_FLAGS=-O2
++CONF_OPT_FLAGS="-O2"
+ CONF_DEBUG_FLAGS=-g
+ CONF_LIBNSL=yes
+ CONF_EXCEPT_FLAGS=
+@@ -630,7 +630,7 @@
+   CFLAGS="-Wall $CFLAGS"
+ 
+   if test X"$use_speed_tune" = Xyes; then
+-    CONF_OPT_FLAGS=-O2
++    CONF_OPT_FLAGS="-O2"
+   fi
+ 
+   CONF_SHARED_CC="$CXX -shared"
diff --git a/devel/mico/files/patch-examples::Makefile b/devel/mico/files/patch-examples::Makefile
deleted file mode 100644
index 3448308427cf..000000000000
--- a/devel/mico/files/patch-examples::Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- demo/Makefile.orig	Fri Feb 14 13:55:57 2003
-+++ demo/Makefile	Sun Jul  6 00:26:03 2003
-@@ -27,7 +27,7 @@
- 
- RUNDIRS = bench dynany interceptor codesets poa obv mcast generic pi
- 
--INST_DIRS = $(DIRS) shlib ssl
-+INST_DIRS = $(DIRS) shlib
- 
- ifeq ($(HAVE_DYNAMIC), yes)
- DIRS := $(DIRS) shlib
-@@ -62,7 +62,7 @@
- endif
- 
- ifeq ($(USE_EXTERN), yes)
--DIRS := $(DIRS) externalize 
-+DIRS := $(DIRS) externalization
- endif
- 
- 
diff --git a/devel/mico/files/patch-fixes::externalization b/devel/mico/files/patch-fixes::externalization
deleted file mode 100644
index 663723cc6bea..000000000000
--- a/devel/mico/files/patch-fixes::externalization
+++ /dev/null
@@ -1,352 +0,0 @@
---- coss/externalization/Makefile.orig	Wed Jul  9 18:02:19 2003
-+++ coss/externalization/Makefile	Wed Jul  9 18:02:27 2003
-@@ -85,6 +85,8 @@
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) extreferenced.o $(LDLIBS) -o extreferenced
- 	$(POSTLD) $@
- 
-+idlcompile: CosExternalization.cc CosExternalizationContainment.cc CosExternalizationReference.cc
-+
- CosExternalization.h CosExternalization.cc: \
- 		../../include/coss/CosExternalization.idl $(IDL)
- 	$(IDL) $(IDLFLAGS) --name CosExternalization \
-@@ -125,6 +127,8 @@
- 	$(IBINCMD) extcontainmentd $(INSTDIR)/bin
- 	$(IDIRCMD) $(INSTDIR)/bin
- 	$(IBINCMD) extreferenced $(INSTDIR)/bin
-+	$(IDIRCMD) $(INSTDIR)/bin
-+	$(IBINCMD) extcriteriad $(INSTDIR)/bin
- 
- 
- ifeq (.depend, $(wildcard .depend))
---- include/coss/CosStream_impl.h.orig	Fri Jul  4 15:24:06 2003
-+++ include/coss/CosStream_impl.h	Fri Jul  4 17:12:36 2003
-@@ -58,8 +58,8 @@
- 
- class StreamIO_impl : virtual public POA_CosStream::StreamIO
- {
--    istream* istream_;
--    ostream* ostream_;
-+    std::istream* istream_;
-+    std::ostream* ostream_;
-     enum in_out
-     {
- 	in,
-@@ -67,12 +67,12 @@
-     } iotype;
- 
- protected:
--    CORBA::Boolean was_extern(vector<CosObjectIdentity::ObjectIdentifier>* vec_,
-+    CORBA::Boolean was_extern(std::vector<CosObjectIdentity::ObjectIdentifier>* vec_,
- 			      CosObjectIdentity::ObjectIdentifier id);
- public:
--    StreamIO_impl(ostream* ostream_ptr = &cout)
-+    StreamIO_impl(std::ostream* ostream_ptr = &std::cout)
- 	: ostream_(ostream_ptr), iotype(out) { };
--    StreamIO_impl(istream* istream_ptr = &cin)
-+    StreamIO_impl(std::istream* istream_ptr = &std::cin)
- 	: istream_(istream_ptr), iotype(in) { };
- 
-     virtual void write_string(const char* aString);
---- include/coss/Externalization_impl.h.orig	Fri Jul  4 18:04:44 2003
-+++ include/coss/Externalization_impl.h	Fri Jul  4 18:08:33 2003
-@@ -32,8 +32,8 @@
- {
-     CORBA::String_var filename_;
-     CosLifeCycle::Key factory_id_;
--    istream* ifstream_;
--    ostream* ofstream_;
-+    std::istream* ifstream_;
-+    std::ostream* ofstream_;
-     CORBA::Boolean context;
-     
- public:
---- coss/externalization/Stream_impl.cc.orig	Fri Jul  4 15:30:45 2003
-+++ coss/externalization/Stream_impl.cc	Fri Jul  4 16:58:23 2003
-@@ -37,8 +37,10 @@
- #include <iostream.h>
- #endif
- 
--typedef map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,less<RoleNameKey> > WorkedRoles;
--typedef map<RoleNameKey,CosGraphs::Role_ptr,less<RoleNameKey> > NewRoles;
-+using std::string;
-+
-+typedef std::map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,std::less<RoleNameKey> > WorkedRoles;
-+typedef std::map<RoleNameKey,CosGraphs::Role_ptr,std::less<RoleNameKey> > NewRoles;
- typedef IfaceSequenceTmpl<CosCompoundExternalization::Node_var,CosCompoundExternalization::Node_ptr> NewNodes;
- 
- const char tag_object = 0xF0;
-@@ -135,10 +137,10 @@
-     (*aStreamable).externalize_to_stream(_sio);
- }
- 
--CORBA::Boolean StreamIO_impl::was_extern(vector<CosObjectIdentity::ObjectIdentifier>* vec_,
-+CORBA::Boolean StreamIO_impl::was_extern(std::vector<CosObjectIdentity::ObjectIdentifier>* vec_,
- 					 CosObjectIdentity::ObjectIdentifier id)
- {
--    vector<CosObjectIdentity::ObjectIdentifier>::iterator j;
-+    std::vector<CosObjectIdentity::ObjectIdentifier>::iterator j;
-     for(j = vec_->begin();j != vec_->end();++j)
- 	if (*j == id)
- 	    return TRUE;
-@@ -151,10 +153,10 @@
-     if (iotype != out)
- 	return;
-     CosStream::StreamIO_ptr _sio = this->_this();
--    vector<CosObjectIdentity::ObjectIdentifier>* done_nodes =
--	new vector<CosObjectIdentity::ObjectIdentifier>;
--    vector<CosObjectIdentity::ObjectIdentifier>* done_rel =
--	new vector<CosObjectIdentity::ObjectIdentifier>;
-+    std::vector<CosObjectIdentity::ObjectIdentifier>* done_nodes =
-+	new std::vector<CosObjectIdentity::ObjectIdentifier>;
-+    std::vector<CosObjectIdentity::ObjectIdentifier>* done_rel =
-+	new std::vector<CosObjectIdentity::ObjectIdentifier>;
- // Externalize Root Node
-     CosObjectIdentity::ObjectIdentifier starting_node_id = starting_node->constant_random_id();
- // End
---- coss/externalization/extreferenced.cc.orig	Fri Jul  4 17:57:42 2003
-+++ coss/externalization/extreferenced.cc	Fri Jul  4 17:58:50 2003
-@@ -34,8 +34,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+    	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -65,7 +65,7 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosExternalizationReference Service Factories is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosExternalizationReference Service Factories is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else if(strcmp(argv[i], "--with-naming") == 0 ||
-@@ -76,8 +76,8 @@
- 				type = RegisterHelper::trading;
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- coss/externalization/streamd.cc.orig	Fri Jul  4 17:57:59 2003
-+++ coss/externalization/streamd.cc	Fri Jul  4 17:59:41 2003
-@@ -38,8 +38,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -67,7 +67,7 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else if(strcmp(argv[i], "--trading") == 0 ||
-@@ -77,8 +77,8 @@
- 	}
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
-@@ -111,20 +111,20 @@
- 	    tr_obj = orb -> resolve_initial_references("TradingService");
- #ifdef HAVE_EXCEPTIONS
- 	} catch(CORBA::ORB::InvalidName&) {
--	    cerr << "Can`t resolve Trading Service. Abort" << endl;
-+	    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
- 	    exit(1);
- 	}
- #endif
- 	if (CORBA::is_nil(tr_obj))
- 	{
--	    cerr << "Can`t resolve Trading Service. Abort" << endl;
-+	    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
- 	    exit(1);
- 	}
- 	CosTrading::Lookup_var trader_ = CosTrading::Lookup::_narrow (tr_obj);
- 	CosTrading::Register_var reg = trader_->register_if();
- 	if (CORBA::is_nil(reg))
- 	{
--	    cerr << "Invalid Trading Service. Abort" << endl;
-+	    std::cerr << "Invalid Trading Service. Abort" << std::endl;
- 	    exit(1);
- 	}
- 	CORBA::Object_var obj = trader_->type_repos();
-@@ -132,7 +132,7 @@
- 		CosTradingRepos::ServiceTypeRepository::_narrow(obj);
- 	if (CORBA::is_nil(repo))
- 	{
--	    cerr << "Invalid Trading Service. Abort" << endl;
-+	    std::cerr << "Invalid Trading Service. Abort" << std::endl;
- 	    exit(1);
- 	}
- 
---- coss/externalization/extcriteriad.cc.orig	Fri Jul  4 17:58:08 2003
-+++ coss/externalization/extcriteriad.cc	Fri Jul  4 18:00:00 2003
-@@ -37,8 +37,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -63,13 +63,13 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosCompoundExternalization::PropagationCriteriaFactory Service is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosCompoundExternalization::PropagationCriteriaFactory Service is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- coss/externalization/extcontainmentd.cc.orig	Fri Jul  4 18:01:09 2003
-+++ coss/externalization/extcontainmentd.cc	Fri Jul  4 18:01:40 2003
-@@ -34,8 +34,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -64,7 +64,7 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else if(strcmp(argv[i], "--with-naming") == 0 ||
-@@ -75,8 +75,8 @@
- 		        type = RegisterHelper::trading;
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- coss/externalization/extnoded.cc.orig	Fri Jul  4 17:35:15 2003
-+++ coss/externalization/extnoded.cc	Fri Jul  4 17:35:45 2003
-@@ -34,8 +34,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+    	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -64,7 +64,7 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosCompoundExternalization::Node Service Factories is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosCompoundExternalization::Node Service Factories is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else if(strcmp(argv[i], "--with-naming") == 0 ||
-@@ -75,8 +75,8 @@
- 		    type = RegisterHelper::trading;
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- include/coss/CompoundExternalization_impl.h.orig	Sat Jul  5 23:41:43 2003
-+++ include/coss/CompoundExternalization_impl.h	Sat Jul  5 23:52:35 2003
-@@ -52,7 +52,7 @@
- 
- 	virtual void internalize_node(CosStream::StreamIO_ptr sio,
-                     		      CosLifeCycle::FactoryFinder_ptr there,
--                		      CosGraphs::Node::Roles*& rolesOfNode);
-+                		      CosGraphs::Node::Roles_out rolesOfNode);
-     };
- 
- 
-@@ -73,7 +73,7 @@
-     
- 	friend void CosCompoundExternalization_impl::Node_impl::internalize_node(CosStream::StreamIO_ptr sio,
-                         							 CosLifeCycle::FactoryFinder_ptr there,
--										 CosGraphs::Node::Roles*& rolesOfNode);
-+										 CosGraphs::Node::Roles_out rolesOfNode);
- 	virtual void externalize_role(CosStream::StreamIO_ptr sio);
- 
- 	virtual void internalize_role(CosStream::StreamIO_ptr sio);
---- coss/externalization/CompoundExternalization_impl.cc.orig	Sat Jul  5 23:14:13 2003
-+++ coss/externalization/CompoundExternalization_impl.cc	Sat Jul  5 23:51:29 2003
-@@ -111,7 +111,7 @@
- void
- CosCompoundExternalization_impl::Node_impl::internalize_node(CosStream::StreamIO_ptr sio,
-                     					     CosLifeCycle::FactoryFinder_ptr there,
--                    					     CosGraphs::Node::Roles*& rolesOfNode)
-+                    					     CosGraphs::Node::Roles_out rolesOfNode)
- {
- //  Node read its non-object data using the primitive StreamIO::read_...(data) function
-     random_id = sio -> read_unsigned_long();
---- coss/externalization/Externalization_impl.cc.orig	Mon Oct 13 13:49:22 2003
-+++ coss/externalization/Externalization_impl.cc	Tue Oct 14 04:45:47 2003
-@@ -22,6 +22,9 @@
-  *                 sedov@postman.simcb.ru
-  */
- 
-+#include <string>
-+using std::string;
-+
- #ifndef _WIN32
-     #include <stream.h>
- #endif
-@@ -37,7 +40,7 @@
- #include <coss/CosStream_impl.h>
- #include <coss/RegisterHelper.h>
- 
--Stream_impl::Stream_impl(const char* filename = NULL)
-+Stream_impl::Stream_impl(const char* filename)
-     : POA_CosExternalization::Stream(),
-       POA_CosLifeCycle::LifeCycleObject()
- {
diff --git a/devel/mico/files/patch-fixes::lifecycle b/devel/mico/files/patch-fixes::lifecycle
deleted file mode 100644
index b41d6dc0cade..000000000000
--- a/devel/mico/files/patch-fixes::lifecycle
+++ /dev/null
@@ -1,490 +0,0 @@
---- coss/lifecycle/Makefile.orig	Mon Oct 13 13:49:23 2003
-+++ coss/lifecycle/Makefile	Sun Feb 15 21:15:07 2004
-@@ -101,6 +101,8 @@
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) genericfactory.o $(LDLIBS) -o genericfactory
- 	$(POSTLD) $@
- 
-+idlcompile: CosLifeCycle.cc CosCompoundLifeCycle.cc CosLifeCycleContainment.cc CosLifeCycleReference.cc
-+
- CosLifeCycle.h CosLifeCycle.cc: \
- 		../../include/coss/CosLifeCycle.idl $(IDL)
- 	$(IDL) $(IDLFLAGS) --name CosLifeCycle \
-@@ -149,6 +151,12 @@
- 	$(IBINCMD) lifecontainmentd $(INSTDIR)/bin
- 	$(IDIRCMD) $(INSTDIR)/bin
- 	$(IBINCMD) lifereferenced $(INSTDIR)/bin
-+	$(IDIRCMD) $(INSTDIR)/bin
-+	$(IBINCMD) lifecriteriad $(INSTDIR)/bin
-+	$(IDIRCMD) $(INSTDIR)/bin
-+	$(IBINCMD) factoryfinderd $(INSTDIR)/bin
-+	$(IDIRCMD) $(INSTDIR)/bin
-+	$(IBINCMD) genericfactory $(INSTDIR)/bin
- 
- 
- ifeq (.depend, $(wildcard .depend))
---- coss/lifecycle/FactoryFinder_impl.cc.orig	Fri Jul  4 14:44:09 2003
-+++ coss/lifecycle/FactoryFinder_impl.cc	Fri Jul  4 16:44:03 2003
-@@ -28,6 +28,8 @@
- #include <coss/FactoryFinder_impl.h>
- #include <string>
- 
-+using std::string;
-+
- FactoryFinder_impl::FactoryFinder_impl()
- #ifndef _WIN32
-     : POA_CosLifeCycle::FactoryFinder ()
-@@ -61,13 +63,13 @@
- 				nm_obj = orb -> resolve_initial_references("NameService");
- #ifdef HAVE_EXCEPTIONS
- 			} catch(CORBA::ORB::InvalidName&) {
--				cerr << "Can`t resolve Naming Service. Abort" << endl;
-+			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
- 				exit(1);
- 			}
- #endif
- 			if (CORBA::is_nil(nm_obj))
- 			{
--				cerr << "Can`t resolve Naming Service. Abort" << endl;
-+			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
- 				exit(1);
- 			}
- 			naming_ = CosNaming::NamingContext::_narrow (nm_obj);
-@@ -82,13 +84,13 @@
- 				tr_obj = orb -> resolve_initial_references("TradingService");
- #ifdef HAVE_EXCEPTIONS
- 			} catch(CORBA::ORB::InvalidName&) {
--				cerr << "Can`t resolve Trading Service. Abort" << endl;
-+			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
- 				exit(1);
- 			}
- #endif
- 			if (CORBA::is_nil(tr_obj))
- 			{
--				cerr << "Can`t resolve Trading Service. Abort" << endl;
-+			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
- 				exit(1);
- 			}
- 			trader_ = CosTrading::Lookup::_narrow (tr_obj);
---- coss/lifecycle/GenericFactory_impl.cc.orig	Fri Jul  4 14:47:28 2003
-+++ coss/lifecycle/GenericFactory_impl.cc	Fri Jul  4 16:19:21 2003
-@@ -25,6 +25,7 @@
- #include <CORBA.h>
- #include <coss/GenericFactory_impl.h>
- 
-+using std::string;
- 
- GenericFactory_impl::GenericFactory_impl (void)
- #ifndef _WIN32
-@@ -58,13 +59,13 @@
- 					nm_obj = orb -> resolve_initial_references("NameService");
- #ifdef HAVE_EXCEPTIONS
- 			} catch(CORBA::ORB::InvalidName&) {
--				cerr << "Can`t resolve Naming Service. Abort" << endl;
-+			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
- 				exit(1);
- 			}
- #endif
- 			if (CORBA::is_nil(nm_obj))
- 			{
--				cerr << "Can`t resolve Naming Service. Abort" << endl;
-+			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
- 				exit(1);
- 			}
- 			naming_ = CosNaming::NamingContext::_narrow (nm_obj);
-@@ -79,13 +80,13 @@
- 				tr_obj = orb -> resolve_initial_references("TradingService");
- #ifdef HAVE_EXCEPTIONS
- 			} catch(CORBA::ORB::InvalidName&) {
--				cerr << "Can`t resolve Trading Service. Abort" << endl;
-+			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
- 				exit(1);
- 			}
- #endif
- 			if (CORBA::is_nil(tr_obj))
- 			{
--				cerr << "Can`t resolve Trading Service. Abort" << endl;
-+			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
- 				exit(1);
- 			}
- 			trader_ = CosTrading::Lookup::_narrow (tr_obj);
-@@ -404,8 +405,8 @@
- 	if (!strcmp(factory_key[3].id.in(),""))
- 		return CORBA::Object::_nil();
- 
--    CORBA::String_var filter_ = (char *)NULL;
--    CORBA::String_var preferences = (char *)NULL;
-+    const char* filter_ = NULL;
-+    const char* preferences = NULL;
-     CORBA::ULong i;
-     for(i = 0;i < the_criteria.length();++i)
- 	if (!strcmp(the_criteria[i].name,"filter"))
-@@ -505,13 +506,13 @@
- 	add_ += filter;
- 	filter = add_;
-     }
--    if (filter.size() && filter_.in())
-+    if (filter.size() && filter_ != NULL)
-     {
- 	string add_;
- 	add_ += "(";
- 	add_ += filter;
- 	add_ += ") and ";
--	add_ += filter_.in();
-+	add_ += filter_;
- 	filter = add_;
-     }
-     
---- coss/lifecycle/Operations_impl.cc.orig	Fri Jul  4 16:41:53 2003
-+++ coss/lifecycle/Operations_impl.cc	Fri Jul  4 16:42:53 2003
-@@ -30,9 +30,9 @@
- #include <list>
- #include <algorithm>
- 
--typedef map<RoleKey,CosGraphs::Role_ptr,less<RoleKey> > WorkedRoles;
--typedef list<CosObjectIdentity::ObjectIdentifier> WorkedRelationships;
--typedef list<CosGraphs::Traversal::TraversalScopedId> WorkedNodes;
-+typedef std::map<RoleKey,CosGraphs::Role_ptr,std::less<RoleKey> > WorkedRoles;
-+typedef std::list<CosObjectIdentity::ObjectIdentifier> WorkedRelationships;
-+typedef std::list<CosGraphs::Traversal::TraversalScopedId> WorkedNodes;
- 
- Operations_impl::Operations_impl()
- #ifndef _WIN32
-@@ -142,7 +142,7 @@
- #endif
-     for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
-     {
--	if (find(workedRelationships.begin(),
-+	if (std::find(workedRelationships.begin(),
- 		  workedRelationships.end(),
- 		  (*OriginalEdgeList)[i].the_relationship.scoped_relationship.constant_random_id) !=
- 	   workedRelationships.end())
-@@ -251,7 +251,7 @@
- 	    ex.reason = CORBA::string_dup("Node not supported CosCompoundLifeCycle::Node interface.");
- 	    mico_throw (ex);
- 	}
--	if (find(MovedNodes.begin(),MovedNodes.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
-+	if (std::find(MovedNodes.begin(),MovedNodes.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
- 		MovedNodes.end())
- 	    continue;
- 	current_node_ptr->move_node(there,the_criteria);
-@@ -290,7 +290,7 @@
- 
-     for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
-     {
--	if (find(Rel4Remove.begin(),Rel4Remove.end(),
-+	if (std::find(Rel4Remove.begin(),Rel4Remove.end(),
- 		(*OriginalEdgeList)[i].the_relationship.scoped_relationship.constant_random_id) !=
- 	    Rel4Remove.end())
- 	    continue;
-@@ -316,7 +316,7 @@
- #endif
-     for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
-     {
--	if (find(Nodes4Remove.begin(),Nodes4Remove.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
-+	if (std::find(Nodes4Remove.begin(),Nodes4Remove.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
- 	    Nodes4Remove.end())
- 	    continue;
- 	CosCompoundLifeCycle::Node_ptr tmp_node_ptr =
---- coss/lifecycle/RegisterHelper.cc.orig	Fri Jul  4 16:44:17 2003
-+++ coss/lifecycle/RegisterHelper.cc	Fri Jul  4 16:45:17 2003
-@@ -45,7 +45,7 @@
- #ifdef HAVE_EXCEPTIONS
- 			} catch(CORBA::ORB::InvalidName&) {
- #if DEBUG
--	    		cerr << "Can`t resolve Naming Service." << endl;
-+			    std::cerr << "Can`t resolve Naming Service." << std::endl;
- #endif
- 			}
- #endif
-@@ -64,7 +64,7 @@
- #ifdef HAVE_EXCEPTIONS
- 			} catch(CORBA::ORB::InvalidName&) {
- #if DEBUG
--	    		cerr << "Can`t resolve Trading Service." << endl;
-+			    std::cerr << "Can`t resolve Trading Service." << std::endl;
- #endif
- 			}
- #endif
-@@ -121,14 +121,14 @@
- {
- 	if (CORBA::is_nil(_obj))
- 	{
--		cerr << "Can`t resolve Naming Service. Abort" << endl;
--		return FALSE;
-+	    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
-+	    return FALSE;
- 	}
- 	CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow(_obj);
- 	if (CORBA::is_nil(nc.in()))
- 	{
--		cerr << "Invalid Naming Service. Abort" << endl;
--		return FALSE;
-+	    std::cerr << "Invalid Naming Service. Abort" << std::endl;
-+	    return FALSE;
- 	}
- 	CosNaming::Name full(4);
- 	full.length(4);
-@@ -173,14 +173,14 @@
- {
-     if (CORBA::is_nil(_obj))
-     {
--	cerr << "Can`t resolve Trading Service. Abort" << endl;
-+	std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
- 	return FALSE;
-     }
-     CosTrading::Lookup_var trader_ = CosTrading::Lookup::_narrow (_obj);
-     CosTrading::Register_var reg = trader_->register_if();
-     if (CORBA::is_nil(reg))
-     {
--	cerr << "Invalid Trading Service. Abort" << endl;
-+	std::cerr << "Invalid Trading Service. Abort" << std::endl;
- 	return FALSE;
-     }
-     CORBA::Object_var obj = trader_->type_repos();
-@@ -188,7 +188,7 @@
- 	CosTradingRepos::ServiceTypeRepository::_narrow(obj);
-     if (CORBA::is_nil(repo))
-     {
--	cerr << "Invalid Trading Service. Abort" << endl;
-+	std::cerr << "Invalid Trading Service. Abort" << std::endl;
- 	return FALSE;
-     }
- 
---- coss/lifecycle/lifenoded.cc.orig	Fri Jul  4 17:16:08 2003
-+++ coss/lifecycle/lifenoded.cc	Fri Jul  4 17:17:41 2003
-@@ -36,8 +36,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+        std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -66,7 +66,7 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosCompoundLifeCycle::Node Service Factories is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosCompoundLifeCycle::Node Service Factories is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else if(strcmp(argv[i], "--with-naming") == 0 ||
-@@ -81,8 +81,8 @@
- 	}
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- coss/lifecycle/lifecontainmentd.cc.orig	Fri Jul  4 17:22:32 2003
-+++ coss/lifecycle/lifecontainmentd.cc	Fri Jul  4 17:23:15 2003
-@@ -36,8 +36,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+    	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -65,7 +65,7 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosLifeCycleContainment Service Factories is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosLifeCycleContainment Service Factories is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else if(strcmp(argv[i], "--with-naming") == 0 ||
-@@ -80,8 +80,8 @@
- 	}
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- coss/lifecycle/lifereferenced.cc.orig	Fri Jul  4 17:24:49 2003
-+++ coss/lifecycle/lifereferenced.cc	Fri Jul  4 17:25:32 2003
-@@ -36,8 +36,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+    	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -67,7 +67,7 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosLifeCycleReference Service Factories is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosLifeCycleReference Service Factories is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else if(strcmp(argv[i], "--with-naming") == 0 ||
-@@ -82,8 +82,8 @@
- 	}
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- coss/lifecycle/operationd.cc.orig	Fri Jul  4 17:26:48 2003
-+++ coss/lifecycle/operationd.cc	Fri Jul  4 17:27:22 2003
-@@ -30,8 +30,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+    	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -56,13 +56,13 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosCompoundLifeCycle::OperationsFactory Service is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosCompoundLifeCycle::OperationsFactory Service is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- coss/lifecycle/lifecriteriad.cc.orig	Fri Jul  4 17:29:24 2003
-+++ coss/lifecycle/lifecriteriad.cc	Fri Jul  4 17:29:58 2003
-@@ -38,8 +38,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+    	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -64,13 +64,13 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosCompoundLifeCycle::PropagationCriteriaFactory Service is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosCompoundLifeCycle::PropagationCriteriaFactory Service is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- coss/lifecycle/factoryfinderd.cc.orig	Fri Jul  4 17:31:06 2003
-+++ coss/lifecycle/factoryfinderd.cc	Fri Jul  4 17:31:36 2003
-@@ -29,8 +29,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+    	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -58,7 +58,7 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosLifeCycle::FactoryFinder Service is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosLifeCycle::FactoryFinder Service is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else if(strcmp(argv[i], "--with-naming") == 0 ||
-@@ -69,8 +69,8 @@
- 			type = RegisterHelper::trading;
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- coss/lifecycle/genericfactory.cc.orig	Fri Jul  4 17:32:54 2003
-+++ coss/lifecycle/genericfactory.cc	Fri Jul  4 17:33:21 2003
-@@ -29,8 +29,8 @@
- static void
- usage(const char* progName)
- {
--	cerr << "Usage:\n";
--	cerr << progName << " [options]\n"
-+    	std::cerr << "Usage:\n";
-+	std::cerr << progName << " [options]\n"
- 	"\n"
- 	"Options:\n"
- 	"-h, --help                Show this message.\n"
-@@ -58,7 +58,7 @@
- 	else if(strcmp(argv[i], "--version") == 0 ||
- 		strcmp(argv[i], "-v") == 0)
- 	{
--	    cerr << "Version of CosLifeCycle::GenericFactory Service is " << MICO_VERSION << endl;
-+	    std::cerr << "Version of CosLifeCycle::GenericFactory Service is " << MICO_VERSION << std::endl;
- 	    return 0;
- 	}
- 	else if(strcmp(argv[i], "--with-naming") == 0 ||
-@@ -69,8 +69,8 @@
- 			type = RegisterHelper::trading;
- 	else
- 	{
--	    cerr << progName << ": unknown option `"
--		 << argv[i] << "'\n" << endl;
-+	    std::cerr << progName << ": unknown option `"
-+		 << argv[i] << "'\n" << std::endl;
- 	    usage(progName);
- 	    return 1;
- 	}
---- include/coss/CosLifeCycle.idl.orig	Tue Oct 14 04:25:27 2003
-+++ include/coss/CosLifeCycle.idl	Tue Oct 14 04:21:38 2003
-@@ -24,8 +24,8 @@
-   //     The purpose of the life cycle service is to 
-   
-   typedef CosNaming::Name Key; 
--  typedef Object Factory;
--  typedef sequence <Factory> Factories;
-+  typedef Object Factory_;
-+  typedef sequence <Factory_> Factories;
- 
-   typedef struct NVP 
-   {
diff --git a/devel/mico/files/patch-src::configure.in b/devel/mico/files/patch-src::configure.in
deleted file mode 100644
index 547cc6509ee2..000000000000
--- a/devel/mico/files/patch-src::configure.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.in.orig	Sat Oct 11 02:30:00 2003
-+++ configure.in	Sat Oct 11 02:34:43 2003
-@@ -594,7 +594,7 @@
- # System dependencies.
- #
- 
--CONF_OPT_FLAGS=-O2
-+CONF_OPT_FLAGS="-O2"
- CONF_DEBUG_FLAGS=-g
- CONF_LIBNSL=yes
- CONF_EXCEPT_FLAGS=
-@@ -619,7 +619,7 @@
-   CFLAGS="-Wall $CFLAGS"
- 
-   if test X"$use_speed_tune" = Xyes; then
--    CONF_OPT_FLAGS=-O2
-+    CONF_OPT_FLAGS="-O2"
-   fi
- 
-   CONF_SHARED_CC="$CXX -shared"
-@@ -677,7 +677,7 @@
-     CONF_SOEXT=sl
-     CONF_OBJ_SIZE_LIMIT=yes
-     ;;
--  *freebsd4*)
-+  *freebsd*)
-     # must not use .so.1.0 here
-     if test X"$use_threads" = Xyes; then
-       CXXFLAGS="$CXXFLAGS -D_THREAD_SAFE"
-@@ -1017,7 +1017,8 @@
-   if test X"$TCL_VERSION" != X; then
-     dnl # remove quotes if any
-     TCL_VERSION=`echo $TCL_VERSION | tr -d \"`
--    TCL_LIBS=-ltcl$TCL_VERSION
-+    TCL_LIBS="-ltcl$TCL_VERSION -L/usr/local/lib"
-+    TCL_LIBS=`echo $TCL_LIBS | tr -d .`
-     HAVE_TCL=yes
-     AC_MSG_RESULT($TCL_VERSION)
-   else
-@@ -1049,8 +1050,8 @@
- AC_CHECK_LIB(socket, open)
- AC_CHECK_LIB(bsd, open)
- 
--AC_CHECK_LIB(elf, open)
--AC_CHECK_LIB(dl, open)
-+#AC_CHECK_LIB(elf, open)
-+#AC_CHECK_LIB(dl, open)
- AC_CHECK_LIB(dld, open)
- AC_CHECK_LIB(ld, open)
- 
diff --git a/devel/mico/pkg-descr b/devel/mico/pkg-descr
index 2619557e7dbb..256d7cfd95d9 100644
--- a/devel/mico/pkg-descr
+++ b/devel/mico/pkg-descr
@@ -19,6 +19,6 @@ Here is some of MICO features:
     * CORBA Services: 
        o Interoperable Naming service, o Trading service, o Event service, 
        o Relationship service, o Property service, o Time service, 
-       o Security service, o Lifecycle service, o Externalization service
+       o Security service
 
 WWW: http://www.mico.org
diff --git a/devel/mico/pkg-plist b/devel/mico/pkg-plist
index 01c0806d9049..69d91362bef1 100644
--- a/devel/mico/pkg-plist
+++ b/devel/mico/pkg-plist
@@ -1,21 +1,10 @@
 %%MICO_SERVICE%%bin/ccmload
 %%MICO_SERVICE%%bin/componentserver
-%%MICO_SERVICE%%bin/containmentd
 %%MICO_SERVICE%%bin/eventd
-%%MICO_SERVICE%%bin/extcontainmentd
-%%MICO_SERVICE%%bin/extcriteriad
-%%MICO_SERVICE%%bin/extnoded
-%%MICO_SERVICE%%bin/extreferenced
-%%MICO_SERVICE%%bin/factoryfinderd
-%%MICO_SERVICE%%bin/genericfactory
 bin/idl
 bin/imr
 bin/iordump
 bin/ird
-%%MICO_SERVICE%%bin/lifecontainmentd
-%%MICO_SERVICE%%bin/lifecriteriad
-%%MICO_SERVICE%%bin/lifenoded
-%%MICO_SERVICE%%bin/lifereferenced
 bin/mico-ar
 bin/mico-c++
 %%MICO_SERVICE%%bin/mico-ccm
@@ -27,62 +16,39 @@ bin/mico-shc++
 bin/mico-shld
 bin/micod
 bin/mkdepend
-%%MICO_SERVICE%%bin/noded
 %%MICO_SERVICE%%bin/nsadmin
 %%MICO_SERVICE%%bin/nsd
-%%MICO_SERVICE%%bin/operationd
 %%MICO_SERVICE%%bin/propertyd
-%%MICO_SERVICE%%bin/proxyd
-%%MICO_SERVICE%%bin/randomd
-%%MICO_SERVICE%%bin/referenced
-%%MICO_SERVICE%%bin/streamd
 %%MICO_SERVICE%%bin/timed
-%%MICO_SERVICE%%bin/traderd
-%%MICO_SERVICE%%bin/traversald
 %%FLEX%%include/FlexLexer.h
 include/CORBA-SMALL.h
 include/CORBA.h
 include/coss/CompoundExternalization_impl.h
-%%MICO_SERVICE%%include/coss/CosCompoundLifeCycle.h
 include/coss/CosCompoundLifeCycle.idl
-%%MICO_SERVICE%%include/coss/CosContainment.h
 include/coss/CosContainment.idl
 include/coss/CosContainment_impl.h
 %%MICO_SERVICE%%include/coss/CosEventChannelAdmin.h
 include/coss/CosEventChannelAdmin.idl
 %%MICO_SERVICE%%include/coss/CosEventComm.h
 include/coss/CosEventComm.idl
-%%MICO_SERVICE%%include/coss/CosExternalization.h
 include/coss/CosExternalization.idl
-%%MICO_SERVICE%%include/coss/CosExternalizationContainment.h
 include/coss/CosExternalizationContainment.idl
-%%MICO_SERVICE%%include/coss/CosExternalizationReference.h
 include/coss/CosExternalizationReference.idl
-%%MICO_SERVICE%%include/coss/CosGraphs.h
 include/coss/CosGraphs.idl
-%%MICO_SERVICE%%include/coss/CosGraphsExtension.h
 include/coss/CosGraphsExtension.idl
-%%MICO_SERVICE%%include/coss/CosLifeCycle.h
 include/coss/CosLifeCycle.idl
-%%MICO_SERVICE%%include/coss/CosLifeCycleContainment.h
 include/coss/CosLifeCycleContainment.idl
-%%MICO_SERVICE%%include/coss/CosLifeCycleReference.h
 include/coss/CosLifeCycleReference.idl
 %%MICO_SERVICE%%include/coss/CosNaming.h
 include/coss/CosNaming.idl
-%%MICO_SERVICE%%include/coss/CosObjectIdentity.h
 include/coss/CosObjectIdentity.idl
-%%MICO_SERVICE%%include/coss/CosReference.h
 include/coss/CosReference.idl
 include/coss/CosReference_impl.h
-%%MICO_SERVICE%%include/coss/CosRelationships.h
 include/coss/CosRelationships.idl
 include/coss/CosStream_impl.h
 %%MICO_SERVICE%%include/coss/CosTime.h
 include/coss/CosTime.idl
-%%MICO_SERVICE%%include/coss/CosTrading.h
 include/coss/CosTrading.idl
-%%MICO_SERVICE%%include/coss/CosTradingRepos.h
 include/coss/CosTradingRepos.idl
 include/coss/EdgeIterator_impl.h
 include/coss/ExternalizationContainment_impl.h
@@ -91,6 +57,7 @@ include/coss/ExternalizationReference_impl.h
 include/coss/ExternalizationTraversalCriteria_impl.h
 include/coss/Externalization_impl.h
 include/coss/FactoryFinder_impl.h
+include/coss/GTP.idl
 include/coss/GenericCriteriaFactory_impl.h
 include/coss/GenericFactory_impl.h
 include/coss/GraphsRole_impl.h
@@ -107,12 +74,13 @@ include/coss/NamedRoleTypesHelper.h
 include/coss/NodeFactory_impl.h
 include/coss/NodeStreamableFactory_impl.h
 include/coss/Node_impl.h
+include/coss/MobileTerminal.idl
+include/coss/MobileTerminalNotification.idl
 include/coss/OperationsFactory_impl.h
 include/coss/Operations_impl.h
 %%MICO_SERVICE%%include/coss/PropertyService.h
 include/coss/PropertyService.idl
 include/coss/PropertyService_impl.h
-%%MICO_SERVICE%%include/coss/RandomGenerator.h
 include/coss/RandomGenerator.idl
 include/coss/RandomGenerator_impl.h
 include/coss/RegisterHelper.h
@@ -124,9 +92,7 @@ include/coss/Role_impl.h
 include/coss/TraversalCriteria_impl.h
 include/coss/TraversalFactory_impl.h
 include/coss/Traversal_impl.h
-%%MICO_SERVICE%%include/coss/random.h
 include/coss/random.idl
-%%MICO_SERVICE%%include/coss/stream.h
 include/coss/stream.idl
 include/coss/stream_impl.h
 include/mico/CCM.h
@@ -140,8 +106,6 @@ include/mico/assert.h
 include/mico/basic.h
 include/mico/basic_seq.h
 include/mico/basic_seq.idl
-include/mico/boa.h
-include/mico/boa_impl.h
 include/mico/buffer.h
 include/mico/code_set_registry.h
 include/mico/codec.h
@@ -158,7 +122,6 @@ include/mico/conv_frame.idl
 include/mico/current.h
 include/mico/current.idl
 include/mico/dii.h
-include/mico/dispatch.h
 include/mico/dsi.h
 include/mico/dynany.h
 include/mico/dynany.idl
@@ -186,6 +149,7 @@ include/mico/ir_base.h
 include/mico/ir_base.idl
 include/mico/ir_creator.h
 include/mico/lmath.h
+include/mico/ltp.h
 include/mico/magic.h
 include/mico/memtrace.h
 include/mico/message.h
@@ -225,10 +189,14 @@ include/mico/policy.idl
 include/mico/policy2.h
 include/mico/policy2.idl
 include/mico/policy_impl.h
+include/mico/poll_dispatcher.h
 include/mico/process.h
 include/mico/process_impl.h
 include/mico/qtmico.h
+include/mico/reflection.h
+include/mico/reflection.idl
 include/mico/rtti.h
+include/mico/watm.h
 include/mico/security/AccessConfig.h
 include/mico/security/AuditConfig.h
 include/mico/security/AuditIntercept.h
@@ -304,33 +272,33 @@ include/mico/valuetype.idl
 include/mico/valuetype_impl.h
 include/mico/version.h
 include/mico/x11.h
-lib/libmico2.3.11.a
-lib/libmico2.3.11.so
-lib/libmico2.3.11.so.1
-lib/libmicoaux2.3.11.a
-lib/libmicoaux2.3.11.so
-lib/libmicoaux2.3.11.so.1
-%%MICO_SERVICE%%lib/libmicoccm2.3.11.a
-%%MICO_SERVICE%%lib/libmicoccm2.3.11.so
-%%MICO_SERVICE%%lib/libmicoccm2.3.11.so.1
-%%MICO_SERVICE%%lib/libmicocoss2.3.11.a
-%%MICO_SERVICE%%lib/libmicocoss2.3.11.so
-%%MICO_SERVICE%%lib/libmicocoss2.3.11.so.1
-%%MICO_GTK%%lib/libmicogtk2.3.11.a
-%%MICO_GTK%%lib/libmicogtk2.3.11.so
-%%MICO_GTK%%lib/libmicogtk2.3.11.so.1
-lib/libmicoir2.3.11.a
-lib/libmicoir2.3.11.so
-lib/libmicoir2.3.11.so.1
-%%MICO_QT%%lib/libmicoqt2.3.11.a
-%%MICO_QT%%lib/libmicoqt2.3.11.so
-%%MICO_QT%%lib/libmicoqt2.3.11.so.1
-%%MICO_TCL%%lib/libmicotcl2.3.11.a
-%%MICO_TCL%%lib/libmicotcl2.3.11.so
-%%MICO_TCL%%lib/libmicotcl2.3.11.so.1
-%%MICO_X11%%lib/libmicox2.3.11.a
-%%MICO_X11%%lib/libmicox2.3.11.so
-%%MICO_X11%%lib/libmicox2.3.11.so.1
+lib/libmico2.3.12.a
+lib/libmico2.3.12.so
+lib/libmico2.3.12.so.1
+lib/libmicoaux2.3.12.a
+lib/libmicoaux2.3.12.so
+lib/libmicoaux2.3.12.so.1
+%%MICO_SERVICE%%lib/libmicoccm2.3.12.a
+%%MICO_SERVICE%%lib/libmicoccm2.3.12.so
+%%MICO_SERVICE%%lib/libmicoccm2.3.12.so.1
+%%MICO_SERVICE%%lib/libmicocoss2.3.12.a
+%%MICO_SERVICE%%lib/libmicocoss2.3.12.so
+%%MICO_SERVICE%%lib/libmicocoss2.3.12.so.1
+%%MICO_GTK%%lib/libmicogtk2.3.12.a
+%%MICO_GTK%%lib/libmicogtk2.3.12.so
+%%MICO_GTK%%lib/libmicogtk2.3.12.so.1
+lib/libmicoir2.3.12.a
+lib/libmicoir2.3.12.so
+lib/libmicoir2.3.12.so.1
+%%MICO_QT%%lib/libmicoqt2.3.12.a
+%%MICO_QT%%lib/libmicoqt2.3.12.so
+%%MICO_QT%%lib/libmicoqt2.3.12.so.1
+%%MICO_TCL%%lib/libmicotcl2.3.12.a
+%%MICO_TCL%%lib/libmicotcl2.3.12.so
+%%MICO_TCL%%lib/libmicotcl2.3.12.so.1
+%%MICO_X11%%lib/libmicox2.3.12.a
+%%MICO_X11%%lib/libmicox2.3.12.so
+%%MICO_X11%%lib/libmicox2.3.12.so.1
 lib/mico-setup.csh
 lib/mico-setup.sh
 %%PORTDOCS%%%%DOCSDIR%%/manual.ps
@@ -466,11 +434,6 @@ lib/mico-setup.sh
 %%PORTDOCS%%%%EXAMPLESDIR%%/dynany/dynany.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/dynany/dynanytest.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/dynany/test.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/externalization/Makefile
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/externalization/client.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/externalization/hello.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/externalization/runit
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/externalization/server.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/generic/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/generic/client.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/generic/run_test
@@ -590,11 +553,6 @@ lib/mico-setup.sh
 %%PORTDOCS%%%%EXAMPLESDIR%%/interop/visibroker/account
 %%PORTDOCS%%%%EXAMPLESDIR%%/interop/visibroker/main.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/interop/visibroker/run_applet
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/lifecycle/Makefile
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/lifecycle/client.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/lifecycle/hello.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/lifecycle/runit
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/lifecycle/server.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/mcast/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/mcast/client.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/mcast/hello.idl
@@ -706,42 +664,6 @@ lib/mico-setup.sh
 %%PORTDOCS%%%%EXAMPLESDIR%%/random/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/random/client.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/random/random.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-1/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-1/calc.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-1/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-1/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-2/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-2/calc.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-2/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-2/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-3/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-3/calc.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-3/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-3/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-4/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-4/calc.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-4/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Calc-4/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-1/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-1/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-1/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-1/tty.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-2/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-2/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-2/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-2/tty.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-3/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-3/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-3/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-3/tty.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-3/ttyplus.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-4/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-4/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-4/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-4/tty.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Hello-4/ttyplus.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/redlich/README
 %%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/Makefile
 %%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/README
 %%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/security/acl-aware/Makefile
@@ -907,40 +829,6 @@ lib/mico-setup.sh
 %%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/events/server.cc
 %%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/events/server2.cc
 %%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/events/server3.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/Documents.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/DocumentsServer.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/Documents_impl.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/Documents_impl.h
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/Makefile
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/README
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/Test.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/TestServer.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/Test_impl.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/Test_impl.h
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/daemons-start
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/daemons-stop
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/rundemo
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/servers-start
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/simple-test.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/stop-servers
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/externalize/test
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/Documents.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/DocumentsServer.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/Documents_impl.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/Documents_impl.h
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/Makefile
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/README
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/Test.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/TestServer.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/Test_impl.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/Test_impl.h
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/daemons-start
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/daemons-stop
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/rundemo
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/servers-start
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/simple-test.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/stop-servers
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/lifecycle/test
 %%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/naming-lb/Client.cc
 %%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/naming-lb/Makefile
 %%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/naming-lb/Printer.idl
@@ -959,77 +847,15 @@ lib/mico-setup.sh
 %%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/property-daemon/get_properties.cc
 %%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/property-daemon/set_properties.cc
 %%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/property-daemon/start_demo
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/Documents.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/DocumentsServer.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/Documents_impl.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/Documents_impl.h
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/Makefile
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/README
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/Test.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/TestServer.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/Test_impl.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/Test_impl.h
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/daemons-start
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/daemons-stop
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/rundemo
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/servers-start
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/simple-test.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/stop-servers
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/relship/test
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/stream-bench/Makefile
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/stream-bench/bench
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/stream-bench/req.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/stream-bench/req_client.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/stream-bench/req_server.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/stream-bench/stream_client.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/stream-bench/stream_server.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/services/stream-sound/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/services/stream-sound/client.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/services/stream-sound/server.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/services/stream-sound/sound.h
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/trader/Makefile
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/trader/demo.idl
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/trader/main.cc
-%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/services/trader/run
 %%PORTDOCS%%%%EXAMPLESDIR%%/shlib/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/shlib/client.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/shlib/hello
 %%PORTDOCS%%%%EXAMPLESDIR%%/shlib/hello.idl
 %%PORTDOCS%%%%EXAMPLESDIR%%/shlib/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/central/DepotData.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/central/DepotData.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/central/DepotImpl.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/central/DepotImpl.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/central/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/central/TreeNode.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/central/depot.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/central/depot_server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/idl/Central.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/idl/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/idl/POS.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/idl/Store.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/pos/InputMediaImpl.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/pos/InputMediaImpl.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/pos/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/pos/OutputMediaImpl.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/pos/OutputMediaImpl.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/pos/POSTerminalImpl.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/pos/POSTerminalImpl.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/pos/POS_Client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/pos/POS_Server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/primer_utils/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/primer_utils/NsPublisher.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/primer_utils/NsPublisher.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/store/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/store/StoreAccessImpl.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/store/StoreAccessImpl.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/store/StoreImpl.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/store/StoreImpl.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/store/TaxImpl.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/store/TaxImpl.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/siegel/store/store_server.cc
 %%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/Makefile
 %%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/c_cert.pem
 %%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/c_key.pem
@@ -1040,22 +866,11 @@ lib/mico-setup.sh
 %%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/server.cc
 %%PORTDOCS%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/ssl
 %%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/ssl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/siegel/store
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/siegel/primer_utils
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/siegel/pos
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/siegel/idl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/siegel/central
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/siegel
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/shlib
-%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/trader
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/services/stream-sound
-%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/stream-bench
-%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/relship
+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/stream-sound
 %%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/property-daemon
 %%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/naming-lb
 %%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/naming
-%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/lifecycle
-%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/externalize
 %%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/services/events
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/services
 %%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/tutorial
@@ -1068,15 +883,6 @@ lib/mico-setup.sh
 %%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/acl-unaware
 %%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security/acl-aware
 %%PORTDOCS%%%%MICO_SSL%%@dirrm %%EXAMPLESDIR%%/security
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/redlich/Hello-4
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/redlich/Hello-3
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/redlich/Hello-2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/redlich/Hello-1
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/redlich/Calc-4
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/redlich/Calc-3
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/redlich/Calc-2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/redlich/Calc-1
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/redlich
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/random
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/poa/inherit
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/poa/hello-2
@@ -1100,7 +906,6 @@ lib/mico-setup.sh
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mt/callback
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mt
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mcast
-%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/lifecycle
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop/visibroker
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop/orbix
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop/jdk
@@ -1135,7 +940,6 @@ lib/mico-setup.sh
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interceptor
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/henning
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/generic
-%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/externalization
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/dynany
 %%PORTDOCS%%%%MICO_X11%%@dirrm %%EXAMPLESDIR%%/dispatcher/x11
 %%PORTDOCS%%%%MICO_QT%%@dirrm %%EXAMPLESDIR%%/dispatcher/qtmico