summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-08-01 19:35:18 +0000
committerRene Ladan <rene@FreeBSD.org>2014-08-01 19:35:18 +0000
commit12bea20bfc4df9c543f3ddd25007f6aee3e340b3 (patch)
tree88ffdc2666ec7bcc1be1f6ee8fc5ae5662fd0f4c
parentFix stage violation (diff)
Remove Hotmail support, it depended on expired port mail/getlive.
Approved by: portmgr (infrastructure blanket)
-rw-r--r--mail/mail-notification/Makefile17
-rw-r--r--mail/mail-notification/pkg-plist1
2 files changed, 4 insertions, 14 deletions
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index e50d6e10da54..1fa2339a1972 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mail-notification
DISTVERSION= 5.4
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= mailnotify
@@ -26,13 +26,12 @@ GCONF_SCHEMAS= mail-notification.schemas
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-OPTIONS_DEFINE= EVOLUTION GMAIL HOTMAIL IMAP MAILDIR MBOX MH MOZILLA \
+OPTIONS_DEFINE= EVOLUTION GMAIL IMAP MAILDIR MBOX MH MOZILLA \
POP3 SASL SSL SYLPHEED
-OPTIONS_DEFAULT= GMAIL HOTMAIL IMAP MAILDIR MBOX MH MOZILLA \
+OPTIONS_DEFAULT= GMAIL IMAP MAILDIR MBOX MH MOZILLA \
POP3 SASL SSL SYLPHEED
EVOLUTION_DESC= Evolution support
GMAIL_DESC= Gmail support
-HOTMAIL_DESC= Windows Live Hotmail support
IMAP_DESC= IMAP support
MAILDIR_DESC= Maildir support
MBOX_DESC= mbox support
@@ -69,13 +68,6 @@ PLIST_SUB+= GMAIL="@comment "
.else
PLIST_SUB+= GMAIL=""
.endif
-.if ! ${PORT_OPTIONS:MHOTMAIL}
-JB_CONF_ARGS+= hotmail=no
-PLIST_SUB+= HOTMAIL="@comment "
-.else
-RUN_DEPENDS+= getlive:${PORTSDIR}/mail/getlive
-PLIST_SUB+= HOTMAIL=""
-.endif
JB_CONF_ARGS+= yahoo=no
.if ! ${PORT_OPTIONS:MEVOLUTION}
JB_CONF_ARGS+= evolution=no
@@ -99,8 +91,7 @@ JB_CONF_ARGS+= sylpheed=no
|| ${PORT_OPTIONS:MPOP3} \
|| ${PORT_OPTIONS:MIMAP} \
|| ${PORT_OPTIONS:MMOZILLA} \
- || ${PORT_OPTIONS:MSYLPHEED} \
- || ${PORT_OPTIONS:MHOTMAIL}
+ || ${PORT_OPTIONS:MSYLPHEED}
LIB_DEPENDS+= libgmime-2.0.so:${PORTSDIR}/mail/gmime2
.endif
.if ! ${PORT_OPTIONS:MSSL}
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index 01f50adc124e..7802559c3373 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -6,7 +6,6 @@ share/gnome/help/mail-notification/C/figures/mail.png
share/gnome/help/mail-notification/C/mail-notification.xml
share/gnome/help/mail-notification/C/software-license.xml
%%GMAIL%%%%DATADIR%%/gmail.png
-%%HOTMAIL%%%%DATADIR%%/hotmail.png
%%DATADIR%%/logo.png
%%DATADIR%%/new-mail.wav
%%DATADIR%%/mailbox-properties-dialog.glade