- Update to 0.6.1

- Simplify dependencies, update gconf handling to new scheme, scrape pkg-message

Approved by:	perky (maintainer)

4 files changed, 10 insertions, 25 deletions

diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 56f98e564f3..8b291d7cd74 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liferea
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	liferea
@@ -20,8 +20,7 @@ RUN_DEPENDS=	mozilla:${PORTSDIR}/www/mozilla
 .endif
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gconf2 libxml2 libgtkhtml \
-		gnomevfs2
+USE_GNOME=	gnomeprefix gnomehack libgtkhtml
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
@@ -43,7 +42,4 @@ post-patch:
 		${WRKSRC}/configure
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index 6a0908f8c32..8a6fd59edf8 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,2 +1,2 @@
-MD5 (liferea-0.6.0.tar.gz) = efdfcdd96d91696d26f9382fd0bd7c68
-SIZE (liferea-0.6.0.tar.gz) = 1001195
+MD5 (liferea-0.6.1.tar.gz) = a9a03cdeeb2a57c96dd8e7718917e787
+SIZE (liferea-0.6.1.tar.gz) = 1032988
diff --git a/net/liferea/pkg-message b/net/liferea/pkg-message
deleted file mode 100644
index 1fa577d27ec..00000000000
--- a/net/liferea/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-NOTE THAT 0.4.8 BREAKS DOWNWARD COMPATIBILITY.
-
-When upgrading to 0.4.8 the cache directory structure and the save mechanism
-of the feed list will be changed. After the automatic conversion older
-versions of Liferea cannot read the cache anymore and the won't see the
-converted feed list anymore. To be prepared for problems please export the
-feed list using the older version of Liferea! In case of problems you can
-reinstall the older version and import the backup feed list.
-##
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index c9ac7acae0c..873daf4b493 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -1,21 +1,21 @@
 bin/liferea
 bin/liferea-bin
-etc/gconf/gconf.xml.defaults/apps/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/liferea/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/liferea/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/liferea.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/liferea.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/liferea.schemas > /dev/null || /usr/bin/true
 lib/liferea/liblihtmlg.so
 %%MOZ%%lib/liferea/liblihtmlm.so
 share/gnome/applications/liferea.desktop
 share/gnome/liferea/css/liferea.css
+share/gnome/liferea/css/liferea2.css
 share/gnome/liferea/opml/feedlist.opml
 share/gnome/liferea/opml/feedlist_de.opml
 share/gnome/liferea/opml/feedlist_es.opml
 share/gnome/liferea/opml/feedlist_fr.opml
+share/gnome/liferea/opml/feedlist_sk.opml
 share/gnome/liferea/pixmaps/available.png
 share/gnome/liferea/pixmaps/directory.png
+share/gnome/liferea/pixmaps/edit.png
 share/gnome/liferea/pixmaps/empty.png
 share/gnome/liferea/pixmaps/flag.png
 share/gnome/liferea/pixmaps/liferea.png
@@ -23,6 +23,7 @@ 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/technorati.png
 share/gnome/liferea/pixmaps/unread.png
 share/gnome/liferea/pixmaps/vfolder.png
 share/gnome/pixmaps/liferea.png
@@ -43,5 +44,3 @@ share/locale/zh_TW/LC_MESSAGES/liferea.mo
 @dirrm share/gnome/liferea/css
 @dirrm share/gnome/liferea
 @dirrm lib/liferea
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/liferea
-@dirrm etc/gconf/gconf.xml.defaults/apps/liferea