3 files changed, 77 insertions, 55 deletions

diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index ac24be8add4a..edc4f969b778 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liferea
-PORTVERSION=	1.0.27
+PORTVERSION=	1.2.0
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	liferea
@@ -25,21 +25,38 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=		liferea.1
 GCONF_SCHEMAS=	liferea.schemas
+INSTALLS_ICONS=	yes
 
-OPTIONS=	DBUS "Enable dbus support" on \
+OPTIONS=	LIBNOTIFY "Enable libnotify support" on \
+		DBUS "Enable dbus support" on \
+		GNUTLS "Enable SSL/HTTPS support" on \
 		XPI "Firefox extension to subscribe feeds (req. dbus)" off \
 		MOZILLA "Use Mozilla for rendering" off \
 		XULRUNNER "Use Xulrunner for rendering" off
 
 .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
+
+.ifdef WITHOUT_GNUTLS
+CONFIGURE_ARGS+=--disable-gnutls
+.else
+LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
+.endif
+
 .ifdef WITH_MOZILLA
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 CONFIGURE_ARGS+=--enable-gecko=${GECKO}
-PLIST_SUB=	MOZ=""
+PLIST_SUB+=	MOZ=""
 .else
 CONFIGURE_ARGS+=--disable-gecko
-PLIST_SUB=	MOZ="@comment "
+PLIST_SUB+=	MOZ="@comment "
 .endif
 
 .ifdef WITH_XPI
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index 0f9dc074d59f..95d72292438e 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,3 +1,3 @@
-MD5 (liferea-1.0.27.tar.gz) = af0a43286d4a3362b526c89826e7f851
-SHA256 (liferea-1.0.27.tar.gz) = e836d2620c008334cd6ade11676d954690e4908c564a38a5e1cec00dd48efa49
-SIZE (liferea-1.0.27.tar.gz) = 1572604
+MD5 (liferea-1.2.0.tar.gz) = 02b95014baba4725b02895074cc4f25e
+SHA256 (liferea-1.2.0.tar.gz) = aaf607fea8db256adce02a8bcc032f90d7491bf2ca74d0579331bc08d293c22d
+SIZE (liferea-1.2.0.tar.gz) = 1307305
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index 94c9fe82d478..bb3d0e436867 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -9,12 +9,19 @@ lib/liferea/liblihtmlg.so
 %%MOZ%%lib/liferea/liblihtmlm.so
 %%XUL%%lib/liferea/liblihtmlx.la
 %%XUL%%lib/liferea/liblihtmlx.so
+%%NOTIFY%%lib/liferea/liblinotiflibnotify.la
+%%NOTIFY%%lib/liferea/liblinotiflibnotify.so
+%%NOTIFY%%lib/liferea/liblinotiflibnotify.so.0
+%%NOTIFY%%lib/liferea/liblinotifpopup.la
+%%NOTIFY%%lib/liferea/liblinotifpopup.so
+%%NOTIFY%%lib/liferea/liblinotifpopup.so.0
 share/gnome/applications/liferea.desktop
 share/gnome/liferea/css/adblock.css
 share/gnome/liferea/css/liferea.css
-share/gnome/liferea/css/liferea2.css
 share/gnome/liferea/doc/html/about_de.html
 share/gnome/liferea/doc/html/about_en.html
+share/gnome/liferea/doc/html/concepts_de.html
+share/gnome/liferea/doc/html/concepts_en.html
 share/gnome/liferea/doc/html/enclosures_de.html
 share/gnome/liferea/doc/html/enclosures_en.html
 share/gnome/liferea/doc/html/faq_de.html
@@ -24,25 +31,27 @@ share/gnome/liferea/doc/html/folders_de.html
 share/gnome/liferea/doc/html/folders_en.html
 share/gnome/liferea/doc/html/headlines_de.html
 share/gnome/liferea/doc/html/headlines_en.html
-share/gnome/liferea/doc/html/help_feed_available.png
+share/gnome/liferea/doc/html/help_feed_default.png
 share/gnome/liferea/doc/html/help_feed_error.png
-share/gnome/liferea/doc/html/help_feed_ocs.png
-share/gnome/liferea/doc/html/help_feed_prop_auth_1.0.0.png
-share/gnome/liferea/doc/html/help_feed_prop_cache_1.0.0.png
-share/gnome/liferea/doc/html/help_feed_prop_enclosures_1.0.0.png
-share/gnome/liferea/doc/html/help_feed_prop_general_1.0.0.png
-share/gnome/liferea/doc/html/help_feed_prop_source_1.0.0.png
+share/gnome/liferea/doc/html/help_feed_prop_adv_1.2.0.png
+share/gnome/liferea/doc/html/help_feed_prop_cache_1.2.0.png
+share/gnome/liferea/doc/html/help_feed_prop_downl_1.2.0.png
+share/gnome/liferea/doc/html/help_feed_prop_general_1.2.0.png
+share/gnome/liferea/doc/html/help_feed_prop_source_1.2.0.png
+share/gnome/liferea/doc/html/help_folder.png
 share/gnome/liferea/doc/html/help_item_flag.png
-share/gnome/liferea/doc/html/help_prefs_browser_1.0.0.png
-share/gnome/liferea/doc/html/help_prefs_enclosures_1.0.0.png
-share/gnome/liferea/doc/html/help_prefs_feeds_1.0.0.png
-share/gnome/liferea/doc/html/help_prefs_folders_1.0.0.png
-share/gnome/liferea/doc/html/help_prefs_gui_1.0.0.png
-share/gnome/liferea/doc/html/help_prefs_headlines_1.0.0.png
-share/gnome/liferea/doc/html/help_prefs_proxy_1.0.0.png
-share/gnome/liferea/doc/html/help_search_1.0.0.png
-share/gnome/liferea/doc/html/help_subscribe_1.0.0.png
-share/gnome/liferea/doc/html/help_vfolder_1.0.0.png
+share/gnome/liferea/doc/html/help_item_unread.png
+share/gnome/liferea/doc/html/help_opml.png
+share/gnome/liferea/doc/html/help_prefs_browser_1.2.0.png
+share/gnome/liferea/doc/html/help_prefs_enclosures_1.2.0.png
+share/gnome/liferea/doc/html/help_prefs_feeds_1.2.0.png
+share/gnome/liferea/doc/html/help_prefs_folders_1.2.0.png
+share/gnome/liferea/doc/html/help_prefs_gui_1.2.0.png
+share/gnome/liferea/doc/html/help_prefs_headlines_1.2.0.png
+share/gnome/liferea/doc/html/help_prefs_proxy_1.2.0.png
+share/gnome/liferea/doc/html/help_search_1.2.0.png
+share/gnome/liferea/doc/html/help_subscribe_1.2.0.png
+share/gnome/liferea/doc/html/help_vfolder_1.2.0.png
 share/gnome/liferea/doc/html/preferences_de.html
 share/gnome/liferea/doc/html/preferences_en.html
 share/gnome/liferea/doc/html/reference.css
@@ -60,6 +69,8 @@ share/gnome/liferea/doc/html/topics_ja.html
 share/gnome/liferea/doc/html/updating_de.html
 share/gnome/liferea/doc/html/updating_en.html
 share/gnome/liferea/dtd/html.ent
+share/gnome/liferea/media/xspf_license.txt
+share/gnome/liferea/media/xspf_player_slim.swf
 share/gnome/liferea/opml/feedlist.opml
 share/gnome/liferea/opml/feedlist_de.opml
 share/gnome/liferea/opml/feedlist_es.opml
@@ -68,44 +79,54 @@ share/gnome/liferea/opml/feedlist_nl.opml
 share/gnome/liferea/opml/feedlist_pl.opml
 share/gnome/liferea/opml/feedlist_sk.opml
 share/gnome/liferea/pixmaps/arrow.png
+share/gnome/liferea/pixmaps/attachment.png
 share/gnome/liferea/pixmaps/available.png
 share/gnome/liferea/pixmaps/available_offline.png
+share/gnome/liferea/pixmaps/bookmark.png
+share/gnome/liferea/pixmaps/comments.png
+share/gnome/liferea/pixmaps/default.png
 share/gnome/liferea/pixmaps/directory.png
 share/gnome/liferea/pixmaps/edit.png
 share/gnome/liferea/pixmaps/empty.png
 share/gnome/liferea/pixmaps/empty_offline.png
+share/gnome/liferea/pixmaps/fl_opml.png
 share/gnome/liferea/pixmaps/flag.png
+share/gnome/liferea/pixmaps/grayflag.png
 share/gnome/liferea/pixmaps/liferea.png
+share/gnome/liferea/pixmaps/newsbin.png
 share/gnome/liferea/pixmaps/ocs.png
 share/gnome/liferea/pixmaps/offline.png
 share/gnome/liferea/pixmaps/online.png
 share/gnome/liferea/pixmaps/read.xpm
+share/gnome/liferea/pixmaps/tag.png
 share/gnome/liferea/pixmaps/technorati.png
 share/gnome/liferea/pixmaps/unread.png
 share/gnome/liferea/pixmaps/vfolder.png
-share/gnome/pixmaps/liferea.png
-share/locale/bg/LC_MESSAGES/liferea.mo
-share/locale/ca/LC_MESSAGES/liferea.mo
-share/locale/cs/LC_MESSAGES/liferea.mo
+share/gnome/liferea/xslt/feed.xml
+share/gnome/liferea/xslt/feed.xml.in
+share/gnome/liferea/xslt/folder.xml
+share/gnome/liferea/xslt/folder.xml.in
+share/gnome/liferea/xslt/item.xml
+share/gnome/liferea/xslt/item.xml.in
+share/gnome/liferea/xslt/i18n-filter.xslt
+share/gnome/liferea/xslt/newsbin.xml
+share/gnome/liferea/xslt/newsbin.xml.in
+share/gnome/liferea/xslt/source.xml
+share/gnome/liferea/xslt/source.xml.in
+share/gnome/liferea/xslt/vfolder.xml
+share/gnome/liferea/xslt/vfolder.xml.in
+share/icons/hicolor/48x48/apps/liferea.png
 share/locale/de/LC_MESSAGES/liferea.mo
 share/locale/es/LC_MESSAGES/liferea.mo
-share/locale/fi/LC_MESSAGES/liferea.mo
 share/locale/fr/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_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/sv/LC_MESSAGES/liferea.mo
-share/locale/zh_CN/LC_MESSAGES/liferea.mo
-share/locale/zh_TW/LC_MESSAGES/liferea.mo
+@dirrm share/gnome/liferea/xslt
 @dirrm share/gnome/liferea/pixmaps
 @dirrm share/gnome/liferea/opml
+@dirrm share/gnome/liferea/media
 @dirrm share/gnome/liferea/dtd
 @dirrm share/gnome/liferea/doc/html
 @dirrm share/gnome/liferea/doc
@@ -114,21 +135,5 @@ share/locale/zh_TW/LC_MESSAGES/liferea.mo
 @dirrm lib/liferea
 %%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome
 %%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
 @dirrmtry share/locale/pl/LC_MESSAGES
 @dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca