Index: head/net-im/skype4/Makefile =================================================================== --- head/net-im/skype4/Makefile (revision 389222) +++ head/net-im/skype4/Makefile (revision 389223) @@ -1,66 +1,74 @@ # Created by: netchild@FreeBSD.org # $FreeBSD$ PORTNAME= skype PORTVERSION= 4.3.0.37 PORTEPOCH= 1 CATEGORIES= net-im MASTER_SITES= http://download.skype.com/linux/ PKGNAMESUFFIX= 4 MAINTAINER= xmj@chaot.net COMMENT= P2P VoIP software +RUN_DEPENDS= ${LINUXBASE}/lib/skype_oss_wrapper/libpulse.so.0:${PORTSDIR}/audio/linux-skype_oss_wrapper + CONFLICTS= skype-devel-[0-9]* OPTIONS_DEFINE= VIDEO OPTIONS_DEFAULT= VIDEO NO_BUILD= yes USES= cpe desktop-file-utils tar:bzip2 USE_LINUX= yes -USE_LINUX_APPS+= fontconfig xorglibs qt47 qt47-x11 qt47-webkit libsndfile openssl-compat pulseaudio-libs tcp_wrappers-libs flac libasyncns +USE_LINUX_APPS+= fontconfig xorglibs qt47 qt47-x11 qt47-webkit openssl-compat RESTRICTED= Redistribution prohibited. SKYPEDIR= share/skype PORTDOCS= LICENSE README PLIST_SUB+= SKYPEDIR=${SKYPEDIR} SUB_FILES= skype.sh SUB_LIST+= SKYPEDIR=${SKYPEDIR} -BROKEN= Skype 4.3 is missing several Linux syscalls. -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2015-05-26 +.include -#NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -#NVIDIA_GL_USE= LINUX_APPS=xorglibs -#NVIDIA_GL_USE_OFF= LINUX_APPS=dri +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100075 +BROKEN= Skype 4.3 requires Linux 2.6.32 emulation. +.endif +NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver +NVIDIA_GL_USE= LINUX_APPS=xorglibs +NVIDIA_GL_USE_OFF= LINUX_APPS=dri + .include .if ${PORT_OPTIONS:MVIDEO} RUN_DEPENDS+= webcamd>0:${PORTSDIR}/multimedia/webcamd USE_LINUX_APPS+= libv4l SUB_LIST+= VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so " .else SUB_LIST+= VIDEO="" .endif do-install: @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications - @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/applications/ - @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/skype.png - @cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ + @${INSTALL_DATA} ${WRKSRC}/skype.desktop \ + ${STAGEDIR}${PREFIX}/share/applications/ + @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/skype.png + @cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && \ + ${COPYTREE_SHARE} "avatars icons sounds lang" \ + ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The binary main program @${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The wrapper for main program @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${STAGEDIR}${PREFIX}/bin/skype # Documentation @${INSTALL} -d ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include +.include Index: head/net-im/skype4/files/skype.sh.in =================================================================== --- head/net-im/skype4/files/skype.sh.in (revision 389222) +++ head/net-im/skype4/files/skype.sh.in (revision 389223) @@ -1,3 +1,4 @@ -#!/compat/linux/bin/sh -%%VIDEO%% %%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% --disable-api $@ +#!/bin/sh +export %%VIDEO%%LD_LIBRARY_PATH=/lib/skype_oss_wrapper:${LD_LIBRARY_PATH} +exec %%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% --disable-api "$@"