Merge from vendor branch FIX_VENDOR:

import of cogl-1.8.0;
cogl is a modern 3D graphics API used by recent verions of clutter

graphics/clutter/cogl/Makefile

@@ -0,0 +1,32 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2011/09/28 12:29:39 robert Exp $
+
+COMMENT=		modern 3D graphics API
+
+MAJOR=			1.8
+DISTNAME=		cogl-${MAJOR}.0
+
+EXTRACT_SUFX=		.tar.xz
+
+SHARED_LIBS+=		cogl-pango	0.0 # 0.0
+SHARED_LIBS+=		cogl		5.0 # 5.0
+
+MASTER_SITES=		${HOMEPAGE}/sources/cogl/${MAJOR}/
+
+MODULES=		x11/gnome
+
+WANTLIB += GL X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xrender
+WANTLIB += Xxf86vm cairo drm expat ffi fontconfig freetype gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png pthread-stubs xcb xcb-render xcb-shm
+WANTLIB += z
+
+MODGNOME_TOOLS=		goi
+
+LIB_DEPENDS+=		devel/pango \
+			graphics/cairo \
+			graphics/gdk-pixbuf2
+
+CONFIGURE_ARGS+=	--with-gl-libname=libGL.so
+
+.include <bsd.port.mk>

graphics/clutter/cogl/distinfo

@@ -0,0 +1,5 @@
+MD5 (clutter/cogl-1.8.0.tar.xz) = 0A02OcdWYNXGqYmrky6ZFA==
+RMD160 (clutter/cogl-1.8.0.tar.xz) = /CGYRSDUgZOVPfyymCPKakodDcQ=
+SHA1 (clutter/cogl-1.8.0.tar.xz) = LQTPGy2ZQPU8gxaFoQFMBART12Q=
+SHA256 (clutter/cogl-1.8.0.tar.xz) = YAi20Ke61kRguPbF63Cw3hjfQ2Pcbf9+rg8CmDIZdwE=
+SIZE (clutter/cogl-1.8.0.tar.xz) = 1017516

graphics/clutter/cogl/patches/patch-cogl-pango_cogl-pango-1_0_pc_in

@@ -0,0 +1,16 @@
+$OpenBSD: patch-cogl-pango_cogl-pango-1_0_pc_in,v 1.1.1.1 2011/09/28 12:29:39 robert Exp $
+--- cogl-pango/cogl-pango-1.0.pc.in.orig	Tue Sep 20 16:12:59 2011
++++ cogl-pango/cogl-pango-1.0.pc.in	Tue Sep 20 16:13:36 2011
+@@ -3,11 +3,10 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ apiversion=1.0
+-requires=@COGL_PKG_REQUIRES@ cogl-1.0
+
+ Name: Cogl
+ Description: An object oriented GL/GLES Abstraction/Utility Layer
+ Version: @COGL_1_VERSION@
+ Libs: -L${libdir} -lcogl-pango
+ Cflags: -I${includedir}/cogl
+-Requires: ${requires}
++Requires: @COGL_PKG_REQUIRES@ cogl-1.0

graphics/clutter/cogl/patches/patch-cogl-pango_cogl-pango-2_0-experimental_pc_in

@@ -0,0 +1,16 @@
+$OpenBSD: patch-cogl-pango_cogl-pango-2_0-experimental_pc_in,v 1.1.1.1 2011/09/28 12:29:39 robert Exp $
+--- cogl-pango/cogl-pango-2.0-experimental.pc.in.orig	Tue Sep 20 16:12:59 2011
++++ cogl-pango/cogl-pango-2.0-experimental.pc.in	Tue Sep 20 16:13:46 2011
+@@ -3,11 +3,10 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ apiversion=1.0
+-requires=@COGL_PKG_REQUIRES@ cogl-1.0
+
+ Name: Cogl
+ Description: An object oriented GL/GLES Abstraction/Utility Layer
+ Version: @COGL_1_VERSION@
+ Libs: -L${libdir} -lcoglpango
+ Cflags: -I${includedir}/cogl
+-Requires: ${requires}
++Requires: @COGL_PKG_REQUIRES@ cogl-1.0

graphics/clutter/cogl/patches/patch-cogl-pango_cogl-pango_pc_in

@@ -0,0 +1,16 @@
+$OpenBSD: patch-cogl-pango_cogl-pango_pc_in,v 1.1.1.1 2011/09/28 12:29:39 robert Exp $
+--- cogl-pango/cogl-pango.pc.in.orig	Tue Sep 20 16:12:59 2011
++++ cogl-pango/cogl-pango.pc.in	Tue Sep 20 16:13:53 2011
+@@ -3,11 +3,10 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ apiversion=@COGL_API_VERSION@
+-requires=@COGL_PKG_REQUIRES@ @COGL_PANGO_PKG_REQUIRES@
+
+ Name: Cogl
+ Description: An pango integration library for Cogl
+ Version: @COGL_VERSION@
+ Libs: -L${libdir} -lcogl-pango
+ Cflags: -I${includedir}/cogl -DCOGL_ENABLE_EXPERIMENTAL_2_0_API
+-Requires: ${requires}
++Requires: @COGL_PKG_REQUIRES@ @COGL_PANGO_PKG_REQUIRES@

graphics/clutter/cogl/patches/patch-cogl_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-cogl_Makefile_in,v 1.1.1.1 2011/09/28 12:29:39 robert Exp $
+--- cogl/Makefile.in.orig	Tue Sep 20 14:45:41 2011
++++ cogl/Makefile.in	Tue Sep 20 14:45:47 2011
+@@ -110,7 +110,7 @@ DIST_COMMON = $(am__coglinclude_HEADERS_DIST) $(srcdir
+ @SUPPORT_EGL_TRUE@       $(srcdir)/winsys/cogl-winsys-egl-feature-functions.h \
+ @SUPPORT_EGL_TRUE@       $(srcdir)/winsys/cogl-winsys-egl-private.h
+
+-@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)
+ subdir = cogl

graphics/clutter/cogl/patches/patch-cogl_cogl-1_0_pc_in

@@ -0,0 +1,16 @@
+$OpenBSD: patch-cogl_cogl-1_0_pc_in,v 1.1.1.1 2011/09/28 12:29:39 robert Exp $
+--- cogl/cogl-1.0.pc.in.orig	Tue Sep 20 16:12:59 2011
++++ cogl/cogl-1.0.pc.in	Tue Sep 20 16:13:17 2011
+@@ -3,11 +3,10 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ apiversion=1.0
+-requires=@COGL_PKG_REQUIRES@
+
+ Name: Cogl
+ Description: An object oriented GL/GLES Abstraction/Utility Layer
+ Version: @COGL_1_VERSION@
+ Libs: -L${libdir} -lcogl
+ Cflags: -I${includedir}/cogl
+-Requires: ${requires}
++Requires: @COGL_PKG_REQUIRES@

graphics/clutter/cogl/patches/patch-cogl_cogl-2_0-experimental_pc_in

@@ -0,0 +1,16 @@
+$OpenBSD: patch-cogl_cogl-2_0-experimental_pc_in,v 1.1.1.1 2011/09/28 12:29:39 robert Exp $
+--- cogl/cogl-2.0-experimental.pc.in.orig	Tue Sep 20 16:12:59 2011
++++ cogl/cogl-2.0-experimental.pc.in	Tue Sep 20 16:13:28 2011
+@@ -3,11 +3,10 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ apiversion=@COGL_API_VERSION@
+-requires=@COGL_PKG_REQUIRES@
+
+ Name: Cogl
+ Description: An object oriented GL/GLES Abstraction/Utility Layer
+ Version: @COGL_VERSION@
+ Libs: -L${libdir} -lcogl
+ Cflags: -I${includedir}/cogl
+-Requires: ${requires}
++Requires: @COGL_PKG_REQUIRES@

graphics/clutter/cogl/pkg/DESCR

@@ -0,0 +1,5 @@
+Cogl is a modern 3D graphics API with associated utility APIs designed
+to expose the features of 3D graphics hardware using a direct state
+access API design, as opposed to the state-machine style of OpenGL. It
+is implemented in the C programming language but we want to provide
+bindings for everyone's favorite language too.

graphics/clutter/cogl/pkg/PFRAG.shared

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/09/28 12:29:39 robert Exp $
+@lib lib/libcogl-pango.so.${LIBcogl-pango_VERSION}
+@lib lib/libcogl.so.${LIBcogl_VERSION}

graphics/clutter/cogl/pkg/PLIST

@@ -0,0 +1,183 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2011/09/28 12:29:39 robert Exp $
+%%SHARED%%
+include/cogl/
+include/cogl/cogl/
+include/cogl/cogl-pango/
+include/cogl/cogl-pango/cogl-pango.h
+include/cogl/cogl/cogl-attribute-buffer.h
+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.h
+include/cogl/cogl/cogl-color.h
+include/cogl/cogl/cogl-context.h
+include/cogl/cogl/cogl-defines.h
+include/cogl/cogl/cogl-deprecated.h
+include/cogl/cogl/cogl-depth-state.h
+include/cogl/cogl/cogl-display.h
+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-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-object.h
+include/cogl/cogl/cogl-offscreen.h
+include/cogl/cogl/cogl-onscreen-template.h
+include/cogl/cogl/cogl-pango.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-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-swap-chain.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.h
+include/cogl/cogl/cogl-types.h
+include/cogl/cogl/cogl-vector.h
+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/cogl2-experimental.h
+include/cogl/cogl/cogl2-path.h
+lib/girepository-1.0/
+lib/girepository-1.0/Cogl-1.0.typelib
+lib/girepository-1.0/CoglPango-1.0.typelib
+lib/libcogl-pango.la
+lib/libcogl.la
+lib/pkgconfig/
+lib/pkgconfig/cogl-1.0.pc
+lib/pkgconfig/cogl-2.0-experimental.pc
+lib/pkgconfig/cogl-gl-1.0.pc
+lib/pkgconfig/cogl-pango-1.0.pc
+lib/pkgconfig/cogl-pango-2.0-experimental.pc
+share/gir-1.0/
+share/gir-1.0/Cogl-1.0.gir
+share/gir-1.0/CoglPango-1.0.gir
+share/locale/
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
+share/locale/ar/LC_MESSAGES/cogl.mo
+share/locale/ast/
+share/locale/ast/LC_MESSAGES/
+share/locale/ast/LC_MESSAGES/cogl.mo
+share/locale/be/
+share/locale/be/LC_MESSAGES/
+share/locale/be/LC_MESSAGES/cogl.mo
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
+share/locale/ca/LC_MESSAGES/cogl.mo
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
+share/locale/cs/LC_MESSAGES/cogl.mo
+share/locale/de/
+share/locale/de/LC_MESSAGES/
+share/locale/de/LC_MESSAGES/cogl.mo
+share/locale/el/
+share/locale/el/LC_MESSAGES/
+share/locale/el/LC_MESSAGES/cogl.mo
+share/locale/en_CA/
+share/locale/en_CA/LC_MESSAGES/
+share/locale/en_CA/LC_MESSAGES/cogl.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
+share/locale/en_GB/LC_MESSAGES/cogl.mo
+share/locale/eo/
+share/locale/eo/LC_MESSAGES/
+share/locale/eo/LC_MESSAGES/cogl.mo
+share/locale/es/
+share/locale/es/LC_MESSAGES/
+share/locale/es/LC_MESSAGES/cogl.mo
+share/locale/eu/
+share/locale/eu/LC_MESSAGES/
+share/locale/eu/LC_MESSAGES/cogl.mo
+share/locale/fa/
+share/locale/fa/LC_MESSAGES/
+share/locale/fa/LC_MESSAGES/cogl.mo
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
+share/locale/fr/LC_MESSAGES/cogl.mo
+share/locale/gl/
+share/locale/gl/LC_MESSAGES/
+share/locale/gl/LC_MESSAGES/cogl.mo
+share/locale/id/
+share/locale/id/LC_MESSAGES/
+share/locale/id/LC_MESSAGES/cogl.mo
+share/locale/it/
+share/locale/it/LC_MESSAGES/
+share/locale/it/LC_MESSAGES/cogl.mo
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
+share/locale/ja/LC_MESSAGES/cogl.mo
+share/locale/kn/
+share/locale/kn/LC_MESSAGES/
+share/locale/kn/LC_MESSAGES/cogl.mo
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
+share/locale/lt/LC_MESSAGES/cogl.mo
+share/locale/lv/
+share/locale/lv/LC_MESSAGES/
+share/locale/lv/LC_MESSAGES/cogl.mo
+share/locale/nb/
+share/locale/nb/LC_MESSAGES/
+share/locale/nb/LC_MESSAGES/cogl.mo
+share/locale/nl/
+share/locale/nl/LC_MESSAGES/
+share/locale/nl/LC_MESSAGES/cogl.mo
+share/locale/or/
+share/locale/or/LC_MESSAGES/
+share/locale/or/LC_MESSAGES/cogl.mo
+share/locale/pa/
+share/locale/pa/LC_MESSAGES/
+share/locale/pa/LC_MESSAGES/cogl.mo
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
+share/locale/pl/LC_MESSAGES/cogl.mo
+share/locale/pt/
+share/locale/pt/LC_MESSAGES/
+share/locale/pt/LC_MESSAGES/cogl.mo
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
+share/locale/pt_BR/LC_MESSAGES/cogl.mo
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
+share/locale/ru/LC_MESSAGES/cogl.mo
+share/locale/sl/
+share/locale/sl/LC_MESSAGES/
+share/locale/sl/LC_MESSAGES/cogl.mo
+share/locale/sr/
+share/locale/sr/LC_MESSAGES/
+share/locale/sr/LC_MESSAGES/cogl.mo
+share/locale/sr@latin/
+share/locale/sr@latin/LC_MESSAGES/
+share/locale/sr@latin/LC_MESSAGES/cogl.mo
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
+share/locale/sv/LC_MESSAGES/cogl.mo
+share/locale/ta/
+share/locale/ta/LC_MESSAGES/
+share/locale/ta/LC_MESSAGES/cogl.mo
+share/locale/tr/
+share/locale/tr/LC_MESSAGES/
+share/locale/tr/LC_MESSAGES/cogl.mo
+share/locale/zh_CN/
+share/locale/zh_CN/LC_MESSAGES/
+share/locale/zh_CN/LC_MESSAGES/cogl.mo
+share/locale/zh_HK/
+share/locale/zh_HK/LC_MESSAGES/
+share/locale/zh_HK/LC_MESSAGES/cogl.mo
+share/locale/zh_TW/
+share/locale/zh_TW/LC_MESSAGES/
+share/locale/zh_TW/LC_MESSAGES/cogl.mo