Chase libnotify, libproxy and webkit-gtk2 shlib changes, and fix build where needed.

svn path=/head/; revision=280300
2024-10-19 19:59:43 +00:00 · 2011-08-23 18:39:19 +00:00 · 2011-08-23 18:39:19 +00:00 · fe61bf1eb4 · 2021-03-31 03:12:20 +00:00
commit fe61bf1eb4
parent 5732783897
150 changed files with 1326 additions and 168 deletions
--- a/audio/Makefile
+++ b/audio/Makefile
@ -360,6 +360,7 @@
    SUBDIR += libbpm
    SUBDIR += libbs2b
    SUBDIR += libcanberra
+    SUBDIR += libcanberra-gtk3
    SUBDIR += libcdaudio
    SUBDIR += libcddb
    SUBDIR += libcddb-doc
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	ario
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}

@ -17,6 +18,7 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		gcrypt:${PORTSDIR}/security/libgcrypt \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		curl:${PORTSDIR}/ftp/curl \
 		notify:${PORTSDIR}/devel/libnotify \
 		soup:${PORTSDIR}/devel/libsoup22 \
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	clementine
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-player
@ -16,7 +17,7 @@ COMMENT=	A cross-platform music player based on Amarok 1.4

 LIB_DEPENDS=	lastfm.0:${PORTSDIR}/audio/liblastfm \
 		tag.1:${PORTSDIR}/audio/taglib \
-		notify.1:${PORTSDIR}/devel/libnotify \
+		notify.4:${PORTSDIR}/devel/libnotify \
 		xine.1:${PORTSDIR}/multimedia/libxine \
 		mtp:${PORTSDIR}/audio/libmtp
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@ -7,13 +7,14 @@

 PORTNAME=	cueplayer
 PORTVERSION=	0.28
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE

 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	CUE player

-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify

 USE_QT_VER=	4
 QT_COMPONENTS=	gui xml qmake_build uic_build moc_build rcc_build network
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	gmpc-libnotify
 PORTVERSION=	0.20.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@ -15,7 +16,7 @@ MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A libnotify for gmpc

 LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc

--- a/audio/gmpc-libnotify/files/patch-src_plugin.c
+++ b/audio/gmpc-libnotify/files/patch-src_plugin.c
@ -0,0 +1,20 @@
+--- src/plugin.c.orig	2011-08-15 20:17:11.000000000 +0200
+++ src/plugin.c	2011-08-15 20:18:35.000000000 +0200
+@@ -149,16 +149,13 @@ static void libnotify_song_changed(MpdOb
+ 		if(not == NULL)
+ 		{
+ 			//            notify_notification_close(not, NULL);
+-			not = notify_notification_new(summary, buffer,NULL, NULL);
+			not = notify_notification_new(summary, buffer,NULL);
+ 		}
+ 		else{
+ 			notify_notification_update(not, summary, buffer, NULL);
+ 		}
+ 		notify_notification_set_urgency(not, NOTIFY_URGENCY_LOW);
+ 
+-		if(cfg_get_single_value_as_int_with_default(config, "libnotify-plugin", "attach-to-tray", TRUE))
+-			notify_notification_attach_to_status_icon(not, tray_icon2_gsi);
+-
+ 		g_free(summary);
+ 		/* Add the song to the widget */
+ 		g_object_set_data_full(G_OBJECT(not), "mpd-song", mpd_songDup(song),  (GDestroyNotify)mpd_freeSong);
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	gmpc-wikipedia
 PORTVERSION=	0.20.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 		http://freebsd.unixfreunde.de/sources/
@ -16,7 +17,7 @@ COMMENT=	Wikipedia info for gmpc

 LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup \
-		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc

--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	goobox
 PORTVERSION=	1.9.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -38,7 +38,7 @@ OPTIONS=	NOTIFY "Enable libnotify support" on
 .include <bsd.port.pre.mk>

 .if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=	--enable-notification
 .else
 CONFIGURE_ARGS+=	--disable-notification
--- a/audio/goobox/files/patch-src_main.c
+++ b/audio/goobox/files/patch-src_main.c
@ -0,0 +1,11 @@
+--- src/main.c.orig	2011-08-15 20:09:01.000000000 +0200
+++ src/main.c	2011-08-15 20:09:22.000000000 +0200
+@@ -698,7 +698,7 @@ system_notify (GooWindow  *window,
+ 	}
+ 
+ 	if (notification == NULL) {
+-		notification = notify_notification_new (title, msg, "goobox", NULL);
+		notification = notify_notification_new (title, msg, "goobox");
+ 		notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 		notify_notification_add_action (notification,
+ 						GTK_STOCK_MEDIA_NEXT,
--- a/audio/padevchooser/Makefile
+++ b/audio/padevchooser/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	padevchooser
 PORTVERSION=	0.9.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/

@ -16,7 +16,7 @@ COMMENT=	GTK icon tray for PulseAudio

 LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 		pulse.0:${PORTSDIR}/audio/pulseaudio \
-		notify.1:${PORTSDIR}/devel/libnotify \
+		notify.4:${PORTSDIR}/devel/libnotify \
 		avahi-core:${PORTSDIR}/net/avahi
 RUN_DEPENDES=	dbus-daemon:${PORTSDIR}/devel/dbus

--- a/audio/padevchooser/files/patch-src_padevchooser.c
+++ b/audio/padevchooser/files/patch-src_padevchooser.c
@ -0,0 +1,11 @@
+--- src/padevchooser.c.orig	2011-08-11 21:41:17.000000000 +0200
+++ src/padevchooser.c	2011-08-11 21:41:42.000000000 +0200
+@@ -162,7 +162,7 @@ static void notify_event(const char *tit
+         
+     if (!notification) {
+         s = g_strdup_printf("<i>%s</i>\n%s", title, text);
+-        notification = notify_notification_new(title, s, "audio-card", GTK_WIDGET(tray_icon));
+        notification = notify_notification_new(title, s, "audio-card");
+         notify_notification_set_category(notification, "device.added");
+         notify_notification_set_urgency(notification, NOTIFY_URGENCY_LOW);
+         g_signal_connect_swapped(G_OBJECT(notification), "closed", G_CALLBACK(notification_closed), NULL);
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.111 2010/09/28 15:55:46 kwm Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.115 2011/05/04 18:44:36 kwm Exp $
 #

 PORTNAME=	rhythmbox
 PORTVERSION=	0.12.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -27,6 +27,8 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
 		brasero-media.3:${PORTSDIR}/sysutils/brasero

+CONFLICTS=	rhythmbox-2.[0-9]* rhythmbox-3.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
@ -89,7 +91,7 @@ PLIST_SUB+=		MTP="@comment "
 .if defined(WITH_DAAP)
 CONFIGURE_ARGS+=	--enable-daap  --with-mdns=avahi
 LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app \
-    			gnome-keyring:${PORTSDIR}/security/gnome-keyring
+    			gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
 PLIST_SUB+=		DAAP=""
 .else
 .if exists(${LOCALBASE}/lib/libavahi-client.a)
@ -100,7 +102,7 @@ PLIST_SUB+=		DAAP="@comment "
 .endif

 .if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS+=		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
 .else
 CONFIGURE_ARGS+=	--disable-libnotify
--- a/audio/rhythmbox/files/patch-plugins_status-icon_rb-status-icon-plugin.c
+++ b/audio/rhythmbox/files/patch-plugins_status-icon_rb-status-icon-plugin.c
@ -0,0 +1,11 @@
+--- plugins/status-icon/rb-status-icon-plugin.c.orig	2011-08-21 21:46:27.000000000 +0200
+++ plugins/status-icon/rb-status-icon-plugin.c	2011-08-21 21:46:43.000000000 +0200
+@@ -394,7 +394,7 @@ do_notify (RBStatusIconPlugin *plugin,
+ 		icon_name = NULL;
+ 
+ 	if (plugin->priv->notification == NULL) {
+-		plugin->priv->notification = notify_notification_new (primary, secondary, icon_name, NULL);
+		plugin->priv->notification = notify_notification_new (primary, secondary, icon_name);
+ 
+ 		g_signal_connect_object (plugin->priv->notification,
+ 					 "closed",
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	vagalume
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://vagalume.igalia.com/files/source/ \
 		${MASTER_SITE_DEBIAN_POOL}
@ -53,7 +54,7 @@ PLIST_SUB+=	DBUS="@comment "
 .if !defined(WITHOUT_TRAY)
 CONFIGURE_ARGS+=--enable-tray-icon
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 .else
 CONFIGURE_ARGS+=--disable-tray-icon
 .endif
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	cairo-dock-plugins
 DISTVERSION=	2.3.0~3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpadlibrarian.net/73753265/

@ -71,7 +71,7 @@ PLIST_SUB+=	TERMINAL="@comment "
 .endif

 .if defined(WITH_WEBLETS)
-LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
 CMAKE_ARGS+=	-Denable_weblets:STRING=yes
 PLIST_SUB+=	WEBLETS=""
 .else
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@ -7,13 +7,14 @@

 PORTNAME=		gnome-globalmenu
 PORTVERSION=		0.7.10
+PORTREVISION=		1
 CATEGORIES=		deskutils
 MASTER_SITES=		http://gnome2-globalmenu.googlecode.com/files/

 MAINTAINER=		gustau.perez@gmail.com
 COMMENT=		Global menu for gnome

-LIB_DEPENDS=		notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=		notify.4:${PORTSDIR}/devel/libnotify

 USE_GNOME=		gnomepanel gnomedesktop

--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	google-gadgets
 PORTVERSION=	0.11.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
 DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}
@ -58,7 +58,7 @@ QT_COMPONENTS=	webkit opengl gui corelib script network moc_build

 .if defined(WITH_GTKWEBKIT)
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
-LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
 .endif

 .if defined(WITH_MOZILLA)
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	lightning
 DISTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	calendar/${PORTNAME}/releases/${DISTVERSION}b2/source
@ -65,7 +65,7 @@ EXTRA_PATCHES=	${FILESDIR}/liboggplay_oss
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif

 post-patch:
--- a/deskutils/notify-osd/Makefile
+++ b/deskutils/notify-osd/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	notify-osd
 PORTVERSION=	0.9.29
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpadlibrarian.net/43419242/ \
 		CRITICAL
@ -15,7 +16,7 @@ MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	On-screen-display notification agent using libnotify

 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus

 GNU_CONFIGURE=	yes
--- a/deskutils/notify-osd/files/patch-tests_test-synchronous.c
+++ b/deskutils/notify-osd/files/patch-tests_test-synchronous.c
@ -0,0 +1,21 @@
+--- tests/test-synchronous.c.orig	2011-08-16 13:55:36.000000000 +0200
+++ tests/test-synchronous.c	2011-08-16 13:56:05.000000000 +0200
+@@ -38,7 +38,7 @@ send_normal (const gchar *message)
+         NotifyNotification *n;
+ 	n = notify_notification_new ("Test notification",
+ 				     g_strdup (message),
+-				     "", NULL);
+				     "");
+ 	notify_notification_show (n, NULL);
+ 	g_object_unref(G_OBJECT(n));
+ }
+@@ -53,8 +53,7 @@ send_synchronous (const char *type,
+ 	if (n == NULL)
+ 		n = notify_notification_new (" ",
+ 					     "",
+-					     g_strdup (icon),
+-					     NULL);
+					     g_strdup (icon));
+ 	else
+ 		notify_notification_update (n,
+ 					    " ",
--- a/deskutils/notify-osd/files/patch-tests_test-withlib.c
+++ b/deskutils/notify-osd/files/patch-tests_test-withlib.c
@ -0,0 +1,113 @@
+--- tests/test-withlib.c.orig	2011-08-16 13:52:38.000000000 +0200
+++ tests/test-withlib.c	2011-08-16 13:54:51.000000000 +0200
+@@ -94,7 +94,7 @@ test_withlib_show_notification (void)
+ 
+ 	n = notify_notification_new ("Test",
+ 				     "You should see a normal notification",
+-				     "", NULL);
+				     "");
+ 	notify_notification_show (n, NULL);
+ 	sleep (3);
+ 
+@@ -109,7 +109,7 @@ test_withlib_update_notification (void)
+ 
+ 	n = notify_notification_new ("Test",
+ 				     "New notification",
+-				     "", NULL);
+				     "");
+ 	res = notify_notification_show (n, NULL);
+ 	g_assert (res);
+ 	sleep (1);
+@@ -135,7 +135,7 @@ test_withlib_pass_icon_data (void)
+ 
+ 	n = notify_notification_new ("Image Test",
+ 				     "You should see an image",
+-				     "", NULL);
+				     "");
+ 	g_print ("iconpath: %s\n", SRCDIR"/icons/avatar.png");
+ 	pixbuf = gdk_pixbuf_new_from_file_at_scale (SRCDIR"/icons/avatar.png",
+ 						    64, 64, TRUE, NULL);
+@@ -157,22 +157,22 @@ test_withlib_priority (void)
+ 
+ 	n1 = notify_notification_new ("Dummy Notification",
+ 				      "This is a test notification",
+-				      "", NULL);
+				      "");
+ 	notify_notification_show (n1, NULL);
+ 	n2 = notify_notification_new ("Normal Notification",
+ 				      "You should see this *after* the urgent notification.",
+-				      "", NULL);
+				      "");
+ 	notify_notification_set_urgency (n2, NOTIFY_URGENCY_LOW);
+ 	notify_notification_show (n2, NULL);
+ 	n3 = notify_notification_new ("Synchronous Notification",
+ 				      "You should immediately see this notification.",
+-				      "", NULL);
+				      "");
+ 	notify_notification_set_hint_string (n3, "synchronous", "test");
+ 	notify_notification_set_urgency (n3, NOTIFY_URGENCY_NORMAL);
+ 	notify_notification_show (n3, NULL);
+ 	n4 = notify_notification_new ("Urgent Notification",
+ 				      "You should see a dialog box, and after, a normal notification.",
+-				      "", NULL);
+				      "");
+ 	notify_notification_set_urgency (n4, NOTIFY_URGENCY_CRITICAL);
+ 	notify_notification_show (n4, NULL);
+ 	
+@@ -207,7 +207,7 @@ test_withlib_actions (void)
+ 
+ 	n1 = notify_notification_new ("Notification with an action",
+ 				      "You should see that in a dialog box. Click the 'Action' button for the test to succeed.",
+-				      "", NULL);
+				      "");
+ 	notify_notification_add_action (n1,
+ 					"action",
+ 					"Action",
+@@ -231,7 +231,7 @@ test_withlib_close_notification (void)
+ 
+ 	n = notify_notification_new ("Test Title",
+ 				     "This notification will be closed prematurely...",
+-				     "", NULL);
+				     "");
+ 	notify_notification_show (n, NULL);
+ 	
+ 	loop = g_main_loop_new(NULL, FALSE);
+@@ -256,8 +256,7 @@ test_withlib_append_hint (void)
+ 	/* init notification, supply first line of body-text */
+ 	n = notify_notification_new ("Test (append-hint)",
+ 				     "The quick brown fox jumps over the lazy dog.",
+-				     SRCDIR"/icons/avatar.png",
+-				     NULL);
+				     SRCDIR"/icons/avatar.png");
+ 	res = notify_notification_show (n, NULL);
+ 	g_assert (res);
+ 	sleep (1);
+@@ -296,8 +295,7 @@ test_withlib_icon_only_hint (void)
+ 	/* init notification, supply first line of body-text */
+ 	n = notify_notification_new (" ", /* needs this to be non-NULL */
+ 				     NULL,
+-				     "notification-audio-play",
+-				     NULL);
+				     "notification-audio-play");
+ 	notify_notification_set_hint_string (n, "icon-only", "allowed");
+ 	res = notify_notification_show (n, NULL);
+ 	g_assert (res);
+@@ -314,8 +312,7 @@ test_withlib_swallow_markup (void)
+ 
+ 	n = notify_notification_new ("Swallow markup test",
+ 				     "This text is hopefully neither <b>bold</b>, <i>italic</i> nor <u>underlined</u>.\n\nA little math-notation:\n\n\ta &gt; b &lt; c = 0",
+-				     SRCDIR"/icons/avatar.png",
+-				     NULL);
+				     SRCDIR"/icons/avatar.png");
+ 	res = notify_notification_show (n, NULL);
+ 	g_assert (res);
+ 	sleep (2);
+@@ -341,7 +338,7 @@ test_withlib_throttle (void)
+ 
+ 		// create dummy notification
+ 		snprintf (buf, 19, "Test #%.2d", i);
+-		n = notify_notification_new (buf, buf, "", NULL);
+		n = notify_notification_new (buf, buf, "");
+ 
+ 		// inject it into the queue
+ 		res = notify_notification_show (n, &error);
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	osmo
 PORTVERSION=	0.2.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}/

--- a/deskutils/osmo/files/patch-src__check_events.c
+++ b/deskutils/osmo/files/patch-src__check_events.c
@ -0,0 +1,48 @@
+--- src/check_events.c.orig	2011-08-12 15:17:59.000000000 +0200
+++ src/check_events.c	2011-08-12 15:20:36.000000000 +0200
+@@ -454,9 +454,9 @@
+ 					a->date = 0;
+ 
+ 					if (textdesc != NULL)
+-						a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL);
+						a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING);
+ 					else
+-						a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL);
+						a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING);
+ 
+ 					g_free (textdesc);
+ 					g_free (text);
+@@ -483,9 +483,7 @@
+ #endif /* HAVE_LIBNOTIFY */
+ 
+ 					if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
+-#ifdef HAVE_LIBNOTIFY
+-						notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
+-#endif /* HAVE_LIBNOTIFY */
+
+ 				        gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
+ 
+ 						if (config.blink_on_events) {
+@@ -532,9 +530,9 @@
+ 					a->time = -1;
+ 					a->date = 0;
+ 					if (textdesc != NULL)
+-						a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL);
+						a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO);
+ 					else
+-						a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL);
+						a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO);
+ 
+ 					notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER);
+ 					notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL);
+@@ -545,9 +543,7 @@
+ #endif /* HAVE_LIBNOTIFY */
+ 
+ 					if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) {
+-#ifdef HAVE_LIBNOTIFY
+-						notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon);
+-#endif /* HAVE_LIBNOTIFY */
+
+ 				        gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK);
+ 
+ 						if (config.blink_on_events) {
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	rubrica
 PORTVERSION=	2.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	BERLIOS
 DISTNAME=	${PORTNAME}2-${PORTVERSION}
@ -18,7 +18,7 @@ COMMENT=	An addressbook for the GNOME 2 desktop
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme

 USE_BZIP2=	yes
--- a/deskutils/rubrica/files/patch-src_app.c
+++ b/deskutils/rubrica/files/patch-src_app.c
@ -0,0 +1,12 @@
+--- src/app.c.orig	2011-08-12 15:55:03.000000000 +0200
+++ src/app.c	2011-08-12 15:55:26.000000000 +0200
+@@ -1269,8 +1269,7 @@ rubrica_app_init(RubricaApp* self)
+   self->priv->cutted      = NULL;
+   self->priv->notify      = notify_notification_new("Rubrica Addressbook",
+ 						    NULL, 
+-						    "info",
+-						    NULL);
+						    "info");
+   self->priv->show_card   = TRUE;
+ 
+   g_object_set(self->priv->notebook, "homogeneous", FALSE, NULL);
--- a/deskutils/steadyflow/Makefile
+++ b/deskutils/steadyflow/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	steadyflow
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ \
 		https://launchpadlibrarian.net/72208624/
@ -16,7 +17,7 @@ COMMENT=	Simple download manager

 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		gee.2:${PORTSDIR}/devel/libgee \
-		notify.1:${PORTSDIR}/devel/libnotify \
+		notify.4:${PORTSDIR}/devel/libnotify \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala

--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	xfce4-notifyd
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@ -18,7 +19,7 @@ COMMENT=	Visually-appealing notification daemon for Xfce
 LICENSE=	GPLv3

 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify

 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	xneur
 PORTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
 		http://mirror.amdmi3.ru/distfiles/
@ -14,7 +15,7 @@ MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
 MAINTAINER=	admin@lissyara.su
 COMMENT=	Auto keyboard switcher

-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
+LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
 		pcre.0:${PORTSDIR}/devel/pcre

 USE_BZIP2=	yes
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	devhelp
 PORTVERSION=	2.32.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@ -15,7 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Developer help browser for GNOME 2

-LIB_DEPENDS=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
+LIB_DEPENDS=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique

 USE_BZIP2=	yes
--- a/devel/libnotifymm/Makefile
+++ b/devel/libnotifymm/Makefile
@ -15,10 +15,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrappers for libnotify

-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
+LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
 		glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
 		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24

+BROKEN=		doesn't build with notify 0.7.
+DEPRECATED=	Doesn't build and isn't used by anything.
+EXPIRATION_DATE=2011-09-23
+
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	pkgconfig gnomehack gnomeprefix ltverhack
--- a/devel/notify-sharp/Makefile
+++ b/devel/notify-sharp/Makefile
@ -15,7 +15,7 @@ COMMENT=	C\# client library for notification-daemon

 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
-		${LOCALBASE}/share/dbus-1/services/org.freedesktop.Notifications.service:${PORTSDIR}/deskutils/notification-daemon
+		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon

 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@ -8,7 +8,7 @@
 PORTNAME=	notify
 PORTVERSION=	0.1.1
 DISTVERSIONPREFIX=python-
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/notify-python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -16,7 +16,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A python bindings for libnotify

-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify

 USE_BZIP2=	yes
 USE_GMAKE=	yes
--- a/devel/py-notify/files/patch-src_pynotify.defs
+++ b/devel/py-notify/files/patch-src_pynotify.defs
@ -0,0 +1,35 @@
+--- src/pynotify.defs.orig	2011-07-30 20:46:04.000000000 +0200
+++ src/pynotify.defs	2011-07-30 20:46:45.000000000 +0200
+@@ -38,7 +38,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "message" (null-ok) (default "NULL"))
+     '("const-gchar*" "icon" (null-ok) (default "NULL"))
+-    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
+   )
+ )
+ 
+@@ -53,24 +52,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "attach")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@ -11,6 +11,7 @@

 PORTNAME=	seed
 PORTVERSION=	2.31.91
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -20,7 +21,7 @@ COMMENT=	GObject JavaScriptCore bridge

 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-js-common.pc:${PORTSDIR}/devel/gnome-js-common
 LIB_DEPENDS=	ffi.5:${PORTSDIR}/devel/libffi \
-		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
+		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
 		girepository-1.0.1:${PORTSDIR}/devel/gobject-introspection \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	upp
 PORTVERSION=	3211
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
@ -16,7 +17,7 @@ COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite

 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		expat.6:${PORTSDIR}/textproc/expat2 \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify

 USE_XORG=	xft
 USE_GNOME=	gtk20
--- a/devel/upp/files/patch-uppsrc_CtrlLib_TrayIconX11.cpp
+++ b/devel/upp/files/patch-uppsrc_CtrlLib_TrayIconX11.cpp
@ -0,0 +1,11 @@
+--- uppsrc/CtrlLib/TrayIconX11.cpp.orig	2011-08-12 16:13:23.000000000 +0200
+++ uppsrc/CtrlLib/TrayIconX11.cpp	2011-08-12 16:14:01.000000000 +0200
+@@ -106,7 +106,7 @@ void TrayIcon::Message(int type, const c
+ 	NotifyNotification *notification = notify_notification_new (title, text
+ 					, type == 1 ? "gtk-dialog-info"
+ 					: type == 2 ? "gtk-dialog-warning"
+-					: "gtk-dialog-error", NULL);
+					: "gtk-dialog-error");
+ 	notify_notification_set_timeout(notification, timeout * 1000);
+ 	notify_notification_show (notification, &error);
+ #endif
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@ -7,7 +7,7 @@

 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		emulators kld
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
 DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
@ -32,7 +32,7 @@ PLIST_SUB+=		X11="@comment "
 CONFLICTS=		open-vm-tools-[0-9]*
 .else
 .if !defined(WITHOUT_LIBNOTIFY)
-LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 .if defined(WITH_UNITY)
 CONFIGURE_ENV+=		CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@ -106,7 +106,7 @@ CONFIGURE_ARGS+=--enable-locale-specific-tax

 .if defined(WITH_WEBKIT)
 CONFIGURE_ARGS+=--with-html-engine=webkit
-LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
 .else
 USE_GNOME+=	gtkhtml3
 .endif
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	gwget
 PORTVERSION=	1.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -36,7 +36,7 @@ GCONF_SCHEMAS=	${PORTNAME}.schemas
 .include <bsd.port.pre.mk>

 .if !defined(WITHOUT_LIBNOTIFY)
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS+=	${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
 .else
 CONFIGURE_ARGS+=	--disable-libnotify
--- a/ftp/gwget/files/patch-src_systray.c
+++ b/ftp/gwget/files/patch-src_systray.c
@ -0,0 +1,11 @@
+--- src/systray.c.orig	2011-08-16 13:49:31.000000000 +0200
+++ src/systray.c	2011-08-16 13:49:44.000000000 +0200
+@@ -224,7 +224,7 @@ gwget_tray_notify (gchar *primary, gchar
+        		if (!notify_is_initted ())
+ 			if (!notify_init ("gwget"))
+ 		               return;
+-       NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name,NULL);
+       NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name);
+        notify_notification_show(notification,NULL);
+ #endif
+ 
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	gimp-app
 DISTVERSION=	2.6.11
-PORTREVISION?=	3
+PORTREVISION?=	4
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@ -132,7 +132,7 @@ CONFIGURE_ARGS+=	--without-gvfs
 .endif

 .if defined(WITH_HELPBROWSER)
-LIB_DEPENDS+=		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
 CONFIGURE_ARGS+=	--with-webkit
 PLIST_SUB+=		HELPBROWSER=""
 .else
@ -155,7 +155,7 @@ CONFIGURE_ARGS+=	--disable-mp
 .endif

 .if defined(WITH_POPPLER)
-LIB_DEPENDS+=		poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS+=		poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk
 PLIST_SUB+=		POPPLER=""
 .else
 CONFIGURE_ARGS+=	--without-poppler
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	shotwell
 PORTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.yorba.org/download/shotwell/${PORTVERSION:R}/

@ -22,7 +23,7 @@ LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3 \
 		gexiv2.0:${PORTSDIR}/graphics/gexiv2 \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
-		webkit:${PORTSDIR}/www/webkit-gtk2 \
+		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
 		raw.2:${PORTSDIR}/graphics/libraw

--- a/graphics/solang/Makefile
+++ b/graphics/solang/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	solang
 PORTVERSION=	0.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	http://rishi.fedorapeople.org/solang/

@ -22,7 +22,7 @@ LIB_DEPENDS=	gegl-0.1.105:${PORTSDIR}/graphics/gegl \
 		exiv2.10:${PORTSDIR}/graphics/exiv2 \
 		flickcurl.0:${PORTSDIR}/www/flickcurl \
 		gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview \
-		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
+		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
 		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		gdl-1.3:${PORTSDIR}/x11-toolkits/gdl \
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	xchat
 PORTVERSION=	0.26.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/xchat-gnome/${PORTVERSION:R}
--- a/irc/xchat-gnome/files/patch-plugins_notify-osd_notify-osd.c
+++ b/irc/xchat-gnome/files/patch-plugins_notify-osd_notify-osd.c
@ -0,0 +1,11 @@
+--- plugins/notify-osd/notify-osd.c.orig	2011-06-26 13:22:24.000000000 +0200
+++ plugins/notify-osd/notify-osd.c	2011-06-26 13:22:41.000000000 +0200
+@@ -67,7 +67,7 @@
+ 	gchar *escaped;
+ 
+ 	escaped = g_markup_escape_text (message, strlen(message));
+-	notify = notify_notification_new (summary, escaped, NULL, NULL);
+	notify = notify_notification_new (summary, escaped, NULL);
+ 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 	notify_notification_set_icon_from_pixbuf (notify, notify_icon);
+ 	if (!notify_notification_show (notify, &error)) {
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	balsa
 PORTVERSION=	2.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
 DISTNAME=	balsa-${PORTVERSION}
@ -74,7 +74,7 @@ CONFIGURE_ARGS+=--with-gtksourceview=2
 .endif

 .if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--with-libnotify=yes
 .else
 CONFIGURE_ARGS+=--with-libnotify=no
--- a/mail/balsa/files/patch-libbalsa_information.c
+++ b/mail/balsa/files/patch-libbalsa_information.c
@ -0,0 +1,11 @@
+--- libbalsa/information.c.orig	2011-08-16 13:30:24.000000000 +0200
+++ libbalsa/information.c	2011-08-16 13:30:48.000000000 +0200
+@@ -122,7 +122,7 @@ libbalsa_information_varg(GtkWindow *par
+         g_free(msg);
+ 
+         note =
+-            notify_notification_new("Balsa", escaped->str, icon_str, NULL);
+            notify_notification_new("Balsa", escaped->str, icon_str);
+         g_string_free(escaped, TRUE);
+ 
+         notify_notification_set_timeout(note, 7000);    /* 7 seconds */
--- a/mail/balsa/files/patch-src_main-window.c
+++ b/mail/balsa/files/patch-src_main-window.c
@ -0,0 +1,11 @@
+--- src/main-window.c.orig	2011-08-16 13:32:27.000000000 +0200
+++ src/main-window.c	2011-08-16 13:33:10.000000000 +0200
+@@ -3406,7 +3406,7 @@ bw_display_new_mail_notification(int num
+         } else {
+             num_total = num_new;
+             balsa_app.main_window->new_mail_note =
+-                notify_notification_new("Balsa", NULL, NULL, NULL);
+                notify_notification_new("Balsa", NULL, NULL);
+             g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
+                                                new_mail_note),
+                                       (gpointer) & balsa_app.main_window->
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	fancy
 PORTVERSION=	0.9.13
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@ -15,7 +16,7 @@ MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Webkit based HTML renderer plugin for claws-mail

 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		webkit:${PORTSDIR}/www/webkit-gtk2
+		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
 BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail

--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	notification
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.232 2010/11/15 20:40:29 kwm Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.237 2011/04/30 20:43:20 mezz Exp $
 #

 PORTNAME=	evolution
 PORTVERSION=	2.32.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -21,13 +21,14 @@ LIB_DEPENDS=	nss3.1:${PORTSDIR}/security/nss \
 		gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview
 RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell

+CONFLICTS=	evolution-3.[0-9]*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	build
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
 		desktopfileutils gnomedocutils ltasneededhack gnomedesktop
-GNOME_DESKTOP_VERSION=2
 USE_AUTOTOOLS=	libtool
 USE_GSTREAMER=	yes
 INSTALLS_OMF=	yes
--- a/mail/evolution/files/patch-calendar_gui_alarm-notify_alarm-queue.c
+++ b/mail/evolution/files/patch-calendar_gui_alarm-notify_alarm-queue.c
@ -0,0 +1,11 @@
+--- calendar/gui/alarm-notify/alarm-queue.c.orig	2011-03-07 20:53:40.000000000 +0100
+++ calendar/gui/alarm-notify/alarm-queue.c	2011-03-07 20:53:50.000000000 +0100
+@@ -1606,7 +1606,7 @@ popup_notification (time_t trigger, Comp
+ 			body = g_strdup_printf ("%s %s", start_str, time_str);
+ 	}
+ 
+-	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
+	n = notify_notification_new (summary, body, "stock_appointment-reminder");
+ 	if (!notify_notification_show(n, NULL))
+ 	    g_warning ("Could not send notification to daemon\n");
+ 
--- a/mail/evolution/files/patch-plugins_mail-notification_mail-notification.c
+++ b/mail/evolution/files/patch-plugins_mail-notification_mail-notification.c
@ -0,0 +1,13 @@
+--- plugins/mail-notification/mail-notification.c.orig	2011-03-07 21:24:25.000000000 +0100
+++ plugins/mail-notification/mail-notification.c	2011-03-07 21:24:40.000000000 +0100
+@@ -564,9 +564,7 @@ new_notify_status (EMEventTargetFolder *
+ 
+ 			notify  = notify_notification_new (
+ 				_("New email"), safetext,
+-				"mail-unread", NULL);
+-			notify_notification_attach_to_status_icon (
+-				notify, status_icon);
+				"mail-unread");
+ 
+ 			/* Check if actions are supported */
+ 			if (can_support_actions ()) {
--- a/mail/evolution/files/patch-plugins_publish-calendar_publish-calendar.c
+++ b/mail/evolution/files/patch-plugins_publish-calendar_publish-calendar.c
@ -0,0 +1,12 @@
+--- plugins/publish-calendar/publish-calendar.c.orig	2011-03-07 21:12:59.000000000 +0100
+++ plugins/publish-calendar/publish-calendar.c	2011-03-07 21:14:23.000000000 +0100
+@@ -150,8 +150,7 @@ update_publish_notification (GtkMessageT
+ 				return;
+ 			}
+ 
+-			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL);
+-			notify_notification_attach_to_status_icon (notify, status_icon);
+			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name);
+ 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+ 			g_timeout_add (500, show_notify_cb, NULL);
--- a/mail/gnome-gmail-notifier/Makefile
+++ b/mail/gnome-gmail-notifier/Makefile
@ -7,14 +7,14 @@

 PORTNAME=	gnome-gmail-notifier
 PORTVERSION=	0.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail deskutils
 MASTER_SITES=	GOOGLE_CODE

 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	A Gmail Inbox Monitor for the GNOME2 desktop

-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
+LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
 		soup-2.4:${PORTSDIR}/devel/libsoup \
 		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring

--- a/mail/gnome-gmail-notifier/files/patch-src_ggn-icon.c
+++ b/mail/gnome-gmail-notifier/files/patch-src_ggn-icon.c
@ -0,0 +1,16 @@
+--- src/ggn-icon.c.orig	2011-08-16 13:36:23.000000000 +0200
+++ src/ggn-icon.c	2011-08-16 13:37:27.000000000 +0200
+@@ -566,12 +566,7 @@ gpointer ggn_icon_show_notification_thre
+   /* create a new notification. */
+   icon->priv->note = notify_notification_new (icon->priv->title,
+                                               icon->priv->summary,
+-                                              icon->priv->icon_file,
+-                                              NULL);
+-
+-  /* attach the notification to our icon. */
+-  notify_notification_attach_to_status_icon (icon->priv->note,
+-                                             icon->priv->icon);
+                                              icon->priv->icon_file);
+ 
+   /* set the notification timeout. */
+   notify_notification_set_timeout (icon->priv->note, (4 * 1000));
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	thunderbird
 DISTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@ -80,7 +81,7 @@ MOZ_OPTIONS+=	--disable-gnomeui
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif

 .if ${ARCH} == amd64 || ${ARCH} == i386
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	thunderbird
 DISTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@ -80,7 +81,7 @@ MOZ_OPTIONS+=	--disable-gnomeui
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif

 .if ${ARCH} == amd64 || ${ARCH} == i386
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	thunderbird
 DISTVERSION=	3.1.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@ -80,7 +80,7 @@ MOZ_OPTIONS+=	--disable-gnomeui
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif

 post-extract:
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	audacious-plugins
 PORTVERSION=	2.5.4
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/

@ -80,7 +81,7 @@ CONFIGURE_ARGS+=--disable-sdlout
 .endif

 .if defined(WITH_NOTIFY) || exists(${LOCALBASE}/lib/libnotify.so.1)
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-notify
 PLIST_SUB+=     NOTIFY=""
 .else
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	gnome-mplayer
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GOOGLE_CODE

@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--without-gconf --disable-schemas-install
 .endif

 .if defined(WITH_NOTIFY)
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS+=	${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
 CONFIGURE_ARGS+=	--with-libnotify
 .else
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	ogmrip
 PORTVERSION=	0.13.6
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}

@ -57,7 +58,7 @@ PLIST_SUB+=		GUI_SUPPORT="@comment "
 CONFIGURE_ARGS+=	--enable-gtk-support --enable-dbus-support \
 			--enable-libnotify-support
 LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-			notify.1:${PORTSDIR}/devel/libnotify
+			notify.4:${PORTSDIR}/devel/libnotify
 USE_GNOME+=		gconf2 libglade2
 GCONF_SCHEMAS=		ogmrip.schemas
 PLIST_SUB+=		GUI_SUPPORT=""
--- a/multimedia/ogmrip/files/patch-src_ogmrip-progress-dialog.c
+++ b/multimedia/ogmrip/files/patch-src_ogmrip-progress-dialog.c
@ -0,0 +1,13 @@
+--- src/ogmrip-progress-dialog.c.orig	2011-08-12 13:44:15.000000000 +0200
+++ src/ogmrip-progress-dialog.c	2011-08-12 14:16:35.000000000 +0200
+@@ -418,8 +418,8 @@ ogmrip_progress_dialog_init (OGMRipProgr
+   g_signal_connect_swapped (dialog->priv->status_icon, "popup_menu",
+       G_CALLBACK (ogmrip_progress_dialog_status_icon_popup_menu), dialog);
+ 
+-  dialog->priv->notification = notify_notification_new_with_status_icon ("Dummy", "Dummy",
+-      OGMRIP_DATA_DIR G_DIR_SEPARATOR_S OGMRIP_ICON_FILE, dialog->priv->status_icon);
+  dialog->priv->notification = notify_notification_new ("Dummy", "Dummy",
+      OGMRIP_DATA_DIR G_DIR_SEPARATOR_S OGMRIP_ICON_FILE);
+   g_signal_connect (dialog, "window-state-event",
+       G_CALLBACK (ogmrip_progress_dialog_state_changed), NULL);
+ 
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	vlc
 DISTVERSION=	1.1.11
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@ -21,7 +22,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt \
-		proxy.0:${PORTSDIR}/net/libproxy
+		proxy.1:${PORTSDIR}/net/libproxy

 OPTIONS=	A52 "A52 DVD audio decoder" On \
 		AALIB "Aalib Console Graphics Support" Off \
@ -454,7 +455,7 @@ USE_GETTEXT=	yes

 .if defined(WITH_NOTIFY)
 CONFIGURE_ARGS+=--enable-notify
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 .else
 CONFIGURE_ARGS+=--disable-notify
 .endif
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	xfce4-parole
 PORTVERSION=	0.2.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/apps/parole/0.2
@ -20,7 +20,7 @@ COMMENT=	Lightweight media player for Xfce4 based on the gstreamer engine
 DATADIR=	${PREFIX}/share/${PORTNAME:S/xfce4-//}

 LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
-		notify.1:${PORTSDIR}/devel/libnotify \
+		notify.4:${PORTSDIR}/devel/libnotify \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib

 USE_AUTOTOOLS=	libtool
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	empathy
 PORTVERSION=	2.32.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME

@ -23,6 +23,8 @@ LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
 		telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \
 		telepathy-logger.1:${PORTSDIR}/net-im/telepathy-logger \
 		folks-telepathy.16:${PORTSDIR}/net-im/folks \
+		gcr.0:${PORTSDIR}/security/gnome-keyring \
+		notify.4:${PORTSDIR}/devel/libnotify \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
@ -81,7 +83,7 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-h
 .endif

 .if defined(WITH_WEBKIT)
-LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
 CONFIGURE_ARGS+=--enable-webkit
 PLIST_SUB+=	ADIUM=""
 .else
--- a/net-im/empathy/files/patch-configure
+++ b/net-im/empathy/files/patch-configure
@ -1,5 +1,5 @@
--- configure.orig	2010-11-18 17:41:43.000000000 +0100
-+++ configure	2010-11-18 17:41:43.000000000 +0100
+--- configure.orig	2011-08-16 16:19:02.000000000 +0200
+++ configure	2011-08-16 16:19:59.000000000 +0200
@@ -13390,8 +13390,8 @@
 .SECONDARY: $(gsettings_SCHEMAS)
 
@ -11,6 +11,62 @@
 
 install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
 	@$(NORMAL_INSTALL)
+@@ -14771,14 +14771,14 @@
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED
+-    libnotify < 0.7\""; } >&5
+    libnotify < 0.9\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED
+-    libnotify < 0.7") 2>&5
+    libnotify < 0.9") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED
+-    libnotify < 0.7" 2>/dev/null`
+    libnotify < 0.9" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -14790,14 +14790,14 @@
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED
+-    libnotify < 0.7\""; } >&5
+    libnotify < 0.9\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED
+-    libnotify < 0.7") 2>&5
+    libnotify < 0.9") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED
+-    libnotify < 0.7" 2>/dev/null`
+    libnotify < 0.9" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -14818,16 +14818,16 @@
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+ 	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED
+-    libnotify < 0.7" 2>&1`
+    libnotify < 0.9" 2>&1`
+         else
+ 	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED
+-    libnotify < 0.7" 2>&1`
+    libnotify < 0.9" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBNOTIFY_PKG_ERRORS" >&5
+ 
+ 	as_fn_error $? "Package requirements (libnotify >= $LIBNOTIFY_REQUIRED
+-    libnotify < 0.7) were not met:
+    libnotify < 0.9) were not met:
+ 
+ $LIBNOTIFY_PKG_ERRORS
+ 
@@ -15049,11 +15049,11 @@
 fi
 
--- a/net-im/empathy/files/patch-src_empathy-chat-window.c
+++ b/net-im/empathy/files/patch-src_empathy-chat-window.c
@ -0,0 +1,11 @@
+--- src/empathy-chat-window.c.orig	2011-08-16 16:23:38.000000000 +0200
+++ src/empathy-chat-window.c	2011-08-16 16:24:00.000000000 +0200
+@@ -1300,7 +1300,7 @@ chat_window_show_or_update_notification 
+ 		   to an existing notification with the same title.
+ 		   In this way the previous message will not be lost: the new
+ 		   message will appear below it, in the same notification */
+-		notification = notify_notification_new (header, escaped, NULL, NULL);
+		notification = notify_notification_new (header, escaped, NULL);
+ 
+ 		if (priv->notification == NULL) {
+ 			priv->notification = notification;
--- a/net-im/empathy/files/patch-src_empathy-status-icon.c
+++ b/net-im/empathy/files/patch-src_empathy-status-icon.c
@ -0,0 +1,13 @@
+--- src/empathy-status-icon.c.orig	2011-08-16 16:25:07.000000000 +0200
+++ src/empathy-status-icon.c	2011-08-16 16:25:32.000000000 +0200
+@@ -206,8 +206,8 @@ status_icon_update_notification (Empathy
+ 			   to an existing notification with the same title.
+ 			   In this way the previous message will not be lost: the new
+ 			   message will appear below it, in the same notification */
+-			notification = notify_notification_new_with_status_icon
+-				(priv->event->header, message_esc, NULL, priv->icon);
+			notification = notify_notification_new
+				(priv->event->header, message_esc, NULL);
+ 
+ 			if (priv->notification == NULL) {
+ 				priv->notification = notification;
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	gossip
 PORTVERSION=	0.31
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -44,7 +44,7 @@ OPTIONS=	NOTIFY "Enable libnotify support" on \
 .include <bsd.port.pre.mk>

 .if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
 .else
 CONFIGURE_ARGS+=	--enable-libnotify=no
 .endif
--- a/net-im/gossip/files/patch-src_gossip-notify.c
+++ b/net-im/gossip/files/patch-src_gossip-notify.c
@ -0,0 +1,93 @@
+--- src/gossip-notify.c.orig	2011-08-15 19:59:28.000000000 +0200
+++ src/gossip-notify.c	2011-08-15 20:03:01.000000000 +0200
+@@ -225,7 +225,7 @@ notify_contact_online (GossipContact *co
+ 					gossip_contact_get_name (contact),
+ 					notify_get_default_status_from_presence (presence));
+ 
+-	notify = notify_notification_new (_("Contact Online"), body, NULL, NULL);
+	notify = notify_notification_new (_("Contact Online"), body, NULL);
+ 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_LOW);
+ 	notify_notification_set_icon_from_pixbuf (notify, pixbuf);
+ 
+@@ -234,10 +234,6 @@ notify_contact_online (GossipContact *co
+ 			  G_CALLBACK (notify_closed_cb),
+ 			  NULL);
+ 
+-	if (attach_status_icon) {
+-		notify_notification_attach_to_status_icon (notify, attach_status_icon);
+-	}
+-
+ 	notify_notification_add_action (notify, "default", _("Default"),
+ 					(NotifyActionCallback) notify_online_action_cb,
+ 					g_object_ref (contact), NULL);
+@@ -330,14 +326,9 @@ notify_subscription_request_show (Gossip
+ 
+ 	notify = notify_notification_new (_("Subscription Request"),
+ 					  message,
+-					  NULL,
+ 					  NULL);
+ 	g_free (message);
+ 
+-	if (attach_status_icon) {
+-		notify_notification_attach_to_status_icon (notify, attach_status_icon);
+-	}
+-
+ 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 	notify_notification_set_timeout (notify, NOTIFY_SUBSCRIPTION_TIME);
+ 
+@@ -377,15 +368,10 @@ notify_file_transfer_request (GossipFT *
+ 						     gossip_ft_get_file_name (ft));
+ 	notification = notify_notification_new (_("File Transfer"),
+ 					  	notification_body,
+-					  	NULL,
+ 					  	NULL);
+ 
+ 	g_free (notification_body);
+ 	
+-	if (attach_status_icon) {
+-		notify_notification_attach_to_status_icon (notification, attach_status_icon);
+-	}
+-
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
+ 
+ 	error = NULL;
+@@ -546,7 +532,7 @@ notify_new_message (GossipEventManager *
+ 		str = g_markup_printf_escaped (_("“%s”"), body_stripped);
+ 	}
+ 
+-	notify = notify_notification_new (title, str, NULL, NULL);
+	notify = notify_notification_new (title, str, NULL);
+ 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 	notify_notification_set_icon_from_pixbuf (notify, pixbuf);
+ 	notify_notification_set_timeout (notify, NOTIFY_MESSAGE_TIME);
+@@ -556,10 +542,6 @@ notify_new_message (GossipEventManager *
+ 			  G_CALLBACK (notify_closed_cb),
+ 			  NULL);
+ 
+-	if (attach_status_icon) {
+-		notify_notification_attach_to_status_icon (notify, attach_status_icon);
+-	}
+-
+ 	notify_notification_add_action (notify, "default", _("Default"),
+ 					(NotifyActionCallback) notify_new_message_default_cb,
+ 					g_object_ref (event_manager), NULL);
+@@ -901,7 +883,7 @@ gossip_notify_hint_show (const gchar    
+ 		return FALSE;
+ 	}
+ 
+-	notify = notify_notification_new (summary, message, NULL, NULL);
+	notify = notify_notification_new (summary, message, NULL);
+ 	g_object_set_data_full (G_OBJECT (notify), "conf_path", g_strdup (conf_path), g_free);
+ 	g_object_set_data (G_OBJECT (notify), "func", func);
+ 	g_signal_connect (notify,
+@@ -909,10 +891,6 @@ gossip_notify_hint_show (const gchar    
+ 			  G_CALLBACK (notify_hint_closed_cb),
+ 			  user_data);
+ 
+-	if (attach_status_icon) {
+-		notify_notification_attach_to_status_icon (notify, attach_status_icon);
+-	}
+-
+ 	if (!notify_notification_show (notify, &error)) {
+ 		g_warning ("Failed to send notification: %s",
+ 			   error->message);
--- a/net-im/openfetion/Makefile
+++ b/net-im/openfetion/Makefile
@ -50,7 +50,7 @@ CONFIGURE_ARGS+=--disable-gst
 .endif

 .if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-libnotify
 .else
 CONFIGURE_ARGS+=--disable-libnotify
--- a/net-im/openfetion/files/patch-src_fx_main.c
+++ b/net-im/openfetion/files/patch-src_fx_main.c
@ -0,0 +1,13 @@
+--- src/fx_main.c.orig	2011-08-12 14:28:22.000000000 +0200
+++ src/fx_main.c	2011-08-12 14:28:39.000000000 +0200
+@@ -124,8 +124,8 @@ void fx_main_initialize(FxMain* fxmain)
+ 			SKIN_DIR"offline.svg");
+ 	gtk_status_icon_set_tooltip(fxmain->trayIcon, "OpenFetion");
+ #ifdef USE_LIBNOTIFY
+-	fxmain->notify = notify_notification_new_with_status_icon("welcome"
+-			, "" , NULL , fxmain->trayIcon);
+	fxmain->notify = notify_notification_new("welcome"
+			, "" , NULL);
+ 	notify_notification_set_timeout(fxmain->notify , 2500);
+ #endif
+ 
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	libnotify
 PORTVERSION=	0.14
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net-im
 MASTER_SITES=	SF/gaim-${PORTNAME}/pidgin-${PORTNAME}/pidgin-${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	pidgin-
@ -18,7 +18,7 @@ COMMENT=	This plugin adds a libnotify interface to Pidgin

 BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
    		${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify
-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
+LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
 		purple.9:${PORTSDIR}/net-im/libpurple

 GNU_CONFIGURE=	yes
--- a/net-im/pidgin-libnotify/files/patch-src_pidgin-libnotify.c
+++ b/net-im/pidgin-libnotify/files/patch-src_pidgin-libnotify.c
@ -0,0 +1,11 @@
+--- src/pidgin-libnotify.c.orig	2011-08-12 15:51:55.000000000 +0200
+++ src/pidgin-libnotify.c	2011-08-12 15:53:28.000000000 +0200
+@@ -286,7 +286,7 @@
+ 		g_free (tr_body);
+ 		return;
+ 	}
+-	notification = notify_notification_new (title, tr_body, NULL, NULL);
+	notification = notify_notification_new (title, tr_body, NULL);
+ 	purple_debug_info (PLUGIN_ID, "notify(), new: "
+ 					 "title: '%s', body: '%s', buddy: '%s'\n",
+ 					 title, tr_body, best_name (buddy));
--- a/net-im/pino/Makefile
+++ b/net-im/pino/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	pino
 PORTVERSION=	0.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	GOOGLE_CODE

@ -17,10 +17,10 @@ COMMENT=	A simple and fast Twitter and Identi.ca client
 BUILD_DEPENDS=	${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee \
 		gtkspell.0:${PORTSDIR}/textproc/gtkspell \
-		notify.1:${PORTSDIR}/devel/libnotify \
+		notify.4:${PORTSDIR}/devel/libnotify \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
-		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2

 BROKEN=		Doesn't build with vala-0.10

--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	eiskaltdcpp-gtk
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	eiskaltdcpp-${DISTVERSION}
--- a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk_src_notify.cc
+++ b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk_src_notify.cc
@ -0,0 +1,11 @@
+--- eiskaltdcpp-gtk/src/notify.cc.orig	2011-08-12 11:54:13.000000000 +0200
+++ eiskaltdcpp-gtk/src/notify.cc	2011-08-12 11:54:24.000000000 +0200
+@@ -69,7 +69,7 @@ void Notify::init()
+ {
+ #ifdef USE_LIBNOTIFY
+ 	notify_init(g_get_application_name());
+-	notification = notify_notification_new("template", "template", NULL, NULL);
+	notification = notify_notification_new("template", "template", NULL);
+ #endif // USE_LIBNOTIFY
+ 	action = FALSE;
+ }
--- a/net-p2p/transmission-gtk2/Makefile
+++ b/net-p2p/transmission-gtk2/Makefile
@ -5,14 +5,14 @@
 # $FreeBSD$
 #

-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-gtk2

 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	A fast and lightweight GTK+2 BitTorrent client

 LIB_DEPENDS=	${GEN_LIB_DEPENDS} \
-		notify.1:${PORTSDIR}/devel/libnotify \
+		notify.4:${PORTSDIR}/devel/libnotify \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	${GEN_RUN_DEPENDS} \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	ekiga3
 PORTVERSION=	3.2.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/
 DISTNAME=	ekiga-${PORTVERSION}
@ -88,7 +88,7 @@ CONFIGURE_ARGS+=	--disable-h323
 .endif

 .if defined(WITH_NOTIFY)
-LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=	--enable-notify
 .else
 CONFIGURE_ARGS+=	--disable-notify
--- a/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp
+++ b/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp
@ -1,5 +1,5 @@
--- lib/engine/components/libnotify/libnotify-main.cpp.orig	2010-08-28 15:04:11.000000000 -0400
-+++ lib/engine/components/libnotify/libnotify-main.cpp	2010-08-28 15:01:22.000000000 -0400
+--- lib/engine/components/libnotify/libnotify-main.cpp.orig	2009-09-22 16:27:35.000000000 +0200
+++ lib/engine/components/libnotify/libnotify-main.cpp	2011-03-08 22:11:18.000000000 +0100
@@ -38,6 +38,7 @@
 #include <map>
 #include <tr1/memory>
@ -8,3 +8,12 @@
 #include <libnotify/notify.h>
 
 #include "services.h"
+@@ -158,7 +159,7 @@ LibNotify::on_notification_added (gmref_
+ 
+   notif = notify_notification_new (notification->get_title ().c_str (),
+ 				   notification->get_body ().c_str (),
+-				   urgency, NULL);
+				   urgency);
+ 
+   g_signal_connect (notif, "closed",
+ 		    G_CALLBACK (on_notif_closed), notification.get ());
--- a/net/ekiga3/files/patch-src_gui_main.cpp
+++ b/net/ekiga3/files/patch-src_gui_main.cpp
@ -0,0 +1,16 @@
+--- src/gui/main.cpp.orig	2011-03-08 22:31:52.000000000 +0100
+++ src/gui/main.cpp	2011-03-08 22:47:35.000000000 +0100
+@@ -2807,12 +2807,11 @@ ekiga_main_window_incoming_call_notify (
+ 
+   body = g_strdup_printf ("%s\n%s\n%s", uri, app, account);
+   
+-  notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL);
+  notify = notify_notification_new (title, body, GM_ICON_LOGO);
+   notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL);
+   notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL);
+   notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER);
+   notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL);
+-  notify_notification_attach_to_status_icon (notify, statusicon);
+   if (!notify_notification_show (notify, NULL)) {
+     ekiga_main_window_incoming_call_dialog_show (mw, call);
+   }
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@ -14,7 +14,7 @@ MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Simple RSS/RDF feed reader

 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2

 USE_GNOME=	gnomeprefix gnomehack libglade2 gconf2
 USE_GMAKE=	yes
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@ -7,7 +7,7 @@

 PORTNAME=		twitux
 PORTVERSION=	0.69
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=		net
 MASTER_SITES=	SF

@ -16,7 +16,7 @@ COMMENT=		GNOME client for Twitter

 LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
 	sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
-	notify.1:${PORTSDIR}/devel/libnotify \
+	notify.4:${PORTSDIR}/devel/libnotify \
 	canberra:${PORTSDIR}/audio/libcanberra

 USE_XORG=		x11
--- a/net/twitux/files/patch-src_twitux-app.c
+++ b/net/twitux/files/patch-src_twitux-app.c
@ -0,0 +1,12 @@
+--- src/twitux-app.c.orig	2011-08-16 15:27:29.000000000 +0200
+++ src/twitux-app.c	2011-08-16 15:27:54.000000000 +0200
+@@ -1446,8 +1446,7 @@ twitux_app_notify (gchar *msg)
+ 
+ 		notification = notify_notification_new (PACKAGE_NAME,
+ 												msg,
+-												"twitux",
+-												NULL);
+												"twitux");
+ 
+ 		notify_notification_set_timeout (notification, 8 * 1000);
+ 		notify_notification_show (notification, &error);
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	vino
 PORTVERSION=	2.32.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -34,7 +34,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 GCONF_SCHEMAS=	vino-server.schemas

 .if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-libnotify=yes
 .else
 CONFIGURE_ARGS+=--enable-libnotify=no
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@ -6,7 +6,7 @@

 PORTNAME=	synce-trayicon
 PORTVERSION=	0.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	palm
 MASTER_SITES=	SF/synce/SynCE-GNOME/${PORTVERSION}

@ -17,7 +17,7 @@ LIB_DEPENDS=	rra.0:${PORTSDIR}/palm/synce-librra \
 		gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		unshield.0:${PORTSDIR}/archivers/unshield \
 		orange.0:${PORTSDIR}/archivers/liborange \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	${LOCALBASE}/libexec/gvfsd-synce:${PORTSDIR}/palm/synce-gvfs \
 		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon

--- a/palm/synce-trayicon/files/patch-src_synce-trayicon.c
+++ b/palm/synce-trayicon/files/patch-src_synce-trayicon.c
@ -0,0 +1,11 @@
+--- src/synce-trayicon.c.orig	2011-08-16 14:13:49.000000000 +0200
+++ src/synce-trayicon.c	2011-08-16 14:14:40.000000000 +0200
+@@ -204,7 +204,7 @@
+   }
+ 
+   if (gtk_status_icon_is_embedded(GTK_STATUS_ICON(self))) {
+-          priv->notification = notify_notification_new_with_status_icon (summary, body, NULL, GTK_STATUS_ICON(self));
+          priv->notification = notify_notification_new (summary, body, NULL);
+           notify_notification_show (priv->notification, NULL);
+   } else {
+           g_debug("%s: not embedded", G_STRFUNC);
--- a/ports-mgmt/gnome-packagekit/Makefile
+++ b/ports-mgmt/gnome-packagekit/Makefile
@ -3,11 +3,11 @@
 # Whom:					Anders F Bjorklund <afb@users.sourceforge.net>
 #
 # $FreeBSD$
-#  $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.19 2010/10/04 20:40:36 kwm Exp $
+#  $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.25 2011/06/14 20:18:46 mezz Exp $

 PORTNAME=	gnome-packagekit
 PORTVERSION=	2.32.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt sysutils gnome
 MASTER_SITES=	GNOME

@ -17,7 +17,7 @@ COMMENT=	PackageKit client programs for the GNOME desktop
 BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit \
-		notify:${PORTSDIR}/devel/libnotify \
+		notify.4:${PORTSDIR}/devel/libnotify \
 		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
 		upower-glib.1:${PORTSDIR}/sysutils/upower \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c
@ -0,0 +1,66 @@
+--- src/gpk-check-update.c.orig	2010-09-22 17:20:47.000000000 +0200
+++ src/gpk-check-update.c	2011-03-07 18:27:18.000000000 +0100
+@@ -388,9 +388,8 @@ gpk_check_update_finished_notify (GpkChe
+ 	}
+ 
+ 	/* TRANSLATORS: title: system update completed all okay */
+-	notification = notify_notification_new_with_status_icon (_("The system update has completed"),
+-								 message_text->str, "help-browser",
+-								 cupdate->priv->status_icon);
+	notification = notify_notification_new (_("The system update has completed"),
+						   message_text->str, "help-browser");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	if (restart == PK_RESTART_ENUM_SYSTEM) {
+@@ -456,7 +455,7 @@ gpk_check_update_show_error (GpkCheckUpd
+ 
+ 	/* do the bubble */
+ 	egg_debug ("title=%s, message=%s", title, message);
+-	notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon);
+	notification = notify_notification_new (title, message, "help-browser");
+ 	if (notification == NULL) {
+ 		egg_warning ("failed to get bubble");
+ 		goto out;
+@@ -656,7 +655,7 @@ gpk_check_update_critical_updates_warnin
+ 
+ 	/* do the bubble */
+ 	egg_debug ("title=%s, message=%s", title, message);
+-	notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon);
+	notification = notify_notification_new (title, message, "help-browser");
+ 	if (notification == NULL) {
+ 		egg_warning ("failed to get bubble");
+ 		return;
+@@ -782,9 +781,8 @@ gpk_check_update_check_on_battery (GpkCh
+ 	/* TRANSLATORS: policy says update, but we are on battery and so prompt */
+ 	message = _("Automatic updates are not being installed as the computer is running on battery power");
+ 	/* TRANSLATORS: informs user will not install by default */
+-	notification = notify_notification_new_with_status_icon (_("Updates not installed"),
+-								 message, "help-browser",
+-								 cupdate->priv->status_icon);
+	notification = notify_notification_new (_("Updates not installed"),
+						   message, "help-browser");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ //	notify_notification_add_action (notification, "do-not-show-update-not-battery",
+@@ -839,10 +837,10 @@ gpk_check_update_notify_doing_updates (G
+ 		goto out;
+ 
+ 	/* TRANSLATORS: title: notification when we scheduled an automatic update */
+-	notification = notify_notification_new_with_status_icon (_("Updates are being installed"),
+	notification = notify_notification_new (_("Updates are being installed"),
+ 						/* TRANSLATORS: tell the user why the hard disk is grinding... */
+ 						_("Updates are being automatically installed on your computer"),
+-						"software-update-urgent", cupdate->priv->status_icon);
+						"software-update-urgent");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	/* TRANSLATORS: button: cancel the update system */
+@@ -1328,7 +1326,7 @@ gpk_check_update_get_distro_upgrades_fin
+ 
+ 	/* TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9 */
+ 	title = _("Distribution upgrades available");
+-	notification = notify_notification_new_with_status_icon (title, string->str, "help-browser", cupdate->priv->status_icon);
+	notification = notify_notification_new (title, string->str, "help-browser");
+ 	if (notification == NULL) {
+ 		egg_warning ("failed to make bubble");
+ 		goto out;
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c
@ -0,0 +1,11 @@
+--- src/gpk-dbus-task.c.orig	2011-03-07 18:28:01.000000000 +0100
+++ src/gpk-dbus-task.c	2011-03-07 18:28:10.000000000 +0100
+@@ -377,7 +377,7 @@ gpk_dbus_task_handle_error (GpkDbusTask 
+ 	dtask->priv->cached_error_code = g_object_ref (error_code);
+ 
+ 	/* do the bubble */
+-	notification = notify_notification_new (title, message, "help-browser", NULL);
+	notification = notify_notification_new (title, message, "help-browser");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, "show-error-details",
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c
@ -0,0 +1,38 @@
+--- src/gpk-firmware.c.orig	2011-03-07 18:20:16.000000000 +0100
+++ src/gpk-firmware.c	2011-03-07 18:20:38.000000000 +0100
+@@ -268,7 +268,7 @@ gpk_firmware_require_restart (GpkFirmwar
+ 	message = _("You will need to restart this computer before the hardware will work correctly.");
+ 
+ 	/* TRANSLATORS: title of libnotify bubble */
+-	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL);
+	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 
+@@ -303,7 +303,7 @@ gpk_firmware_require_replug (GpkFirmware
+ 	message = _("You will need to remove and then reinsert the hardware before it will work correctly.");
+ 
+ 	/* TRANSLATORS: title of libnotify bubble */
+-	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL);
+	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 
+@@ -330,7 +330,7 @@ gpk_firmware_require_nothing (GpkFirmwar
+ 	message = _("Your hardware has been set up and is now ready to use.");
+ 
+ 	/* TRANSLATORS: title of libnotify bubble */
+-	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL);
+	notification = notify_notification_new (_("Additional software was installed"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 
+@@ -624,7 +624,7 @@ gpk_firmware_timeout_cb (gpointer data)
+ 	}
+ 
+ 	/* TRANSLATORS: title of libnotify bubble */
+-	notification = notify_notification_new (_("Additional firmware required"), string->str, "help-browser", NULL);
+	notification = notify_notification_new (_("Additional firmware required"), string->str, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, "install-firmware",
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c
@ -0,0 +1,11 @@
+--- src/gpk-hardware.c.orig	2011-03-07 18:21:23.000000000 +0100
+++ src/gpk-hardware.c	2011-03-07 18:21:32.000000000 +0100
+@@ -183,7 +183,7 @@ gpk_hardware_what_provides_cb (GObject *
+ 	message = g_strdup_printf ("%s\n\t%s", _("Additional packages can be installed to support this hardware"), package);
+ 	/* TRANSLATORS: a new bit of hardware has been plugged in */
+ 	body = g_strdup_printf ("%s", _("New hardware attached"));
+-	notification = notify_notification_new (body, message, "help-browser", NULL);
+	notification = notify_notification_new (body, message, "help-browser");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, GPK_HARDWARE_INSTALL_ACTION,
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c
+++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c
@ -0,0 +1,29 @@
+--- src/gpk-watch.c.orig	2010-09-22 17:20:31.000000000 +0200
+++ src/gpk-watch.c	2011-03-07 09:32:41.000000000 +0100
+@@ -1153,7 +1153,7 @@ gpk_watch_process_messages_cb (PkMessage
+ 	}
+ 
+ 	/* do the bubble */
+-	notification = notify_notification_new_with_status_icon (gpk_message_enum_to_localised_text (type), details, "emblem-important", watch->priv->status_icon);
+	notification = notify_notification_new (gpk_message_enum_to_localised_text (type), details, "emblem-important");
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	ret = notify_notification_show (notification, &error);
+@@ -1213,7 +1213,7 @@ gpk_watch_process_error_code (GpkWatch *
+ 	title_prefix = g_strdup_printf ("%s: %s", _("Package Manager"), title);
+ 
+ 	/* do the bubble */
+-	notification = notify_notification_new (title_prefix, message, "help-browser", NULL);
+	notification = notify_notification_new (title_prefix, message, "help-browser");
+ 	notify_notification_set_timeout (notification, 15000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, "show-error-details",
+@@ -1392,7 +1392,7 @@ gpk_watch_adopt_cb (PkClient *client, GA
+ 		goto out;
+ 
+ 	/* TRANSLATORS: title: an action has finished, and we are showing the libnotify bubble */
+-	notification = notify_notification_new (_("Task completed"), message, "help-browser", NULL);
+	notification = notify_notification_new (_("Task completed"), message, "help-browser");
+ 	notify_notification_set_timeout (notification, 5000);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 	notify_notification_add_action (notification, "do-not-show-notify-complete",
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@ -3,12 +3,12 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse-plugins/Makefile,v 1.25 2010/04/27 22:22:07 kwm Exp $
+#   $MCom: ports/security/seahorse-plugins/Makefile,v 1.28 2011/07/03 11:57:45 kwm Exp $
 #

 PORTNAME=	seahorse-plugins
 PORTVERSION=	2.30.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -83,7 +83,7 @@ PLIST_SUB+=	APPLET="@comment "
 .endif

 .if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 .else
 CONFIGURE_ARGS+=--disable-libnotify
 .endif
--- a/security/seahorse-plugins/files/patch-libseahorse_seahorse-notification.c
+++ b/security/seahorse-plugins/files/patch-libseahorse_seahorse-notification.c
@ -0,0 +1,11 @@
+--- libseahorse/seahorse-notification.c.orig	2011-03-07 09:25:10.000000000 +0100
+++ libseahorse/seahorse-notification.c	2011-03-07 09:25:57.000000000 +0100
+@@ -213,7 +213,7 @@
+     heading = format_key_text (snotif->heading);
+     message = format_key_text (snotif->message);
+     
+-    notif = notify_notification_new (heading, message, snotif->icon, attachto);
+    notif = notify_notification_new (heading, message, snotif->icon);
+     
+     g_free (heading);
+     g_free (message);
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@ -3,12 +3,12 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse/Makefile,v 1.99 2010/09/28 09:01:33 kwm Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.104 2011/07/03 11:57:45 kwm Exp $
 #

 PORTNAME=	seahorse
 PORTVERSION=	2.32.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -20,10 +20,12 @@ BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
    		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		gnome-keyring:${PORTSDIR}/security/gnome-keyring \
+		gcr.0:${PORTSDIR}/security/gnome-keyring \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup

+CONFLICTS=	seahorse-3.[0-9]*
+
 USE_XORG=	sm
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
@ -53,7 +55,7 @@ CONFIGURE_ARGS+=--disable-ldap
 .endif

 .if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 .else
 CONFIGURE_ARGS+=--disable-libnotify
 .endif
--- a/security/seahorse/files/patch-libseahorse_seahorse-notification.c
+++ b/security/seahorse/files/patch-libseahorse_seahorse-notification.c
@ -0,0 +1,11 @@
+--- libseahorse/seahorse-notification.c.orig	2011-03-06 21:03:39.000000000 +0100
+++ libseahorse/seahorse-notification.c	2011-03-06 21:03:58.000000000 +0100
+@@ -231,7 +231,7 @@ setup_libnotify_notification (SeahorseNo
+     heading = format_key_text (snotif->heading);
+     message = format_key_text (snotif->message);
+     
+-    notif = notify_notification_new (heading, message, snotif->icon, attachto);
+    notif = notify_notification_new (heading, message, snotif->icon);
+     
+     g_free (heading);
+     g_free (message);
--- a/security/tuntun/Makefile
+++ b/security/tuntun/Makefile
@ -7,13 +7,15 @@

 PORTNAME=	tuntun
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security gnome
 MASTER_SITES=	http://tuntun.googlecode.com/files/

 MAINTAINER=	anderson@cnpm.embrapa.br
 COMMENT=	A Gnome applet gui for OpenVPN

+LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
 		LIBS="`pkg-config --libs libgnomeui-2.0`"
--- a/security/tuntun/files/patch-src_tuntun-applet.c
+++ b/security/tuntun/files/patch-src_tuntun-applet.c
@ -0,0 +1,19 @@
+--- src/tuntun-applet.c.orig	2011-08-16 15:08:48.000000000 +0200
+++ src/tuntun-applet.c	2011-08-16 15:32:49.000000000 +0200
+@@ -705,14 +705,14 @@ static void tuntun_panel_applet_on_conne
+ 			NotifyNotification* _tmp2_;
+ 			char* _tmp1_;
+ 			char* _tmp0_;
+-			notification = (_tmp2_ = notify_notification_new (tuntun_connection_info_get_name (tuntun_connection_get_info (connection)), _tmp0_ = g_strdup_printf (_ ("connection established\nassigned ip: %s"), tuntun_connection_info_get_assigned_ip (tuntun_connection_get_info (connection))), _tmp1_ = tuntun_utils_get_image_path (TUNTUN_CONSTANTS_IMAGES_CONNECTION_STATUS_CONNECTED), (GtkWidget*) self), _g_object_unref0 (notification), _tmp2_);
+			notification = (_tmp2_ = notify_notification_new (tuntun_connection_info_get_name (tuntun_connection_get_info (connection)), _tmp0_ = g_strdup_printf (_ ("connection established\nassigned ip: %s"), tuntun_connection_info_get_assigned_ip (tuntun_connection_get_info (connection))), _tmp1_ = tuntun_utils_get_image_path (TUNTUN_CONSTANTS_IMAGES_CONNECTION_STATUS_CONNECTED)), _g_object_unref0 (notification), _tmp2_);
+ 			_g_free0 (_tmp1_);
+ 			_g_free0 (_tmp0_);
+ 		} else {
+ 			if (tuntun_connection_get_status (connection) == TUNTUN_CONNECTION_STATES_DISCONNECTED) {
+ 				NotifyNotification* _tmp4_;
+ 				char* _tmp3_;
+-				notification = (_tmp4_ = notify_notification_new (tuntun_connection_info_get_name (tuntun_connection_get_info (connection)), _ ("connection closed"), _tmp3_ = tuntun_utils_get_image_path (TUNTUN_CONSTANTS_IMAGES_CONNECTION_STATUS_DISCONNECTED), (GtkWidget*) self), _g_object_unref0 (notification), _tmp4_);
+				notification = (_tmp4_ = notify_notification_new (tuntun_connection_info_get_name (tuntun_connection_get_info (connection)), _ ("connection closed"), _tmp3_ = tuntun_utils_get_image_path (TUNTUN_CONSTANTS_IMAGES_CONNECTION_STATUS_DISCONNECTED)), _g_object_unref0 (notification), _tmp4_);
+ 				_g_free0 (_tmp3_);
+ 			}
+ 		}
--- a/Show More
+++ b/Show More