summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authordrochner <drochner>2009-10-22 17:33:57 +0000
committerdrochner <drochner>2009-10-22 17:33:57 +0000
commit364d2210c6eba1f352a681815fd4c097776b1a4c (patch)
tree3e1080316a9198f6882e1b7d76a77d74f72f691f /wm
parent6c3de42508fc5e64a1f033900eb8b5c0a1f2b295 (diff)
downloadpkgsrc-364d2210c6eba1f352a681815fd4c097776b1a4c.tar.gz
update to 2.28.0
This switches to the gnome-2.28 release branch.
Diffstat (limited to 'wm')
-rw-r--r--wm/metacity/Makefile8
-rw-r--r--wm/metacity/PLIST4
-rw-r--r--wm/metacity/distinfo9
-rw-r--r--wm/metacity/patches/patch-ab13
4 files changed, 24 insertions, 10 deletions
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 1908f6027e7..301331533f3 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.83 2009/10/22 17:33:57 drochner Exp $
#
-DISTNAME= metacity-2.26.0
-PKGREVISION= 1
+DISTNAME= metacity-2.28.0
CATEGORIES= wm x11 gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.26/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.28/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -40,6 +39,7 @@ BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.7
BUILDLINK_DEPMETHOD.libXt?= build
+.include "../../audio/libcanberra/buildlink3.mk"
.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index 148ea45a0d9..cd0e916ad0a 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2009/06/14 18:19:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.31 2009/10/22 17:33:57 drochner Exp $
bin/metacity
bin/metacity-message
bin/metacity-theme-viewer
@@ -12,7 +12,6 @@ include/metacity-1/metacity-private/theme.h
include/metacity-1/metacity-private/util.h
lib/libmetacity-private.la
lib/pkgconfig/libmetacity-private.pc
-libexec/metacity-dialog
man/man1/metacity-theme-viewer.1
man/man1/metacity-window-demo.1
man/man1/metacity-message.1
@@ -33,6 +32,7 @@ share/locale/be@latin/LC_MESSAGES/metacity.mo
share/locale/bg/LC_MESSAGES/metacity.mo
share/locale/bn/LC_MESSAGES/metacity.mo
share/locale/bn_IN/LC_MESSAGES/metacity.mo
+share/locale/br/LC_MESSAGES/metacity.mo
share/locale/bs/LC_MESSAGES/metacity.mo
share/locale/ca/LC_MESSAGES/metacity.mo
share/locale/ca@valencia/LC_MESSAGES/metacity.mo
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 5c05d679cb8..6c19b7ef02f 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.39 2009/03/16 20:10:19 jmcneill Exp $
+$NetBSD: distinfo,v 1.40 2009/10/22 17:33:57 drochner Exp $
-SHA1 (metacity-2.26.0.tar.bz2) = 70593f69148960a0248527c8ae8d442a3d251d08
-RMD160 (metacity-2.26.0.tar.bz2) = 26b75abb9b705f9fd7711dfbbff134e600dcfd56
-Size (metacity-2.26.0.tar.bz2) = 2289848 bytes
+SHA1 (metacity-2.28.0.tar.bz2) = d64dc861ac00fffc503bf9acdc705b67b772d772
+RMD160 (metacity-2.28.0.tar.bz2) = 0eec1900fad87604bc531757d0e878d2da8cb89d
+Size (metacity-2.28.0.tar.bz2) = 2288241 bytes
SHA1 (patch-aa) = e57853437a8485399f302553a4a4289e607d3780
+SHA1 (patch-ab) = 6e3f56831d152a2144a8970a5c17b37be70ca117
diff --git a/wm/metacity/patches/patch-ab b/wm/metacity/patches/patch-ab
new file mode 100644
index 00000000000..fa851ddcaf6
--- /dev/null
+++ b/wm/metacity/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2009/10/22 17:33:57 drochner Exp $
+
+--- src/core/main.c.orig 2009-10-21 21:56:47.000000000 +0200
++++ src/core/main.c
+@@ -58,7 +58,7 @@
+
+ #include <stdlib.h>
+ #include <sys/types.h>
+-#include <wait.h>
++#include <sys/wait.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <signal.h>