Update to 2.8.0, based on work done by xtraeme@:

ORBit2-2.8.0
	* bug fixes
		+ sequence_concat helper (Frank)
		+ corbaloc fixes (Frank)

ORBit2-2.7.6
	* bug fixes
		+ try_connection deadlock (Michael, Padraig O'Briain)
		+ shutdown_orb fd leak (Michael, Morten Welinder)
		+ don't export libIDL strangely (Michael, Morten)
	* featurelets
		+ define file specific foo in idlcompile (James H)


ORBit2-2.7.5
	* bug fixes
		+ cmdline option parsing (Michael)
		+ idl-compiler stderr fixes (Dan Winship)
		+ object key hashing fix (Frank Rehberger)
		+ ~always enable thread-safety (Michael)
		+ parallel build fixes (Michael)
		+ _is_a fixes for in-proc + transient poa (Michael)
	* featurelets
		+ RootPOA/POACurrent set guards (Frank)
		+ corbaloc support (Frank)
		+ more regression tests (Michael, Frank)

ORBit2-2.7.3
	* bug fixes
		+ vicious union discriminator issue (Brian Cameron)
		+ non_existent / try_connection fix (Michael)
		+ 'broken' emission at idle (Michael, George Lebl)
		+ DynAnyFactory registration (Michael)
		+ no longer explicitely "entering a wold of pain"
		+ ORBit_sequence fixes (Frank Rehberger)
		+ linc source fix (Padraig O'Briain)
		+ gthread linkage fix (Michael)
		+ struct/union leakage on exceptions (Frank)
	* featurelets
		+ improved regression tests (Michael, Frank, Bowie Owens)
		+ lots of documentation improvements (Gustavo Carneiro)
		+ -ORBInitRef, -ORBNamingIOR (Frank)

ORBit2-2.7.2
	* bug fixes
		+ fixed docs build (Gustavo Varneiro)
		+ thread pool fix (Alex)
		+ build fixes (Waschk, oGalaxy, Michael)
	* features (Michael)
		+ vastly improved thread safety (& Alex)
		+ improved regression tests
		+ much improved ABI
		+ implemented POA thread policies
		+ client side re-enterancy guard policies
		+ internalized linc as 'linc2/link'
		+ in-proc cross-thread invocation
		+ poa copying API

ORBit2-2.7.1
	* bug fixes
		+ tail align fix (Herbert Valerio Riedel)
		+ request ID fix (Herbert)
		+ thread hint fix (Gustavo Carneiro)
		+ build fixes (Richard Kinder)
		+ packed type marshal fix (Michael Haubenwallner)
		+ purifing mode fixes (Michael)
		+ use g_get_tmp_dir (Michael)
	* features
		+ much improved thread safey (Michael)
		+ improved tests (Michael)
		+ locate request impl. (Herbert)
		+ GIOP cleans (Herbert)
		+ configurable init msg limit (Michael)
		+ cygwin support (Masahiro Sakai)
		+ code cleans (Richard Kinder)

4 files changed, 67 insertions, 42 deletions

diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 07a0096c11c..c13607be88d 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,26 +1,34 @@
-# $NetBSD: Makefile,v 1.21 2003/12/04 17:08:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.22 2003/12/14 19:43:50 jmmv Exp $
 #
 
-DISTNAME=		ORBit2-2.6.0
-PKGREVISION=		5
+DISTNAME=		ORBit2-2.8.2
 CATEGORIES=		net gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ORBit2/2.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ORBit2/2.8/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://orbit-resource.sourceforge.net/
 COMMENT=		High-performance CORBA ORB with C language support
 
+CONFLICTS=		linc>=1.1
+
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
 PKGCONFIG_OVERRIDE=	${WRKSRC}/ORBit-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/ORBit-CosNaming-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/ORBit-imodule-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/src/idl-compiler/ORBit-idl-2.0.pc.in
 
-.include "../../net/linc/buildlink2.mk"
-.include "../../net/libIDL/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
+.include "../../net/libIDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ORBit2/PLIST b/net/ORBit2/PLIST
index e1d2e013cc2..78135e5c203 100644
--- a/net/ORBit2/PLIST
+++ b/net/ORBit2/PLIST
@@ -1,19 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/04 23:46:49 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/14 19:43:50 jmmv Exp $
 bin/ior-decode-2
+bin/linc-cleanup-sockets
 bin/orbit-idl-2
 bin/orbit2-config
 bin/typelib-dump
 include/orbit-2.0/ORBitservices/CosNaming.h
 include/orbit-2.0/ORBitservices/CosNaming_impl.h
+include/orbit-2.0/ORBitservices/orbit-imodule.h
 include/orbit-2.0/orbit-idl/orbit-idl-backend.h
-include/orbit-2.0/orbit/GIOP/giop-basics.h
-include/orbit-2.0/orbit/GIOP/giop-connection.h
-include/orbit-2.0/orbit/GIOP/giop-endian.h
-include/orbit-2.0/orbit/GIOP/giop-recv-buffer.h
-include/orbit-2.0/orbit/GIOP/giop-send-buffer.h
-include/orbit-2.0/orbit/GIOP/giop-server.h
-include/orbit-2.0/orbit/GIOP/giop-types.h
-include/orbit-2.0/orbit/GIOP/giop.h
 include/orbit-2.0/orbit/dynamic/dynamic-defs.h
 include/orbit-2.0/orbit/dynamic/dynamic.h
 include/orbit-2.0/orbit/orb-core/allocators.h
@@ -60,6 +54,11 @@ lib/libORBit-2.la
 lib/libORBit-2.so
 lib/libORBit-2.so.0
 lib/libORBit-2.so.0.0
+lib/libORBit-imodule-2.a
+lib/libORBit-imodule-2.la
+lib/libORBit-imodule-2.so
+lib/libORBit-imodule-2.so.0
+lib/libORBit-imodule-2.so.0.0
 lib/libORBitCosNaming-2.a
 lib/libORBitCosNaming-2.la
 lib/libORBitCosNaming-2.so
@@ -69,21 +68,30 @@ lib/libname-server-2.a
 lib/orbit-2.0/Everything_module.a
 lib/orbit-2.0/Everything_module.la
 lib/orbit-2.0/Everything_module.so
-lib/orbit-2.0/Everything_module.so.0
-lib/orbit-2.0/Everything_module.so.0.0
 lib/pkgconfig/ORBit-2.0.pc
 lib/pkgconfig/ORBit-CosNaming-2.0.pc
 lib/pkgconfig/ORBit-idl-2.0.pc
+lib/pkgconfig/ORBit-imodule-2.0.pc
 share/aclocal/ORBit2.m4
+share/doc/html/ORBit2/ORBit2-orbit2-allocators.html
+share/doc/html/ORBit2/ORBit2-orbit2-small.html
+share/doc/html/ORBit2/ORBit2.devhelp
+share/doc/html/ORBit2/general.html
+share/doc/html/ORBit2/home.png
+share/doc/html/ORBit2/index.html
+share/doc/html/ORBit2/index.sgml
+share/doc/html/ORBit2/left.png
+share/doc/html/ORBit2/right.png
+share/doc/html/ORBit2/up.png
 share/idl/orbit-2.0/CosNaming.idl
 @dirrm share/idl/orbit-2.0
 @unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}
+@dirrm share/doc/html/ORBit2
 @dirrm lib/orbit-2.0
 @dirrm include/orbit-2.0/orbit/util
 @dirrm include/orbit-2.0/orbit/poa
 @dirrm include/orbit-2.0/orbit/orb-core
 @dirrm include/orbit-2.0/orbit/dynamic
-@dirrm include/orbit-2.0/orbit/GIOP
 @dirrm include/orbit-2.0/orbit-idl
 @dirrm include/orbit-2.0/orbit
 @dirrm include/orbit-2.0/ORBitservices
diff --git a/net/ORBit2/buildlink2.mk b/net/ORBit2/buildlink2.mk
index cca1d2f70df..e4ba4195d8d 100644
--- a/net/ORBit2/buildlink2.mk
+++ b/net/ORBit2/buildlink2.mk
@@ -1,31 +1,38 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/11/12 01:31:50 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/12/14 19:43:50 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use ORBit2.
+#
+# This file was created automatically using createbuildlink 2.8.
+#
 
 .if !defined(ORBIT2_BUILDLINK2_MK)
 ORBIT2_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		orbit2
-BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.6.0nb4
-BUILDLINK_PKGSRCDIR.orbit2?=	../../net/ORBit2
-
-EVAL_PREFIX+=				BUILDLINK_PREFIX.orbit2=orbit2
-BUILDLINK_PREFIX.orbit2_DEFAULT=	${LOCALBASE}
-
-BUILDLINK_FILES.orbit2=		include/orbit-2.0/orbit/*/*
-BUILDLINK_FILES.orbit2+=	include/orbit-2.0/orbit/*
-BUILDLINK_FILES.orbit2+=	include/orbit-2.0/ORBitservices/*
-BUILDLINK_FILES.orbit2+=	lib/libORBit-2.*
-BUILDLINK_FILES.orbit2+=	lib/libORBitCosNaming-2.*
-BUILDLINK_FILES.orbit2+=	lib/libname-server-2.*
-BUILDLINK_FILES.orbit2+=	lib/orbit-2.0/*
-BUILDLINK_FILES.orbit2+=	share/idl/orbit-2.0/CosNaming.idl
-
-.include "../../devel/pkgconfig/buildlink2.mk"
+BUILDLINK_PACKAGES+=			ORBit2
+BUILDLINK_DEPENDS.ORBit2?=		ORBit2>=2.8.2
+BUILDLINK_PKGSRCDIR.ORBit2?=		../../net/ORBit2
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.ORBit2=ORBit2
+BUILDLINK_PREFIX.ORBit2_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.ORBit2+=	include/orbit-2.0/ORBitservices/*
+BUILDLINK_FILES.ORBit2+=	include/orbit-2.0/orbit-idl/*
+BUILDLINK_FILES.ORBit2+=	include/orbit-2.0/orbit/dynamic/*
+BUILDLINK_FILES.ORBit2+=	include/orbit-2.0/orbit/orb-core/*
+BUILDLINK_FILES.ORBit2+=	include/orbit-2.0/orbit/*
+BUILDLINK_FILES.ORBit2+=	include/orbit-2.0/orbit/poa/*
+BUILDLINK_FILES.ORBit2+=	include/orbit-2.0/orbit/util/*
+BUILDLINK_FILES.ORBit2+=	lib/libORBit-2.*
+BUILDLINK_FILES.ORBit2+=	lib/libORBit-imodule-2.*
+BUILDLINK_FILES.ORBit2+=	lib/libORBitCosNaming-2.*
+BUILDLINK_FILES.ORBit2+=	lib/libname-server-2.*
+BUILDLINK_FILES.ORBit2+=	lib/orbit-2.0/Everything_module.*
+
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../net/libIDL/buildlink2.mk"
-.include "../../net/linc/buildlink2.mk"
 
-BUILDLINK_TARGETS+=	orbit2-buildlink
+BUILDLINK_TARGETS+=	ORBit2-buildlink
 
-orbit2-buildlink: _BUILDLINK_USE
+ORBit2-buildlink: _BUILDLINK_USE
 
 .endif	# ORBIT2_BUILDLINK2_MK
diff --git a/net/ORBit2/distinfo b/net/ORBit2/distinfo
index 1b7c9cb76d9..47b3b115d72 100644
--- a/net/ORBit2/distinfo
+++ b/net/ORBit2/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.11 2003/01/22 09:25:44 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2003/12/14 19:43:50 jmmv Exp $
 
-SHA1 (ORBit2-2.6.0.tar.bz2) = 0d68b90e860bbf855ff5c9b347865860ca678838
-Size (ORBit2-2.6.0.tar.bz2) = 432522 bytes
+SHA1 (ORBit2-2.8.2.tar.bz2) = 71802214c4c61002a6e6c2a0d8c9a8b2452b0c36
+Size (ORBit2-2.8.2.tar.bz2) = 619464 bytes
+SHA1 (patch-aa) = 1269f4adf5e8c8b1ca8da68a40e6f35643681417
+SHA1 (patch-ab) = e548ddb3464efca3554480498306a6f39bf2f236