Update to 0.4.2. OK'ed by wiz@ during the freeze. Closes PR pkg/34317.

version 0.4.2 (17-June-2006):
	* Add G_BEGIN_DECLS and G_END_DECLS to notify.h, so that libnotify can
	  be used in C++ applications properly.

version 0.4.1 (17-June-2006):
	* Added support for attaching to a GtkStatusIcon. Patch by chpe. (Bug #60)
	* Added GObject properties to NotifyNotification. Patch by chpe. (Bug #60)
	* Added API documentation, accessible through devhelp.
	* Fixed up libnotify.pc to support dependencies correctly. (Bug #58)
	* Fixed notify_uninit() to properly set _initted to FALSE after being
	  called. (Bug #56)

version 0.4.0 (26-April-2006):
	* Patch by M.S. to switch notify-send to use GOption instead of popt,
	  to add -v, --version, -h, and --hint options, and to rename
	  -T, --type to -c, --category. This also fixes assertions when calling
	  notify-send "". (Bug #41)
	* Fixed the short flag for --type to be -T in notify-send. (Bug #18)
	* Fixed the help in notify-send to indicate that --expire-timeout
	  requires milliseconds, not seconds. (Bug #28)
	* Fixed some C99 usage. Patch by jensgr. (Bug #44)
	* Fixed notify-send on PPC.

4 files changed, 21 insertions, 25 deletions

diff --git a/sysutils/libnotify/Makefile b/sysutils/libnotify/Makefile
index df564ffa38a..a7aec30f9f9 100644
--- a/sysutils/libnotify/Makefile
+++ b/sysutils/libnotify/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/08/23 09:49:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2006/09/16 14:46:55 jmmv Exp $
 #
 
-DISTNAME=	libnotify-0.3.2
-PKGREVISION=	2
+DISTNAME=	libnotify-0.4.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/libnotify/
 
@@ -17,7 +16,6 @@ USE_TOOLS+=	pkg-config
 PKGCONFIG_OVERRIDE=	libnotify.pc.in
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/libnotify/PLIST b/sysutils/libnotify/PLIST
index b2c0218d5fd..afc204d1794 100644
--- a/sysutils/libnotify/PLIST
+++ b/sysutils/libnotify/PLIST
@@ -1,7 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/30 21:00:29 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/09/16 14:46:55 jmmv Exp $
 bin/notify-send
 include/libnotify/notification.h
+include/libnotify/notify-enum-types.h
 include/libnotify/notify.h
 lib/libnotify.la
 lib/pkgconfig/libnotify.pc
+share/gtk-doc/html/libnotify/NotifyNotification.html
+share/gtk-doc/html/libnotify/ch01.html
+share/gtk-doc/html/libnotify/home.png
+share/gtk-doc/html/libnotify/index.html
+share/gtk-doc/html/libnotify/index.sgml
+share/gtk-doc/html/libnotify/left.png
+share/gtk-doc/html/libnotify/libnotify-notify.html
+share/gtk-doc/html/libnotify/libnotify.devhelp
+share/gtk-doc/html/libnotify/libnotify.devhelp2
+share/gtk-doc/html/libnotify/right.png
+share/gtk-doc/html/libnotify/style.css
+share/gtk-doc/html/libnotify/up.png
+@dirrm share/gtk-doc/html/libnotify
 @dirrm include/libnotify
diff --git a/sysutils/libnotify/distinfo b/sysutils/libnotify/distinfo
index a07b97c8bf8..074b1e97f0c 100644
--- a/sysutils/libnotify/distinfo
+++ b/sysutils/libnotify/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/04/04 13:27:44 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2006/09/16 14:46:55 jmmv Exp $
 
-SHA1 (libnotify-0.3.2.tar.gz) = 689bc631cfe9af87fb5439a6266fcc5305be289b
-RMD160 (libnotify-0.3.2.tar.gz) = 934eb851b385b304a207657b01f9c24368e35c12
-Size (libnotify-0.3.2.tar.gz) = 337224 bytes
+SHA1 (libnotify-0.4.2.tar.gz) = ff67522426f2908c41de9ded210c8e3e28e0de84
+RMD160 (libnotify-0.4.2.tar.gz) = 6a2bc403a927571480683b5ffa3d40ecb482e24f
+Size (libnotify-0.4.2.tar.gz) = 388355 bytes
 SHA1 (patch-aa) = 9ff274136d023426b89a7cf2a89f22305e218db5
diff --git a/sysutils/libnotify/patches/patch-aa b/sysutils/libnotify/patches/patch-aa
deleted file mode 100644
index 9f52c84b24d..00000000000
--- a/sysutils/libnotify/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/04 13:27:44 jmmv Exp $
-
---- tests/test-server-info.c.orig	2006-01-20 10:53:53.000000000 +0100
-+++ tests/test-server-info.c
-@@ -26,10 +26,10 @@
- int
- main(int argc, char **argv)
- {
--	notify_init("TestCaps");
- 	GList *l, *caps;
- 	char *name, *vendor, *version, *spec_version;
- 
-+	notify_init("TestCaps");
- 	if (!notify_get_server_info(&name, &vendor, &version, &spec_version))
- 	{
- 		fprintf(stderr, "Failed to receive server info.\n");