--gBBFr7Ir9EOA20Yy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

-On [20050625 22:11], Eric Gillespie (epg@pretzelnet.org) wrote:
>I couldn't get py-m2crypto to work with swig 1.3.24 despite its
>claims to work with it, so i just left swig-build and added the
>conflicts.

Can you test this?  Python 2.3 and 2.4 seem to work.  Need someone who might
have 2.2.  For all I know you can just nix the swig stuff from setup.py
since it picks it up from Python itself (based on a patch from FreeBSD's
ports), but I only got 2.4 installed on my boxes here.

It needs a check against OpenSSL 0.9.8 and higher, since it is NOT
compatible with that version.  But I have no idea how to do that.  Could I
just add openssl<0.9.8 after the current openssl>= part in Makefile?

-- 
Jeroen Ruigrok van der Werven <asmodai(at)wxs.nl> / asmodai / kita no mono
Free Tibet! http://www.savetibet.org/ | http://www.andf.info/
http://www.tendra.org/   | http://www.in-nomine.org/
Nothing is more honorable than enlightenment, nothing is more beautiful
than virtue...

--gBBFr7Ir9EOA20Yy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="py-m2crypto.diff"

Index: security/py-m2crypto/Makefile
===================================================================
RCS file: /home/ncvs/NetBSD/pkgsrc/security/py-m2crypto/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- security/py-m2crypto/Makefile	11 Apr 2005 21:47:18 -0000	1.12
+++ security/py-m2crypto/Makefile	31 Aug 2005 07:15:03 -0000
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.12 2005/04/11 21:47:18 tv Exp $
 #
 
-DISTNAME=		m2crypto-0.12
-PKGNAME=		${PYPKGPREFIX}-m2crypto-0.12
-PKGREVISION=		2
+DISTNAME=		m2crypto-0.13
+PKGNAME=		${PYPKGPREFIX}-m2crypto-0.13
 CATEGORIES=		security python
 MASTER_SITES=		http://sandbox.rulemaker.net/ngps/Dist/
 EXTRACT_SUFX=		.zip
@@ -13,11 +12,11 @@
 COMMENT=		Crypto and SSL toolkit for Python
 
 PYDISTUTILSPKG=			yes
-PYTHON_VERSIONS_ACCEPTED=	23 22 21
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 
 BUILDLINK_DEPENDS.openssl=	openssl>=0.9.7b
 
 .include "../../lang/python/extension.mk"
-.include "../../devel/swig-build/buildlink3.mk"
+.include "../../devel/swig13/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: security/py-m2crypto/distinfo
===================================================================
RCS file: /home/ncvs/NetBSD/pkgsrc/security/py-m2crypto/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- security/py-m2crypto/distinfo	24 Feb 2005 13:10:12 -0000	1.3
+++ security/py-m2crypto/distinfo	31 Aug 2005 07:12:11 -0000
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.3 2005/02/24 13:10:12 agc Exp $
 
-SHA1 (m2crypto-0.12.zip) = 33755f36d3d43d4c89281fcc57571eb99e275a3d
-RMD160 (m2crypto-0.12.zip) = c005e8b7e77651bbeb7d2df9267d0b2940ace0fb
-Size (m2crypto-0.12.zip) = 397229 bytes
+SHA1 (m2crypto-0.13.zip) = 53b722f6ca9a3661c42c18360b158f3e7ac5b5c2
+RMD160 (m2crypto-0.13.zip) = b2477dff6f49a80ab5508f18837009b4a634a0df
+Size (m2crypto-0.13.zip) = 410759 bytes
+SHA1 (patch-aa) = 538277c944bb829b45e751560138303f39440493
--- /dev/null	2005-08-31 09:18:48.000000000 +0200
+++ security/py-m2crypto/patches/patch-aa	2005-08-31 09:08:52.000000000 +0200
@@ -0,0 +1,61 @@
+$NetBSD$
+
+--- setup.py.orig	2005-08-31 09:07:45.000000000 +0200
++++ setup.py
+@@ -12,56 +12,6 @@ import os, shutil
+ from distutils.core import setup, Extension
+ from distutils.command import build_ext
+ 
+-# This copy of swig_sources is from Python 2.2.
+-
+-def swig_sources (self, sources):
+-
+-    """Walk the list of source files in 'sources', looking for SWIG
+-    interface (.i) files.  Run SWIG on all that are found, and
+-    return a modified 'sources' list with SWIG source files replaced
+-    by the generated C (or C++) files.
+-    """
+-
+-    new_sources = []
+-    swig_sources = []
+-    swig_targets = {}
+-
+-    # XXX this drops generated C/C++ files into the source tree, which
+-    # is fine for developers who want to distribute the generated
+-    # source -- but there should be an option to put SWIG output in
+-    # the temp dir.
+-
+-    if self.swig_cpp:
+-        target_ext = '.cpp'
+-    else:
+-        target_ext = '.c'
+-
+-    for source in sources:
+-        (base, ext) = os.path.splitext(source)
+-        if ext == ".i":             # SWIG interface file
+-            new_sources.append(base + target_ext)
+-            swig_sources.append(source)
+-            swig_targets[source] = new_sources[-1]
+-        else:
+-            new_sources.append(source)
+-
+-    if not swig_sources:
+-        return new_sources
+-
+-    swig = self.find_swig()
+-    swig_cmd = [swig, "-python", "-ISWIG"]
+-    if self.swig_cpp:
+-        swig_cmd.append("-c++")
+-
+-    for source in swig_sources:
+-        target = swig_targets[source]
+-        self.announce("swigging %s to %s" % (source, target))
+-        self.spawn(swig_cmd + ["-o", target, source])
+-
+-    return new_sources
+-
+-build_ext.build_ext.swig_sources = swig_sources
+-
+ my_inc = os.path.join(os.getcwd(), 'SWIG')
+ 
+ if os.name == 'nt':

--gBBFr7Ir9EOA20Yy--