Update to last release before rewrite. No NEWS/ChangeLog. USE_TOOLS+=

msgmerge xgettext; Remove disabling of libinotify in configure. Buildlink
libXrandr, libxslt, startup-notification, pango, and cairo.

3 files changed, 23 insertions, 11 deletions

diff --git a/wm/compiz-fusion-plugins-main/Makefile b/wm/compiz-fusion-plugins-main/Makefile
index de2f0309925..169e55b8e33 100644
--- a/wm/compiz-fusion-plugins-main/Makefile
+++ b/wm/compiz-fusion-plugins-main/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2013/06/06 12:53:59 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/06/30 20:53:46 rodent Exp $
 #
 
-PKGVER=		0.8.4
+PKGVER=		0.8.8
 PKGNAME=	compiz-fusion-plugins-main-${PKGVER}
 DISTNAME=	compiz-plugins-main-${PKGVER}
-PKGREVISION=	19
 CATEGORIES=	wm x11
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/
 
@@ -14,14 +13,13 @@ COMMENT=	Compositing window manager - main plugins
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		intltool pkg-config msgfmt gmake
+USE_TOOLS+=		gmake intltool msgfmt msgmerge pkg-config xgettext
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE+=	compiz-text.pc.in
 
-CONFIGURE_ARGS+=	--disable-inotify
 CONFIGURE_ARGS+=	--enable-schemas
 
 GCONF_SCHEMAS+=		compiz-animation.schemas
@@ -50,7 +48,15 @@ GCONF_SCHEMAS+=		compiz-wall.schemas
 GCONF_SCHEMAS+=		compiz-winrules.schemas
 GCONF_SCHEMAS+=		compiz-workarounds.schemas
 
+CONFIGURE_ARGS+=	--disable-nls
+
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
+BUILDLINK_API_DEPENDS.compiz-bcop+=	compiz-bcop>=0.7.3
 .include "../../devel/compiz-bcop/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../wm/compiz/buildlink3.mk"
diff --git a/wm/compiz-fusion-plugins-main/buildlink3.mk b/wm/compiz-fusion-plugins-main/buildlink3.mk
index 7f11f527993..200aed2e682 100644
--- a/wm/compiz-fusion-plugins-main/buildlink3.mk
+++ b/wm/compiz-fusion-plugins-main/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2013/06/06 12:53:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2013/06/30 20:53:46 rodent Exp $
 
 BUILDLINK_TREE+=	compiz-fusion-plugins-main
 
@@ -9,7 +9,13 @@ BUILDLINK_API_DEPENDS.compiz-fusion-plugins-main+=	compiz-fusion-plugins-main>=0
 BUILDLINK_ABI_DEPENDS.compiz-fusion-plugins-main+=	compiz-fusion-plugins-main>=0.8.4nb19
 BUILDLINK_PKGSRCDIR.compiz-fusion-plugins-main?=	../../wm/compiz-fusion-plugins-main
 
-.include "../../wm/compiz/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+
 .endif # COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-compiz-fusion-plugins-main
diff --git a/wm/compiz-fusion-plugins-main/distinfo b/wm/compiz-fusion-plugins-main/distinfo
index 37305945407..84da16a75f4 100644
--- a/wm/compiz-fusion-plugins-main/distinfo
+++ b/wm/compiz-fusion-plugins-main/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/11/26 19:55:13 imil Exp $
+$NetBSD: distinfo,v 1.4 2013/06/30 20:53:46 rodent Exp $
 
-SHA1 (compiz-plugins-main-0.8.4.tar.gz) = 3ff97da731b192835994a2a4ff86f65cc976a163
-RMD160 (compiz-plugins-main-0.8.4.tar.gz) = ec09f372c17397d2384987a130d0c495a8e34444
-Size (compiz-plugins-main-0.8.4.tar.gz) = 1810595 bytes
+SHA1 (compiz-plugins-main-0.8.8.tar.gz) = 4feb559c87a8e1fd54ea6ee96cf8196e5fc1704b
+RMD160 (compiz-plugins-main-0.8.8.tar.gz) = 62c6faf909825923cf4ef6bc8de69d2058af7942
+Size (compiz-plugins-main-0.8.8.tar.gz) = 1838991 bytes