The FreeBSD GNOME team presents a Glib and Gtk+ 3 update.

This update updates Glib20 to 2.36 and Gtk+ 3.8

* The gio-fam-backend port that used gamin for the GFileMonitor API is gone.
  It is replaced by a GIO kqueue implementation developed as part of a NetBSD
  GSoC 2011 project by Dimitry Matveev.
* Fix a bug in the glib20 Makefile so it includes -lintl in the glib-2.0
  pkgconfig file [1]. This broke static linking and newer binutils.
* Add introspection USE_GNOME component which sets GI_SCANNER_DISABLE_CACHE to
  prevent creation of /  root/.cache dir. Defaults to build & run depend,
  but :build and :run switches available.
* New x11-toolkits/pangox-compat port and companion USE_GNOME component for
  pangox support which was removed from the pango port. Add it to ports still
  using pangox API.

Exp-run by:	bapt@
PR:		ports/178958 [1]
Submitted by:	emaste@ [1]

4 files changed, 24 insertions, 31 deletions

diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 5591b1968926..1a45ca22ba2f 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -1,29 +1,21 @@
-# New ports collection makefile for:	libnotify
-# Date created:				2005-08-06
-# Whom:					Andreas Kohn <andreas@syndrom23.de>
-#
+# Created by: Andreas Kohn <andreas@syndrom23.de>
 # $FreeBSD$
-#   $MCom: ports/devel/libnotify/Makefile,v 1.21 2011/06/11 19:51:15 mezz Exp $
-#
+#   $MCom: ports/trunk/devel/libnotify/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libnotify
-PORTVERSION=	0.7.3
-PORTREVISION=	2
+PORTVERSION=	0.7.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for desktop notifications
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack intlhack glib20 gtk20 ltverhack
-USES=		gettext
-USE_GMAKE=	yes
+
+USE_XZ=		yes
+USE_GNOME=	intlhack glib20 gdkpixbuf2 ltverhack introspection:build
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libnotify/distinfo b/devel/libnotify/distinfo
index cdc49f2c6748..048dd5e9163f 100644
--- a/devel/libnotify/distinfo
+++ b/devel/libnotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libnotify-0.7.3.tar.bz2) = 322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88
-SIZE (libnotify-0.7.3.tar.bz2) = 305203
+SHA256 (libnotify-0.7.5.tar.xz) = 4378cb47874ba4d5f759b7890d8d28d086e81d3f0bd4f6e84e5ab66d82ffb652
+SIZE (libnotify-0.7.5.tar.xz) = 275804
diff --git a/devel/libnotify/files/patch-configure b/devel/libnotify/files/patch-configure
index 6aca4e53d57f..fa512f8de042 100644
--- a/devel/libnotify/files/patch-configure
+++ b/devel/libnotify/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-06-07 22:08:06.000000000 +0200
-+++ configure	2011-06-07 22:08:10.000000000 +0200
-@@ -646,8 +646,6 @@
+--- configure.orig	2011-08-30 23:03:20.000000000 +0200
++++ configure	2011-08-30 23:03:01.000000000 +0200
+@@ -648,8 +648,6 @@
  INTROSPECTION_COMPILER
  INTROSPECTION_SCANNER
  GLIB_GENMARSHAL
@@ -9,26 +9,26 @@
  PACKAGE_LIBS
  PACKAGE_CFLAGS
  PKG_CONFIG_LIBDIR
-@@ -804,8 +802,6 @@
+@@ -806,8 +804,6 @@
  PKG_CONFIG_LIBDIR
  PACKAGE_CFLAGS
  PACKAGE_LIBS
 -TESTS_CFLAGS
 -TESTS_LIBS
+ GTKDOC_DEPS_CFLAGS
+ GTKDOC_DEPS_LIBS
  XMLTO
- XMLTO_FLAGS'
- 
-@@ -1473,9 +1469,6 @@
+@@ -1477,9 +1473,6 @@
                C compiler flags for PACKAGE, overriding pkg-config
    PACKAGE_LIBS
                linker flags for PACKAGE, overriding pkg-config
 -  TESTS_CFLAGS
 -              C compiler flags for TESTS, overriding pkg-config
 -  TESTS_LIBS  linker flags for TESTS, overriding pkg-config
-   XMLTO       Define/override the `xmlto' location.
-   XMLTO_FLAGS Define/override `xmlto' options, like `--skip-validation'.
- 
-@@ -11656,99 +11643,6 @@
+   GTKDOC_DEPS_CFLAGS
+               C compiler flags for GTKDOC_DEPS, overriding pkg-config
+   GTKDOC_DEPS_LIBS
+@@ -11664,98 +11657,6 @@
  
  fi
  
@@ -124,7 +124,6 @@
 -$as_echo "yes" >&6; }
 -
 -fi
--
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
  
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
  
diff --git a/devel/libnotify/pkg-plist b/devel/libnotify/pkg-plist
index 2a6d2352ab67..1be0df3cc4ee 100644
--- a/devel/libnotify/pkg-plist
+++ b/devel/libnotify/pkg-plist
@@ -11,13 +11,15 @@ lib/libnotify.so.4
 libdata/pkgconfig/libnotify.pc
 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