diff --git a/mail/evolution-plugin-rss/Makefile b/mail/evolution-plugin-rss/Makefile index 2a736f88c69..5923a3ccf7a 100644 --- a/mail/evolution-plugin-rss/Makefile +++ b/mail/evolution-plugin-rss/Makefile @@ -1,21 +1,16 @@ -# $OpenBSD: Makefile,v 1.17 2009/11/18 14:42:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.18 2010/04/23 10:56:54 jasper Exp $ SHARED_ONLY= Yes COMMENT= RSS-reader plugin for GNOME GNOME_PROJECT= evolution-rss -GNOME_VERSION= 0.1.4 -PKGNAME= evolution-plugin-rss-${GNOME_VERSION}p2 +GNOME_VERSION= 0.1.4.99 # Debian evolution-rss_0.1.9~20100320 +PKGNAME= evolution-plugin-rss-${GNOME_VERSION} CATEGORIES= mail -# Upstream patch so that RSS feeds are updated again. -MASTER_SITES0= http://gnome.eu.org/patches/ -PATCHFILES= evolution-rss-${GNOME_VERSION}-recv-feeds.patch:0 -PATCH_DIST_STRIP= -p1 - -EVO_VERSION= 2.28 +EVO_VERSION= 2.30 SUBST_VARS= EVO_VERSION HOMEPAGE= http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin @@ -37,8 +32,10 @@ WANTLIB += glitz gmodule-2.0 gnome-keyring gnutls gobject-2.0 WANTLIB += gpg-error gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png proxy pthread pthread-stubs WANTLIB += soup-2.4 sqlite3 stdc++ tasn1 xcb xml2 z +WANTLIB += eggdbus-1 xcb-render xcb-render-util -MASTER_SITES= http://gnome.eu.org/ +#MASTER_SITES= http://gnome.eu.org/ +MASTER_SITES= http://crappydiffs.org/ EXTRACT_SUFX= .tar.gz MODULES= devel/gettext \ diff --git a/mail/evolution-plugin-rss/distinfo b/mail/evolution-plugin-rss/distinfo index c953e5512af..1e5abe6b7c1 100644 --- a/mail/evolution-plugin-rss/distinfo +++ b/mail/evolution-plugin-rss/distinfo @@ -1,10 +1,5 @@ -MD5 (evolution-rss-0.1.4-recv-feeds.patch) = 1WdrgAkreDVbNDNRy40TFQ== -MD5 (evolution-rss-0.1.4.tar.gz) = 5t9q6R/kGILMtUIxso1+/Q== -RMD160 (evolution-rss-0.1.4-recv-feeds.patch) = XptscucJdCMTbO163eCSfBJMlS8= -RMD160 (evolution-rss-0.1.4.tar.gz) = r+70K+nktZPpjZwgVdqFfeuZ0K4= -SHA1 (evolution-rss-0.1.4-recv-feeds.patch) = lAjAuh5xLKsDWdoaiDaHMsjuoSY= -SHA1 (evolution-rss-0.1.4.tar.gz) = C+pW8gBEI8ZQbW/1USAu2iOthAw= -SHA256 (evolution-rss-0.1.4-recv-feeds.patch) = dbphnDDZY5apMwYNJEeBXbF3m2lNBOYd3iYXvC5H1uU= -SHA256 (evolution-rss-0.1.4.tar.gz) = 3WQOBXTKeO/q/MU7fpEklt0Bj0fGypPfjwUbAIBImhQ= -SIZE (evolution-rss-0.1.4-recv-feeds.patch) = 874 -SIZE (evolution-rss-0.1.4.tar.gz) = 618558 +MD5 (evolution-rss-0.1.4.99.tar.gz) = nJw4yJZWmMxjvU/vhB06Tw== +RMD160 (evolution-rss-0.1.4.99.tar.gz) = q2EdP3Wn4oXseQSPztyNx5E8e44= +SHA1 (evolution-rss-0.1.4.99.tar.gz) = PF66wMFqh+SYSIe8ijihnqZ/UGY= +SHA256 (evolution-rss-0.1.4.99.tar.gz) = bMlWyeoTgb3P5JTgjVA8iLEpPffbdIHfsvamIvoUOQc= +SIZE (evolution-rss-0.1.4.99.tar.gz) = 694183 diff --git a/mail/evolution-plugin-rss/patches/patch-configure b/mail/evolution-plugin-rss/patches/patch-configure index 7b72c7bde22..4f0e2542048 100644 --- a/mail/evolution-plugin-rss/patches/patch-configure +++ b/mail/evolution-plugin-rss/patches/patch-configure @@ -1,14 +1,14 @@ -$OpenBSD: patch-configure,v 1.4 2009/09/14 15:39:05 jasper Exp $ ---- configure.orig Sun Sep 13 23:04:56 2009 -+++ configure Sun Sep 13 23:08:59 2009 -@@ -17593,11 +17593,8 @@ if test -n "$EVOLUTION_VERSION"; then +$OpenBSD: patch-configure,v 1.5 2010/04/23 10:56:54 jasper Exp $ +--- configure.orig Fri Apr 23 12:45:42 2010 ++++ configure Fri Apr 23 12:46:13 2010 +@@ -16445,11 +16445,8 @@ if test -n "$EVOLUTION_VERSION"; then EVOLUTION_BASE_VERSION=$EVOLUTION_VERSION EVOLUTION_BASE_VERSION_S="" EVOLUTION_EXEC_VERSION=`$PKG_CONFIG --variable=execversion evolution-shell 2>/dev/null` - if test -n "$EVOLUTION_EXEC_VERSION"; then - break; - else -+ if test -z "$EVOLUTION_EXEC_VERSION"; then ++ if test -z "$EVOLUTION_EXEC_VERSION"; then EVOLUTION_EXEC_VERSION=$EVOLUTION_BASE_VERSION - break; fi diff --git a/mail/evolution-plugin-rss/patches/patch-src_Makefile_in b/mail/evolution-plugin-rss/patches/patch-src_Makefile_in deleted file mode 100644 index 018fad5b3d1..00000000000 --- a/mail/evolution-plugin-rss/patches/patch-src_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.4 2009/09/14 15:39:05 jasper Exp $ ---- src/Makefile.in.orig Tue Aug 25 14:13:43 2009 -+++ src/Makefile.in Sun Sep 13 23:04:44 2009 -@@ -860,7 +860,7 @@ info: info-am - - info-am: - --install-data-am: install-data-local install-errorDATA \ -+install-data-am: install-errorDATA \ - install-gladeDATA install-pluginDATA install-pluginLTLIBRARIES \ - install-schemaDATA install-serverDATA - diff --git a/mail/evolution-plugin-rss/pkg/PLIST b/mail/evolution-plugin-rss/pkg/PLIST index 8a34808bb56..bbd665a3bb4 100644 --- a/mail/evolution-plugin-rss/pkg/PLIST +++ b/mail/evolution-plugin-rss/pkg/PLIST @@ -1,12 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.6 2009/09/14 15:39:05 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.7 2010/04/23 10:56:54 jasper Exp $ @bin bin/evolution-import-rss -lib/bonobo/servers/GNOME_Evolution_RSS_${EVO_VERSION}.server lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.a lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.la lib/evolution/${EVO_VERSION}/plugins/liborg-gnome-evolution-rss.so lib/evolution/${EVO_VERSION}/plugins/org-gnome-evolution-rss.eplug lib/evolution/${EVO_VERSION}/plugins/org-gnome-evolution-rss.xml share/evolution/${EVO_VERSION}/errors/org-gnome-evolution-rss.error +share/evolution/${EVO_VERSION}/glade/ share/evolution/${EVO_VERSION}/glade/rss-html-rendering.glade share/evolution/${EVO_VERSION}/glade/rss-ui.glade share/evolution/${EVO_VERSION}/images/pix.png @@ -21,6 +21,8 @@ share/evolution/${EVO_VERSION}/images/rss.png share/locale/as/LC_MESSAGES/evolution-rss.mo share/locale/bn_IN/LC_MESSAGES/evolution-rss.mo share/locale/cs/LC_MESSAGES/evolution-rss.mo +share/locale/de/LC_MESSAGES/evolution-rss.mo +share/locale/el/LC_MESSAGES/evolution-rss.mo share/locale/en_AU/LC_MESSAGES/evolution-rss.mo share/locale/en_GB/LC_MESSAGES/evolution-rss.mo share/locale/es/LC_MESSAGES/evolution-rss.mo @@ -28,14 +30,18 @@ share/locale/fr/LC_MESSAGES/evolution-rss.mo share/locale/gl/LC_MESSAGES/evolution-rss.mo share/locale/gu/LC_MESSAGES/evolution-rss.mo share/locale/hi/LC_MESSAGES/evolution-rss.mo +share/locale/hu/LC_MESSAGES/evolution-rss.mo share/locale/it/LC_MESSAGES/evolution-rss.mo share/locale/kn/LC_MESSAGES/evolution-rss.mo share/locale/ml/LC_MESSAGES/evolution-rss.mo share/locale/mr/LC_MESSAGES/evolution-rss.mo +share/locale/nb/LC_MESSAGES/evolution-rss.mo share/locale/or/LC_MESSAGES/evolution-rss.mo share/locale/pt/LC_MESSAGES/evolution-rss.mo +share/locale/pt_BR/LC_MESSAGES/evolution-rss.mo share/locale/ro/LC_MESSAGES/evolution-rss.mo share/locale/ru/LC_MESSAGES/evolution-rss.mo +share/locale/sl/LC_MESSAGES/evolution-rss.mo share/locale/sv/LC_MESSAGES/evolution-rss.mo share/locale/ta/LC_MESSAGES/evolution-rss.mo share/locale/te/LC_MESSAGES/evolution-rss.mo