update to 4.12

In addition to many functional improvements, the release provides
a path for ensuring easy migration to SIP v5.

4 files changed, 17 insertions, 17 deletions

diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile
index e5a1b3abab8..aedf831d29e 100644
--- a/x11/py-sip/Makefile
+++ b/x11/py-sip/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2010/11/15 13:06:56 adam Exp $
+# $NetBSD: Makefile,v 1.20 2011/01/11 15:14:20 drochner Exp $
 
-DISTNAME=	sip-4.11.2
+DISTNAME=	sip-4.12
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	x11 devel python
 MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/sip4/
diff --git a/x11/py-sip/distinfo b/x11/py-sip/distinfo
index d167382a94c..d281218f9b3 100644
--- a/x11/py-sip/distinfo
+++ b/x11/py-sip/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/11/15 13:06:56 adam Exp $
+$NetBSD: distinfo,v 1.17 2011/01/11 15:14:20 drochner Exp $
 
-SHA1 (sip-4.11.2.tar.gz) = 586a86a55553617e39b1df8376166d03d697184c
-RMD160 (sip-4.11.2.tar.gz) = 755e4610f9e3359df0a7a9f009ad16a5592341f0
-Size (sip-4.11.2.tar.gz) = 665000 bytes
-SHA1 (patch-aa) = d6986bbc402fc8b345b2f624fbc2537bf6c275eb
-SHA1 (patch-ab) = f5ba9704fc3867a1273dca534b145cdb14b070e7
+SHA1 (sip-4.12.tar.gz) = 6ab3232d44afc2c58dc347103653313fda4e0d33
+RMD160 (sip-4.12.tar.gz) = 7aee4657ac9e244d993a366d21581a4148b72659
+Size (sip-4.12.tar.gz) = 706863 bytes
+SHA1 (patch-aa) = 83c90f534c46c5b5751d2ef23ba3cf23f803be65
+SHA1 (patch-ab) = 044f78528dc67f7585c15b0fb3ec116ff11e31a6
diff --git a/x11/py-sip/patches/patch-aa b/x11/py-sip/patches/patch-aa
index b8d5758c229..6e241cc8d2a 100644
--- a/x11/py-sip/patches/patch-aa
+++ b/x11/py-sip/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2010/02/04 18:34:43 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2011/01/11 15:14:20 drochner Exp $
 
---- configure.py.orig	2010-01-14 14:52:09.000000000 +0000
+--- configure.py.orig	2010-12-23 17:40:28.000000000 +0000
 +++ configure.py
 @@ -208,7 +208,7 @@ def set_platform_directories():
  
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.3 2010/02/04 18:34:43 drochner Exp $
 +        plat_sip_dir = sys.prefix + "/share/sip%s" % sys.version[0:3]
  
  
- def create_config(module, template, macros):
-@@ -226,7 +226,7 @@ def create_config(module, template, macr
+ def patch_files():
+@@ -254,7 +254,7 @@ def create_config(module, template, macr
          "sip_version":      sip_version,
          "sip_version_str":  sip_version_str,
          "platform":         opts.platform,
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2010/02/04 18:34:43 drochner Exp $
          "sip_inc_dir":      opts.sipincdir,
          "sip_mod_dir":      opts.sipmoddir,
          "default_bin_dir":  plat_bin_dir,
-@@ -261,7 +261,7 @@ def create_makefiles(macros):
+@@ -289,7 +289,7 @@ def create_makefiles(macros):
      sipconfig.ParentMakefile(
          configuration=cfg,
          subdirs=["sipgen", "siplib"],
diff --git a/x11/py-sip/patches/patch-ab b/x11/py-sip/patches/patch-ab
index b60b96be0ee..7bd5810b1c9 100644
--- a/x11/py-sip/patches/patch-ab
+++ b/x11/py-sip/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/10/08 14:10:45 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2011/01/11 15:14:20 drochner Exp $
 
---- sipgen/sipgen.sbf.orig	2008-08-08 16:07:36.000000000 +0200
+--- sipgen/sipgen.sbf.orig	2010-12-23 17:37:09.000000000 +0000
 +++ sipgen/sipgen.sbf
-@@ -10,6 +10,6 @@
+@@ -14,6 +14,6 @@
  # SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  
 -target = sip
 +target = sip@PYVERSSUFFIX@
- sources = main.c transform.c gencode.c export.c heap.c parser.c lexer.c 
+ sources = main.c transform.c gencode.c extracts.c export.c heap.c parser.c lexer.c 
  headers = sip.h parser.h