6 files changed, 142 insertions, 14 deletions

diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index b82fc0d5e50b..4fbdb7f63c4e 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -2,16 +2,19 @@
 # Date created:         Jun 21. 2004
 # Whom:                 netchild@FreeBSD.org
 #
+# Maintainers:		Beech Rintoul <beech@FreeBSD.org>
+#			Martin Wilke <miwi@FreeBSD.org>
+#
 # $FreeBSD$
 #
 
 PORTNAME=	skype
 PORTVERSION=	1.4.0.118
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	LOCAL/beech
-DISTNAME=	skype_static_staticQT-${DISTVERSION}-oss-generic
+MASTER_SITES=	http://download.skype.com/linux/
+DISTNAME=	skype_static-${DISTVERSION}-oss
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	P2P VoIP software
@@ -47,7 +50,7 @@ do-install:
 	@${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}/
+	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "avatars icons sounds lang" ${DATADIR}/
 
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR}
diff --git a/net-im/skype/distinfo b/net-im/skype/distinfo
index feb574372936..af0b214afed4 100644
--- a/net-im/skype/distinfo
+++ b/net-im/skype/distinfo
@@ -1,3 +1,3 @@
-MD5 (skype_static_staticQT-1.4.0.118-oss-generic.tar.bz2) = 00813dd5db73f116fdcf19778bb1234a
-SHA256 (skype_static_staticQT-1.4.0.118-oss-generic.tar.bz2) = 606bc7ba4b73112f572608d2fd7a2829bd1c3c0c9891063aee9bbeebfbf23821
-SIZE (skype_static_staticQT-1.4.0.118-oss-generic.tar.bz2) = 19595152
+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/pkg-plist b/net-im/skype/pkg-plist
index 85eb0c213e59..d71b5a623101 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/skype/pkg-plist
@@ -1,6 +1,66 @@
 bin/skype
 share/applications/skype.desktop
 share/pixmaps/skype.png
+%%DATADIR%%/avatars/Empire Skype.png
+%%DATADIR%%/avatars/Behind Skype.png
+%%DATADIR%%/avatars/Skype Brrr... .png
+%%DATADIR%%/avatars/Ninja Skype.png
+%%DATADIR%%/avatars/Skype Cola.png
+%%DATADIR%%/avatars/Skype-ahoy.png
+%%DATADIR%%/avatars/Skype Candy.png
+%%DATADIR%%/avatars/Designer Skype.png
+%%DATADIR%%/avatars/Skype Time.png
+%%DATADIR%%/avatars/Travel Skype.png
+%%DATADIR%%/avatars/Make Skype Not War.png
+%%DATADIR%%/avatars/Skype 502.png
+%%DATADIR%%/avatars/Skype in a Bag.png
+%%DATADIR%%/avatars/Architect Skype.png
+%%DATADIR%%/avatars/Skype Safety.png
+%%DATADIR%%/avatars/DJ Skype.png
+%%DATADIR%%/avatars/Fax Skype.png
+%%DATADIR%%/avatars/Devil Skype.png
+%%DATADIR%%/avatars/Hula Skype.png
+%%DATADIR%%/avatars/Sushi Skype.png
+%%DATADIR%%/avatars/Skype Goaaaaal.png
+%%DATADIR%%/avatars/Skype Cool Shades.png
+%%DATADIR%%/avatars/Skypahontas.png
+%%DATADIR%%/avatars/Skype Beauty.png
+%%DATADIR%%/avatars/Rice Skype.png
+%%DATADIR%%/avatars/Skype-in-one.png
+%%DATADIR%%/avatars/Carnaval Skype.png
+%%DATADIR%%/avatars/Skypers of the Caribbean.png
+%%DATADIR%%/avatars/Star Skype.png
+%%DATADIR%%/avatars/Angel Skype.png
+%%DATADIR%%/avatars/Pop Skype.png
+%%DATADIR%%/avatars/Skype Boarder.png
+%%DATADIR%%/avatars/Chic Skype.png
+%%DATADIR%%/avatars/College Skype.png
+%%DATADIR%%/avatars/Call Me.png
+%%DATADIR%%/avatars/Earbud Skype.png
+%%DATADIR%%/avatars/Beach Skype.png
+%%DATADIR%%/avatars/Business Skype.png
+%%DATADIR%%/avatars/DIY Skype.png
+%%DATADIR%%/avatars/Skype Headset.png
+%%DATADIR%%/avatars/Skype Artiste.png
+%%DATADIR%%/avatars/Metal Skype.png
+%%DATADIR%%/avatars/Skype Extreme.png
+%%DATADIR%%/avatars/Skype Jyve.png
+%%DATADIR%%/avatars/Call Me Sweetheart.png
+%%DATADIR%%/avatars/Skype.png
+%%DATADIR%%/avatars/Skype Bling.png
+%%DATADIR%%/avatars/Skype-a-Manger.png
+%%DATADIR%%/avatars/The Skypeness.png
+%%DATADIR%%/avatars/Yin Yang Skype.png
+%%DATADIR%%/avatars/Wetsuit Skype.png
+%%DATADIR%%/avatars/Skype Jah.png
+%%DATADIR%%/avatars/Desert Skype.png
+%%DATADIR%%/avatars/Party Skype.png
+%%DATADIR%%/avatars/Skype San.png
+%%DATADIR%%/avatars/Skype Aid.png
+%%DATADIR%%/avatars/Skype Smiley.png
+%%DATADIR%%/avatars/Geisha Skype.png
+%%DATADIR%%/avatars/Christmas Skype.png
+%%DATADIR%%/avatars/Skype Shorty.png
 %%DATADIR%%/icons/SkypeBlue_16x16.png
 %%DATADIR%%/icons/SkypeBlue_32x32.png
 %%DATADIR%%/icons/SkypeBlue_48x48.png
@@ -38,5 +98,6 @@ share/pixmaps/skype.png
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/avatars
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index b82fc0d5e50b..4fbdb7f63c4e 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -2,16 +2,19 @@
 # Date created:         Jun 21. 2004
 # Whom:                 netchild@FreeBSD.org
 #
+# Maintainers:		Beech Rintoul <beech@FreeBSD.org>
+#			Martin Wilke <miwi@FreeBSD.org>
+#
 # $FreeBSD$
 #
 
 PORTNAME=	skype
 PORTVERSION=	1.4.0.118
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	LOCAL/beech
-DISTNAME=	skype_static_staticQT-${DISTVERSION}-oss-generic
+MASTER_SITES=	http://download.skype.com/linux/
+DISTNAME=	skype_static-${DISTVERSION}-oss
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	P2P VoIP software
@@ -47,7 +50,7 @@ do-install:
 	@${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}/
+	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "avatars icons sounds lang" ${DATADIR}/
 
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR}
diff --git a/net-im/skype20/distinfo b/net-im/skype20/distinfo
index feb574372936..af0b214afed4 100644
--- a/net-im/skype20/distinfo
+++ b/net-im/skype20/distinfo
@@ -1,3 +1,3 @@
-MD5 (skype_static_staticQT-1.4.0.118-oss-generic.tar.bz2) = 00813dd5db73f116fdcf19778bb1234a
-SHA256 (skype_static_staticQT-1.4.0.118-oss-generic.tar.bz2) = 606bc7ba4b73112f572608d2fd7a2829bd1c3c0c9891063aee9bbeebfbf23821
-SIZE (skype_static_staticQT-1.4.0.118-oss-generic.tar.bz2) = 19595152
+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/skype20/pkg-plist b/net-im/skype20/pkg-plist
index 85eb0c213e59..d71b5a623101 100644
--- a/net-im/skype20/pkg-plist
+++ b/net-im/skype20/pkg-plist
@@ -1,6 +1,66 @@
 bin/skype
 share/applications/skype.desktop
 share/pixmaps/skype.png
+%%DATADIR%%/avatars/Empire Skype.png
+%%DATADIR%%/avatars/Behind Skype.png
+%%DATADIR%%/avatars/Skype Brrr... .png
+%%DATADIR%%/avatars/Ninja Skype.png
+%%DATADIR%%/avatars/Skype Cola.png
+%%DATADIR%%/avatars/Skype-ahoy.png
+%%DATADIR%%/avatars/Skype Candy.png
+%%DATADIR%%/avatars/Designer Skype.png
+%%DATADIR%%/avatars/Skype Time.png
+%%DATADIR%%/avatars/Travel Skype.png
+%%DATADIR%%/avatars/Make Skype Not War.png
+%%DATADIR%%/avatars/Skype 502.png
+%%DATADIR%%/avatars/Skype in a Bag.png
+%%DATADIR%%/avatars/Architect Skype.png
+%%DATADIR%%/avatars/Skype Safety.png
+%%DATADIR%%/avatars/DJ Skype.png
+%%DATADIR%%/avatars/Fax Skype.png
+%%DATADIR%%/avatars/Devil Skype.png
+%%DATADIR%%/avatars/Hula Skype.png
+%%DATADIR%%/avatars/Sushi Skype.png
+%%DATADIR%%/avatars/Skype Goaaaaal.png
+%%DATADIR%%/avatars/Skype Cool Shades.png
+%%DATADIR%%/avatars/Skypahontas.png
+%%DATADIR%%/avatars/Skype Beauty.png
+%%DATADIR%%/avatars/Rice Skype.png
+%%DATADIR%%/avatars/Skype-in-one.png
+%%DATADIR%%/avatars/Carnaval Skype.png
+%%DATADIR%%/avatars/Skypers of the Caribbean.png
+%%DATADIR%%/avatars/Star Skype.png
+%%DATADIR%%/avatars/Angel Skype.png
+%%DATADIR%%/avatars/Pop Skype.png
+%%DATADIR%%/avatars/Skype Boarder.png
+%%DATADIR%%/avatars/Chic Skype.png
+%%DATADIR%%/avatars/College Skype.png
+%%DATADIR%%/avatars/Call Me.png
+%%DATADIR%%/avatars/Earbud Skype.png
+%%DATADIR%%/avatars/Beach Skype.png
+%%DATADIR%%/avatars/Business Skype.png
+%%DATADIR%%/avatars/DIY Skype.png
+%%DATADIR%%/avatars/Skype Headset.png
+%%DATADIR%%/avatars/Skype Artiste.png
+%%DATADIR%%/avatars/Metal Skype.png
+%%DATADIR%%/avatars/Skype Extreme.png
+%%DATADIR%%/avatars/Skype Jyve.png
+%%DATADIR%%/avatars/Call Me Sweetheart.png
+%%DATADIR%%/avatars/Skype.png
+%%DATADIR%%/avatars/Skype Bling.png
+%%DATADIR%%/avatars/Skype-a-Manger.png
+%%DATADIR%%/avatars/The Skypeness.png
+%%DATADIR%%/avatars/Yin Yang Skype.png
+%%DATADIR%%/avatars/Wetsuit Skype.png
+%%DATADIR%%/avatars/Skype Jah.png
+%%DATADIR%%/avatars/Desert Skype.png
+%%DATADIR%%/avatars/Party Skype.png
+%%DATADIR%%/avatars/Skype San.png
+%%DATADIR%%/avatars/Skype Aid.png
+%%DATADIR%%/avatars/Skype Smiley.png
+%%DATADIR%%/avatars/Geisha Skype.png
+%%DATADIR%%/avatars/Christmas Skype.png
+%%DATADIR%%/avatars/Skype Shorty.png
 %%DATADIR%%/icons/SkypeBlue_16x16.png
 %%DATADIR%%/icons/SkypeBlue_32x32.png
 %%DATADIR%%/icons/SkypeBlue_48x48.png
@@ -38,5 +98,6 @@ share/pixmaps/skype.png
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/avatars
 @dirrm %%DATADIR%%
 @dirrmtry share/applications