- Update to 1.4.0.118 (oss)

Approved by:	portmgr (linimon, kris), sat (mentor)

8 files changed, 68 insertions, 51 deletions

diff --git a/MOVED b/MOVED
index 753e7205ed10..5306677e021a 100644
--- a/MOVED
+++ b/MOVED
@@ -3315,7 +3315,6 @@ korean/mule-freewnn||2007-10-14|Has expired: emacs19 and related ports are obsol
 www/w3||2007-10-14|Has expired: distfile is 10 years old and depends on emacs19 which is obsolete
 security/p5-Digest-SHA2||2007-10-16|Has expired: Has numerious known bugs, deprecated in favor of Digest::SHA
 devel/p5-Devel-Peek||2007-10-16|Has expired: depends on antique versions of perl
-net/skype-devel|net/skype|2007-10-16|No longer needed: Please update to net/skype
 devel/bison2|devel/bison|2007-10-17|Bison 1.x to 2.x conversion
 games/actioncube|games/assaultcube|2007-10-19|Project name changed
 x11-fm/pcmanfm||2007-10-21|Has expired: Unmaintained upstream
diff --git a/UPDATING b/UPDATING
index 80784a09d561..6567aed124f2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -28,16 +28,14 @@ upgrades.
 
   After that, new nvidia-driver will install cleanly.
 
-20071030:
-  AFFECTS: users of net/skype
+20071101:
+  AFFECTS: users of net/skype-devel
   AUTHOR: beech@FreeBSD.org
 
-  The skype port has been upgraded to version 1.4.0.118. This requires a sysctl
-  change to run. After upgrading, please do: "sysctl compat.linux.osrelease=2.6"
-  from a terminal. Also add: "compat.linux.osrelease=2.6" to your
-  /etc/sysctl.conf  to make this change at boot time. Also, net/skype-devel has
-  been removed from the ports tree. All skype users are encouraged to update to
-  the latest version.
+  The skype-devel port has been upgraded to version 1.4.0.118. This requires a sysctl
+  change to run. After upgrading, please do: "sysctl compat.linux.osrelease=2.4.20"
+  from a terminal. Also add: "compat.linux.osrelease=2.4.20" to your
+  /etc/sysctl.conf  to make this change at boot time.
 
 20071030:
   AFFECTS: users of sysutils/daemontools
diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index f16c85dfce30..fab7a429d949 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	1.4.0.99
+PORTVERSION=	1.4.0.118
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	skype_static-${DISTVERSION}
+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}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
 		${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20
 
 .ifdef WITH_NVIDIA_GL
@@ -26,24 +25,23 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 USE_GL=	linux
 .endif
 
-BROKEN=	alsa sound not working
 USE_BZIP2=	yes
 USE_LINUX=	yes
-ONLY_FOR_ARCHS=	i386 amd64
 
-RESTRICTED=	Redistribution not allowed
+RESTRICTED=	Redistribution prohibited.
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
 DATADIR=	${PREFIX}/share/${PKGBASE}
 
 do-build:
-	${BRANDELF} -t Linux ${WRKSRC}/skype
+	@${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
-	@${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype-devel_bin
-	@${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype-devel_bin \"\$$@\" 2>&1 | ${GREP} -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype-devel
-	@${CHMOD} a+rx ${PREFIX}/bin/skype-devel
-	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds LICENSE README" ${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 6.x-RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt
+	@${INSTALL} -d ${PREFIX}/share/applications
+	@${INSTALL} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype_devel
+	@${CHMOD} a+rx ${PREFIX}/bin/skype_devel
+	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds lang LICENSE README" ${DATADIR}/
+	@${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. If you experience problems update to the most recent FreeBSD RELEASE, if this does not fix your problems, ask on multimedia@FreeBSD.org." | fmt
 
 .include <bsd.port.mk>
diff --git a/net-im/skype-devel/distinfo b/net-im/skype-devel/distinfo
index e7e83da924f4..af0b214afed4 100644
--- a/net-im/skype-devel/distinfo
+++ b/net-im/skype-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (skype_static-1.4.0.99.tar.bz2) = 879418eb6a64cd5ff561465a41bb78ab
-SHA256 (skype_static-1.4.0.99.tar.bz2) = bfa236e74b00222360d8e4a83fac7560e6043d264d29911645bcdea8be5fe14c
-SIZE (skype_static-1.4.0.99.tar.bz2) = 17543204
+MD5 (skype_static-1.4.0.118-oss.tar.bz2) = 00813dd5db73f116fdcf19778bb1234a
+SHA256 (skype_static-1.4.0.118-oss.tar.bz2) = 606bc7ba4b73112f572608d2fd7a2829bd1c3c0c9891063aee9bbeebfbf23821
+SIZE (skype_static-1.4.0.118-oss.tar.bz2) = 19595152
diff --git a/net-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist
index 350acf4c74de..41f038026df2 100644
--- a/net-im/skype-devel/pkg-plist
+++ b/net-im/skype-devel/pkg-plist
@@ -1,10 +1,19 @@
-bin/skype-devel
-bin/skype-devel_bin
-%%DATADIR%%/LICENSE
-%%DATADIR%%/README
+bin/skype_devel
 %%DATADIR%%/icons/SkypeBlue_16x16.png
 %%DATADIR%%/icons/SkypeBlue_32x32.png
 %%DATADIR%%/icons/SkypeBlue_48x48.png
+@dirrm %%DATADIR%%/icons
+%%DATADIR%%/lang/skype_de.ts
+%%DATADIR%%/lang/skype_et.ts
+%%DATADIR%%/lang/skype_lv.ts
+%%DATADIR%%/lang/skype_pl.ts
+%%DATADIR%%/lang/skype_pt_pt.ts
+%%DATADIR%%/lang/skype_ro.ts
+%%DATADIR%%/lang/skype_ru.ts
+%%DATADIR%%/lang/skype_tr.ts
+%%DATADIR%%/lang/skype_zh_s.ts
+%%DATADIR%%/lang/skype_zh_t.ts
+@dirrm %%DATADIR%%/lang
 %%DATADIR%%/sounds/CallBusy.wav
 %%DATADIR%%/sounds/CallConnecting.wav
 %%DATADIR%%/sounds/CallHangup.wav
@@ -26,6 +35,9 @@ bin/skype-devel_bin
 %%DATADIR%%/sounds/TransferFailed.wav
 %%DATADIR%%/sounds/TransferRequest.wav
 %%DATADIR%%/sounds/VoicemailReceived.wav
-@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/sounds
+%%DATADIR%%/LICENSE
+%%DATADIR%%/README
 @dirrm %%DATADIR%%
+share/applications/skype.desktop
+@dirrmtry share/applications
diff --git a/net/skype-devel/Makefile b/net/skype-devel/Makefile
index f16c85dfce30..fab7a429d949 100644
--- a/net/skype-devel/Makefile
+++ b/net/skype-devel/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	1.4.0.99
+PORTVERSION=	1.4.0.118
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	skype_static-${DISTVERSION}
+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}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
 		${LINUXBASE}/usr/lib/libsigc-2.0.so.0:${PORTSDIR}/devel/linux-libsigc++20
 
 .ifdef WITH_NVIDIA_GL
@@ -26,24 +25,23 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 USE_GL=	linux
 .endif
 
-BROKEN=	alsa sound not working
 USE_BZIP2=	yes
 USE_LINUX=	yes
-ONLY_FOR_ARCHS=	i386 amd64
 
-RESTRICTED=	Redistribution not allowed
+RESTRICTED=	Redistribution prohibited.
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
 DATADIR=	${PREFIX}/share/${PKGBASE}
 
 do-build:
-	${BRANDELF} -t Linux ${WRKSRC}/skype
+	@${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
-	@${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype-devel_bin
-	@${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype-devel_bin \"\$$@\" 2>&1 | ${GREP} -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype-devel
-	@${CHMOD} a+rx ${PREFIX}/bin/skype-devel
-	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds LICENSE README" ${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 6.x-RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt
+	@${INSTALL} -d ${PREFIX}/share/applications
+	@${INSTALL} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype_devel
+	@${CHMOD} a+rx ${PREFIX}/bin/skype_devel
+	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds lang LICENSE README" ${DATADIR}/
+	@${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. If you experience problems update to the most recent FreeBSD RELEASE, if this does not fix your problems, ask on multimedia@FreeBSD.org." | fmt
 
 .include <bsd.port.mk>
diff --git a/net/skype-devel/distinfo b/net/skype-devel/distinfo
index e7e83da924f4..af0b214afed4 100644
--- a/net/skype-devel/distinfo
+++ b/net/skype-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (skype_static-1.4.0.99.tar.bz2) = 879418eb6a64cd5ff561465a41bb78ab
-SHA256 (skype_static-1.4.0.99.tar.bz2) = bfa236e74b00222360d8e4a83fac7560e6043d264d29911645bcdea8be5fe14c
-SIZE (skype_static-1.4.0.99.tar.bz2) = 17543204
+MD5 (skype_static-1.4.0.118-oss.tar.bz2) = 00813dd5db73f116fdcf19778bb1234a
+SHA256 (skype_static-1.4.0.118-oss.tar.bz2) = 606bc7ba4b73112f572608d2fd7a2829bd1c3c0c9891063aee9bbeebfbf23821
+SIZE (skype_static-1.4.0.118-oss.tar.bz2) = 19595152
diff --git a/net/skype-devel/pkg-plist b/net/skype-devel/pkg-plist
index 350acf4c74de..41f038026df2 100644
--- a/net/skype-devel/pkg-plist
+++ b/net/skype-devel/pkg-plist
@@ -1,10 +1,19 @@
-bin/skype-devel
-bin/skype-devel_bin
-%%DATADIR%%/LICENSE
-%%DATADIR%%/README
+bin/skype_devel
 %%DATADIR%%/icons/SkypeBlue_16x16.png
 %%DATADIR%%/icons/SkypeBlue_32x32.png
 %%DATADIR%%/icons/SkypeBlue_48x48.png
+@dirrm %%DATADIR%%/icons
+%%DATADIR%%/lang/skype_de.ts
+%%DATADIR%%/lang/skype_et.ts
+%%DATADIR%%/lang/skype_lv.ts
+%%DATADIR%%/lang/skype_pl.ts
+%%DATADIR%%/lang/skype_pt_pt.ts
+%%DATADIR%%/lang/skype_ro.ts
+%%DATADIR%%/lang/skype_ru.ts
+%%DATADIR%%/lang/skype_tr.ts
+%%DATADIR%%/lang/skype_zh_s.ts
+%%DATADIR%%/lang/skype_zh_t.ts
+@dirrm %%DATADIR%%/lang
 %%DATADIR%%/sounds/CallBusy.wav
 %%DATADIR%%/sounds/CallConnecting.wav
 %%DATADIR%%/sounds/CallHangup.wav
@@ -26,6 +35,9 @@ bin/skype-devel_bin
 %%DATADIR%%/sounds/TransferFailed.wav
 %%DATADIR%%/sounds/TransferRequest.wav
 %%DATADIR%%/sounds/VoicemailReceived.wav
-@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/sounds
+%%DATADIR%%/LICENSE
+%%DATADIR%%/README
 @dirrm %%DATADIR%%
+share/applications/skype.desktop
+@dirrmtry share/applications