- Update of devel/omniORB to 3.0.3; also fixes significant problems with the

  port (see below).
- Submitted this to current maintainer on Wednesday 14 March; no response yet
- The Python modules were not correctly installed to the Python site library
  directory before.  They are now.  (Thanks to Michael Ewe <m.ewe@t-online.de>
  for pointing out the issue.)
- Used PORTDOCS pragma in $PLIST.

PR:		25934
Submitted by:	Johann Visagie <johann@egenetics.com>

8 files changed, 193 insertions, 79 deletions

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 94817724b841..c1efdd43b160 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.orl.co.uk/pub/omniORB/omniORB3/
+MASTER_SITES=	ftp://ftp.uk.research.att.com/pub/omniORB/omniORB3/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//g}
 
 MAINTAINER=	ejc@bazzle.com
@@ -16,13 +16,14 @@ MAINTAINER=	ejc@bazzle.com
 MAN1=		catior.1 genior.1 nameclt.1 obuildtree.1 ols.1 omake.1 \
 		omniNames.1 opriv.1 oshadow.1
 
-WRKSRC=		${WRKDIR}/omni/src
+WRKSRC=		${WRKDIR}/omni
+BUILD_WRKSRC=	${WRKSRC}/src
 
 USE_PYTHON=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-NO_FILTER_SHLIBS=yes
+NO_FILTER_SHLIBS=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	export
 MAKE_ENV+=	CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" \
@@ -31,15 +32,17 @@ MAKE_ENV+=	CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" \
 ONLY_FOR_ARCHS=	i386
 
 # Setting ${CONFIG_TARGET} to this value  and patching it into
-# ${WRKSRC}/../config/config.mk via the post-patch target ensures that the
+# ${WRKSRC}/config/config.mk via the post-patch target ensures that the
 # internal make variable __OSVERSION__ is set to 4.  This activates gcc
 # 2.9.5-specific code, and obviates the need for most of the patches
 # previously required since there are now version checks in the source.
 CONFIG_TARGET=	x86_freebsd_4.0
 
+CPIO=		cpio --quiet -pdum -R
+
 post-patch:
 	@${SETENV} LANG=C ${PERL} -pi -e 's/__PLATFORM__/${CONFIG_TARGET}/;' \
-		${WRKSRC}/../config/config.mk
+		${WRKSRC}/config/config.mk
 
 binfiles=	catior convertior genior nameclt omkdepend omniMapper \
 		omniNames
@@ -47,32 +50,36 @@ scriptfiles=	omniidl omniidlrun.py
 
 do-install:
 .for binfile in ${binfiles}
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/${CONFIG_TARGET}/${binfile} \
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${CONFIG_TARGET}/${binfile} \
 		${PREFIX}/bin
 .endfor
 .for scriptfile in ${scriptfiles}
-	${INSTALL_SCRIPT} ${WRKSRC}/../bin/${CONFIG_TARGET}/${scriptfile} \
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${CONFIG_TARGET}/${scriptfile} \
 		${PREFIX}/bin
 .endfor
-	cd ${WRKSRC}/../lib/${CONFIG_TARGET} && \
-		find . |cpio -pdum -R ${BINOWN}:${BINGRP} ${PREFIX}/lib
+	cd ${WRKSRC}/lib/${CONFIG_TARGET} && \
+		find . | ${CPIO} ${BINOWN}:${BINGRP} ${PREFIX}/lib
 .for m in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/../man/man1/${m} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/${m} ${PREFIX}/man/man1
 .endfor
 	${MKDIR} ${PREFIX}/include/omniORB3
 	${MKDIR} ${PREFIX}/include/omnithread
-	${INSTALL_DATA} ${WRKSRC}/../include/omnithread.h ${PREFIX}/include
-	cd ${WRKSRC}/../include && \
+	${INSTALL_DATA} ${WRKSRC}/include/omnithread.h ${PREFIX}/include
+	cd ${WRKSRC}/include && ( \
 		${INSTALL_DATA} omnithread/* ${PREFIX}/include/omnithread; \
-		${INSTALL_DATA} omniORB3/* ${PREFIX}/include/omniORB3
+		${INSTALL_DATA} omniORB3/* ${PREFIX}/include/omniORB3 )
+	cd ${WRKSRC}/lib/python && \
+		find . | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${PYTHON_SITELIBDIR}
 	@ cd ${.CURDIR}
 .if !defined(NOPORTDOCS)
 	${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_302 ${PREFIX}/share/doc/omniORB
-	cd ${WRKSRC}/../doc && \
-		find . |cpio -pdum -R ${SHAREOWN}:${SHAREGRP} ${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_${PORTVERSION:S/.//g} \
+		${PREFIX}/share/doc/omniORB
+	cd ${WRKSRC}/doc && \
+		find . | ${CPIO} ${SHAREOWN}:${SHAREGRP} \
+		${PREFIX}/share/doc/omniORB
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index 427a00640660..16b488e044bf 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -1 +1 @@
-MD5 (omniORB_302.tar.gz) = fd44f65cfd56a5c5d5a2a46d1da6c8e1
+MD5 (omniORB_303.tar.gz) = 221e68ca295c9bbcf2e23491a0d0dc2c
diff --git a/devel/omniORB/files/patch-aa b/devel/omniORB/files/patch-aa
index bc123dbe2ccf..9018becd03b2 100644
--- a/devel/omniORB/files/patch-aa
+++ b/devel/omniORB/files/patch-aa
@@ -1,5 +1,5 @@
---- ../config/config.mk.orig	Fri Aug 18 16:09:38 2000
-+++ ../config/config.mk	Mon Sep 11 17:26:22 2000
+--- 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
  #platform = x86_freebsd_4.0
diff --git a/devel/omniORB/files/patch-aj b/devel/omniORB/files/patch-aj
index 5777ddf440b3..66adc2fa7ef4 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	Fri Aug 18 16:09:33 2000
++++ mk/platforms/x86_freebsd_4.0.mk	Tue Sep 12 09:56:52 2000
 @@ -10,7 +10,7 @@
  #
  # You must set a path to a Python 1.5.2 interpreter.
diff --git a/devel/omniORB/files/patch-ak b/devel/omniORB/files/patch-ak
index 99a0f42846c0..4213e56cb464 100644
--- a/devel/omniORB/files/patch-ak
+++ b/devel/omniORB/files/patch-ak
@@ -1,5 +1,5 @@
---- tool/omniidl/cxx/idlutil.cc.orig	Fri Aug 18 16:09:06 2000
-+++ tool/omniidl/cxx/idlutil.cc	Mon Sep 11 17:44:48 2000
+--- 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)
diff --git a/devel/omniORB/files/patch-al b/devel/omniORB/files/patch-al
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/devel/omniORB/files/patch-al
+++ /dev/null
diff --git a/devel/omniORB/files/patch-mk-beforedir.mk b/devel/omniORB/files/patch-mk-beforedir.mk
new file mode 100644
index 000000000000..395189076fb5
--- /dev/null
+++ b/devel/omniORB/files/patch-mk-beforedir.mk
@@ -0,0 +1,11 @@
+--- 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 3c58d76a4a2e..ad740e54ddf6 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -1,3 +1,48 @@
+%%PORTDOCS%%share/doc/omniORB/README.FreeBSD
+%%PORTDOCS%%share/doc/omniORB/README.unix
+%%PORTDOCS%%share/doc/omniORB/ReleaseNote_omniORB_303
+%%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
+%%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/omniORB013.html
+%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB014.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/omnithread.tex
+%%PORTDOCS%%share/doc/omniORB/tex/cover.tex
+%%PORTDOCS%%share/doc/omniORB/tex/ode.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/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
@@ -53,31 +98,120 @@ include/omnithread/nt.h
 include/omnithread/posix.h
 include/omnithread/pthread_nt.h
 include/omnithread/solaris.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
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/idlast.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/idltype.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/idltype.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/idlutil.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/idlutil.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/idlvisitor.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/idlvisitor.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/main.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/main.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/output.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl/output.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/config.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/config.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/main.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/main.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/tcstring.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/tcstring.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/template.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/template.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/typecode.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/typecode.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/env.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/env.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/defs.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/defs.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/forward.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/forward.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/marshal.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/marshal.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/opers.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/opers.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/poa.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/poa.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/tcstring.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/tcstring.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/template.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/template.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/tie.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/tie.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/id.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/id.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/main.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/main.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/template.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/template.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/name.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/name.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/dispatch.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/dispatch.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/main.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/main.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/mangler.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/mangler.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/poa.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/poa.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/proxy.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/proxy.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/template.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/template.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skutil.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skutil.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/support.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/support.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/types.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/types.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/tyutil.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/tyutil.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/util.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/util.pyc
+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.2
+lib/libCOS3.so.0.3
 lib/libCOSBOA3.a
 lib/libCOSBOA3.so
 lib/libCOSBOA3.so.0
-lib/libCOSBOA3.so.0.2
+lib/libCOSBOA3.so.0.3
 lib/libCOSDynamic3.a
 lib/libCOSDynamic3.so
 lib/libCOSDynamic3.so.0
-lib/libCOSDynamic3.so.0.2
+lib/libCOSDynamic3.so.0.3
 lib/libomniDynamic3.a
 lib/libomniDynamic3.so
 lib/libomniDynamic3.so.0
-lib/libomniDynamic3.so.0.2
+lib/libomniDynamic3.so.0.3
 lib/libomniGK_alone.a
 lib/libomniGK_stub.a
 lib/libomniORB3.a
 lib/libomniORB3.so
 lib/libomniORB3.so.0
-lib/libomniORB3.so.0.2
+lib/libomniORB3.so.0.3
 lib/libomnithread.a
 lib/libomnithread.so
 lib/libomnithread.so.2
@@ -87,53 +221,15 @@ lib/libtcpwrapGK.so
 lib/libtcpwrapGK.so.2
 lib/libtcpwrapGK.so.2.0
 lib/omnicpp
-share/doc/omniORB/README.FreeBSD
-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
-share/doc/omniORB/omniORB/omniORB001.html
-share/doc/omniORB/omniORB/omniORB002.html
-share/doc/omniORB/omniORB/omniORB003.html
-share/doc/omniORB/omniORB/omniORB004.html
-share/doc/omniORB/omniORB/omniORB005.html
-share/doc/omniORB/omniORB/omniORB006.html
-share/doc/omniORB/omniORB/omniORB007.html
-share/doc/omniORB/omniORB/omniORB008.html
-share/doc/omniORB/omniORB/omniORB009.html
-share/doc/omniORB/omniORB/omniORB010.html
-share/doc/omniORB/omniORB/omniORB011.html
-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/omniidl.html
-share/doc/omniORB/omniidl.pdf
-share/doc/omniORB/omniidl.ps
-share/doc/omniORB/omnithread.html
-share/doc/omniORB/omnithread.pdf
-share/doc/omniORB/omnithread.ps
-share/doc/omniORB/omnithread.tex
-share/doc/omniORB/tex/cover.tex
-share/doc/omniORB/tex/ode.tex
-share/doc/omniORB/tex/omniORB.bib
-share/doc/omniORB/tex/omniORB.tex
-share/doc/omniORB/tex/omniParTcl.tex
-share/doc/omniORB/tex/omniidl.tex
-share/doc/omniORB/tex/omnithread.tex
-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 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
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl
 @dirrm include/omnithread
 @dirrm include/omniORB3
+%%PORTDOCS%%@dirrm share/doc/omniORB/tex
+%%PORTDOCS%%@dirrm share/doc/omniORB/omniORB
+%%PORTDOCS%%@dirrm share/doc/omniORB