aboutsummaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJohannes Jost Meixner <xmj@FreeBSD.org>2015-06-11 14:58:03 +0000
committerJohannes Jost Meixner <xmj@FreeBSD.org>2015-06-11 14:58:03 +0000
commit3b7562930ff3e861d0f380f41d0198ea327fe2bd (patch)
tree11ab539cc7564d100adb4b674a0425e893721b7f /net-im
parent55e63d75574296882a03382650b992b82611a40f (diff)
downloadports-3b7562930ff3e861d0f380f41d0198ea327fe2bd.tar.gz
ports-3b7562930ff3e861d0f380f41d0198ea327fe2bd.zip
Notes
Diffstat (limited to 'net-im')
-rw-r--r--net-im/skype4/Makefile30
-rw-r--r--net-im/skype4/files/skype.sh.in5
2 files changed, 22 insertions, 13 deletions
diff --git a/net-im/skype4/Makefile b/net-im/skype4/Makefile
index 5d1c7c0722d3..0827ef5d9ced 100644
--- a/net-im/skype4/Makefile
+++ b/net-im/skype4/Makefile
@@ -11,6 +11,8 @@ 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
@@ -20,7 +22,7 @@ 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.
@@ -30,13 +32,15 @@ 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 <bsd.port.pre.mk>
+
+.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
+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 <bsd.port.options.mk>
.if ${PORT_OPTIONS:MVIDEO}
@@ -49,9 +53,13 @@ SUB_LIST+= VIDEO=""
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}/
@@ -63,4 +71,4 @@ do-install:
@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/skype4/files/skype.sh.in b/net-im/skype4/files/skype.sh.in
index 256b15d9a7bd..4a704598a288 100644
--- a/net-im/skype4/files/skype.sh.in
+++ b/net-im/skype4/files/skype.sh.in
@@ -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 "$@"