Index: head/irc/bitlbee/Makefile
===================================================================
--- head/irc/bitlbee/Makefile	(revision 544932)
+++ head/irc/bitlbee/Makefile	(revision 544933)
@@ -1,127 +1,117 @@
 # $FreeBSD$
 
 PORTNAME=	bitlbee
 PORTVERSION=	3.6
 PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		LOCAL/brix
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	IRC to other chat networks gateway
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xmlto:textproc/xmlto \
 		xsltproc:textproc/libxslt
 
 USES=		gettext-runtime gmake gnome pkgconfig
 
 SUB_FILES=	pkg-message
 PORTDOCS=	AUTHORS CHANGES CREDITS FAQ README
 PORTEXAMPLES=	bitlbee.conf motd.txt
 
 HAS_CONFIGURE=	yes
 USE_RC_SUBR=	bitlbee
 USE_GNOME=	glib20
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES LDAP OTR PAM
 
 OPTIONS_SINGLE=		EVENTS SSL
 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
 LIBEVENT_BROKEN=	bitlbee w/ libevent fails to start as daemon or fork
 LIBEVENT_DESC=		Use libevent as event handler
 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
 
 CONFIGURE_ARGS=		--config=/var/db/bitlbee \
 			--pcdir=${PREFIX}/libdata/pkgconfig \
 			--prefix=${PREFIX} \
 			--mandir=${MANPREFIX}/man \
 			--strip=1 \
 			--yahoo=0
 
 DEBUG_CONFIGURE_ON=	--debug=1
 DOCS_USES=		python:build
 DOCS_CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 GLIB_CONFIGURE_ON=	--events=glib
 GNUTLS_CONFIGURE_ON=	--ssl=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 JABBER_CONFIGURE_OFF=	--jabber=0
 LDAP_CONFIGURE_ON=	--ldap=1
 LDAP_USE=		OPENLDAP=yes
 LIBEVENT_CONFIGURE_ON=	--events=libevent --libevent=${LOCALBASE}
 LIBEVENT_LIB_DEPENDS=	libevent.so:devel/libevent
 LIBPURPLE_CONFIGURE_ON=	--purple=1
 LIBPURPLE_LIB_DEPENDS=	libpurple.so:net-im/libpurple
 MSN_CONFIGURE_OFF=	--msn=0
 NSS_CONFIGURE_ON=	--ssl=nss
 NSS_LIB_DEPENDS=	libnss3.so:security/nss \
 			libnspr4.so:devel/nspr \
 			libplc4.so:devel/nspr \
 			libplds4.so:devel/nspr
 OPENSSL_CONFIGURE_ON=	--ssl=openssl
 OPENSSL_USES=		ssl
 OSCAR_CONFIGURE_OFF=	--oscar=0
 OTR_CONFIGURE_ON=	--otr=1
 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
 GROUPS=		bitlbee
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^install:/ s/$$/ install-dev/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s|^\(EFLAGS=.*\)|\1 ${LDFLAGS}|" \
 			  -e "/include.*ldap.h/ s,-E,-I${LOCALBASE}/include -E," \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s:/etc/bitlbee/motd.txt:${ETCDIR}/motd.txt:" \
 		-e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
 		${WRKSRC}/bitlbee.conf
 	@${REINPLACE_CMD} -e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
 		${WRKSRC}/doc/bitlbee.8
 
 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}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/doc/@} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/irc/bitlbee/pkg-plist
===================================================================
--- head/irc/bitlbee/pkg-plist	(revision 544932)
+++ head/irc/bitlbee/pkg-plist	(revision 544933)
@@ -1,49 +1,44 @@
 man/man5/bitlbee.conf.5.gz
 man/man8/bitlbee.8.gz
 sbin/bitlbee
 include/bitlbee/account.h
 include/bitlbee/arc.h
 include/bitlbee/auth.h
 include/bitlbee/base64.h
 include/bitlbee/bee.h
 include/bitlbee/bitlbee.h
 include/bitlbee/canohost.h
 include/bitlbee/commands.h
 include/bitlbee/conf.h
 include/bitlbee/config.h
 include/bitlbee/dcc.h
 include/bitlbee/events.h
 include/bitlbee/ft.h
 include/bitlbee/ftutil.h
 include/bitlbee/help.h
 include/bitlbee/http_client.h
 include/bitlbee/ini.h
 include/bitlbee/ipc.h
 include/bitlbee/irc.h
 include/bitlbee/json.h
 include/bitlbee/json_util.h
 include/bitlbee/log.h
 include/bitlbee/md5.h
 include/bitlbee/misc.h
 include/bitlbee/nick.h
 include/bitlbee/nogaim.h
 include/bitlbee/oauth.h
 include/bitlbee/oauth2.h
 include/bitlbee/otr.h
 include/bitlbee/proxy.h
 include/bitlbee/query.h
 include/bitlbee/set.h
 include/bitlbee/sha1.h
 include/bitlbee/sock.h
 include/bitlbee/ssl_client.h
 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