Import of pkgsrc-2014Q1

2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
--- a/sysutils/libnotify/Makefile
+++ b/sysutils/libnotify/Makefile
@@ -1,27 +1,29 @@
-# $NetBSD: Makefile,v 1.30 2013/06/06 12:53:57 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/12/08 16:30:15 prlw1 Exp $

-DISTNAME=	libnotify-0.4.5
-PKGREVISION=	17
+DISTNAME=	libnotify-0.7.6
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://www.galago-project.org/files/releases/source/libnotify/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libnotify/0.7/}
+EXTRACT_SUFX=	.tar.xz

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.galago-project.org/
+HOMEPAGE=	http://developer.gnome.org/libnotify/
 COMMENT=	Desktop notification framework
 LICENSE=	gnu-lgpl-v2.1

 CONFLICTS+=	libnotify07-[0-9]*
+SUPERSEDES+=	libnotify07-[0-9]*

 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes

 PKGCONFIG_OVERRIDE=	libnotify.pc.in

+.include "options.mk"
+
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.26.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.76
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gtk3=	build
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/sysutils/libnotify/PLIST
+++ b/sysutils/libnotify/PLIST
@@ -1,18 +1,24 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/08/16 09:17:33 obache Exp $
 bin/notify-send
 include/libnotify/notification.h
 include/libnotify/notify-enum-types.h
+include/libnotify/notify-features.h
 include/libnotify/notify.h
+${PLIST.introspection}lib/girepository-1.0/Notify-0.7.typelib
 lib/libnotify.la
 lib/pkgconfig/libnotify.pc
+${PLIST.doc}share/doc/libnotify/spec/notification-spec.html
+${PLIST.introspection}share/gir-1.0/Notify-0.7.gir
 share/gtk-doc/html/libnotify/NotifyNotification.html
+share/gtk-doc/html/libnotify/annotation-glossary.html
+share/gtk-doc/html/libnotify/api-index-deprecated.html
+share/gtk-doc/html/libnotify/api-index-full.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
--- a/sysutils/libnotify/buildlink3.mk
+++ b/sysutils/libnotify/buildlink3.mk
@@ -1,18 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.25 2013/06/06 12:53:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2013/08/16 09:17:33 obache Exp $

 BUILDLINK_TREE+=	libnotify

 .if !defined(LIBNOTIFY_BUILDLINK3_MK)
 LIBNOTIFY_BUILDLINK3_MK:=

-BUILDLINK_API_DEPENDS.libnotify+=	libnotify>=0.3.2
-BUILDLINK_ABI_DEPENDS.libnotify+=	libnotify>=0.4.5nb17
+BUILDLINK_API_DEPENDS.libnotify+=	libnotify>=0.7.0
 BUILDLINK_PKGSRCDIR.libnotify?=	../../sysutils/libnotify

+pkgbase := libnotify
+.include "../../mk/pkg-build-options.mk"
+
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .endif # LIBNOTIFY_BUILDLINK3_MK

 BUILDLINK_TREE+=	-libnotify
--- a/sysutils/libnotify/distinfo
+++ b/sysutils/libnotify/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2011/04/25 08:55:28 adam Exp $
+$NetBSD: distinfo,v 1.10 2013/12/08 16:30:15 prlw1 Exp $

-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
+SHA1 (libnotify-0.7.6.tar.xz) = 956ce02a9f2c9fb74a81a765358131efdb7bf536
+RMD160 (libnotify-0.7.6.tar.xz) = 7f2ae9f2e75396607e79c2a5781bbe81b3efc9fd
+Size (libnotify-0.7.6.tar.xz) = 280388 bytes
--- a/sysutils/libnotify/options.mk
+++ b/sysutils/libnotify/options.mk
@@ -0,0 +1,25 @@
+# $NetBSD: options.mk,v 1.2 2013/08/17 16:28:48 richard Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libnotify
+PKG_SUPPORTED_OPTIONS=	doc introspection
+PKG_SUGGESTED_OPTIONS+=	# blank
+PLIST_VARS+=		doc introspection
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdoc)
+BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+CONFIGURE_ARGS+=	--enable-docbook-docs
+PLIST.doc=		yes
+.else
+CONFIGURE_ARGS+=	--disable-docbook-docs
+.endif
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.12
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-introspection=yes
+PLIST.introspection=	yes
+.else
+CONFIGURE_ARGS+=	--enable-introspection=no
+.endif
--- a/sysutils/libnotify/patches/patch-libnotify_notification.c
+++ b/sysutils/libnotify/patches/patch-libnotify_notification.c
@@ -1,16 +0,0 @@
-$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) || \