Fri Aug 23 11:25:38 2013 UTC ()
update to 4.15
Adds features required by PyQt v5.0.1 and PyQt v4.10.3


(drochner)
diff -r1.38 -r1.39 pkgsrc/x11/py-sip/Makefile
diff -r1.31 -r1.32 pkgsrc/x11/py-sip/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/py-sip/patches/patch-aa
cvs diff -r1.38 -r1.39 pkgsrc/x11/py-sip/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-sip/Makefile 2013/07/04 17:03:02 1.38
+++ pkgsrc/x11/py-sip/Makefile 2013/08/23 11:25:38 1.39
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.38 2013/07/04 17:03:02 wiz Exp $ 1# $NetBSD: Makefile,v 1.39 2013/08/23 11:25:38 drochner Exp $
2 2
3DISTNAME= sip-4.14.7 3DISTNAME= sip-4.15
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= x11 devel python 5CATEGORIES= x11 devel python
6#MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/sip4/ 6#MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/sip4/
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.riverbankcomputing.com/software/sip/intro 10HOMEPAGE= http://www.riverbankcomputing.com/software/sip/intro
11COMMENT= Tool to create Python bindings for C++ libraries 11COMMENT= Tool to create Python bindings for C++ libraries
12 12
13PYTHON_VERSIONS_INCLUDE_3X= yes 13PYTHON_VERSIONS_INCLUDE_3X= yes
14 14
15CONFLICTS+= ${PYPKGPREFIX}-qt2-sip-* ${PYPKGPREFIX}-qt3-sip-* 15CONFLICTS+= ${PYPKGPREFIX}-qt2-sip-* ${PYPKGPREFIX}-qt3-sip-*
16 16
cvs diff -r1.31 -r1.32 pkgsrc/x11/py-sip/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-sip/distinfo 2013/07/04 17:03:02 1.31
+++ pkgsrc/x11/py-sip/distinfo 2013/08/23 11:25:38 1.32
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.31 2013/07/04 17:03:02 wiz Exp $ 1$NetBSD: distinfo,v 1.32 2013/08/23 11:25:38 drochner Exp $
2 2
3SHA1 (sip-4.14.7.tar.gz) = ee048f6db7257d1eae2d9d2e407c1657c8888023 3SHA1 (sip-4.15.tar.gz) = 211b8f5ecc3d99b72b88b2e3a45a57808452879c
4RMD160 (sip-4.14.7.tar.gz) = 2148334fa22d0002ec92d3446d9c3536bb1e0c70 4RMD160 (sip-4.15.tar.gz) = f43990bfd188c51f368a169fd6d3f080f9e94520
5Size (sip-4.14.7.tar.gz) = 754916 bytes 5Size (sip-4.15.tar.gz) = 772479 bytes
6SHA1 (patch-aa) = 353f3c08b4eb27a329221ecfeec6feb0dca4b287 6SHA1 (patch-aa) = 5a94ed24d3ea0a960abfeea7aaaaf6b542d6ad64
7SHA1 (patch-ab) = 044f78528dc67f7585c15b0fb3ec116ff11e31a6 7SHA1 (patch-ab) = 044f78528dc67f7585c15b0fb3ec116ff11e31a6
cvs diff -r1.6 -r1.7 pkgsrc/x11/py-sip/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/py-sip/patches/Attic/patch-aa 2012/05/23 13:26:49 1.6
+++ pkgsrc/x11/py-sip/patches/Attic/patch-aa 2013/08/23 11:25:38 1.7
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1$NetBSD: patch-aa,v 1.6 2012/05/23 13:26:49 obache Exp $ 1$NetBSD: patch-aa,v 1.7 2013/08/23 11:25:38 drochner Exp $
2 2
3--- configure.py.orig 2012-02-10 10:03:04.000000000 +0000 3--- configure.py.orig 2013-08-21 05:25:44.000000000 +0000
4+++ configure.py 4+++ configure.py
5@@ -19,6 +19,7 @@ import sys 5@@ -19,6 +19,7 @@ import sys
6 import os 6 import os
7 import glob 7 import glob
8 import optparse 8 import optparse
9+import imp 9+import imp
10 from distutils import sysconfig 10 from distutils import sysconfig
11  11
12 import siputils 12 try:
13@@ -211,7 +212,7 @@ def set_platform_directories(): 13@@ -218,7 +219,7 @@ def set_platform_directories():
14  14
15 plat_py_lib_dir = lib_dir + "/config" 15 plat_py_lib_dir = lib_dir + "/config"
16 plat_bin_dir = sys.exec_prefix + "/bin" 16 plat_bin_dir = sys.exec_prefix + "/bin"
17- plat_sip_dir = sys.prefix + "/share/sip" 17- plat_sip_dir = sys.prefix + "/share/sip"
18+ plat_sip_dir = sys.prefix + "/share/sip%s" % sys.version[0:3] 18+ plat_sip_dir = sys.prefix + "/share/sip%s" % sys.version[0:3]
19  19
20  20
21 def patch_files(): 21 def patch_files():
22@@ -264,7 +265,7 @@ def create_config(module, template, macr 22@@ -271,7 +272,7 @@ def create_config(module, template, macr
23 "sip_version": sip_version, 23 "sip_version": sip_version,
24 "sip_version_str": sip_version_str, 24 "sip_version_str": sip_version_str,
25 "platform": opts.platform, 25 "platform": opts.platform,
26- "sip_bin": os.path.join(opts.sipbindir, "sip"), 26- "sip_bin": os.path.join(opts.sipbindir, "sip"),
27+ "sip_bin": os.path.join(opts.sipbindir, "sip%s" % sys.version[0:3]), 27+ "sip_bin": os.path.join(opts.sipbindir, "sip%s" % sys.version[0:3]),
28 "sip_inc_dir": opts.sipincdir, 28 "sip_inc_dir": opts.sipincdir,
29 "sip_mod_dir": opts.sipmoddir, 29 "sip_mod_dir": opts.sipmoddir,
30 "default_bin_dir": plat_bin_dir, 30 "default_bin_dir": plat_bin_dir,
31@@ -297,11 +298,19 @@ def create_makefiles(macros): 31@@ -305,11 +306,19 @@ def create_makefiles(macros):
32  32
33 sipconfig.inform("Creating top level Makefile...") 33 sipconfig.inform("Creating top level Makefile...")
34  34
35+ pyc_file = "sipconfig.pyc" 35+ pyc_file = "sipconfig.pyc"
36+ pyc_dir = cfg.sip_mod_dir 36+ pyc_dir = cfg.sip_mod_dir
37+ try: 37+ try:
38+ pyc_file = imp.cache_from_source("sipconfig.py") 38+ pyc_file = imp.cache_from_source("sipconfig.py")
39+ pyc_dir = os.path.join(cfg.sip_mod_dir, "__pycache__") 39+ pyc_dir = os.path.join(cfg.sip_mod_dir, "__pycache__")
40+ except AttributeError: 40+ except AttributeError:
41+ pass 41+ pass
42+ 42+
43 sipconfig.ParentMakefile( 43 sipconfig.ParentMakefile(
44 configuration=cfg, 44 configuration=cfg,