Update to 2.6.0. Changes since previous version are listed here, but some

may be missing:

- allow building against an uninstalled libwnck build
- add "Move to Workspace" menu
- fix crash with updated allowed actions hint

5 files changed, 19 insertions, 14 deletions

diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index eb07243acb2..3677a5c7449 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/01 18:31:25 jmmv Exp $
 #
 
-DISTNAME=	libwnck-2.4.0.1
-PKGREVISION=	1
+DISTNAME=	libwnck-2.6.0
 CATEGORIES=	devel x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libwnck/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libwnck/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/devel/libwnck/PLIST b/devel/libwnck/PLIST
index e808a6d2492..8018ea8388a 100644
--- a/devel/libwnck/PLIST
+++ b/devel/libwnck/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2003/12/14 19:50:21 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/01 18:31:25 jmmv Exp $
 include/libwnck-1.0/libwnck/application.h
+include/libwnck-1.0/libwnck/class-group.h
 include/libwnck-1.0/libwnck/libwnck.h
 include/libwnck-1.0/libwnck/pager.h
 include/libwnck-1.0/libwnck/screen.h
@@ -13,8 +14,8 @@ include/libwnck-1.0/libwnck/workspace.h
 lib/libwnck-1.a
 lib/libwnck-1.la
 lib/libwnck-1.so
-lib/libwnck-1.so.11
-lib/libwnck-1.so.11.0
+lib/libwnck-1.so.13
+lib/libwnck-1.so.13.0
 lib/pkgconfig/libwnck-1.0.pc
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libwnck.mo
@@ -28,6 +29,8 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libwnck.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libwnck.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libwnck.mo
@@ -38,6 +41,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libwnck.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libwnck.mo
@@ -51,10 +55,12 @@ ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libwnck.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libwnck.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libwnck.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libwnck.mo
diff --git a/devel/libwnck/buildlink2.mk b/devel/libwnck/buildlink2.mk
index 2848ff37eeb..2894d4cac14 100644
--- a/devel/libwnck/buildlink2.mk
+++ b/devel/libwnck/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/04/01 18:31:25 jmmv Exp $
 
 .if !defined(LIBWNCK_BUILDLINK2_MK)
 LIBWNCK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libwnck
-BUILDLINK_DEPENDS.libwnck?=	libwnck>=2.4.0.1nb1
+BUILDLINK_DEPENDS.libwnck?=	libwnck>=2.6.0
 BUILDLINK_PKGSRCDIR.libwnck?=	../../devel/libwnck
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libwnck=libwnck
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index 43960b49ed8..2308a7591e9 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:31:25 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWNCK_BUILDLINK3_MK:=	${LIBWNCK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwnck}
 BUILDLINK_PACKAGES+=	libwnck
 
 .if !empty(LIBWNCK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.4.0.1nb1
+BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.6.0
 BUILDLINK_PKGSRCDIR.libwnck?=	../../devel/libwnck
 .endif	# LIBWNCK_BUILDLINK3_MK
 
diff --git a/devel/libwnck/distinfo b/devel/libwnck/distinfo
index 00f639edc20..5eb58ca3dd8 100644
--- a/devel/libwnck/distinfo
+++ b/devel/libwnck/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/12/14 19:50:21 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2004/04/01 18:31:25 jmmv Exp $
 
-SHA1 (libwnck-2.4.0.1.tar.bz2) = b121afb6015377c7cd5e3d59a75ae27632f93a56
-Size (libwnck-2.4.0.1.tar.bz2) = 310490 bytes
+SHA1 (libwnck-2.6.0.tar.bz2) = 072c2d2456246e637a5a81a984dabdd986addbdb
+Size (libwnck-2.6.0.tar.bz2) = 329689 bytes