From 1ae3e448b39651c5392f1acbe32aca772c388764 Mon Sep 17 00:00:00 2001 From: imil Date: Thu, 26 Nov 2009 19:46:35 +0000 Subject: Updated to 0.8.4 - MASTER_SITES changed - HOMEPAGE changed - added LICENSE - added gmake to USE_TOOLS - added new COMPIZ_GCONF_SCHEMAS - removed configuration patch (default instead) - patch metadata/decoration.xml.in instead of compiz-decoration.schemas - patch-ac now upstream - patch-ad now upstream --- wm/compiz/Makefile | 19 +++++++++++-------- wm/compiz/PLIST | 37 ++++++++++++++++++++++++++----------- wm/compiz/distinfo | 13 +++++-------- wm/compiz/patches/patch-aa | 32 ++++++++++++++++++++------------ 4 files changed, 62 insertions(+), 39 deletions(-) (limited to 'wm') diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile index 1e4ba7064d6..1e7af54f73c 100644 --- a/wm/compiz/Makefile +++ b/wm/compiz/Makefile @@ -1,19 +1,20 @@ -# $NetBSD: Makefile,v 1.25 2009/10/30 19:24:01 tnn Exp $ +# $NetBSD: Makefile,v 1.26 2009/11/26 19:46:35 imil Exp $ # -DISTNAME= compiz-0.6.2 -PKGREVISION= 6 +PKGVER= 0.8.4 +DISTNAME= compiz-${PKGVER} CATEGORIES= wm x11 -MASTER_SITES= ${MASTER_SITE_XORG:=app/} +MASTER_SITES= http://releases.compiz.org/${PKGVER}/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://compiz.org/ COMMENT= Compositing window manager +LICENSE= mit PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes -USE_TOOLS+= intltool pkg-config msgfmt +USE_TOOLS+= intltool pkg-config msgfmt gmake USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes @@ -21,6 +22,7 @@ USE_LIBTOOL= yes COMPIZ_GCONF_SCHEMAS+= compiz-annotate.schemas COMPIZ_GCONF_SCHEMAS+= compiz-blur.schemas COMPIZ_GCONF_SCHEMAS+= compiz-clone.schemas +COMPIZ_GCONF_SCHEMAS+= compiz-commands.schemas COMPIZ_GCONF_SCHEMAS+= compiz-core.schemas COMPIZ_GCONF_SCHEMAS+= compiz-cube.schemas COMPIZ_GCONF_SCHEMAS+= compiz-dbus.schemas @@ -29,12 +31,14 @@ COMPIZ_GCONF_SCHEMAS+= compiz-fade.schemas COMPIZ_GCONF_SCHEMAS+= compiz-fs.schemas COMPIZ_GCONF_SCHEMAS+= compiz-gconf.schemas COMPIZ_GCONF_SCHEMAS+= compiz-glib.schemas +COMPIZ_GCONF_SCHEMAS+= compiz-gnomecompat.schemas COMPIZ_GCONF_SCHEMAS+= compiz-ini.schemas COMPIZ_GCONF_SCHEMAS+= compiz-inotify.schemas +COMPIZ_GCONF_SCHEMAS+= compiz-kconfig.schemas COMPIZ_GCONF_SCHEMAS+= compiz-minimize.schemas COMPIZ_GCONF_SCHEMAS+= compiz-move.schemas +COMPIZ_GCONF_SCHEMAS+= compiz-obs.schemas COMPIZ_GCONF_SCHEMAS+= compiz-place.schemas -COMPIZ_GCONF_SCHEMAS+= compiz-plane.schemas COMPIZ_GCONF_SCHEMAS+= compiz-png.schemas COMPIZ_GCONF_SCHEMAS+= compiz-regex.schemas COMPIZ_GCONF_SCHEMAS+= compiz-resize.schemas @@ -47,7 +51,6 @@ COMPIZ_GCONF_SCHEMAS+= compiz-video.schemas COMPIZ_GCONF_SCHEMAS+= compiz-water.schemas COMPIZ_GCONF_SCHEMAS+= compiz-wobbly.schemas COMPIZ_GCONF_SCHEMAS+= compiz-zoom.schemas - GCONF_SCHEMAS+= gwd.schemas GCONF_SCHEMAS+= ${COMPIZ_GCONF_SCHEMAS} @@ -61,7 +64,7 @@ PKG_SUGGESTED_OPTIONS= gnome PKG_OPTIONS_VAR= PKG_OPTIONS.compiz SUBST_CLASSES+= paths -SUBST_FILES.paths= metadata/compiz-decoration.schemas +SUBST_FILES.paths= metadata/decoration.xml.in SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g' SUBST_STAGE.paths= post-patch diff --git a/wm/compiz/PLIST b/wm/compiz/PLIST index cd7bd399b64..bc76cf057e6 100644 --- a/wm/compiz/PLIST +++ b/wm/compiz/PLIST @@ -1,31 +1,36 @@ -@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:18:57 joerg Exp $ +@comment $NetBSD: PLIST,v 1.9 2009/11/26 19:46:35 imil Exp $ bin/compiz bin/gtk-window-decorator +include/compiz/compiz-common.h +include/compiz/compiz-core.h +include/compiz/compiz-cube.h +include/compiz/compiz-plugin.h +include/compiz/compiz-scale.h include/compiz/compiz.h -include/compiz/cube.h include/compiz/decoration.h -include/compiz/scale.h lib/compiz/libannotate.la lib/compiz/libblur.la lib/compiz/libclone.la +lib/compiz/libcommands.la lib/compiz/libcube.la lib/compiz/libdbus.la lib/compiz/libdecoration.la lib/compiz/libfade.la lib/compiz/libgconf.la lib/compiz/libglib.la +lib/compiz/libgnomecompat.la lib/compiz/libini.la lib/compiz/libminimize.la lib/compiz/libmove.la +lib/compiz/libobs.la lib/compiz/libplace.la -lib/compiz/libplane.la lib/compiz/libpng.la lib/compiz/libregex.la lib/compiz/libresize.la lib/compiz/librotate.la lib/compiz/libscale.la lib/compiz/libscreenshot.la -${PLIST.gnome}lib/compiz/libsvg.la +lib/compiz/libsvg.la lib/compiz/libswitcher.la lib/compiz/libvideo.la lib/compiz/libwater.la @@ -37,10 +42,12 @@ lib/pkgconfig/compiz-gconf.pc lib/pkgconfig/compiz-scale.pc lib/pkgconfig/compiz.pc lib/pkgconfig/libdecoration.pc -${PLIST.gnome}lib/window-manager-settings/libcompiz.la +lib/window-manager-settings/libcompiz.la +share/applications/compiz.desktop share/compiz/annotate.xml share/compiz/blur.xml share/compiz/clone.xml +share/compiz/commands.xml share/compiz/core.xml share/compiz/cube.xml share/compiz/dbus.xml @@ -50,13 +57,15 @@ share/compiz/freedesktop.png share/compiz/fs.xml share/compiz/gconf.xml share/compiz/glib.xml +share/compiz/gnomecompat.xml share/compiz/icon.png share/compiz/ini.xml share/compiz/inotify.xml +share/compiz/kconfig.xml share/compiz/minimize.xml share/compiz/move.xml +share/compiz/obs.xml share/compiz/place.xml -share/compiz/plane.xml share/compiz/png.xml share/compiz/regex.xml share/compiz/resize.xml @@ -73,6 +82,7 @@ share/compiz/zoom.xml share/gconf/schemas/compiz-annotate.schemas share/gconf/schemas/compiz-blur.schemas share/gconf/schemas/compiz-clone.schemas +share/gconf/schemas/compiz-commands.schemas share/gconf/schemas/compiz-core.schemas share/gconf/schemas/compiz-cube.schemas share/gconf/schemas/compiz-dbus.schemas @@ -81,12 +91,14 @@ share/gconf/schemas/compiz-fade.schemas share/gconf/schemas/compiz-fs.schemas share/gconf/schemas/compiz-gconf.schemas share/gconf/schemas/compiz-glib.schemas +share/gconf/schemas/compiz-gnomecompat.schemas share/gconf/schemas/compiz-ini.schemas share/gconf/schemas/compiz-inotify.schemas +share/gconf/schemas/compiz-kconfig.schemas share/gconf/schemas/compiz-minimize.schemas share/gconf/schemas/compiz-move.schemas +share/gconf/schemas/compiz-obs.schemas share/gconf/schemas/compiz-place.schemas -share/gconf/schemas/compiz-plane.schemas share/gconf/schemas/compiz-png.schemas share/gconf/schemas/compiz-regex.schemas share/gconf/schemas/compiz-resize.schemas @@ -100,13 +112,14 @@ share/gconf/schemas/compiz-water.schemas share/gconf/schemas/compiz-wobbly.schemas share/gconf/schemas/compiz-zoom.schemas share/gconf/schemas/gwd.schemas -${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-desktop-key.xml -${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-key.xml -${PLIST.gnome}share/gnome/wm-properties/compiz.desktop +share/gnome-control-center/keybindings/50-compiz-desktop-key.xml +share/gnome-control-center/keybindings/50-compiz-key.xml +share/gnome/wm-properties/compiz-wm.desktop share/locale/af/LC_MESSAGES/compiz.mo share/locale/ar/LC_MESSAGES/compiz.mo share/locale/bg/LC_MESSAGES/compiz.mo share/locale/bn/LC_MESSAGES/compiz.mo +share/locale/bn_IN/LC_MESSAGES/compiz.mo share/locale/bs/LC_MESSAGES/compiz.mo share/locale/ca/LC_MESSAGES/compiz.mo share/locale/cs/LC_MESSAGES/compiz.mo @@ -118,6 +131,7 @@ share/locale/en_GB/LC_MESSAGES/compiz.mo share/locale/en_US/LC_MESSAGES/compiz.mo share/locale/es/LC_MESSAGES/compiz.mo share/locale/et/LC_MESSAGES/compiz.mo +share/locale/eu/LC_MESSAGES/compiz.mo share/locale/fi/LC_MESSAGES/compiz.mo share/locale/fr/LC_MESSAGES/compiz.mo share/locale/gl/LC_MESSAGES/compiz.mo @@ -138,6 +152,7 @@ share/locale/mk/LC_MESSAGES/compiz.mo share/locale/mr/LC_MESSAGES/compiz.mo share/locale/nb/LC_MESSAGES/compiz.mo share/locale/nl/LC_MESSAGES/compiz.mo +share/locale/or/LC_MESSAGES/compiz.mo share/locale/pa/LC_MESSAGES/compiz.mo share/locale/pl/LC_MESSAGES/compiz.mo share/locale/pt/LC_MESSAGES/compiz.mo diff --git a/wm/compiz/distinfo b/wm/compiz/distinfo index c151c334a32..2654f34534d 100644 --- a/wm/compiz/distinfo +++ b/wm/compiz/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.8 2009/10/31 13:47:52 tnn Exp $ +$NetBSD: distinfo,v 1.9 2009/11/26 19:46:35 imil Exp $ -SHA1 (compiz-0.6.2.tar.gz) = ab5ecad856049a12a803fe6c94c3e55cdfcb5f68 -RMD160 (compiz-0.6.2.tar.gz) = 6cc235570c3ac15573050b27198648045a85a804 -Size (compiz-0.6.2.tar.gz) = 1784471 bytes -SHA1 (patch-aa) = 1b6ab48fd459bc2fa4173f8f1d4936aa0d5c00be -SHA1 (patch-ab) = 273430fa119b4c904287115be1f5273868073899 -SHA1 (patch-ac) = 51479150d46def76d1c9988151c37571f4954c82 -SHA1 (patch-ad) = 4230d18b6d19548d12c559b4dad0a843bf6fb4e4 +SHA1 (compiz-0.8.4.tar.gz) = 244ac823818209e44944d74df42d8986ec31d9dd +RMD160 (compiz-0.8.4.tar.gz) = 176bfa04b8ee3ee3c5b7e6f3c27c88d16c54ac63 +Size (compiz-0.8.4.tar.gz) = 1755741 bytes +SHA1 (patch-aa) = 0772722aea9828c1f05f48ebbdad02387ae9c41a diff --git a/wm/compiz/patches/patch-aa b/wm/compiz/patches/patch-aa index 99468754dd7..39eb21b7d76 100644 --- a/wm/compiz/patches/patch-aa +++ b/wm/compiz/patches/patch-aa @@ -1,13 +1,21 @@ -$NetBSD: patch-aa,v 1.3 2008/05/12 01:57:37 jmcneill Exp $ +$NetBSD: patch-aa,v 1.4 2009/11/26 19:46:35 imil Exp $ ---- metadata/compiz-core.schemas.orig 2008-05-11 20:43:31.000000000 -0400 -+++ metadata/compiz-core.schemas 2008-05-11 20:44:03.000000000 -0400 -@@ -7,7 +7,7 @@ - compiz - list - string -- [] -+ [gconf,decoration,wobbly,fade,minimize,switcher,move,resize,place,rotate,zoom,scale] - - Active Plugins - List of currently active plugins +--- metadata/decoration.xml.in.orig 2009-11-26 10:26:46.000000000 +0000 ++++ metadata/decoration.xml.in +@@ -16,7 +16,7 @@ + +