3 files changed, 46 insertions, 74 deletions

diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index 58e4c6d8f55a..e9dd493b7c72 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -6,59 +6,44 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	1.3.0.30
-PORTREVISION=	2
+PORTVERSION=	1.4.0.74
+DISTVERSIONSUFFIX=	-static
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	skype-beta_staticQT-${PORTVERSION}
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	P2P VoIP software
 
-CONFLICTS=	skype-[0-9]*
-
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
 		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
-		${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
+		${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
+		${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
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
+USE_GL=	linux
 .endif
 
-BROKEN=	sources not available
-
+BROKEN=	alsa sound not working
 USE_BZIP2=	yes
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
-RESTRICTED=	Redistribution not allowed yet.
+RESTRICTED=	Redistribution not allowed
 
-.include <bsd.port.pre.mk>
-
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}
+DATADIR=	${PREFIX}/share/${PKGBASE}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
-#	${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/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
-	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
-	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
-	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
-	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
-	${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
-	${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/sound/
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
-
-post-install:
+	@${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype-devel_bin
+	@${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype-devel_bin \"\$$@\" 2>&1 | ${GREP} -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype-devel
+	@${CHMOD} a+rx ${PREFIX}/bin/skype-devel
+	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds LICENSE README" ${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 6.x-RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/skype-devel/distinfo b/net-im/skype-devel/distinfo
index 1efc77c2aad8..37332a84b1b7 100644
--- a/net-im/skype-devel/distinfo
+++ b/net-im/skype-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (skype-beta_staticQT-1.3.0.30.tar.bz2) = 2a6155ddc0c9afdfe4a3846ca8276f7b
-SHA256 (skype-beta_staticQT-1.3.0.30.tar.bz2) = 5895f49e7e44ddaeebc4058ecaf3fe6b165dbd7ce6214eea408a952d7e0d5394
-SIZE (skype-beta_staticQT-1.3.0.30.tar.bz2) = 15402445
+MD5 (skype-1.4.0.74-static.tar.bz2) = 4717b9b13e684fd72dd881cb757d285c
+SHA256 (skype-1.4.0.74-static.tar.bz2) = e4174e1b06bb348a0a91ab6374f6d0d6cffe45e73a02203557cc30093afbdc3f
+SIZE (skype-1.4.0.74-static.tar.bz2) = 17082427
diff --git a/net-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist
index 54578dd55be3..350acf4c74de 100644
--- a/net-im/skype-devel/pkg-plist
+++ b/net-im/skype-devel/pkg-plist
@@ -1,44 +1,31 @@
-bin/skype
-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_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%%/sound/call_busy.wav
-%%DATADIR%%/sound/call_hangup.wav
-%%DATADIR%%/sound/call_hold.wav
-%%DATADIR%%/sound/call_initiated.wav
-%%DATADIR%%/sound/call_resume.wav
-%%DATADIR%%/sound/call_ringin.wav
-%%DATADIR%%/sound/call_ringout.wav
-%%DATADIR%%/sound/im2.wav
-%%DATADIR%%/sound/online.wav
-@dirrm %%DATADIR%%/sound
+bin/skype-devel
+bin/skype-devel_bin
 %%DATADIR%%/LICENSE
+%%DATADIR%%/README
+%%DATADIR%%/icons/SkypeBlue_16x16.png
+%%DATADIR%%/icons/SkypeBlue_32x32.png
+%%DATADIR%%/icons/SkypeBlue_48x48.png
+%%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%%/icons
+@dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%
-share/applications/skype.desktop
-share/pixmaps/skype.png
-@dirrmtry share/applications