Updated to Xfce 4.4.1

See http://www.xfce.org/documentation/changelogs/4.4.1 for details.

5 files changed, 29 insertions, 41 deletions

diff --git a/x11/xfce4-notes-plugin/Makefile b/x11/xfce4-notes-plugin/Makefile
index f149c2c2f33..7a1f0881809 100644
--- a/x11/xfce4-notes-plugin/Makefile
+++ b/x11/xfce4-notes-plugin/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:23 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.11.1
+XFCE4_VERSION=	1.4.1
 
 DISTNAME=	xfce4-notes-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+#PKGREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-notes-plugin/
 COMMENT=	Xfce notes plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-notes-plugin/PLIST b/x11/xfce4-notes-plugin/PLIST
index 3e23d366ec5..4eded5315aa 100644
--- a/x11/xfce4-notes-plugin/PLIST
+++ b/x11/xfce4-notes-plugin/PLIST
@@ -1,4 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/28 07:03:31 martti Exp $
-lib/xfce4/panel-plugins/libnotes.la
-share/xfce4/notes/note_xfce.png
-@dirrm share/xfce4/notes
+@comment $NetBSD: PLIST,v 1.4 2007/04/12 09:55:23 martti Exp $
+bin/xfce4-popup-notes
+libexec/xfce4/panel-plugins/xfce4-notes-plugin
+share/icons/hicolor/16x16/apps/xfce4-notes-plugin.png
+share/icons/hicolor/22x22/apps/xfce4-notes-plugin.png
+share/icons/hicolor/24x24/apps/xfce4-notes-plugin.png
+share/icons/hicolor/32x32/apps/xfce4-notes-plugin.png
+share/icons/hicolor/scalable/apps/xfce4-notes-plugin.svg
+share/locale/ca/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo
+share/xfce4/panel-plugins/xfce4-notes-plugin.desktop
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index 6ed03fbdcec..d0d750b42bf 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/10/12 09:24:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/04/12 09:55:23 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+=	xfce4-notes-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-notes-plugin
 
 .if ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.11.1nb3
+BUILDLINK_API_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=1.4
 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=	../../x11/xfce4-notes-plugin
 .endif	# XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-notes-plugin/distinfo b/x11/xfce4-notes-plugin/distinfo
index 8f38382882b..8d50eda69d9 100644
--- a/x11/xfce4-notes-plugin/distinfo
+++ b/x11/xfce4-notes-plugin/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/12/18 22:56:15 rillig Exp $
+$NetBSD: distinfo,v 1.6 2007/04/12 09:55:23 martti Exp $
 
-SHA1 (xfce4-notes-plugin-0.11.1.tar.gz) = f0955bb680b9c7f98e86cb743d695bc5b0edd2d1
-RMD160 (xfce4-notes-plugin-0.11.1.tar.gz) = 67df2aad40cbfa7f7a544ab1a050a1b974885eed
-Size (xfce4-notes-plugin-0.11.1.tar.gz) = 339966 bytes
-SHA1 (patch-aa) = 1a1ba3c7f9f97f34046cf5fd37260d32a767899f
+SHA1 (xfce4-notes-plugin-1.4.1.tar.bz2) = 6cc99392e44e94a81731dbd585a075c195f2a9d8
+RMD160 (xfce4-notes-plugin-1.4.1.tar.bz2) = abd47c86f7235406e84c5871603afdc80f7e04c9
+Size (xfce4-notes-plugin-1.4.1.tar.bz2) = 157811 bytes
diff --git a/x11/xfce4-notes-plugin/patches/patch-aa b/x11/xfce4-notes-plugin/patches/patch-aa
deleted file mode 100644
index 94dc09abdf9..00000000000
--- a/x11/xfce4-notes-plugin/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/18 22:56:15 rillig Exp $
-
-Keywords: c90
-
---- panel-plugin/notes.c.orig	Sat Oct  1 18:30:35 2005
-+++ panel-plugin/notes.c	Sun Dec 18 23:52:08 2005
-@@ -148,9 +148,6 @@ notes_create_note (void)
- 
-   _note *note;
-   
--  /* create or note structure */
--  note = g_new(_note, 1);
--
-   GtkWidget *main_w;
-   GtkWidget *table;
-   GtkWidget *text_view;
-@@ -169,6 +166,9 @@ notes_create_note (void)
-   GtkWidget *hbox;
- 
-   GtkWidget *button_close_image;
-+
-+  /* create or note structure */
-+  note = g_new(_note, 1);
- 
-   main_w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   gtk_window_set_title (GTK_WINDOW (main_w), _("main_w"));