update to 1.8.9

this switches to the 1.8 release branch

4 files changed, 20 insertions, 67 deletions

diff --git a/www/liferea-current/Makefile b/www/liferea-current/Makefile
index 76199e223f4..1345a093290 100644
--- a/www/liferea-current/Makefile
+++ b/www/liferea-current/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2012/10/08 23:02:33 adam Exp $
+# $NetBSD: Makefile,v 1.37 2012/10/11 15:35:28 drochner Exp $
 
-DISTNAME=		liferea-1.6.8
-PKGREVISION=		7
+DISTNAME=		liferea-1.8.9
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
@@ -26,9 +25,7 @@ GCONF_SCHEMAS=		liferea.schemas
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
@@ -36,4 +33,6 @@ GCONF_SCHEMAS=		liferea.schemas
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
+.include "../../textproc/json-glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/liferea-current/PLIST b/www/liferea-current/PLIST
index 27b6937c420..0c03e5508ca 100644
--- a/www/liferea-current/PLIST
+++ b/www/liferea-current/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2011/11/30 10:50:08 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/10/11 15:35:28 drochner Exp $
 bin/liferea
 bin/liferea-add-feed
-lib/liferea/liblinotiflibnotify.la
 man/man1/liferea.1
 man/pl/man1/liferea.1
 share/applications/liferea.desktop
@@ -12,9 +11,10 @@ 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/liferea/auth.glade
+share/liferea/auth.ui
 share/liferea/css/adblock.css
 share/liferea/css/liferea.css
+share/liferea/css/user.css
 share/liferea/doc/html/about_de.html
 share/liferea/doc/html/about_en.html
 share/liferea/doc/html/concepts_de.html
@@ -66,19 +66,20 @@ share/liferea/doc/html/topics_en.html
 share/liferea/doc/html/updating_de.html
 share/liferea/doc/html/updating_en.html
 share/liferea/dtd/html.ent
-share/liferea/google_source.glade
-share/liferea/liferea.glade
-share/liferea/new_subscription.glade
-share/liferea/node_source.glade
-share/liferea/opml/feedlist.opml
+share/liferea/google_source.ui
+share/liferea/liferea.ui
+share/liferea/new_subscription.ui
+share/liferea/node_source.ui
 share/liferea/opml/feedlist_bg.opml
 share/liferea/opml/feedlist_ca.opml
 share/liferea/opml/feedlist_de.opml
+share/liferea/opml/feedlist_en.opml
 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_hu.opml
 share/liferea/opml/feedlist_it.opml
 share/liferea/opml/feedlist_nl.opml
 share/liferea/opml/feedlist_pl.opml
@@ -87,8 +88,7 @@ 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_source.glade
-share/liferea/pixmaps/arrow.png
+share/liferea/opml_source.ui
 share/liferea/pixmaps/attachment.png
 share/liferea/pixmaps/available.png
 share/liferea/pixmaps/available_offline.png
@@ -96,34 +96,23 @@ 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_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/newsbin.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/liferea/simple_subscription.glade
+share/liferea/simple_subscription.ui
+share/liferea/ttrss_source.ui
 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/ast/LC_MESSAGES/liferea.mo
 share/locale/be@latin/LC_MESSAGES/liferea.mo
diff --git a/www/liferea-current/distinfo b/www/liferea-current/distinfo
index 8d40e4330e1..f5258ddd4f3 100644
--- a/www/liferea-current/distinfo
+++ b/www/liferea-current/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.13 2012/03/21 18:35:05 drochner Exp $
+$NetBSD: distinfo,v 1.14 2012/10/11 15:35:28 drochner Exp $
 
-SHA1 (liferea-1.6.8.tar.gz) = 333faa0875d82c4a6a63193ef0e307d71a682717
-RMD160 (liferea-1.6.8.tar.gz) = 044acdc2a68fbdbfc3f635a63ab02c5d0f30e65e
-Size (liferea-1.6.8.tar.gz) = 1915635 bytes
-SHA1 (patch-ae) = ddc205f451ca9a73f773ef73509150413dfcff97
+SHA1 (liferea-1.8.9.tar.gz) = 35452b46d987ba37d5a81ea3e4c0f7199c9c0403
+RMD160 (liferea-1.8.9.tar.gz) = 5c9f3c5a32730fad43ed233ef205db828a4f937a
+Size (liferea-1.8.9.tar.gz) = 1879287 bytes
diff --git a/www/liferea-current/patches/patch-ae b/www/liferea-current/patches/patch-ae
deleted file mode 100644
index 268d8ba0389..00000000000
--- a/www/liferea-current/patches/patch-ae
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2011/07/13 20:01:40 drochner Exp $
-
---- src/common.c.orig	2011-06-22 13:25:40.000000000 +0000
-+++ src/common.c
-@@ -273,9 +273,9 @@ static const gchar *dayofweek[] = { "Sun
- static const gchar *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
- 
- gchar *createRFC822Date(const time_t *time) {
--	struct tm *tm;
-+	struct tm *tm, tmbuf;
- 
--	tm = gmtime(time); /* No need to free because it is statically allocated */
-+	tm = gmtime_r(time, &tmbuf); /* No need to free because it is statically allocated */
- 	return g_strdup_printf("%s, %2d %s %4d %02d:%02d:%02d GMT", dayofweek[tm->tm_wday], tm->tm_mday,
- 					   months[tm->tm_mon], 1900 + tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec);
- }
-@@ -374,7 +374,7 @@ static time_t common_parse_rfc822_tz(cha
- 
- /* converts a RFC822 time string to a time_t value */
- time_t parseRFC822Date(gchar *date) {
--	struct tm	tm;
-+	struct tm	tm, t2buf;
- 	time_t		t, t2;
- 	char 		*oldlocale;
- 	char		*pos;
-@@ -422,7 +422,7 @@ time_t parseRFC822Date(gchar *date) {
- 			   correction. (Usually, there is no daylight savings
- 			   time since the input is GMT.) */
- 			t = t - common_parse_rfc822_tz(pos);
--			t2 = mktime(gmtime(&t));
-+			t2 = mktime(gmtime_r(&t, &t2buf));
- 			t = t - (t2 - t);
- 			return t;
- 		} else {