Update cinnamon to 2.2.14 and related ports to the last version available.

While here:

	- switch maintainership to gnome@FreeBSD.org
	- convert those ports with options to the
	  compact form
	- stop using paths in {run/lib}_depends and
 	  instead use the package:dir form
	- ensure no USE_AUTOTOOLS= libtool is used. Those
	  doing the autofoo dance must use libtoolize
	  instead

I will drop keepla in the future. I did no want to mix that
with this commit.


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

7 files changed, 8 insertions, 89 deletions

diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 333ee75ff..64d3bcbcc 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -3,13 +3,12 @@
 #    $MCom$
 
 PORTNAME=	muffin
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.6
 CATEGORIES=	x11-wm gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
 
-MAINTAINER=	gustau.perez@gmail.com
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Compositing window manager forked from Mutter for use with Cinnamon
 
 BUILD_DEPENDS=	zenity3>=3.0.0:${PORTSDIR}/x11/zenity3 \
@@ -24,18 +23,19 @@ RUN_DEPENDS=	zenity3>=3.0.0:${PORTSDIR}/x11/zenity3
 
 USES=		gettext libtool:keepla gmake pathfix pkgconfig
 USE_GNOME=	gconf2 gnomedocutils gnomehier gnomeprefix gtk30 \
-		intlhack introspection:build
+		introspection:build
 USE_AUTOTOOLS=	libtoolize autoconf automake
-USE_CSTD=	gnu89
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
+USE_CSTD=	gnu89
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install-strip
+PATHFIX_MAKEFILEIN=	Makefile.am
 CONFIGURE_ENV=	LIBS="-lexecinfo"
 CONFIGURE_ARGS=	--enable-compile-warnings=maximum
 GLIB_SCHEMAS=	org.cinnamon.muffin.gschema.xml
+INSTALL_TARGET=	install-strip
 
 pre-configure:
 		@cd ${WRKSRC} && ${SH} autogen.sh
diff --git a/x11-wm/muffin/distinfo b/x11-wm/muffin/distinfo
index c15bf9936..0331b5e92 100644
--- a/x11-wm/muffin/distinfo
+++ b/x11-wm/muffin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/muffin-2.2.1.tar.gz) = aec5062ca53364e5077694ef0848b7a4efe384f19d41736c2f7d86e53ce5c009
-SIZE (gnome3/muffin-2.2.1.tar.gz) = 2705007
+SHA256 (gnome3/muffin-2.2.6.tar.gz) = 5617504f5f8ecaf53268787728e6b7bf5da1514d9bc538dd0c047d467cca9ccf
+SIZE (gnome3/muffin-2.2.6.tar.gz) = 2705497
diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c b/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c
deleted file mode 100644
index e99a9d229..000000000
--- a/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/compositor/meta-shaped-texture.c.orig	2014-03-31 10:15:32.429567385 +0000
-+++ src/compositor/meta-shaped-texture.c	2014-03-31 10:15:38.680567395 +0000
-@@ -295,10 +295,8 @@
-       if (meta_texture_rectangle_check (paint_tex))
-         priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
-                                                          COGL_PIXEL_FORMAT_A_8,
--                                                         COGL_PIXEL_FORMAT_A_8,
-                                                          stride,
--                                                         mask_data,
--                                                         NULL /* error */);
-+                                                         mask_data);
-       else
-         priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
-                                                          COGL_TEXTURE_NONE,
diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c b/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c
deleted file mode 100644
index 12c6c27db..000000000
--- a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/compositor/meta-texture-rectangle.c.orig	2013-11-23 13:42:35.000000000 +0000
-+++ src/compositor/meta-texture-rectangle.c	2014-03-31 08:00:34.766125773 +0000
-@@ -35,10 +35,8 @@
- meta_texture_rectangle_new (unsigned int width,
-                             unsigned int height,
-                             CoglPixelFormat format,
--                            CoglPixelFormat internal_format,
-                             unsigned int rowstride,
--                            const guint8 *data,
--                            GError **error)
-+                            const guint8 *data)
- {
-   ClutterBackend *backend =
-     clutter_get_default_backend ();
-@@ -46,10 +44,7 @@
-     clutter_backend_get_cogl_context (backend);
-   CoglTextureRectangle *tex_rect;
- 
--  tex_rect = cogl_texture_rectangle_new_with_size (context,
--                                                   width, height,
--                                                   internal_format,
--                                                   error);
-+  tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
-   if (tex_rect == NULL)
-     return NULL;
- 
diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h b/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h
deleted file mode 100644
index 81593c066..000000000
--- a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/compositor/meta-texture-rectangle.h.orig	2013-11-23 13:42:35.000000000 +0000
-+++ src/compositor/meta-texture-rectangle.h	2014-03-31 08:00:34.766125773 +0000
-@@ -34,10 +34,8 @@
- meta_texture_rectangle_new (unsigned int width,
-                             unsigned int height,
-                             CoglPixelFormat format,
--                            CoglPixelFormat internal_format,
-                             unsigned int rowstride,
--                            const guint8 *data,
--                            GError **error);
-+                            const guint8 *data);
- 
- gboolean
- meta_texture_rectangle_check (CoglTexture *texture);
diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c b/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c
deleted file mode 100644
index d605aece6..000000000
--- a/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/compositor/meta-texture-tower.c.orig	2013-11-23 13:42:35.000000000 +0000
-+++ src/compositor/meta-texture-tower.c	2014-03-31 08:00:34.767127023 +0000
-@@ -365,13 +365,9 @@
-         meta_texture_rectangle_new (width, height,
-                                     /* data format */
-                                     TEXTURE_FORMAT,
--                                    /* internal cogl format */
--                                    TEXTURE_FORMAT,
-                                     /* rowstride */
-                                     width * 4,
-                                     /* data */
--                                    NULL,
--                                    /* error */
-                                     NULL);
-     }
-   else
diff --git a/x11-wm/muffin/files/patch-src_makefile.am b/x11-wm/muffin/files/patch-src_makefile.am
deleted file mode 100644
index abfc0f984..000000000
--- a/x11-wm/muffin/files/patch-src_makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig.am	2013-02-24 10:55:25.339517972 +0100
-+++ src/Makefile.am	2013-02-24 10:56:23.792517007 +0100
-@@ -294,7 +294,7 @@
- inlinepixbufs.h: $(IMAGES)
- 	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- pkgconfig_DATA = libmuffin.pc muffin-plugins.pc
-