4 files changed, 41 insertions, 21 deletions

diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 43e603322eef..24d3633c3eb1 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	liferea
-PORTVERSION=	1.6.5
-PORTREVISION=	1
+PORTVERSION=	1.6.6
 CATEGORIES=	net gnome
 MASTER_SITES=	SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
 
@@ -23,6 +22,7 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-libnotify
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		liferea.1
@@ -30,16 +30,7 @@ MANLANG=	"" pl
 GCONF_SCHEMAS=	liferea.schemas
 INSTALLS_ICONS=	yes
 
-OPTIONS=	LIBNOTIFY "Enable libnotify support" on
+post-patch:
+	@${CP} ${FILESDIR}/liferea_dbus.xml ${WRKSRC}/src
 
-.include <bsd.port.pre.mk>
-
-.ifdef WITHOUT_LIBNOTIFY
-CONFIGURE_ARGS+=--disable-libnotify
-PLIST_SUB+=	NOTIFY="@comment "
-.else
-LIB_DEPENDS+=	notify.1:${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 e9145756ad18..80afc00bffd2 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.6.tar.gz) = fd717d7d506714bd57288b05daddda64c1e56627c680db56848b4e84d3b36803
+SIZE (liferea-1.6.6.tar.gz) = 1860948
diff --git a/net/liferea/files/liferea_dbus.xml b/net/liferea/files/liferea_dbus.xml
new file mode 100644
index 000000000000..30ebd2a3b829
--- /dev/null
+++ b/net/liferea/files/liferea_dbus.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<node name="/org/gnome/feed/Reader">
+
+  <interface name="org.gnome.feed.Reader">
+
+    <method name="Ping">
+      <arg name="result" type="b" direction="out" />
+    </method>
+    
+    <method name="SetOnline">
+      <arg name="online" type="b" />
+      <arg name="result" type="b" direction="out" />
+    </method>
+    
+    <method name="Subscribe">
+      <arg name="url" type="s" />
+      <arg name="result" type="b" direction="out" />
+    </method>
+    
+    <method name="GetUnreadItems">
+      <arg name="result" type="i" direction="out" />
+    </method>
+
+    <method name="GetNewItems">
+      <arg name="result" type="i" direction="out" />
+    </method>
+
+  </interface>
+</node>
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index 88d337473128..83c1107e6048 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