Update to 1.6.18.

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

4 files changed, 20 insertions, 13 deletions

diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 81b13e4c1..14686ebe8 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -3,21 +3,22 @@
 # Whom:			Martin Wilke <miwi@FreeBSD.org>
 #
 # $FreeBSD$
-#  $MCom: ports/graphics/clutter/Makefile,v 1.47 2011/04/05 22:04:50 kwm Exp $
+#  $MCom: ports/graphics/clutter/Makefile,v 1.48 2011/06/14 15:47:17 kwm Exp $
 #
 
 PORTNAME=	clutter
-PORTVERSION=	1.6.16
+PORTVERSION=	1.6.18
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	OpenGL based interactive canvas library
 
-LIB_DEPENDS=	json-glib-1.0.0:${PORTSDIR}/devel/json-glib
-
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	json-glib-1.0.0:${PORTSDIR}/devel/json-glib
+
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_XZ=		yes
@@ -27,7 +28,7 @@ USE_GL=		gl
 USE_XORG=	glproto x11 xfixes xdamage xcomposite xi
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-x --enable-conformance=no
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index 54c9b7026..3f9916f1a 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clutter-1.6.16.tar.xz) = 206517f8f74252105c46762d11a973b2bae3f2702d2d2ed0cac1206ff5605d9b
-SIZE (clutter-1.6.16.tar.xz) = 4507324
+SHA256 (clutter-1.6.18.tar.xz) = b1ac7e9caa3ebe27e290ff2db307964ff23750d2bbfcb5a33fcc04f687783683
+SIZE (clutter-1.6.18.tar.xz) = 4502032
diff --git a/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in b/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in
index ec4a62547..1347cb2dc 100644
--- a/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in
+++ b/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in
@@ -1,6 +1,6 @@
---- clutter/cogl/cogl/Makefile.in.orig	2010-11-20 14:38:12.000000000 +0100
-+++ clutter/cogl/cogl/Makefile.in	2010-11-20 14:47:42.000000000 +0100
-@@ -582,6 +582,7 @@
+--- clutter/cogl/cogl/Makefile.in.orig	2011-09-14 22:46:37.000000000 +0200
++++ clutter/cogl/cogl/Makefile.in	2011-09-14 22:47:46.000000000 +0200
+@@ -671,6 +671,7 @@
  	-I$(srcdir)/winsys 			\
  	-I$(srcdir)/driver/$(COGL_DRIVER) 	\
  	-I$(top_builddir)/clutter/cogl          \
@@ -8,3 +8,12 @@
  	$(NULL)
  
  AM_CPPFLAGS = \
+@@ -852,7 +853,7 @@
+ glib_enum_headers = $(cogl_public_h)
+ enum_tmpl_h = $(addprefix $(srcdir)/, $(glib_enum_h:.h=.h.in))
+ enum_tmpl_c = $(addprefix $(srcdir)/, $(glib_enum_c:.c=.c.in))
+-libclutter_cogl_la_LIBADD = -lm -ldl $(CLUTTER_LIBS)
++libclutter_cogl_la_LIBADD = -lm $(CLUTTER_LIBS)
+ libclutter_cogl_la_SOURCES = $(cogl_sources_c)
+ nodist_libclutter_cogl_la_SOURCES = $(BUILT_SOURCES)
+ 
diff --git a/graphics/clutter/pkg-plist b/graphics/clutter/pkg-plist
index 8af6fdefe..7d8a7277c 100644
--- a/graphics/clutter/pkg-plist
+++ b/graphics/clutter/pkg-plist
@@ -152,7 +152,6 @@ share/doc/cally/CallyText.html
 share/doc/cally/CallyTexture.html
 share/doc/cally/CallyUtil.html
 share/doc/cally/cally-General-API.html
-share/doc/cally/cally.devhelp
 share/doc/cally/cally.devhelp2
 share/doc/cally/callybase.html
 share/doc/cally/callyobjecthierarchy.html
@@ -278,7 +277,6 @@ share/doc/cally/up.png
 %%DOCSDIR%%/clutter-animations.html
 %%DOCSDIR%%/clutter-overview.html
 %%DOCSDIR%%/clutter-subclassing-ClutterActor.html
-%%DOCSDIR%%/clutter.devhelp
 %%DOCSDIR%%/clutter.devhelp2
 %%DOCSDIR%%/clutteranimation.html
 %%DOCSDIR%%/clutterbackends.html
@@ -350,7 +348,6 @@ share/doc/cogl/cogl-Textures.html
 share/doc/cogl/cogl-Vectors.html
 share/doc/cogl/cogl-Vertex-Buffers-(Deprecated).html
 share/doc/cogl/cogl-Vertex-Buffers.html
-share/doc/cogl/cogl.devhelp
 share/doc/cogl/cogl.devhelp2
 share/doc/cogl/cogl_ortho.png
 share/doc/cogl/coglglossary.html