Update "ORBit" package to version 0.4.0.

13 files changed, 169 insertions, 60 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 30dab890a31..b5ea49f6e88 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,19 +1,22 @@
-# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 1999/03/05 00:25:09 tron Exp $
 #
 
-DISTNAME=	ORBit-0.3.90
+DISTNAME=	ORBit-0.4.0
 CATEGORIES=	corba
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/ORBit/ \
-		ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/
+MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/sources/gnome-1.0/sources/ \
+		ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ \
+		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 
-DEPENDS+=	glib-1.1.12:../../devel/glib
+DEPENDS+=	glib-1.2.0:../../devel/glib
 DEPENDS+=	gindent-1.9.1:../../devel/gindent
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+CONFIGURE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 LIBTOOL_FLAGS=	--install-la
 INFO_FILES=	libIDL.info
diff --git a/net/ORBit/files/md5 b/net/ORBit/files/md5
index c2959c539ae..1382339021a 100644
--- a/net/ORBit/files/md5
+++ b/net/ORBit/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/12/19 12:31:47 tron Exp $
+$NetBSD: md5,v 1.4 1999/03/05 00:25:10 tron Exp $
 
-MD5 (ORBit-0.3.90.tar.gz) = cafc78094ce82d7366a3c490225bb1fa
+MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc
diff --git a/net/ORBit/patches/patch-aa b/net/ORBit/patches/patch-aa
new file mode 100644
index 00000000000..37fd256aa50
--- /dev/null
+++ b/net/ORBit/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.3 1999/03/05 00:25: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 @@
+ fi
+ 
+ # Always use our own libtool.
++if false; then
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # 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; }
++fi
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/net/ORBit/patches/patch-ab b/net/ORBit/patches/patch-ab
index 0048fa48806..97a2408aaf7 100644
--- a/net/ORBit/patches/patch-ab
+++ b/net/ORBit/patches/patch-ab
@@ -1,33 +1,22 @@
-$NetBSD: patch-ab,v 1.1 1998/08/20 22:07:25 agc Exp $
+$NetBSD: patch-ab,v 1.2 1999/03/05 00:25:10 tron Exp $
 
-Install scripts correctly
-
---- Makefile.in.orig	Sat Aug  8 23:10:55 1998
-+++ Makefile.in	Sat Aug  8 23:11:08 1998
+--- Makefile.in.orig	Thu Feb 25 16:17:03 1999
++++ Makefile.in	Thu Mar  4 23:51:40 1999
 @@ -48,7 +48,7 @@
  INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
  INSTALL_DATA = @INSTALL_DATA@
 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
  transform = @program_transform_name@
  
  NORMAL_INSTALL = :
-@@ -86,7 +86,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
+@@ -93,7 +93,7 @@
  
--SUBDIRS=libIDL src test
-+SUBDIRS=libIDL src
+ AUTOMAKE_OPTIONS = 1.3 # required version of automake.
  
- bin_SCRIPTS=orbit-config
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -307,7 +307,7 @@
- uninstall: uninstall-recursive uninstall-am
+-SUBDIRS = popt libIDL src test
++SUBDIRS = popt libIDL src
  
- install-strip:
--	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='${INSTALL_SCRIPT}' install
- installdirs: installdirs-recursive
- 	$(mkinstalldirs)  $(DATADIR)$(bindir)
+ bin_SCRIPTS = orbit-config
  
diff --git a/net/ORBit/patches/patch-ad b/net/ORBit/patches/patch-ad
new file mode 100644
index 00000000000..9a8e95ffd19
--- /dev/null
+++ b/net/ORBit/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 1999/03/05 00:25:10 tron 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 @@
+ 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/net/ORBit/patches/patch-af b/net/ORBit/patches/patch-af
index 14d749ce0c0..b94beea24ce 100644
--- a/net/ORBit/patches/patch-af
+++ b/net/ORBit/patches/patch-af
@@ -1,16 +1,17 @@
-$NetBSD: patch-af,v 1.2 1998/12/19 12:31:47 tron Exp $
+$NetBSD: patch-af,v 1.3 1999/03/05 00:25:10 tron Exp $
 
---- src/idl-compiler/orbit-c-backend.c.orig	Wed Dec 16 02:17:18 1998
-+++ src/idl-compiler/orbit-c-backend.c	Sat Dec 19 12:54:49 1998
-@@ -18,9 +18,9 @@
- #ifndef HAVE_INDENT
- #define INDENT "cat"
- #elif HAVE_INDENT_KR
--#define INDENT "indent -npro -kr -i8 -bad -fca -sc -sob"
-+#define INDENT "gindent -npro -kr -i8 -bad -fca -sc -sob"
+--- 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.
+ */
+ #ifdef HAVE_INDENT_KR
+-#  define INDENT "indent -npro -kr -i8 -bad -fca -sc -sob"
++#  define INDENT "gindent -npro -kr -i8 -bad -fca -sc -sob"
  #else
--#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"
- #endif /* HAVE_INDENT */
- 
- void
+ #  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"
+ #  else
+ #    define INDENT "cat"
+ #  endif
diff --git a/net/ORBit/patches/patch-ag b/net/ORBit/patches/patch-ag
index aa6b88b7217..106bfe53a1d 100644
--- a/net/ORBit/patches/patch-ag
+++ b/net/ORBit/patches/patch-ag
@@ -1,13 +1,19 @@
-$NetBSD: patch-ag,v 1.2 1998/12/19 12:31:47 tron Exp $
+$NetBSD: patch-ag,v 1.3 1999/03/05 00:25:10 tron Exp $
 
---- src/daemons/interface_repository/Makefile.in.orig	Wed Dec 16 03:41:51 1998
-+++ src/daemons/interface_repository/Makefile.in	Sat Dec 19 12:56:24 1998
-@@ -439,7 +439,7 @@
- 
- 
- $(orbit_ird_built): interface_repository.idl $(IDL)
--	$(IDL) $<
-+	$(IDL) interface_repository.idl
- 
- dist-hook:
- 	cd $(distdir); rm -f $(BUILD_SOURCES)
+--- src/IIOP/connection.c.orig	Sun Feb 21 19:56:43 1999
++++ src/IIOP/connection.c	Thu Mar  4 23:34:25 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
+@@ -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/net/ORBit/patches/patch-ah b/net/ORBit/patches/patch-ah
new file mode 100644
index 00000000000..6d99b555060
--- /dev/null
+++ b/net/ORBit/patches/patch-ah
@@ -0,0 +1,20 @@
+$NetBSD: patch-ah,v 1.1 1999/03/05 00:25: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
+ 
+ # Always use our own libtool.
++if false; then
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # 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; }
++fi
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/net/ORBit/patches/patch-ai b/net/ORBit/patches/patch-ai
new file mode 100644
index 00000000000..d8b6779c14f
--- /dev/null
+++ b/net/ORBit/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 1999/03/05 00:25:10 tron 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_la_LDFLAGS = -release $(LT_RELEASE)
+ 
+ 
+ m4datadir = $(datadir)/aclocal
diff --git a/net/ORBit/patches/patch-aj b/net/ORBit/patches/patch-aj
new file mode 100644
index 00000000000..ab953f7f7dc
--- /dev/null
+++ b/net/ORBit/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 1999/03/05 00:25:10 tron Exp $
+
+--- src/IIOP/Makefile.in.orig	Thu Feb 25 16:17:16 1999
++++ src/IIOP/Makefile.in	Fri Mar  5 00:29:31 1999
+@@ -90,9 +90,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
+ 
diff --git a/net/ORBit/patches/patch-ak b/net/ORBit/patches/patch-ak
new file mode 100644
index 00000000000..430994d23bd
--- /dev/null
+++ b/net/ORBit/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 1999/03/05 00:25:10 tron Exp $
+
+--- 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/net/ORBit/patches/patch-al b/net/ORBit/patches/patch-al
new file mode 100644
index 00000000000..982495bfe57
--- /dev/null
+++ b/net/ORBit/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 1999/03/05 00:25:10 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 @@
+ 
+ 
+ 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-common.c 	interface_repository-skels.c 	interface_repository-impl.c
diff --git a/net/ORBit/pkg/PLIST b/net/ORBit/pkg/PLIST
index 7f3cad5343b..436643252b6 100644
--- a/net/ORBit/pkg/PLIST
+++ b/net/ORBit/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 1999/02/11 19:17:29 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 1999/03/05 00:25:10 tron Exp $
+bin/libIDL-config
 bin/name-client
 bin/old-name-server
 bin/orbit-idl
@@ -6,19 +7,20 @@ bin/orbit-config
 bin/orbit-event-server
 bin/orbit-ird
 bin/orbit-name-server
-lib/libIDL.so.5.7
+lib/libIDL-0.6.so.0.0
 lib/libIDL.la
 lib/libIDL.a
-lib/libORBitCosNaming.so.3.0
+lib/libIDLConf.sh
+lib/libORBitCosNaming.so.4.0
 lib/libORBitCosNaming.la
 lib/libORBitCosNaming.a
-lib/libORBitutil.so.3.0
+lib/libORBitutil.so.4.0
 lib/libORBitutil.la
 lib/libORBitutil.a
-lib/libIIOP.so.3.0
+lib/libIIOP.so.4.0
 lib/libIIOP.la
 lib/libIIOP.a
-lib/libORBit.so.3.0
+lib/libORBit.so.4.0
 lib/libORBit.la
 lib/libORBit.a
 lib/libname-server.a
@@ -82,7 +84,8 @@ include/orb/orbit_poa.h
 include/orb/orbit_poa_type.h
 @unexec install-info --delete %D/info/libIDL.info %D/info/dir
 info/libIDL.info
-@exec install-info %D/info/libIDL.info %D/info/libIDL.info
+@exec install-info %D/info/libIDL.info %D/info/dir
+share/aclocal/libIDL.m4
 @dirrm include/libIDL
 @dirrm include/ORBitutil
 @dirrm include/ORBitservices