update to 1.2.4

This switches to the new stable branch, too many changes to list here.

3 files changed, 65 insertions, 42 deletions

diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 4ccf8317cc2..a39bcf1c88e 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2006/12/08 19:40:39 drochner Exp $
+# $NetBSD: Makefile,v 1.50 2007/01/23 18:23:08 drochner Exp $
 
-DISTNAME=		liferea-1.0.27
+DISTNAME=		liferea-1.2.4
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
@@ -10,7 +10,7 @@ COMMENT=		Simple FeedReader clone for reading RSS/RDF feeds
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		gmake pkg-config msgfmt perl
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -22,6 +22,9 @@ GCONF2_SCHEMAS=		liferea.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../www/libgtkhtml/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/liferea/PLIST b/www/liferea/PLIST
index a2a4b5351f2..7085d1397e2 100644
--- a/www/liferea/PLIST
+++ b/www/liferea/PLIST
@@ -1,16 +1,20 @@
-@comment $NetBSD: PLIST,v 1.18 2006/07/04 16:22:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.19 2007/01/23 18:23:08 drochner Exp $
 bin/liferea
 bin/liferea-add-feed
 bin/liferea-bin
 lib/liferea/liblihtmlg.la
+lib/liferea/liblinotifpopup.la
 man/man1/liferea.1
+man/pl/man1/liferea.1
 share/applications/liferea.desktop
 share/gconf/schemas/liferea.schemas
+share/icons/hicolor/48x48/apps/liferea.png
 share/liferea/css/adblock.css
 share/liferea/css/liferea.css
-share/liferea/css/liferea2.css
 share/liferea/doc/html/about_de.html
 share/liferea/doc/html/about_en.html
+share/liferea/doc/html/concepts_de.html
+share/liferea/doc/html/concepts_en.html
 share/liferea/doc/html/enclosures_de.html
 share/liferea/doc/html/enclosures_en.html
 share/liferea/doc/html/faq_de.html
@@ -20,25 +24,27 @@ share/liferea/doc/html/folders_de.html
 share/liferea/doc/html/folders_en.html
 share/liferea/doc/html/headlines_de.html
 share/liferea/doc/html/headlines_en.html
-share/liferea/doc/html/help_feed_available.png
+share/liferea/doc/html/help_feed_default.png
 share/liferea/doc/html/help_feed_error.png
-share/liferea/doc/html/help_feed_ocs.png
-share/liferea/doc/html/help_feed_prop_auth_1.0.0.png
-share/liferea/doc/html/help_feed_prop_cache_1.0.0.png
-share/liferea/doc/html/help_feed_prop_enclosures_1.0.0.png
-share/liferea/doc/html/help_feed_prop_general_1.0.0.png
-share/liferea/doc/html/help_feed_prop_source_1.0.0.png
+share/liferea/doc/html/help_feed_prop_adv_1.2.0.png
+share/liferea/doc/html/help_feed_prop_cache_1.2.0.png
+share/liferea/doc/html/help_feed_prop_downl_1.2.0.png
+share/liferea/doc/html/help_feed_prop_general_1.2.0.png
+share/liferea/doc/html/help_feed_prop_source_1.2.0.png
+share/liferea/doc/html/help_folder.png
 share/liferea/doc/html/help_item_flag.png
-share/liferea/doc/html/help_prefs_browser_1.0.0.png
-share/liferea/doc/html/help_prefs_enclosures_1.0.0.png
-share/liferea/doc/html/help_prefs_feeds_1.0.0.png
-share/liferea/doc/html/help_prefs_folders_1.0.0.png
-share/liferea/doc/html/help_prefs_gui_1.0.0.png
-share/liferea/doc/html/help_prefs_headlines_1.0.0.png
-share/liferea/doc/html/help_prefs_proxy_1.0.0.png
-share/liferea/doc/html/help_search_1.0.0.png
-share/liferea/doc/html/help_subscribe_1.0.0.png
-share/liferea/doc/html/help_vfolder_1.0.0.png
+share/liferea/doc/html/help_item_unread.png
+share/liferea/doc/html/help_opml.png
+share/liferea/doc/html/help_prefs_browser_1.2.0.png
+share/liferea/doc/html/help_prefs_enclosures_1.2.0.png
+share/liferea/doc/html/help_prefs_feeds_1.2.0.png
+share/liferea/doc/html/help_prefs_folders_1.2.0.png
+share/liferea/doc/html/help_prefs_gui_1.2.0.png
+share/liferea/doc/html/help_prefs_headlines_1.2.0.png
+share/liferea/doc/html/help_prefs_proxy_1.2.0.png
+share/liferea/doc/html/help_search_1.2.0.png
+share/liferea/doc/html/help_subscribe_1.2.0.png
+share/liferea/doc/html/help_vfolder_1.2.0.png
 share/liferea/doc/html/preferences_de.html
 share/liferea/doc/html/preferences_en.html
 share/liferea/doc/html/reference.css
@@ -56,6 +62,8 @@ 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_de.opml
 share/liferea/opml/feedlist_es.opml
@@ -64,50 +72,62 @@ share/liferea/opml/feedlist_nl.opml
 share/liferea/opml/feedlist_pl.opml
 share/liferea/opml/feedlist_sk.opml
 share/liferea/pixmaps/arrow.png
+share/liferea/pixmaps/attachment.png
 share/liferea/pixmaps/available.png
 share/liferea/pixmaps/available_offline.png
+share/liferea/pixmaps/bookmark.png
+share/liferea/pixmaps/comments.png
+share/liferea/pixmaps/default.png
 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_opml.png
 share/liferea/pixmaps/flag.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
 share/liferea/pixmaps/unread.png
 share/liferea/pixmaps/vfolder.png
-share/locale/bg/LC_MESSAGES/liferea.mo
-share/locale/ca/LC_MESSAGES/liferea.mo
-share/locale/cs/LC_MESSAGES/liferea.mo
+share/liferea/xslt/feed.xml
+share/liferea/xslt/feed.xml.in
+share/liferea/xslt/folder.xml
+share/liferea/xslt/folder.xml.in
+share/liferea/xslt/i18n-filter.xslt
+share/liferea/xslt/item.xml
+share/liferea/xslt/item.xml.in
+share/liferea/xslt/newsbin.xml
+share/liferea/xslt/newsbin.xml.in
+share/liferea/xslt/source.xml
+share/liferea/xslt/source.xml.in
+share/liferea/xslt/vfolder.xml
+share/liferea/xslt/vfolder.xml.in
+share/locale/ar/LC_MESSAGES/liferea.mo
 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
-share/pixmaps/liferea.png
-@comment in xdg-dirs: @dirrm share/pixmaps
+share/locale/tr/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
-@dirrm share/liferea/opml
 @dirrm share/liferea/css
 @dirrm share/liferea
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @comment in GConf2: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/liferea
diff --git a/www/liferea/distinfo b/www/liferea/distinfo
index 3d9ca1c648b..6dbaa169b7a 100644
--- a/www/liferea/distinfo
+++ b/www/liferea/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.31 2006/12/08 19:40:39 drochner Exp $
+$NetBSD: distinfo,v 1.32 2007/01/23 18:23:08 drochner Exp $
 
-SHA1 (liferea-1.0.27.tar.gz) = 42a2cf303c0a7d432339f6e6ffa335bd7cbb982d
-RMD160 (liferea-1.0.27.tar.gz) = 091ecce2c12e25fb6f9b7f1e89c1e8e8c56a5453
-Size (liferea-1.0.27.tar.gz) = 1572604 bytes
+SHA1 (liferea-1.2.4.tar.gz) = ad6ea9ddc49ade78e8a41d99cc74deb3f1778e77
+RMD160 (liferea-1.2.4.tar.gz) = 206daa8aea6f1ecfcfd6b43632164ffa79769349
+Size (liferea-1.2.4.tar.gz) = 1347546 bytes