Update to 0.5.10.

26 files changed, 540 insertions, 212 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 00d1df496fcf..efa6740fa614 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ORBit
-PORTVERSION=	0.5.8
-PORTREVISION=	1
+PORTVERSION=	0.5.10
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ORBit
@@ -20,9 +19,8 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_GMAKE=	yes
 USE_GLIB=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFILES=	configure libIDL/configure popt/configure
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --disable-indent
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -33,5 +31,15 @@ post-install:
 	@if [ ! -f ${PREFIX}/etc/orbitrc ]; then \
 		${CP} -p ${PREFIX}/etc/orbitrc.default ${PREFIX}/etc/orbitrc ; \
 	fi
+.for dir in IIOP ORBitservices ORBitutil orb orbit-idl2.h
+	@if [ -L ${PREFIX}/include/${dir} ]; then \
+		${RM} -f ${PREFIX}/include/${dir}; \
+	fi
+	@${LN} -sf ${PREFIX}/include/orbit-1.0/${dir} ${PREFIX}/include/${dir}
+.endfor
+	@if [ -L ${PREFIX}/include/libIDL ]; then \
+		${RM} -f ${PREFIX}/include/libIDL; \
+	fi
+	@${LN} -sf ${PREFIX}/include/libIDL-1.0/libIDL ${PREFIX}/include/libIDL
 
 .include <bsd.port.mk>
diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo
index ab34ceeca4f8..18d662a9dfe2 100644
--- a/devel/ORBit/distinfo
+++ b/devel/ORBit/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.5.8.tar.gz) = 602b23db8666274caf6cf87b7857d4a3
+MD5 (ORBit-0.5.10.tar.gz) = 84e818d9f6fa4f389b9ea82aa00e8f6c
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index 62c710cfd460..3f1db0c1be83 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -20,18 +20,6 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
  CONFIG_CLEAN_FILES = 
---- src/orb/Makefile.in.orig	Tue Jan 30 14:56:07 2001
-+++ src/orb/Makefile.in	Thu Mar  8 11:16:44 2001
-@@ -113,3 +113,3 @@
- 
--libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBit_la_LDFLAGS = -version-info 2:0:0
- libORBit_la_LIBADD = $(GLIB_LIBS) -lm
-@@ -121,3 +121,3 @@
- 
--CFLAGS = -g -O0
-+CFLAGS = @CFLAGS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- src/services/name/Makefile.in.orig	Thu Oct 12 11:07:08 2000
 +++ src/services/name/Makefile.in	Thu Oct 12 13:11:55 2000
 @@ -109,3 +109,3 @@
diff --git a/devel/ORBit/files/patch-ad b/devel/ORBit/files/patch-ad
index 3c04c50923e9..67fb863369c4 100644
--- a/devel/ORBit/files/patch-ad
+++ b/devel/ORBit/files/patch-ad
@@ -1,5 +1,8 @@
---- orbit-config.in.orig	Thu Oct  7 23:49:07 1999
-+++ orbit-config.in	Tue Feb 22 18:20:47 2000
+
+$FreeBSD$
+
+--- orbit-config.in.orig	Wed Sep 19 20:09:00 2001
++++ orbit-config.in	Wed Oct  3 14:51:10 2001
 @@ -28,8 +28,8 @@
  
  Known values for TARGET are:
@@ -16,24 +19,9 @@
  
      client|server)
 -	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
--	the_flags="$the_flags `glib-config --cflags` -I$includedir "
-+	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `@GLIB_CONFIG@ --libs` @LIBS@ -lm"
-+	the_flags="$the_flags `@GLIB_CONFIG@ --cflags` -I$includedir "
+-        the_flags="$the_flags `glib-config --cflags` "
++	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `@GLIB_CONFIG@ --libs` @LIBS@ @LIB_WRAP@ -lm"
++        the_flags="$the_flags `@GLIB_CONFIG@ --cflags` "
+         test "x$includedir" = "x/usr/include" \
+           || the_flags="$the_flags -I$includedir "
  	;;
- 
-    --use-service=*)
---- libIDL/libIDL-config.in.orig	Fri Apr 16 09:52:20 1999
-+++ libIDL/libIDL-config.in	Wed Oct 13 20:49:40 1999
-@@ -74,10 +74,10 @@
- 	echo $exec_prefix
- fi
- if test "$echo_cflags" = "yes"; then
--	all_flags="$all_flags $includes $cflags `glib-config --cflags`"
-+	all_flags="$all_flags $includes $cflags `@GLIB_CONFIG@ --cflags`"
- fi
- if test "$echo_libs" = "yes"; then
--	all_flags="$all_flags -L@libdir@ -lIDL `glib-config --libs`"
-+	all_flags="$all_flags -L@libdir@ -lIDL `@GLIB_CONFIG@ --libs`"
- fi
- 
- # Straight out any possible duplicates, but be careful to
diff --git a/devel/ORBit/files/patch-libIDL::ltmain.sh b/devel/ORBit/files/patch-libIDL::ltmain.sh
new file mode 100644
index 000000000000..0d35f77b6fb7
--- /dev/null
+++ b/devel/ORBit/files/patch-libIDL::ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- libIDL/ltmain.sh.orig	Wed Oct  3 10:03:39 2001
++++ libIDL/ltmain.sh	Wed Oct  3 15:05:20 2001
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/ORBit/files/patch-ltmain.sh b/devel/ORBit/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/devel/ORBit/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/ORBit/files/patch-popt::ltmain.sh b/devel/ORBit/files/patch-popt::ltmain.sh
new file mode 100644
index 000000000000..ea7d5ba5ef7b
--- /dev/null
+++ b/devel/ORBit/files/patch-popt::ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- popt/ltmain.sh.orig	Wed Oct  3 10:03:41 2001
++++ popt/ltmain.sh	Wed Oct  3 15:01:07 2001
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/ORBit/files/patch-src::IIOP::connection.c b/devel/ORBit/files/patch-src::IIOP::connection.c
new file mode 100644
index 000000000000..c817c169b116
--- /dev/null
+++ b/devel/ORBit/files/patch-src::IIOP::connection.c
@@ -0,0 +1,65 @@
+$NetBSD: patch-ag,v 1.6 2001/05/21 19:59:04 rh Exp $
+
+--- src/IIOP/connection.c.orig	Sun May 13 09:07:46 2001
++++ src/IIOP/connection.c
+@@ -1,4 +1,7 @@
+ #include "config.h"
++#include <sys/types.h>
++#include <sys/param.h>
++#include <stdio.h>
+ #if defined (__hpux) && ! defined (_XOPEN_SOURCE_EXTENDED)
+ #   define _XOPEN_SOURCE_EXTENDED 1
+ #   define WE_DEFINED_XOPEN_SOURCE_EXTENDED 1
+@@ -13,7 +16,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <sys/types.h>
+ #include <fcntl.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+@@ -32,7 +34,7 @@
+ #include <signal.h>
+ #include <syslog.h>
+ 
+-#if defined(HAVE_TCPD_H) && defined(HAVE_HOSTS_ACCESS)
++#if defined(HAVE_TCPD_H)
+ #include <tcpd.h>
+ #endif
+ 
+@@ -80,7 +82,7 @@
+ GIOPConnectionList giop_connection_list;
+ static GSList *iiop_unix_socket_list = NULL;
+ 
+-#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H)
++#if defined (HAVE_TCPD_H)
+ static const char *argv0_val = NULL;
+ #endif
+ 
+@@ -104,7 +106,7 @@
+   struct sigaction mypipe;
+   g_assert(sizeof(GIOPMessageHeader) == 12);
+ 
+-#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H)
++#if defined (HAVE_TCPD_H)
+   argv0_val = g_strdup(g_basename(argv0)); /* For TCP wrappers */
+ #endif
+ 
+@@ -1007,7 +1009,7 @@
+  */
+ int allow_severity = LOG_INFO, deny_severity = LOG_NOTICE;
+ 
+-#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H)
++#if defined(HAVE_TCPD_H)
+ DEFINE_LOCK(tcp_wrappers_usage);
+ 
+ #endif
+@@ -1033,7 +1035,7 @@
+ 
+   newfd = accept(GIOP_CONNECTION_GET_FD(connection), &sock, &n);
+ 
+-#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H)
++#if defined(HAVE_TCPD_H)
+   /* tcp wrappers access checking */
+   switch(IIOP_CONNECTION(connection)->icnxtype) {
+   case IIOP_IPV4:
diff --git a/devel/ORBit/files/patch-src::daemons::interface_repository::Makefile.in b/devel/ORBit/files/patch-src::daemons::interface_repository::Makefile.in
new file mode 100644
index 000000000000..2ec5230f1504
--- /dev/null
+++ b/devel/ORBit/files/patch-src::daemons::interface_repository::Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.5 2000/10/17 23:48:01 jlam Exp $
+
+--- src/daemons/interface_repository/Makefile.in.orig	Thu Oct 12 12:07:12 2000
++++ src/daemons/interface_repository/Makefile.in
+@@ -102,7 +102,7 @@
+ 
+ 
+ orbit_ird_LDFLAGS = -static
+-orbit_ird_LDADD =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@ 	-lm
++orbit_ird_LDADD =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@ 	-lm @LIB_WRAP@
+ 
+ 
+ orbit_ird_SOURCES =  	interface_repository-skels.c 	interface_repository-impl.c
diff --git a/devel/ORBit/files/patch-src::orb::Makefile.in b/devel/ORBit/files/patch-src::orb::Makefile.in
new file mode 100644
index 000000000000..03b978704fbd
--- /dev/null
+++ b/devel/ORBit/files/patch-src::orb::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/orb/Makefile.in.orig	Wed Oct  3 10:21:01 2001
++++ src/orb/Makefile.in	Wed Oct  3 14:43:17 2001
+@@ -115,7 +115,7 @@
+ IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
+ IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
+ 
+-libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libORBit_la_LDFLAGS = -version-info 2:0:0
+ libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+ 
+ BUILT_SOURCES =  	orbit.h		interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
diff --git a/devel/ORBit/files/patch-src::services::event::Makefile.in b/devel/ORBit/files/patch-src::services::event::Makefile.in
new file mode 100644
index 000000000000..c29eee588ca7
--- /dev/null
+++ b/devel/ORBit/files/patch-src::services::event::Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.3 2000/10/17 23:48:01 jlam Exp $
+
+--- src/services/event/Makefile.in.orig	Thu Oct 12 12:07:09 2000
++++ src/services/event/Makefile.in
+@@ -115,7 +115,7 @@
+ DEPS = $(top_builddir)/src/orb/libORBit.la					$(top_builddir)/src/ORBitutil/libORBitutil.la				$(top_builddir)/src/IIOP/libIIOP.la
+ 
+ 
+-LDADDS =  	$(top_builddir)/src/orb/libORBit.la					$(top_builddir)/src/IIOP/libIIOP.la					$(top_builddir)/src/ORBitutil/libORBitutil.la				@GLIB_LIBS@ 								-lm
++LDADDS =  	$(top_builddir)/src/orb/libORBit.la					$(top_builddir)/src/IIOP/libIIOP.la					$(top_builddir)/src/ORBitutil/libORBitutil.la				@GLIB_LIBS@ 								-lm @LIB_WRAP@
+ 
+ 
+ event_consumer_SOURCES = event-consumer.c					CosEventComm-skels.c	 						CosEventChannel-common.c 						CosEventChannel-stubs.c
diff --git a/devel/ORBit/files/patch-src::services::name::Makefile.in b/devel/ORBit/files/patch-src::services::name::Makefile.in
new file mode 100644
index 000000000000..2a2a3ff5169f
--- /dev/null
+++ b/devel/ORBit/files/patch-src::services::name::Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.8 2000/10/17 23:48:01 jlam Exp $
+
+--- src/services/name/Makefile.in.orig	Thu Oct 12 12:07:08 2000
++++ src/services/name/Makefile.in
+@@ -123,7 +123,7 @@
+ DEPS = $(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 			$(top_builddir)/src/IIOP/libIIOP.la				libORBitCosNaming.la
+ 
+ 
+-LDADDS =  	$(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/IIOP/libIIOP.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 			libORBitCosNaming.la						@GLIB_LIBS@ 							-lm
++LDADDS =  	$(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/IIOP/libIIOP.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 			libORBitCosNaming.la						@GLIB_LIBS@ 							-lm @LIB_WRAP@
+ 
+ 
+ #name-client.c boot.c orbit-name-server.c new-name-server.c: CosNaming.h
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index 1b03b0a0507e..54f1b173b491 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -10,68 +10,74 @@ etc/libIDLConf.sh
 @unexec if cmp -s %D/etc/orbitrc.default %D/etc/orbitrc; then rm -f %D/etc/orbitrc; fi
 etc/orbitrc.default
 @exec if [ ! -f %D/etc/orbitrc ] ; then cp -p %D/%F %B/orbitrc; fi
-include/IIOP/IIOP-config.h
-include/IIOP/IIOP-types.h
-include/IIOP/IIOP.h
-include/IIOP/giop-msg-buffer.h
-include/IIOP/iiop-encoders.h
-include/IIOP/iiop-endian.h
-include/ORBitservices/CosEventChannel.idl
-include/ORBitservices/CosEventComm.idl
-include/ORBitservices/CosNaming.h
-include/ORBitservices/CosNaming.idl
-include/ORBitservices/CosNaming_impl.h
-include/ORBitservices/CosTypedEventChannel.idl
-include/ORBitservices/CosTypedEventComm.idl
-include/ORBitservices/LName.pidl
-include/ORBitutil/basic_types.h
-include/ORBitutil/compat.h
-include/ORBitutil/orbit-os-config.h
-include/ORBitutil/os-feature-alloca.h
-include/ORBitutil/os-specifics.h
-include/ORBitutil/thread-safety.h
-include/ORBitutil/trace.h
-include/ORBitutil/util.h
-include/libIDL/IDL.h
-include/orb/allocator-defs.h
-include/orb/allocators.h
-include/orb/cdr.h
-include/orb/corba_any.h
-include/orb/corba_any_proto.h
-include/orb/corba_any_type.h
-include/orb/corba_basic_sequences_type.h
-include/orb/corba_context.h
-include/orb/corba_env.h
-include/orb/corba_env_type.h
-include/orb/corba_object.h
-include/orb/corba_object_type.h
-include/orb/corba_orb.h
-include/orb/corba_orb_type.h
-include/orb/corba_portableserver.h
-include/orb/corba_portableserver_type.h
-include/orb/corba_sequences.h
-include/orb/corba_sequences_type.h
-include/orb/corba_typecode.h
-include/orb/corba_typecode_type.h
-include/orb/dii.h
-include/orb/dynany.h
-include/orb/env.h
-include/orb/interface_repository.h
-include/orb/iop.h
-include/orb/ir.h
-include/orb/options.h
-include/orb/orb.h
-include/orb/orbit.h
-include/orb/orbit_config.h
-include/orb/orbit_object.h
-include/orb/orbit_object_type.h
-include/orb/orbit_poa.h
-include/orb/orbit_poa_type.h
-include/orb/orbit_typecode.h
-include/orb/orbit_types.h
-include/orb/poa.h
-include/orb/sequences.h
-include/orb/typecode.h
+include/IIOP
+include/ORBitservices
+include/ORBitutil
+include/libIDL
+include/libIDL-1.0/libIDL/IDL.h
+include/orb
+include/orbit-1.0/IIOP/IIOP-config.h
+include/orbit-1.0/IIOP/IIOP-types.h
+include/orbit-1.0/IIOP/IIOP.h
+include/orbit-1.0/IIOP/giop-msg-buffer.h
+include/orbit-1.0/IIOP/iiop-encoders.h
+include/orbit-1.0/IIOP/iiop-endian.h
+include/orbit-1.0/ORBitservices/CosEventChannel.idl
+include/orbit-1.0/ORBitservices/CosEventComm.idl
+include/orbit-1.0/ORBitservices/CosNaming.h
+include/orbit-1.0/ORBitservices/CosNaming.idl
+include/orbit-1.0/ORBitservices/CosNaming_impl.h
+include/orbit-1.0/ORBitservices/CosTypedEventChannel.idl
+include/orbit-1.0/ORBitservices/CosTypedEventComm.idl
+include/orbit-1.0/ORBitservices/LName.pidl
+include/orbit-1.0/ORBitutil/basic_types.h
+include/orbit-1.0/ORBitutil/compat.h
+include/orbit-1.0/ORBitutil/orbit-os-config.h
+include/orbit-1.0/ORBitutil/os-feature-alloca.h
+include/orbit-1.0/ORBitutil/os-specifics.h
+include/orbit-1.0/ORBitutil/thread-safety.h
+include/orbit-1.0/ORBitutil/trace.h
+include/orbit-1.0/ORBitutil/util.h
+include/orbit-1.0/orb/allocator-defs.h
+include/orbit-1.0/orb/allocators.h
+include/orbit-1.0/orb/cdr.h
+include/orbit-1.0/orb/corba_any.h
+include/orbit-1.0/orb/corba_any_proto.h
+include/orbit-1.0/orb/corba_any_type.h
+include/orbit-1.0/orb/corba_basic_sequences_type.h
+include/orbit-1.0/orb/corba_context.h
+include/orbit-1.0/orb/corba_env.h
+include/orbit-1.0/orb/corba_env_type.h
+include/orbit-1.0/orb/corba_object.h
+include/orbit-1.0/orb/corba_object_type.h
+include/orbit-1.0/orb/corba_orb.h
+include/orbit-1.0/orb/corba_orb_type.h
+include/orbit-1.0/orb/corba_portableserver.h
+include/orbit-1.0/orb/corba_portableserver_type.h
+include/orbit-1.0/orb/corba_sequences.h
+include/orbit-1.0/orb/corba_sequences_type.h
+include/orbit-1.0/orb/corba_typecode.h
+include/orbit-1.0/orb/corba_typecode_type.h
+include/orbit-1.0/orb/dii.h
+include/orbit-1.0/orb/dynany.h
+include/orbit-1.0/orb/env.h
+include/orbit-1.0/orb/interface_repository.h
+include/orbit-1.0/orb/iop.h
+include/orbit-1.0/orb/ir.h
+include/orbit-1.0/orb/options.h
+include/orbit-1.0/orb/orb.h
+include/orbit-1.0/orb/orbit.h
+include/orbit-1.0/orb/orbit_config.h
+include/orbit-1.0/orb/orbit_object.h
+include/orbit-1.0/orb/orbit_object_type.h
+include/orbit-1.0/orb/orbit_poa.h
+include/orbit-1.0/orb/orbit_poa_type.h
+include/orbit-1.0/orb/orbit_typecode.h
+include/orbit-1.0/orb/orbit_types.h
+include/orbit-1.0/orb/poa.h
+include/orbit-1.0/orb/sequences.h
+include/orbit-1.0/orb/typecode.h
+include/orbit-1.0/orbit-idl2.h
 include/orbit-idl2.h
 @unexec install-info --delete %D/info/libIDL.info %D/info/dir
 info/libIDL.info
@@ -97,8 +103,10 @@ libdata/pkgconfig/ORBit.pc
 libdata/pkgconfig/libIDL.pc
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
-@dirrm include/IIOP
-@dirrm include/ORBitservices
-@dirrm include/ORBitutil
-@dirrm include/libIDL
-@dirrm include/orb
+@dirrm include/orbit-1.0/orb
+@dirrm include/orbit-1.0/ORBitutil
+@dirrm include/orbit-1.0/ORBitservices
+@dirrm include/orbit-1.0/IIOP
+@dirrm include/orbit-1.0
+@dirrm include/libIDL-1.0/libIDL
+@dirrm include/libIDL-1.0
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 00d1df496fcf..efa6740fa614 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ORBit
-PORTVERSION=	0.5.8
-PORTREVISION=	1
+PORTVERSION=	0.5.10
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ORBit
@@ -20,9 +19,8 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_GMAKE=	yes
 USE_GLIB=	yes
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFILES=	configure libIDL/configure popt/configure
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --disable-indent
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -33,5 +31,15 @@ post-install:
 	@if [ ! -f ${PREFIX}/etc/orbitrc ]; then \
 		${CP} -p ${PREFIX}/etc/orbitrc.default ${PREFIX}/etc/orbitrc ; \
 	fi
+.for dir in IIOP ORBitservices ORBitutil orb orbit-idl2.h
+	@if [ -L ${PREFIX}/include/${dir} ]; then \
+		${RM} -f ${PREFIX}/include/${dir}; \
+	fi
+	@${LN} -sf ${PREFIX}/include/orbit-1.0/${dir} ${PREFIX}/include/${dir}
+.endfor
+	@if [ -L ${PREFIX}/include/libIDL ]; then \
+		${RM} -f ${PREFIX}/include/libIDL; \
+	fi
+	@${LN} -sf ${PREFIX}/include/libIDL-1.0/libIDL ${PREFIX}/include/libIDL
 
 .include <bsd.port.mk>
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index ab34ceeca4f8..18d662a9dfe2 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.5.8.tar.gz) = 602b23db8666274caf6cf87b7857d4a3
+MD5 (ORBit-0.5.10.tar.gz) = 84e818d9f6fa4f389b9ea82aa00e8f6c
diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac
index 62c710cfd460..3f1db0c1be83 100644
--- a/devel/ORBit2/files/patch-ac
+++ b/devel/ORBit2/files/patch-ac
@@ -20,18 +20,6 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
  CONFIG_CLEAN_FILES = 
---- src/orb/Makefile.in.orig	Tue Jan 30 14:56:07 2001
-+++ src/orb/Makefile.in	Thu Mar  8 11:16:44 2001
-@@ -113,3 +113,3 @@
- 
--libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBit_la_LDFLAGS = -version-info 2:0:0
- libORBit_la_LIBADD = $(GLIB_LIBS) -lm
-@@ -121,3 +121,3 @@
- 
--CFLAGS = -g -O0
-+CFLAGS = @CFLAGS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- src/services/name/Makefile.in.orig	Thu Oct 12 11:07:08 2000
 +++ src/services/name/Makefile.in	Thu Oct 12 13:11:55 2000
 @@ -109,3 +109,3 @@
diff --git a/devel/ORBit2/files/patch-ad b/devel/ORBit2/files/patch-ad
index 3c04c50923e9..67fb863369c4 100644
--- a/devel/ORBit2/files/patch-ad
+++ b/devel/ORBit2/files/patch-ad
@@ -1,5 +1,8 @@
---- orbit-config.in.orig	Thu Oct  7 23:49:07 1999
-+++ orbit-config.in	Tue Feb 22 18:20:47 2000
+
+$FreeBSD$
+
+--- orbit-config.in.orig	Wed Sep 19 20:09:00 2001
++++ orbit-config.in	Wed Oct  3 14:51:10 2001
 @@ -28,8 +28,8 @@
  
  Known values for TARGET are:
@@ -16,24 +19,9 @@
  
      client|server)
 -	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
--	the_flags="$the_flags `glib-config --cflags` -I$includedir "
-+	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `@GLIB_CONFIG@ --libs` @LIBS@ -lm"
-+	the_flags="$the_flags `@GLIB_CONFIG@ --cflags` -I$includedir "
+-        the_flags="$the_flags `glib-config --cflags` "
++	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `@GLIB_CONFIG@ --libs` @LIBS@ @LIB_WRAP@ -lm"
++        the_flags="$the_flags `@GLIB_CONFIG@ --cflags` "
+         test "x$includedir" = "x/usr/include" \
+           || the_flags="$the_flags -I$includedir "
  	;;
- 
-    --use-service=*)
---- libIDL/libIDL-config.in.orig	Fri Apr 16 09:52:20 1999
-+++ libIDL/libIDL-config.in	Wed Oct 13 20:49:40 1999
-@@ -74,10 +74,10 @@
- 	echo $exec_prefix
- fi
- if test "$echo_cflags" = "yes"; then
--	all_flags="$all_flags $includes $cflags `glib-config --cflags`"
-+	all_flags="$all_flags $includes $cflags `@GLIB_CONFIG@ --cflags`"
- fi
- if test "$echo_libs" = "yes"; then
--	all_flags="$all_flags -L@libdir@ -lIDL `glib-config --libs`"
-+	all_flags="$all_flags -L@libdir@ -lIDL `@GLIB_CONFIG@ --libs`"
- fi
- 
- # Straight out any possible duplicates, but be careful to
diff --git a/devel/ORBit2/files/patch-libIDL::ltmain.sh b/devel/ORBit2/files/patch-libIDL::ltmain.sh
new file mode 100644
index 000000000000..0d35f77b6fb7
--- /dev/null
+++ b/devel/ORBit2/files/patch-libIDL::ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- libIDL/ltmain.sh.orig	Wed Oct  3 10:03:39 2001
++++ libIDL/ltmain.sh	Wed Oct  3 15:05:20 2001
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/ORBit2/files/patch-ltmain.sh b/devel/ORBit2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/devel/ORBit2/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/ORBit2/files/patch-popt::ltmain.sh b/devel/ORBit2/files/patch-popt::ltmain.sh
new file mode 100644
index 000000000000..ea7d5ba5ef7b
--- /dev/null
+++ b/devel/ORBit2/files/patch-popt::ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- popt/ltmain.sh.orig	Wed Oct  3 10:03:41 2001
++++ popt/ltmain.sh	Wed Oct  3 15:01:07 2001
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/ORBit2/files/patch-src::IIOP::connection.c b/devel/ORBit2/files/patch-src::IIOP::connection.c
new file mode 100644
index 000000000000..c817c169b116
--- /dev/null
+++ b/devel/ORBit2/files/patch-src::IIOP::connection.c
@@ -0,0 +1,65 @@
+$NetBSD: patch-ag,v 1.6 2001/05/21 19:59:04 rh Exp $
+
+--- src/IIOP/connection.c.orig	Sun May 13 09:07:46 2001
++++ src/IIOP/connection.c
+@@ -1,4 +1,7 @@
+ #include "config.h"
++#include <sys/types.h>
++#include <sys/param.h>
++#include <stdio.h>
+ #if defined (__hpux) && ! defined (_XOPEN_SOURCE_EXTENDED)
+ #   define _XOPEN_SOURCE_EXTENDED 1
+ #   define WE_DEFINED_XOPEN_SOURCE_EXTENDED 1
+@@ -13,7 +16,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <sys/types.h>
+ #include <fcntl.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+@@ -32,7 +34,7 @@
+ #include <signal.h>
+ #include <syslog.h>
+ 
+-#if defined(HAVE_TCPD_H) && defined(HAVE_HOSTS_ACCESS)
++#if defined(HAVE_TCPD_H)
+ #include <tcpd.h>
+ #endif
+ 
+@@ -80,7 +82,7 @@
+ GIOPConnectionList giop_connection_list;
+ static GSList *iiop_unix_socket_list = NULL;
+ 
+-#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H)
++#if defined (HAVE_TCPD_H)
+ static const char *argv0_val = NULL;
+ #endif
+ 
+@@ -104,7 +106,7 @@
+   struct sigaction mypipe;
+   g_assert(sizeof(GIOPMessageHeader) == 12);
+ 
+-#if defined(HAVE_HOSTS_ACCESS) && defined (HAVE_TCPD_H)
++#if defined (HAVE_TCPD_H)
+   argv0_val = g_strdup(g_basename(argv0)); /* For TCP wrappers */
+ #endif
+ 
+@@ -1007,7 +1009,7 @@
+  */
+ int allow_severity = LOG_INFO, deny_severity = LOG_NOTICE;
+ 
+-#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H)
++#if defined(HAVE_TCPD_H)
+ DEFINE_LOCK(tcp_wrappers_usage);
+ 
+ #endif
+@@ -1033,7 +1035,7 @@
+ 
+   newfd = accept(GIOP_CONNECTION_GET_FD(connection), &sock, &n);
+ 
+-#if defined(HAVE_HOSTS_ACCESS) && defined(HAVE_TCPD_H)
++#if defined(HAVE_TCPD_H)
+   /* tcp wrappers access checking */
+   switch(IIOP_CONNECTION(connection)->icnxtype) {
+   case IIOP_IPV4:
diff --git a/devel/ORBit2/files/patch-src::daemons::interface_repository::Makefile.in b/devel/ORBit2/files/patch-src::daemons::interface_repository::Makefile.in
new file mode 100644
index 000000000000..2ec5230f1504
--- /dev/null
+++ b/devel/ORBit2/files/patch-src::daemons::interface_repository::Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.5 2000/10/17 23:48:01 jlam Exp $
+
+--- src/daemons/interface_repository/Makefile.in.orig	Thu Oct 12 12:07:12 2000
++++ src/daemons/interface_repository/Makefile.in
+@@ -102,7 +102,7 @@
+ 
+ 
+ orbit_ird_LDFLAGS = -static
+-orbit_ird_LDADD =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@ 	-lm
++orbit_ird_LDADD =  	$(top_builddir)/src/orb/libORBit.la 	$(top_builddir)/src/IIOP/libIIOP.la 	$(top_builddir)/src/ORBitutil/libORBitutil.la 	@GLIB_LIBS@ 	-lm @LIB_WRAP@
+ 
+ 
+ orbit_ird_SOURCES =  	interface_repository-skels.c 	interface_repository-impl.c
diff --git a/devel/ORBit2/files/patch-src::orb::Makefile.in b/devel/ORBit2/files/patch-src::orb::Makefile.in
new file mode 100644
index 000000000000..03b978704fbd
--- /dev/null
+++ b/devel/ORBit2/files/patch-src::orb::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/orb/Makefile.in.orig	Wed Oct  3 10:21:01 2001
++++ src/orb/Makefile.in	Wed Oct  3 14:43:17 2001
+@@ -115,7 +115,7 @@
+ IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
+ IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
+ 
+-libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libORBit_la_LDFLAGS = -version-info 2:0:0
+ libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+ 
+ BUILT_SOURCES =  	orbit.h		interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
diff --git a/devel/ORBit2/files/patch-src::services::event::Makefile.in b/devel/ORBit2/files/patch-src::services::event::Makefile.in
new file mode 100644
index 000000000000..c29eee588ca7
--- /dev/null
+++ b/devel/ORBit2/files/patch-src::services::event::Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.3 2000/10/17 23:48:01 jlam Exp $
+
+--- src/services/event/Makefile.in.orig	Thu Oct 12 12:07:09 2000
++++ src/services/event/Makefile.in
+@@ -115,7 +115,7 @@
+ DEPS = $(top_builddir)/src/orb/libORBit.la					$(top_builddir)/src/ORBitutil/libORBitutil.la				$(top_builddir)/src/IIOP/libIIOP.la
+ 
+ 
+-LDADDS =  	$(top_builddir)/src/orb/libORBit.la					$(top_builddir)/src/IIOP/libIIOP.la					$(top_builddir)/src/ORBitutil/libORBitutil.la				@GLIB_LIBS@ 								-lm
++LDADDS =  	$(top_builddir)/src/orb/libORBit.la					$(top_builddir)/src/IIOP/libIIOP.la					$(top_builddir)/src/ORBitutil/libORBitutil.la				@GLIB_LIBS@ 								-lm @LIB_WRAP@
+ 
+ 
+ event_consumer_SOURCES = event-consumer.c					CosEventComm-skels.c	 						CosEventChannel-common.c 						CosEventChannel-stubs.c
diff --git a/devel/ORBit2/files/patch-src::services::name::Makefile.in b/devel/ORBit2/files/patch-src::services::name::Makefile.in
new file mode 100644
index 000000000000..2a2a3ff5169f
--- /dev/null
+++ b/devel/ORBit2/files/patch-src::services::name::Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.8 2000/10/17 23:48:01 jlam Exp $
+
+--- src/services/name/Makefile.in.orig	Thu Oct 12 12:07:08 2000
++++ src/services/name/Makefile.in
+@@ -123,7 +123,7 @@
+ DEPS = $(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 			$(top_builddir)/src/IIOP/libIIOP.la				libORBitCosNaming.la
+ 
+ 
+-LDADDS =  	$(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/IIOP/libIIOP.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 			libORBitCosNaming.la						@GLIB_LIBS@ 							-lm
++LDADDS =  	$(top_builddir)/src/orb/libORBit.la				$(top_builddir)/src/IIOP/libIIOP.la				$(top_builddir)/src/ORBitutil/libORBitutil.la 			libORBitCosNaming.la						@GLIB_LIBS@ 							-lm @LIB_WRAP@
+ 
+ 
+ #name-client.c boot.c orbit-name-server.c new-name-server.c: CosNaming.h
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index 1b03b0a0507e..54f1b173b491 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -10,68 +10,74 @@ etc/libIDLConf.sh
 @unexec if cmp -s %D/etc/orbitrc.default %D/etc/orbitrc; then rm -f %D/etc/orbitrc; fi
 etc/orbitrc.default
 @exec if [ ! -f %D/etc/orbitrc ] ; then cp -p %D/%F %B/orbitrc; fi
-include/IIOP/IIOP-config.h
-include/IIOP/IIOP-types.h
-include/IIOP/IIOP.h
-include/IIOP/giop-msg-buffer.h
-include/IIOP/iiop-encoders.h
-include/IIOP/iiop-endian.h
-include/ORBitservices/CosEventChannel.idl
-include/ORBitservices/CosEventComm.idl
-include/ORBitservices/CosNaming.h
-include/ORBitservices/CosNaming.idl
-include/ORBitservices/CosNaming_impl.h
-include/ORBitservices/CosTypedEventChannel.idl
-include/ORBitservices/CosTypedEventComm.idl
-include/ORBitservices/LName.pidl
-include/ORBitutil/basic_types.h
-include/ORBitutil/compat.h
-include/ORBitutil/orbit-os-config.h
-include/ORBitutil/os-feature-alloca.h
-include/ORBitutil/os-specifics.h
-include/ORBitutil/thread-safety.h
-include/ORBitutil/trace.h
-include/ORBitutil/util.h
-include/libIDL/IDL.h
-include/orb/allocator-defs.h
-include/orb/allocators.h
-include/orb/cdr.h
-include/orb/corba_any.h
-include/orb/corba_any_proto.h
-include/orb/corba_any_type.h
-include/orb/corba_basic_sequences_type.h
-include/orb/corba_context.h
-include/orb/corba_env.h
-include/orb/corba_env_type.h
-include/orb/corba_object.h
-include/orb/corba_object_type.h
-include/orb/corba_orb.h
-include/orb/corba_orb_type.h
-include/orb/corba_portableserver.h
-include/orb/corba_portableserver_type.h
-include/orb/corba_sequences.h
-include/orb/corba_sequences_type.h
-include/orb/corba_typecode.h
-include/orb/corba_typecode_type.h
-include/orb/dii.h
-include/orb/dynany.h
-include/orb/env.h
-include/orb/interface_repository.h
-include/orb/iop.h
-include/orb/ir.h
-include/orb/options.h
-include/orb/orb.h
-include/orb/orbit.h
-include/orb/orbit_config.h
-include/orb/orbit_object.h
-include/orb/orbit_object_type.h
-include/orb/orbit_poa.h
-include/orb/orbit_poa_type.h
-include/orb/orbit_typecode.h
-include/orb/orbit_types.h
-include/orb/poa.h
-include/orb/sequences.h
-include/orb/typecode.h
+include/IIOP
+include/ORBitservices
+include/ORBitutil
+include/libIDL
+include/libIDL-1.0/libIDL/IDL.h
+include/orb
+include/orbit-1.0/IIOP/IIOP-config.h
+include/orbit-1.0/IIOP/IIOP-types.h
+include/orbit-1.0/IIOP/IIOP.h
+include/orbit-1.0/IIOP/giop-msg-buffer.h
+include/orbit-1.0/IIOP/iiop-encoders.h
+include/orbit-1.0/IIOP/iiop-endian.h
+include/orbit-1.0/ORBitservices/CosEventChannel.idl
+include/orbit-1.0/ORBitservices/CosEventComm.idl
+include/orbit-1.0/ORBitservices/CosNaming.h
+include/orbit-1.0/ORBitservices/CosNaming.idl
+include/orbit-1.0/ORBitservices/CosNaming_impl.h
+include/orbit-1.0/ORBitservices/CosTypedEventChannel.idl
+include/orbit-1.0/ORBitservices/CosTypedEventComm.idl
+include/orbit-1.0/ORBitservices/LName.pidl
+include/orbit-1.0/ORBitutil/basic_types.h
+include/orbit-1.0/ORBitutil/compat.h
+include/orbit-1.0/ORBitutil/orbit-os-config.h
+include/orbit-1.0/ORBitutil/os-feature-alloca.h
+include/orbit-1.0/ORBitutil/os-specifics.h
+include/orbit-1.0/ORBitutil/thread-safety.h
+include/orbit-1.0/ORBitutil/trace.h
+include/orbit-1.0/ORBitutil/util.h
+include/orbit-1.0/orb/allocator-defs.h
+include/orbit-1.0/orb/allocators.h
+include/orbit-1.0/orb/cdr.h
+include/orbit-1.0/orb/corba_any.h
+include/orbit-1.0/orb/corba_any_proto.h
+include/orbit-1.0/orb/corba_any_type.h
+include/orbit-1.0/orb/corba_basic_sequences_type.h
+include/orbit-1.0/orb/corba_context.h
+include/orbit-1.0/orb/corba_env.h
+include/orbit-1.0/orb/corba_env_type.h
+include/orbit-1.0/orb/corba_object.h
+include/orbit-1.0/orb/corba_object_type.h
+include/orbit-1.0/orb/corba_orb.h
+include/orbit-1.0/orb/corba_orb_type.h
+include/orbit-1.0/orb/corba_portableserver.h
+include/orbit-1.0/orb/corba_portableserver_type.h
+include/orbit-1.0/orb/corba_sequences.h
+include/orbit-1.0/orb/corba_sequences_type.h
+include/orbit-1.0/orb/corba_typecode.h
+include/orbit-1.0/orb/corba_typecode_type.h
+include/orbit-1.0/orb/dii.h
+include/orbit-1.0/orb/dynany.h
+include/orbit-1.0/orb/env.h
+include/orbit-1.0/orb/interface_repository.h
+include/orbit-1.0/orb/iop.h
+include/orbit-1.0/orb/ir.h
+include/orbit-1.0/orb/options.h
+include/orbit-1.0/orb/orb.h
+include/orbit-1.0/orb/orbit.h
+include/orbit-1.0/orb/orbit_config.h
+include/orbit-1.0/orb/orbit_object.h
+include/orbit-1.0/orb/orbit_object_type.h
+include/orbit-1.0/orb/orbit_poa.h
+include/orbit-1.0/orb/orbit_poa_type.h
+include/orbit-1.0/orb/orbit_typecode.h
+include/orbit-1.0/orb/orbit_types.h
+include/orbit-1.0/orb/poa.h
+include/orbit-1.0/orb/sequences.h
+include/orbit-1.0/orb/typecode.h
+include/orbit-1.0/orbit-idl2.h
 include/orbit-idl2.h
 @unexec install-info --delete %D/info/libIDL.info %D/info/dir
 info/libIDL.info
@@ -97,8 +103,10 @@ libdata/pkgconfig/ORBit.pc
 libdata/pkgconfig/libIDL.pc
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
-@dirrm include/IIOP
-@dirrm include/ORBitservices
-@dirrm include/ORBitutil
-@dirrm include/libIDL
-@dirrm include/orb
+@dirrm include/orbit-1.0/orb
+@dirrm include/orbit-1.0/ORBitutil
+@dirrm include/orbit-1.0/ORBitservices
+@dirrm include/orbit-1.0/IIOP
+@dirrm include/orbit-1.0
+@dirrm include/libIDL-1.0/libIDL
+@dirrm include/libIDL-1.0