Update "ORBit" package to version 0.4.2.

7 files changed, 51 insertions, 54 deletions

diff --git a/corba/ORBit/Makefile b/corba/ORBit/Makefile
index e05c5546564..6db84376698 100644
--- a/corba/ORBit/Makefile
+++ b/corba/ORBit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 1999/03/22 22:43:41 agc Exp $
+# $NetBSD: Makefile,v 1.13 1999/04/04 19:20:10 tron Exp $
 #
 
-DISTNAME=	ORBit-0.4.0
+DISTNAME=	ORBit-0.4.2
 CATEGORIES=	corba
 MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
 		ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ \
diff --git a/corba/ORBit/files/md5 b/corba/ORBit/files/md5
index 1382339021a..2738febc688 100644
--- a/corba/ORBit/files/md5
+++ b/corba/ORBit/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/03/05 00:25:10 tron Exp $
+$NetBSD: md5,v 1.5 1999/04/04 19:20:10 tron Exp $
 
-MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc
+MD5 (ORBit-0.4.2.tar.gz) = 5c7e91d2a4eda8bd7b48cfa13569287f
diff --git a/corba/ORBit/patches/patch-aa b/corba/ORBit/patches/patch-aa
index 37fd256aa50..f7587e21550 100644
--- a/corba/ORBit/patches/patch-aa
+++ b/corba/ORBit/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.3 1999/03/05 00:25:10 tron Exp $
+$NetBSD: patch-aa,v 1.4 1999/04/04 19:20:10 tron Exp $
 
---- popt/configure.orig	Wed Feb 24 20:54:33 1999
-+++ popt/configure	Thu Mar  4 23:23:12 1999
-@@ -1895,6 +1895,7 @@
+--- popt/configure.orig	Wed Mar 24 18:46:35 1999
++++ popt/configure	Sun Apr  4 19:09:10 1999
+@@ -1883,6 +1883,7 @@
  fi
  
- # Always use our own libtool.
-+if false; then
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
++if false; then
  # Check for any special flags to pass to ltconfig.
-@@ -2126,6 +2127,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -2179,6 +2180,7 @@
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +fi
  
  # Redirect the config.log output again, so that the ltconfig log is not
diff --git a/corba/ORBit/patches/patch-ac b/corba/ORBit/patches/patch-ac
index 4ec3dfe9821..5efbff1f3d8 100644
--- a/corba/ORBit/patches/patch-ac
+++ b/corba/ORBit/patches/patch-ac
@@ -1,27 +1,24 @@
-$NetBSD: patch-ac,v 1.1 1998/08/20 22:07:25 agc Exp $
+$NetBSD: patch-ac,v 1.2 1999/04/04 19:20:10 tron Exp $
 
-Use NetBSD's libtool package
-Comment out erroneous setting of INSTALL variable.
-
---- configure	1998/08/19 10:37:24	1.1
-+++ configure	1998/08/19 10:38:11
-@@ -1236,6 +1236,7 @@
-   echo "$ac_t""no" 1>&6
+--- configure.orig	Wed Mar 24 22:32:13 1999
++++ configure	Sun Apr  4 18:28:33 1999
+@@ -1569,6 +1569,7 @@
  fi
  
+ 
 +if false; then
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -1865,6 +1866,7 @@
+ 
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1281,6 +1282,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 +fi
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -3261,10 +3263,10 @@
+@@ -5424,10 +5426,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/corba/ORBit/patches/patch-af b/corba/ORBit/patches/patch-af
index b94beea24ce..b04607d6d93 100644
--- a/corba/ORBit/patches/patch-af
+++ b/corba/ORBit/patches/patch-af
@@ -1,17 +1,17 @@
-$NetBSD: patch-af,v 1.3 1999/03/05 00:25:10 tron Exp $
+$NetBSD: patch-af,v 1.4 1999/04/04 19:20:10 tron Exp $
 
---- src/idl-compiler/orbit-c-backend.c.orig	Mon Feb 22 17:27:40 1999
-+++ src/idl-compiler/orbit-c-backend.c	Thu Mar  4 23:05:25 1999
-@@ -16,10 +16,10 @@
-    Output: (in files) header, skeletons, stubs, and common code.
- */
+--- src/idl-compiler/main.c.orig	Tue Mar 23 20:26:47 1999
++++ src/idl-compiler/main.c	Sun Apr  4 18:06:57 1999
+@@ -53,10 +53,10 @@
+ 
  #ifdef HAVE_INDENT_KR
+ #warning "Please e-mail orbit-list@cuc.edu if you get HAVE_INDENT_KR working"
 -#  define INDENT "indent -npro -kr -i8 -bad -fca -sc -sob"
 +#  define INDENT "gindent -npro -kr -i8 -bad -fca -sc -sob"
  #else
  #  ifdef HAVE_INDENT
--#    define INDENT "indent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp"
-+#    define INDENT "gindent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp"
+-#    define INDENT "indent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp -st"
++#    define INDENT "gindent -npro -bad -bap -bc -sob -br -ce -cli2 -npcs -di1 -psl -i3 -lp -st"
  #  else
  #    define INDENT "cat"
  #  endif
diff --git a/corba/ORBit/patches/patch-ah b/corba/ORBit/patches/patch-ah
index 6d99b555060..c4edf30350e 100644
--- a/corba/ORBit/patches/patch-ah
+++ b/corba/ORBit/patches/patch-ah
@@ -1,19 +1,19 @@
-$NetBSD: patch-ah,v 1.1 1999/03/05 00:25:10 tron Exp $
+$NetBSD: patch-ah,v 1.2 1999/04/04 19:20:10 tron Exp $
 
---- libIDL/configure.orig	Wed Feb 24 20:54:31 1999
-+++ libIDL/configure	Fri Mar  5 00:18:15 1999
-@@ -2185,6 +2185,7 @@
- fi
+--- libIDL/configure.orig	Thu Mar 25 20:15:02 1999
++++ libIDL/configure	Sun Apr  4 18:27:26 1999
+@@ -2446,6 +2446,7 @@
+ rm -f confcache
+ 
  
- # Always use our own libtool.
 +if false; then
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+@@ -2469,6 +2470,7 @@
  
- # Check for any special flags to pass to ltconfig.
-@@ -2416,6 +2417,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +fi
  
  # Redirect the config.log output again, so that the ltconfig log is not
diff --git a/corba/ORBit/pkg/PLIST b/corba/ORBit/pkg/PLIST
index 436643252b6..07047370095 100644
--- a/corba/ORBit/pkg/PLIST
+++ b/corba/ORBit/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1999/03/05 00:25:10 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 1999/04/04 19:20:10 tron Exp $
 bin/libIDL-config
 bin/name-client
 bin/old-name-server
@@ -11,16 +11,16 @@ lib/libIDL-0.6.so.0.0
 lib/libIDL.la
 lib/libIDL.a
 lib/libIDLConf.sh
-lib/libORBitCosNaming.so.4.0
+lib/libORBitCosNaming.so.4.2
 lib/libORBitCosNaming.la
 lib/libORBitCosNaming.a
-lib/libORBitutil.so.4.0
+lib/libORBitutil.so.4.2
 lib/libORBitutil.la
 lib/libORBitutil.a
-lib/libIIOP.so.4.0
+lib/libIIOP.so.4.2
 lib/libIIOP.la
 lib/libIIOP.a
-lib/libORBit.so.4.0
+lib/libORBit.so.4.2
 lib/libORBit.la
 lib/libORBit.a
 lib/libname-server.a