Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66]) by www.NetBSD.org (Postfix) with ESMTP id BD05D63B952 for ; Tue, 28 Feb 2012 07:20:20 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id CC4EA14A162; Tue, 28 Feb 2012 07:20:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E480F14A161 for ; Tue, 28 Feb 2012 07:20:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id RPkRwMHjeHnr for ; Tue, 28 Feb 2012 07:20:22 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 5E4EB14A15B for ; Tue, 28 Feb 2012 07:20:22 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 3839B175DD; Tue, 28 Feb 2012 07:20:22 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Tue, 28 Feb 2012 07:20:22 +0000 From: "Steven Drake" Subject: CVS commit: pkgsrc/net/py-omniORBpy To: pkgsrc-changes@NetBSD.org Reply-To: sbd@netbsd.org X-Mailer: log_accum Message-Id: <20120228072022.3839B175DD@cvs.netbsd.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk Module Name: pkgsrc Committed By: sbd Date: Tue Feb 28 07:20:21 UTC 2012 Modified Files: pkgsrc/net/py-omniORBpy: PLIST distinfo Added Files: pkgsrc/net/py-omniORBpy: hacks.mk pkgsrc/net/py-omniORBpy/patches: patch-omniidl__be_dir.mk Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-omniORBpy/PLIST \ pkgsrc/net/py-omniORBpy/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/net/py-omniORBpy/hacks.mk cvs rdiff -u -r0 -r1.1 \ pkgsrc/net/py-omniORBpy/patches/patch-omniidl__be_dir.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.