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)

1 files changed, 14 insertions, 6 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"