- Complete the move from net to net-im

- update to 2.2.0.25
- set conflicts with the otehr skype ports
- OPTIONify

Many thanks to: avg@, nox@, kwm@, miwi@, netchild@ and many others

6 files changed, 0 insertions, 220 deletions

diff --git a/net/Makefile b/net/Makefile
index 618dfa206331..8f89fc16a0fe 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1010,7 +1010,6 @@
     SUBDIR += sixxs-aiccu
     SUBDIR += skstream
     SUBDIR += skyfish
-    SUBDIR += skype-devel
     SUBDIR += skystar2
     SUBDIR += sl2tps
     SUBDIR += slbd
diff --git a/net/skype-devel/Makefile b/net/skype-devel/Makefile
deleted file mode 100644
index 10c22bb83ac2..000000000000
--- a/net/skype-devel/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# New ports collection makefile for:	skype-devel
-# Date created:         Jun 21. 2004
-# Whom:                 netchild@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	skype
-PORTVERSION=	2.0.0.68
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://download.skype.com/linux/
-PKGNAMESUFFIX=	-devel
-DISTNAME=	skype_static-${DISTVERSION}-oss
-
-MAINTAINER=	itetcu@FreeBSD.org
-COMMENT=	P2P VoIP software
-
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
-		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
-		${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20 \
-		${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
-
-.ifdef WITH_NVIDIA_GL
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-USE_LINUX_APPS+=dri
-.endif
-
-USE_BZIP2=	yes
-USE_LINUX=	yes
-RESTRICTED=	Redistribution prohibited.
-
-IGNORE=		has moved, use net/skype instead
-
-WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
-SKYPEDIR=	share/skype
-PORTDOCS=	LICENSE README
-SUB_FILES=	pkg-message
-SUB_LIST=	SKYPEDIR=${SKYPEDIR}
-PLIST_SUB=	SKYPEDIR=${SKYPEDIR}
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${MV} ${WRKSRC}/skype.desktop ${WRKSRC}/skype-devel.desktop
-	@${REINPLACE_CMD} -e 's|Exec=skype|Exec=skype_devel --resources=${PREFIX}/${SKYPEDIR}|' \
-		${WRKSRC}/skype-devel.desktop
-
-do-build:
-	@${BRANDELF} -t Linux ${WRKSRC}/skype
-
-do-install:
-	@${INSTALL} -d ${PREFIX}/share/applications
-	@${INSTALL} ${WRKSRC}/skype-devel.desktop ${PREFIX}/share/applications/
-	@${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png
-	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype_devel
-	@${CHMOD} a+rx ${PREFIX}/bin/skype_devel
-	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/skype-devel/distinfo b/net/skype-devel/distinfo
deleted file mode 100644
index fd4524e85da6..000000000000
--- a/net/skype-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (skype_static-2.0.0.68-oss.tar.bz2) = c90106e8b85af3af620ecb27e542016d1459751025a94c32466b0be73b0989f4
-SIZE (skype_static-2.0.0.68-oss.tar.bz2) = 21568297
diff --git a/net/skype-devel/files/pkg-message.in b/net/skype-devel/files/pkg-message.in
deleted file mode 100644
index 320c5fd18814..000000000000
--- a/net/skype-devel/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-skype_devel has been installed in:
-
-%%PREFIX%%/bin/skype_devel 
-
-If you are starting from a terminal, please use the following command:
-	skype_devel --resources=%%DATADIR%%
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/net/skype-devel/pkg-descr b/net/skype-devel/pkg-descr
deleted file mode 100644
index 06e936789071..000000000000
--- a/net/skype-devel/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Skype is a free program that uses the latest P2P technology to bring
-affordable and high-quality voice communications to people all over
-the world.
-
-WWW: http://www.skype.com/
diff --git a/net/skype-devel/pkg-plist b/net/skype-devel/pkg-plist
deleted file mode 100644
index 9f1be48485d7..000000000000
--- a/net/skype-devel/pkg-plist
+++ /dev/null
@@ -1,134 +0,0 @@
-bin/skype_devel
-share/pixmaps/skype.png
-share/applications/skype-devel.desktop
-%%SKYPEDIR%%/avatars/Angel Skype.png
-%%SKYPEDIR%%/avatars/Architect Skype.png
-%%SKYPEDIR%%/avatars/Beach Skype.png
-%%SKYPEDIR%%/avatars/Behind Skype.png
-%%SKYPEDIR%%/avatars/Business Skype.png
-%%SKYPEDIR%%/avatars/Call Me Sweetheart.png
-%%SKYPEDIR%%/avatars/Call Me.png
-%%SKYPEDIR%%/avatars/Carnaval Skype.png
-%%SKYPEDIR%%/avatars/Chic Skype.png
-%%SKYPEDIR%%/avatars/Christmas Skype.png
-%%SKYPEDIR%%/avatars/College Skype.png
-%%SKYPEDIR%%/avatars/DIY Skype.png
-%%SKYPEDIR%%/avatars/DJ Skype.png
-%%SKYPEDIR%%/avatars/Desert Skype.png
-%%SKYPEDIR%%/avatars/Designer Skype.png
-%%SKYPEDIR%%/avatars/Devil Skype.png
-%%SKYPEDIR%%/avatars/Earbud Skype.png
-%%SKYPEDIR%%/avatars/Empire Skype.png
-%%SKYPEDIR%%/avatars/Fax Skype.png
-%%SKYPEDIR%%/avatars/Geisha Skype.png
-%%SKYPEDIR%%/avatars/Hula Skype.png
-%%SKYPEDIR%%/avatars/Make Skype Not War.png
-%%SKYPEDIR%%/avatars/Metal Skype.png
-%%SKYPEDIR%%/avatars/Ninja Skype.png
-%%SKYPEDIR%%/avatars/Party Skype.png
-%%SKYPEDIR%%/avatars/Pop Skype.png
-%%SKYPEDIR%%/avatars/Rice Skype.png
-%%SKYPEDIR%%/avatars/Skypahontas.png
-%%SKYPEDIR%%/avatars/Skype 502.png
-%%SKYPEDIR%%/avatars/Skype Aid.png
-%%SKYPEDIR%%/avatars/Skype Artiste.png
-%%SKYPEDIR%%/avatars/Skype Beauty.png
-%%SKYPEDIR%%/avatars/Skype Bling.png
-%%SKYPEDIR%%/avatars/Skype Boarder.png
-%%SKYPEDIR%%/avatars/Skype Brrr... .png
-%%SKYPEDIR%%/avatars/Skype Candy.png
-%%SKYPEDIR%%/avatars/Skype Cola.png
-%%SKYPEDIR%%/avatars/Skype Cool Shades.png
-%%SKYPEDIR%%/avatars/Skype Extreme.png
-%%SKYPEDIR%%/avatars/Skype Goaaaaal.png
-%%SKYPEDIR%%/avatars/Skype Headset.png
-%%SKYPEDIR%%/avatars/Skype Jah.png
-%%SKYPEDIR%%/avatars/Skype Jyve.png
-%%SKYPEDIR%%/avatars/Skype Safety.png
-%%SKYPEDIR%%/avatars/Skype San.png
-%%SKYPEDIR%%/avatars/Skype Shorty.png
-%%SKYPEDIR%%/avatars/Skype Smiley.png
-%%SKYPEDIR%%/avatars/Skype Time.png
-%%SKYPEDIR%%/avatars/Skype in a Bag.png
-%%SKYPEDIR%%/avatars/Skype-a-Manger.png
-%%SKYPEDIR%%/avatars/Skype-ahoy.png
-%%SKYPEDIR%%/avatars/Skype-in-one.png
-%%SKYPEDIR%%/avatars/Skype.png
-%%SKYPEDIR%%/avatars/Skypers of the Caribbean.png
-%%SKYPEDIR%%/avatars/Star Skype.png
-%%SKYPEDIR%%/avatars/Sushi Skype.png
-%%SKYPEDIR%%/avatars/The Skypeness.png
-%%SKYPEDIR%%/avatars/Travel Skype.png
-%%SKYPEDIR%%/avatars/Wetsuit Skype.png
-%%SKYPEDIR%%/avatars/Yin Yang Skype.png
-%%SKYPEDIR%%/icons/SkypeBlue_16x16.png
-%%SKYPEDIR%%/icons/SkypeBlue_32x32.png
-%%SKYPEDIR%%/icons/SkypeBlue_48x48.png
-%%SKYPEDIR%%/lang/skype_bg.qm
-%%SKYPEDIR%%/lang/skype_bg.ts
-%%SKYPEDIR%%/lang/skype_de.qm
-%%SKYPEDIR%%/lang/skype_de.ts
-%%SKYPEDIR%%/lang/skype_en.qm
-%%SKYPEDIR%%/lang/skype_en.ts
-%%SKYPEDIR%%/lang/skype_es.qm
-%%SKYPEDIR%%/lang/skype_es.ts
-%%SKYPEDIR%%/lang/skype_et.qm
-%%SKYPEDIR%%/lang/skype_et.ts
-%%SKYPEDIR%%/lang/skype_fr.qm
-%%SKYPEDIR%%/lang/skype_fr.ts
-%%SKYPEDIR%%/lang/skype_it.qm
-%%SKYPEDIR%%/lang/skype_it.ts
-%%SKYPEDIR%%/lang/skype_ja.qm
-%%SKYPEDIR%%/lang/skype_ja.ts
-%%SKYPEDIR%%/lang/skype_ko.qm
-%%SKYPEDIR%%/lang/skype_ko.ts
-%%SKYPEDIR%%/lang/skype_lt.qm
-%%SKYPEDIR%%/lang/skype_lt.ts
-%%SKYPEDIR%%/lang/skype_lv.qm
-%%SKYPEDIR%%/lang/skype_lv.ts
-%%SKYPEDIR%%/lang/skype_pl.qm
-%%SKYPEDIR%%/lang/skype_pl.ts
-%%SKYPEDIR%%/lang/skype_pt_br.qm
-%%SKYPEDIR%%/lang/skype_pt_br.ts
-%%SKYPEDIR%%/lang/skype_pt_pt.qm
-%%SKYPEDIR%%/lang/skype_pt_pt.ts
-%%SKYPEDIR%%/lang/skype_ro.qm
-%%SKYPEDIR%%/lang/skype_ro.ts
-%%SKYPEDIR%%/lang/skype_ru.qm
-%%SKYPEDIR%%/lang/skype_ru.ts
-%%SKYPEDIR%%/lang/skype_th.qm
-%%SKYPEDIR%%/lang/skype_th.ts
-%%SKYPEDIR%%/lang/skype_tr.qm
-%%SKYPEDIR%%/lang/skype_tr.ts
-%%SKYPEDIR%%/lang/skype_zh_s.qm
-%%SKYPEDIR%%/lang/skype_zh_s.ts
-%%SKYPEDIR%%/lang/skype_zh_t.qm
-%%SKYPEDIR%%/lang/skype_zh_t.ts
-%%SKYPEDIR%%/sounds/CallBusy.wav
-%%SKYPEDIR%%/sounds/CallConnecting.wav
-%%SKYPEDIR%%/sounds/CallFailed.wav
-%%SKYPEDIR%%/sounds/CallHangup.wav
-%%SKYPEDIR%%/sounds/CallHold.wav
-%%SKYPEDIR%%/sounds/CallRemoteHangup.wav
-%%SKYPEDIR%%/sounds/CallResume.wav
-%%SKYPEDIR%%/sounds/CallRingingIn.wav
-%%SKYPEDIR%%/sounds/CallRingingOut.wav
-%%SKYPEDIR%%/sounds/ChatIncoming.wav
-%%SKYPEDIR%%/sounds/ChatIncomingInitial.wav
-%%SKYPEDIR%%/sounds/ChatOutgoing.wav
-%%SKYPEDIR%%/sounds/ContactAdded.wav
-%%SKYPEDIR%%/sounds/ContactAuthRequest.wav
-%%SKYPEDIR%%/sounds/ContactOffline.wav
-%%SKYPEDIR%%/sounds/ContactOnline.wav
-%%SKYPEDIR%%/sounds/SkypeLogin.wav
-%%SKYPEDIR%%/sounds/SkypeLogout.wav
-%%SKYPEDIR%%/sounds/TransferComplete.wav
-%%SKYPEDIR%%/sounds/TransferFailed.wav
-%%SKYPEDIR%%/sounds/TransferRequest.wav
-%%SKYPEDIR%%/sounds/VoicemailReceived.wav
-@dirrm %%SKYPEDIR%%/sounds
-@dirrm %%SKYPEDIR%%/lang
-@dirrm %%SKYPEDIR%%/icons
-@dirrm %%SKYPEDIR%%/avatars
-@dirrm %%SKYPEDIR%%
-@dirrmtry share/applications