Add omniidl_be_init hack.

Both the omniORB package and py-omniORBpy install files into
${PYSITELIB}/omniidl_be, but the only files that conflicts are __init__.py
with the comment "Empty file to convince Python that this is a module."
and __init__.pyc.
So if this package is being built with the same PYTHON_VERSION_DEFAULT as
omniORB was simply don't install the __int__.py{,c} files.

4 files changed, 43 insertions, 4 deletions

diff --git a/net/py-omniORBpy/PLIST b/net/py-omniORBpy/PLIST
index 64e7a1d1b9e..c1ef2b73664 100644
--- a/net/py-omniORBpy/PLIST
+++ b/net/py-omniORBpy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/04/21 16:35:27 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/02/28 07:20:21 sbd Exp $
 include/omniORB4/pydistdate.hh
 include/omniORBpy.h
 ${PYSITELIB}/CORBA.py
@@ -316,7 +316,7 @@ ${PYSITELIB}/omniORB/omniConnectionMgmt.py
 ${PYSITELIB}/omniORB/omniConnectionMgmt.pyc
 ${PYSITELIB}/omniORB/tcInternal.py
 ${PYSITELIB}/omniORB/tcInternal.pyc
-${PYSITELIB}/omniidl_be/__init__.py
-${PYSITELIB}/omniidl_be/__init__.pyc
+${PLIST.omniidl_be_init}${PYSITELIB}/omniidl_be/__init__.py
+${PLIST.omniidl_be_init}${PYSITELIB}/omniidl_be/__init__.pyc
 ${PYSITELIB}/omniidl_be/python.py
 ${PYSITELIB}/omniidl_be/python.pyc
diff --git a/net/py-omniORBpy/distinfo b/net/py-omniORBpy/distinfo
index f1df404028a..2eff4e436ed 100644
--- a/net/py-omniORBpy/distinfo
+++ b/net/py-omniORBpy/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2011/04/21 16:35:27 drochner Exp $
+$NetBSD: distinfo,v 1.3 2012/02/28 07:20:21 sbd Exp $
 
 SHA1 (omniORBpy-3.5.tar.bz2) = 33ef2d2c59ede8a7b1072db12fe6bb2378606027
 RMD160 (omniORBpy-3.5.tar.bz2) = 952033782f2da58834f2c5255b2b8286af214d0d
 Size (omniORBpy-3.5.tar.bz2) = 607213 bytes
 SHA1 (patch-aa) = da768cb94abd970037675535b5350f84480f6ff3
+SHA1 (patch-omniidl__be_dir.mk) = 66821bd1d261d36815c6f3bd2ac0fe42722617a3
diff --git a/net/py-omniORBpy/hacks.mk b/net/py-omniORBpy/hacks.mk
new file mode 100644
index 00000000000..b50f1eb1d55
--- /dev/null
+++ b/net/py-omniORBpy/hacks.mk
@@ -0,0 +1,22 @@
+# $NetBSD: hacks.mk,v 1.1 2012/02/28 07:20:21 sbd Exp $
+.if !defined(HACKS_MK)
+HACKS_MK= defined
+
+### [ Tue Feb 28 17:44:28 NZDT 2012 : sbd ]
+### The omniORB package install files into ${PYSITELIB}/omniidl_be, 
+### but the only files that conflicts are __init__.py with the comment
+### "Empty file to convince Python that this is a module." and __init__.pyc.
+### So if this package is being built with the same PYTHON_VERSION_DEFAULT as
+### omniORB was simply don't install the __int__.py{,c} files.
+### 
+PKG_HACKS+=	omniidl_be_init
+PLIST_VARS+=    omniidl_be_init
+.if defined(_PKGSRC_BARRIER)
+omniORB_PYTHON_VERSION!=	${PKG_INFO} -Q PYTHON_VERSION_DEFAULT omniORB
+.  if "${omniORB_PYTHON_VERSION}" != "${PYTHON_VERSION_DEFAULT}"
+PLIST.omniidl_be_init=  yes
+INSTALL_ENV+=   INSTALL_OMNIIDL_BE_INIT=yes
+.  endif
+.endif
+
+.endif  # FOO_HACKS_MK
diff --git a/net/py-omniORBpy/patches/patch-omniidl__be_dir.mk b/net/py-omniORBpy/patches/patch-omniidl__be_dir.mk
new file mode 100644
index 00000000000..fbb6b865536
--- /dev/null
+++ b/net/py-omniORBpy/patches/patch-omniidl__be_dir.mk
@@ -0,0 +1,16 @@
+$NetBSD: patch-omniidl__be_dir.mk,v 1.1 2012/02/28 07:20:21 sbd Exp $
+
+--- omniidl_be/dir.mk.orig	2003-03-23 21:51:59.000000000 +0000
++++ omniidl_be/dir.mk
+@@ -6,7 +6,10 @@ ifeq ($(PYTHON),)
+ PYTHON = python
+ endif
+ 
+-FILES = __init__.py python.py
++FILES = python.py
++ifdef INSTALL_OMNIIDL_BE_INIT
++FILES += __init__.py
++endif
+ 
+ export:: $(FILES)
+ 	@(dir="$(PYLIBDIR)"; \