Adding latest version of libnotify as libnotify07. Setting libnotify and

libnotify07 to conflict with each other. Resolves PR pkg/47441

8 files changed, 127 insertions, 2 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index b0b09caa582..533c06f5ebb 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.567 2013/04/19 07:57:23 wiz Exp $
+# $NetBSD: Makefile,v 1.568 2013/04/21 00:50:03 rodent Exp $
 #
 
 COMMENT=	System utilities
@@ -256,6 +256,7 @@ SUBDIR+=	libgksu
 SUBDIR+=	libgtop
 SUBDIR+=	libirman
 SUBDIR+=	libnotify
+SUBDIR+=	libnotify07
 SUBDIR+=	libol
 SUBDIR+=	liboobs
 SUBDIR+=	libpciaccess
diff --git a/sysutils/libnotify/Makefile b/sysutils/libnotify/Makefile
index e117f07a7a4..6544e185393 100644
--- a/sysutils/libnotify/Makefile
+++ b/sysutils/libnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/02/16 11:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2013/04/21 00:50:03 rodent Exp $
 
 DISTNAME=	libnotify-0.4.5
 PKGREVISION=	14
@@ -11,6 +11,8 @@ HOMEPAGE=	http://www.galago-project.org/
 COMMENT=	Desktop notification framework
 LICENSE=	gnu-lgpl-v2.1
 
+CONFLICTS+=	libnotify07-[0-9]*
+
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
diff --git a/sysutils/libnotify07/DESCR b/sysutils/libnotify07/DESCR
new file mode 100644
index 00000000000..9db54037341
--- /dev/null
+++ b/sysutils/libnotify07/DESCR
@@ -0,0 +1,5 @@
+libnotify is a library that allows applications to raise visual notifications in
+a desktop environment. An external application, the notification-daemon, is then
+in charge to show them as it wishes.
+
+This is the 0.7.* version of libnotify.
diff --git a/sysutils/libnotify07/Makefile b/sysutils/libnotify07/Makefile
new file mode 100644
index 00000000000..32ffa779e03
--- /dev/null
+++ b/sysutils/libnotify07/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1 2013/04/21 00:50:03 rodent Exp $
+
+DISTNAME=	libnotify-0.7.5
+PKGNAME=	${DISTNAME:S/-/07-/1}
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libnotify/0.7/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://developer.gnome.org/libnotify/
+COMMENT=	Desktop notification framework
+LICENSE=	gnu-lgpl-v2.1
+
+CONFLICTS+=	libnotify-[0-9]*
+
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake pkg-config
+GNU_CONFIGURE=	yes
+
+PKGCONFIG_OVERRIDE=	libnotify.pc.in
+
+.include "options.mk"
+
+BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+.include "../../devel/gobject-introspection/buildlink3.mk"
+BUILD_DEPENDS+=	gdk-pixbuf2-[0-9]*:../../graphics/gdk-pixbuf2
+.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/gtk3/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libnotify07/PLIST b/sysutils/libnotify07/PLIST
new file mode 100644
index 00000000000..eff8e9eeb27
--- /dev/null
+++ b/sysutils/libnotify07/PLIST
@@ -0,0 +1,25 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/21 00:50:03 rodent 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.devhelp2
+share/gtk-doc/html/libnotify/right.png
+share/gtk-doc/html/libnotify/style.css
+share/gtk-doc/html/libnotify/up.png
diff --git a/sysutils/libnotify07/buildlink3.mk b/sysutils/libnotify07/buildlink3.mk
new file mode 100644
index 00000000000..53765fefa2e
--- /dev/null
+++ b/sysutils/libnotify07/buildlink3.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/04/21 00:50:04 rodent Exp $
+
+BUILDLINK_TREE+=	libnotify07
+
+.if !defined(LIBNOTIFY07_BUILDLINK3_MK)
+LIBNOTIFY07_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libnotify07+=	libnotify07>=0.3.2
+BUILDLINK_ABI_DEPENDS.libnotify07+=	libnotify07>=0.6.1
+BUILDLINK_PKGSRCDIR.libnotify07?=	../../sysutils/libnotify07
+
+pkgbase := libnotify07
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.libnotify07:Mdoc)
+.include "../../textproc/gtk-doc/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.libnotify07:Mintrospection)
+CONFIGURE_ARGS+=	--enable-introspection=yes
+.endif
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.endif # LIBNOTIFY07_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libnotify07
diff --git a/sysutils/libnotify07/distinfo b/sysutils/libnotify07/distinfo
new file mode 100644
index 00000000000..7e96072e7a1
--- /dev/null
+++ b/sysutils/libnotify07/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2013/04/21 00:50:04 rodent Exp $
+
+SHA1 (libnotify-0.7.5.tar.xz) = 729d1382617fee7e82eac17d808c11469ab2b7e1
+RMD160 (libnotify-0.7.5.tar.xz) = 9f166a6b17f1f00e85e658e2effa8da93ac5497f
+Size (libnotify-0.7.5.tar.xz) = 275804 bytes
diff --git a/sysutils/libnotify07/options.mk b/sysutils/libnotify07/options.mk
new file mode 100644
index 00000000000..e963d614b49
--- /dev/null
+++ b/sysutils/libnotify07/options.mk
@@ -0,0 +1,26 @@
+# $NetBSD: options.mk,v 1.1 2013/04/21 00:50:04 rodent Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libnotify07
+PKG_SUPPORTED_OPTIONS=	doc introspection
+PKG_SUGGESTED_OPTIONS+=	# blank
+PLIST_VARS+=		doc introspection
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdoc)
+.include "../../textproc/gtk-doc/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-gtk-doc=yes --enable-gtk-doc-html=yes
+CONFIGURE_ARGS+=	--enable-gtk-doc-pdf=yes
+PLIST.doc=		yes
+.else
+CONFIGURE_ARGS+=	--enable-gtk-doc=no --enable-gtk-doc-html=no
+CONFIGURE_ARGS+=	--enable-gtk-doc-pdf=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-introspection=yes
+PLIST.introspection=	yes
+.else
+CONFIGURE_ARGS+=	--enable-introspection=no
+.endif