Attachment 116258 Details for Bug 158178 – file.diff

[patch] file.diff

file.diff (text/plain), 10.67 KB, created by R.Mahmatkhanov on 2011-06-22 23:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R.Mahmatkhanov

Created: 2011-06-22 23:20:11 UTC

Size: 10.67 KB

patch

obsolete

>diff -ruNa liferea.orig/Makefile liferea/Makefile
>--- liferea.orig/Makefile	2011-06-22 17:12:17.000000000 +0400
>+++ liferea/Makefile	2011-06-22 22:13:10.000000000 +0400
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	liferea
> PORTVERSION=	1.6.6
>+PORTREVISION=	1
> CATEGORIES=	net gnome
> MASTER_SITES=	SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
> 
>@@ -16,15 +17,18 @@
> LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
> 		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
> 
>-USE_GNOME=	gnomeprefix gnomehack libglade2 gconf2
>+USE_GNOME=	desktopfileutils gconf2 gnomeprefix gnomehack libglade2
> USE_GMAKE=	yes
> USE_AUTOTOOLS=	libtool
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
>-		LDFLAGS="-L${LOCALBASE}/lib"
>-CONFIGURE_ARGS=	--disable-libnotify
>+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
>+CPPFLAGS+=	"-I${LOCALBASE}/include"
>+CONFIGURE_ARGS=	--disable-libnotify \
>+		--disable-nm
> MAKE_JOBS_SAFE=	yes
> 
>+LICENSE=	GPLv2
>+
> MAN1=		liferea.1
> MANLANG=	"" pl
> GCONF_SCHEMAS=	liferea.schemas
>@@ -33,4 +37,7 @@
> post-patch:
> 	@${CP} ${FILESDIR}/liferea_dbus.xml ${WRKSRC}/src
> 
>+post-install:
>+	@-update-desktop-database
>+
> .include <bsd.port.mk>
>diff -ruNa liferea.orig/pkg-plist liferea/pkg-plist
>--- liferea.orig/pkg-plist	2011-06-22 17:12:17.000000000 +0400
>+++ liferea/pkg-plist	2011-06-22 22:12:21.000000000 +0400
>@@ -1,118 +1,118 @@
> bin/liferea
> bin/liferea-add-feed
> share/applications/liferea.desktop
>-share/liferea/auth.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
>-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
>-share/liferea/doc/html/faq_en.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.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.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
>-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/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/updating_de.html
>-share/liferea/doc/html/updating_en.html
>-share/liferea/dtd/html.ent
>-share/liferea/opml/feedlist.opml
>-share/liferea/opml/feedlist_bg.opml
>-share/liferea/opml/feedlist_ca.opml
>-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_gl.opml
>-share/liferea/opml/feedlist_he.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
>-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/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_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/xslt/feed.xml
>-share/liferea/xslt/feed.xml.in
>-share/liferea/xslt/folder.xml
>-share/liferea/xslt/folder.xml.in
>-share/liferea/xslt/item.xml
>-share/liferea/xslt/item.xml.in
>-share/liferea/xslt/i18n-filter.xslt
>-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
>+%%DATADIR%%/auth.glade
>+%%DATADIR%%/google_source.glade
>+%%DATADIR%%/liferea.glade
>+%%DATADIR%%/new_subscription.glade
>+%%DATADIR%%/node_source.glade
>+%%DATADIR%%/opml_source.glade
>+%%DATADIR%%/simple_subscription.glade
>+%%DATADIR%%/css/adblock.css
>+%%DATADIR%%/css/liferea.css
>+%%DATADIR%%/doc/html/about_de.html
>+%%DATADIR%%/doc/html/about_en.html
>+%%DATADIR%%/doc/html/concepts_de.html
>+%%DATADIR%%/doc/html/concepts_en.html
>+%%DATADIR%%/doc/html/enclosures_de.html
>+%%DATADIR%%/doc/html/enclosures_en.html
>+%%DATADIR%%/doc/html/faq_de.html
>+%%DATADIR%%/doc/html/faq_en.html
>+%%DATADIR%%/doc/html/folders_de.html
>+%%DATADIR%%/doc/html/folders_en.html
>+%%DATADIR%%/doc/html/greader_de.html
>+%%DATADIR%%/doc/html/greader_en.html
>+%%DATADIR%%/doc/html/headlines_de.html
>+%%DATADIR%%/doc/html/headlines_en.html
>+%%DATADIR%%/doc/html/help_feed_default.png
>+%%DATADIR%%/doc/html/help_feed_error.png
>+%%DATADIR%%/doc/html/help_feed_prop_adv_1.6.0.png
>+%%DATADIR%%/doc/html/help_feed_prop_cache_1.6.0.png
>+%%DATADIR%%/doc/html/help_feed_prop_downl_1.6.0.png
>+%%DATADIR%%/doc/html/help_feed_prop_general_1.6.0.png
>+%%DATADIR%%/doc/html/help_feed_prop_source_1.6.0.png
>+%%DATADIR%%/doc/html/help_folder.png
>+%%DATADIR%%/doc/html/help_item_flag.png
>+%%DATADIR%%/doc/html/help_item_unread.png
>+%%DATADIR%%/doc/html/help_opml.png
>+%%DATADIR%%/doc/html/help_prefs_browser_1.6.0.png
>+%%DATADIR%%/doc/html/help_prefs_enclosures_1.6.0.png
>+%%DATADIR%%/doc/html/help_prefs_feeds_1.6.0.png
>+%%DATADIR%%/doc/html/help_prefs_folders_1.6.0.png
>+%%DATADIR%%/doc/html/help_prefs_gui_1.6.0.png
>+%%DATADIR%%/doc/html/help_prefs_headlines_1.6.0.png
>+%%DATADIR%%/doc/html/help_prefs_proxy_1.6.0.png
>+%%DATADIR%%/doc/html/help_search_1.6.0.png
>+%%DATADIR%%/doc/html/help_subscribe_1.6.0.png
>+%%DATADIR%%/doc/html/help_vfolder_1.6.0.png
>+%%DATADIR%%/doc/html/newsbin_de.html
>+%%DATADIR%%/doc/html/newsbin_en.html
>+%%DATADIR%%/doc/html/preferences_de.html
>+%%DATADIR%%/doc/html/preferences_en.html
>+%%DATADIR%%/doc/html/reference.css
>+%%DATADIR%%/doc/html/reference_de.html
>+%%DATADIR%%/doc/html/reference_en.html
>+%%DATADIR%%/doc/html/searching_de.html
>+%%DATADIR%%/doc/html/searching_en.html
>+%%DATADIR%%/doc/html/subscriptions_de.html
>+%%DATADIR%%/doc/html/subscriptions_en.html
>+%%DATADIR%%/doc/html/topics_de.html
>+%%DATADIR%%/doc/html/topics_en.html
>+%%DATADIR%%/doc/html/updating_de.html
>+%%DATADIR%%/doc/html/updating_en.html
>+%%DATADIR%%/dtd/html.ent
>+%%DATADIR%%/opml/feedlist.opml
>+%%DATADIR%%/opml/feedlist_bg.opml
>+%%DATADIR%%/opml/feedlist_ca.opml
>+%%DATADIR%%/opml/feedlist_de.opml
>+%%DATADIR%%/opml/feedlist_es.opml
>+%%DATADIR%%/opml/feedlist_eu.opml
>+%%DATADIR%%/opml/feedlist_fr.opml
>+%%DATADIR%%/opml/feedlist_gl.opml
>+%%DATADIR%%/opml/feedlist_he.opml
>+%%DATADIR%%/opml/feedlist_it.opml
>+%%DATADIR%%/opml/feedlist_nl.opml
>+%%DATADIR%%/opml/feedlist_pl.opml
>+%%DATADIR%%/opml/feedlist_pt.opml
>+%%DATADIR%%/opml/feedlist_pt_BR.opml
>+%%DATADIR%%/opml/feedlist_ru.opml
>+%%DATADIR%%/opml/feedlist_sk.opml
>+%%DATADIR%%/opml/feedlist_sv.opml
>+%%DATADIR%%/pixmaps/arrow.png
>+%%DATADIR%%/pixmaps/attachment.png
>+%%DATADIR%%/pixmaps/available.png
>+%%DATADIR%%/pixmaps/available_offline.png
>+%%DATADIR%%/pixmaps/bookmark.png
>+%%DATADIR%%/pixmaps/comments.png
>+%%DATADIR%%/pixmaps/default.png
>+%%DATADIR%%/pixmaps/directory.png
>+%%DATADIR%%/pixmaps/edit.png
>+%%DATADIR%%/pixmaps/empty.png
>+%%DATADIR%%/pixmaps/empty_offline.png
>+%%DATADIR%%/pixmaps/fl_google.png
>+%%DATADIR%%/pixmaps/fl_opml.png
>+%%DATADIR%%/pixmaps/flag.png
>+%%DATADIR%%/pixmaps/folder_empty.png
>+%%DATADIR%%/pixmaps/grayflag.png
>+%%DATADIR%%/pixmaps/newsbin.png
>+%%DATADIR%%/pixmaps/read.xpm
>+%%DATADIR%%/pixmaps/tag.png
>+%%DATADIR%%/pixmaps/technorati.png
>+%%DATADIR%%/pixmaps/unread.png
>+%%DATADIR%%/pixmaps/vfolder.png
>+%%DATADIR%%/xslt/feed.xml
>+%%DATADIR%%/xslt/feed.xml.in
>+%%DATADIR%%/xslt/folder.xml
>+%%DATADIR%%/xslt/folder.xml.in
>+%%DATADIR%%/xslt/item.xml
>+%%DATADIR%%/xslt/item.xml.in
>+%%DATADIR%%/xslt/i18n-filter.xslt
>+%%DATADIR%%/xslt/newsbin.xml
>+%%DATADIR%%/xslt/newsbin.xml.in
>+%%DATADIR%%/xslt/source.xml
>+%%DATADIR%%/xslt/source.xml.in
>+%%DATADIR%%/xslt/vfolder.xml
>+%%DATADIR%%/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
>@@ -152,15 +152,17 @@
> share/locale/uk/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/dtd
>-@dirrm share/liferea/doc/html
>-@dirrm share/liferea/doc
>-@dirrm share/liferea/css
>-@dirrm share/liferea
>+@dirrm %%DATADIR%%/xslt
>+@dirrm %%DATADIR%%/pixmaps
>+@dirrm %%DATADIR%%/opml
>+@dirrm %%DATADIR%%/dtd
>+@dirrm %%DATADIR%%/doc/html
>+@dirrm %%DATADIR%%/doc
>+@dirrm %%DATADIR%%/css
>+@dirrm %%DATADIR%%
> @dirrmtry man/pl/man1
> @dirrmtry man/pl
> @dirrm lib/liferea
> @dirrmtry share/applications
>+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 158178: 116258