12 files changed, 2 insertions, 175 deletions

diff --git a/MOVED b/MOVED
index 77b131060023..4e5598c5a234 100644
--- a/MOVED
+++ b/MOVED
@@ -11635,3 +11635,5 @@ www/erwn||2019-02-22|Abandonware, not depended on
 textproc/scrollkeeper|textproc/rarian|2019-02-23|rarian replaced scrollkeeper long ago
 devel/eggdbus||2019-02-23|Abandonned since 2009, not depended on
 devel/libgalago||2019-02-23|Abandonned since 2006, not depended on
+net-im/libyahoo2||2019-02-23|Yahoo messenger has been discontinued in July 17, 2018
+net-im/py-xmpppy-yahoo||2019-02-23|Yahoo messenger has been discontinued in July 17, 2018
diff --git a/net-im/Makefile b/net-im/Makefile
index 8ad3784a809f..dd2eedc5805e 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -63,7 +63,6 @@
     SUBDIR += libsignon-glib
     SUBDIR += libstrophe
     SUBDIR += libtelepathy
-    SUBDIR += libyahoo2
     SUBDIR += licq
     SUBDIR += licq-icq
     SUBDIR += licq-jabber
@@ -144,7 +143,6 @@
     SUBDIR += py-unmessage
     SUBDIR += py-xmpppy
     SUBDIR += py-xmpppy-irc
-    SUBDIR += py-xmpppy-yahoo
     SUBDIR += qTox
     SUBDIR += qq
     SUBDIR += quaternion
diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile
deleted file mode 100644
index dad76754b6ba..000000000000
--- a/net-im/libyahoo2/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: ijliao
-# $FreeBSD$
-
-PORTNAME=	libyahoo2
-PORTVERSION=	1.0.1
-PORTREVISION=	1
-CATEGORIES=	net-im
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	C library that handles the new Yahoo! Messenger protocol
-
-USES=		libtool pathfix ssl:build tar:bzip2
-USE_GNOME=	glib20
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-
-CFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-Wall -ansi -pedantic||g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-g -Wall||g ; \
-		 s| -module ||g' ${WRKSRC}/src/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/net-im/libyahoo2/distinfo b/net-im/libyahoo2/distinfo
deleted file mode 100644
index dc86205b7466..000000000000
--- a/net-im/libyahoo2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libyahoo2-1.0.1.tar.bz2) = 72093b22da71dec40f1e300b82d70a47a4787ed0dcc5115ebfa1880b7f5d1894
-SIZE (libyahoo2-1.0.1.tar.bz2) = 365649
diff --git a/net-im/libyahoo2/files/patch-src_autoresponder.c b/net-im/libyahoo2/files/patch-src_autoresponder.c
deleted file mode 100644
index 1397c0f3f5d5..000000000000
--- a/net-im/libyahoo2/files/patch-src_autoresponder.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/autoresponder.c.orig	2008-04-30 05:09:22.000000000 +0000
-+++ src/autoresponder.c	2008-04-30 05:09:31.000000000 +0000
-@@ -58,7 +58,7 @@
- #include "yahoo_util.h"
- 
- #ifndef _WIN32
--int fileno(FILE * stream);
-+//int fileno(FILE * stream);
- #endif
- 
- #define MAX_PREF_LEN 255
diff --git a/net-im/libyahoo2/files/patch-src_sampleclient.c b/net-im/libyahoo2/files/patch-src_sampleclient.c
deleted file mode 100644
index 8d8482ad5e09..000000000000
--- a/net-im/libyahoo2/files/patch-src_sampleclient.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sample_client.c.orig	2008-04-30 05:08:50.000000000 +0000
-+++ src/sample_client.c	2008-04-30 05:09:08.000000000 +0000
-@@ -58,7 +58,7 @@
- #include "yahoo_util.h"
- 
- #ifndef _WIN32
--int fileno(FILE * stream);
-+// int fileno(FILE * stream);
- #endif
- 
- #define MAX_PREF_LEN 255
diff --git a/net-im/libyahoo2/pkg-descr b/net-im/libyahoo2/pkg-descr
deleted file mode 100644
index 95a39a5b6bf5..000000000000
--- a/net-im/libyahoo2/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-libyahoo2 is a C library interface to the new Yahoo! Messenger protocol.
-It supports almost all current features of the protocol.
-
-WWW: http://libyahoo2.sourceforge.net/
diff --git a/net-im/libyahoo2/pkg-plist b/net-im/libyahoo2/pkg-plist
deleted file mode 100644
index 5cdb62482165..000000000000
--- a/net-im/libyahoo2/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-include/libyahoo2/yahoo2.h
-include/libyahoo2/yahoo2_callbacks.h
-include/libyahoo2/yahoo2_types.h
-include/libyahoo2/yahoo_fn.h
-include/libyahoo2/yahoo_httplib.h
-include/libyahoo2/yahoo_list.h
-lib/libyahoo2.a
-lib/libyahoo2.so
-lib/libyahoo2.so.11
-lib/libyahoo2.so.11.0.1
-libdata/pkgconfig/libyahoo2.pc
diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile
deleted file mode 100644
index 56d5d74eaa72..000000000000
--- a/net-im/py-xmpppy-yahoo/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# Created by: Michael Nottebrock <lofi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	yahoo
-PORTVERSION=	0.3.20070314
-PORTREVISION=	1
-CATEGORIES=	net-im python
-MASTER_SITES=	LOCAL/lofi
-PKGNAMEPREFIX=	xmpppy-
-DISTNAME=	yahoo-transport-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Yahoo! transport for Jabber
-
-OPTIONS_DEFINE=	EJABBERD
-EJABBERD_DESC=	transport with ejabberd
-
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy \
-		${PYTHON_SITELIBDIR}/DNS/__init__.py:dns/py-dns
-
-USES=		python:2.7
-NO_BUILD=	yes
-FILES=		adhoc.py config.py jep0133.py roomlist.py xmlconfig.py \
-		yahoo_helpers.py avatar.py htmlutils.py migratespool.py toolbox.py \
-		yahoo.py ylib.py
-FILES_CURPHOO=	YahooMD5.py __init__.py cpformat.py md5crypt.py pysha.py yahoo_fn.py
-PFILES=		${FILES:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/.} \
-		${FILES_CURPHOO:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/curphoo/.}
-PLIST_FILES=	${PFILES} ${PFILES:S.$.c.} ${PFILES:S.$.o.} etc/${PKGBASE:S.-._.}.conf.sample
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD} BINDIR=${PYTHON_SITELIBDIR}/xmpp/yahoo \
-		JABBER_USER=${JABBER_USER}
-USE_RC_SUBR=	${PKGBASE:S/-/_/}
-DDIR=		${PYTHON_SITELIBDIR}/xmpp/yahoo
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEJABBERD}
-JABBER_USER?=	ejabberd
-SUB_LIST+=	JABBER_REQUIRE=ejabberd
-.else
-JABBER_USER?=	jabber
-SUB_LIST+=	JABBER_REQUIRE=jabberd
-.endif
-
-post-patch:
-	@${GREP} -lr '/usr/bin/env python' ${WRKSRC} | \
-		${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin/env python|${PYTHON_CMD}|"
-	@${REINPLACE_CMD} -e "s|/etc/pyyimt.conf.xml|${PREFIX}/etc/${PKGBASE:S.-._.}.conf|" \
-		-e 's|pid = ""|pid = "/var/jabberd/pid/PyYIMt.pid"|g' \
-		-e 's|spoolFile = "user.dbm"|spoolFile = "/var/spool/jabberd/yahoouser.dbm"|g' \
-		${WRKSRC}/config.py
-	@${REINPLACE_CMD} -e '/spoolFile/s|yahoouser.dbm|/var/spool/jabberd/yahoouser.dbm|' \
-			-e 's|<debugFile.*|<!-- <debugFile>yahooerror.log</debugFile> -->|' \
-		-e 's|PyYIMt.pid|/var/jabberd/pid/PyYIMt.pid|' \
-		${WRKSRC}/config_example.xml
-
-do-install:
-	@${INSTALL} -d ${STAGEDIR}${DDIR}
-	${INSTALL_DATA} ${FILES:S.^.${WRKSRC}/.} ${STAGEDIR}${DDIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/yahoo.py ${STAGEDIR}${DDIR}/
-	@${MKDIR} ${STAGEDIR}${DDIR}/curphoo
-	${INSTALL_DATA} ${FILES_CURPHOO:S.^.${WRKSRC}/curphoo/.} ${STAGEDIR}${DDIR}/curphoo/
-	${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/${PKGBASE:S.-._.}.conf.sample
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR}
-	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR}
-	@${CHMOD} -R a-w ${STAGEDIR}${DDIR}
-
-.include <bsd.port.mk>
diff --git a/net-im/py-xmpppy-yahoo/distinfo b/net-im/py-xmpppy-yahoo/distinfo
deleted file mode 100644
index 1a6b3fd7d67d..000000000000
--- a/net-im/py-xmpppy-yahoo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (yahoo-transport-0.3.20070314.tar.gz) = 73a1af4e99c00b832ec293c067a0e59330ec5a993605de8d28c4122c1faec11a
-SIZE (yahoo-transport-0.3.20070314.tar.gz) = 94998
diff --git a/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in b/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in
deleted file mode 100644
index 8638b52dd4da..000000000000
--- a/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: xmpppy_yahoo
-# REQUIRE: DAEMON %%JABBER_REQUIRE%%
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-# Define these jabber_pyaim_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#
-
-. /etc/rc.subr
-
-name="xmpppy_yahoo"
-rcvar=xmpppy_yahoo_enable
-
-load_rc_config $name
-
-: ${xmpppy_yahoo_enable="NO"}
-: ${xmpppy_yahoo_dir="%%BINDIR%%"}
-: ${xmpppy_yahoo_piddir="/var/jabberd/pid"}
-: ${xmpppy_yahoo_user="%%JABBER_USER%%"}
-
-pidfile="${xmpppy_yahoo_piddir}/PyYIMt.pid"
-command_interpreter="%%PYTHON_CMD%%"
-command_args="&"
-command="${xmpppy_yahoo_dir}/yahoo.py"
-
-run_rc_command "$1"
diff --git a/net-im/py-xmpppy-yahoo/pkg-descr b/net-im/py-xmpppy-yahoo/pkg-descr
deleted file mode 100644
index 95e896add8f4..000000000000
--- a/net-im/py-xmpppy-yahoo/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The Y!M transport is a dynamic gateway that allows XMPP/Jabber
-users to connect to Yahoo! Messenger using their Groupchat and MUC clients.
-It is based on xmpppy and curphoo Python libraries.
-
-WWW: http://xmpppy.sourceforge.net/yahoo/