From b387a79a178f7dd35810ac65841d1decbe94120f Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Mon, 14 Jul 2008 02:40:22 +0000 Subject: - Update to 5.4 - Add options for Yahoo! Mail and Windows Live Hotmail - Chase mail/evolution version - Pass maintainership to submitter PR: ports/125489 Submitted by: Marcin Wisnicki --- mail/mail-notification/Makefile | 85 ++++++++++++++-------- mail/mail-notification/distinfo | 6 +- .../files/patch-01-mail-notification-findevo_212 | 56 -------------- .../patch-02-mail-notification-evo-api-change | 11 --- .../files/patch-03-openssl-threads | 11 --- mail/mail-notification/files/patch-eel_fix | 66 ----------------- mail/mail-notification/files/patch-openssl-threads | 11 +++ mail/mail-notification/pkg-plist | 20 ++--- 8 files changed, 78 insertions(+), 188 deletions(-) delete mode 100644 mail/mail-notification/files/patch-01-mail-notification-findevo_212 delete mode 100644 mail/mail-notification/files/patch-02-mail-notification-evo-api-change delete mode 100644 mail/mail-notification/files/patch-03-openssl-threads delete mode 100644 mail/mail-notification/files/patch-eel_fix create mode 100644 mail/mail-notification/files/patch-openssl-threads (limited to 'mail/mail-notification') diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index f082eabbc5b1..bc1ab4de4053 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -6,58 +6,60 @@ # PORTNAME= mail-notification -DISTVERSION= 4.1 -PORTREVISION= 2 +DISTVERSION= 5.4 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= mailnotify -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mwisnicki+freebsd@gmail.com COMMENT= A mail notification for freedesktop.org-compliant system trays -LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + gnome-keyring:${PORTSDIR}/security/gnome-keyring \ + notify:${PORTSDIR}/devel/libnotify USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_GNOME= gnomeprefix gnomehack eel2 -GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNOME= gconf2 gnomeprefix gnomevfs2 libglade2 libgnomeui libxml2 CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +JB_CONF_ARGS= cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}" prefix="${PREFIX}" +JB_CONF_ENV= jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}" GCONF_SCHEMAS= mail-notification.schemas INSTALLS_OMF= yes INSTALLS_ICONS= yes -OPTIONS= MBOX "mbox support" on \ - MH "MH support" on \ +OPTIONS= EVOLUTION "Evolution support" off \ + GMAIL "Gmail support" on \ + HOTMAIL "Windows Live Hotmail support" on \ + IMAP "IMAP support" on \ MAILDIR "Maildir support" on \ + MBOX "mbox support" on \ + MH "MH support" on \ + MOZILLA "Mozilla products support" on \ POP3 "POP3 support" on \ - IMAP "IMAP support" on \ - SSL "SSL/TLS support" on \ SASL "SASL authentication support" on \ - GMAIL "Gmail support" on \ - EVOLUTION "Evolution support" off \ - MOZILLA "Mozilla products support" on \ - SYLPHEED "Sylpheed support" on + SSL "SSL/TLS support" on \ + SYLPHEED "Sylpheed support" on \ + YAHOO "Yahoo! Mail support" on .include .if defined(WITHOUT_MBOX) -CONFIGURE_ARGS+=--disable-mbox +JB_CONF_ARGS+= mbox=no .endif .if defined(WITHOUT_MH) -CONFIGURE_ARGS+=--disable-mh +JB_CONF_ARGS+= mh=no .endif .if defined(WITHOUT_MAILDIR) -CONFIGURE_ARGS+=--disable-maildir +JB_CONF_ARGS+= maildir=no .endif .if defined(WITHOUT_POP3) -CONFIGURE_ARGS+=--disable-pop3 +JB_CONF_ARGS+= pop3=no .endif .if defined(WITHOUT_IMAP) -CONFIGURE_ARGS+=--disable-imap +JB_CONF_ARGS+= imap=no .endif .if defined(WITHOUT_POP3) && defined(WITHOUT_IMAP) # only POP3 and IMAP use SSL and SASL @@ -65,25 +67,39 @@ WITHOUT_SSL= yes WITHOUT_SASL= yes .endif .if defined(WITHOUT_GMAIL) -CONFIGURE_ARGS+=--disable-gmail +JB_CONF_ARGS+= gmail=no PLIST_SUB+= GMAIL="@comment " .else PLIST_SUB+= GMAIL="" .endif +.if defined(WITHOUT_HOTMAIL) +JB_CONF_ARGS+= hotmail=no +PLIST_SUB+= HOTMAIL="@comment " +.else +RUN_DEPENDS+= getlive:${PORTSDIR}/mail/getlive +PLIST_SUB+= HOTMAIL="" +.endif +.if defined(WITHOUT_YAHOO) +JB_CONF_ARGS+= yahoo=no +PLIST_SUB+= YAHOO="@comment " +.else +RUN_DEPENDS+= fetchyahoo:${PORTSDIR}/mail/fetchyahoo +PLIST_SUB+= YAHOO="" +.endif .if defined(WITHOUT_EVOLUTION) -CONFIGURE_ARGS+=--disable-evolution +JB_CONF_ARGS+= evolution=no PLIST_SUB+= EVOLUTION="@comment " .else -EVO_VERSION= 2.12 +EVO_VERSION= 2.22 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) -CONFIGURE_ARGS+=--disable-mozilla +JB_CONF_ARGS+= mozilla=no .endif .if defined(WITHOUT_SYLPHEED) -CONFIGURE_ARGS+=--disable-sylpheed +JB_CONF_ARGS+= sylpheed=no .endif .if defined(WITH_MBOX) \ || defined(WITH_MH) \ @@ -91,19 +107,30 @@ CONFIGURE_ARGS+=--disable-sylpheed || defined(WITH_POP3) \ || defined(WITH_IMAP) \ || defined(WITH_MOZILLA) \ - || defined(WITH_SYLPHEED) + || defined(WITH_SYLPHEED) \ + || defined(WITH_HOTMAIL) \ + || defined(WITH_YAHOO) LIB_DEPENDS+= gmime-2.0.4:${PORTSDIR}/mail/gmime2 .endif .if defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--disable-ssl +JB_CONF_ARGS+= ssl=no .else # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk .include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif .if defined(WITHOUT_SASL) -CONFIGURE_ARGS+=--disable-sasl +JB_CONF_ARGS+= sasl=no .else LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 .endif +do-configure: + cd ${WRKSRC} && ${JB_CONF_ENV} ./jb configure ${JB_CONF_ARGS} + +do-build: + cd ${WRKSRC} && ./jb build + +do-install: + cd ${WRKSRC} && ./jb install + .include diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo index f28b96aa74c4..9f3d34071e65 100644 --- a/mail/mail-notification/distinfo +++ b/mail/mail-notification/distinfo @@ -1,3 +1,3 @@ -MD5 (mail-notification-4.1.tar.bz2) = 4d9617ad0e7eded0953ac6d152f06a46 -SHA256 (mail-notification-4.1.tar.bz2) = c3dea02bf7060e3e30851adb629b3b3b78e163371c4001028d011d81976d9193 -SIZE (mail-notification-4.1.tar.bz2) = 713068 +MD5 (mail-notification-5.4.tar.bz2) = c8dc33a61251acb5474e56eab6b18f43 +SHA256 (mail-notification-5.4.tar.bz2) = 5dec5f3852437e7735269697c77a29a24ea230987c764523fe66dabdca815af5 +SIZE (mail-notification-5.4.tar.bz2) = 570008 diff --git a/mail/mail-notification/files/patch-01-mail-notification-findevo_212 b/mail/mail-notification/files/patch-01-mail-notification-findevo_212 deleted file mode 100644 index dbdc1898ab73..000000000000 --- a/mail/mail-notification/files/patch-01-mail-notification-findevo_212 +++ /dev/null @@ -1,56 +0,0 @@ -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 --git a/mail/mail-notification/files/patch-02-mail-notification-evo-api-change b/mail/mail-notification/files/patch-02-mail-notification-evo-api-change deleted file mode 100644 index b5915438f712..000000000000 --- a/mail/mail-notification/files/patch-02-mail-notification-evo-api-change +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 --git a/mail/mail-notification/files/patch-03-openssl-threads b/mail/mail-notification/files/patch-03-openssl-threads deleted file mode 100644 index 74ab914cf05e..000000000000 --- a/mail/mail-notification/files/patch-03-openssl-threads +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2007-06-26 13:40:19.000000000 +0200 -+++ configure 2007-10-31 03:47:03.000000000 +0100 -@@ -24236,7 +24236,7 @@ - #include - - int main() { --#ifdef OPENSSL_THREADS -+#if defined(OPENSSL_THREADS) || defined(THREADS) - exit(0); /* ok */ - #else - exit(1); /* no thread support */ diff --git a/mail/mail-notification/files/patch-eel_fix b/mail/mail-notification/files/patch-eel_fix deleted file mode 100644 index bf2d48f6e718..000000000000 --- a/mail/mail-notification/files/patch-eel_fix +++ /dev/null @@ -1,66 +0,0 @@ ---- src/mn-maildir-mailbox-backend.c.orig 2008-03-28 17:57:40.000000000 -0400 -+++ src/mn-maildir-mailbox-backend.c 2008-03-28 17:58:18.000000000 -0400 -@@ -163,7 +163,7 @@ ___2_mn_maildir_mailbox_backend_monitor_ - { - char *filename; - -- filename = eel_uri_get_basename(info_uri); -+ filename = mn_vfs_uri_get_basename(info_uri); - if (filename) - { - if (filename[0] != '.') ---- src/mn-mh-mailbox-backend.c.orig 2008-03-28 17:58:56.000000000 -0400 -+++ src/mn-mh-mailbox-backend.c 2008-03-28 17:59:07.000000000 -0400 -@@ -155,7 +155,7 @@ ___2_mn_mh_mailbox_backend_monitor_cb (M - { - char *filename; - -- filename = eel_uri_get_basename(info_uri); -+ filename = mn_vfs_uri_get_basename(info_uri); - if (filename) - { - if (! strcmp(filename, SEQUENCES_FILE) || mn_str_isnumeric(filename)) ---- src/mn-sylpheed-mailbox-backend.c.orig 2008-03-28 17:59:36.000000000 -0400 -+++ src/mn-sylpheed-mailbox-backend.c 2008-03-28 17:59:48.000000000 -0400 -@@ -277,7 +277,7 @@ ___4_mn_sylpheed_mailbox_backend_monitor - { - char *filename; - -- filename = eel_uri_get_basename(info_uri); -+ filename = mn_vfs_uri_get_basename(info_uri); - if (filename) - { - if (! strcmp(filename, SYLPHEED_MARK_FILE)) ---- src/mn-vfs.c.orig 2008-03-28 18:00:14.000000000 -0400 -+++ src/mn-vfs.c 2008-03-28 18:01:22.000000000 -0400 -@@ -325,3 +325,21 @@ mn_vfs_get_local_path (GnomeVFSURI *uri) - - return path; - } -+ -+char * -+mn_vfs_uri_get_basename (const char *text_uri) -+{ -+ GnomeVFSURI *uri; -+ char *name; -+ -+ g_return_val_if_fail(text_uri != NULL, NULL); -+ -+ uri = gnome_vfs_uri_new(text_uri); -+ if (! uri) -+ return NULL; -+ -+ name = gnome_vfs_uri_extract_short_name(uri); -+ gnome_vfs_uri_unref(uri); -+ -+ return name; -+} ---- src/mn-vfs.h.orig 2008-03-28 18:01:40.000000000 -0400 -+++ src/mn-vfs.h 2008-03-28 18:02:16.000000000 -0400 -@@ -52,4 +52,6 @@ GnomeVFSURI *mn_vfs_uri_append_file_suff - - char *mn_vfs_get_local_path (GnomeVFSURI *uri); - -+char *mn_vfs_uri_get_basename (const char *text_uri); -+ - #endif /* _MN_VFS_H */ diff --git a/mail/mail-notification/files/patch-openssl-threads b/mail/mail-notification/files/patch-openssl-threads new file mode 100644 index 000000000000..8c935adef6b1 --- /dev/null +++ b/mail/mail-notification/files/patch-openssl-threads @@ -0,0 +1,11 @@ +--- jbsrc/lib/src/extras/jb-openssl.c.orig 2008-04-27 16:47:43.000000000 +0200 ++++ jbsrc/lib/src/extras/jb-openssl.c 2008-07-10 22:48:53.000000000 +0200 +@@ -91,7 +91,7 @@ + result = jb_test_compile_string("#define OPENSSL_THREAD_DEFINES\n" + "#include \n" + "int main () {\n" +- "#ifndef OPENSSL_THREADS\n" ++ "#if !defined(OPENSSL_THREADS) && !defined(THREADS)\n" + "#error \"no thread support\"\n" + "#endif\n" + "}\n", diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist index c041b6aea9ea..f24cd2327bf6 100644 --- a/mail/mail-notification/pkg-plist +++ b/mail/mail-notification/pkg-plist @@ -1,19 +1,17 @@ bin/mail-notification etc/xdg/autostart/mail-notification.desktop -libdata/bonobo/servers/GNOME_MailNotification.server -%%EVOLUTION%%libdata/bonobo/servers/GNOME_MailNotification_Evolution.server share/applications/mail-notification-properties.desktop share/gnome/help/mail-notification/C/documentation-license.xml share/gnome/help/mail-notification/C/figures/mail.png -share/gnome/help/mail-notification/C/figures/mailbox-emblem-error.png -share/gnome/help/mail-notification/C/figures/mailbox-emblem-polled.png -share/gnome/help/mail-notification/C/figures/mailbox-emblem-unknown.png share/gnome/help/mail-notification/C/mail-notification.xml share/gnome/help/mail-notification/C/software-license.xml -%%GMAIL%%share/mail-notification/ui/gmail.png -share/mail-notification/ui/logo.png -share/mail-notification/ui/mailbox-properties-dialog.glade -share/mail-notification/ui/properties-dialog.glade +%%GMAIL%%share/mail-notification/gmail.png +%%HOTMAIL%%share/mail-notification/hotmail.png +share/mail-notification/logo.png +share/mail-notification/new-mail.wav +%%YAHOO%%share/mail-notification/yahoo.png +share/mail-notification/mailbox-properties-dialog.glade +share/mail-notification/properties-dialog.glade share/omf/mail-notification/mail-notification-C.omf share/icons/hicolor/16x16/apps/mail-notification.png share/icons/hicolor/22x22/apps/mail-notification.png @@ -25,6 +23,7 @@ share/locale/bg/LC_MESSAGES/mail-notification.mo share/locale/ca/LC_MESSAGES/mail-notification.mo share/locale/cs/LC_MESSAGES/mail-notification.mo share/locale/de/LC_MESSAGES/mail-notification.mo +share/locale/es/LC_MESSAGES/mail-notification.mo share/locale/fr/LC_MESSAGES/mail-notification.mo share/locale/ja/LC_MESSAGES/mail-notification.mo share/locale/nl/LC_MESSAGES/mail-notification.mo @@ -35,12 +34,9 @@ share/locale/ru/LC_MESSAGES/mail-notification.mo 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-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 @dirrm share/gnome/help/mail-notification/C/figures @dirrm share/gnome/help/mail-notification/C -- cgit v1.2.3