Updated to 0.8.4

- MASTER_SITES changed
- HOMEPAGE changed
- added LICENSE
- added intltool to USE_TOOLS

4 files changed, 160 insertions, 108 deletions

diff --git a/wm/ccsm/Makefile b/wm/ccsm/Makefile
index d05fbb28045..f968b28b0ea 100644
--- a/wm/ccsm/Makefile
+++ b/wm/ccsm/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:49 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/11/26 20:11:13 imil Exp $
 #
 
-DISTNAME=		ccsm-0.6.0
-PKGREVISION=		1
+PKGVER=			0.8.4
+DISTNAME=		ccsm-${PKGVER}
 CATEGORIES=		wm gnome
-MASTER_SITES=		http://releases.compiz-fusion.org/0.6.0/
+MASTER_SITES=		http://releases.compiz.org/${PKGVER}/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.compiz-fusion.org/
+HOMEPAGE=		http://compiz.org/
 COMMENT=		CompizConfig Settings Manager
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		pkg-config gmake msgfmt
+USE_TOOLS+=		pkg-config gmake msgfmt intltool
 
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
-PYTHON_PATCH_SCRIPTS=	setup.py
-PYTHON_PATCH_SCRIPTS+=	ccm/*.py
+REPLACE_PYTHON=		${WRKSRC}/setup.py ${WRKSRC}/ccm/*.py
 
 MAKE_ENV+=	PYTHONBIN=${PYTHONBIN:Q}
 
diff --git a/wm/ccsm/PLIST b/wm/ccsm/PLIST
index 537ed2aad40..fc32192e467 100644
--- a/wm/ccsm/PLIST
+++ b/wm/ccsm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:18:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/11/26 20:11:13 imil Exp $
 bin/ccsm
 ${PYSITELIB}/ccm/Conflicts.py
 ${PYSITELIB}/ccm/Conflicts.pyc
@@ -25,116 +25,168 @@ ${PYSITELIB}/ccm/__init__.py
 ${PYSITELIB}/ccm/__init__.pyc
 ${PYSITELIB}/ccm/__init__.pyo
 share/applications/ccsm.desktop
-share/ccsm/images/category-accessibility.svg
-share/ccsm/images/category-desktop.svg
-share/ccsm/images/category-effects-boxed.svg
-share/ccsm/images/category-effects.svg
-share/ccsm/images/category-extras.svg
-share/ccsm/images/category-general.svg
-share/ccsm/images/category-image_loading.svg
-share/ccsm/images/category-key_bindings.svg
-share/ccsm/images/category-profiles.svg
-share/ccsm/images/category-search.svg
-share/ccsm/images/category-uncategorized.svg
-share/ccsm/images/category-utility.svg
-share/ccsm/images/category-window_management.svg
-share/ccsm/images/plugin-3d.svg
-share/ccsm/images/plugin-addhelper.svg
-share/ccsm/images/plugin-animation.svg
-share/ccsm/images/plugin-annotate.svg
-share/ccsm/images/plugin-atlantis.svg
-share/ccsm/images/plugin-bench.svg
-share/ccsm/images/plugin-blur.svg
-share/ccsm/images/plugin-bs.svg
-share/ccsm/images/plugin-capture.svg
-share/ccsm/images/plugin-clone.svg
-share/ccsm/images/plugin-colorfilter.svg
-share/ccsm/images/plugin-core.svg
-share/ccsm/images/plugin-crashhandler.svg
-share/ccsm/images/plugin-cube.svg
-share/ccsm/images/plugin-cubecaps.svg
-share/ccsm/images/plugin-cubereflex.svg
-share/ccsm/images/plugin-dbus.svg
-share/ccsm/images/plugin-debug.svg
-share/ccsm/images/plugin-decoration.svg
-share/ccsm/images/plugin-expo.svg
-share/ccsm/images/plugin-extrawm.svg
-share/ccsm/images/plugin-ezoom.svg
-share/ccsm/images/plugin-fade.svg
-share/ccsm/images/plugin-fadedesktop.svg
-share/ccsm/images/plugin-fakeargb.svg
-share/ccsm/images/plugin-firepaint.svg
-share/ccsm/images/plugin-fs.svg
-share/ccsm/images/plugin-gears.svg
-share/ccsm/images/plugin-glib.svg
-share/ccsm/images/plugin-group.svg
-share/ccsm/images/plugin-imgjpeg.svg
-share/ccsm/images/plugin-inotify.svg
-share/ccsm/images/plugin-mblur.svg
-share/ccsm/images/plugin-minimize.svg
-share/ccsm/images/plugin-move.svg
-share/ccsm/images/plugin-mswitch.svg
-share/ccsm/images/plugin-neg.svg
-share/ccsm/images/plugin-notification.svg
-share/ccsm/images/plugin-opacify.svg
-share/ccsm/images/plugin-place.svg
-share/ccsm/images/plugin-plane.svg
-share/ccsm/images/plugin-png.svg
-share/ccsm/images/plugin-put.svg
-share/ccsm/images/plugin-reflex.svg
-share/ccsm/images/plugin-regex.svg
-share/ccsm/images/plugin-resize.svg
-share/ccsm/images/plugin-resizeinfo.svg
-share/ccsm/images/plugin-ring.svg
-share/ccsm/images/plugin-rotate.svg
-share/ccsm/images/plugin-scale.svg
-share/ccsm/images/plugin-scaleaddon.svg
-share/ccsm/images/plugin-scalefilter.svg
-share/ccsm/images/plugin-schemep.svg
-share/ccsm/images/plugin-screencasting.svg
-share/ccsm/images/plugin-screenshot.svg
-share/ccsm/images/plugin-shift.svg
-share/ccsm/images/plugin-showdesktop.svg
-share/ccsm/images/plugin-snap.svg
-share/ccsm/images/plugin-snow.svg
-share/ccsm/images/plugin-splash.svg
-share/ccsm/images/plugin-state.svg
-share/ccsm/images/plugin-svg.svg
-share/ccsm/images/plugin-switcher.svg
-share/ccsm/images/plugin-text.svg
-share/ccsm/images/plugin-thumbnail.svg
-share/ccsm/images/plugin-tile.svg
-share/ccsm/images/plugin-trailfocus.svg
-share/ccsm/images/plugin-unknown.svg
-share/ccsm/images/plugin-video.svg
-share/ccsm/images/plugin-vpswitch.svg
-share/ccsm/images/plugin-wall.svg
-share/ccsm/images/plugin-wallpaper.svg
-share/ccsm/images/plugin-water.svg
-share/ccsm/images/plugin-widget.svg
-share/ccsm/images/plugin-winrules.svg
-share/ccsm/images/plugin-wobbly.svg
-share/ccsm/images/plugin-workarounds.svg
-share/ccsm/images/plugin-zoom.svg
+share/ccsm/icons/hicolor/22x22/categories/plugins-accessibility.png
+share/ccsm/icons/hicolor/22x22/categories/plugins-desktop.png
+share/ccsm/icons/hicolor/22x22/categories/plugins-effects.png
+share/ccsm/icons/hicolor/22x22/categories/plugins-extras.png
+share/ccsm/icons/hicolor/22x22/categories/plugins-general.png
+share/ccsm/icons/hicolor/22x22/categories/plugins-image_loading.png
+share/ccsm/icons/hicolor/22x22/categories/plugins-uncategorized.png
+share/ccsm/icons/hicolor/22x22/categories/plugins-utility.png
+share/ccsm/icons/hicolor/22x22/categories/plugins-window_management.png
+share/ccsm/icons/hicolor/22x22/devices/input-keyboard.png
+share/ccsm/icons/hicolor/22x22/devices/input-mouse.png
+share/ccsm/icons/hicolor/22x22/devices/video-display.png
+share/ccsm/icons/hicolor/22x22/mimetypes/audio-x-generic.png
+share/ccsm/icons/hicolor/scalable/apps/plugin-3d.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-addhelper.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-animation.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-animationaddon.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-annotate.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-atlantis.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-bench.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-bicubic.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-blur.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-clone.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-colorfilter.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-commands.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-core.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-crashhandler.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-cube.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-cubeaddon.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-dbus.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-debug.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-decoration.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-expo.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-extrawm.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-ezoom.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-fade.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-fadedesktop.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-fakeargb.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-firepaint.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-fs.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-gears.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-glib.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-gnomecompat.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-group.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-imgjpeg.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-inotify.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-loginout.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-mag.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-maximumize.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-mblur.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-minimize.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-mousepoll.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-move.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-mswitch.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-neg.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-notification.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-obs.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-opacify.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-place.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-png.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-put.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-reflex.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-regex.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-resize.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-resizeinfo.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-ring.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-rotate.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-scale.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-scaleaddon.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-scalefilter.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-schemep.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-screensaver.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-screenshot.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-session.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-shelf.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-shift.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-showdesktop.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-showmouse.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-snap.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-snow.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-splash.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-stackswitch.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-staticswitcher.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-svg.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-switcher.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-text.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-thumbnail.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-tile.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-trailfocus.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-unknown.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-video.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-vpswitch.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-wall.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-wallpaper.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-water.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-widget.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-winrules.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-wobbly.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-workarounds.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-zoom.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-accessibility.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-all.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-desktop.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-effects.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-extras.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-general.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-image_loading.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-profiles.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-search.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-uncategorized.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-utility.svg
+share/ccsm/icons/hicolor/scalable/categories/plugins-window_management.svg
+share/ccsm/images/display.png
+share/ccsm/images/modifier.png
+share/icons/hicolor/16x16/apps/ccsm.png
+share/icons/hicolor/22x22/apps/ccsm.png
+share/icons/hicolor/22x22/apps/ccsm.svg
+share/icons/hicolor/24x24/apps/ccsm.png
+share/icons/hicolor/32x32/apps/ccsm.png
+share/icons/hicolor/32x32/apps/ccsm.svg
+share/icons/hicolor/48x48/apps/ccsm.png
 share/icons/hicolor/scalable/apps/ccsm.svg
 share/locale/ar/LC_MESSAGES/ccsm.mo
+share/locale/as/LC_MESSAGES/ccsm.mo
+share/locale/be/LC_MESSAGES/ccsm.mo
+share/locale/bg/LC_MESSAGES/ccsm.mo
 share/locale/bn/LC_MESSAGES/ccsm.mo
+share/locale/bn_IN/LC_MESSAGES/ccsm.mo
 share/locale/ca/LC_MESSAGES/ccsm.mo
+share/locale/cs/LC_MESSAGES/ccsm.mo
+share/locale/da/LC_MESSAGES/ccsm.mo
 share/locale/de/LC_MESSAGES/ccsm.mo
 share/locale/el/LC_MESSAGES/ccsm.mo
+share/locale/en_GB/LC_MESSAGES/ccsm.mo
+share/locale/es/LC_MESSAGES/ccsm.mo
+share/locale/eu/LC_MESSAGES/ccsm.mo
+share/locale/fa/LC_MESSAGES/ccsm.mo
+share/locale/fi/LC_MESSAGES/ccsm.mo
 share/locale/fr/LC_MESSAGES/ccsm.mo
 share/locale/gl/LC_MESSAGES/ccsm.mo
 share/locale/gu/LC_MESSAGES/ccsm.mo
+share/locale/he/LC_MESSAGES/ccsm.mo
+share/locale/hi/LC_MESSAGES/ccsm.mo
+share/locale/hr/LC_MESSAGES/ccsm.mo
+share/locale/hu/LC_MESSAGES/ccsm.mo
 share/locale/id/LC_MESSAGES/ccsm.mo
 share/locale/it/LC_MESSAGES/ccsm.mo
+share/locale/ja/LC_MESSAGES/ccsm.mo
+share/locale/ko/LC_MESSAGES/ccsm.mo
+share/locale/md/LC_MESSAGES/ccsm.mo
+share/locale/ml_IN/LC_MESSAGES/ccsm.mo
 share/locale/nb/LC_MESSAGES/ccsm.mo
 share/locale/nl/LC_MESSAGES/ccsm.mo
+share/locale/or/LC_MESSAGES/ccsm.mo
+share/locale/pa/LC_MESSAGES/ccsm.mo
 share/locale/pl/LC_MESSAGES/ccsm.mo
 share/locale/pt/LC_MESSAGES/ccsm.mo
 share/locale/pt_BR/LC_MESSAGES/ccsm.mo
+share/locale/ru/LC_MESSAGES/ccsm.mo
 share/locale/sk/LC_MESSAGES/ccsm.mo
 share/locale/sv/LC_MESSAGES/ccsm.mo
 share/locale/tr/LC_MESSAGES/ccsm.mo
 share/locale/wo/LC_MESSAGES/ccsm.mo
 share/locale/zh_CN/LC_MESSAGES/ccsm.mo
-share/pixmaps/ccsm.png
+share/locale/zh_HK/LC_MESSAGES/ccsm.mo
diff --git a/wm/ccsm/distinfo b/wm/ccsm/distinfo
index aecbc130cd5..6a8080a24b8 100644
--- a/wm/ccsm/distinfo
+++ b/wm/ccsm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/05/12 12:08:13 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2009/11/26 20:11:13 imil Exp $
 
-SHA1 (ccsm-0.6.0.tar.gz) = 6bd25039608d4a98ecfa30665b332198c233e754
-RMD160 (ccsm-0.6.0.tar.gz) = 50564ea2e8e185fba0a8a0c05e2273169047727b
-Size (ccsm-0.6.0.tar.gz) = 565794 bytes
-SHA1 (patch-aa) = b6e0b750158a4a35149bd9d012a909ed045614d7
+SHA1 (ccsm-0.8.4.tar.gz) = be7b6788373cf40e15bf91eafc69b9742dd81acc
+RMD160 (ccsm-0.8.4.tar.gz) = d2d17d7eb627c5142b33f6a1d04557beabdb4665
+Size (ccsm-0.8.4.tar.gz) = 635866 bytes
+SHA1 (patch-aa) = 83439bdc7c716fe5e94eef90c22d2975ca7f2357
diff --git a/wm/ccsm/patches/patch-aa b/wm/ccsm/patches/patch-aa
index 9a6401a2390..081a5ff55c4 100644
--- a/wm/ccsm/patches/patch-aa
+++ b/wm/ccsm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/05/12 12:08:13 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2009/11/26 20:11:13 imil Exp $
 
---- Makefile.orig	2008-05-12 07:28:57.000000000 -0400
+--- Makefile.orig	2009-11-26 13:36:40.000000000 +0000
 +++ Makefile
 @@ -1,11 +1,11 @@
  all: