- Update to 0.90.0.14.

  This version has some fixes for FreeBSD, you shouldn't need to
  apply a kernel patch to use it.
- Let 'make' transform the version number for the distfile.
- It's for i386 only (needs to be revisited if the 32bit layer of amd64
  gains a linux emu). [1]
- Install an icon to the correct place in the GNOME case.

This also closes a PR with a version update.

PR:		69510
Submitted by:	marius [1]

9 files changed, 21 insertions, 12 deletions

diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index 26690bf93e57..c84bb62fe4a3 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	0.90.0.4
+PORTVERSION=	0.90.0.14
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_ver-0_90_0_4-staticQT
+DISTNAME=	skype_ver-${PORTVERSION:C/\./_/g}-staticQT
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	P2P VoIP software
@@ -22,6 +22,7 @@ RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
+ONLY_FOR_ARCHS=	i386
 
 RESTRICTED=	Redistribution not allowed yet.
 
@@ -40,6 +41,7 @@ do-install:
 	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/
 .if ${HAVE_GNOME:Mgnomehier} != ""
 	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
+	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
 .endif
 	${MKDIR} ${DATADIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
diff --git a/net-im/skype-devel/distinfo b/net-im/skype-devel/distinfo
index d839dfa2c64f..a6a016a080f1 100644
--- a/net-im/skype-devel/distinfo
+++ b/net-im/skype-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (skype_ver-0_90_0_4-staticQT.tar.bz2) = 2343cc3ae7b73325134cc51482dd83d6
-SIZE (skype_ver-0_90_0_4-staticQT.tar.bz2) = 5693856
+MD5 (skype_ver-0_90_0_14-staticQT.tar.bz2) = a0e297fa503d57ef6117768101d2ccb6
+SIZE (skype_ver-0_90_0_14-staticQT.tar.bz2) = 5768600
diff --git a/net-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist
index 7bd1e612fdd4..9fabd9e190d3 100644
--- a/net-im/skype-devel/pkg-plist
+++ b/net-im/skype-devel/pkg-plist
@@ -8,3 +8,4 @@ bin/skype
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
 %%GNOME%%share/gnome/applications/skype.desktop
+%%GNOME%%share/gnome/pixmaps/skype.png
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index 26690bf93e57..c84bb62fe4a3 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	0.90.0.4
+PORTVERSION=	0.90.0.14
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_ver-0_90_0_4-staticQT
+DISTNAME=	skype_ver-${PORTVERSION:C/\./_/g}-staticQT
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	P2P VoIP software
@@ -22,6 +22,7 @@ RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
+ONLY_FOR_ARCHS=	i386
 
 RESTRICTED=	Redistribution not allowed yet.
 
@@ -40,6 +41,7 @@ do-install:
 	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/
 .if ${HAVE_GNOME:Mgnomehier} != ""
 	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
+	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
 .endif
 	${MKDIR} ${DATADIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
diff --git a/net-im/skype/distinfo b/net-im/skype/distinfo
index d839dfa2c64f..a6a016a080f1 100644
--- a/net-im/skype/distinfo
+++ b/net-im/skype/distinfo
@@ -1,2 +1,2 @@
-MD5 (skype_ver-0_90_0_4-staticQT.tar.bz2) = 2343cc3ae7b73325134cc51482dd83d6
-SIZE (skype_ver-0_90_0_4-staticQT.tar.bz2) = 5693856
+MD5 (skype_ver-0_90_0_14-staticQT.tar.bz2) = a0e297fa503d57ef6117768101d2ccb6
+SIZE (skype_ver-0_90_0_14-staticQT.tar.bz2) = 5768600
diff --git a/net-im/skype/pkg-plist b/net-im/skype/pkg-plist
index 7bd1e612fdd4..9fabd9e190d3 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/skype/pkg-plist
@@ -8,3 +8,4 @@ bin/skype
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
 %%GNOME%%share/gnome/applications/skype.desktop
+%%GNOME%%share/gnome/pixmaps/skype.png
diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index 26690bf93e57..c84bb62fe4a3 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	0.90.0.4
+PORTVERSION=	0.90.0.14
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_ver-0_90_0_4-staticQT
+DISTNAME=	skype_ver-${PORTVERSION:C/\./_/g}-staticQT
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	P2P VoIP software
@@ -22,6 +22,7 @@ RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
+ONLY_FOR_ARCHS=	i386
 
 RESTRICTED=	Redistribution not allowed yet.
 
@@ -40,6 +41,7 @@ do-install:
 	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/
 .if ${HAVE_GNOME:Mgnomehier} != ""
 	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
+	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
 .endif
 	${MKDIR} ${DATADIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
diff --git a/net-im/skype20/distinfo b/net-im/skype20/distinfo
index d839dfa2c64f..a6a016a080f1 100644
--- a/net-im/skype20/distinfo
+++ b/net-im/skype20/distinfo
@@ -1,2 +1,2 @@
-MD5 (skype_ver-0_90_0_4-staticQT.tar.bz2) = 2343cc3ae7b73325134cc51482dd83d6
-SIZE (skype_ver-0_90_0_4-staticQT.tar.bz2) = 5693856
+MD5 (skype_ver-0_90_0_14-staticQT.tar.bz2) = a0e297fa503d57ef6117768101d2ccb6
+SIZE (skype_ver-0_90_0_14-staticQT.tar.bz2) = 5768600
diff --git a/net-im/skype20/pkg-plist b/net-im/skype20/pkg-plist
index 7bd1e612fdd4..9fabd9e190d3 100644
--- a/net-im/skype20/pkg-plist
+++ b/net-im/skype20/pkg-plist
@@ -8,3 +8,4 @@ bin/skype
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
 %%GNOME%%share/gnome/applications/skype.desktop
+%%GNOME%%share/gnome/pixmaps/skype.png