3 files changed, 79 insertions, 79 deletions

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index f07c4219b4d9..8028a8afc143 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -36,8 +36,7 @@ PLIST_SUB+=	STATIC="@comment "
 PLIST_SUB+=	STATIC=""
 .endif
 
-MAN1=		catior.1 genior.1 nameclt.1 obuildtree.1 ols.1 omake.1 \
-		omniNames.1 opriv.1 oshadow.1
+MAN1=		catior.1 genior.1 nameclt.1 omniNames.1 omniidl.1
 
 pre-configure:
 	@ ${MKDIR} ${CONFIGURE_WRKSRC}
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index 49f2d34f4c9e..d49f0465f1a5 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -1 +1 @@
-MD5 (omniORB-4.0.1.tar.gz) = 430b889bd2e1e9a7563df5c91fe4e455
+MD5 (omniORB-4.0.2.tar.gz) = 283e4744759b73368fbea66f98c2bd95
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index 454a93f5df09..7a58a2406db4 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -1,53 +1,3 @@
-%%PORTDOCS%%share/doc/omniORB/COPYING
-%%PORTDOCS%%share/doc/omniORB/README.FIRST
-%%PORTDOCS%%share/doc/omniORB/README.unix
-%%PORTDOCS%%share/doc/omniORB/ReleaseNotes_4.0.1.txt
-%%PORTDOCS%%share/doc/omniORB/omniNames.html
-%%PORTDOCS%%share/doc/omniORB/omniNames.pdf
-%%PORTDOCS%%share/doc/omniORB/omniNames.ps
-%%PORTDOCS%%share/doc/omniORB/omniORB.pdf
-%%PORTDOCS%%share/doc/omniORB/omniORB.ps
-%%PORTDOCS%%share/doc/omniORB/omniORB/contents_motif.gif
-%%PORTDOCS%%share/doc/omniORB/omniORB/index.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/next_motif.gif
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB001.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB002.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB003.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB004.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB005.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB006.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB007.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB008.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB009.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB010.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB011.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB012.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/previous_motif.gif
-%%PORTDOCS%%share/doc/omniORB/omniidl.html
-%%PORTDOCS%%share/doc/omniORB/omniidl.pdf
-%%PORTDOCS%%share/doc/omniORB/omniidl.ps
-%%PORTDOCS%%share/doc/omniORB/omnithread.html
-%%PORTDOCS%%share/doc/omniORB/omnithread.pdf
-%%PORTDOCS%%share/doc/omniORB/omnithread.ps
-%%PORTDOCS%%share/doc/omniORB/tex/cover.tex
-%%PORTDOCS%%share/doc/omniORB/tex/ode.tex
-%%PORTDOCS%%share/doc/omniORB/tex/omniNames.tex
-%%PORTDOCS%%share/doc/omniORB/tex/omniORB.bib
-%%PORTDOCS%%share/doc/omniORB/tex/omniORB.tex
-%%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/utilities.html
-%%PORTDOCS%%share/doc/omniORB/utilities.pdf
-%%PORTDOCS%%share/doc/omniORB/utilities.ps
-%%STATIC%%lib/libCOS4.a
-%%STATIC%%lib/libCOSDynamic4.a
-%%STATIC%%lib/libomniCodeSets4.a
-%%STATIC%%lib/libomniDynamic4.a
-%%STATIC%%lib/libomniORB4.a
-%%STATIC%%lib/libomnisslTP.a
-%%STATIC%%lib/libomnithread.a
 bin/catior
 bin/convertior
 bin/genior
@@ -55,6 +5,7 @@ bin/nameclt
 bin/omkdepend
 bin/omniMapper
 bin/omniNames
+bin/omniNames-daemon
 bin/omnicpp
 bin/omniidl
 bin/omniidlrun.py
@@ -107,6 +58,7 @@ include/omniORB4/IOP_S.h
 include/omniORB4/Naming.hh
 include/omniORB4/acconfig.h
 include/omniORB4/boa.h
+include/omniORB4/bootstrap.hh
 include/omniORB4/callDescriptor.h
 include/omniORB4/callHandle.h
 include/omniORB4/cdrStream.h
@@ -212,6 +164,34 @@ include/omnithread/nt.h
 include/omnithread/posix.h
 include/omnithread/pthread_nt.h
 include/omnithread/solaris.h
+%%STATIC%%lib/libCOS4.a
+%%STATIC%%lib/libCOSDynamic4.a
+%%STATIC%%lib/libomniCodeSets4.a
+%%STATIC%%lib/libomniDynamic4.a
+%%STATIC%%lib/libomniORB4.a
+%%STATIC%%lib/libomnisslTP.a
+%%STATIC%%lib/libomnithread.a
+lib/libCOS4.so
+lib/libCOS4.so.0
+lib/libCOS4.so.0.2
+lib/libCOSDynamic4.so
+lib/libCOSDynamic4.so.0
+lib/libCOSDynamic4.so.0.2
+lib/libomniCodeSets4.so
+lib/libomniCodeSets4.so.0
+lib/libomniCodeSets4.so.0.2
+lib/libomniDynamic4.so
+lib/libomniDynamic4.so.0
+lib/libomniDynamic4.so.0.2
+lib/libomniORB4.so
+lib/libomniORB4.so.0
+lib/libomniORB4.so.0.2
+lib/libomnisslTP.so
+lib/libomnisslTP.so.4
+lib/libomnisslTP.so.4.0
+lib/libomnithread.so
+lib/libomnithread.so.3
+lib/libomnithread.so.3.0
 lib/%%PYTHON_VERSION%%/site-packages/_omniidlmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/_omniidlmodule.so.1
 lib/%%PYTHON_VERSION%%/site-packages/_omniidlmodule.so.1.0
@@ -307,28 +287,49 @@ 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/interactive.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/interactive.pyc
-lib/libCOS4.so
-lib/libCOS4.so.0
-lib/libCOS4.so.0.1
-lib/libCOSDynamic4.so
-lib/libCOSDynamic4.so.0
-lib/libCOSDynamic4.so.0.1
-lib/libomniCodeSets4.so
-lib/libomniCodeSets4.so.0
-lib/libomniCodeSets4.so.0.1
-lib/libomniDynamic4.so
-lib/libomniDynamic4.so.0
-lib/libomniDynamic4.so.0.1
-lib/libomniORB4.so
-lib/libomniORB4.so.0
-lib/libomniORB4.so.0.1
-lib/libomnisslTP.so
-lib/libomnisslTP.so.4
-lib/libomnisslTP.so.4.0
-lib/libomnithread.so
-lib/libomnithread.so.3
-lib/libomnithread.so.3.0
-share/omniORB/idl/COS/AttNotifyChannelAdmin.idl
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README.FIRST
+%%PORTDOCS%%%%DOCSDIR%%/README.unix
+%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes_4.0.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/omniNames.html
+%%PORTDOCS%%%%DOCSDIR%%/omniNames.pdf
+%%PORTDOCS%%%%DOCSDIR%%/omniNames.ps
+%%PORTDOCS%%%%DOCSDIR%%/omniORB.pdf
+%%PORTDOCS%%%%DOCSDIR%%/omniORB.ps
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/contents_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/index.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/next_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB001.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB002.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB003.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB004.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB005.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB006.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB007.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB008.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB009.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB010.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB011.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB012.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/previous_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/omniidl.html
+%%PORTDOCS%%%%DOCSDIR%%/omniidl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/omniidl.ps
+%%PORTDOCS%%%%DOCSDIR%%/omnithread.html
+%%PORTDOCS%%%%DOCSDIR%%/omnithread.pdf
+%%PORTDOCS%%%%DOCSDIR%%/omnithread.ps
+%%PORTDOCS%%%%DOCSDIR%%/tex/cover.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/ode.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniNames.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniORB.bib
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniORB.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniParTcl.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniidl.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/omnithread.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/utilities.tex
+%%PORTDOCS%%%%DOCSDIR%%/utilities.html
+%%PORTDOCS%%%%DOCSDIR%%/utilities.pdf
+%%PORTDOCS%%%%DOCSDIR%%/utilities.ps
 share/omniORB/idl/COS/CosCollection.idl
 share/omniORB/idl/COS/CosCompoundLifeCycle.idl
 share/omniORB/idl/COS/CosConcurrencyControl.idl
@@ -397,6 +398,9 @@ share/omniORB/idl/poa_include.idl
 @dirrm share/omniORB/idl/COS
 @dirrm share/omniORB/idl
 @dirrm share/omniORB
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tex
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/omniORB
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header
@@ -408,6 +412,3 @@ share/omniORB/idl/poa_include.idl
 @dirrm include/omniORB4/internal
 @dirrm include/omniORB4
 @dirrm include/COS
-%%PORTDOCS%%@dirrm share/doc/omniORB/tex
-%%PORTDOCS%%@dirrm share/doc/omniORB/omniORB
-%%PORTDOCS%%@dirrm share/doc/omniORB