Update to 1.10.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16769 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 54 insertions, 17 deletions

diff --git a/graphics/cogl/Makefile b/graphics/cogl/Makefile
index 5cd5bc21c..838f1a7a7 100644
--- a/graphics/cogl/Makefile
+++ b/graphics/cogl/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Martin Wilke <miwi@FreeBSD.org>
 #
 # $FreeBSD$
-#  $MCom: ports/graphics/cogl/Makefile,v 1.4 2011/09/19 20:27:20 kwm Exp $
+#  $MCom: ports/graphics/cogl/Makefile,v 1.5 2011/10/18 20:13:19 kwm Exp $
 #
 
 PORTNAME=	cogl
-PORTVERSION=	1.8.2
+PORTVERSION=	1.10.2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -30,7 +30,7 @@ USE_GL=		gl
 USE_XORG=	glproto x11 xfixes xdamage xcomposite xi
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-x
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git a/graphics/cogl/distinfo b/graphics/cogl/distinfo
index 4be332cfe..fca7aae00 100644
--- a/graphics/cogl/distinfo
+++ b/graphics/cogl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cogl-1.8.2.tar.xz) = ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7
-SIZE (cogl-1.8.2.tar.xz) = 1029304
+SHA256 (cogl-1.10.2.tar.xz) = 042cf87ec35d2eac78719856356e415dd5333f9f613093c5db8b438630c1ecb3
+SIZE (cogl-1.10.2.tar.xz) = 1209148
diff --git a/graphics/cogl/files/patch-cogl_Makefile.in b/graphics/cogl/files/patch-cogl_Makefile.in
index 51c1da637..205c9885b 100644
--- a/graphics/cogl/files/patch-cogl_Makefile.in
+++ b/graphics/cogl/files/patch-cogl_Makefile.in
@@ -1,11 +1,11 @@
---- cogl/Makefile.in.orig	2011-09-15 19:41:54.000000000 +0200
-+++ cogl/Makefile.in	2011-09-15 19:42:09.000000000 +0200
-@@ -110,7 +110,7 @@ DIST_COMMON = $(am__coglinclude_HEADERS_
- @SUPPORT_EGL_TRUE@       $(srcdir)/winsys/cogl-winsys-egl-feature-functions.h \
- @SUPPORT_EGL_TRUE@       $(srcdir)/winsys/cogl-winsys-egl-private.h
+--- cogl/Makefile.in.orig	2012-05-20 14:15:08.000000000 +0200
++++ cogl/Makefile.in	2012-05-20 14:15:53.000000000 +0200
+@@ -153,7 +153,7 @@
+ @SUPPORT_SDL_TRUE@       $(srcdir)/winsys/cogl-winsys-sdl-private.h \
+ @SUPPORT_SDL_TRUE@       $(srcdir)/winsys/cogl-winsys-sdl.c
  
--@SUPPORT_GLX_TRUE@am__append_11 = -ldl
-+@SUPPORT_GLX_TRUE@am__append_11 =
- @HAVE_INTROSPECTION_TRUE@am__append_12 = Cogl-1.0.gir
- @HAVE_INTROSPECTION_TRUE@am__append_13 = $(gir_DATA) $(typelib_DATA)
+-@SUPPORT_GLX_TRUE@am__append_22 = -ldl
++@SUPPORT_GLX_TRUE@am__append_22 = 
+ @HAVE_INTROSPECTION_TRUE@am__append_23 = Cogl-1.0.gir
+ @HAVE_INTROSPECTION_TRUE@am__append_24 = $(gir_DATA) $(typelib_DATA)
  subdir = cogl
diff --git a/graphics/cogl/pkg-plist b/graphics/cogl/pkg-plist
index 96fa7ea41..08276c241 100644
--- a/graphics/cogl/pkg-plist
+++ b/graphics/cogl/pkg-plist
@@ -4,6 +4,7 @@ include/cogl/cogl/cogl-attribute.h
 include/cogl/cogl/cogl-bitmap.h
 include/cogl/cogl/cogl-buffer.h
 include/cogl/cogl/cogl-clip-state.h
+include/cogl/cogl/cogl-clutter-xlib.h
 include/cogl/cogl/cogl-clutter.h
 include/cogl/cogl/cogl-color.h
 include/cogl/cogl/cogl-context.h
@@ -15,28 +16,37 @@ include/cogl/cogl/cogl-enum-types.h
 include/cogl/cogl/cogl-euler.h
 include/cogl/cogl/cogl-fixed.h
 include/cogl/cogl/cogl-framebuffer.h
+include/cogl/cogl/cogl-glib-source.h
 include/cogl/cogl/cogl-index-buffer.h
 include/cogl/cogl/cogl-indices.h
 include/cogl/cogl/cogl-material-compat.h
 include/cogl/cogl/cogl-matrix.h
+include/cogl/cogl/cogl-meta-texture.h
 include/cogl/cogl/cogl-object.h
 include/cogl/cogl/cogl-offscreen.h
 include/cogl/cogl/cogl-onscreen-template.h
+include/cogl/cogl/cogl-onscreen.h
 include/cogl/cogl/cogl-pango.h
+include/cogl/cogl/cogl-path-functions.h
 include/cogl/cogl/cogl-path.h
 include/cogl/cogl/cogl-pipeline-layer-state.h
 include/cogl/cogl/cogl-pipeline-state.h
 include/cogl/cogl/cogl-pipeline.h
 include/cogl/cogl/cogl-pixel-buffer.h
+include/cogl/cogl/cogl-poll.h
 include/cogl/cogl/cogl-primitive.h
 include/cogl/cogl/cogl-primitives.h
 include/cogl/cogl/cogl-quaternion.h
 include/cogl/cogl/cogl-renderer.h
 include/cogl/cogl/cogl-shader.h
+include/cogl/cogl/cogl-snippet.h
+include/cogl/cogl/cogl-sub-texture.h
 include/cogl/cogl/cogl-swap-chain.h
+include/cogl/cogl/cogl-texture-2d-sliced.h
 include/cogl/cogl/cogl-texture-2d.h
 include/cogl/cogl/cogl-texture-3d.h
 include/cogl/cogl/cogl-texture-pixmap-x11.h
+include/cogl/cogl/cogl-texture-rectangle.h
 include/cogl/cogl/cogl-texture.h
 include/cogl/cogl/cogl-types.h
 include/cogl/cogl/cogl-vector.h
@@ -44,7 +54,8 @@ include/cogl/cogl/cogl-vertex-buffer.h
 include/cogl/cogl/cogl-xlib-renderer.h
 include/cogl/cogl/cogl-xlib.h
 include/cogl/cogl/cogl.h
-include/cogl/cogl/cogl2-clip-state.h
+include/cogl/cogl/cogl1-context.h
+include/cogl/cogl/cogl2-compatibility.h
 include/cogl/cogl/cogl2-experimental.h
 include/cogl/cogl/cogl2-path.h
 lib/girepository-1.0/Cogl-1.0.typelib
@@ -56,20 +67,25 @@ lib/libcogl-pango.so.0
 lib/libcogl.a
 lib/libcogl.la
 lib/libcogl.so
-lib/libcogl.so.5
+lib/libcogl.so.9
 libdata/pkgconfig/cogl-1.0.pc
 libdata/pkgconfig/cogl-2.0-experimental.pc
 libdata/pkgconfig/cogl-gl-1.0.pc
 libdata/pkgconfig/cogl-pango-1.0.pc
 libdata/pkgconfig/cogl-pango-2.0-experimental.pc
+share/cogl/examples-data/crate.jpg
 share/gir-1.0/Cogl-1.0.gir
 share/gir-1.0/CoglPango-1.0.gir
+share/locale/an/LC_MESSAGES/cogl.mo
 share/locale/ar/LC_MESSAGES/cogl.mo
+share/locale/as/LC_MESSAGES/cogl.mo
 share/locale/ast/LC_MESSAGES/cogl.mo
 share/locale/be/LC_MESSAGES/cogl.mo
 share/locale/bg/LC_MESSAGES/cogl.mo
 share/locale/ca/LC_MESSAGES/cogl.mo
+share/locale/ca@valencia/LC_MESSAGES/cogl.mo
 share/locale/cs/LC_MESSAGES/cogl.mo
+share/locale/da/LC_MESSAGES/cogl.mo
 share/locale/de/LC_MESSAGES/cogl.mo
 share/locale/el/LC_MESSAGES/cogl.mo
 share/locale/en_CA/LC_MESSAGES/cogl.mo
@@ -80,10 +96,13 @@ share/locale/eu/LC_MESSAGES/cogl.mo
 share/locale/fa/LC_MESSAGES/cogl.mo
 share/locale/fr/LC_MESSAGES/cogl.mo
 share/locale/gl/LC_MESSAGES/cogl.mo
+share/locale/he/LC_MESSAGES/cogl.mo
+share/locale/hi/LC_MESSAGES/cogl.mo
 share/locale/hu/LC_MESSAGES/cogl.mo
 share/locale/id/LC_MESSAGES/cogl.mo
 share/locale/it/LC_MESSAGES/cogl.mo
 share/locale/ja/LC_MESSAGES/cogl.mo
+share/locale/km/LC_MESSAGES/cogl.mo
 share/locale/kn/LC_MESSAGES/cogl.mo
 share/locale/ko/LC_MESSAGES/cogl.mo
 share/locale/lt/LC_MESSAGES/cogl.mo
@@ -101,16 +120,34 @@ share/locale/sr/LC_MESSAGES/cogl.mo
 share/locale/sr@latin/LC_MESSAGES/cogl.mo
 share/locale/sv/LC_MESSAGES/cogl.mo
 share/locale/ta/LC_MESSAGES/cogl.mo
+share/locale/te/LC_MESSAGES/cogl.mo
 share/locale/tr/LC_MESSAGES/cogl.mo
+share/locale/ug/LC_MESSAGES/cogl.mo
+share/locale/uk/LC_MESSAGES/cogl.mo
+share/locale/vi/LC_MESSAGES/cogl.mo
 share/locale/zh_CN/LC_MESSAGES/cogl.mo
 share/locale/zh_HK/LC_MESSAGES/cogl.mo
 share/locale/zh_TW/LC_MESSAGES/cogl.mo
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
+@dirrmtry share/cogl/examples-data
+@dirrmtry share/cogl
 @dirrm include/cogl/cogl
 @dirrm include/cogl/cogl-pango
 @dirrm include/cogl