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

8 files changed, 60 insertions, 7 deletions

diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index c76505fcc9c1..aa1772c43222 100644
--- 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
diff --git a/devel/libnotifymm/Makefile b/devel/libnotifymm/Makefile
index 3ea684c855b0..d3c2a9a76a7d 100644
--- 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
diff --git a/devel/notify-sharp/Makefile b/devel/notify-sharp/Makefile
index f05d779d0e5e..46216a446f8a 100644
--- 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
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index 4198a41ef1a1..4847a9738b9c 100644
--- 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
diff --git a/devel/py-notify/files/patch-src_pynotify.defs b/devel/py-notify/files/patch-src_pynotify.defs
new file mode 100644
index 000000000000..e0645c40f736
--- /dev/null
+++ 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")
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index 6220b2403fee..94ebad53e7c5 100644
--- 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 \
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 57b51d9a241a..6f0675162ad5 100644
--- 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
diff --git a/devel/upp/files/patch-uppsrc_CtrlLib_TrayIconX11.cpp b/devel/upp/files/patch-uppsrc_CtrlLib_TrayIconX11.cpp
new file mode 100644
index 000000000000..f1909b176c30
--- /dev/null
+++ 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