Date: Fri, 19 Feb 2010 18:36:08 GMT From: Paul Shepel <tacid@tacid.kiev.ua> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/144114: [patch] update net/skype to 2.1.0.81 version Message-ID: <201002191836.o1JIa8WZ076240@www.freebsd.org> Resent-Message-ID: <201002191840.o1JIe17F085047@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144114 >Category: ports >Synopsis: [patch] update net/skype to 2.1.0.81 version >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: Fri Feb 19 18:40:00 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Paul Shepel >Release: 8.0-RELEASE >Organization: >Environment: FreeBSD paul 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 16:02:27 UTC 2010 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Port was marked BROKEN so I've made patch to update it to new version. >How-To-Repeat: >Fix: Patch Patch attached with submission follows: diff -ruN net/skype.orig/Makefile net/skype/Makefile --- net/skype.orig/Makefile 2010-02-18 11:40:41.000000000 +0200 +++ net/skype/Makefile 2010-02-19 19:41:20.000000000 +0200 @@ -9,61 +9,61 @@ # PORTNAME= skype -PORTVERSION= 2.0.0.72 -PORTEPOCH= 1 -CATEGORIES= net +PORTVERSION= 2.1.0.81 +CATEGORIES= net linux MASTER_SITES= http://download.skype.com/linux/ -DISTNAME= skype_static-${DISTVERSION}-oss +DISTNAME= skype_static-${DISTVERSION} MAINTAINER= itetcu@FreeBSD.org COMMENT= P2P VoIP software -.ifdef WITH_NVIDIA_GL -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -USE_LINUX_APPS+=xorglibs -.else -USE_LINUX_APPS+=dri -.endif - -BROKEN= fails to fetch - USE_BZIP2= yes USE_LINUX= yes USE_LINUX_APPS+=alsalib expat fontconfig libsigcpp20 RESTRICTED= Redistribution prohibited. -WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss +WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION} SKYPEDIR= share/skype PORTDOCS= LICENSE README PLIST_SUB+= SKYPEDIR=${SKYPEDIR} SUB_FILES= skype.sh SUB_LIST+= SKYPEDIR=${SKYPEDIR} +NO_BUILD= yes .include <bsd.port.pre.mk> -pre-fetch: - @${ECHO_MSG} "" - @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * *" - @${ECHO_MSG} "ATTENTION!" - @${ECHO_MSG} "" - @${ECHO_MSG} "Skype requires at least linux_base-fc6" - @${ECHO_MSG} "which is NOT default at this time." - @${ECHO_MSG} "If you don't have that version or above installed," - @${ECHO_MSG} "hit 'control c' now!" - @${ECHO_MSG} "" - @${ECHO_MSG} "Please read ${PORTSDIR}/UPDATING 20080318" - @${ECHO_MSG} "for update and install instructions." - @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * *" - @${ECHO_MSG} "" +.if ${OSVERSION}<700055 +IGNORE= you need FreeBSD>=7.0 RELEASE with Linux emulation 2.6.x. +.elif ${OSVERSION}<800076 && !defined(OVERRIDE_LINUX_NONBASE_PORTS) +IGNORE= net/skype requires at least emulators/linux_base-fc6 which is NOT default. \ + Please read ${PORTSDIR}/UPDATING 20080318 for update and install instructions. +.endif + +.ifndef WITHOUT_NVIDIA_GL +# Cheking for installed nvidia-driver with linux +.if exists(${LINUXBASE}/usr/lib/libnvidia-tls.so.1) +WITH_NVIDIA_GL?=yes +.endif +.endif + +.ifdef WITH_NVIDIA_GL +RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver +USE_LINUX_APPS+=xorglibs +.else +USE_LINUX_APPS+=dri +.endif -do-build: - @${BRANDELF} -t Linux ${WRKSRC}/skype +pre-everything:: +.ifdef WITH_NVIDIA_GL + @${ECHO_MSG} "===> Installing with NVIDIA driver support" +.endif do-install: @${INSTALL} -d ${PREFIX}/share/applications @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/ @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png @cd ${WRKSRC}/ && ${MKDIR} ${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/ + @${INSTALL_DATA} ${WRKSRC}/skype.conf ${PREFIX}/etc/dbus-1/system.d/ # The binary main program @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/${SKYPEDIR}/ @@ -71,6 +71,11 @@ # The wrapper for main program @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype +# Creating symlink to /home in LINUXBASE because skype will search for user homes there + @if [ ! -d ${LINUXBASE}/home ]; then \ + ${LN} -s /home ${LINUXBASE} ; \ + fi + .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} diff -ruN net/skype.orig/distinfo net/skype/distinfo --- net/skype.orig/distinfo 2010-02-18 11:40:41.000000000 +0200 +++ net/skype/distinfo 2010-02-18 19:59:04.000000000 +0200 @@ -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 -ruN net/skype.orig/pkg-plist net/skype/pkg-plist --- net/skype.orig/pkg-plist 2010-02-18 11:40:41.000000000 +0200 +++ net/skype/pkg-plist 2010-02-18 20:01:48.000000000 +0200 @@ -1,6 +1,7 @@ bin/skype share/pixmaps/skype.png share/applications/skype.desktop +etc/dbus-1/system.d/skype.conf %%SKYPEDIR%%/skype %%SKYPEDIR%%/avatars/Angel Skype.png %%SKYPEDIR%%/avatars/Architect Skype.png @@ -101,6 +102,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 @@ -133,3 +136,5 @@ @dirrm %%SKYPEDIR%%/avatars @dirrm %%SKYPEDIR%% @dirrmtry share/applications +@dirrmtry etc/dbus-1/system.d +@dirrmtry etc/dbus-1 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002191836.o1JIa8WZ076240>