update to 1.32.1

This is a new major release.

5 files changed, 27 insertions, 49 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index c0480012103..0e48f30bcf0 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2012/04/08 19:08:50 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2012/04/30 14:28:57 drochner Exp $
 #
 
-DISTNAME=	gobject-introspection-1.30.0
-PKGREVISION=	3
+DISTNAME=	gobject-introspection-1.32.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/1.30/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/1.32/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/GObjectIntrospection
diff --git a/devel/gobject-introspection/PLIST b/devel/gobject-introspection/PLIST
index 7e3c156b046..fdaac79803c 100644
--- a/devel/gobject-introspection/PLIST
+++ b/devel/gobject-introspection/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2012/02/10 15:14:56 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/04/30 14:28:57 drochner Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
-bin/g-ir-doc-tool
 bin/g-ir-generate
 bin/g-ir-scanner
 include/gobject-introspection-1.0/giarginfo.h
@@ -59,12 +58,6 @@ lib/gobject-introspection/giscanner/cachestore.pyo
 lib/gobject-introspection/giscanner/codegen.py
 lib/gobject-introspection/giscanner/codegen.pyc
 lib/gobject-introspection/giscanner/codegen.pyo
-lib/gobject-introspection/giscanner/docbookdescription.py
-lib/gobject-introspection/giscanner/docbookdescription.pyc
-lib/gobject-introspection/giscanner/docbookdescription.pyo
-lib/gobject-introspection/giscanner/docbookwriter.py
-lib/gobject-introspection/giscanner/docbookwriter.pyc
-lib/gobject-introspection/giscanner/docbookwriter.pyo
 lib/gobject-introspection/giscanner/docmain.py
 lib/gobject-introspection/giscanner/docmain.pyc
 lib/gobject-introspection/giscanner/docmain.pyo
@@ -89,6 +82,24 @@ lib/gobject-introspection/giscanner/libtoolimporter.pyo
 lib/gobject-introspection/giscanner/maintransformer.py
 lib/gobject-introspection/giscanner/maintransformer.pyc
 lib/gobject-introspection/giscanner/maintransformer.pyo
+lib/gobject-introspection/giscanner/mallard-C-class.tmpl
+lib/gobject-introspection/giscanner/mallard-C-default.tmpl
+lib/gobject-introspection/giscanner/mallard-C-enum.tmpl
+lib/gobject-introspection/giscanner/mallard-C-function.tmpl
+lib/gobject-introspection/giscanner/mallard-C-namespace.tmpl
+lib/gobject-introspection/giscanner/mallard-C-property.tmpl
+lib/gobject-introspection/giscanner/mallard-C-record.tmpl
+lib/gobject-introspection/giscanner/mallard-C-signal.tmpl
+lib/gobject-introspection/giscanner/mallard-C-vfunc.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-class.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-default.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-enum.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-function.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-namespace.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-property.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-record.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-signal.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-vfunc.tmpl
 lib/gobject-introspection/giscanner/mallardwriter.py
 lib/gobject-introspection/giscanner/mallardwriter.pyc
 lib/gobject-introspection/giscanner/mallardwriter.pyo
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index 85e421bda35..db1043afb6b 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.8 2012/02/15 16:42:36 martin Exp $
+$NetBSD: distinfo,v 1.9 2012/04/30 14:28:57 drochner Exp $
 
-SHA1 (gobject-introspection-1.30.0.tar.bz2) = 58a313e758917ae0760c5147b6dd72af840927cf
-RMD160 (gobject-introspection-1.30.0.tar.bz2) = ebc44388f628ae80ad2150afeb7df3fc49032309
-Size (gobject-introspection-1.30.0.tar.bz2) = 1279723 bytes
+SHA1 (gobject-introspection-1.32.1.tar.xz) = 289df976328490a2d5d4187032cf6d429dcef121
+RMD160 (gobject-introspection-1.32.1.tar.xz) = 7546532aed866451e0f934257c4b9bbc75f460e5
+Size (gobject-introspection-1.32.1.tar.xz) = 1120996 bytes
 SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b
 SHA1 (patch-ab) = 5cb15e68a1f249f2975d661daf566cc2ec1f6102
 SHA1 (patch-ac) = 7f716a061473fcf9853a2a508b895b3a87050fa4
 SHA1 (patch-ad) = 4086722fa0f51c332536002db36b9edbe2e71a2a
-SHA1 (patch-ae) = c29edcabecc236f40fd69fb909c45e1a2eddaa6d
-SHA1 (patch-af) = 974878388616ca066902d0f3cd20b5dd5c1b3c10
 SHA1 (patch-giscanner_scannerlexer.l) = 69152ebb060b87083d32aff6ad2a6195c9987c59
diff --git a/devel/gobject-introspection/patches/patch-ae b/devel/gobject-introspection/patches/patch-ae
deleted file mode 100644
index 99f9802c8e4..00000000000
--- a/devel/gobject-introspection/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2012/02/10 15:14:56 drochner Exp $
-
-compatibility with Python<2.7
-
---- giscanner/docbookdescription.py.orig	2011-08-30 01:07:30.000000000 +0000
-+++ giscanner/docbookdescription.py
-@@ -1,7 +1,7 @@
- 
- TAG_PROGRAM_LISTING = '<programlisting'
- TAG_CDATA = '<![CDATA['
--TAGS = {TAG_PROGRAM_LISTING, TAG_CDATA, ']]>', '</programlisting>'}
-+TAGS = [TAG_PROGRAM_LISTING, TAG_CDATA, ']]>', '</programlisting>']
- 
- def get_formatted_description(description):
-     desc = description.replace("|[", "<informalexample><programlisting>") \
diff --git a/devel/gobject-introspection/patches/patch-af b/devel/gobject-introspection/patches/patch-af
deleted file mode 100644
index f0b87f573af..00000000000
--- a/devel/gobject-introspection/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2012/02/10 15:14:56 drochner Exp $
-
-deal with CC env var consisting of multiple words
-
---- giscanner/sourcescanner.py.orig	2011-09-03 18:42:14.000000000 +0000
-+++ giscanner/sourcescanner.py
-@@ -274,7 +274,7 @@ class SourceScanner(object):
- 
-         defines = ['__GI_SCANNER__']
-         undefs = []
--        cpp_args = [os.environ.get('CC', 'cc'), '-E', '-C', '-I.', '-']
-+        cpp_args = os.environ.get('CC', 'cc').split() + ['-E', '-C', '-I.', '-']
- 
-         cpp_args += self._cpp_options
-         proc = subprocess.Popen(cpp_args,