Date: Wed, 31 Oct 2007 05:41:51 +0100 From: Marcin Wisnicki <mwisnicki+freebsd@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jylefort@FreeBSD.org Subject: ports/117710: [PATCH] mail/mail-notification: update to 4.1 and unbreak with evolution Message-ID: <47280792.2533440a.0e38.0dde@mx.google.com> Resent-Message-ID: <200710310450.l9V4o1WO009401@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117710 >Category: ports >Synopsis: [PATCH] mail/mail-notification: update to 4.1 and unbreak with evolution >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 31 04:50:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Marcin Wisnicki >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD desktop.pnet.one.pl 6.2-STABLE FreeBSD 6.2-STABLE #9: Sun Sep 9 04:53:53 CEST >Description: Update mail-notification to latest version and unbreak Evolution support after recent Gnome upgrade. Fix some portlint warnings while there. Evolution-related patches adapted from https://savannah.nongnu.org/bugs/?20904 Added file(s): - files/patch-01-mail-notification-findevo_212 - files/patch-02-mail-notification-evo-api-change - files/patch-03-openssl-threads Port maintainer (jylefort@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- mail-notification-4.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/mail/mail-notification.orig/Makefile /usr/ports/mail/mail-notification/Makefile --- /usr/ports/mail/mail-notification.orig/Makefile 2007-10-31 00:58:36.000000000 +0100 +++ /usr/ports/mail/mail-notification/Makefile 2007-10-31 05:13:50.000000000 +0100 @@ -6,8 +6,7 @@ # PORTNAME= mail-notification -DISTVERSION= 4.0 -PORTREVISION= 3 +DISTVERSION= 4.1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= mailnotify @@ -17,7 +16,10 @@ LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify +USE_BZIP2= yes USE_XLIB= yes +USE_GETTEXT= yes +USE_LDCONFIG= yes USE_GNOME= gnomeprefix gnomehack eel2 GNU_CONFIGURE= yes USE_GMAKE= yes @@ -72,9 +74,9 @@ CONFIGURE_ARGS+=--disable-evolution PLIST_SUB+= EVOLUTION="@comment " .else -EVO_VERSION= 2.10 -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin-${EVO_VERSION}.pc:${PORTSDIR}/mail/evolution -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin-${EVO_VERSION}.pc:${PORTSDIR}/mail/evolution +EVO_VERSION= 2.12 +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc:${PORTSDIR}/mail/evolution +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc:${PORTSDIR}/mail/evolution PLIST_SUB+= EVOLUTION="" EVO_VERSION=${EVO_VERSION} .endif .if defined(WITHOUT_MOZILLA) diff -ruN --exclude=CVS /usr/ports/mail/mail-notification.orig/distinfo /usr/ports/mail/mail-notification/distinfo --- /usr/ports/mail/mail-notification.orig/distinfo 2007-10-31 00:58:36.000000000 +0100 +++ /usr/ports/mail/mail-notification/distinfo 2007-10-31 02:38:39.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (mail-notification-4.0.tar.gz) = 0e10b221de4389fa9275fb7bf52dc010 -SHA256 (mail-notification-4.0.tar.gz) = e8f462420d1398d293ee3b9451e854c4ca9bf030111c38e3e4247cf2813db378 -SIZE (mail-notification-4.0.tar.gz) = 956007 +MD5 (mail-notification-4.1.tar.bz2) = 4d9617ad0e7eded0953ac6d152f06a46 +SHA256 (mail-notification-4.1.tar.bz2) = c3dea02bf7060e3e30851adb629b3b3b78e163371c4001028d011d81976d9193 +SIZE (mail-notification-4.1.tar.bz2) = 713068 diff -ruN --exclude=CVS /usr/ports/mail/mail-notification.orig/files/patch-01-mail-notification-findevo_212 /usr/ports/mail/mail-notification/files/patch-01-mail-notification-findevo_212 --- /usr/ports/mail/mail-notification.orig/files/patch-01-mail-notification-findevo_212 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/mail/mail-notification/files/patch-01-mail-notification-findevo_212 2007-10-31 02:57:01.000000000 +0100 @@ -0,0 +1,56 @@ +diff -Naur mail-notification-4.1.org/configure mail-notification-4.1/configure +--- configure 2007-06-28 18:06:41.000000000 +0200 ++++ configure 2007-06-28 18:07:08.000000000 +0200 +@@ -24403,12 +24403,12 @@ + pkg_cv_EVOLUTION_PLUGIN_CFLAGS="$EVOLUTION_PLUGIN_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-\$evolution_branch \$evolution_plugin_min_version\"") >&5 +- ($PKG_CONFIG --exists --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin \$evolution_plugin_min_version\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "evolution-plugin $evolution_plugin_min_version") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-$evolution_branch $evolution_plugin_min_version" 2>/dev/null` ++ pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin $evolution_plugin_min_version" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -24421,12 +24421,12 @@ + pkg_cv_EVOLUTION_PLUGIN_LIBS="$EVOLUTION_PLUGIN_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-\$evolution_branch \$evolution_plugin_min_version\"") >&5 +- ($PKG_CONFIG --exists --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin \$evolution_plugin_min_version\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "evolution-plugin $evolution_plugin_min_version") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-$evolution_branch $evolution_plugin_min_version" 2>/dev/null` ++ pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin $evolution_plugin_min_version" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -24445,9 +24445,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version"` ++ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-plugin $evolution_plugin_min_version"` + else +- EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-$evolution_branch $evolution_plugin_min_version"` ++ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin $evolution_plugin_min_version"` + fi + # Put the nasty error message in config.log where it belongs + echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5 +@@ -24468,7 +24468,7 @@ + if test $found = yes; then + { echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5 + echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6; } +- evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$evolution_branch 2>/dev/null` ++ evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin 2>/dev/null` + if test -n "$evolution_plugindir"; then + { echo "$as_me:$LINENO: result: $evolution_plugindir" >&5 + echo "${ECHO_T}$evolution_plugindir" >&6; } diff -ruN --exclude=CVS /usr/ports/mail/mail-notification.orig/files/patch-02-mail-notification-evo-api-change /usr/ports/mail/mail-notification/files/patch-02-mail-notification-evo-api-change --- /usr/ports/mail/mail-notification.orig/files/patch-02-mail-notification-evo-api-change 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/mail/mail-notification/files/patch-02-mail-notification-evo-api-change 2007-10-31 03:56:00.000000000 +0100 @@ -0,0 +1,11 @@ +--- src/mn-evolution-folder-tree-control.c.orig 2007-06-26 13:41:11.000000000 +0200 ++++ src/mn-evolution-folder-tree-control.c 2007-10-31 03:53:10.000000000 +0100 +@@ -264,7 +264,7 @@ + switch (arg_id) + { + case PROP_SELECTED_URI: +- em_folder_tree_set_selected(tree, BONOBO_ARG_GET_STRING(arg)); ++ em_folder_tree_set_selected(tree, BONOBO_ARG_GET_STRING(arg), TRUE); + break; + + default: diff -ruN --exclude=CVS /usr/ports/mail/mail-notification.orig/files/patch-03-openssl-threads /usr/ports/mail/mail-notification/files/patch-03-openssl-threads --- /usr/ports/mail/mail-notification.orig/files/patch-03-openssl-threads 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/mail/mail-notification/files/patch-03-openssl-threads 2007-10-31 03:47:29.000000000 +0100 @@ -0,0 +1,11 @@ +--- configure.orig 2007-06-26 13:40:19.000000000 +0200 ++++ configure 2007-10-31 03:47:03.000000000 +0100 +@@ -24236,7 +24236,7 @@ + #include <openssl/opensslconf.h> + + int main() { +-#ifdef OPENSSL_THREADS ++#if defined(OPENSSL_THREADS) || defined(THREADS) + exit(0); /* ok */ + #else + exit(1); /* no thread support */ diff -ruN --exclude=CVS /usr/ports/mail/mail-notification.orig/pkg-plist /usr/ports/mail/mail-notification/pkg-plist --- /usr/ports/mail/mail-notification.orig/pkg-plist 2007-10-31 00:58:36.000000000 +0100 +++ /usr/ports/mail/mail-notification/pkg-plist 2007-10-31 04:52:52.000000000 +0100 @@ -35,10 +35,10 @@ share/locale/sr/LC_MESSAGES/mail-notification.mo share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo share/locale/sv/LC_MESSAGES/mail-notification.mo -%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-mail-notification.a -%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-mail-notification.la -%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-mail-notification.so -%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/org-gnome-mail-notification.eplug +%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/liborg-jylefort-mail-notification.a +%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/liborg-jylefort-mail-notification.la +%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/liborg-jylefort-mail-notification.so +%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/org-jylefort-mail-notification.eplug @dirrm share/omf/mail-notification @dirrm share/mail-notification/ui @dirrm share/mail-notification --- mail-notification-4.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?47280792.2533440a.0e38.0dde>