Sync with FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16108 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 14 insertions, 45 deletions

diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index dd4838368..76aad77c1 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -2,14 +2,13 @@
 # Date created:		28 August 2003
 # Whom:			Hye-Shik Chang <perky@FreeBSD.org>
 #
-# $FreeBSD$
+# $FreeBSD: ports/net/liferea/Makefile,v 1.151 2011/06/24 19:32:14 pav Exp $
 #
 
 PORTNAME=	liferea
-PORTVERSION=	1.6.5
-PORTREVISION=	2
+PORTVERSION=	1.6.6b
 CATEGORIES=	net gnome
-MASTER_SITES=	SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/Liferea%20Stable/1.6.6
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Simple RSS/RDF feed reader
@@ -21,8 +20,9 @@ USE_GNOME=	gnomeprefix gnomehack libglade2 gconf2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-libnotify
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		liferea.1
@@ -30,16 +30,6 @@ MANLANG=	"" pl
 GCONF_SCHEMAS=	liferea.schemas
 INSTALLS_ICONS=	yes
 
-OPTIONS=	LIBNOTIFY "Enable libnotify support" on
+LICENSE=	GPLv2
 
-.include <bsd.port.pre.mk>
-
-.ifdef WITHOUT_LIBNOTIFY
-CONFIGURE_ARGS+=--disable-libnotify
-PLIST_SUB+=	NOTIFY="@comment "
-.else
-LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
-PLIST_SUB+=	NOTIFY=""
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index e9145756a..72544917b 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liferea-1.6.5.tar.gz) = 3a594bd8acbdcbc236f629f2bee63ffba0ddcc38fb406f8ba89629963a877ebd
-SIZE (liferea-1.6.5.tar.gz) = 1784724
+SHA256 (liferea-1.6.6b.tar.gz) = 98474f0deff2143e1bb2fddecaf038c15bc9a21b0f32c570f395f03ad6b9c07b
+SIZE (liferea-1.6.6b.tar.gz) = 1866016
diff --git a/net/liferea/files/patch-src_notification_libnotify.c b/net/liferea/files/patch-src_notification_libnotify.c
deleted file mode 100644
index 081768a42..000000000
--- a/net/liferea/files/patch-src_notification_libnotify.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/notification/libnotify.c.orig	2011-03-07 11:14:15.000000000 +0100
-+++ src/notification/libnotify.c	2011-03-07 11:14:29.000000000 +0100
-@@ -150,7 +150,7 @@ static void notif_libnotify_callback_sho
- //		notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL);
- //		notify_notification_clear_actions(n);
- 
--		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL);
-+		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL);
- 
- 		notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
- 
-@@ -244,7 +244,7 @@ notif_libnotify_node_has_new_items (node
- 
- 	labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), 
- 	                                  node_get_title (node), item_count);
--	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
-+	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL);
- 	g_free(labelSummary_p);
- 
- 	notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index 88d337473..83c1107e6 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -1,11 +1,7 @@
 bin/liferea
 bin/liferea-add-feed
-%%NOTIFY%%lib/liferea/liblinotiflibnotify.a
-%%NOTIFY%%lib/liferea/liblinotiflibnotify.la
-%%NOTIFY%%lib/liferea/liblinotiflibnotify.so
 share/applications/liferea.desktop
 share/liferea/auth.glade
-share/liferea/bloglines_source.glade
 share/liferea/google_source.glade
 share/liferea/liferea.glade
 share/liferea/new_subscription.glade
@@ -73,6 +69,7 @@ share/liferea/opml/feedlist_es.opml
 share/liferea/opml/feedlist_eu.opml
 share/liferea/opml/feedlist_fr.opml
 share/liferea/opml/feedlist_gl.opml
+share/liferea/opml/feedlist_he.opml
 share/liferea/opml/feedlist_it.opml
 share/liferea/opml/feedlist_nl.opml
 share/liferea/opml/feedlist_pl.opml
@@ -92,7 +89,6 @@ share/liferea/pixmaps/directory.png
 share/liferea/pixmaps/edit.png
 share/liferea/pixmaps/empty.png
 share/liferea/pixmaps/empty_offline.png
-share/liferea/pixmaps/fl_bloglines.png
 share/liferea/pixmaps/fl_google.png
 share/liferea/pixmaps/fl_opml.png
 share/liferea/pixmaps/flag.png
@@ -124,6 +120,7 @@ share/icons/hicolor/32x32/apps/liferea.png
 share/icons/hicolor/48x48/apps/liferea.png
 share/icons/hicolor/scalable/apps/liferea.svg
 share/locale/ar/LC_MESSAGES/liferea.mo
+share/locale/ast/LC_MESSAGES/liferea.mo
 share/locale/be@latin/LC_MESSAGES/liferea.mo
 share/locale/bg/LC_MESSAGES/liferea.mo
 share/locale/ca/LC_MESSAGES/liferea.mo
@@ -136,6 +133,7 @@ share/locale/eu/LC_MESSAGES/liferea.mo
 share/locale/fi/LC_MESSAGES/liferea.mo
 share/locale/fr/LC_MESSAGES/liferea.mo
 share/locale/gl/LC_MESSAGES/liferea.mo
+share/locale/he/LC_MESSAGES/liferea.mo
 share/locale/hu/LC_MESSAGES/liferea.mo
 share/locale/it/LC_MESSAGES/liferea.mo
 share/locale/ja/LC_MESSAGES/liferea.mo
@@ -151,6 +149,7 @@ share/locale/sk/LC_MESSAGES/liferea.mo
 share/locale/sq/LC_MESSAGES/liferea.mo
 share/locale/sv/LC_MESSAGES/liferea.mo
 share/locale/tr/LC_MESSAGES/liferea.mo
+share/locale/uk/LC_MESSAGES/liferea.mo
 share/locale/zh_CN/LC_MESSAGES/liferea.mo
 share/locale/zh_TW/LC_MESSAGES/liferea.mo
 @dirrm share/liferea/xslt