Update to 0.5.3, provided by Dan Winship. Changes are mainly bugfixes.

6 files changed, 63 insertions, 59 deletions

diff --git a/net/ORBit/patches/patch-ad b/net/ORBit/patches/patch-ad
index 9a8e95ffd19..7fdc3e99cdd 100644
--- a/net/ORBit/patches/patch-ad
+++ b/net/ORBit/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.3 1999/03/05 00:25:10 tron Exp $
+$NetBSD: patch-ad,v 1.4 2000/08/09 23:09:35 wiz Exp $
 
---- popt/Makefile.in.orig	Thu Feb 25 16:17:05 1999
-+++ popt/Makefile.in	Thu Mar  4 23:25:05 1999
-@@ -122,7 +122,7 @@
+--- popt/Makefile.in.orig	Fri Aug  4 14:27:49 2000
++++ popt/Makefile.in	Fri Aug  4 14:28:17 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) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --mode=link $(CCLD) -rpath $(PREFIX)/lib $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link $(CCLD) -rpath $(PREFIX)/lib $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES =  $(libpopt_la_SOURCES) $(test1_SOURCES) $(test2_SOURCES)
  HEADERS =  $(noinst_HEADERS)
  
- DIST_COMMON =  README ./stamp-h.in COPYING Makefile.am Makefile.in \
diff --git a/net/ORBit/patches/patch-ae b/net/ORBit/patches/patch-ae
index c5637b3313d..9758db95472 100644
--- a/net/ORBit/patches/patch-ae
+++ b/net/ORBit/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.6 2000/05/30 19:13:18 drochner Exp $
+$NetBSD: patch-ae,v 1.7 2000/08/09 23:09:35 wiz Exp $
 
---- src/services/name/Makefile.in.orig	Mon Feb 21 19:32:42 2000
-+++ src/services/name/Makefile.in	Fri May 26 22:18:27 2000
-@@ -122,7 +122,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 -lwrap
+--- src/services/name/Makefile.in.orig	Fri Aug  4 14:28:42 2000
++++ src/services/name/Makefile.in	Fri Aug  4 14:28:52 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/net/ORBit/patches/patch-ai b/net/ORBit/patches/patch-ai
index d8b6779c14f..4bc79d9d5bb 100644
--- a/net/ORBit/patches/patch-ai
+++ b/net/ORBit/patches/patch-ai
@@ -1,12 +1,13 @@
-$NetBSD: patch-ai,v 1.1 1999/03/05 00:25:10 tron Exp $
+$NetBSD: patch-ai,v 1.2 2000/08/09 23:09:35 wiz Exp $
 
---- libIDL/Makefile.in.orig	Thu Feb 25 16:17:07 1999
-+++ libIDL/Makefile.in	Fri Mar  5 00:21:00 1999
-@@ -120,7 +120,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/Makefile.in.orig	Fri Aug  4 14:29:21 2000
++++ libIDL/Makefile.in	Fri Aug  4 14:29:46 2000
+@@ -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 = -release $(LT_RELEASE)
  
  
diff --git a/net/ORBit/patches/patch-aj b/net/ORBit/patches/patch-aj
index 94c61ea76bc..41cf97cac7c 100644
--- a/net/ORBit/patches/patch-aj
+++ b/net/ORBit/patches/patch-aj
@@ -1,31 +1,33 @@
-$NetBSD: patch-aj,v 1.5 2000/07/11 11:23:40 wiz Exp $
+$NetBSD: patch-aj,v 1.6 2000/08/09 23:09:35 wiz Exp $
 
---- src/IIOP/Makefile.in.orig	Mon Jul  3 21:08:22 2000
-+++ src/IIOP/Makefile.in	Tue Jul 11 00:02:52 2000
-@@ -91,12 +91,9 @@
- YACC = @YACC@
+--- src/IIOP/Makefile.in.orig	Fri Aug  4 14:30:17 2000
++++ src/IIOP/Makefile.in	Fri Aug  4 14:31:06 2000
+@@ -96,14 +96,9 @@
  pkglibdir = @pkglibdir@
  
+ 
 -LIBWRAP_PATH = @LIBWRAP_PATH@
  LIB_WRAP = @LIB_WRAP@
--@HAVE_HOSTS_ACCESS_TRUE@libwrap_files = $(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 = $(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
  
-@@ -129,10 +126,7 @@
+@@ -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)))))
--@HAVE_HOSTS_ACCESS_FALSE@libIIOP_la_DEPENDENCIES = 
 +libIIOP_la_DEPENDENCIES = 
- libIIOP_la_OBJECTS =  connection.lo encoders.lo giop-msg-buffer.lo \
+ am_libIIOP_la_OBJECTS =  connection.lo encoders.lo giop-msg-buffer.lo \
  iiop-endian.lo
- CFLAGS = @CFLAGS@
+ libIIOP_la_OBJECTS =  $(am_libIIOP_la_OBJECTS)
diff --git a/net/ORBit/patches/patch-al b/net/ORBit/patches/patch-al
index 3b567965eb3..acb97f8378d 100644
--- a/net/ORBit/patches/patch-al
+++ b/net/ORBit/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.3 1999/11/13 23:57:32 tron Exp $
+$NetBSD: patch-al,v 1.4 2000/08/09 23:09:35 wiz Exp $
 
---- src/daemons/interface_repository/Makefile.in.orig	Tue Sep 28 18:13:00 1999
-+++ src/daemons/interface_repository/Makefile.in	Sun Nov 14 00:53:39 1999
-@@ -102,7 +102,7 @@
+--- src/daemons/interface_repository/Makefile.in.orig	Fri Aug  4 14:32:04 2000
++++ src/daemons/interface_repository/Makefile.in	Fri Aug  4 14:32:15 2000
+@@ -113,7 +113,7 @@
+ 	$(top_builddir)/src/IIOP/libIIOP.la \
+ 	$(top_builddir)/src/ORBitutil/libORBitutil.la \
+ 	@GLIB_LIBS@ \
+-	-lm
++	-lm -lwrap
  
  
- 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
+ orbit_ird_SOURCES = \
diff --git a/net/ORBit/patches/patch-am b/net/ORBit/patches/patch-am
index 7021b053d7f..468df4740e1 100644
--- a/net/ORBit/patches/patch-am
+++ b/net/ORBit/patches/patch-am
@@ -1,12 +1,13 @@
-$NetBSD: patch-am,v 1.1 1999/04/14 20:34:38 garbled Exp $
---- src/services/event/Makefile.in.orig	Wed Apr 14 13:22:16 1999
-+++ src/services/event/Makefile.in	Wed Apr 14 13:22:36 1999
-@@ -110,7 +110,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 -lwrap
- 
- 
- event_consumer_SOURCES = event-consumer.c					CosEventComm-skels.c	 						CosEventChannel-common.c 						CosEventChannel-stubs.c
+$NetBSD: patch-am,v 1.2 2000/08/09 23:09:35 wiz Exp $
+
+--- src/services/event/Makefile.in.orig	Fri Aug  4 14:32:36 2000
++++ src/services/event/Makefile.in	Fri Aug  4 14:32:45 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				\