revbump from libnotify bumped to 0.7 and dependency changed from libnotify07.

43 files changed, 118 insertions, 111 deletions

diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index f16c31d21ff..dc2c913ba4a 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2013/08/15 07:20:27 obache Exp $
+# $NetBSD: Makefile,v 1.37 2013/08/16 09:20:40 obache Exp $
 #
 
 DISTNAME=	ario-1.5.1
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ario-player/1.5.1/}
 
@@ -31,7 +31,7 @@ BUILDLINK_TRANSFORM+=	rm:-W${fl}
 .include "../../www/curl/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 #.include "../../net/avahi/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index fa2cf74e3db..03d98e4abde 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.110 2013/08/15 08:04:29 obache Exp $
+# $NetBSD: Makefile,v 1.111 2013/08/16 09:20:40 obache Exp $
 #
 
 DISTNAME=	rhythmbox-0.12.8
-PKGREVISION=	29
+PKGREVISION=	30
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -40,7 +40,7 @@ GCONF_SCHEMAS=		rhythmbox.schemas
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/brasero/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/libplist/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile
index 623996b5736..2e5ef18d2d0 100644
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2013/08/12 10:00:03 obache Exp $
+# $NetBSD: Makefile,v 1.56 2013/08/16 09:20:40 obache Exp $
 
 DISTNAME=	empathy-2.34.0
-PKGREVISION=	30
+PKGREVISION=	31
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/empathy/2.34/}
 
@@ -43,7 +43,7 @@ BUILDLINK_API_DEPENDS.enchant+=		enchant>=1.2.0
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
diff --git a/chat/pidgin-libnotify/Makefile b/chat/pidgin-libnotify/Makefile
index f44f4899896..e4f35382ee4 100644
--- a/chat/pidgin-libnotify/Makefile
+++ b/chat/pidgin-libnotify/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2013/08/15 08:36:55 obache Exp $
+# $NetBSD: Makefile,v 1.34 2013/08/16 09:20:40 obache Exp $
 #
 
 DISTNAME=	pidgin-libnotify-0.14
-PKGREVISION=	30
+PKGREVISION=	31
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim-libnotify/}
 
@@ -17,6 +17,6 @@ USE_TOOLS+=	pkg-config gmake perl msgfmt intltool
 
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../chat/pidgin/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/xulrunner10/Makefile b/devel/xulrunner10/Makefile
index 2495a2eb611..3366bfd8aab 100644
--- a/devel/xulrunner10/Makefile
+++ b/devel/xulrunner10/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2013/06/06 12:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2013/08/16 09:20:40 obache Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner10-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/xulrunner17/Makefile b/devel/xulrunner17/Makefile
index ab28a81f5eb..0c64be03727 100644
--- a/devel/xulrunner17/Makefile
+++ b/devel/xulrunner17/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2013/08/08 13:01:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2013/08/16 09:20:40 obache Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner17-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//}
+PKGREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/xulrunner192/Makefile b/devel/xulrunner192/Makefile
index 89766f0a54c..a195a994a99 100644
--- a/devel/xulrunner192/Makefile
+++ b/devel/xulrunner192/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2013/06/06 12:53:44 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2013/08/16 09:20:40 obache Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	devel www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 3fd784377dd..d8723950e3d 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2013/08/16 02:04:25 obache Exp $
+# $NetBSD: Makefile,v 1.104 2013/08/16 09:20:40 obache Exp $
 
 DISTNAME=	balsa-2.4.14
+PKGREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
 EXTRACT_SUFX=	.tar.bz2
@@ -41,7 +42,7 @@ CONF_FILES=	${EGDIR}/balsa.soundlist ${PKG_SYSCONFDIR}/sound/events/balsa.soundl
 .include "../../mail/libesmtp/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
diff --git a/mail/balsa/options.mk b/mail/balsa/options.mk
index d970c8118b8..6b692b21fdd 100644
--- a/mail/balsa/options.mk
+++ b/mail/balsa/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2008/10/29 00:18:51 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2013/08/16 09:20:40 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.balsa
-PKG_SUPPORTED_OPTIONS=	compface ldap sqlite ssl
+PKG_SUPPORTED_OPTIONS=	canberra compface ldap sqlite ssl
 PKG_SUGGESTED_OPTIONS=	compface ldap sqlite ssl
 
 .include "../../mk/bsd.options.mk"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 8136061ed9f..ffe741f556e 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.199 2013/08/14 04:35:32 obache Exp $
+# $NetBSD: Makefile,v 1.200 2013/08/16 09:20:40 obache Exp $
 
 DISTNAME=		evolution-2.32.3
-PKGREVISION=		23
+PKGREVISION=		24
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.32/}
 EXTRACT_SUFX=		.tar.bz2
@@ -80,7 +80,7 @@ BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=2.24.3
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index ad2135ac8c6..3bb7d87f7df 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2013/08/16 06:23:42 obache Exp $
+# $NetBSD: Makefile,v 1.81 2013/08/16 09:20:40 obache Exp $
 #
 
 DISTNAME=	mail-notification-5.4
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/mailnotify/
 EXTRACT_SUFX=	.tar.bz2
@@ -66,7 +66,7 @@ do-install:
 .include "../../mail/gmime24/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 4f11936b3b7..a327dbcbf7f 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2013/08/14 05:40:29 obache Exp $
+# $NetBSD: Makefile,v 1.30 2013/08/16 09:20:40 obache Exp $
 #
 
 DISTNAME=	gnome-mplayer-1.0.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gnome-mplayer.googlecode.com/files/
 
diff --git a/multimedia/gnome-mplayer/options.mk b/multimedia/gnome-mplayer/options.mk
index 9b3d03ad2d8..6fbe190c291 100644
--- a/multimedia/gnome-mplayer/options.mk
+++ b/multimedia/gnome-mplayer/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2013/08/14 05:40:29 obache Exp $
+# $NetBSD: options.mk,v 1.5 2013/08/16 09:20:40 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-mplayer
 PKG_SUPPORTED_OPTIONS=	gnome musicbrainz libgpod
@@ -13,7 +13,7 @@ PLIST_VARS+=	nautilus
 #
 .if !empty(PKG_OPTIONS:Mgnome)
 DEPENDS+=		gnome-power-manager-[0-9]*:../../sysutils/gnome-power-manager
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-nautilus
 CONFIGURE_ARGS+=	--with-libnotify
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 66b547e7f19..6fd33353c1f 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.157 2013/06/06 12:54:53 wiz Exp $
+# $NetBSD: Makefile,v 1.158 2013/08/16 09:20:40 obache Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
-PKGREVISION=		29
+PKGREVISION=		30
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile
index f9858d42838..8631a7a196b 100644
--- a/multimedia/vlc2/Makefile
+++ b/multimedia/vlc2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2013/07/22 15:01:33 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2013/08/16 09:20:40 obache Exp $
 
 DISTNAME=		vlc-${VLC_VERSION}
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/} \
 			http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
diff --git a/net/dhcpcd-gtk/Makefile b/net/dhcpcd-gtk/Makefile
index 6e04535cab4..1c553afac6f 100644
--- a/net/dhcpcd-gtk/Makefile
+++ b/net/dhcpcd-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2013/08/16 06:32:34 obache Exp $
+# $NetBSD: Makefile,v 1.33 2013/08/16 09:20:40 obache Exp $
 #
 
 DISTNAME=		dhcpcd-ui-0.6.0
 PKGNAME=		dhcpcd-gtk-0.6.0
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		net
 MASTER_SITES=		http://roy.marples.name/downloads/dhcpcd/
 MASTER_SITES+=		ftp://roy.marples.name/pub/dhcpcd/
@@ -26,5 +26,5 @@ CONFIGURE_ARGS+=	--mandir=${PREFIX:Q}/${PKGMANDIR:Q}
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index af64cac8ddc..88fb052954c 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2013/08/16 05:53:02 obache Exp $
+# $NetBSD: Makefile,v 1.53 2013/08/16 09:20:40 obache Exp $
 #
 
 DISTNAME=		ekiga-3.2.6
-PKGREVISION=		34
+PKGREVISION=		35
 CATEGORIES=		net comms
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ekiga/3.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/ekiga/options.mk b/net/ekiga/options.mk
index 1f46487b08b..7c8c3700a8a 100644
--- a/net/ekiga/options.mk
+++ b/net/ekiga/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2013/08/16 05:53:02 obache Exp $
+# $NetBSD: options.mk,v 1.4 2013/08/16 09:20:40 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ekiga
 PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--disable-gnome
 
 .if !empty(PKG_OPTIONS:Mnotify)
 CONFIGURE_ARGS+=	--enable-notify
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-notify
 .endif
diff --git a/net/transmission-gtk/Makefile b/net/transmission-gtk/Makefile
index c1b8af971f8..3036400fadd 100644
--- a/net/transmission-gtk/Makefile
+++ b/net/transmission-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2013/06/06 12:54:57 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2013/08/16 09:20:40 obache Exp $
 
 PKGNAME=	${DISTNAME:C:-:-gtk-:}
-PKGREVISION=	4
+PKGREVISION=	5
 
 USE_LANGUAGES+=		c c++
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}${PREFIX}
@@ -22,6 +22,6 @@ do-install:
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index 93b7f2c0e32..e67c4b3884f 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2013/08/16 02:56:03 obache Exp $
+# $NetBSD: Makefile,v 1.33 2013/08/16 09:20:40 obache Exp $
 #
 
 DISTNAME=		twitux-0.69
-PKGREVISION=		25
+PKGREVISION=		26
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=twitux/}
 EXTRACT_SUFX=		.tar.bz2
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--enable-aspell=no
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 16d8c8d52cf..ef4a142a174 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2013/08/12 09:36:41 obache Exp $
+# $NetBSD: Makefile,v 1.69 2013/08/16 09:20:41 obache Exp $
 
 DISTNAME=	vino-2.32.2
+PKGREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vino/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -30,7 +31,7 @@ GCONF_SCHEMAS=		vino-server.schemas
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
diff --git a/pkgtools/gnome-packagekit/Makefile b/pkgtools/gnome-packagekit/Makefile
index 8fc0008ed6a..92d92991ebb 100644
--- a/pkgtools/gnome-packagekit/Makefile
+++ b/pkgtools/gnome-packagekit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2013/08/14 05:31:04 obache Exp $
+# $NetBSD: Makefile,v 1.37 2013/08/16 09:20:41 obache Exp $
 #
 
 DISTNAME=	gnome-packagekit-0.4.0
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	pkgtools gnome
 MASTER_SITES=	http://www.packagekit.org/releases/
 
@@ -37,7 +37,7 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.30.0
 .include "../../security/policykit-gnome/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index 4ef658aacce..219318ca3d6 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2013/08/14 08:30:06 obache Exp $
+# $NetBSD: Makefile,v 1.46 2013/08/16 09:20:41 obache Exp $
 
 DISTNAME=	seahorse-plugins-2.30.1
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse-plugins/2.30/}
 EXTRACT_SUFX=	.tar.bz2
@@ -31,7 +31,7 @@ GCONF_SCHEMAS+=		seahorse-plugins.schemas
 .include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 # doesn't suffice, configure says:
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 2c813f76b7c..da2a0a9fbb0 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.116 2013/08/12 12:52:16 obache Exp $
+# $NetBSD: Makefile,v 1.117 2013/08/16 09:20:41 obache Exp $
 
 DISTNAME=	seahorse-2.32.0
-PKGREVISION=	22
+PKGREVISION=	23
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -51,7 +51,7 @@ GCONF_SCHEMAS= 	seahorse.schemas
 BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 4aebeae3980..31ea4013301 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2013/08/12 14:24:35 obache Exp $
+# $NetBSD: Makefile,v 1.31 2013/08/16 09:20:41 obache Exp $
 #
 
 DISTNAME=		gnome-mount-0.8
-PKGREVISION=		25
+PKGREVISION=		26
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 
@@ -28,7 +28,7 @@ post-extract:
 .include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/hal/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index d72d28e6ae0..83208c31b79 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2013/08/14 08:01:48 obache Exp $
+# $NetBSD: Makefile,v 1.46 2013/08/16 09:20:41 obache Exp $
 #
 
 DISTNAME=	gnome-power-manager-2.24.4
-PKGREVISION=	35
+PKGREVISION=	36
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-power-manager/2.24/}
 EXTRACT_SUFX=	.tar.bz2
@@ -47,7 +47,7 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 .include "../../security/policykit-gnome/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/hal/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index b9d4c363d1e..8dfce85b9f1 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2013/08/12 09:10:09 obache Exp $
+# $NetBSD: Makefile,v 1.45 2013/08/16 09:20:41 obache Exp $
 #
 
 DISTNAME=	gnome-settings-daemon-2.32.1
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -43,7 +43,7 @@ BUILDLINK_API_DEPENDS.pulseaudio+=	pulseaudio>=0.9.15
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.21.2
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index 42b66612a15..e5518f7faf6 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2013/08/15 05:45:54 obache Exp $
+# $NetBSD: Makefile,v 1.36 2013/08/16 09:20:41 obache Exp $
 #
 
 DISTNAME=	gnome-volume-manager-2.24.1
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-volume-manager/2.24/}
 EXTRACT_SUFX=	.tar.bz2
@@ -33,7 +33,7 @@ GCONF_SCHEMAS+=		gnome-volume-manager.schemas
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../sysutils/hal/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/notification-daemon/Makefile b/sysutils/notification-daemon/Makefile
index 68f5f1dd284..dab192875a9 100644
--- a/sysutils/notification-daemon/Makefile
+++ b/sysutils/notification-daemon/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2013/08/12 08:35:17 obache Exp $
+# $NetBSD: Makefile,v 1.36 2013/08/16 09:20:41 obache Exp $
 #
 
 DISTNAME=	notification-daemon-0.7.6
+PKGREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/notification-daemon/0.7/}
 EXTRACT_SUFX=	.tar.xz
@@ -31,6 +32,6 @@ PKG_FAIL_REASON+=	"gtk3 option must be enabled for libcanberra."
 .endif
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.27.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-notify-python/Makefile b/sysutils/py-notify-python/Makefile
index c1181551d40..95ec33f4fc0 100644
--- a/sysutils/py-notify-python/Makefile
+++ b/sysutils/py-notify-python/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/08/13 09:38:29 obache Exp $
+# $NetBSD: Makefile,v 1.6 2013/08/16 09:20:41 obache Exp $
 #
 
 DISTNAME=	notify-python-0.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	sysutils
 MASTER_SITES= \
  http://www.galago-project.org/files/releases/source/notify-python/
@@ -31,5 +31,5 @@ post-extract:
 
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ruby-libnotify/Makefile b/sysutils/ruby-libnotify/Makefile
index 2fb7285c1c2..7bbac0c7c6c 100644
--- a/sysutils/ruby-libnotify/Makefile
+++ b/sysutils/ruby-libnotify/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/08/14 12:51:16 obache Exp $
+# $NetBSD: Makefile,v 1.2 2013/08/16 09:20:41 obache Exp $
 
 DISTNAME=	ruby-libnotify-0.5.1
 PKGNAME=	${DISTNAME:S/ruby/${RUBY_PKGPREFIX}/}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	-https://github.com/vargolo/ruby-libnotify/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
@@ -13,7 +14,7 @@ LICENSE=	gnu-lgpl-v2.1
 USE_RUBY_SETUP=	yes
 
 .include "../../x11/ruby-gnome2-gtk/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../devel/ruby-pkg-config/tool.mk"
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xfce4-orage/Makefile b/time/xfce4-orage/Makefile
index f6bbeb41bc1..3ccaf031530 100644
--- a/time/xfce4-orage/Makefile
+++ b/time/xfce4-orage/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2013/08/16 08:14:31 obache Exp $
+# $NetBSD: Makefile,v 1.27 2013/08/16 09:20:41 obache Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	orage-${XFCE4_VERSION}
 PKGNAME=	xfce4-orage-${XFCE4_VERSION}
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	time
 COMMENT=	Xfce time managing application
 
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+=	--disable-libxfce4mcs
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/wm/compiz-fusion-plugins-extra/Makefile b/wm/compiz-fusion-plugins-extra/Makefile
index 76fa2a0a9c0..cfabdd99faf 100644
--- a/wm/compiz-fusion-plugins-extra/Makefile
+++ b/wm/compiz-fusion-plugins-extra/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2013/06/30 22:13:40 rodent Exp $
+# $NetBSD: Makefile,v 1.30 2013/08/16 09:20:41 obache Exp $
 #
 
 PKGVER=		0.8.8
 PKGNAME=	compiz-fusion-plugins-extra-${PKGVER}
 DISTNAME=	compiz-plugins-extra-${PKGVER}
+PKGREVISION=	1
 CATEGORIES=	wm x11
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/
 
@@ -56,8 +57,7 @@ GCONF_SCHEMAS+=		compiz-widget.schemas
 .include "../../devel/GConf/schemas.mk"
 BUILDLINK_API_DEPENDS.compiz-bcop+=	compiz-bcop>=0.7.3
 .include "../../devel/compiz-bcop/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libnotify07+=	libnotify07>=0.6.1
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../wm/compiz-fusion-plugins-main/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../wm/compiz/buildlink3.mk"
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index c0585880111..7aac26fa8b1 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.143 2013/08/13 01:03:02 obache Exp $
+# $NetBSD: Makefile,v 1.144 2013/08/16 09:20:41 obache Exp $
 #
 
 DISTNAME=	epiphany-2.30.6
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.30/}
 EXTRACT_SUFX=	.tar.bz2
@@ -48,7 +48,7 @@ BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.18.0
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libxml2+=		libxml2>=2.6.12
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 44a2ef5dd18..69938ab2e88 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.134 2013/08/07 12:17:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.135 2013/08/16 09:20:41 obache Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	23.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} \
 		${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/liferea-current/Makefile b/www/liferea-current/Makefile
index 785997085ea..b8739204ab1 100644
--- a/www/liferea-current/Makefile
+++ b/www/liferea-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2013/08/16 02:43:30 obache Exp $
+# $NetBSD: Makefile,v 1.51 2013/08/16 09:20:42 obache Exp $
 
 DISTNAME=		liferea-1.8.15
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 EXTRACT_SUFX=		.tar.bz2
@@ -28,7 +28,7 @@ GCONF_SCHEMAS=		liferea.schemas
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 77d85a2eb45..f00e8eb75be 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.120 2013/08/16 02:37:01 obache Exp $
+# $NetBSD: Makefile,v 1.121 2013/08/16 09:20:41 obache Exp $
 
 DISTNAME=		liferea-1.4.28
-PKGREVISION=		34
+PKGREVISION=		35
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
@@ -47,7 +47,7 @@ GCONF_SCHEMAS=		liferea.schemas
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/www/midori/Makefile b/www/midori/Makefile
index d628a153c93..a0de0254cfc 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2013/08/16 06:06:01 obache Exp $
+# $NetBSD: Makefile,v 1.62 2013/08/16 09:20:42 obache Exp $
 
 DISTNAME=	midori-0.4.9
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.4/
 
@@ -73,7 +73,7 @@ BUILDLINK_API_DEPENDS.libsoup24+=libsoup24>=2.26.0
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala= build
 .include "../../lang/vala020/buildlink3.mk"
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index cbb63ea2858..be34fee221a 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.117 2013/08/14 05:59:16 obache Exp $
+# $NetBSD: Makefile,v 1.118 2013/08/16 09:20:42 obache Exp $
 #
 
 DISTNAME=		gnome-applets-2.32.1.1
-PKGREVISION=		29
+PKGREVISION=		30
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.32/}
 EXTRACT_SUFX=		.tar.bz2
@@ -79,7 +79,7 @@ BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gnome-control-center/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 35eae56e81e..0f5cc2650f8 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2013/08/12 12:28:19 obache Exp $
+# $NetBSD: Makefile,v 1.66 2013/08/16 09:20:42 obache Exp $
 #
 
 DISTNAME=	gnome-screensaver-2.30.2
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.30/}
 EXTRACT_SUFX=	.tar.bz2
@@ -65,7 +65,7 @@ BUILDLINK_API_DEPENDS.libexif+=		libexif>=0.6.12
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnome-desktop+=	gnome-desktop>=2.23.2
 .include "../../x11/gnome-desktop/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.11.5
diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile
index 6b7ea46f06e..a54fb819741 100644
--- a/x11/xfce4-exo/Makefile
+++ b/x11/xfce4-exo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2013/08/16 06:45:12 obache Exp $
+# $NetBSD: Makefile,v 1.33 2013/08/16 09:20:42 obache Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,7 +6,7 @@ XFCE4_VERSION=	0.3.101
 
 DISTNAME=	exo-${XFCE4_VERSION}
 PKGNAME=	xfce4-exo-${XFCE4_VERSION}
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	x11
 COMMENT=	Xfce extension library
 
@@ -36,7 +36,7 @@ OWN_DIRS+=		${EGDIR}
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-settings/Makefile b/x11/xfce4-settings/Makefile
index 63404f98d0f..ab11336ef8a 100644
--- a/x11/xfce4-settings/Makefile
+++ b/x11/xfce4-settings/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2013/08/16 07:42:55 obache Exp $
+# $NetBSD: Makefile,v 1.26 2013/08/16 09:20:42 obache Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=		4.6.5
 
 DISTNAME=		xfce4-settings-${XFCE4_VERSION}
-PKGREVISION=		19
+PKGREVISION=		20
 CATEGORIES=		x11
 COMMENT=		Xfce settings manager
 
@@ -32,7 +32,7 @@ CONF_FILES+=	\
 .include "../../devel/xfconf/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index a960f9b9d2a..623ac904769 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2013/08/13 08:50:14 obache Exp $
+# $NetBSD: Makefile,v 1.79 2013/08/16 09:20:42 obache Exp $
 #
 
 DISTNAME=	zenity-2.32.1
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,7 +17,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
-.include "../../sysutils/libnotify07/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 #.include "../../devel/libglade/buildlink3.mk"