diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index fdfca0222c2..329c89dcb08 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -1,45 +1,26 @@
-# $OpenBSD: Makefile,v 1.18 2000/07/04 01:46:37 krw Exp $
+# $OpenBSD: Makefile,v 1.19 2000/08/21 12:20:20 brad Exp $
 
-DISTNAME=	ORBit-0.5.0
+DISTNAME=	ORBit-0.5.3
 CATEGORIES=	devel
 NEED_VERSION=	1.310
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR= stable/sources/ORBit
 
-
-LIB_DEPENDS=	intl::devel/gettext \
+LIB_DEPENDS=	intl.1::devel/gettext \
 		glib.1.2::devel/glib
 
 MAINTAINER=	rohee@openbsd.org
 
-LICENSE_TYPE=		GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-USE_GMAKE=		Yes
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= 	--enable-static --disable-indent
-CONFIGURE_ENV=		GLIB_CONFIG="${LOCALBASE}/bin/glib-config"
-
-# People that installed an older version of ORBit 0.4.x wound up with
-# shared libs with a major/minor of 4.0 ... these files
-# MUST be removed as the version was incorrect (it came from 1.1.x
-# sources). Check that out here (and bitch if necessary).
-pre-extract:
-	@if [ -f ${LOCALBASE}/lib/libORBit.so.4.0 ]; then \
-	   echo "+-------------------"; \
-	   echo "| ERROR: you MUST remove the existing ORBit installation"; \
-	   echo "| before installing this version. To fully remove run"; \
-	   echo "| these commands as user root"; \
-	   echo "|"; \
-	   echo "|      pkg_delete -f `pkg_info -e 'ORBit-*'`"; \
-	   echo "|      ldconfig ${LOCALBASE}/lib"; \
-	   echo "|"; \
-	   echo "+-------------------"; \
-	   exit 1; \
-	fi
+USE_GMAKE=	Yes
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
+CONFIGURE_ARGS+= --enable-static --disable-indent
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/ORBit/files/md5 b/devel/ORBit/files/md5
index b2b0ff9101f..8f4b5d7143b 100644
--- a/devel/ORBit/files/md5
+++ b/devel/ORBit/files/md5
@@ -1,3 +1,3 @@
-MD5 (ORBit-0.5.0.tar.gz) = ff977db3e5273bf6e13dd3124bed0696
-RMD160 (ORBit-0.5.0.tar.gz) = 166ccbadcb71288a796a131417aada3bae0cad84
-SHA1 (ORBit-0.5.0.tar.gz) = bce1cc61511dbdcd7d878dd6fd1ab4abc44426ef
+MD5 (ORBit-0.5.3.tar.gz) = ef0e295ab0666973030c552672aaaee7
+RMD160 (ORBit-0.5.3.tar.gz) = a505da1081f45e20c4cf460eaba1007ea92d88ca
+SHA1 (ORBit-0.5.3.tar.gz) = 42d71f4901a0182b5e0f4f9d4ea2634774002eab
diff --git a/devel/ORBit/patches/patch-ab b/devel/ORBit/patches/patch-Makefile.in
similarity index 58%
rename from devel/ORBit/patches/patch-ab
rename to devel/ORBit/patches/patch-Makefile.in
index 69f047e4395..d0c7121ea61 100644
--- a/devel/ORBit/patches/patch-ab
+++ b/devel/ORBit/patches/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Sep  8 18:37:14 1999
-+++ Makefile.in	Wed Sep  8 18:04:26 1999
-@@ -95,7 +95,7 @@
+--- Makefile.in.orig	Sun Aug 20 17:05:31 2000
++++ Makefile.in	Sun Aug 20 17:06:11 2000
+@@ -98,7 +98,7 @@
  
  AUTOMAKE_OPTIONS = 1.3 # required version of automake.
  
diff --git a/devel/ORBit/patches/patch-aa b/devel/ORBit/patches/patch-aa
deleted file mode 100644
index 6fa2e6bfb05..00000000000
--- a/devel/ORBit/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/IIOP/Makefile.in.orig	Mon Sep 27 16:38:32 1999
-+++ src/IIOP/Makefile.in	Fri Oct  1 19:50:43 1999
-@@ -92,9 +92,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--LIBWRAP_PATH = @LIBWRAP_PATH@
--@HAVE_HOSTS_ACCESS_TRUE@libwrap_files = $(addsuffix .lo, $(basename $(filter %.o, $(shell ar t $(LIBWRAP_PATH)))))
--@HAVE_HOSTS_ACCESS_FALSE@libwrap_files = 
-+libwrap_files = 
- 
- libIIOPincludedir = $(includedir)/IIOP
- 
-@@ -112,7 +110,7 @@
- 
- BUILT_SOURCES = $(libwrap_files)
- 
--libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libIIOP_la_LDFLAGS = -version-info 5:0:0
- 
- EXTRA_DIST = IIOP-design.txt
- 
-@@ -127,10 +125,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--@HAVE_HOSTS_ACCESS_TRUE@libIIOP_la_DEPENDENCIES =  $(addsuffix .lo, \
--@HAVE_HOSTS_ACCESS_TRUE@$(basename $(filter %.o, $(shell ar t \
--@HAVE_HOSTS_ACCESS_TRUE@$(LIBWRAP_PATH)))))
--@HAVE_HOSTS_ACCESS_FALSE@libIIOP_la_DEPENDENCIES = 
-+libIIOP_la_DEPENDENCIES = 
- libIIOP_la_OBJECTS =  connection.lo encoders.lo giop-msg-buffer.lo \
- iiop-endian.lo
- CFLAGS = @CFLAGS@
diff --git a/devel/ORBit/patches/patch-ac b/devel/ORBit/patches/patch-ac
deleted file mode 100644
index 62dfda66177..00000000000
--- a/devel/ORBit/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	Mon Aug 30 17:48:31 1999
-+++ configure	Mon Sep 13 17:46:13 1999
-@@ -5164,10 +5164,10 @@
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
-   esac
- 
--  case "$ac_given_INSTALL" in
--  [/$]*) INSTALL="$ac_given_INSTALL" ;;
--  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--  esac
-+#  case "$ac_given_INSTALL" in
-+#  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+#  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+#  esac
- 
-   echo creating "$ac_file"
-   rm -f "$ac_file"
-@@ -5388,10 +5388,10 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
-+#  case "$ac_given_INSTALL" in
-+#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+#        esac
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/devel/ORBit/patches/patch-ad b/devel/ORBit/patches/patch-ad
deleted file mode 100644
index 4bb1d19b4c0..00000000000
--- a/devel/ORBit/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- popt/Makefile.in.orig	Wed Sep  8 18:37:56 1999
-+++ popt/Makefile.in	Wed Sep  8 18:06:07 1999
-@@ -108,7 +108,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libpopt_la_LDFLAGS = 
-+libpopt_la_LDFLAGS =  -version-info 5:0:0
- libpopt_la_LIBADD = 
- libpopt_la_OBJECTS =  popt.lo findme.lo poptparse.lo poptconfig.lo \
- popthelp.lo
-@@ -121,7 +121,7 @@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --mode=link $(CCLD) -rpath $(PREFIX)/lib $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- HEADERS =  $(noinst_HEADERS)
- 
- DIST_COMMON =  README ./stamp-h.in COPYING Makefile.am Makefile.in \
diff --git a/devel/ORBit/patches/patch-ae b/devel/ORBit/patches/patch-ae
deleted file mode 100644
index 955a0af1fa7..00000000000
--- a/devel/ORBit/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/services/name/Makefile.in.orig	Mon Aug 30 18:01:52 1999
-+++ src/services/name/Makefile.in	Thu Sep  9 17:56:26 1999
-@@ -107,7 +107,7 @@
- libORBitservicesinclude_HEADERS =  	CosNaming.h								CosNaming_impl.h							CosNaming.idl								LName.pidl
- 
- 
--libORBitCosNaming_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBitCosNaming_la_LDFLAGS =  	-version-info 5:0:0
- 
- 
- INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src  @GLIB_CFLAGS@
diff --git a/devel/ORBit/patches/patch-af b/devel/ORBit/patches/patch-af
deleted file mode 100644
index 6cf06baf2a0..00000000000
--- a/devel/ORBit/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ORBitutil/Makefile.in.orig	Wed Sep  8 18:39:25 1999
-+++ src/ORBitutil/Makefile.in	Wed Sep  8 18:07:43 1999
-@@ -105,7 +105,7 @@
- libORBitutilinclude_HEADERS =  	basic_types.h 	thread-safety.h 	trace.h 	util.h 	compat.h 	os-specifics.h
- 
- 
--libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBitutil_la_LDFLAGS = -version-info 5:0:0
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/devel/ORBit/patches/patch-ag b/devel/ORBit/patches/patch-ag
deleted file mode 100644
index f8928e88baa..00000000000
--- a/devel/ORBit/patches/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/IIOP/connection.c.orig	Wed Sep  8 18:39:37 1999
-+++ src/IIOP/connection.c	Wed Sep  8 18:08:22 1999
-@@ -10,6 +10,7 @@
- #include "IIOP.h"
- #include "IIOP-private.h"
- #include "giop-msg-buffer.h"
-+#include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <errno.h>
diff --git a/devel/ORBit/patches/patch-ah b/devel/ORBit/patches/patch-ah
deleted file mode 100644
index e2067599267..00000000000
--- a/devel/ORBit/patches/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/orb/Makefile.in.orig	Wed Sep  8 18:39:49 1999
-+++ src/orb/Makefile.in	Wed Sep  8 18:08:42 1999
-@@ -110,7 +110,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 5:0:0
- libORBit_la_LIBADD = $(GLIB_LIBS) -lm
- 
- BUILT_SOURCES =  	interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
diff --git a/devel/ORBit/patches/patch-ai b/devel/ORBit/patches/patch-ai
deleted file mode 100644
index 2a6584d77e3..00000000000
--- a/devel/ORBit/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
---- libIDL/Makefile.in.orig	Wed Sep  8 18:40:06 1999
-+++ libIDL/Makefile.in	Wed Sep  8 18:09:18 1999
-@@ -92,7 +92,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
-@@ -123,7 +123,7 @@
- 
- libIDL_la_SOURCES = parser.c parser.h lexer.c 			  ns.c util.c util.h rename.h
- 
--libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				  -release $(LT_RELEASE)
-+libIDL_la_LDFLAGS = -version-info 5:0:0
- 
- 
- m4datadir = $(datadir)/aclocal
diff --git a/devel/ORBit/patches/patch-aj b/devel/ORBit/patches/patch-aj
deleted file mode 100644
index a3079e2af2c..00000000000
--- a/devel/ORBit/patches/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/daemons/interface_repository/Makefile.in.orig	Wed Sep  8 18:40:33 1999
-+++ src/daemons/interface_repository/Makefile.in	Wed Sep  8 18:10:07 1999
-@@ -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 -lwrap
- 
- 
- orbit_ird_SOURCES =  	interface_repository-skels.c 	interface_repository-impl.c
diff --git a/devel/ORBit/patches/patch-ak b/devel/ORBit/patches/patch-ak
deleted file mode 100644
index 15b21981476..00000000000
--- a/devel/ORBit/patches/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- orbit-config.in.orig	Tue Oct 27 14:52:35 1998
-+++ orbit-config.in	Fri Mar  5 00:44:54 1999
-@@ -86,7 +86,7 @@
-        	;;
- 
-     client|server)
--	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
-+	the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm -lwrap"
- 	the_flags="$the_flags `glib-config --cflags` -I@includedir@"
- 	;;
- 
diff --git a/devel/ORBit/patches/patch-libIDL_Makefile.in b/devel/ORBit/patches/patch-libIDL_Makefile.in
new file mode 100644
index 00000000000..a8ea6382007
--- /dev/null
+++ b/devel/ORBit/patches/patch-libIDL_Makefile.in
@@ -0,0 +1,21 @@
+--- libIDL/Makefile.in.orig	Mon Aug 21 05:07:15 2000
++++ libIDL/Makefile.in	Mon Aug 21 05:07:40 2000
+@@ -88,7 +88,7 @@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+@@ -130,8 +130,7 @@
+ libIDL_la_SOURCES = parser.c parser.h lexer.c \
+ 			  ns.c util.c util.h rename.h
+ 
+-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
+-			  -release $(LT_RELEASE)
++libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+ m4datadir = $(datadir)/aclocal
diff --git a/devel/ORBit/patches/patch-libIDL_ltconfig b/devel/ORBit/patches/patch-libIDL_ltconfig
new file mode 100644
index 00000000000..cb63e1df57a
--- /dev/null
+++ b/devel/ORBit/patches/patch-libIDL_ltconfig
@@ -0,0 +1,10 @@
+--- libIDL/ltconfig.orig	Sun Aug 20 17:22:44 2000
++++ libIDL/ltconfig	Sun Aug 20 17:22:53 2000
+@@ -2004,6 +2004,7 @@
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method='pass_all'
+   ;;
+ 
+ os2*)
diff --git a/devel/ORBit/patches/patch-an b/devel/ORBit/patches/patch-libIDL_ltmain.sh
similarity index 92%
rename from devel/ORBit/patches/patch-an
rename to devel/ORBit/patches/patch-libIDL_ltmain.sh
index c3900f5f413..ef06f820d39 100644
--- a/devel/ORBit/patches/patch-an
+++ b/devel/ORBit/patches/patch-libIDL_ltmain.sh
@@ -1,6 +1,6 @@
---- libIDL/ltmain.sh.orig	Tue Sep 28 12:11:49 1999
-+++ libIDL/ltmain.sh	Sat Oct 16 19:32:45 1999
-@@ -3326,40 +3326,6 @@
+--- libIDL/ltmain.sh.orig	Tue Jul 25 18:28:39 2000
++++ libIDL/ltmain.sh	Sun Aug 20 17:20:54 2000
+@@ -3555,40 +3555,6 @@
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
  
diff --git a/devel/ORBit/patches/patch-ltconfig b/devel/ORBit/patches/patch-ltconfig
new file mode 100644
index 00000000000..74a6943f516
--- /dev/null
+++ b/devel/ORBit/patches/patch-ltconfig
@@ -0,0 +1,10 @@
+--- ltconfig.orig	Sun Aug 20 17:21:15 2000
++++ ltconfig	Sun Aug 20 17:21:50 2000
+@@ -2004,6 +2004,7 @@
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method='pass_all'
+   ;;
+ 
+ os2*)
diff --git a/devel/ORBit/patches/patch-al b/devel/ORBit/patches/patch-ltmain.sh
similarity index 93%
rename from devel/ORBit/patches/patch-al
rename to devel/ORBit/patches/patch-ltmain.sh
index 6c9ecd54ff9..ac70bdc6157 100644
--- a/devel/ORBit/patches/patch-al
+++ b/devel/ORBit/patches/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Tue Sep 28 12:11:40 1999
-+++ ltmain.sh	Sat Oct 16 19:32:44 1999
-@@ -3326,40 +3326,6 @@
+--- ltmain.sh.orig	Tue Jul 25 18:28:29 2000
++++ ltmain.sh	Sun Aug 20 17:19:44 2000
+@@ -3555,40 +3555,6 @@
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
  
diff --git a/devel/ORBit/patches/patch-orbit-config.in b/devel/ORBit/patches/patch-orbit-config.in
new file mode 100644
index 00000000000..823063344d6
--- /dev/null
+++ b/devel/ORBit/patches/patch-orbit-config.in
@@ -0,0 +1,11 @@
+--- orbit-config.in.orig	Mon Aug 21 06:26:09 2000
++++ orbit-config.in	Mon Aug 21 06:26:34 2000
+@@ -87,7 +87,7 @@
+        	;;
+ 
+     client|server)
+-	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
++	the_libs="$the_libs -L$libdir -lORBit -lIIOP -lwrap -lORBitutil `glib-config --libs` @LIBS@ -lm"
+ 	the_flags="$the_flags `glib-config --cflags` -I$includedir "
+ 	;;
+ 
diff --git a/devel/ORBit/patches/patch-popt_Makefile.in b/devel/ORBit/patches/patch-popt_Makefile.in
new file mode 100644
index 00000000000..6babd4d4da8
--- /dev/null
+++ b/devel/ORBit/patches/patch-popt_Makefile.in
@@ -0,0 +1,11 @@
+--- popt/Makefile.in.orig	Mon Aug 21 05:52:25 2000
++++ popt/Makefile.in	Mon Aug 21 05:52:46 2000
+@@ -160,7 +160,7 @@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link $(CCLD) -rpath $(libdir) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES =  $(libpopt_la_SOURCES) $(test1_SOURCES) $(test2_SOURCES)
+ HEADERS =  $(noinst_HEADERS)
+ 
diff --git a/devel/ORBit/patches/patch-popt_ltconfig b/devel/ORBit/patches/patch-popt_ltconfig
new file mode 100644
index 00000000000..50eea31e2cb
--- /dev/null
+++ b/devel/ORBit/patches/patch-popt_ltconfig
@@ -0,0 +1,10 @@
+--- popt/ltconfig.orig	Sun Aug 20 17:22:13 2000
++++ popt/ltconfig	Sun Aug 20 17:22:23 2000
+@@ -2004,6 +2004,7 @@
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method='pass_all'
+   ;;
+ 
+ os2*)
diff --git a/devel/ORBit/patches/patch-am b/devel/ORBit/patches/patch-popt_ltmain.sh
similarity index 93%
rename from devel/ORBit/patches/patch-am
rename to devel/ORBit/patches/patch-popt_ltmain.sh
index ec2d19203ef..c98103d0a5b 100644
--- a/devel/ORBit/patches/patch-am
+++ b/devel/ORBit/patches/patch-popt_ltmain.sh
@@ -1,6 +1,6 @@
---- popt/ltmain.sh.orig	Tue Sep 28 12:11:51 1999
-+++ popt/ltmain.sh	Sat Oct 16 19:32:45 1999
-@@ -3326,40 +3326,6 @@
+--- popt/ltmain.sh.orig	Tue Jul 25 18:28:41 2000
++++ popt/ltmain.sh	Sun Aug 20 17:20:05 2000
+@@ -3555,40 +3555,6 @@
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
  
diff --git a/devel/ORBit/patches/patch-src_IIOP_Makefile.in b/devel/ORBit/patches/patch-src_IIOP_Makefile.in
new file mode 100644
index 00000000000..8235beef5f1
--- /dev/null
+++ b/devel/ORBit/patches/patch-src_IIOP_Makefile.in
@@ -0,0 +1,31 @@
+--- src/IIOP/Makefile.in.orig	Mon Aug 21 06:21:54 2000
++++ src/IIOP/Makefile.in	Mon Aug 21 06:20:15 2000
+@@ -96,14 +96,9 @@
+ pkglibdir = @pkglibdir@
+ 
+ 
+-LIBWRAP_PATH = @LIBWRAP_PATH@
+ LIB_WRAP = @LIB_WRAP@
+-@HAVE_HOSTS_ACCESS_TRUE@libwrap_files = \
+-@HAVE_HOSTS_ACCESS_TRUE@$(addsuffix .lo, $(basename $(filter %.o, $(shell ar t $(LIBWRAP_PATH)))))
+-@HAVE_HOSTS_ACCESS_FALSE@libwrap_files = \
+-@HAVE_HOSTS_ACCESS_TRUE@libwrap_deps = \
+-@HAVE_HOSTS_ACCESS_FALSE@libwrap_deps = \
+-@HAVE_HOSTS_ACCESS_FALSE@$(LIB_WRAP)
++libwrap_files = 
++libwrap_deps = $(LIB_WRAP)
+ 
+ libIIOPincludedir = $(includedir)/IIOP
+ 
+@@ -154,10 +149,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-@HAVE_HOSTS_ACCESS_FALSE@libIIOP_la_DEPENDENCIES = 
+-@HAVE_HOSTS_ACCESS_TRUE@libIIOP_la_DEPENDENCIES =  $(addsuffix .lo, \
+-@HAVE_HOSTS_ACCESS_TRUE@$(basename $(filter %.o, $(shell ar t \
+-@HAVE_HOSTS_ACCESS_TRUE@$(LIBWRAP_PATH)))))
++libIIOP_la_DEPENDENCIES = 
+ am_libIIOP_la_OBJECTS =  connection.lo encoders.lo giop-msg-buffer.lo \
+ iiop-endian.lo
+ libIIOP_la_OBJECTS =  $(am_libIIOP_la_OBJECTS)
diff --git a/devel/ORBit/patches/patch-src_IIOP_connection.c b/devel/ORBit/patches/patch-src_IIOP_connection.c
new file mode 100644
index 00000000000..1eb043d92ad
--- /dev/null
+++ b/devel/ORBit/patches/patch-src_IIOP_connection.c
@@ -0,0 +1,17 @@
+--- src/IIOP/connection.c.orig	Fri Feb 18 11:18:00 2000
++++ src/IIOP/connection.c	Mon Aug 21 05:54:57 2000
+@@ -1,3 +1,6 @@
++#include <sys/types.h>
++#include <sys/param.h>
++#include <stdio.h>
+ #include "config.h"
+ #ifndef _XOPEN_SOURCE_EXTENDED
+ #   define _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>
diff --git a/devel/ORBit/patches/patch-src_daemons_interface_repositor_Makefile.in b/devel/ORBit/patches/patch-src_daemons_interface_repositor_Makefile.in
new file mode 100644
index 00000000000..b45a5e53652
--- /dev/null
+++ b/devel/ORBit/patches/patch-src_daemons_interface_repositor_Makefile.in
@@ -0,0 +1,11 @@
+--- src/daemons/interface_repository/Makefile.in.orig	Mon Aug 21 06:29:25 2000
++++ src/daemons/interface_repository/Makefile.in	Mon Aug 21 06:29:35 2000
+@@ -113,7 +113,7 @@
+ 	$(top_builddir)/src/IIOP/libIIOP.la \
+ 	$(top_builddir)/src/ORBitutil/libORBitutil.la \
+ 	@GLIB_LIBS@ \
+-	-lm
++	-lm -lwrap
+ 
+ 
+ orbit_ird_SOURCES = \
diff --git a/devel/ORBit/patches/patch-src_services_event_Makefile.in b/devel/ORBit/patches/patch-src_services_event_Makefile.in
new file mode 100644
index 00000000000..af1bf89ac40
--- /dev/null
+++ b/devel/ORBit/patches/patch-src_services_event_Makefile.in
@@ -0,0 +1,11 @@
+--- src/services/event/Makefile.in.orig	Mon Aug 21 06:30:58 2000
++++ src/services/event/Makefile.in	Mon Aug 21 06:31:08 2000
+@@ -138,7 +138,7 @@
+ 	$(top_builddir)/src/IIOP/libIIOP.la				\
+ 	$(top_builddir)/src/ORBitutil/libORBitutil.la			\
+ 	@GLIB_LIBS@ 							\
+-	-lm
++	-lm -lwrap
+ 
+ 
+ event_consumer_SOURCES = event-consumer.c				\
diff --git a/devel/ORBit/patches/patch-src_services_name_Makefile.in b/devel/ORBit/patches/patch-src_services_name_Makefile.in
new file mode 100644
index 00000000000..8cd11993e6d
--- /dev/null
+++ b/devel/ORBit/patches/patch-src_services_name_Makefile.in
@@ -0,0 +1,11 @@
+--- src/services/name/Makefile.in.orig	Mon Aug 21 06:01:35 2000
++++ src/services/name/Makefile.in	Mon Aug 21 06:02:02 2000
+@@ -147,7 +147,7 @@
+ 	$(top_builddir)/src/ORBitutil/libORBitutil.la 		\
+ 	libORBitCosNaming.la					\
+ 	@GLIB_LIBS@ 						\
+-	-lm
++	-lm -lwrap
+ 
+ 
+ #name-client.c boot.c orbit-name-server.c new-name-server.c: CosNaming.h
diff --git a/devel/ORBit/pkg/PFRAG.shared b/devel/ORBit/pkg/PFRAG.shared
index 3eb374e5edf..76e4968e15f 100644
--- a/devel/ORBit/pkg/PFRAG.shared
+++ b/devel/ORBit/pkg/PFRAG.shared
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2000/08/20 20:42:12 brad Exp $
-lib/libIDL.so.5.0
-lib/libIIOP.so.5.0
-lib/libORBit.so.5.0
-lib/libORBitCosNaming.so.5.0
-lib/libORBitutil.so.5.0
+@comment $OpenBSD: PFRAG.shared,v 1.4 2000/08/21 12:20:23 brad Exp $
+lib/libIDL.so.4.4
+lib/libIIOP.so.5.3
+lib/libORBit.so.5.3
+lib/libORBitCosNaming.so.5.3
+lib/libORBitutil.so.5.3
 DYNLIBDIR(%B)
diff --git a/devel/ORBit/pkg/PLIST b/devel/ORBit/pkg/PLIST
index 649d6c45a23..15c2d11557d 100644
--- a/devel/ORBit/pkg/PLIST
+++ b/devel/ORBit/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2000/08/20 20:42:13 brad Exp $
+@comment $OpenBSD: PLIST,v 1.11 2000/08/21 12:20:23 brad Exp $
 @pkgcfl libIDL-*
 bin/libIDL-config
 bin/name-client
@@ -24,6 +24,8 @@ 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
@@ -36,6 +38,7 @@ 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
@@ -85,6 +88,7 @@ lib/libORBitutil.la
 lib/libname-server.a
 lib/liborbit-c-backend.a
 %%SHARED%%
+share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
 @dirrm include/IIOP
 @dirrm include/ORBitservices