Fix building with GDK with Quartz (Mac OS X) backend; switch to .tar.bz2; added LICENSE; fixed pkglint complaints

4 files changed, 30 insertions, 12 deletions

diff --git a/sysutils/libnotify/Makefile b/sysutils/libnotify/Makefile
index 3626b8c8f22..ea26fee447b 100644
--- a/sysutils/libnotify/Makefile
+++ b/sysutils/libnotify/Makefile
@@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.16 2011/04/22 13:42:14 obache Exp $
-#
+# $NetBSD: Makefile,v 1.17 2011/04/25 08:55:28 adam Exp $
 
 DISTNAME=	libnotify-0.4.5
 PKGREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/libnotify/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.galago-project.org/
 COMMENT=	Desktop notification framework
+LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE=	libnotify.pc.in
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
-BUILDLINK_API_DEPENDS.dbus-glib+=       dbus-glib>=0.76
+BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.76
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libnotify/buildlink3.mk b/sysutils/libnotify/buildlink3.mk
index 3c081d6d0dd..26039d1b23d 100644
--- a/sysutils/libnotify/buildlink3.mk
+++ b/sysutils/libnotify/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2011/04/22 13:42:14 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2011/04/25 08:55:28 adam Exp $
 
 BUILDLINK_TREE+=	libnotify
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libnotify
 LIBNOTIFY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libnotify+=	libnotify>=0.3.2
-BUILDLINK_ABI_DEPENDS.libnotify?=	libnotify>=0.4.5nb6
+BUILDLINK_ABI_DEPENDS.libnotify+=	libnotify>=0.4.5nb6
 BUILDLINK_PKGSRCDIR.libnotify?=	../../sysutils/libnotify
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/libnotify/distinfo b/sysutils/libnotify/distinfo
index 932beb48e06..d64058e39b3 100644
--- a/sysutils/libnotify/distinfo
+++ b/sysutils/libnotify/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/01/07 21:47:37 wiz Exp $
+$NetBSD: distinfo,v 1.8 2011/04/25 08:55:28 adam Exp $
 
-SHA1 (libnotify-0.4.5.tar.gz) = e0a3be6249978ae2eb18bb77cdd22763271dc904
-RMD160 (libnotify-0.4.5.tar.gz) = 6ddf4feb50504012c5f5fd205123d9f27cb12ef6
-Size (libnotify-0.4.5.tar.gz) = 364142 bytes
+SHA1 (libnotify-0.4.5.tar.bz2) = 3bdcd4efaeb14480da4b170c6275cc3d705fb17d
+RMD160 (libnotify-0.4.5.tar.bz2) = 8ea0afdb8f2f147a2c5b189bfeca58c2b4558cdb
+Size (libnotify-0.4.5.tar.bz2) = 289217 bytes
+SHA1 (patch-libnotify_notification.c) = 29627a105aabdfd0dbbc0347816bb2068abb99e6
diff --git a/sysutils/libnotify/patches/patch-libnotify_notification.c b/sysutils/libnotify/patches/patch-libnotify_notification.c
new file mode 100644
index 00000000000..dc545390c63
--- /dev/null
+++ b/sysutils/libnotify/patches/patch-libnotify_notification.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-libnotify_notification.c,v 1.1 2011/04/25 08:55:28 adam Exp $
+
+Fix building with GDK with Quartz (Mac OS X) backend.
+
+--- libnotify/notification.c.orig	2011-04-25 08:35:15.000000000 +0000
++++ libnotify/notification.c
+@@ -31,7 +31,9 @@
+ # define HAVE_STATUS_ICON
+ # include <gtk/gtkstatusicon.h>
+ #endif
++#ifndef GDK_WINDOWING_QUARTZ
+ #include <gdk/gdkx.h>
++#endif
+ 
+ #define CHECK_DBUS_VERSION(major, minor) \
+ 	(DBUS_MAJOR_VER > (major) || \