- Update to version 4.0.0

- A fairly significant rewrite of the port, as 4.0.0 now deprecates the
  traditinal OmniORB build infrastructure in favour of the GNU tools.

PR:		44338
Submitted by:	wjv
Approved by:	maintainer timeout

4 files changed, 22 insertions, 68 deletions

diff --git a/devel/omniORB/files/patch-aa b/devel/omniORB/files/patch-aa
deleted file mode 100644
index bbcd8b538f0a..000000000000
--- a/devel/omniORB/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/config.mk.orig	Thu Jul 25 16:42:35 2002
-+++ config/config.mk	Thu Jul 25 16:42:07 2002
-@@ -85,6 +85,7 @@
- #platform = x86_freebsd_4.0
- #platform = x86_openbsd_3.0
- #platform = pc486_rtems_4.5.0
-+platform = __PLATFORM__
- 
- 
- # On Win32 platforms, uncomment the following line to build all the binaries
diff --git a/devel/omniORB/files/patch-aj b/devel/omniORB/files/patch-aj
deleted file mode 100644
index f9e59ad7ae2d..000000000000
--- a/devel/omniORB/files/patch-aj
+++ /dev/null
@@ -1,58 +0,0 @@
---- mk/platforms/x86_freebsd_4.0.mk.orig	Thu Jul 25 16:36:31 2002
-+++ mk/platforms/x86_freebsd_4.0.mk	Thu Jul 25 16:38:55 2002
-@@ -10,7 +10,7 @@
- #
- # You must set a path to a Python 1.5.2 interpreter.
- 
--#PYTHON = /usr/local/bin/python
-+PYTHON = ${PYTHON_CMD}
- 
- 
- #
-@@ -25,12 +25,13 @@
- #
- 
- AR = ar cq
-+MKDIRHIER=	${MKDIR}
- 
- CPP = /usr/libexec/cpp
- 
--CXX = g++
-+CXX ?= g++
- CXXMAKEDEPEND += -D__cplusplus -D__GNUG__ -D__GNUC__
--CXXDEBUGFLAGS = -O2
-+CXXDEBUGFLAGS ?= -O2
- 
- CXXLINK		= $(CXX) -pthread -s
- CXXLINKOPTIONS  = $(CXXDEBUGFLAGS) $(CXXOPTIONS)
-@@ -39,14 +40,14 @@
- EgcsMajorVersion = 1
- EgcsMinorVersion = 1        # This is actually a post-1.0 egcs snapshot.
- 
--CC           = gcc
-+CC           ?= gcc
- CMAKEDEPEND  += -D__GNUC__
--CDEBUGFLAGS  = -O2
-+CDEBUGFLAGS  ?= -O2
- 
- CLINK        = $(CC)
- CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS)
- 
--INSTALL = install -c
-+INSTALL = ${BSD_INSTALL} -c
- 
- IMPORT_CPPFLAGS += -D__x86__ -D__freebsd__ -D__OSVERSION__=4
- 
-@@ -72,10 +73,10 @@
- # Default location of the omniORB configuration file [falls back to this if
- # the environment variable OMNIORB_CONFIG is not set] :
- 
--OMNIORB_CONFIG_DEFAULT_LOCATION = /etc/omniORB.cfg
-+OMNIORB_CONFIG_DEFAULT_LOCATION = ${PREFIX}/etc/omniORB.cfg
- 
- # Default directory for the omniNames log files.
--OMNINAMES_LOG_DEFAULT_LOCATION = /var/omninames
-+OMNINAMES_LOG_DEFAULT_LOCATION = /var/log/omninames
- 
- # Uncomment the following if you want all utils and examples build in
- # this tree to statically linke with the omniORB libraries.
diff --git a/devel/omniORB/files/patch-idl::COS::Gnumakefile.in b/devel/omniORB/files/patch-idl::COS::Gnumakefile.in
new file mode 100644
index 000000000000..18f578c0bcab
--- /dev/null
+++ b/devel/omniORB/files/patch-idl::COS::Gnumakefile.in
@@ -0,0 +1,11 @@
+--- idl/COS/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
++++ idl/COS/GNUmakefile.in	Fri Oct 18 20:27:23 2002
+@@ -4,7 +4,7 @@
+ VPATH=@srcdir@
+ INSTALL=@INSTALL@
+ 
+-INSTALLDIR = $(INSTALLIDLDIR)/omniORB/COS
++INSTALLDIR = $(INSTALLIDLDIR)/COS
+ 
+ FILES = AttNotifyChannelAdmin.idl CosCollection.idl			\
+         CosCompoundLifeCycle.idl CosConcurrencyControl.idl		\
diff --git a/devel/omniORB/files/patch-idl::Gnumakefile.in b/devel/omniORB/files/patch-idl::Gnumakefile.in
new file mode 100644
index 000000000000..d0aa376f299c
--- /dev/null
+++ b/devel/omniORB/files/patch-idl::Gnumakefile.in
@@ -0,0 +1,11 @@
+--- idl/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
++++ idl/GNUmakefile.in	Fri Oct 18 17:32:26 2002
+@@ -4,7 +4,7 @@
+ VPATH=@srcdir@
+ INSTALL=@INSTALL@
+ 
+-INSTALLDIR = $(INSTALLIDLDIR)/omniORB
++INSTALLDIR = $(INSTALLIDLDIR)
+ 
+ FILES = Naming.idl bootstrap.idl corbaidl.idl echo.idl ir.idl orb.idl \
+         poa.idl poa_include.idl