cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- make this build again by updating to version 0.1.2

Browse Source 
- the autoblah do-configure dance is not needed anymore

ok jasper@
This commit is contained in:
ajacoutot 2008-11-23 12:04:27 +00:00
parent 642c3ce926
commit ebba3aa53a
7 changed files with 35 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mail/evolution-plugin-rss/Makefile
View File

@ -1,14 +1,16 @@
# $OpenBSD: Makefile,v 1.5 2008/07/23 13:00:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2008/11/23 12:04:27 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= RSS-reader plugin for GNOME
GNOME_PROJECT= evolution-rss
GNOME_VERSION= 0.1.0
PKGNAME= evolution-plugin-rss-${GNOME_VERSION}p0
GNOME_VERSION= 0.1.2
PKGNAME= evolution-plugin-rss-${GNOME_VERSION}
CATEGORIES= mail
EVO_VERSION= 2.22
EVO_VERSION= 2.24
SUBST_VARS= EVO_VERSION
HOMEPAGE= http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@ -26,18 +28,13 @@ EXTRACT_SUFX= .tar.gz
MODULES= devel/gettext \
x11/gnome
BUILD_DEPENDS= ${RUN_DEPENDS} \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
::x11/gnome/common
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= :gconf2-*:devel/gconf2 \
:evolution->=2.22.2:mail/evolution
:evolution->=2.24.1.1:mail/evolution
LIB_DEPENDS= dbus-glib-1::x11/dbus-glib
USE_X11= Yes
CONFIGURE_STYLE= gnu
AUTOMAKE_VERSION= 1.9
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evolution-rss \
--disable-schemas-install \
@ -47,12 +44,4 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
SUBST_VARS= EVO_VERSION
do-configure:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh \
${CONFIGURE_ARGS} GMSGFMT=${LOCALBASE}/bin/msgfmt DATADIRNAME=share
.include <bsd.port.mk>

10
mail/evolution-plugin-rss/distinfo
View File

@ -1,5 +1,5 @@
MD5 (evolution-rss-0.1.0.tar.gz) = Y0efz0w6+ZirJ5TloPB19g==
RMD160 (evolution-rss-0.1.0.tar.gz) = s9hA0SESCdfAKdO/tjjCm+s+d+o=
SHA1 (evolution-rss-0.1.0.tar.gz) = AbYlghAYir/eNw+Yf6aKcYJDDo4=
SHA256 (evolution-rss-0.1.0.tar.gz) = 2hAkeFEEFtojioYAJiIWvMT0rzqhTrxFgH4v2jm0zDk=
SIZE (evolution-rss-0.1.0.tar.gz) = 485085
MD5 (evolution-rss-0.1.2.tar.gz) = p8BLbzMMSXhdNPWaGVN3mA==
RMD160 (evolution-rss-0.1.2.tar.gz) = NxNQNkrT5X+L28BnFtdEoXmD5wA=
SHA1 (evolution-rss-0.1.2.tar.gz) = JeCeHMZ2TdI3ZozFN72UliILEks=
SHA256 (evolution-rss-0.1.2.tar.gz) = zrwSqvbuKCge6DncVGLBd0HTmfRFsXFxMt6Ss0hLYFM=
SIZE (evolution-rss-0.1.2.tar.gz) = 506503

16
mail/evolution-plugin-rss/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.3 2008/11/23 12:04:27 ajacoutot Exp $
--- configure.orig Sun Nov 23 12:06:58 2008
+++ configure Sun Nov 23 12:08:46 2008
@@ -22108,11 +22108,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
EVOLUTION_EXEC_VERSION=$EVOLUTION_BASE_VERSION
- break;
fi
else
evo_versions='12 11 10 8 6 4'

26
mail/evolution-plugin-rss/patches/patch-configure_ac
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.1 2008/07/08 22:38:53 jasper Exp $
--- configure.ac.orig Wed Jul 9 00:30:06 2008
+++ configure.ac Wed Jul 9 00:31:38 2008
@@ -34,12 +34,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
- dnl we need major minor here
+ if test -z "$EVOLUTION_EXEC_VERSION"; then
EVOLUTION_EXEC_VERSION=$EVOLUTION_BASE_VERSION
- break;
fi
else
evo_versions='12 11 10 8 6 4'
@@ -227,6 +223,8 @@ AC_SUBST([GECKO_LIBS])
fi
fi
fi
+
+AM_CONDITIONAL([HAVE_GECKO], [test "x$have_gecko" = "xyes"])
# *******************************
# webkit renderer

25
mail/evolution-plugin-rss/patches/patch-src_Makefile_am
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2008/07/08 22:38:53 jasper Exp $
--- src/Makefile.am.orig Wed Jul 9 00:28:35 2008
+++ src/Makefile.am Wed Jul 9 00:29:30 2008
@@ -63,7 +63,12 @@ plugin_DATA = org-gnome-evolution-rss.eplug \
org-gnome-evolution-rss.xml
plugin_LTLIBRARIES = liborg-gnome-evolution-rss.la
-liborg_gnome_evolution_rss_la_SOURCES = rss.c gecko-utils.cpp
+SOURCES = rss.c
+if HAVE_GECKO
+SOURCES+= gecko-utils.cpp
+endif
+
+liborg_gnome_evolution_rss_la_SOURCES = $(SOURCES)
liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(WEBKIT_LIBS) $(GECKO_LIBS) $(GECKO_RPATH)
evolution_import_rss_SOURCES = evolution-import-rss.c
@@ -82,7 +87,6 @@ server_DATA = $(server_in_files:.server.in.in=_$(EVOLU
install-data-local:
rm -f $(PLUGIN_INSTALL_DIR)/*gnome-cooly*
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
uninstall-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)

36
mail/evolution-plugin-rss/patches/patch-src_rss_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-src_rss_c,v 1.1 2008/07/08 22:38:53 jasper Exp $
--- src/rss.c.orig Wed Jul 9 00:25:50 2008
+++ src/rss.c Wed Jul 9 00:28:22 2008
@@ -1589,6 +1589,7 @@ rss_mozilla_init(void)
}
#endif
+#ifdef HAVE_GTKMOZEMBED
void
render_set_preferences(void)
{
@@ -1603,6 +1604,7 @@ render_set_preferences(void)
gecko_prefs_set_string("general.useragent.extra.firefox", agstr);
g_free(agstr);
}
+#endif
#ifdef HAVE_RENDERKIT
static gboolean
@@ -3239,6 +3241,8 @@ rss_finalize(void)
gconf_client_get_int(rss_gconf,
GCONF_KEY_HTML_RENDER,
NULL));
+
+#ifdef HAVE_GTKMOZEMBED
//really find a better way to deal with this//
//I do not know how to shutdown gecko (gtk_moz_embed_pop_startup)
//crash in nsCOMPtr_base::assign_with_AddRef
@@ -3247,6 +3251,7 @@ rss_finalize(void)
system("killall -SIGTERM evolution");
#else
gecko_shutdown();
+#endif
#endif
}

7
mail/evolution-plugin-rss/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2008/07/08 22:38:53 jasper Exp $
@comment $OpenBSD: PLIST,v 1.4 2008/11/23 12:04:27 ajacoutot 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
@ -9,8 +9,13 @@ 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/rss-html-rendering.glade
share/evolution/${EVO_VERSION}/glade/rss-ui.glade
share/evolution/${EVO_VERSION}/images/rss-16.png
share/evolution/${EVO_VERSION}/images/rss-22.png
share/evolution/${EVO_VERSION}/images/rss-24.png
share/evolution/${EVO_VERSION}/images/rss-icon-read.png
share/evolution/${EVO_VERSION}/images/rss-icon-unread.png
share/evolution/${EVO_VERSION}/images/rss-text-html.png
share/evolution/${EVO_VERSION}/images/rss-text-x-generic.png
share/evolution/${EVO_VERSION}/images/rss.png
share/locale/en_AU/LC_MESSAGES/evolution-rss.mo
share/locale/ro/LC_MESSAGES/evolution-rss.mo