7 files changed, 41 insertions, 44 deletions

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 18dcce2597f2..a78998963899 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	3.0.4
+PORTVERSION=	3.0.5
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.uk.research.att.com/pub/omniORB/omniORB3/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	omniorb
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//g}
 
 MAINTAINER=	ejc@bazzle.com
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index 3512e944e17b..c44e7021fa82 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -1 +1 @@
-MD5 (omniORB_304.tar.gz) = 60fe9ee00b217e20070727e7eb6fd399
+MD5 (omniORB_305.tar.gz) = 49c6949e7508524e0c27cf68287c4dc9
diff --git a/devel/omniORB/files/patch-aa b/devel/omniORB/files/patch-aa
index 9018becd03b2..bbcd8b538f0a 100644
--- a/devel/omniORB/files/patch-aa
+++ b/devel/omniORB/files/patch-aa
@@ -1,10 +1,10 @@
---- config/config.mk.orig	Fri Aug 18 16:09:38 2000
-+++ config/config.mk	Mon Sep 11 17:26:22 2000
-@@ -77,6 +77,7 @@
- #platform = x86_freebsd_3.2
+--- 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
- # with debugging information. Useful if you want to debug the binaries under
diff --git a/devel/omniORB/files/patch-aj b/devel/omniORB/files/patch-aj
index 66adc2fa7ef4..f9e59ad7ae2d 100644
--- a/devel/omniORB/files/patch-aj
+++ b/devel/omniORB/files/patch-aj
@@ -1,5 +1,5 @@
---- mk/platforms/x86_freebsd_4.0.mk.orig	Fri Aug 18 16:09:33 2000
-+++ mk/platforms/x86_freebsd_4.0.mk	Tue Sep 12 09:56:52 2000
+--- 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.
@@ -17,7 +17,7 @@
  
  CPP = /usr/libexec/cpp
  
--CXX = g++295
+-CXX = g++
 +CXX ?= g++
  CXXMAKEDEPEND += -D__cplusplus -D__GNUG__ -D__GNUC__
 -CXXDEBUGFLAGS = -O2
@@ -29,7 +29,7 @@
  EgcsMajorVersion = 1
  EgcsMinorVersion = 1        # This is actually a post-1.0 egcs snapshot.
  
--CC           = gcc295
+-CC           = gcc
 +CC           ?= gcc
  CMAKEDEPEND  += -D__GNUC__
 -CDEBUGFLAGS  = -O2
diff --git a/devel/omniORB/files/patch-ak b/devel/omniORB/files/patch-ak
index 4213e56cb464..ddc0a8557e1e 100644
--- a/devel/omniORB/files/patch-ak
+++ b/devel/omniORB/files/patch-ak
@@ -1,11 +1,19 @@
---- src/tool/omniidl/cxx/idlutil.cc.orig	Fri Aug 18 16:09:06 2000
-+++ src/tool/omniidl/cxx/idlutil.cc	Mon Sep 11 17:44:48 2000
-@@ -148,7 +148,7 @@
- IdlIntLiteral
- idl_strtoul(const char* text, int base)
- {
--  return strtoull(text, 0, base);
-+  return strtouq(text, 0, base);
- }
- 
- #  endif
+--- src/tool/omniidl/cxx/idlutil.cc.orig	Thu Jul 25 16:49:13 2002
++++ src/tool/omniidl/cxx/idlutil.cc	Thu Jul 25 16:49:25 2002
+@@ -139,13 +139,13 @@
+   IdlIntLiteral ull;
+   switch (base) {
+   case 8:
+-    sscanf(text, "%I64o", &ull);
++    sscanf(text, "%qo", &ull);
+     break;
+   case 10:
+-    sscanf(text, "%I64d", &ull);
++    sscanf(text, "%qd", &ull);
+     break;
+   case 16:
+-    sscanf(text, "%I64x", &ull);
++    sscanf(text, "%qx", &ull);
+     break;
+   default:
+     abort();
diff --git a/devel/omniORB/files/patch-mk-beforedir.mk b/devel/omniORB/files/patch-mk-beforedir.mk
deleted file mode 100644
index 395189076fb5..000000000000
--- a/devel/omniORB/files/patch-mk-beforedir.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- mk/beforedir.mk.orig	Wed Mar 14 12:29:06 2001
-+++ mk/beforedir.mk	Wed Mar 14 12:29:37 2001
-@@ -313,7 +313,7 @@
- 
- CORBA_IDL_FILES = $(CORBA_INTERFACES:%=%.idl)
- 
--CORBA_STUB_DIR = $(TOP)/stub
-+CORBA_STUB_DIR = $(TOP)/idl
- 
- CorbaImplementation = NO_CORBA_IMPLEMENTATION
- 
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index 9ecd5a33dfe8..0604e0ab9eef 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -1,10 +1,9 @@
 %%PORTDOCS%%share/doc/omniORB/README.FreeBSD
 %%PORTDOCS%%share/doc/omniORB/README.unix
-%%PORTDOCS%%share/doc/omniORB/ReleaseNote_omniORB_304
+%%PORTDOCS%%share/doc/omniORB/ReleaseNote_omniORB_305
 %%PORTDOCS%%share/doc/omniORB/omniNames.html
 %%PORTDOCS%%share/doc/omniORB/omniNames.pdf
 %%PORTDOCS%%share/doc/omniORB/omniNames.ps
-%%PORTDOCS%%share/doc/omniORB/omniNames.tex
 %%PORTDOCS%%share/doc/omniORB/omniORB.pdf
 %%PORTDOCS%%share/doc/omniORB/omniORB.ps
 %%PORTDOCS%%share/doc/omniORB/omniORB/contents_motif.gif
@@ -31,7 +30,6 @@
 %%PORTDOCS%%share/doc/omniORB/omnithread.html
 %%PORTDOCS%%share/doc/omniORB/omnithread.pdf
 %%PORTDOCS%%share/doc/omniORB/omnithread.ps
-%%PORTDOCS%%share/doc/omniORB/omnithread.tex
 %%PORTDOCS%%share/doc/omniORB/tex/cover.tex
 %%PORTDOCS%%share/doc/omniORB/tex/ode.tex
 %%PORTDOCS%%share/doc/omniORB/tex/omniORB.bib
@@ -39,10 +37,11 @@
 %%PORTDOCS%%share/doc/omniORB/tex/omniParTcl.tex
 %%PORTDOCS%%share/doc/omniORB/tex/omniidl.tex
 %%PORTDOCS%%share/doc/omniORB/tex/omnithread.tex
+%%PORTDOCS%%share/doc/omniORB/tex/utilities.tex
+%%PORTDOCS%%share/doc/omniORB/tex/omniNames.tex
 %%PORTDOCS%%share/doc/omniORB/utilities.html
 %%PORTDOCS%%share/doc/omniORB/utilities.pdf
 %%PORTDOCS%%share/doc/omniORB/utilities.ps
-%%PORTDOCS%%share/doc/omniORB/utilities.tex
 bin/catior
 bin/convertior
 bin/genior
@@ -98,6 +97,7 @@ include/omnithread/nt.h
 include/omnithread/posix.h
 include/omnithread/pthread_nt.h
 include/omnithread/solaris.h
+include/omnithread/os2_impl.h
 lib/%%PYTHON_VERSION%%/site-packages/omniidl/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl/idlast.py
@@ -186,32 +186,31 @@ lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/dump.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/dump.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/example.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/example.pyc
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/showast.py
 lib/_omniidlmodule.so
 lib/_omniidlmodule.so.0
 lib/_omniidlmodule.so.0.1
 lib/libCOS3.a
 lib/libCOS3.so
 lib/libCOS3.so.0
-lib/libCOS3.so.0.4
+lib/libCOS3.so.0.5
 lib/libCOSBOA3.a
 lib/libCOSBOA3.so
 lib/libCOSBOA3.so.0
-lib/libCOSBOA3.so.0.4
+lib/libCOSBOA3.so.0.5
 lib/libCOSDynamic3.a
 lib/libCOSDynamic3.so
 lib/libCOSDynamic3.so.0
-lib/libCOSDynamic3.so.0.4
+lib/libCOSDynamic3.so.0.5
 lib/libomniDynamic3.a
 lib/libomniDynamic3.so
 lib/libomniDynamic3.so.0
-lib/libomniDynamic3.so.0.4
+lib/libomniDynamic3.so.0.5
 lib/libomniGK_alone.a
 lib/libomniGK_stub.a
 lib/libomniORB3.a
 lib/libomniORB3.so
 lib/libomniORB3.so.0
-lib/libomniORB3.so.0.4
+lib/libomniORB3.so.0.5
 lib/libomnithread.a
 lib/libomnithread.so
 lib/libomnithread.so.2