Update to 0.7.3.

5 files changed, 154 insertions, 9 deletions

diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 8365cf7ca0ba..57f5632b0ea6 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -3,18 +3,20 @@
 # Whom:					Andreas Kohn <andreas@syndrom23.de>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libnotify/Makefile,v 1.10 2010/10/15 06:43:06 avl Exp $
+#   $MCom: ports/devel/libnotify/Makefile,v 1.21 2011/06/11 19:51:15 mezz Exp $
 #
 
 PORTNAME=	libnotify
-PORTVERSION=	0.5.2
+PORTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for desktop notifications
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -24,7 +26,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/libnotify/distinfo b/devel/libnotify/distinfo
index 3f71d40f6ce6..cdc49f2c6748 100644
--- a/devel/libnotify/distinfo
+++ b/devel/libnotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libnotify-0.5.2.tar.bz2) = 1f6f1a2d6a0e009997c7ed31f6197f9bf09e9b45fb9cd54acabceea951d99062
-SIZE (libnotify-0.5.2.tar.bz2) = 310439
+SHA256 (libnotify-0.7.3.tar.bz2) = 322541fdf276eb803686df81763a5186af041b2ee3e9cc5fa1dc86c550388c88
+SIZE (libnotify-0.7.3.tar.bz2) = 305203
diff --git a/devel/libnotify/files/patch-Makefile b/devel/libnotify/files/patch-Makefile
new file mode 100644
index 000000000000..8305c3d1a7bf
--- /dev/null
+++ b/devel/libnotify/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2011-06-07 22:09:51.000000000 +0200
++++ Makefile.in	2011-06-07 22:10:05.000000000 +0200
+@@ -281,7 +281,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+-SUBDIRS = libnotify docs tools tests
++SUBDIRS = libnotify docs tools
+ pcdata_DATA = libnotify.pc
+ pcdatadir = $(prefix)/libdata/pkgconfig
+ EXTRA_DIST = \
diff --git a/devel/libnotify/files/patch-configure b/devel/libnotify/files/patch-configure
new file mode 100644
index 000000000000..6aca4e53d57f
--- /dev/null
+++ b/devel/libnotify/files/patch-configure
@@ -0,0 +1,130 @@
+--- configure.orig	2011-06-07 22:08:06.000000000 +0200
++++ configure	2011-06-07 22:08:10.000000000 +0200
+@@ -646,8 +646,6 @@
+ INTROSPECTION_COMPILER
+ INTROSPECTION_SCANNER
+ GLIB_GENMARSHAL
+-TESTS_LIBS
+-TESTS_CFLAGS
+ PACKAGE_LIBS
+ PACKAGE_CFLAGS
+ PKG_CONFIG_LIBDIR
+@@ -804,8 +802,6 @@
+ PKG_CONFIG_LIBDIR
+ PACKAGE_CFLAGS
+ PACKAGE_LIBS
+-TESTS_CFLAGS
+-TESTS_LIBS
+ XMLTO
+ XMLTO_FLAGS'
+ 
+@@ -1473,9 +1469,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 @@
+ 
+ fi
+ 
+-tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION"
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TESTS" >&5
+-$as_echo_n "checking for TESTS... " >&6; }
+-
+-if test -n "$TESTS_CFLAGS"; then
+-    pkg_cv_TESTS_CFLAGS="$TESTS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$tests_modules\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "$tests_modules") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_TESTS_CFLAGS=`$PKG_CONFIG --cflags "$tests_modules" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$TESTS_LIBS"; then
+-    pkg_cv_TESTS_LIBS="$TESTS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$tests_modules\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "$tests_modules") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_TESTS_LIBS=`$PKG_CONFIG --libs "$tests_modules" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        TESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$tests_modules" 2>&1`
+-        else
+-	        TESTS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$tests_modules" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$TESTS_PKG_ERRORS" >&5
+-
+-	as_fn_error $? "Package requirements ($tests_modules) were not met:
+-
+-$TESTS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables TESTS_CFLAGS
+-and TESTS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables TESTS_CFLAGS
+-and TESTS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
+-else
+-	TESTS_CFLAGS=$pkg_cv_TESTS_CFLAGS
+-	TESTS_LIBS=$pkg_cv_TESTS_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+ 
+ 
diff --git a/devel/libnotify/pkg-plist b/devel/libnotify/pkg-plist
index 11162feb7453..2a6d2352ab67 100644
--- a/devel/libnotify/pkg-plist
+++ b/devel/libnotify/pkg-plist
@@ -3,17 +3,19 @@ include/libnotify/notification.h
 include/libnotify/notify-enum-types.h
 include/libnotify/notify-features.h
 include/libnotify/notify.h
+lib/girepository-1.0/Notify-0.7.typelib
 lib/libnotify.a
 lib/libnotify.la
 lib/libnotify.so
-lib/libnotify.so.1
+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/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-notification.html
 share/gtk-doc/html/libnotify/libnotify-notify.html
 share/gtk-doc/html/libnotify/libnotify.devhelp
 share/gtk-doc/html/libnotify/libnotify.devhelp2