New patches supplied by UEBAYASHI 'UMA' Masao which apply without fuzz.

6 files changed, 30 insertions, 26 deletions

diff --git a/corba/ORBit/files/patch-sum b/corba/ORBit/files/patch-sum
index dd2eaf44aef..cdbf950d48e 100644
--- a/corba/ORBit/files/patch-sum
+++ b/corba/ORBit/files/patch-sum
@@ -1,14 +1,14 @@
-$NetBSD: patch-sum,v 1.2 1999/10/22 23:35:37 tron Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/12 08:15:56 tron Exp $
 
 MD5 (patch-aa) = 970a8c13fe579d27ad5aa30a7b89f5af
 MD5 (patch-ab) = 39d06749d19c30d91d40e48fd4e74321
 MD5 (patch-ac) = fe026df2a9ecc4445b873b4b07312711
 MD5 (patch-ad) = b5a1964a714884369ba9c60790380f69
 MD5 (patch-ae) = 98464c52bd7f89c590bdf08982f2a330
-MD5 (patch-ag) = ef5def8752f3989bb79acbf8beb7c354
+MD5 (patch-ag) = be7d2b90edbefb47476fad9e650a26e1
 MD5 (patch-ah) = 29ad288da577fc93e3a28ed254da924c
 MD5 (patch-ai) = c486d47127aa566b1a8280002295088e
 MD5 (patch-aj) = 1580df7ed3f35c03d8bb1111c1fb7be7
 MD5 (patch-ak) = 2650deea424b4db98a4f3c849f137d56
-MD5 (patch-al) = 4908b684f7fe78fdf39c5455e87127bc
+MD5 (patch-al) = c4882df5b4c3b486df2b37084187fe80
 MD5 (patch-am) = 595270c0a2bd97be8e8aeb33fe3e8b21
diff --git a/corba/ORBit/patches/patch-ag b/corba/ORBit/patches/patch-ag
index 106bfe53a1d..8768ce41dd0 100644
--- a/corba/ORBit/patches/patch-ag
+++ b/corba/ORBit/patches/patch-ag
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.3 1999/03/05 00:25:10 tron Exp $
+$NetBSD: patch-ag,v 1.4 1999/11/12 08:15:56 tron Exp $
 
---- src/IIOP/connection.c.orig	Sun Feb 21 19:56:43 1999
-+++ src/IIOP/connection.c	Thu Mar  4 23:34:25 1999
+--- src/IIOP/connection.c.orig	Thu Sep 23 04:25:32 1999
++++ src/IIOP/connection.c	Fri Nov 12 11:18:11 1999
 @@ -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
+ #   define _XOPEN_SOURCE_EXTENDED 1
 @@ -13,7 +16,6 @@
  #include <stdlib.h>
  #include <unistd.h>
diff --git a/corba/ORBit/patches/patch-al b/corba/ORBit/patches/patch-al
index 982495bfe57..623ff7bba55 100644
--- a/corba/ORBit/patches/patch-al
+++ b/corba/ORBit/patches/patch-al
@@ -1,13 +1,15 @@
-$NetBSD: patch-al,v 1.1 1999/03/05 00:25:10 tron Exp $
+$NetBSD: patch-al,v 1.2 1999/11/12 08:15:56 tron Exp $
 
---- src/daemons/interface_repository/Makefile.in.orig	Thu Feb 25 16:17:26 1999
-+++ src/daemons/interface_repository/Makefile.in	Fri Mar  5 00:52:59 1999
-@@ -100,7 +100,7 @@
+--- src/daemons/interface_repository/Makefile.in.orig	Wed Sep 29 01:13:00 1999
++++ src/daemons/interface_repository/Makefile.in	Fri Nov 12 11:26:07 1999
+@@ -102,7 +102,9 @@
  
  
  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_LDADD =      $(top_builddir)/src/orb/libORBit.la     $(top_builddir)/
++src/IIOP/libIIOP.la     $(top_builddir)/src/ORBitutil/libORBitutil.la   @GLIB_LI
++BS@     -lm -lwrap
  
  
- orbit_ird_SOURCES =  	interface_repository-common.c 	interface_repository-skels.c 	interface_repository-impl.c
+ orbit_ird_SOURCES =  	interface_repository-skels.c 	interface_repository-impl.c
diff --git a/net/ORBit/files/patch-sum b/net/ORBit/files/patch-sum
index dd2eaf44aef..cdbf950d48e 100644
--- a/net/ORBit/files/patch-sum
+++ b/net/ORBit/files/patch-sum
@@ -1,14 +1,14 @@
-$NetBSD: patch-sum,v 1.2 1999/10/22 23:35:37 tron Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/12 08:15:56 tron Exp $
 
 MD5 (patch-aa) = 970a8c13fe579d27ad5aa30a7b89f5af
 MD5 (patch-ab) = 39d06749d19c30d91d40e48fd4e74321
 MD5 (patch-ac) = fe026df2a9ecc4445b873b4b07312711
 MD5 (patch-ad) = b5a1964a714884369ba9c60790380f69
 MD5 (patch-ae) = 98464c52bd7f89c590bdf08982f2a330
-MD5 (patch-ag) = ef5def8752f3989bb79acbf8beb7c354
+MD5 (patch-ag) = be7d2b90edbefb47476fad9e650a26e1
 MD5 (patch-ah) = 29ad288da577fc93e3a28ed254da924c
 MD5 (patch-ai) = c486d47127aa566b1a8280002295088e
 MD5 (patch-aj) = 1580df7ed3f35c03d8bb1111c1fb7be7
 MD5 (patch-ak) = 2650deea424b4db98a4f3c849f137d56
-MD5 (patch-al) = 4908b684f7fe78fdf39c5455e87127bc
+MD5 (patch-al) = c4882df5b4c3b486df2b37084187fe80
 MD5 (patch-am) = 595270c0a2bd97be8e8aeb33fe3e8b21
diff --git a/net/ORBit/patches/patch-ag b/net/ORBit/patches/patch-ag
index 106bfe53a1d..8768ce41dd0 100644
--- a/net/ORBit/patches/patch-ag
+++ b/net/ORBit/patches/patch-ag
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.3 1999/03/05 00:25:10 tron Exp $
+$NetBSD: patch-ag,v 1.4 1999/11/12 08:15:56 tron Exp $
 
---- src/IIOP/connection.c.orig	Sun Feb 21 19:56:43 1999
-+++ src/IIOP/connection.c	Thu Mar  4 23:34:25 1999
+--- src/IIOP/connection.c.orig	Thu Sep 23 04:25:32 1999
++++ src/IIOP/connection.c	Fri Nov 12 11:18:11 1999
 @@ -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
+ #   define _XOPEN_SOURCE_EXTENDED 1
 @@ -13,7 +16,6 @@
  #include <stdlib.h>
  #include <unistd.h>
diff --git a/net/ORBit/patches/patch-al b/net/ORBit/patches/patch-al
index 982495bfe57..623ff7bba55 100644
--- a/net/ORBit/patches/patch-al
+++ b/net/ORBit/patches/patch-al
@@ -1,13 +1,15 @@
-$NetBSD: patch-al,v 1.1 1999/03/05 00:25:10 tron Exp $
+$NetBSD: patch-al,v 1.2 1999/11/12 08:15:56 tron Exp $
 
---- src/daemons/interface_repository/Makefile.in.orig	Thu Feb 25 16:17:26 1999
-+++ src/daemons/interface_repository/Makefile.in	Fri Mar  5 00:52:59 1999
-@@ -100,7 +100,7 @@
+--- src/daemons/interface_repository/Makefile.in.orig	Wed Sep 29 01:13:00 1999
++++ src/daemons/interface_repository/Makefile.in	Fri Nov 12 11:26:07 1999
+@@ -102,7 +102,9 @@
  
  
  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_LDADD =      $(top_builddir)/src/orb/libORBit.la     $(top_builddir)/
++src/IIOP/libIIOP.la     $(top_builddir)/src/ORBitutil/libORBitutil.la   @GLIB_LI
++BS@     -lm -lwrap
  
  
- orbit_ird_SOURCES =  	interface_repository-common.c 	interface_repository-skels.c 	interface_repository-impl.c
+ orbit_ird_SOURCES =  	interface_repository-skels.c 	interface_repository-impl.c