hi,

py3-sip isnt correct right now, its sipconfig module returns the wrong
path to the sip binary:

c64:~/ $python3.6 
Python 3.6.3 (default, Nov  8 2017, 15:44:01) 
[GCC 4.2.1 Compatible OpenBSD Clang 5.0.0 (tags/RELEASE_500/final)] on
openbsd6
Type "help", "copyright", "credits" or "license" for more information.
>>> import sipconfig
>>> sipcfg = sipconfig.Configuration()
>>> print("sip_bin:%s" % sipcfg.sip_bin)
sip_bin:/usr/local/bin/sip

while it should be sip-3:

py-sip-4.19.3p1:devel/py-sip:/usr/local/bin/sip
py3-sip-4.19.3p1:devel/py-sip,python3:/usr/local/bin/sip-3

The following diff fixes it and the sipconfig.py file has the right
paths:

$grep sip_bin /usr/local/lib/python*/site-packages/sipconfig.py 
/usr/local/lib/python2.7/site-packages/sipconfig.py:    'sip_bin': 
'/usr/local/bin/sip',
/usr/local/lib/python3.6/site-packages/sipconfig.py:    'sip_bin': 
'/usr/local/bin/sip-3',

looking for okays, and i wonder if it should go in a bulk.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-sip/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile    26 Jul 2017 22:45:18 -0000      1.39
+++ Makefile    11 Nov 2017 07:03:34 -0000
@@ -7,7 +7,7 @@
 
 DISTNAME=      sip-4.19.3
 PKGNAME=       py-${DISTNAME}
-REVISION =     1
+REVISION =     2
 CATEGORIES=    devel
 
 HOMEPAGE=      http://www.riverbankcomputing.co.uk/software/sip/intro
@@ -39,6 +39,8 @@
 NO_TEST=       Yes
 
 SUBST_VARS +=  MODPY_LIB_SUFFIX
+pre-configure:
+       ${SUBST_CMD} ${WRKSRC}/configure.py
 
 post-install:
        ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${WRKINST}${MODPY_SITEPKG}
Index: patches/patch-configure_py
===================================================================
RCS file: patches/patch-configure_py
diff -N patches/patch-configure_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_py  11 Nov 2017 07:03:34 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: configure.py
+--- configure.py.orig
++++ configure.py
+@@ -281,7 +281,7 @@ def create_config(module, template, macros):
+         "sip_version":      sip_version,
+         "sip_version_str":  sip_version_str,
+         "platform":         build_platform,
+-        "sip_bin":          os.path.join(sip_bin_dir, "sip"),
++        "sip_bin":          os.path.join(sip_bin_dir, 
"sip${MODPY_BIN_SUFFIX}"),
+         "sip_inc_dir":      sip_inc_dir,
+         "sip_mod_dir":      sip_module_dir,
+         "default_bin_dir":  plat_bin_dir,

Reply via email to