6 files changed, 30 insertions, 182 deletions

diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile
index 11ea34c15f4a..8a6d25f7836d 100644
--- a/mail/gnome-gmail-notifier/Makefile
+++ b/mail/gnome-gmail-notifier/Makefile
@@ -6,25 +6,22 @@
 #
 
 PORTNAME=	gnome-gmail-notifier
-PORTVERSION=	0.9.4
-PORTREVISION=	7
+PORTVERSION=	0.10.1
 CATEGORIES=	mail deskutils
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	A Gmail Inbox Monitor for the GNOME2 desktop
 
-LIB_PC_DEPENDS=	libnotify:devel/libnotify	\
-		libsoup-2.4:devel/libsoup	\
-		gnome-keyring-1:security/gnome-keyring
-
-BUILD_DEPENDS=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|:C|:|.pc:${PORTSDIR}/|}
-RUN_DEPENDS=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|:C|:|.pc:${PORTSDIR}/|}
+LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
+		soup-2.4:${PORTSDIR}/devel/libsoup \
+		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 gtk20 libgnome libgnomeui libxml2 libglade2 librsvg2
+USE_GETTEXT=	yes
+USE_GNOME=	glib20 gtk20 gconf2 libxml2 librsvg2
 USE_GSTREAMER=	good
 
 post-patch:
diff --git a/mail/gnome-gmail-notifier/distinfo b/mail/gnome-gmail-notifier/distinfo
index 138f6020fd7c..fe15b04ea7f2 100644
--- a/mail/gnome-gmail-notifier/distinfo
+++ b/mail/gnome-gmail-notifier/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-gmail-notifier-0.9.4.tar.bz2) = 822426b19510036d14c00ed2ea24a899
-SHA256 (gnome-gmail-notifier-0.9.4.tar.bz2) = 4abd640c103a63b1d87c5a660f609a393e4d4ab88c4e4e978a8a7220209353a1
-SIZE (gnome-gmail-notifier-0.9.4.tar.bz2) = 255203
+MD5 (gnome-gmail-notifier-0.10.1.tar.bz2) = 697dea845b968af0f3526bad36f5855a
+SHA256 (gnome-gmail-notifier-0.10.1.tar.bz2) = a25819e55bbcbeccb1ae5ddd8e5ed1a6e0e55f77c5bf6b5661705c29541e50d0
+SIZE (gnome-gmail-notifier-0.10.1.tar.bz2) = 192949
diff --git a/mail/gnome-gmail-notifier/files/patch-configure b/mail/gnome-gmail-notifier/files/patch-configure
deleted file mode 100644
index ec1d065e4efe..000000000000
--- a/mail/gnome-gmail-notifier/files/patch-configure
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure.orig	2009-04-25 16:28:06.000000000 +1000
-+++ configure	2009-04-25 16:28:52.000000000 +1000
-@@ -6639,12 +6639,12 @@
-         pkg_cv_libsoup_CFLAGS="$libsoup_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= \$LIBSOUP_REQUIRED\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= $LIBSOUP_REQUIRED") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$LIBSOUP_REQUIRED\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_libsoup_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2 >= $LIBSOUP_REQUIRED" 2>/dev/null`
-+  pkg_cv_libsoup_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= $LIBSOUP_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -6657,12 +6657,12 @@
-         pkg_cv_libsoup_LIBS="$libsoup_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= \$LIBSOUP_REQUIRED\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= $LIBSOUP_REQUIRED") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$LIBSOUP_REQUIRED\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_libsoup_LIBS=`$PKG_CONFIG --libs "libsoup-2.2 >= $LIBSOUP_REQUIRED" 2>/dev/null`
-+  pkg_cv_libsoup_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= $LIBSOUP_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -6681,14 +6681,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        libsoup_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2 >= $LIBSOUP_REQUIRED"`
-+	        libsoup_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED"`
-         else
--	        libsoup_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2 >= $LIBSOUP_REQUIRED"`
-+	        libsoup_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$libsoup_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (libsoup-2.2 >= $LIBSOUP_REQUIRED) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4 >= $LIBSOUP_REQUIRED) were not met:
- 
- $libsoup_PKG_ERRORS
- 
-@@ -6699,7 +6699,7 @@
- and libsoup_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--echo "$as_me: error: Package requirements (libsoup-2.2 >= $LIBSOUP_REQUIRED) were not met:
-+echo "$as_me: error: Package requirements (libsoup-2.4 >= $LIBSOUP_REQUIRED) were not met:
- 
- $libsoup_PKG_ERRORS
- 
diff --git a/mail/gnome-gmail-notifier/files/patch-src_ggn-atom-feed.c b/mail/gnome-gmail-notifier/files/patch-src_ggn-atom-feed.c
deleted file mode 100644
index c3dc354ed756..000000000000
--- a/mail/gnome-gmail-notifier/files/patch-src_ggn-atom-feed.c
+++ /dev/null
@@ -1,93 +0,0 @@
---- src/ggn-atom-feed.c.orig	2008-01-11 00:41:24.000000000 +0900
-+++ src/ggn-atom-feed.c	2009-04-25 16:24:07.000000000 +1000
-@@ -75,7 +75,7 @@
-     /* the libsoup session and proxy. */
-     SoupSession* session;
-     SoupMessage* message;
--    SoupUri* proxy;
-+    SoupURI* proxy;
-     
-     /* the username and password. */
-     gchar* name;
-@@ -129,25 +129,17 @@
-  */
- static gboolean ggn_atom_feed_auth (SoupSession* session,
-                                     SoupMessage* message,
--                                    gchar* auth_type,
--                                    gchar* auth_realm,
--                                    gchar** username,
--                                    gchar** password,
-+                                    SoupAuth* auth,
-+                                    gboolean retrying,
-                                     gpointer data) {
-     /* the userdata is the gobject. */
-     GgnAtomFeed* feed = GGN_ATOM_FEED (data);
-     
--    /* see if we can set the username. */
--    if (feed->priv->user != NULL) {
--        /* set the username. */
--        *username = g_strdup (feed->priv->user);
--    }
--    
--    /* see if we can set the password. */
--    if (feed->priv->pass != NULL) {
--        /* set the username. */
--        *password = g_strdup (feed->priv->pass);
-+    /* see if we can set the username and password. */
-+    if (feed->priv->user != NULL && feed->priv->pass != NULL) {
-+		soup_auth_authenticate (auth, g_strdup (feed->priv->user), g_strdup (feed->priv->pass));
-     }
-+
-     
-     /* exit our function. */
-     return TRUE;
-@@ -299,7 +291,7 @@
-     g_signal_connect (G_OBJECT (self->priv->session),
-                       "authenticate",
-                       G_CALLBACK (ggn_atom_feed_auth),
--                      (gpointer) self);
-+                      self);
-     
-     /* setup the parser object. */
-     self->priv->parser = ggn_xml_parser_new ();
-@@ -495,12 +487,14 @@
-     feed->priv->proxy = soup_uri_new (feed->priv->prox);
-     
-     /* refresh the proxy-uri property of the session */
--    GValue val = {0,};
--    g_value_init (&val, G_TYPE_POINTER);
--    g_value_set_pointer (&val, feed->priv->proxy);
--    g_object_set_property (G_OBJECT (feed->priv->session),
--                           SOUP_SESSION_PROXY_URI,
--                           &val);
-+	if (feed->priv->proxy != NULL) {
-+		GValue val = {0,};
-+		g_value_init (&val, G_TYPE_POINTER);
-+		g_value_set_pointer (&val, feed->priv->proxy);
-+		g_object_set_property (G_OBJECT (feed->priv->session),
-+							   SOUP_SESSION_PROXY_URI,
-+							   &val);
-+	}
- }
- 
- /*
-@@ -679,7 +673,9 @@
-     /* check the return value. */
-     if (retval == 200) {
-         /* we got the feed. */
--        gchar* body = g_strdup (self->priv->message->response.body);
-+		SoupMessageBody* msgbody = self->priv->message->response_body;
-+		soup_message_body_flatten (msgbody);
-+        gchar* body = g_strdup (msgbody->data);
-         
-         /* see if we must free the message array. */
-         if (self->priv->box.msgs != NULL) {
-@@ -712,7 +708,7 @@
-     }
-     
-     /* close all open and unused connections. */
--    soup_session_try_prune_connection (self->priv->session);
-+    soup_session_abort (self->priv->session);
-     
-     /* emit the "updated" signal. */
-     g_signal_emit (feed, signals[UPDATED], 0, status);
diff --git a/mail/gnome-gmail-notifier/pkg-descr b/mail/gnome-gmail-notifier/pkg-descr
index b8a68c94a353..6633b9fb5b71 100644
--- a/mail/gnome-gmail-notifier/pkg-descr
+++ b/mail/gnome-gmail-notifier/pkg-descr
@@ -6,7 +6,7 @@ The Notifier presents itself as a system tray icon in the GNOME2
 desktop, displaying a small balloon popup when the user recieves new
 mail.
 
-WWW: http://code.google.com/p/gnome-gmail-notifier/
+WWW: http://notifier.geekysuavo.org/
 
 - Florent Thoumie
 flz@FreeBSD.org
diff --git a/mail/gnome-gmail-notifier/pkg-plist b/mail/gnome-gmail-notifier/pkg-plist
index 6fcf3c2c971a..7cb59a754f62 100644
--- a/mail/gnome-gmail-notifier/pkg-plist
+++ b/mail/gnome-gmail-notifier/pkg-plist
@@ -1,17 +1,22 @@
 bin/gnome-gmail-notifier
 share/applications/gnome-gmail-notifier.desktop
-share/gnome-gmail-notifier/ggn-about.glade
-share/gnome-gmail-notifier/ggn-edit.glade
-share/gnome-gmail-notifier/ggn-error.svg
-share/gnome-gmail-notifier/ggn-menu.glade
-share/gnome-gmail-notifier/ggn-new.svg
-share/gnome-gmail-notifier/ggn-normal.svg
-share/gnome-gmail-notifier/ggn-prefs.glade
-share/gnome-gmail-notifier/ggn-wait.svg
-share/gnome-gmail-notifier/ggn-warn.svg
-share/gnome-gmail-notifier/welcome-logo.png
-share/gnome-gmail-notifier/welcome-shot.png
-share/gnome-gmail-notifier/welcome.css
-share/gnome-gmail-notifier/welcome.html
+share/gnome-control-center/default-apps/gnome-gmail-notifier.xml
+%%DATADIR%%/ggn-about.xml
+%%DATADIR%%/ggn-edit.xml
+%%DATADIR%%/ggn-error-lg.svg
+%%DATADIR%%/ggn-error-sm.svg
+%%DATADIR%%/ggn-menu.xml
+%%DATADIR%%/ggn-new-lg.svg
+%%DATADIR%%/ggn-new-sm.svg
+%%DATADIR%%/ggn-normal-lg.svg
+%%DATADIR%%/ggn-normal-sm.svg
+%%DATADIR%%/ggn-prefs.xml
+%%DATADIR%%/ggn-wait.svg
+%%DATADIR%%/ggn-warn.svg
+%%DATADIR%%/ggn-write.svg
+share/locale/es/LC_MESSAGES/gnome-gmail-notifier.mo
 share/pixmaps/gnome-gmail-notifier.svg
-@dirrm share/gnome-gmail-notifier
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/gnome-control-center/default-apps
+@dirrmtry share/gnome-control-center