Update clutter-box2d to 0.10.0.

clutter-box2d-0.10.0:
=====================

Changes:

  - Update to Clutter 1.0
  - Generate GObject-Introspection data

5 files changed, 105 insertions, 17 deletions

diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index 7c54429e7d1..1b58f7c6bec 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:37 sno Exp $
+# $NetBSD: Makefile,v 1.5 2009/10/26 08:48:05 obache Exp $
 #
 
-DISTNAME=	clutter-box2d-0.8.2
-PKGREVISION=	1
+DISTNAME=	clutter-box2d-0.10.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.clutter-project.org/sources/clutter-box2d/0.8/
+MASTER_SITES=	http://www.clutter-project.org/sources/clutter-box2d/0.10/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.clutter-project.org/
diff --git a/graphics/clutter-box2d/PLIST b/graphics/clutter-box2d/PLIST
index d0583e96f1e..4f8c06c5134 100644
--- a/graphics/clutter-box2d/PLIST
+++ b/graphics/clutter-box2d/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:59:08 joerg Exp $
-include/clutter-0.8/clutter-box2d/clutter-box2d-collision.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-contact.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-joint.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-marshal.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-util.h
-include/clutter-0.8/clutter-box2d/clutter-box2d.h
-lib/libclutter-box2d-0.8.la
-lib/pkgconfig/clutter-box2d-0.8.pc
+@comment $NetBSD: PLIST,v 1.4 2009/10/26 08:48:05 obache Exp $
+include/clutter-1.0/clutter-box2d/clutter-box2d-collision.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-contact.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-joint.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-marshal.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-util.h
+include/clutter-1.0/clutter-box2d/clutter-box2d.h
+lib/libclutter-box2d-0.10.la
+lib/pkgconfig/clutter-box2d-0.10.pc
 share/gtk-doc/html/clutter-box2d/ClutterBox2D.html
 share/gtk-doc/html/clutter-box2d/ch01.html
 share/gtk-doc/html/clutter-box2d/ch02.html
diff --git a/graphics/clutter-box2d/distinfo b/graphics/clutter-box2d/distinfo
index ff8ff55710a..ab5e4d7cd27 100644
--- a/graphics/clutter-box2d/distinfo
+++ b/graphics/clutter-box2d/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/05/08 11:06:33 obache Exp $
+$NetBSD: distinfo,v 1.3 2009/10/26 08:48:05 obache Exp $
 
-SHA1 (clutter-box2d-0.8.2.tar.gz) = 4abf2820d9156aa2263357daa646a6101ca1867a
-RMD160 (clutter-box2d-0.8.2.tar.gz) = 242f7cd59a8968c60a27a25b8b3c25d2cd9cdd7f
-Size (clutter-box2d-0.8.2.tar.gz) = 491985 bytes
+SHA1 (clutter-box2d-0.10.0.tar.gz) = 284c8d20f6d04bbdf54599af7a42547fe22fae08
+RMD160 (clutter-box2d-0.10.0.tar.gz) = a43b4378246bd43cb8ab8c342185229bf5f584e5
+Size (clutter-box2d-0.10.0.tar.gz) = 491980 bytes
+SHA1 (patch-aa) = 873b3f2277727ca6f9093b58994d3ef137310718
+SHA1 (patch-ab) = 8a596ad7aac00e68733131be0e907befef64b2ea
diff --git a/graphics/clutter-box2d/patches/patch-aa b/graphics/clutter-box2d/patches/patch-aa
new file mode 100644
index 00000000000..dbe26030b6e
--- /dev/null
+++ b/graphics/clutter-box2d/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1 2009/10/26 08:48:05 obache Exp $
+
+http://git.clutter-project.org/cgit.cgi?url=clutter-box2d/diff/&id=dae84a82efe22b284cba8ca1985ce14bb4e86c99
+
+--- clutter-box2d/Makefile.am.orig	2009-07-29 15:12:34.000000000 +0000
++++ clutter-box2d/Makefile.am
+@@ -39,6 +39,8 @@ DISTCLEANFILES = $(MARSHALFILES)
+ EXTRA_DIST = \
+ 	clutter-box2d-marshal.list
+ 
++if HAVE_INTROSPECTION
++
+ BUILT_GIRSOURCES =
+ 
+ ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-box2d-@CLUTTER_BOX2D_API_VERSION@.la
+@@ -68,5 +70,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
+ %.typelib: %.gir $(INTROSPECTION_COMPILER)
+ 	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+ 
++endif # HAVE_INTROSPECTION
++
+ CLEANFILES=
+ CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/graphics/clutter-box2d/patches/patch-ab b/graphics/clutter-box2d/patches/patch-ab
new file mode 100644
index 00000000000..9b265d8070c
--- /dev/null
+++ b/graphics/clutter-box2d/patches/patch-ab
@@ -0,0 +1,64 @@
+$NetBSD: patch-ab,v 1.1 2009/10/26 08:48:05 obache Exp $
+
+regen with patch-aa
+
+--- clutter-box2d/Makefile.in.orig	2009-07-29 15:17:36.000000000 +0000
++++ clutter-box2d/Makefile.in
+@@ -269,14 +269,14 @@ DISTCLEANFILES = $(MARSHALFILES)
+ EXTRA_DIST = \
+ 	clutter-box2d-marshal.list
+ 
+-BUILT_GIRSOURCES = ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir
++@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir
+ 
+ # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
+ # install anything - we need to install inside our prefix.
+-girdir = $(datadir)/gir-1.0
+-gir_DATA = $(BUILT_GIRSOURCES)
+-typelibsdir = $(libdir)/girepository-1.0/
+-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
++@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
++@HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES)
++@HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
++@HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+ CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+@@ -651,22 +651,22 @@ clutter-box2d-marshal.c: clutter-box2d-m
+ clutter-box2d-marshal.h: clutter-box2d-marshal.list Makefile
+ 	glib-genmarshal --prefix=clutter_box2d_marshal --header $< > $@
+ 
+-ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-box2d-@CLUTTER_BOX2D_API_VERSION@.la
+-	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
+-		--namespace ClutterBox2D --nsversion=@CLUTTER_BOX2D_API_VERSION@ \
+-		--add-include-path=$(srcdir) --add-include=path=. \
+-		--include=Clutter-1.0 \
+-		--library=clutter-box2d-@CLUTTER_BOX2D_API_VERSION@ \
+-		--libtool="$(top_builddir)/libtool" \
+-		--output $@ \
+-		--pkg gobject-2.0 \
+-		--pkg clutter-1.0 \
+-		$(top_srcdir)/clutter-box2d/clutter-box2d.h \
+-		$(top_srcdir)/clutter-box2d/clutter-box2d-joint.h \
+-		$(top_srcdir)/clutter-box2d/clutter-box2d-util.h
++@HAVE_INTROSPECTION_TRUE@ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-box2d-@CLUTTER_BOX2D_API_VERSION@.la
++@HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
++@HAVE_INTROSPECTION_TRUE@		--namespace ClutterBox2D --nsversion=@CLUTTER_BOX2D_API_VERSION@ \
++@HAVE_INTROSPECTION_TRUE@		--add-include-path=$(srcdir) --add-include=path=. \
++@HAVE_INTROSPECTION_TRUE@		--include=Clutter-1.0 \
++@HAVE_INTROSPECTION_TRUE@		--library=clutter-box2d-@CLUTTER_BOX2D_API_VERSION@ \
++@HAVE_INTROSPECTION_TRUE@		--libtool="$(top_builddir)/libtool" \
++@HAVE_INTROSPECTION_TRUE@		--output $@ \
++@HAVE_INTROSPECTION_TRUE@		--pkg gobject-2.0 \
++@HAVE_INTROSPECTION_TRUE@		--pkg clutter-1.0 \
++@HAVE_INTROSPECTION_TRUE@		$(top_srcdir)/clutter-box2d/clutter-box2d.h \
++@HAVE_INTROSPECTION_TRUE@		$(top_srcdir)/clutter-box2d/clutter-box2d-joint.h \
++@HAVE_INTROSPECTION_TRUE@		$(top_srcdir)/clutter-box2d/clutter-box2d-util.h
+ 
+-%.typelib: %.gir $(INTROSPECTION_COMPILER)
+-	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
++@HAVE_INTROSPECTION_TRUE@%.typelib: %.gir $(INTROSPECTION_COMPILER)
++@HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: