- Revert to 1.2.0.18

Approved by:	portmgr (linimon, kris), sat (mentor)

3 files changed, 61 insertions, 60 deletions

diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index 9c860c623027..370c29516fcc 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -6,42 +6,46 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	1.4.0.118
+PORTVERSION=	1.2.0.18
+PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_static-${DISTVERSION}-oss
+MASTER_SITES=	NETBSD
+DISTNAME=	skype_staticQT-${PORTVERSION}
 
 MAINTAINER=	beech@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
-
-.ifdef WITH_NVIDIA_GL
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-USE_GL=	linux
-.endif
+		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 
 USE_BZIP2=	yes
 USE_LINUX=	yes
-ONLY_FOR_ARCHS=	i386
 
-RESTRICTED=	Redistribution not allowed
+RESTRICTED=	Redistribution prohibited.
+
+OPTIONS=	NVIDIA_GL "Enable Nvidia Support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_NVIDIA_GL)
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+.else
+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
+.endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
-DATADIR=	${PREFIX}/share/${PKGBASE}
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 do-build:
-	@${BRANDELF} -t Linux ${WRKSRC}/skype
+	${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
 	@${INSTALL} -d ${PREFIX}/share/applications
-	@${INSTALL} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
-	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype
+	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
+	@${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | grep -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype
 	@${CHMOD} a+rx ${PREFIX}/bin/skype
-	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds lang LICENSE README" ${DATADIR}/
-	@${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. If you experience problems update to the most recent FreeBSD RELEASE, if this does not fix your problems, ask on multimedia@FreeBSD.org." | fmt
+	@${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+	@${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
+	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sound lang LICENSE" ${DATADIR}/
+	@${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. It is fixed in 6.x. Additionally there is some further work in the sound subsystem going on which fixes some related problems. This work will not be available in 6.0-RELEASE. If you experience problems update to the most recent RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/skype20/distinfo b/net-im/skype20/distinfo
index af0b214afed4..45a776b79003 100644
--- a/net-im/skype20/distinfo
+++ b/net-im/skype20/distinfo
@@ -1,3 +1,3 @@
-MD5 (skype_static-1.4.0.118-oss.tar.bz2) = 00813dd5db73f116fdcf19778bb1234a
-SHA256 (skype_static-1.4.0.118-oss.tar.bz2) = 606bc7ba4b73112f572608d2fd7a2829bd1c3c0c9891063aee9bbeebfbf23821
-SIZE (skype_static-1.4.0.118-oss.tar.bz2) = 19595152
+MD5 (skype_staticQT-1.2.0.18.tar.bz2) = bc05f6883e8c0350186e1a376940d5c8
+SHA256 (skype_staticQT-1.2.0.18.tar.bz2) = fa825ff455b7c6fb53bd4090e7fb99038ce426b4078b4f1dda0307fc4fa216b3
+SIZE (skype_staticQT-1.2.0.18.tar.bz2) = 10678284
diff --git a/net-im/skype20/pkg-plist b/net-im/skype20/pkg-plist
index b48ce968d735..b7763d3ec4ac 100644
--- a/net-im/skype20/pkg-plist
+++ b/net-im/skype20/pkg-plist
@@ -1,43 +1,40 @@
 bin/skype
-%%DATADIR%%/icons/SkypeBlue_16x16.png
-%%DATADIR%%/icons/SkypeBlue_32x32.png
-%%DATADIR%%/icons/SkypeBlue_48x48.png
+bin/skype_bin
+%%DATADIR%%/icons/skype_16_32.png
+%%DATADIR%%/icons/skype_32_32.png
+%%DATADIR%%/icons/skype_48_32.png
 @dirrm %%DATADIR%%/icons
-%%DATADIR%%/lang/skype_de.ts
-%%DATADIR%%/lang/skype_et.ts
-%%DATADIR%%/lang/skype_lv.ts
-%%DATADIR%%/lang/skype_pl.ts
-%%DATADIR%%/lang/skype_pt_pt.ts
-%%DATADIR%%/lang/skype_ro.ts
-%%DATADIR%%/lang/skype_ru.ts
-%%DATADIR%%/lang/skype_tr.ts
-%%DATADIR%%/lang/skype_zh_s.ts
-%%DATADIR%%/lang/skype_zh_t.ts
+%%DATADIR%%/lang/skype_da.qm
+%%DATADIR%%/lang/skype_de.qm
+%%DATADIR%%/lang/skype_el.qm
+%%DATADIR%%/lang/skype_en.qm
+%%DATADIR%%/lang/skype_es.qm
+%%DATADIR%%/lang/skype_es_AR.qm
+%%DATADIR%%/lang/skype_et.qm
+%%DATADIR%%/lang/skype_fi.qm
+%%DATADIR%%/lang/skype_fr.qm
+%%DATADIR%%/lang/skype_it.qm
+%%DATADIR%%/lang/skype_iw.qm
+%%DATADIR%%/lang/skype_ja.qm
+%%DATADIR%%/lang/skype_ko.qm
+%%DATADIR%%/lang/skype_nl.qm
+%%DATADIR%%/lang/skype_no.qm
+%%DATADIR%%/lang/skype_pl.qm
+%%DATADIR%%/lang/skype_pt_BR.qm
+%%DATADIR%%/lang/skype_ro.qm
+%%DATADIR%%/lang/skype_ru.qm
+%%DATADIR%%/lang/skype_sv.qm
+%%DATADIR%%/lang/skype_zh_CN.qm
+%%DATADIR%%/lang/skype_zh_TW.qm
 @dirrm %%DATADIR%%/lang
-%%DATADIR%%/sounds/CallBusy.wav
-%%DATADIR%%/sounds/CallConnecting.wav
-%%DATADIR%%/sounds/CallHangup.wav
-%%DATADIR%%/sounds/CallHold.wav
-%%DATADIR%%/sounds/CallRemoteHangup.wav
-%%DATADIR%%/sounds/CallResume.wav
-%%DATADIR%%/sounds/CallRingingIn.wav
-%%DATADIR%%/sounds/CallRingingOut.wav
-%%DATADIR%%/sounds/ChatIncoming.wav
-%%DATADIR%%/sounds/ChatIncomingInitial.wav
-%%DATADIR%%/sounds/ChatOutgoing.wav
-%%DATADIR%%/sounds/ContactAdded.wav
-%%DATADIR%%/sounds/ContactAuthRequest.wav
-%%DATADIR%%/sounds/ContactOffline.wav
-%%DATADIR%%/sounds/ContactOnline.wav
-%%DATADIR%%/sounds/SkypeLogin.wav
-%%DATADIR%%/sounds/SkypeLogout.wav
-%%DATADIR%%/sounds/TransferComplete.wav
-%%DATADIR%%/sounds/TransferFailed.wav
-%%DATADIR%%/sounds/TransferRequest.wav
-%%DATADIR%%/sounds/VoicemailReceived.wav
-@dirrm %%DATADIR%%/sounds
+%%DATADIR%%/sound/busy4.wav
+%%DATADIR%%/sound/call_in.wav
+%%DATADIR%%/sound/call_out.wav
+%%DATADIR%%/sound/hangup.wav
+%%DATADIR%%/sound/im.wav
+@dirrm %%DATADIR%%/sound
 %%DATADIR%%/LICENSE
-%%DATADIR%%/README
 @dirrm %%DATADIR%%
 share/applications/skype.desktop
+share/pixmaps/skype.png
 @dirrmtry share/applications