Upgrade to version 2.3.0.

PR:		14001
Submitted by:	Maxim Sobolev <sobomax@altavista.net>

10 files changed, 230 insertions, 101 deletions

diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index bac40ec65a7b..17e3f0db6041 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-DISTNAME=	mico-2.2.7
+DISTNAME=	mico-2.3.0
 CATEGORIES=	devel
 MASTER_SITES=	http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/
 
@@ -18,13 +18,22 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_NEWGCC=	yes
+
+.if defined(QT2)
+USE_QT2=	yes
+MAKE_ENV=	QT_INCLUDE="${X11BASE}/include/qt2"
+.else
 USE_QT=		yes
+MAKE_ENV=	QT_INCLUDE="${X11BASE}/include/qt"
+.endif
+
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/mico
 
-CONFIGURE_ARGS=	--with-qt --with-gtk --with-tcl --disable-mini-stl
+CONFIGURE_ARGS=	--with-qt --with-gtk --with-tcl --disable-mini-stl \
+		--enable-static --enable-shared
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 MAN1=		idl.1 imr.1 nsadmin.1
@@ -32,6 +41,31 @@ MAN5=		micorc.5
 MAN8=		ird.8 micod.8 nsd.8
 
 post-install:
+	${LN} -s ${PREFIX}/lib/libmico2.3.0.so.1 ${PREFIX}/lib/libmico.2.3.0.so
+	${LN} -s ${PREFIX}/lib/libmicoaux2.3.0.so.1 ${PREFIX}/lib/libmicoaux.2.3.0.so
+	${LN} -s ${PREFIX}/lib/libmicocoss2.3.0.so.1 ${PREFIX}/lib/libmicocoss.2.3.0.so
+	${LN} -s ${PREFIX}/lib/libmicogtk2.3.0.so.1 ${PREFIX}/lib/libmicogtk.2.3.0.so
+	${LN} -s ${PREFIX}/lib/libmicoqt2.3.0.so.1 ${PREFIX}/lib/libmicoqt.2.3.0.so
+	${LN} -s ${PREFIX}/lib/libmicotcl2.3.0.so.1 ${PREFIX}/lib/libmicotcl.2.3.0.so
+	${LN} -s ${PREFIX}/lib/libmicox2.3.0.so.1 ${PREFIX}/lib/libmicox.2.3.0.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	@strip ${PREFIX}/bin/containmentd
+	@strip ${PREFIX}/bin/eventd
+	@strip ${PREFIX}/bin/idl
+	@strip ${PREFIX}/bin/imr
+	@strip ${PREFIX}/bin/iordump
+	@strip ${PREFIX}/bin/ird
+	@strip ${PREFIX}/bin/mico-cpp
+	@strip ${PREFIX}/bin/micod
+	@strip ${PREFIX}/bin/noded
+	@strip ${PREFIX}/bin/nsadmin
+	@strip ${PREFIX}/bin/nsd
+	@strip ${PREFIX}/bin/propertyd
+	@strip ${PREFIX}/bin/proxyd
+	@strip ${PREFIX}/bin/randomd
+	@strip ${PREFIX}/bin/referenced
+	@strip ${PREFIX}/bin/timed
+	@strip ${PREFIX}/bin/traderd
+	@strip ${PREFIX}/bin/traversald
 
 .include <bsd.port.mk>
diff --git a/devel/mico/distinfo b/devel/mico/distinfo
index 775b18b9a4d2..ffe06d0b1875 100644
--- a/devel/mico/distinfo
+++ b/devel/mico/distinfo
@@ -1 +1 @@
-MD5 (mico-2.2.7.tar.gz) = 0fa9acdbf61602509c9f7740c2e5a094
+MD5 (mico-2.3.0.tar.gz) = 787e1bb9e49d41e62d560c0a86046782
diff --git a/devel/mico/files/patch-ak b/devel/mico/files/patch-ak
index 29b9ebf6333c..bfa66cd10705 100644
--- a/devel/mico/files/patch-ak
+++ b/devel/mico/files/patch-ak
@@ -1,6 +1,7 @@
---- configure.in.orig	Wed Oct 21 15:29:16 1998
-+++ configure.in	Wed May 12 16:48:24 1999
-@@ -102,7 +102,7 @@
+diff -ruN work/mico/configure.in mico/configure.in
+--- work/mico/configure.in	Sun Aug  8 06:00:49 1999
++++ configure.in	Sun Sep 26 04:44:44 1999
+@@ -170,7 +170,7 @@
  # extra dirs
  #
  
@@ -9,13 +10,13 @@
  
  #
  # misc
-@@ -234,7 +234,12 @@
+@@ -314,7 +314,12 @@
      CONF_OBJ_SIZE_LIMIT=yes
      ;;
    *bsd*)
 -    CONF_SOEXT=so.1.0
 +    if test "X$PORTOBJFORMAT" = "Xelf"; then
-+      CONF_SHARED_CC="$CXX -shared -Wl,-soname,\$@"
++      CONF_SHARED_CC="$CXX -shared -Wl,-x "
 +      CONF_SOEXT=so.1
 +    else
 +      CONF_SOEXT=so.1.0
diff --git a/devel/mico/files/patch-am b/devel/mico/files/patch-am
index 527068690be9..a24ccd4e0f03 100644
--- a/devel/mico/files/patch-am
+++ b/devel/mico/files/patch-am
@@ -100,3 +100,56 @@
  	done
  
  install-cd: install
+--- demo/boa/Makefile.orig	Mon Sep 27 22:52:48 1999
++++ demo/boa/Makefile	Mon Sep 27 22:53:43 1999
+@@ -31,7 +31,7 @@
+ 	for i in $(DIRS); do $(MAKE) -C $$i clean || exit 1; done
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/boa
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/boa
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/boa
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/boa
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/boa
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/boa
+ 	for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done
+--- demo/dispatcher/Makefile.orig	Mon Sep 27 22:54:58 1999
++++ demo/dispatcher/Makefile	Mon Sep 27 22:55:23 1999
+@@ -27,8 +27,8 @@
+ 	rm -f *.o core *~ .depend
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/dispatcher
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/dispatcher
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/dispatcher
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/dispatcher
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/dispatcher
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/dispatcher
+ 	test -z "$(DIRS)" || \
+ 	  eval 'for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done'
+--- demo/obv/Makefile.orig	Mon Sep 27 22:56:17 1999
++++ demo/obv/Makefile	Mon Sep 27 22:56:39 1999
+@@ -13,7 +13,7 @@
+ 	rm -f *.o core *~ .depend
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/obv
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/obv
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/obv
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/obv
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/obv
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/obv
+ 	for i in $(DIRS); do $(MAKE) -C $$i install || exit 1; done
+--- demo/services/Makefile.orig	Mon Sep 27 22:57:19 1999
++++ demo/services/Makefile	Mon Sep 27 22:57:43 1999
+@@ -13,7 +13,7 @@
+ 	rm -f *.o core *~ .depend
+ 
+ install:
+-	$(IDIRCMD) $(INSTDIR)/doc/mico/examples/services
+-	$(ISRCCMD) Makefile $(INSTDIR)/doc/mico/examples/services
+-	$(ISRCCMD) README $(INSTDIR)/doc/mico/examples/services
++	$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico/examples/services
++	$(ISRCCMD) Makefile $(SHARED_INSTDIR)/doc/mico/examples/services
++	$(ISRCCMD) README $(SHARED_INSTDIR)/doc/mico/examples/services
+ 	for i in $(DIRS) stream-sound; do $(MAKE) -C $$i install || exit 1; done
diff --git a/devel/mico/files/patch-an b/devel/mico/files/patch-an
index a97a694d359c..2875edc3d009 100644
--- a/devel/mico/files/patch-an
+++ b/devel/mico/files/patch-an
@@ -1,19 +1,12 @@
-*** auxdir/Makefile.orig	Wed Aug  4 13:04:27 1999
---- auxdir/Makefile	Wed Aug  4 13:04:57 1999
-***************
-*** 49,55 ****
-  ifeq ($(HAVE_GTK), yes)
-  STATIC_LIBS := $(STATIC_LIBS) libmicogtk$(VERSION).a
-  CXXFLAGS := $(CXXFLAGS) $(GTK_CFLAGS)
-! GTK_SRCS := gtkmico.cc gtkmico-c.cc
-  STATIC_GTK_OBJS = $(GTK_SRCS:.cc=.o)
-  SHARED_GTK_OBJS = $(GTK_SRCS:.cc=.pic.o)
-  endif
---- 49,55 ----
-  ifeq ($(HAVE_GTK), yes)
-  STATIC_LIBS := $(STATIC_LIBS) libmicogtk$(VERSION).a
-  CXXFLAGS := $(CXXFLAGS) $(GTK_CFLAGS)
-! GTK_SRCS := gtkmico.cc 
-  STATIC_GTK_OBJS = $(GTK_SRCS:.cc=.o)
-  SHARED_GTK_OBJS = $(GTK_SRCS:.cc=.pic.o)
-  endif
+diff -ruN work/mico/auxdir/Makefile mico/auxdir/Makefile
+--- work/mico/auxdir/Makefile	Mon Jul 26 20:44:45 1999
++++ auxdir/Makefile	Sun Sep 26 04:48:35 1999
+@@ -24,7 +24,7 @@
+ 
+ LDLIBS    = -lmico$(VERSION) $(CONFLIBS)
+ LDFLAGS  := -L../orb $(LDFLAGS)
+-CXXFLAGS := -I. -I../include $(CXXFLAGS) $(X_CFLAGS)
++CXXFLAGS := -I. -I../include -I$(QT_INCLUDES) $(CXXFLAGS) $(X_CFLAGS)
+ 
+ AUX_SRCS=dynany_impl.cc
+ STATIC_AUX_OBJS = $(AUX_SRCS:.cc=.o)
diff --git a/devel/mico/files/patch-ao b/devel/mico/files/patch-ao
new file mode 100644
index 000000000000..3cd1d0986826
--- /dev/null
+++ b/devel/mico/files/patch-ao
@@ -0,0 +1,19 @@
+--- admin/mico-shld.def.in.orig	Mon Jul 26 20:44:44 1999
++++ admin/mico-shld.def.in	Mon Sep 27 23:32:57 1999
+@@ -50,10 +50,15 @@
+ outfile=` echo "$outfile" | sed -e 's/\.o$//' `'.@SOEXT@'
+ 
+ ldcmd="@SHARED_CC@ @PICFLAGS@ @LDSOFLAGS@ @DLFLAGS@ $libdirs @LDFLAGS@ -o $outfile \
+- $args" # @LIBS@
++-Wl,-soname,$outfile $args" # @LIBS@
+ 
+ echo "$ldcmd"
+ eval "$ldcmd" || exit
++
++symlink=` echo "$outfile" | sed 's/\.[1234567890]$//' `
++
++lncmd="ln -s $outfile $symlink"
++eval "$lncmd" || exit
+ 
+ # for HP-UX
+ chmod 555 "$outfile"
diff --git a/devel/mico/files/patch-ap b/devel/mico/files/patch-ap
new file mode 100644
index 000000000000..be39d860d053
--- /dev/null
+++ b/devel/mico/files/patch-ap
@@ -0,0 +1,11 @@
+--- coss/time/Makefile.orig	Mon Sep 27 00:12:40 1999
++++ coss/time/Makefile	Mon Sep 27 00:12:55 1999
+@@ -22,7 +22,7 @@
+ 
+ include ../../MakeVars
+ 
+-LDLIBS    = -lmicocoss$(VERSION) -lmico$(VERSION) $(CONFLIBS)
++LDLIBS    = -lmicocoss$(VERSION) -lmico$(VERSION) $(CONFLIBS) -lcompat
+ LDFLAGS  := -L.. -L.. -L../../orb $(LDFLAGS)
+ CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS)
+ IDLFLAGS := -I../../include --poa --no-boa --relative-paths
diff --git a/devel/mico/files/patch-aq b/devel/mico/files/patch-aq
new file mode 100644
index 000000000000..f1a0116c9e69
--- /dev/null
+++ b/devel/mico/files/patch-aq
@@ -0,0 +1,10 @@
+--- Makefile.orig	Fri Dec  3 14:35:16 1999
++++ Makefile	Fri Dec  3 14:36:14 1999
+@@ -62,7 +62,6 @@
+ 		$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \
+ 		$(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \
+ 	fi
+-	-ldconfig
+ 
+ install-cd:
+ 	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
diff --git a/devel/mico/pkg-descr b/devel/mico/pkg-descr
index 7dff444cbba9..7c4d8328515b 100644
--- a/devel/mico/pkg-descr
+++ b/devel/mico/pkg-descr
@@ -1,3 +1,4 @@
 a CORBA 2.0 implementation which goal is freely available
 
 WWW: http://diamant.vsb.cs.uni-frankfurt.de/~mico
+     http://www.mico.org
diff --git a/devel/mico/pkg-plist b/devel/mico/pkg-plist
index c299854510fd..34341dd7b925 100644
--- a/devel/mico/pkg-plist
+++ b/devel/mico/pkg-plist
@@ -1,3 +1,4 @@
+bin/containmentd
 bin/eventd
 bin/idl
 bin/imr
@@ -10,37 +11,66 @@ bin/mico-ld
 bin/mico-shc++
 bin/mico-shld
 bin/micod
+bin/noded
 bin/nsadmin
 bin/nsd
 bin/propertyd
+bin/proxyd
+bin/randomd
+bin/referenced
+bin/timed
 bin/traderd
-doc/mico/examples/boa/Makefile
-doc/mico/examples/boa/README
-doc/mico/examples/dispatcher/Makefile
-doc/mico/examples/dispatcher/README
-doc/mico/examples/obv/Makefile
-doc/mico/examples/obv/README
-doc/mico/examples/services/Makefile
-doc/mico/examples/services/README
+bin/traversald
 include/CORBA-SMALL.h
 include/CORBA.h
+include/mico/CosContainment.h
+include/mico/CosContainment.idl
+include/mico/CosContainment_impl.h
 include/mico/CosEventChannelAdmin.h
 include/mico/CosEventChannelAdmin.idl
 include/mico/CosEventComm.h
 include/mico/CosEventComm.idl
+include/mico/CosGraphs.h
+include/mico/CosGraphs.idl
+include/mico/CosGraphsExtension.h
+include/mico/CosGraphsExtension.idl
+include/mico/CosNaming.h
+include/mico/CosNaming.idl
 include/mico/CosObjectIdentity.h
 include/mico/CosObjectIdentity.idl
+include/mico/CosReference.h
+include/mico/CosReference.idl
+include/mico/CosReference_impl.h
 include/mico/CosRelationships.h
 include/mico/CosRelationships.idl
+include/mico/CosTime.h
+include/mico/CosTime.idl
+include/mico/CosTrading.h
+include/mico/CosTrading.idl
+include/mico/CosTradingRepos.h
+include/mico/CosTradingRepos.idl
+include/mico/EdgeIterator_impl.h
+include/mico/GenericCriteriaFactory_impl.h
+include/mico/GraphsRole_impl.h
 include/mico/IdentifiableObject_impl.h
+include/mico/InterfaceDefsHelper.h
+include/mico/NamedRoleTypesHelper.h
+include/mico/NodeFactory_impl.h
+include/mico/Node_impl.h
 include/mico/PropertyService.h
 include/mico/PropertyService.idl
 include/mico/PropertyService_impl.h
+include/mico/RandomGenerator.h
+include/mico/RandomGenerator.idl
+include/mico/RandomGenerator_impl.h
 include/mico/RelationshipFactory_impl.h
 include/mico/RelationshipIterator_impl.h
 include/mico/Relationship_impl.h
 include/mico/RoleFactory_impl.h
 include/mico/Role_impl.h
+include/mico/TraversalCriteria_impl.h
+include/mico/TraversalFactory_impl.h
+include/mico/Traversal_impl.h
 include/mico/address.h
 include/mico/address_impl.h
 include/mico/any.h
@@ -93,8 +123,6 @@ include/mico/ir_impl.h
 include/mico/lmath.h
 include/mico/magic.h
 include/mico/memtrace.h
-include/mico/naming.h
-include/mico/naming.idl
 include/mico/native.h
 include/mico/object.h
 include/mico/operators.h
@@ -120,6 +148,8 @@ include/mico/policy_impl.h
 include/mico/process.h
 include/mico/process_impl.h
 include/mico/qtmico.h
+include/mico/random.h
+include/mico/random.idl
 include/mico/rtti.h
 include/mico/sequence.h
 include/mico/sequence_special.h
@@ -143,13 +173,9 @@ include/mico/tckind.idl
 include/mico/tclmico.h
 include/mico/template_impl.h
 include/mico/throw.h
-include/mico/trader.h
-include/mico/trader.idl
 include/mico/transport.h
 include/mico/transport_impl.h
 include/mico/typecode.h
-include/mico/typerepo.h
-include/mico/typerepo.idl
 include/mico/types.h
 include/mico/util.h
 include/mico/value.h
@@ -179,13 +205,27 @@ include/ministl/simplevec.h
 include/ministl/string
 include/ministl/vector
 include/ministl/vector.h
-lib/libmico2.2.7.a
-lib/libmicoaux2.2.7.a
-lib/libmicocoss2.2.7.a
-lib/libmicogtk2.2.7.a
-lib/libmicoqt2.2.7.a
-lib/libmicotcl2.2.7.a
-lib/libmicox2.2.7.a
+lib/libmico.2.3.0.so
+lib/libmico2.3.0.a
+lib/libmico2.3.0.so.1
+lib/libmicoaux.2.3.0.so
+lib/libmicoaux2.3.0.a
+lib/libmicoaux2.3.0.so.1
+lib/libmicocoss.2.3.0.so
+lib/libmicocoss2.3.0.a
+lib/libmicocoss2.3.0.so.1
+lib/libmicogtk.2.3.0.so
+lib/libmicogtk2.3.0.a
+lib/libmicogtk2.3.0.so.1
+lib/libmicoqt.2.3.0.so
+lib/libmicoqt2.3.0.a
+lib/libmicoqt2.3.0.so.1
+lib/libmicotcl.2.3.0.so
+lib/libmicotcl2.3.0.a
+lib/libmicotcl2.3.0.so.1
+lib/libmicox.2.3.0.so
+lib/libmicox2.3.0.a
+lib/libmicox2.3.0.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/mico-setup.csh
@@ -198,6 +238,8 @@ share/doc/mico/examples/bench/bench.idl
 share/doc/mico/examples/bench/bench_impl.h
 share/doc/mico/examples/bench/client.cc
 share/doc/mico/examples/bench/server.cc
+share/doc/mico/examples/boa/Makefile
+share/doc/mico/examples/boa/README
 share/doc/mico/examples/boa/account/Makefile
 share/doc/mico/examples/boa/account/account.idl
 share/doc/mico/examples/boa/account/main.cc
@@ -228,6 +270,8 @@ share/doc/mico/examples/codesets/client.cc
 share/doc/mico/examples/codesets/hello.idl
 share/doc/mico/examples/codesets/runit
 share/doc/mico/examples/codesets/server.cc
+share/doc/mico/examples/dispatcher/Makefile
+share/doc/mico/examples/dispatcher/README
 share/doc/mico/examples/dispatcher/gtkmico/Makefile
 share/doc/mico/examples/dispatcher/gtkmico/README
 share/doc/mico/examples/dispatcher/gtkmico/client.cc
@@ -297,6 +341,8 @@ share/doc/mico/examples/mcast/client.cc
 share/doc/mico/examples/mcast/hello.idl
 share/doc/mico/examples/mcast/runit
 share/doc/mico/examples/mcast/server.cc
+share/doc/mico/examples/obv/Makefile
+share/doc/mico/examples/obv/README
 share/doc/mico/examples/obv/abstract/Makefile
 share/doc/mico/examples/obv/abstract/README
 share/doc/mico/examples/obv/abstract/abstract
@@ -404,6 +450,8 @@ share/doc/mico/examples/redlich/Hello-4/tty.idl
 share/doc/mico/examples/redlich/Hello-4/ttyplus.idl
 share/doc/mico/examples/redlich/Makefile
 share/doc/mico/examples/redlich/README
+share/doc/mico/examples/services/Makefile
+share/doc/mico/examples/services/README
 share/doc/mico/examples/services/events/Makefile
 share/doc/mico/examples/services/events/client.cc
 share/doc/mico/examples/services/events/client2.cc
@@ -422,59 +470,23 @@ share/doc/mico/examples/services/property-daemon/bank.idl
 share/doc/mico/examples/services/property-daemon/get_properties.cc
 share/doc/mico/examples/services/property-daemon/set_properties.cc
 share/doc/mico/examples/services/property-daemon/start_demo
-share/doc/mico/examples/services/relship/Bank.idl
-share/doc/mico/examples/services/relship/BankServer.cc
-share/doc/mico/examples/services/relship/Bank_impl.cc
-share/doc/mico/examples/services/relship/Bank_impl.h
-share/doc/mico/examples/services/relship/ContainedInRoleServer.cc
-share/doc/mico/examples/services/relship/Containment.idl
-share/doc/mico/examples/services/relship/ContainmentServer.cc
-share/doc/mico/examples/services/relship/Containment_impl.cc
-share/doc/mico/examples/services/relship/Containment_impl.h
-share/doc/mico/examples/services/relship/ContainsRoleServer.cc
 share/doc/mico/examples/services/relship/Documents.idl
+share/doc/mico/examples/services/relship/DocumentsServer.cc
 share/doc/mico/examples/services/relship/Documents_impl.cc
 share/doc/mico/examples/services/relship/Documents_impl.h
-share/doc/mico/examples/services/relship/EmployeeRoleServer.cc
-share/doc/mico/examples/services/relship/EmployerRoleServer.cc
-share/doc/mico/examples/services/relship/Employment.idl
-share/doc/mico/examples/services/relship/EmploymentServer.cc
-share/doc/mico/examples/services/relship/Employment_impl.cc
-share/doc/mico/examples/services/relship/Employment_impl.h
-share/doc/mico/examples/services/relship/FigureServer.cc
-share/doc/mico/examples/services/relship/InterfaceDefsHelper.cc
-share/doc/mico/examples/services/relship/InterfaceDefsHelper.h
 share/doc/mico/examples/services/relship/Makefile
-share/doc/mico/examples/services/relship/NamedRoleTypesHelper.cc
-share/doc/mico/examples/services/relship/NamedRoleTypesHelper.h
-share/doc/mico/examples/services/relship/OwnedByRoleServer.cc
-share/doc/mico/examples/services/relship/OwnerRoleServer.cc
-share/doc/mico/examples/services/relship/Ownership.idl
-share/doc/mico/examples/services/relship/OwnershipServer.cc
-share/doc/mico/examples/services/relship/Ownership_impl.cc
-share/doc/mico/examples/services/relship/Ownership_impl.h
-share/doc/mico/examples/services/relship/Person.idl
-share/doc/mico/examples/services/relship/PersonServer.cc
-share/doc/mico/examples/services/relship/Person_impl.cc
-share/doc/mico/examples/services/relship/Person_impl.h
-share/doc/mico/examples/services/relship/Reference.idl
-share/doc/mico/examples/services/relship/ReferenceServer.cc
-share/doc/mico/examples/services/relship/Reference_impl.cc
-share/doc/mico/examples/services/relship/Reference_impl.h
-share/doc/mico/examples/services/relship/ReferencedByRoleServer.cc
-share/doc/mico/examples/services/relship/ReferencesRoleServer.cc
-share/doc/mico/examples/services/relship/RelationshipFactoryServer.cc
-share/doc/mico/examples/services/relship/RelationshipIteratorServer.cc
-share/doc/mico/examples/services/relship/RoleFactoryServer.cc
-share/doc/mico/examples/services/relship/TextServer.cc
-share/doc/mico/examples/services/relship/interactive
-share/doc/mico/examples/services/relship/interactive-client.cc
-share/doc/mico/examples/services/relship/simple
-share/doc/mico/examples/services/relship/simple-client.cc
-share/doc/mico/examples/services/relship/start-servers
+share/doc/mico/examples/services/relship/README
+share/doc/mico/examples/services/relship/Test.idl
+share/doc/mico/examples/services/relship/TestServer.cc
+share/doc/mico/examples/services/relship/Test_impl.cc
+share/doc/mico/examples/services/relship/Test_impl.h
+share/doc/mico/examples/services/relship/daemons-start
+share/doc/mico/examples/services/relship/daemons-stop
+share/doc/mico/examples/services/relship/rundemo
+share/doc/mico/examples/services/relship/servers-start
+share/doc/mico/examples/services/relship/simple-test.cc
 share/doc/mico/examples/services/relship/stop-servers
 share/doc/mico/examples/services/relship/test
-share/doc/mico/examples/services/relship/test-client.cc
 share/doc/mico/examples/services/stream-bench/Makefile
 share/doc/mico/examples/services/stream-bench/bench
 share/doc/mico/examples/services/stream-bench/req.idl
@@ -564,9 +576,4 @@ share/doc/mico/manual.ps
 @dirrm share/doc/mico
 @dirrm include/ministl
 @dirrm include/mico
-@dirrm doc/mico/examples/services
-@dirrm doc/mico/examples/obv
-@dirrm doc/mico/examples/dispatcher
-@dirrm doc/mico/examples/boa
-@dirrm doc/mico/examples
-@dirrm doc/mico
+