ports/147550: [PORT UPDATE] net/skype update to 2.1.0.81

[HASHI Hiroaki]

>Number:         147550
>Category:       ports
>Synopsis:       [PORT UPDATE] net/skype update to 2.1.0.81
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 06 05:10:08 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     HASHI Hiroaki
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
personal
>Environment:
System: FreeBSD stenmark.meridiani.jp 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #3: Tue Jun 1 09:11:17 JST 2010 hashiz at stenmark.meridiani.jp:/usr/obj/usr/src/sys/STENMARK amd64


	
>Description:
	net/skype was BROKEN.

>How-To-Repeat:
	cd /usr/ports/net/skype
	make build

>Fix:
	Update skype to 2.1.0.81.
	And add alsa-oss plugin for linux environment.
	skype -> alsa-lib -> alsa-oss plugin -> /dev/dsp

	see http://www.freebsd.org/cgi/query-pr.cgi?pr=147549

--- Mk::bsd.linux-apps.mk.patch begins here ---
--- Mk/bsd.linux-apps.mk.orig	2009-09-14 19:09:31.000000000 +0900
+++ Mk/bsd.linux-apps.mk	2010-06-06 13:44:51.000000000 +0900
@@ -60,7 +60,7 @@
 WEB_AUTH=			nvu
 
 # Non-version specific components
-_LINUX_APPS_ALL=	allegro alsalib arts aspell atk cairo curl dri esound expat fontconfig \
+_LINUX_APPS_ALL=	allegro alsalib alsapluginsoss arts aspell atk cairo curl dri esound expat fontconfig \
 					freealut gdkpixbuf gtk gtk2 hicontheme imlib jpeg libaudiofile \
 					libg2c libglade libglade2 libglu libmng libogg libsigcpp20 libtheora \
 					libvorbis libxml libxml2 mikmod naslibs openal openmotif openssl pango png png10 qt33 \
@@ -107,6 +107,12 @@
 alsalib_DETECT=		${alsalib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 alsalib_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-lib
 
+alsapluginsoss_FILE=		${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so
+alsapluginsoss_f8_FILE=		${alsapluginsoss_FILE}
+alsapluginsoss_f10_FILE=	${alsapluginsoss_FILE}
+alsapluginsoss_DETECT=		${alsapluginsoss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+alsapluginsoss_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-plugins-oss
+
 arts_FILE=			${LINUXBASE}/usr/lib/libartsc.so.0
 arts_f8_FILE=		${arts_FILE}
 arts_f10_FILE=		${LINUXBASE}/usr/lib/libartsc.so.0
--- Mk::bsd.linux-apps.mk.patch ends here ---

--- net::skype.patch begins here ---
diff -ru net/skype.orig/Makefile net/skype/Makefile
--- net/skype.orig/Makefile	2010-03-01 21:27:37.000000000 +0900
+++ net/skype/Makefile	2010-06-06 13:37:19.000000000 +0900
@@ -9,11 +9,11 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	2.0.0.72
+PORTVERSION=	2.1.0.81
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_static-${DISTVERSION}-oss
+DISTNAME=	skype_static-${DISTVERSION}
 
 MAINTAINER=	itetcu at FreeBSD.org
 COMMENT=	P2P VoIP software
@@ -25,14 +25,12 @@
 USE_LINUX_APPS+=dri
 .endif
 
-BROKEN=		This is the last version of skype that works on FreeBSD, but the distfile is no longer available from the vendor, and won't be in the future. We are working on alternative solutions.
-
 USE_BZIP2=	yes
 USE_LINUX=	yes
-USE_LINUX_APPS+=alsalib expat fontconfig libsigcpp20
+USE_LINUX_APPS+=alsalib expat fontconfig libsigcpp20 alsapluginsoss
 RESTRICTED=	Redistribution prohibited.
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
+WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}
 SKYPEDIR=	share/skype
 PORTDOCS=	LICENSE README
 PLIST_SUB+=	SKYPEDIR=${SKYPEDIR}
diff -ru net/skype.orig/distinfo net/skype/distinfo
--- net/skype.orig/distinfo	2008-06-19 10:31:13.000000000 +0900
+++ net/skype/distinfo	2010-06-06 13:37:32.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (skype_static-2.0.0.72-oss.tar.bz2) = ff41dd31906484863884ee0a7da441c1
-SHA256 (skype_static-2.0.0.72-oss.tar.bz2) = dbb70b25ec16202b867d8336649c8314f9fd8d224cf78ee444f168c8a67e5b6c
-SIZE (skype_static-2.0.0.72-oss.tar.bz2) = 21587040
+MD5 (skype_static-2.1.0.81.tar.bz2) = 137a4a749c8fb3b76c3410514c7e2053
+SHA256 (skype_static-2.1.0.81.tar.bz2) = 5cbdc7c07b47af01607ac6d0b7285368866f92a244f52aed68c4f7c227d466ae
+SIZE (skype_static-2.1.0.81.tar.bz2) = 27555345
diff -ru net/skype.orig/pkg-plist net/skype/pkg-plist
--- net/skype.orig/pkg-plist	2008-11-26 12:21:47.000000000 +0900
+++ net/skype/pkg-plist	2010-06-06 13:43:50.000000000 +0900
@@ -101,6 +101,8 @@
 %%SKYPEDIR%%/lang/skype_th.ts
 %%SKYPEDIR%%/lang/skype_tr.qm
 %%SKYPEDIR%%/lang/skype_tr.ts
+%%SKYPEDIR%%/lang/skype_uk.qm
+%%SKYPEDIR%%/lang/skype_uk.ts
 %%SKYPEDIR%%/lang/skype_zh_s.qm
 %%SKYPEDIR%%/lang/skype_zh_s.ts
 %%SKYPEDIR%%/lang/skype_zh_t.qm
Only in net/skype.orig: skype-next
--- net::skype.patch ends here ---


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