ports/114698: [PATCH] net/skype: Update to 1.4.0.74

Wed Jul 18 14:50:03 UTC 2007

>Number:         114698
>Category:       ports
>Synopsis:       [PATCH] net/skype: Update to 1.4.0.74
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 18 14:50:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Otavio Fernandes
>Release:        6.2-RELEASE
>Organization:
>Environment:
FreeBSD flanela.<DOMAIN>.com 6.2-STABLE FreeBSD 6.2-STABLE #1: Fri Jul  6 16:38:34 BRT 2007     root at flanela.<DOMAIN>.com:/usr/obj/usr/src/sys/OF  i386

>Description:
Update to 1.4.0.74
>How-To-Repeat:

>Fix:
===> Updating from CVS
M Makefile
M distinfo
M pkg-plist
===> Generating patch
===> Viewing diff with less
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/skype/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile

--- Makefile	19 May 2007 20:19:01 -0000	1.33
+++ Makefile	18 Jul 2007 14:34:18 -0000
@@ -1,25 +1,26 @@
-# New ports collection makefile for:	skype
-# Date created:         Jun 21. 2004
-# Whom:                 netchild at FreeBSD.org
+# New ports collection makefile for:    skype
+# Date created:         2007-07-18
+# Whom:                 Otavio Fernandes <otaviof at gmail.com>
 #
 # $FreeBSD: ports/net/skype/Makefile,v 1.33 2007/05/19 20:19:01 flz Exp $
 #
 
 PORTNAME=	skype
-PORTVERSION=	1.2.0.18
-PORTREVISION=	4
+PORTVERSION=	1.4.0.74
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_staticQT-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-static
 
 MAINTAINER=	itetcu at FreeBSD.org
 COMMENT=	P2P VoIP software
 
-CONFLICTS+=	skype-devel-[0-9]*
-
+LIB_DEPENDS=	libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20 \
+		libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
 		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 
+CONFLICTS+=	skype-devel-[0-9]*
+
 USE_BZIP2=	yes
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
@@ -37,7 +38,7 @@
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}_static-${PORTVERSION}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
@@ -46,14 +47,13 @@
 	@${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
+	${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/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png
+	${MKDIR} ${DATADIR}/icons ${DATADIR}/sounds
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
-	${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
-	${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/sound/
+	${INSTALL_DATA} ${WRKSRC}/sounds/*.wav ${DATADIR}/sounds/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
 
 post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/skype/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo	22 Jan 2006 21:23:51 -0000	1.16
+++ distinfo	18 Jul 2007 14:34:18 -0000
@@ -1,3 +1,3 @@
-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
+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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/skype/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- pkg-plist	14 Oct 2006 08:54:26 -0000	1.7
+++ pkg-plist	18 Jul 2007 14:34:18 -0000
@@ -1,38 +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
+%%DATADIR%%/icons/SkypeBlue_16x16.png
+%%DATADIR%%/icons/SkypeBlue_32x32.png
+%%DATADIR%%/icons/SkypeBlue_48x48.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
- at dirrm %%DATADIR%%/lang
-%%DATADIR%%/sound/busy4.wav
-%%DATADIR%%/sound/call_in.wav
-%%DATADIR%%/sound/call_out.wav
-%%DATADIR%%/sound/hangup.wav
-%%DATADIR%%/sound/im.wav
- at dirrm %%DATADIR%%/sound
+%%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
+ at dirrm %%DATADIR%%/sounds
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
 share/applications/skype.desktop
===> Done

>Release-Note:
>Audit-Trail:
>Unformatted:

