Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Aug 2020 12:26:57 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r544933 - head/irc/bitlbee
Message-ID:  <202008151226.07FCQvPC046465@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Sat Aug 15 12:26:57 2020
New Revision: 544933
URL: https://svnweb.freebsd.org/changeset/ports/544933

Log:
  irc/bitlbee: remove optional expired Skype support

Modified:
  head/irc/bitlbee/Makefile
  head/irc/bitlbee/pkg-plist

Modified: head/irc/bitlbee/Makefile
==============================================================================
--- head/irc/bitlbee/Makefile	Sat Aug 15 12:18:51 2020	(r544932)
+++ head/irc/bitlbee/Makefile	Sat Aug 15 12:26:57 2020	(r544933)
@@ -34,9 +34,9 @@ OPTIONS_SINGLE_EVENTS=	GLIB LIBEVENT
 OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS NSS
 
 OPTIONS_MULTI=		PROTO
-OPTIONS_MULTI_PROTO=	LIBPURPLE JABBER MSN OSCAR SKYPE TWITTER
+OPTIONS_MULTI_PROTO=	LIBPURPLE JABBER MSN OSCAR TWITTER
 
-LIBPURPLE_PREVENTS=	JABBER MSN OSCAR SKYPE TWITTER
+LIBPURPLE_PREVENTS=	JABBER MSN OSCAR TWITTER
 LIBPURPLE_PREVENTS_MSG=	If libpurple is enabled, all native protocols must be disabled
 
 GLIB_DESC=		Use glib as event handler
@@ -46,7 +46,6 @@ LIBPURPLE_DESC=		Use libpurple for protocol support
 MSN_DESC=		Microsoft Messenger support
 OSCAR_DESC=		OSCAR (ICQ) support
 OTR_DESC=		Off-the-Record Messaging support
-SKYPE_DESC=		Skype support
 TWITTER_DESC=		Twitter support
 
 OPTIONS_DEFAULT=	GLIB GNUTLS JABBER OSCAR OTR TWITTER
@@ -87,9 +86,6 @@ OTR_LIB_DEPENDS=	libotr.so.5:security/libotr \
 			libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 PAM_CONFIGURE_ON=	--pam=1
-SKYPE_CONFIGURE_ON=	--skype=1
-SKYPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Skype4Py>0:net-im/py-skype4py@${PY_FLAVOR}
-SKYPE_USES=		python:2.7
 TWITTER_CONFIGURE_OFF=	--twitter=0
 
 USERS=		bitlbee
@@ -109,12 +105,6 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
-
-post-install-SKYPE-on:
-	${MV} ${STAGEDIR}${PREFIX}/etc/skyped/skyped.conf \
-		${STAGEDIR}${PREFIX}/etc/skyped/skyped.conf.sample
-	${MV} ${STAGEDIR}${PREFIX}/etc/skyped/skyped.cnf \
-		${STAGEDIR}${PREFIX}/etc/skyped/skyped.cnf.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/irc/bitlbee/pkg-plist
==============================================================================
--- head/irc/bitlbee/pkg-plist	Sat Aug 15 12:18:51 2020	(r544932)
+++ head/irc/bitlbee/pkg-plist	Sat Aug 15 12:26:57 2020	(r544933)
@@ -40,10 +40,5 @@ include/bitlbee/storage.h
 include/bitlbee/url.h
 include/bitlbee/xmltree.h
 libdata/pkgconfig/bitlbee.pc
-%%SKYPE%%bin/skyped
-%%SKYPE%%lib/bitlbee/skype.so
-%%SKYPE%%man/man1/skyped.1.gz
-%%SKYPE%%@sample etc/skyped/skyped.conf.sample
-%%SKYPE%%@sample etc/skyped/skyped.cnf.sample
 %%DATADIR%%/help.txt
 @dir etc/bitlbee



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008151226.07FCQvPC046465>