3 files changed, 313 insertions, 25 deletions

diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 0529e7c161af..bd74531d8a61 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -1,36 +1,46 @@
-# New ports collection makefile for:   mico
-# Version required:    2.0.6
-# Date created:        31 March 1998
-# Whom:                Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for:   mico-latest
+# Version required:    2.1.0
+# Date created:        11 July 1998
+# Whom:                Marc G. Fournier <scrappy@freebsd.org>
 #
-# $Id: Makefile,v 1.3 1998/08/12 06:29:26 asami Exp $
+# $Id: Makefile,v 1.3 1998/07/12 19:28:33 scrappy Exp $
 #
 
-DISTNAME=	mico-2.0.6
+DISTNAME=	mico-2.1.0
 CATEGORIES=	devel
 MASTER_SITES=	http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/
 
-MAINTAINER=	Nakai@technologist.com
+MAINTAINER=	scrappy@freebsd.org
 
-LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=	gtk\\.1\\.4:${PORTSDIR}/x11/gtk \
+		qt\\.1\\.33:${PORTSDIR}/x11/qt133
 
-BROKEN=		gtk and tcl path
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt \
+		g++28:${PORTSDIR}/lang/gcc28 \
+		${PREFIX}/${GCC28DIR}/libstdc++.a:${PORTSDIR}/lang/glibstdc++28
 
-WRKSRC=		${WRKDIR}/mico
-
-CONFIGURE_ARGS=	--with-qt=${X11BASE}/include/X11/qt \
-		--with-gtk=${X11BASE}/include/gtk --with-tcl=/usr/include \
-		--disable-optimize
+CXX=		g++28
+CC=		gcc28
 
-USE_QT=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-MAN1=		idl.1 imr.1 nsadmin.1
+WRKSRC=		${WRKDIR}/mico
+
+CONFIGURE_ARGS=	--with-qt --with-gtk --with-tcl=/usr/include \
+		--disable-optimize --disable-mini-stl --disable-shared
+
+MAN1=		idl.1 imr.1 nsadmn.1
 MAN5=		micorc.5
 MAN8=		ird.8 micod.8 nsd.8
 
+pre-patch:
+	cd ${WRKSRC}/idl; flex -B -+ -8 -oscanner.cc scanner.l
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
+
+GNUOSREL!=      uname -r | ${SED} -e 's/[-(].*//'
+GCC28DIR=       lib/gcc-lib/i386-unknown-freebsd${GNUOSREL}/2.8.1
diff --git a/devel/mico/distinfo b/devel/mico/distinfo
index c038c9eff660..ca4176b633b5 100644
--- a/devel/mico/distinfo
+++ b/devel/mico/distinfo
@@ -1 +1 @@
-MD5 (mico-2.0.6.tar.gz) = ba1269e056948b65ebee8807b1d16033
+MD5 (mico-2.1.0.tar.gz) = 8e2a36c5678402664339e902b788923b
diff --git a/devel/mico/pkg-plist b/devel/mico/pkg-plist
index b366ebd5f617..34832b4384d7 100644
--- a/devel/mico/pkg-plist
+++ b/devel/mico/pkg-plist
@@ -10,12 +10,242 @@ bin/mico-shld
 bin/micod
 bin/nsadmin
 bin/nsd
+doc/mico/examples/MakeVars
+doc/mico/examples/README
+doc/mico/examples/account/Makefile
+doc/mico/examples/account/account.idl
+doc/mico/examples/account/main.cc
+doc/mico/examples/account2/Makefile
+doc/mico/examples/account2/account
+doc/mico/examples/account2/account.idl
+doc/mico/examples/account2/client.cc
+doc/mico/examples/account2/server.cc
+doc/mico/examples/account3/Makefile
+doc/mico/examples/account3/account
+doc/mico/examples/account3/account.idl
+doc/mico/examples/account3/client.cc
+doc/mico/examples/account3/server.cc
+doc/mico/examples/account4/Makefile
+doc/mico/examples/account4/account
+doc/mico/examples/account4/account.idl
+doc/mico/examples/account4/client.cc
+doc/mico/examples/account4/server.cc
+doc/mico/examples/activate/Makefile
+doc/mico/examples/activate/client.cc
+doc/mico/examples/activate/hello-permethod
+doc/mico/examples/activate/hello-shared
+doc/mico/examples/activate/hello-unshared
+doc/mico/examples/activate/hello.idl
+doc/mico/examples/activate/server.cc
+doc/mico/examples/bench/Makefile
+doc/mico/examples/bench/bench
+doc/mico/examples/bench/bench.idl
+doc/mico/examples/bench/bench_impl.h
+doc/mico/examples/bench/client.cc
+doc/mico/examples/bench/server.cc
+doc/mico/examples/codesets/Makefile
+doc/mico/examples/codesets/client.cc
+doc/mico/examples/codesets/hello.idl
+doc/mico/examples/codesets/runit
+doc/mico/examples/codesets/server.cc
+doc/mico/examples/corba-c/Makefile
+doc/mico/examples/corba-c/client.c
+doc/mico/examples/corba-c/hello
+doc/mico/examples/corba-c/hello.idl
+doc/mico/examples/corba-c/server.c
+doc/mico/examples/dynany/Makefile
+doc/mico/examples/dynany/dynany.cc
+doc/mico/examples/dynany/dynanytest.cc
+doc/mico/examples/dynany/test.idl
+doc/mico/examples/events/Makefile
+doc/mico/examples/events/client.cc
+doc/mico/examples/events/client2.cc
+doc/mico/examples/events/runit
+doc/mico/examples/events/server.cc
+doc/mico/examples/events/server2.cc
+doc/mico/examples/events/server3.cc
+doc/mico/examples/gtkmico/Makefile
+doc/mico/examples/gtkmico/README
+doc/mico/examples/gtkmico/client.cc
+doc/mico/examples/gtkmico/gtkhello
+doc/mico/examples/gtkmico/hello.idl
+doc/mico/examples/gtkmico/server.cc
+doc/mico/examples/interceptor/Makefile
+doc/mico/examples/interceptor/client.cc
+doc/mico/examples/interceptor/hello.idl
+doc/mico/examples/interceptor/runit
+doc/mico/examples/interceptor/server.cc
+doc/mico/examples/interop/Makefile
+doc/mico/examples/interop/README
+doc/mico/examples/interop/jdk/Account.idl
+doc/mico/examples/interop/jdk/Client.java
+doc/mico/examples/interop/jdk/ClientApplet.html.in
+doc/mico/examples/interop/jdk/ClientApplet.java
+doc/mico/examples/interop/jdk/Makefile
+doc/mico/examples/interop/jdk/README
+doc/mico/examples/interop/jdk/account
+doc/mico/examples/interop/jdk/main.cc
+doc/mico/examples/interop/jdk/run_applet
+doc/mico/examples/interop/orbix/Makefile
+doc/mico/examples/interop/orbix/README
+doc/mico/examples/interop/orbix/grid.idl
+doc/mico/examples/interop/orbix/main.cc
+doc/mico/examples/interop/visibroker/Account.idl
+doc/mico/examples/interop/visibroker/Client.java
+doc/mico/examples/interop/visibroker/ClientApplet.html.in
+doc/mico/examples/interop/visibroker/ClientApplet.java
+doc/mico/examples/interop/visibroker/Makefile
+doc/mico/examples/interop/visibroker/README
+doc/mico/examples/interop/visibroker/account
+doc/mico/examples/interop/visibroker/main.cc
+doc/mico/examples/interop/visibroker/run_applet
+doc/mico/examples/naming/Makefile
+doc/mico/examples/naming/account.idl
+doc/mico/examples/naming/account_test
+doc/mico/examples/naming/client.cc
+doc/mico/examples/naming/server.cc
+doc/mico/examples/qtmico/Makefile
+doc/mico/examples/qtmico/README
+doc/mico/examples/qtmico/client.cc
+doc/mico/examples/qtmico/hello.idl
+doc/mico/examples/qtmico/qthello1
+doc/mico/examples/qtmico/qthello2
+doc/mico/examples/qtmico/server.cc
+doc/mico/examples/redlich/Calc-1/Makefile
+doc/mico/examples/redlich/Calc-1/calc.idl
+doc/mico/examples/redlich/Calc-1/client.cc
+doc/mico/examples/redlich/Calc-1/server.cc
+doc/mico/examples/redlich/Calc-2/Makefile
+doc/mico/examples/redlich/Calc-2/calc.idl
+doc/mico/examples/redlich/Calc-2/client.cc
+doc/mico/examples/redlich/Calc-2/server.cc
+doc/mico/examples/redlich/Calc-3/Makefile
+doc/mico/examples/redlich/Calc-3/calc.idl
+doc/mico/examples/redlich/Calc-3/client.cc
+doc/mico/examples/redlich/Calc-3/server.cc
+doc/mico/examples/redlich/Calc-4/Makefile
+doc/mico/examples/redlich/Calc-4/calc.idl
+doc/mico/examples/redlich/Calc-4/client.cc
+doc/mico/examples/redlich/Calc-4/server.cc
+doc/mico/examples/redlich/Hello-1/Makefile
+doc/mico/examples/redlich/Hello-1/client.cc
+doc/mico/examples/redlich/Hello-1/server.cc
+doc/mico/examples/redlich/Hello-1/tty.idl
+doc/mico/examples/redlich/Hello-2/Makefile
+doc/mico/examples/redlich/Hello-2/client.cc
+doc/mico/examples/redlich/Hello-2/server.cc
+doc/mico/examples/redlich/Hello-2/tty.idl
+doc/mico/examples/redlich/Hello-3/Makefile
+doc/mico/examples/redlich/Hello-3/client.cc
+doc/mico/examples/redlich/Hello-3/server.cc
+doc/mico/examples/redlich/Hello-3/tty.idl
+doc/mico/examples/redlich/Hello-3/ttyplus.idl
+doc/mico/examples/redlich/Hello-4/Makefile
+doc/mico/examples/redlich/Hello-4/client.cc
+doc/mico/examples/redlich/Hello-4/server.cc
+doc/mico/examples/redlich/Hello-4/tty.idl
+doc/mico/examples/redlich/Hello-4/ttyplus.idl
+doc/mico/examples/redlich/Makefile
+doc/mico/examples/redlich/README
+doc/mico/examples/relship/Bank.idl
+doc/mico/examples/relship/BankServer.cc
+doc/mico/examples/relship/Bank_impl.cc
+doc/mico/examples/relship/Bank_impl.h
+doc/mico/examples/relship/ContainedInRoleServer.cc
+doc/mico/examples/relship/Containment.idl
+doc/mico/examples/relship/ContainmentServer.cc
+doc/mico/examples/relship/Containment_impl.cc
+doc/mico/examples/relship/Containment_impl.h
+doc/mico/examples/relship/ContainsRoleServer.cc
+doc/mico/examples/relship/Documents.idl
+doc/mico/examples/relship/Documents_impl.cc
+doc/mico/examples/relship/Documents_impl.h
+doc/mico/examples/relship/EmployeeRoleServer.cc
+doc/mico/examples/relship/EmployerRoleServer.cc
+doc/mico/examples/relship/Employment.idl
+doc/mico/examples/relship/EmploymentServer.cc
+doc/mico/examples/relship/Employment_impl.cc
+doc/mico/examples/relship/Employment_impl.h
+doc/mico/examples/relship/FigureServer.cc
+doc/mico/examples/relship/InterfaceDefsHelper.cc
+doc/mico/examples/relship/InterfaceDefsHelper.h
+doc/mico/examples/relship/Makefile
+doc/mico/examples/relship/NamedRoleTypesHelper.cc
+doc/mico/examples/relship/NamedRoleTypesHelper.h
+doc/mico/examples/relship/OwnedByRoleServer.cc
+doc/mico/examples/relship/OwnerRoleServer.cc
+doc/mico/examples/relship/Ownership.idl
+doc/mico/examples/relship/OwnershipServer.cc
+doc/mico/examples/relship/Ownership_impl.cc
+doc/mico/examples/relship/Ownership_impl.h
+doc/mico/examples/relship/Person.idl
+doc/mico/examples/relship/PersonServer.cc
+doc/mico/examples/relship/Person_impl.cc
+doc/mico/examples/relship/Person_impl.h
+doc/mico/examples/relship/Reference.idl
+doc/mico/examples/relship/ReferenceServer.cc
+doc/mico/examples/relship/Reference_impl.cc
+doc/mico/examples/relship/Reference_impl.h
+doc/mico/examples/relship/ReferencedByRoleServer.cc
+doc/mico/examples/relship/ReferencesRoleServer.cc
+doc/mico/examples/relship/RelationshipFactoryServer.cc
+doc/mico/examples/relship/RelationshipIteratorServer.cc
+doc/mico/examples/relship/RoleFactoryServer.cc
+doc/mico/examples/relship/TextServer.cc
+doc/mico/examples/relship/interactive
+doc/mico/examples/relship/interactive-client.cc
+doc/mico/examples/relship/simple
+doc/mico/examples/relship/simple-client.cc
+doc/mico/examples/relship/start-servers
+doc/mico/examples/relship/stop-servers
+doc/mico/examples/relship/test
+doc/mico/examples/relship/test-client.cc
+doc/mico/examples/shlib/Makefile
+doc/mico/examples/shlib/client.cc
+doc/mico/examples/shlib/hello
+doc/mico/examples/shlib/hello.idl
+doc/mico/examples/shlib/server.cc
+doc/mico/examples/siegel/README
+doc/mico/examples/siegel/diffs
+doc/mico/examples/ssl/Makefile
+doc/mico/examples/ssl/cert.pem
+doc/mico/examples/ssl/client.cc
+doc/mico/examples/ssl/hello.idl
+doc/mico/examples/ssl/key.pem
+doc/mico/examples/ssl/server.cc
+doc/mico/examples/ssl/ssl
+doc/mico/examples/stream-bench/Makefile
+doc/mico/examples/stream-bench/bench
+doc/mico/examples/stream-bench/req.idl
+doc/mico/examples/stream-bench/req_client.cc
+doc/mico/examples/stream-bench/req_server.cc
+doc/mico/examples/stream-bench/stream_client.cc
+doc/mico/examples/stream-bench/stream_server.cc
+doc/mico/examples/stream-sound/Makefile
+doc/mico/examples/stream-sound/client.cc
+doc/mico/examples/stream-sound/server.cc
+doc/mico/examples/x11/Makefile
+doc/mico/examples/x11/client.cc
+doc/mico/examples/x11/hello.idl
+doc/mico/examples/x11/server.cc
+doc/mico/examples/x11/xhello
+doc/mico/manual.ps
 include/CORBA-c.h
 include/CORBA.h
 include/mico/CosEventChannelAdmin.h
 include/mico/CosEventChannelAdmin.idl
 include/mico/CosEventComm.h
 include/mico/CosEventComm.idl
+include/mico/CosObjectIdentity.h
+include/mico/CosObjectIdentity.idl
+include/mico/CosRelationships.h
+include/mico/CosRelationships.idl
+include/mico/IdentifiableObject_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/address.h
 include/mico/address_impl.h
 include/mico/any.h
@@ -26,10 +256,14 @@ include/mico/basic_seq.h
 include/mico/boa.h
 include/mico/boa_impl.h
 include/mico/buffer.h
+include/mico/code_set_registry.h
 include/mico/codec.h
 include/mico/codec_impl.h
+include/mico/codeset.h
+include/mico/codeset_impl.h
 include/mico/config.h
 include/mico/config.h.in
+include/mico/conv_frame.idl
 include/mico/dii.h
 include/mico/dispatch.h
 include/mico/dsi.h
@@ -68,6 +302,7 @@ include/mico/sequence.h
 include/mico/shlib.h
 include/mico/shlib_impl.h
 include/mico/ssl.h
+include/mico/static.h
 include/mico/stream.h
 include/mico/stream.idl
 include/mico/stream_impl.h
@@ -102,14 +337,57 @@ include/ministl/set.h
 include/ministl/string
 include/ministl/vector
 include/ministl/vector.h
-lib/libmico2.0.6.a
-lib/libmico2.0.6.so.1.0
-lib/libmicoaux2.0.6.a
-lib/libmicocoss2.0.6.a
-lib/libmicox2.0.6.a
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libmico2.1.0.a
+lib/libmicoaux2.1.0.a
+lib/libmicocoss2.1.0.a
+lib/libmicogtk2.1.0.a
+lib/libmicoqt2.1.0.a
+lib/libmicotcl2.1.0.a
+lib/libmicox2.1.0.a
 lib/mico-setup.csh
 lib/mico-setup.sh
-@dirrm include/mico
+man/man1/idl.1.gz
+man/man1/imr.1.gz
+man/man1/nsadmin.1.gz
+man/man5/micorc.5.gz
+man/man8/ird.8.gz
+man/man8/micod.8.gz
+man/man8/nsd.8.gz
 @dirrm include/ministl
+@dirrm include/mico
+@dirrm doc/mico/examples/x11
+@dirrm doc/mico/examples/stream-sound
+@dirrm doc/mico/examples/stream-bench
+@dirrm doc/mico/examples/ssl
+@dirrm doc/mico/examples/siegel
+@dirrm doc/mico/examples/shlib
+@dirrm doc/mico/examples/relship
+@dirrm doc/mico/examples/redlich/Hello-4
+@dirrm doc/mico/examples/redlich/Hello-3
+@dirrm doc/mico/examples/redlich/Hello-2
+@dirrm doc/mico/examples/redlich/Hello-1
+@dirrm doc/mico/examples/redlich/Calc-4
+@dirrm doc/mico/examples/redlich/Calc-3
+@dirrm doc/mico/examples/redlich/Calc-2
+@dirrm doc/mico/examples/redlich/Calc-1
+@dirrm doc/mico/examples/redlich
+@dirrm doc/mico/examples/qtmico
+@dirrm doc/mico/examples/naming
+@dirrm doc/mico/examples/interop/visibroker
+@dirrm doc/mico/examples/interop/orbix
+@dirrm doc/mico/examples/interop/jdk
+@dirrm doc/mico/examples/interop
+@dirrm doc/mico/examples/interceptor
+@dirrm doc/mico/examples/gtkmico
+@dirrm doc/mico/examples/events
+@dirrm doc/mico/examples/dynany
+@dirrm doc/mico/examples/corba-c
+@dirrm doc/mico/examples/codesets
+@dirrm doc/mico/examples/bench
+@dirrm doc/mico/examples/activate
+@dirrm doc/mico/examples/account4
+@dirrm doc/mico/examples/account3
+@dirrm doc/mico/examples/account2
+@dirrm doc/mico/examples/account
+@dirrm doc/mico/examples
+@dirrm doc/mico