4 files changed, 42 insertions, 99 deletions

diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index b14e724c9443..2a4655978a42 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	liferea
-PORTVERSION=	1.4.28
-PORTREVISION=	7
+PORTVERSION=	1.6.1
 CATEGORIES=	net gnome
 MASTER_SITES=	SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Simple RSS/RDF feed reader
 
-LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
 
 USE_GNOME=	gnomeprefix gnomehack libglade2
 USE_GMAKE=	yes
@@ -28,12 +28,7 @@ MANLANG=	"" pl
 GCONF_SCHEMAS=	liferea.schemas
 INSTALLS_ICONS=	yes
 
-OPTIONS=	LIBNOTIFY "Enable libnotify support" on \
-		DBUS "Enable dbus support" on \
-		GNUTLS "Enable SSL/HTTPS support" on \
-		GTKHTML "Use GtkHtml for rendering" on \
-		WEBKIT "Use Webkit for rendering" off
-#		XULRUNNER "Use Xulrunner for rendering" off
+OPTIONS=	LIBNOTIFY "Enable libnotify support" on
 
 .include <bsd.port.pre.mk>
 
@@ -45,44 +40,4 @@ LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
 PLIST_SUB+=	NOTIFY=""
 .endif
 
-.ifdef WITHOUT_GNUTLS
-CONFIGURE_ARGS+=--disable-gnutls
-.else
-LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
-.endif
-
-.ifdef WITH_GTKHTML
-USE_GNOME+=	libgtkhtml
-CONFIGURE_ARGS+=--enable-gtkhtml2
-PLIST_SUB+=	GTKHTML=""
-.else
-CONFIGURE_ARGS+=--disable-gtkhtml2
-PLIST_SUB+=	GTKHTML="@comment "
-.endif
-
-.ifdef WITH_WEBKIT
-LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
-CONFIGURE_ARGS+=--enable-webkit
-PLIST_SUB+=	WEBKIT=""
-.else
-CONFIGURE_ARGS+=--disable-webkit
-PLIST_SUB+=	WEBKIT="@comment "
-.endif
-
-.ifdef WITH_XULRUNNER
-CONFIGURE_ARGS+=--with-gecko=libxul
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libxul/libxul.so:${PORTSDIR}/www/libxul
-RUN_DEPENDS+=	${LOCALBASE}/lib/libxul/libxul.so:${PORTSDIR}/www/libxul
-PLIST_SUB+=	XUL=""
-.else
-CONFIGURE_ARGS+=--disable-gecko
-PLIST_SUB+=	XUL="@comment "
-.endif
-
-.ifdef WITHOUT_DBUS
-CONFIGURE_ARGS+=--disable-dbus
-.else
-LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index 59d76eac13dd..cdf76a8b038d 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,3 +1,3 @@
-MD5 (liferea-1.4.28.tar.gz) = 411bd9e56a648056cdce96dbea104c3e
-SHA256 (liferea-1.4.28.tar.gz) = d39abe7d9651783f4ecd59a0f6c5e2650f32df834e0e742a6b5d003795913fd6
-SIZE (liferea-1.4.28.tar.gz) = 1697036
+MD5 (liferea-1.6.1.tar.gz) = ff760f3b5937713e8bb5ce543c7cbb31
+SHA256 (liferea-1.6.1.tar.gz) = 78669aeacec47b645767892fde67b85a9caf23f9a23207a2acf49e1cfa3c3299
+SIZE (liferea-1.6.1.tar.gz) = 1744806
diff --git a/net/liferea/files/patch-src-Makefile.in b/net/liferea/files/patch-src-Makefile.in
deleted file mode 100644
index 8fc03294870c..000000000000
--- a/net/liferea/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.in.orig	2008-12-03 10:17:44.000000000 +0100
-+++ src/Makefile.in	2008-12-03 10:18:37.000000000 +0100
-@@ -302,7 +302,8 @@
- top_srcdir = @top_srcdir@
- @WITH_GTKHTML2_TRUE@GTKHTML2 = gtkhtml2
- @WITH_WEBKIT_TRUE@WEBKIT = webkit
--SUBDIRS = net parsers notification ui fl_sources scripting . $(GTKHTML2) $(WEBKIT) mozilla
-+@WITH_MOZILLA_TRUE@MOZILLA = mozilla
-+SUBDIRS = net parsers notification ui fl_sources scripting . $(GTKHTML2) $(WEBKIT) $(MOZILLA)
- AM_CPPFLAGS = \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- 	-DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index 28b87c0dbe4c..f8c1c2143de7 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -1,20 +1,16 @@
 bin/liferea
 bin/liferea-add-feed
-bin/liferea-bin
-%%GTKHTML%%lib/liferea/liblihtmlg.la
-%%GTKHTML%%lib/liferea/liblihtmlg.so
-%%WEBKIT%%lib/liferea/liblihtmlw.la
-%%WEBKIT%%lib/liferea/liblihtmlw.so
-@comment %%XUL%%lib/liferea/liblihtmlx.la
-@comment %%XUL%%lib/liferea/liblihtmlx.so
 %%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
 share/liferea/node_source.glade
 share/liferea/opml_source.glade
+share/liferea/simple_subscription.glade
 share/liferea/css/adblock.css
 share/liferea/css/liferea.css
 share/liferea/doc/html/about_de.html
@@ -25,33 +21,33 @@ share/liferea/doc/html/enclosures_de.html
 share/liferea/doc/html/enclosures_en.html
 share/liferea/doc/html/faq_de.html
 share/liferea/doc/html/faq_en.html
-share/liferea/doc/html/faq_ja.html
 share/liferea/doc/html/folders_de.html
 share/liferea/doc/html/folders_en.html
+share/liferea/doc/html/greader_de.html
+share/liferea/doc/html/greader_en.html
 share/liferea/doc/html/headlines_de.html
 share/liferea/doc/html/headlines_en.html
 share/liferea/doc/html/help_feed_default.png
 share/liferea/doc/html/help_feed_error.png
-share/liferea/doc/html/help_feed_prop_adv_1.4.0.png
-share/liferea/doc/html/help_feed_prop_cache_1.4.0.png
-share/liferea/doc/html/help_feed_prop_downl_1.4.0.png
-share/liferea/doc/html/help_feed_prop_general_1.4.0.png
-share/liferea/doc/html/help_feed_prop_source_1.4.0.png
+share/liferea/doc/html/help_feed_prop_adv_1.6.0.png
+share/liferea/doc/html/help_feed_prop_cache_1.6.0.png
+share/liferea/doc/html/help_feed_prop_downl_1.6.0.png
+share/liferea/doc/html/help_feed_prop_general_1.6.0.png
+share/liferea/doc/html/help_feed_prop_source_1.6.0.png
 share/liferea/doc/html/help_folder.png
 share/liferea/doc/html/help_item_flag.png
 share/liferea/doc/html/help_item_unread.png
 share/liferea/doc/html/help_opml.png
-share/liferea/doc/html/help_prefs_browser_1.4.0.png
-share/liferea/doc/html/help_prefs_enclosures_1.4.0.png
-share/liferea/doc/html/help_prefs_feeds_1.4.0.png
-share/liferea/doc/html/help_prefs_folders_1.4.0.png
-share/liferea/doc/html/help_prefs_gui_1.4.0.png
-share/liferea/doc/html/help_prefs_headlines_1.4.0.png
-share/liferea/doc/html/help_prefs_proxy_1.4.0.png
-share/liferea/doc/html/help_search_1.4.0.png
-share/liferea/doc/html/help_source_add_1.4.0.png
-share/liferea/doc/html/help_subscribe_1.4.0.png
-share/liferea/doc/html/help_vfolder_1.4.0.png
+share/liferea/doc/html/help_prefs_browser_1.6.0.png
+share/liferea/doc/html/help_prefs_enclosures_1.6.0.png
+share/liferea/doc/html/help_prefs_feeds_1.6.0.png
+share/liferea/doc/html/help_prefs_folders_1.6.0.png
+share/liferea/doc/html/help_prefs_gui_1.6.0.png
+share/liferea/doc/html/help_prefs_headlines_1.6.0.png
+share/liferea/doc/html/help_prefs_proxy_1.6.0.png
+share/liferea/doc/html/help_search_1.6.0.png
+share/liferea/doc/html/help_subscribe_1.6.0.png
+share/liferea/doc/html/help_vfolder_1.6.0.png
 share/liferea/doc/html/newsbin_de.html
 share/liferea/doc/html/newsbin_en.html
 share/liferea/doc/html/preferences_de.html
@@ -59,20 +55,15 @@ share/liferea/doc/html/preferences_en.html
 share/liferea/doc/html/reference.css
 share/liferea/doc/html/reference_de.html
 share/liferea/doc/html/reference_en.html
-share/liferea/doc/html/reference_ja.html
-share/liferea/doc/html/reference_nl.html
 share/liferea/doc/html/searching_de.html
 share/liferea/doc/html/searching_en.html
 share/liferea/doc/html/subscriptions_de.html
 share/liferea/doc/html/subscriptions_en.html
 share/liferea/doc/html/topics_de.html
 share/liferea/doc/html/topics_en.html
-share/liferea/doc/html/topics_ja.html
 share/liferea/doc/html/updating_de.html
 share/liferea/doc/html/updating_en.html
 share/liferea/dtd/html.ent
-share/liferea/media/xspf_license.txt
-share/liferea/media/xspf_player_slim.swf
 share/liferea/opml/feedlist.opml
 share/liferea/opml/feedlist_bg.opml
 share/liferea/opml/feedlist_ca.opml
@@ -80,6 +71,7 @@ share/liferea/opml/feedlist_de.opml
 share/liferea/opml/feedlist_es.opml
 share/liferea/opml/feedlist_eu.opml
 share/liferea/opml/feedlist_fr.opml
+share/liferea/opml/feedlist_it.opml
 share/liferea/opml/feedlist_nl.opml
 share/liferea/opml/feedlist_pl.opml
 share/liferea/opml/feedlist_pt.opml
@@ -87,7 +79,6 @@ share/liferea/opml/feedlist_pt_BR.opml
 share/liferea/opml/feedlist_ru.opml
 share/liferea/opml/feedlist_sk.opml
 share/liferea/opml/feedlist_sv.opml
-share/liferea/opml/feedlist_tr.opml
 share/liferea/pixmaps/arrow.png
 share/liferea/pixmaps/attachment.png
 share/liferea/pixmaps/available.png
@@ -103,12 +94,9 @@ share/liferea/pixmaps/fl_bloglines.png
 share/liferea/pixmaps/fl_google.png
 share/liferea/pixmaps/fl_opml.png
 share/liferea/pixmaps/flag.png
+share/liferea/pixmaps/folder_empty.png
 share/liferea/pixmaps/grayflag.png
-share/liferea/pixmaps/liferea.png
 share/liferea/pixmaps/newsbin.png
-share/liferea/pixmaps/ocs.png
-share/liferea/pixmaps/offline.png
-share/liferea/pixmaps/online.png
 share/liferea/pixmaps/read.xpm
 share/liferea/pixmaps/tag.png
 share/liferea/pixmaps/technorati.png
@@ -127,31 +115,43 @@ share/liferea/xslt/source.xml
 share/liferea/xslt/source.xml.in
 share/liferea/xslt/vfolder.xml
 share/liferea/xslt/vfolder.xml.in
+share/icons/hicolor/16x16/apps/liferea.png
+share/icons/hicolor/22x22/apps/liferea.png
+share/icons/hicolor/24x24/apps/liferea.png
+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/be@latin/LC_MESSAGES/liferea.mo
+share/locale/bg/LC_MESSAGES/liferea.mo
 share/locale/ca/LC_MESSAGES/liferea.mo
 share/locale/cs/LC_MESSAGES/liferea.mo
 share/locale/de/LC_MESSAGES/liferea.mo
 share/locale/el/LC_MESSAGES/liferea.mo
 share/locale/es/LC_MESSAGES/liferea.mo
 share/locale/eu/LC_MESSAGES/liferea.mo
+share/locale/fi/LC_MESSAGES/liferea.mo
 share/locale/fr/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
+share/locale/ko/LC_MESSAGES/liferea.mo
+share/locale/mk/LC_MESSAGES/liferea.mo
+share/locale/nl/LC_MESSAGES/liferea.mo
 share/locale/pl/LC_MESSAGES/liferea.mo
 share/locale/pt/LC_MESSAGES/liferea.mo
 share/locale/pt_BR/LC_MESSAGES/liferea.mo
+share/locale/ro/LC_MESSAGES/liferea.mo
 share/locale/ru/LC_MESSAGES/liferea.mo
 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/zh_CN/LC_MESSAGES/liferea.mo
+share/locale/zh_TW/LC_MESSAGES/liferea.mo
 @dirrm share/liferea/xslt
 @dirrm share/liferea/pixmaps
 @dirrm share/liferea/opml
-@dirrm share/liferea/media
 @dirrm share/liferea/dtd
 @dirrm share/liferea/doc/html
 @dirrm share/liferea/doc