5 files changed, 92 insertions, 51 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 3ce8372fe347..941406c83830 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -1,25 +1,33 @@
 # New ports collection makefile for:   orbit
-# Version required:		0.3.0
+# Version required:		0.3.90
 # Date Created:			16 Aug 1998
 # Whom:				Chia-liang Kao <clkao@CirX.ORG>
 #
-# $Id: Makefile,v 1.6 1998/11/25 00:42:11 asami Exp $
+# $Id: Makefile,v 1.7 1998/11/25 13:16:32 vanilla Exp $
 #
 
-DISTNAME=	ORBit-0.3.0
+DISTNAME=	ORBit-0.3.90
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gnome.org/pub/ORBit/
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
+		ftp://ftp.gnome.org/pub/GNOME/sources/
+#MASTER_SITES=	ftp://ftp.gnome.org/pub/ORBit/
 
 MAINTAINER=	clkao@CirX.ORG
 
-LIB_DEPENDS=	glib11.0:${PORTSDIR}/devel/glib
+LIB_DEPENDS=	glib11d.1:${PORTSDIR}/devel/glib11-devel
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
+CONFIGURE_ENV=	INSTALL='$${INSTALL} -c' \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
 CONFIGURE_ARGS= --disable-indent
 
+pre-install:
+	@if [ ! -f ${PREFIX}/info/dir ]; then \
+	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo
index d2ae92e6d576..9eb5a94a1fd6 100644
--- a/devel/ORBit/distinfo
+++ b/devel/ORBit/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.3.0.tar.gz) = b714070c52eed2a57189ed2d56f88e75
+MD5 (ORBit-0.3.90.tar.gz) = cafc78094ce82d7366a3c490225bb1fa
diff --git a/devel/ORBit/files/patch-ab b/devel/ORBit/files/patch-ab
index a0c49f88c975..535510cda2df 100644
--- a/devel/ORBit/files/patch-ab
+++ b/devel/ORBit/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Aug  8 23:10:55 1998
-+++ Makefile.in	Sat Aug  8 23:11:08 1998
-@@ -86,7 +86,7 @@
+--- Makefile.in.orig	Wed Dec 16 10:41:29 1998
++++ Makefile.in	Wed Dec 23 17:18:56 1998
+@@ -87,7 +87,7 @@
  VERSION = @VERSION@
  YACC = @YACC@
  
@@ -8,4 +8,4 @@
 +SUBDIRS=libIDL src
  
  bin_SCRIPTS=orbit-config
- 
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index cdd4388b64f5..74c6897e804b 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -1,15 +1,24 @@
---- libIDL/Makefile.in.orig	Mon Sep 21 13:50:12 1998
-+++ libIDL/Makefile.in	Wed Nov 25 21:06:38 1998
-@@ -95,7 +95,7 @@
- noinst_PROGRAMS		= tstidl
+--- libIDL/Makefile.in.orig	Wed Dec 16 10:41:34 1998
++++ libIDL/Makefile.in	Wed Dec 23 17:22:00 1998
+@@ -74,7 +74,7 @@
+ LEX = @LEX@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ NM = @NM@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+@@ -101,7 +101,7 @@
  
- libIDL_la_SOURCES	= parser.c parser.h lexer.c ns.c util.c util.h rename.h
--libIDL_la_LDFLAGS	= -version-info 5:0:5
-+libIDL_la_LDFLAGS	= -version-info 0:3:0
+ libIDL_la_SOURCES	= parser.c parser.h lexer.c \
+ 			  ns.c util.c util.h rename.h
+-libIDL_la_LDFLAGS	= -version-info 5:7:5
++libIDL_la_LDFLAGS	= -version-info 0:4:0
  
  tstidl_SOURCES		= tstidl.c
- tstidl_LDADD		= libIDL.la
-@@ -139,7 +139,7 @@
+ tstidl_LDFLAGS		= -static
+@@ -145,7 +145,7 @@
  SOURCES = $(libIDL_la_SOURCES) $(tstidl_SOURCES)
  OBJECTS = $(libIDL_la_OBJECTS) $(tstidl_OBJECTS)
  
@@ -18,45 +27,47 @@
  
  .SUFFIXES:
  .SUFFIXES: .S .c .dvi .info .lo .o .ps .s .texi .texinfo .txi
-@@ -446,7 +446,7 @@
- install-exec: install-libLTLIBRARIES
- 	@$(NORMAL_INSTALL)
- 
--install-data: install-info-am install-pkgincludeHEADERS
-+install-data: install-pkgincludeHEADERS
- 	@$(NORMAL_INSTALL)
- 
- install: install-exec install-data all
---- src/IIOP/Makefile.in.orig	Wed Sep 23 21:35:34 1998
-+++ src/IIOP/Makefile.in	Wed Sep 23 21:35:48 1998
+--- src/IIOP/Makefile.in.orig	Wed Dec 16 10:41:43 1998
++++ src/IIOP/Makefile.in	Wed Dec 23 17:22:38 1998
 @@ -117,7 +117,7 @@
  	iiop-encoders.h \
  	iiop-endian.h
  
 -libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libIIOP_la_LDFLAGS = -version-info 0:3:0
++libIIOP_la_LDFLAGS = -version-info 0:4:0
  
  EXTRA_DIST = IIOP-design.txt
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- src/ORBitutil/Makefile.in.orig	Wed Sep 23 21:35:00 1998
-+++ src/ORBitutil/Makefile.in	Wed Sep 23 21:35:14 1998
+--- src/ORBitutil/Makefile.in.orig	Wed Dec 16 10:41:42 1998
++++ src/ORBitutil/Makefile.in	Wed Dec 23 17:22:57 1998
 @@ -110,7 +110,7 @@
  	util.h \
  	compat.h
  
 -libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBitutil_la_LDFLAGS = -version-info 0:3:0
++libORBitutil_la_LDFLAGS = -version-info 0:4:0
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
  CONFIG_CLEAN_FILES = 
---- src/orb/Makefile.in.orig	Wed Sep 23 21:36:05 1998
-+++ src/orb/Makefile.in	Wed Sep 23 21:36:21 1998
-@@ -190,7 +190,7 @@
- 	orbit_poa_type.h \
- 	orbit_types.h
+--- src/orb/Makefile.in.orig	Wed Dec 16 10:41:40 1998
++++ src/orb/Makefile.in	Wed Dec 23 17:23:17 1998
+@@ -164,7 +164,7 @@
+ INTF_REP = $(top_srcdir)/src/daemons/interface_repository
+ INTF_OBJ = ../daemons/interface_repository
  
 -libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libORBit_la_LDFLAGS = -version-info 0:3:0
++libORBit_la_LDFLAGS = -version-info 0:4:0
  libORBit_la_LIBADD = $(GLIB_LIBS) -lm
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
+ 
+ BUILT_SOURCES = \
+--- src/services/name/Makefile.in.orig	Wed Dec 16 10:41:47 1998
++++ src/services/name/Makefile.in	Wed Dec 23 17:57:37 1998
+@@ -107,7 +107,7 @@
+ 	LName.pidl
+ 
+ libORBitCosNaming_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++	-version-info 0:4:0
+ 
+ INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src  @GLIB_CFLAGS@
+ 
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index d29c1118bd36..3d3db0f0133e 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -1,13 +1,24 @@
-bin/naming-client
+bin/name-client
+bin/old-name-server
 bin/orbit-config
+bin/orbit-event-server
 bin/orbit-idl
-bin/orbit-naming-server
+bin/orbit-ird
+bin/orbit-name-server
 include/IIOP/IIOP-config.h
 include/IIOP/IIOP-types.h
 include/IIOP/IIOP.h
 include/IIOP/giop-msg-buffer.h
 include/IIOP/iiop-encoders.h
 include/IIOP/iiop-endian.h
+include/ORBitservices/CosEventChannel.idl
+include/ORBitservices/CosEventComm.idl
+include/ORBitservices/CosNaming.h
+include/ORBitservices/CosNaming.idl
+include/ORBitservices/CosNaming_impl.h
+include/ORBitservices/CosTypedEventChannel.idl
+include/ORBitservices/CosTypedEventComm.idl
+include/ORBitservices/LName.pidl
 include/ORBitutil/basic_types.h
 include/ORBitutil/compat.h
 include/ORBitutil/thread-safety.h
@@ -16,14 +27,13 @@ include/ORBitutil/util.h
 include/libIDL/IDL.h
 include/orb/allocator-defs.h
 include/orb/allocators.h
-include/orb/boa.h
 include/orb/cdr.h
 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_env.h
 include/orb/corba_env_type.h
-include/orb/corba_ir.h
 include/orb/corba_object.h
 include/orb/corba_object_type.h
 include/orb/corba_orb.h
@@ -37,6 +47,7 @@ include/orb/corba_typecode_type.h
 include/orb/dii.h
 include/orb/dynany.h
 include/orb/env.h
+include/orb/interface_repository.h
 include/orb/iop.h
 include/orb/ir.h
 include/orb/options.h
@@ -47,29 +58,40 @@ include/orb/orbit_object.h
 include/orb/orbit_object_type.h
 include/orb/orbit_poa.h
 include/orb/orbit_poa_type.h
+include/orb/orbit_typecode.h
 include/orb/orbit_types.h
 include/orb/poa.h
 include/orb/sequences.h
 include/orb/typecode.h
+@unexec install-info --delete %D/info/libIDL.info %D/info/dir
+info/libIDL.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/libIDL.info %D/info/dir
 lib/libIDL.a
 lib/libIDL.la
 lib/libIDL.so
-lib/libIDL.so.0.3
+lib/libIDL.so.0.4
 lib/libIIOP.a
 lib/libIIOP.la
 lib/libIIOP.so
-lib/libIIOP.so.0.3
+lib/libIIOP.so.0.4
 lib/libORBit.a
 lib/libORBit.la
 lib/libORBit.so
-lib/libORBit.so.0.3
+lib/libORBit.so.0.4
+lib/libORBitCosNaming.a
+lib/libORBitCosNaming.la
+lib/libORBitCosNaming.so
+lib/libORBitCosNaming.so.0.4
 lib/libORBitutil.a
 lib/libORBitutil.la
 lib/libORBitutil.so
-lib/libORBitutil.so.0.3
+lib/libORBitutil.so.0.4
+lib/libname-server.a
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm include/IIOP
+@dirrm include/ORBitservices
 @dirrm include/ORBitutil
 @dirrm include/libIDL
 @dirrm include/orb