4 files changed, 45 insertions, 59 deletions

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index eb0edfaa14ea..94817724b841 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	3.0.1
+PORTVERSION=	3.0.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.orl.co.uk/pub/omniORB/omniORB3/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//g}
@@ -18,9 +18,6 @@ MAN1=		catior.1 genior.1 nameclt.1 obuildtree.1 ols.1 omake.1 \
 
 WRKSRC=		${WRKDIR}/omni/src
 
-BUILD_DEPENDS=  python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS=    python1.5:${PORTSDIR}/lang/python15
-
 USE_PYTHON=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
@@ -73,7 +70,7 @@ do-install:
 	${MKDIR} ${PREFIX}/share/doc/omniORB
 	${INSTALL_DATA} ${WRKSRC}/../README.unix ${PREFIX}/share/doc/omniORB
 	${INSTALL_DATA} ${WRKSRC}/../README.FreeBSD ${PREFIX}/share/doc/omniORB
-	${INSTALL_DATA} ${WRKSRC}/../ReleaseNote_omniORB_301 ${PREFIX}/share/doc/omniORB
+	${INSTALL_DATA} ${WRKSRC}/../ReleaseNote_omniORB_302 ${PREFIX}/share/doc/omniORB
 	cd ${WRKSRC}/../doc && \
 		find . |cpio -pdum -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/omniORB
 .endif
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index bb344e3cc350..427a00640660 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -1 +1 @@
-MD5 (omniORB_301.tar.gz) = 0f737010dc0118d103cbf28f0c2597af
+MD5 (omniORB_302.tar.gz) = fd44f65cfd56a5c5d5a2a46d1da6c8e1
diff --git a/devel/omniORB/files/patch-al b/devel/omniORB/files/patch-al
index 81ba9fce3488..e69de29bb2d1 100644
--- a/devel/omniORB/files/patch-al
+++ b/devel/omniORB/files/patch-al
@@ -1,11 +0,0 @@
---- tool/omniidl/cxx/dir.mk.orig	Thu Jul 13 17:25:54 2000
-+++ tool/omniidl/cxx/dir.mk	Thu Sep 14 11:50:03 2000
-@@ -254,7 +254,7 @@
-        $(RM) $@; \
-        $(CXXLINK) $(CXXLINKOPTIONS) -shared -o $@ -Wl,-soname,$(soname) \
-        $(IMPORT_LIBRARY_FLAGS) \
--       $(filter-out $(LibSuffixPattern),$^) $(LIBS)\
-+       $(filter-out $(LibSuffixPattern),$^) $(LIBS) -lgcc\
-        )
- 
- export:: $(lib)
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index f3c4517d9a65..3c58d76a4a2e 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -47,49 +47,55 @@ include/omniORB3/templatedecls.h
 include/omniORB3/templatedefns.h
 include/omniORB3/tracedthread.h
 include/omniORB3/userexception.h
+include/omnithread.h
 include/omnithread/mach.h
 include/omnithread/nt.h
 include/omnithread/posix.h
 include/omnithread/pthread_nt.h
 include/omnithread/solaris.h
-include/omnithread.h
-lib/omnicpp
 lib/_omniidlmodule.so
-lib/_omniidlmodule.so.0.1
 lib/_omniidlmodule.so.0
-lib/libomnithread.a
-lib/libomnithread.so
-lib/libomnithread.so.2.1
-lib/libomnithread.so.2
-lib/libomniORB3.a
-lib/libomniORB3.so
-lib/libomniORB3.so.0.1
-lib/libomniORB3.so.0
-lib/libomniGK_stub.a
-lib/libomniGK_alone.a
-lib/libtcpwrapGK.a
-lib/libtcpwrapGK.so
-lib/libtcpwrapGK.so.2.0
-lib/libtcpwrapGK.so.2
-lib/libomniDynamic3.a
-lib/libomniDynamic3.so
-lib/libomniDynamic3.so.0.1
-lib/libomniDynamic3.so.0
+lib/_omniidlmodule.so.0.1
 lib/libCOS3.a
-lib/libCOSDynamic3.a
 lib/libCOS3.so
-lib/libCOS3.so.0.1
 lib/libCOS3.so.0
-lib/libCOSDynamic3.so
-lib/libCOSDynamic3.so.0.1
-lib/libCOSDynamic3.so.0
+lib/libCOS3.so.0.2
 lib/libCOSBOA3.a
 lib/libCOSBOA3.so
-lib/libCOSBOA3.so.0.1
 lib/libCOSBOA3.so.0
-share/doc/omniORB/README.unix
+lib/libCOSBOA3.so.0.2
+lib/libCOSDynamic3.a
+lib/libCOSDynamic3.so
+lib/libCOSDynamic3.so.0
+lib/libCOSDynamic3.so.0.2
+lib/libomniDynamic3.a
+lib/libomniDynamic3.so
+lib/libomniDynamic3.so.0
+lib/libomniDynamic3.so.0.2
+lib/libomniGK_alone.a
+lib/libomniGK_stub.a
+lib/libomniORB3.a
+lib/libomniORB3.so
+lib/libomniORB3.so.0
+lib/libomniORB3.so.0.2
+lib/libomnithread.a
+lib/libomnithread.so
+lib/libomnithread.so.2
+lib/libomnithread.so.2.1
+lib/libtcpwrapGK.a
+lib/libtcpwrapGK.so
+lib/libtcpwrapGK.so.2
+lib/libtcpwrapGK.so.2.0
+lib/omnicpp
 share/doc/omniORB/README.FreeBSD
-share/doc/omniORB/ReleaseNote_omniORB_301
+share/doc/omniORB/README.unix
+share/doc/omniORB/ReleaseNote_omniORB_302
+share/doc/omniORB/omniNames.html
+share/doc/omniORB/omniNames.pdf
+share/doc/omniORB/omniNames.ps
+share/doc/omniORB/omniNames.tex
+share/doc/omniORB/omniORB.pdf
+share/doc/omniORB/omniORB.ps
 share/doc/omniORB/omniORB/contents_motif.gif
 share/doc/omniORB/omniORB/index.html
 share/doc/omniORB/omniORB/next_motif.gif
@@ -108,12 +114,6 @@ share/doc/omniORB/omniORB/omniORB012.html
 share/doc/omniORB/omniORB/omniORB013.html
 share/doc/omniORB/omniORB/omniORB014.html
 share/doc/omniORB/omniORB/previous_motif.gif
-share/doc/omniORB/omniNames.html
-share/doc/omniORB/omniNames.pdf
-share/doc/omniORB/omniNames.ps
-share/doc/omniORB/omniNames.tex
-share/doc/omniORB/omniORB.pdf
-share/doc/omniORB/omniORB.ps
 share/doc/omniORB/omniidl.html
 share/doc/omniORB/omniidl.pdf
 share/doc/omniORB/omniidl.ps
@@ -121,10 +121,6 @@ share/doc/omniORB/omnithread.html
 share/doc/omniORB/omnithread.pdf
 share/doc/omniORB/omnithread.ps
 share/doc/omniORB/omnithread.tex
-share/doc/omniORB/utilities.html
-share/doc/omniORB/utilities.pdf
-share/doc/omniORB/utilities.ps
-share/doc/omniORB/utilities.tex
 share/doc/omniORB/tex/cover.tex
 share/doc/omniORB/tex/ode.tex
 share/doc/omniORB/tex/omniORB.bib
@@ -132,8 +128,12 @@ share/doc/omniORB/tex/omniORB.tex
 share/doc/omniORB/tex/omniParTcl.tex
 share/doc/omniORB/tex/omniidl.tex
 share/doc/omniORB/tex/omnithread.tex
-@dirrm include/omniORB3
-@dirrm include/omnithread
-@dirrm share/doc/omniORB/omniORB
+share/doc/omniORB/utilities.html
+share/doc/omniORB/utilities.pdf
+share/doc/omniORB/utilities.ps
+share/doc/omniORB/utilities.tex
 @dirrm share/doc/omniORB/tex
+@dirrm share/doc/omniORB/omniORB
 @dirrm share/doc/omniORB
+@dirrm include/omnithread
+@dirrm include/omniORB3