aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeech <beech@FreeBSD.org>2008-03-14 07:11:32 +0800
committerbeech <beech@FreeBSD.org>2008-03-14 07:11:32 +0800
commite498bde39376087dce3763de8b5084ddb6d357b2 (patch)
tree70a121239db12579a6b690269f40bf76277310ad
parent410643d5f82c7c0d800b4a979b38ce8b90adf4e5 (diff)
downloadfreebsd-ports-gnome-e498bde39376087dce3763de8b5084ddb6d357b2.tar.gz
freebsd-ports-gnome-e498bde39376087dce3763de8b5084ddb6d357b2.tar.zst
freebsd-ports-gnome-e498bde39376087dce3763de8b5084ddb6d357b2.zip
- Update to 1.4.0.118
- Note: This update at the request of vendor as v1.2.0.18 is deprecated and no longer available. - Also Note: This version is known to work with amd64, but requires linux_dri which is currently marked ONLY_FOR_ARCHS= i386
Diffstat
-rw-r--r--net-im/skype/Makefile45
-rw-r--r--net-im/skype/distinfo6
-rw-r--r--net-im/skype/files/pkg-message.in10
-rw-r--r--net-im/skype/pkg-descr2
-rw-r--r--net-im/skype/pkg-plist74
-rw-r--r--net-im/skype20/Makefile45
-rw-r--r--net-im/skype20/distinfo6
-rw-r--r--net-im/skype20/files/pkg-message.in10
-rw-r--r--net-im/skype20/pkg-descr2
-rw-r--r--net-im/skype20/pkg-plist74
-rw-r--r--net/skype/Makefile45
-rw-r--r--net/skype/distinfo6
-rw-r--r--net/skype/files/pkg-message.in10
-rw-r--r--net/skype/pkg-descr2
-rw-r--r--net/skype/pkg-plist74
15 files changed, 249 insertions, 162 deletions
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index 370c29516fcc..4c3ebc08798d 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -6,46 +6,53 @@
#
PORTNAME= skype
-PORTVERSION= 1.2.0.18
+PORTVERSION= 1.4.0.118
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= NETBSD
-DISTNAME= skype_staticQT-${PORTVERSION}
+MASTER_SITES= http://download.skype.com/linux/
+DISTNAME= skype_static-${DISTVERSION}-oss
MAINTAINER= beech@FreeBSD.org
COMMENT= P2P VoIP software
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
+ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
+ ${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20
+
+.ifdef WITH_NVIDIA_GL
+RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+.else
+USE_GL= linux
+.endif
USE_BZIP2= yes
USE_LINUX= yes
+ONLY_FOR_ARCHS= i386
RESTRICTED= Redistribution prohibited.
-OPTIONS= NVIDIA_GL "Enable Nvidia Support" off
+WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-oss
+PORTDOCS= LICENSE README
+SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
-.if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
-.endif
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
do-build:
${BRANDELF} -t Linux ${WRKSRC}/skype
do-install:
@${INSTALL} -d ${PREFIX}/share/applications
- @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype_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
- @${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
- @cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sound lang LICENSE" ${DATADIR}/
- @${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. It is fixed in 6.x. Additionally there is some further work in the sound subsystem going on which fixes some related problems. This work will not be available in 6.0-RELEASE. If you experience problems update to the most recent RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt
+ @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png
+ @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype
+ @${CHMOD} a+rx ${PREFIX}/bin/skype
+ @cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds lang" ${DATADIR}/
+
+.if !defined(NOPORTDOCS)
+ @${INSTALL} -d ${DOCSDIR}
+ @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
+
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff --git a/net-im/skype/distinfo b/net-im/skype/distinfo
index 45a776b79003..932edaaef725 100644
--- a/net-im/skype/distinfo
+++ b/net-im/skype/distinfo
@@ -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_static-1.4.0.118-oss.tar.bz2) = e4f45f6aee06de040c7468e71f1be023
+SHA256 (skype_static-1.4.0.118-oss.tar.bz2) = 16c9dc2b6d278bd193d325733bf7132e466f9157732d599c52b357b4e74b0330
+SIZE (skype_static-1.4.0.118-oss.tar.bz2) = 13213514
diff --git a/net-im/skype/files/pkg-message.in b/net-im/skype/files/pkg-message.in
new file mode 100644
index 000000000000..6e521b2d8041
--- /dev/null
+++ b/net-im/skype/files/pkg-message.in
@@ -0,0 +1,10 @@
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+skype_devel has been installed in:
+
+%%PREFIX%%/bin/skype
+
+If you are starting from a terminal, please use the following command:
+ skype --resources=%%DATADIR%%
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/net-im/skype/pkg-descr b/net-im/skype/pkg-descr
index 5d92fde2ea4f..06e936789071 100644
--- a/net-im/skype/pkg-descr
+++ b/net-im/skype/pkg-descr
@@ -2,4 +2,4 @@ Skype is a free program that uses the latest P2P technology to bring
affordable and high-quality voice communications to people all over
the world.
-WWW: http://www.skype.net/
+WWW: http://www.skype.com/
diff --git a/net-im/skype/pkg-plist b/net-im/skype/pkg-plist
index b7763d3ec4ac..50588b6a3544 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/skype/pkg-plist
@@ -1,40 +1,52 @@
bin/skype
-bin/skype_bin
-%%DATADIR%%/icons/skype_16_32.png
-%%DATADIR%%/icons/skype_32_32.png
-%%DATADIR%%/icons/skype_48_32.png
-@dirrm %%DATADIR%%/icons
-%%DATADIR%%/lang/skype_da.qm
+share/applications/skype.desktop
+share/pixmaps/skype.png
+%%DATADIR%%/icons/SkypeBlue_16x16.png
+%%DATADIR%%/icons/SkypeBlue_32x32.png
+%%DATADIR%%/icons/SkypeBlue_48x48.png
%%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_de.ts
%%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_et.ts
+%%DATADIR%%/lang/skype_lv.qm
+%%DATADIR%%/lang/skype_lv.ts
%%DATADIR%%/lang/skype_pl.qm
-%%DATADIR%%/lang/skype_pt_BR.qm
+%%DATADIR%%/lang/skype_pl.ts
+%%DATADIR%%/lang/skype_pt_pt.qm
+%%DATADIR%%/lang/skype_pt_pt.ts
%%DATADIR%%/lang/skype_ro.qm
+%%DATADIR%%/lang/skype_ro.ts
%%DATADIR%%/lang/skype_ru.qm
-%%DATADIR%%/lang/skype_sv.qm
-%%DATADIR%%/lang/skype_zh_CN.qm
-%%DATADIR%%/lang/skype_zh_TW.qm
+%%DATADIR%%/lang/skype_ru.ts
+%%DATADIR%%/lang/skype_tr.qm
+%%DATADIR%%/lang/skype_tr.ts
+%%DATADIR%%/lang/skype_zh_s.qm
+%%DATADIR%%/lang/skype_zh_s.ts
+%%DATADIR%%/lang/skype_zh_t.qm
+%%DATADIR%%/lang/skype_zh_t.ts
+%%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
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/icons
@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
-@dirrm %%DATADIR%%/sound
-%%DATADIR%%/LICENSE
@dirrm %%DATADIR%%
-share/applications/skype.desktop
-share/pixmaps/skype.png
@dirrmtry share/applications
diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index 370c29516fcc..4c3ebc08798d 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -6,46 +6,53 @@
#
PORTNAME= skype
-PORTVERSION= 1.2.0.18
+PORTVERSION= 1.4.0.118
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= NETBSD
-DISTNAME= skype_staticQT-${PORTVERSION}
+MASTER_SITES= http://download.skype.com/linux/
+DISTNAME= skype_static-${DISTVERSION}-oss
MAINTAINER= beech@FreeBSD.org
COMMENT= P2P VoIP software
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
+ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
+ ${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20
+
+.ifdef WITH_NVIDIA_GL
+RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+.else
+USE_GL= linux
+.endif
USE_BZIP2= yes
USE_LINUX= yes
+ONLY_FOR_ARCHS= i386
RESTRICTED= Redistribution prohibited.
-OPTIONS= NVIDIA_GL "Enable Nvidia Support" off
+WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-oss
+PORTDOCS= LICENSE README
+SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
-.if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
-.endif
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
do-build:
${BRANDELF} -t Linux ${WRKSRC}/skype
do-install:
@${INSTALL} -d ${PREFIX}/share/applications
- @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype_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
- @${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
- @cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sound lang LICENSE" ${DATADIR}/
- @${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. It is fixed in 6.x. Additionally there is some further work in the sound subsystem going on which fixes some related problems. This work will not be available in 6.0-RELEASE. If you experience problems update to the most recent RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt
+ @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png
+ @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype
+ @${CHMOD} a+rx ${PREFIX}/bin/skype
+ @cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds lang" ${DATADIR}/
+
+.if !defined(NOPORTDOCS)
+ @${INSTALL} -d ${DOCSDIR}
+ @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
+
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff --git a/net-im/skype20/distinfo b/net-im/skype20/distinfo
index 45a776b79003..932edaaef725 100644
--- a/net-im/skype20/distinfo
+++ b/net-im/skype20/distinfo
@@ -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_static-1.4.0.118-oss.tar.bz2) = e4f45f6aee06de040c7468e71f1be023
+SHA256 (skype_static-1.4.0.118-oss.tar.bz2) = 16c9dc2b6d278bd193d325733bf7132e466f9157732d599c52b357b4e74b0330
+SIZE (skype_static-1.4.0.118-oss.tar.bz2) = 13213514
diff --git a/net-im/skype20/files/pkg-message.in b/net-im/skype20/files/pkg-message.in
new file mode 100644
index 000000000000..6e521b2d8041
--- /dev/null
+++ b/net-im/skype20/files/pkg-message.in
@@ -0,0 +1,10 @@
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+skype_devel has been installed in:
+
+%%PREFIX%%/bin/skype
+
+If you are starting from a terminal, please use the following command:
+ skype --resources=%%DATADIR%%
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/net-im/skype20/pkg-descr b/net-im/skype20/pkg-descr
index 5d92fde2ea4f..06e936789071 100644
--- a/net-im/skype20/pkg-descr
+++ b/net-im/skype20/pkg-descr
@@ -2,4 +2,4 @@ Skype is a free program that uses the latest P2P technology to bring
affordable and high-quality voice communications to people all over
the world.
-WWW: http://www.skype.net/
+WWW: http://www.skype.com/
diff --git a/net-im/skype20/pkg-plist b/net-im/skype20/pkg-plist
index b7763d3ec4ac..50588b6a3544 100644
--- a/net-im/skype20/pkg-plist
+++ b/net-im/skype20/pkg-plist
@@ -1,40 +1,52 @@
bin/skype
-bin/skype_bin
-%%DATADIR%%/icons/skype_16_32.png
-%%DATADIR%%/icons/skype_32_32.png
-%%DATADIR%%/icons/skype_48_32.png
-@dirrm %%DATADIR%%/icons
-%%DATADIR%%/lang/skype_da.qm
+share/applications/skype.desktop
+share/pixmaps/skype.png
+%%DATADIR%%/icons/SkypeBlue_16x16.png
+%%DATADIR%%/icons/SkypeBlue_32x32.png
+%%DATADIR%%/icons/SkypeBlue_48x48.png
%%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_de.ts
%%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_et.ts
+%%DATADIR%%/lang/skype_lv.qm
+%%DATADIR%%/lang/skype_lv.ts
%%DATADIR%%/lang/skype_pl.qm
-%%DATADIR%%/lang/skype_pt_BR.qm
+%%DATADIR%%/lang/skype_pl.ts
+%%DATADIR%%/lang/skype_pt_pt.qm
+%%DATADIR%%/lang/skype_pt_pt.ts
%%DATADIR%%/lang/skype_ro.qm
+%%DATADIR%%/lang/skype_ro.ts
%%DATADIR%%/lang/skype_ru.qm
-%%DATADIR%%/lang/skype_sv.qm
-%%DATADIR%%/lang/skype_zh_CN.qm
-%%DATADIR%%/lang/skype_zh_TW.qm
+%%DATADIR%%/lang/skype_ru.ts
+%%DATADIR%%/lang/skype_tr.qm
+%%DATADIR%%/lang/skype_tr.ts
+%%DATADIR%%/lang/skype_zh_s.qm
+%%DATADIR%%/lang/skype_zh_s.ts
+%%DATADIR%%/lang/skype_zh_t.qm
+%%DATADIR%%/lang/skype_zh_t.ts
+%%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
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/icons
@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
-@dirrm %%DATADIR%%/sound
-%%DATADIR%%/LICENSE
@dirrm %%DATADIR%%
-share/applications/skype.desktop
-share/pixmaps/skype.png
@dirrmtry share/applications
diff --git a/net/skype/Makefile b/net/skype/Makefile
index 370c29516fcc..4c3ebc08798d 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -6,46 +6,53 @@
#
PORTNAME= skype
-PORTVERSION= 1.2.0.18
+PORTVERSION= 1.4.0.118
PORTEPOCH= 1
CATEGORIES= net
-MASTER_SITES= NETBSD
-DISTNAME= skype_staticQT-${PORTVERSION}
+MASTER_SITES= http://download.skype.com/linux/
+DISTNAME= skype_static-${DISTVERSION}-oss
MAINTAINER= beech@FreeBSD.org
COMMENT= P2P VoIP software
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
- ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
+ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
+ ${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20
+
+.ifdef WITH_NVIDIA_GL
+RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+.else
+USE_GL= linux
+.endif
USE_BZIP2= yes
USE_LINUX= yes
+ONLY_FOR_ARCHS= i386
RESTRICTED= Redistribution prohibited.
-OPTIONS= NVIDIA_GL "Enable Nvidia Support" off
+WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-oss
+PORTDOCS= LICENSE README
+SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
-.if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
-.endif
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
do-build:
${BRANDELF} -t Linux ${WRKSRC}/skype
do-install:
@${INSTALL} -d ${PREFIX}/share/applications
- @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype_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
- @${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
- @cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sound lang LICENSE" ${DATADIR}/
- @${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. It is fixed in 6.x. Additionally there is some further work in the sound subsystem going on which fixes some related problems. This work will not be available in 6.0-RELEASE. If you experience problems update to the most recent RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt
+ @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png
+ @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype
+ @${CHMOD} a+rx ${PREFIX}/bin/skype
+ @cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds lang" ${DATADIR}/
+
+.if !defined(NOPORTDOCS)
+ @${INSTALL} -d ${DOCSDIR}
+ @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
+
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff --git a/net/skype/distinfo b/net/skype/distinfo
index 45a776b79003..932edaaef725 100644
--- a/net/skype/distinfo
+++ b/net/skype/distinfo
@@ -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_static-1.4.0.118-oss.tar.bz2) = e4f45f6aee06de040c7468e71f1be023
+SHA256 (skype_static-1.4.0.118-oss.tar.bz2) = 16c9dc2b6d278bd193d325733bf7132e466f9157732d599c52b357b4e74b0330
+SIZE (skype_static-1.4.0.118-oss.tar.bz2) = 13213514
diff --git a/net/skype/files/pkg-message.in b/net/skype/files/pkg-message.in
new file mode 100644
index 000000000000..6e521b2d8041
--- /dev/null
+++ b/net/skype/files/pkg-message.in
@@ -0,0 +1,10 @@
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+skype_devel has been installed in:
+
+%%PREFIX%%/bin/skype
+
+If you are starting from a terminal, please use the following command:
+ skype --resources=%%DATADIR%%
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/net/skype/pkg-descr b/net/skype/pkg-descr
index 5d92fde2ea4f..06e936789071 100644
--- a/net/skype/pkg-descr
+++ b/net/skype/pkg-descr
@@ -2,4 +2,4 @@ Skype is a free program that uses the latest P2P technology to bring
affordable and high-quality voice communications to people all over
the world.
-WWW: http://www.skype.net/
+WWW: http://www.skype.com/
diff --git a/net/skype/pkg-plist b/net/skype/pkg-plist
index b7763d3ec4ac..50588b6a3544 100644
--- a/net/skype/pkg-plist
+++ b/net/skype/pkg-plist
@@ -1,40 +1,52 @@
bin/skype
-bin/skype_bin
-%%DATADIR%%/icons/skype_16_32.png
-%%DATADIR%%/icons/skype_32_32.png
-%%DATADIR%%/icons/skype_48_32.png
-@dirrm %%DATADIR%%/icons
-%%DATADIR%%/lang/skype_da.qm
+share/applications/skype.desktop
+share/pixmaps/skype.png
+%%DATADIR%%/icons/SkypeBlue_16x16.png
+%%DATADIR%%/icons/SkypeBlue_32x32.png
+%%DATADIR%%/icons/SkypeBlue_48x48.png
%%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_de.ts
%%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_et.ts
+%%DATADIR%%/lang/skype_lv.qm
+%%DATADIR%%/lang/skype_lv.ts
%%DATADIR%%/lang/skype_pl.qm
-%%DATADIR%%/lang/skype_pt_BR.qm
+%%DATADIR%%/lang/skype_pl.ts
+%%DATADIR%%/lang/skype_pt_pt.qm
+%%DATADIR%%/lang/skype_pt_pt.ts
%%DATADIR%%/lang/skype_ro.qm
+%%DATADIR%%/lang/skype_ro.ts
%%DATADIR%%/lang/skype_ru.qm
-%%DATADIR%%/lang/skype_sv.qm
-%%DATADIR%%/lang/skype_zh_CN.qm
-%%DATADIR%%/lang/skype_zh_TW.qm
+%%DATADIR%%/lang/skype_ru.ts
+%%DATADIR%%/lang/skype_tr.qm
+%%DATADIR%%/lang/skype_tr.ts
+%%DATADIR%%/lang/skype_zh_s.qm
+%%DATADIR%%/lang/skype_zh_s.ts
+%%DATADIR%%/lang/skype_zh_t.qm
+%%DATADIR%%/lang/skype_zh_t.ts
+%%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
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/icons
@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
-@dirrm %%DATADIR%%/sound
-%%DATADIR%%/LICENSE
@dirrm %%DATADIR%%
-share/applications/skype.desktop
-share/pixmaps/skype.png
@dirrmtry share/applications
generated by cgit (git 2.34.1) at 2024-12-26 03:27:20 +0800