Update x11-wm/muffin to 1.8.2:

	- Make it stage compliant
	- Sort USES and USE_GNOME. Add pkgconfig to USES
	- Fix a wrong lib_depend

Reviewed by:	kwm


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

3 files changed, 21 insertions, 14 deletions

diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 892b1a5db..505d2b289 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	muffin
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.2
 CATEGORIES=	x11-wm gnome
 DIST_SUBDIR=	gnome3
 
@@ -14,21 +14,23 @@ BUILD_DEPENDS=	zenity>3.0.0:${PORTSDIR}/x11/zenity3 \
 		gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libclutter-glx-1.so:${PORTSDIR}/graphics/clutter \
+		libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
 		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
 RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity3
 
+WRKSRC=		${WRKDIR}/linuxmint-muffin-60cab8b
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-GH_TAGNAME=	1.7.1
-GH_COMMIT=	4b36a9a
+GH_TAGNAME=	1.8.2
+GH_COMMIT=	aa1ef1d
 
-NO_STAGE=	yes
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
 USE_PYTHON=	2.5+
-USES=		gettext gmake pathfix
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool autoconf automake
-USE_GNOME=	gnomehier gnomeprefix intlhack gtk30 gconf2 introspection:build
+USE_GNOME=	gconf2 gnomedocutils gnomehier gnomeprefix gtk30 \
+		intlhack introspection:build
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -36,10 +38,11 @@ CONFIGURE_ENV=	LIBS="-lexecinfo"
 CONFIGURE_ARGS=	--enable-compile-warnings=maximum
 GLIB_SCHEMAS=	org.cinnamon.muffin.gschema.xml
 
-MAN1=		muffin-message.1 muffin-theme-viewer.1 muffin-window-demo.1 \
-		muffin.1
-
 pre-configure:
 		@cd ${WRKSRC} && ${SH} autogen.sh
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|REQUIRED_AUTOMAKE_VERSION=1.10|REQUIRED_AUTOMAKE_VERSION=1.14|g' \
+		${WRKSRC}/autogen.sh
+
 .include <bsd.port.mk>
diff --git a/x11-wm/muffin/distinfo b/x11-wm/muffin/distinfo
index c11ea37ed..0c8eb4b77 100644
--- a/x11-wm/muffin/distinfo
+++ b/x11-wm/muffin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/muffin-1.7.1.tar.gz) = 3cf2f77c92979203feb3328f588c88e80a2af222d5a4521a00d810329ece2fac
-SIZE (gnome3/muffin-1.7.1.tar.gz) = 2692864
+SHA256 (gnome3/muffin-1.8.2.tar.gz) = 61c22b185d8afa1b87b5e1b2b74b9525a6fe285cbd904491e71285d10706a6fe
+SIZE (gnome3/muffin-1.8.2.tar.gz) = 2686661
diff --git a/x11-wm/muffin/pkg-plist b/x11-wm/muffin/pkg-plist
index 64722dfce..05f2e9370 100644
--- a/x11-wm/muffin/pkg-plist
+++ b/x11-wm/muffin/pkg-plist
@@ -30,11 +30,15 @@ lib/libmuffin.a
 lib/libmuffin.la
 lib/libmuffin.so
 lib/libmuffin.so.0
-lib/muffin/Meta-3.0.gir
-lib/muffin/Meta-3.0.typelib
+lib/muffin/Meta-Muffin.0.gir
+lib/muffin/Meta-Muffin.0.typelib
 lib/muffin/plugins/default.so
 libdata/pkgconfig/libmuffin.pc
 libdata/pkgconfig/muffin-plugins.pc
+man/man1/muffin-message.1.gz
+man/man1/muffin-theme-viewer.1.gz
+man/man1/muffin-window-demo.1.gz
+man/man1/muffin.1.gz
 share/applications/muffin.desktop
 share/gnome/wm-properties/muffin-wm.desktop
 share/GConf/gsettings/muffin-schemas.convert