3 files changed, 146 insertions, 110 deletions

diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index d3cf0cd0aa63..8dfcee720709 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -9,8 +9,7 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	1.4.0.118
-PORTREVISION=	4
+PORTVERSION=	2.0.0.68
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
@@ -32,25 +31,31 @@ USE_GL=	linux
 
 USE_BZIP2=	yes
 USE_LINUX=	yes
-
 RESTRICTED=	Redistribution prohibited.
 
-WRKSRC=		${WRKDIR}/skype_static-${DISTVERSION}-oss
+WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
+SKYPEDIR=	share/skype
 PORTDOCS=	LICENSE README
 SUB_FILES=	pkg-message
+SUB_LIST=	SKYPEDIR=${SKYPEDIR}
+PLIST_SUB=	SKYPEDIR=${SKYPEDIR}
 
 .include <bsd.port.pre.mk>
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|Exec=skype|Exec=skype --resources=${PREFIX}/${SKYPEDIR}|' \
+		${WRKSRC}/skype.desktop
+
 do-build:
-	${BRANDELF} -t Linux ${WRKSRC}/skype
+	@${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
 	@${INSTALL} -d ${PREFIX}/share/applications
-	@${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+	@${INSTALL} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
 	@${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} "avatars icons sounds lang" ${DATADIR}/
+	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/
 
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR}
diff --git a/net-im/skype/distinfo b/net-im/skype/distinfo
index af0b214afed4..afbe78eeb483 100644
--- a/net-im/skype/distinfo
+++ b/net-im/skype/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (skype_static-2.0.0.68-oss.tar.bz2) = a0f3d5fe5587d737fe96ae63354de005
+SHA256 (skype_static-2.0.0.68-oss.tar.bz2) = c90106e8b85af3af620ecb27e542016d1459751025a94c32466b0be73b0989f4
+SIZE (skype_static-2.0.0.68-oss.tar.bz2) = 21568297
diff --git a/net-im/skype/pkg-plist b/net-im/skype/pkg-plist
index d71b5a623101..c52b76cbd155 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/skype/pkg-plist
@@ -1,103 +1,134 @@
 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
-%%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
-%%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
-@dirrm %%DATADIR%%/avatars
-@dirrm %%DATADIR%%
+share/applications/skype.desktop
+%%SKYPEDIR%%/avatars/Angel Skype.png
+%%SKYPEDIR%%/avatars/Architect Skype.png
+%%SKYPEDIR%%/avatars/Beach Skype.png
+%%SKYPEDIR%%/avatars/Behind Skype.png
+%%SKYPEDIR%%/avatars/Business Skype.png
+%%SKYPEDIR%%/avatars/Call Me Sweetheart.png
+%%SKYPEDIR%%/avatars/Call Me.png
+%%SKYPEDIR%%/avatars/Carnaval Skype.png
+%%SKYPEDIR%%/avatars/Chic Skype.png
+%%SKYPEDIR%%/avatars/Christmas Skype.png
+%%SKYPEDIR%%/avatars/College Skype.png
+%%SKYPEDIR%%/avatars/DIY Skype.png
+%%SKYPEDIR%%/avatars/DJ Skype.png
+%%SKYPEDIR%%/avatars/Desert Skype.png
+%%SKYPEDIR%%/avatars/Designer Skype.png
+%%SKYPEDIR%%/avatars/Devil Skype.png
+%%SKYPEDIR%%/avatars/Earbud Skype.png
+%%SKYPEDIR%%/avatars/Empire Skype.png
+%%SKYPEDIR%%/avatars/Fax Skype.png
+%%SKYPEDIR%%/avatars/Geisha Skype.png
+%%SKYPEDIR%%/avatars/Hula Skype.png
+%%SKYPEDIR%%/avatars/Make Skype Not War.png
+%%SKYPEDIR%%/avatars/Metal Skype.png
+%%SKYPEDIR%%/avatars/Ninja Skype.png
+%%SKYPEDIR%%/avatars/Party Skype.png
+%%SKYPEDIR%%/avatars/Pop Skype.png
+%%SKYPEDIR%%/avatars/Rice Skype.png
+%%SKYPEDIR%%/avatars/Skypahontas.png
+%%SKYPEDIR%%/avatars/Skype 502.png
+%%SKYPEDIR%%/avatars/Skype Aid.png
+%%SKYPEDIR%%/avatars/Skype Artiste.png
+%%SKYPEDIR%%/avatars/Skype Beauty.png
+%%SKYPEDIR%%/avatars/Skype Bling.png
+%%SKYPEDIR%%/avatars/Skype Boarder.png
+%%SKYPEDIR%%/avatars/Skype Brrr... .png
+%%SKYPEDIR%%/avatars/Skype Candy.png
+%%SKYPEDIR%%/avatars/Skype Cola.png
+%%SKYPEDIR%%/avatars/Skype Cool Shades.png
+%%SKYPEDIR%%/avatars/Skype Extreme.png
+%%SKYPEDIR%%/avatars/Skype Goaaaaal.png
+%%SKYPEDIR%%/avatars/Skype Headset.png
+%%SKYPEDIR%%/avatars/Skype Jah.png
+%%SKYPEDIR%%/avatars/Skype Jyve.png
+%%SKYPEDIR%%/avatars/Skype Safety.png
+%%SKYPEDIR%%/avatars/Skype San.png
+%%SKYPEDIR%%/avatars/Skype Shorty.png
+%%SKYPEDIR%%/avatars/Skype Smiley.png
+%%SKYPEDIR%%/avatars/Skype Time.png
+%%SKYPEDIR%%/avatars/Skype in a Bag.png
+%%SKYPEDIR%%/avatars/Skype-a-Manger.png
+%%SKYPEDIR%%/avatars/Skype-ahoy.png
+%%SKYPEDIR%%/avatars/Skype-in-one.png
+%%SKYPEDIR%%/avatars/Skype.png
+%%SKYPEDIR%%/avatars/Skypers of the Caribbean.png
+%%SKYPEDIR%%/avatars/Star Skype.png
+%%SKYPEDIR%%/avatars/Sushi Skype.png
+%%SKYPEDIR%%/avatars/The Skypeness.png
+%%SKYPEDIR%%/avatars/Travel Skype.png
+%%SKYPEDIR%%/avatars/Wetsuit Skype.png
+%%SKYPEDIR%%/avatars/Yin Yang Skype.png
+%%SKYPEDIR%%/icons/SkypeBlue_16x16.png
+%%SKYPEDIR%%/icons/SkypeBlue_32x32.png
+%%SKYPEDIR%%/icons/SkypeBlue_48x48.png
+%%SKYPEDIR%%/lang/skype_bg.qm
+%%SKYPEDIR%%/lang/skype_bg.ts
+%%SKYPEDIR%%/lang/skype_de.qm
+%%SKYPEDIR%%/lang/skype_de.ts
+%%SKYPEDIR%%/lang/skype_en.qm
+%%SKYPEDIR%%/lang/skype_en.ts
+%%SKYPEDIR%%/lang/skype_es.qm
+%%SKYPEDIR%%/lang/skype_es.ts
+%%SKYPEDIR%%/lang/skype_et.qm
+%%SKYPEDIR%%/lang/skype_et.ts
+%%SKYPEDIR%%/lang/skype_fr.qm
+%%SKYPEDIR%%/lang/skype_fr.ts
+%%SKYPEDIR%%/lang/skype_it.qm
+%%SKYPEDIR%%/lang/skype_it.ts
+%%SKYPEDIR%%/lang/skype_ja.qm
+%%SKYPEDIR%%/lang/skype_ja.ts
+%%SKYPEDIR%%/lang/skype_ko.qm
+%%SKYPEDIR%%/lang/skype_ko.ts
+%%SKYPEDIR%%/lang/skype_lt.qm
+%%SKYPEDIR%%/lang/skype_lt.ts
+%%SKYPEDIR%%/lang/skype_lv.qm
+%%SKYPEDIR%%/lang/skype_lv.ts
+%%SKYPEDIR%%/lang/skype_pl.qm
+%%SKYPEDIR%%/lang/skype_pl.ts
+%%SKYPEDIR%%/lang/skype_pt_br.qm
+%%SKYPEDIR%%/lang/skype_pt_br.ts
+%%SKYPEDIR%%/lang/skype_pt_pt.qm
+%%SKYPEDIR%%/lang/skype_pt_pt.ts
+%%SKYPEDIR%%/lang/skype_ro.qm
+%%SKYPEDIR%%/lang/skype_ro.ts
+%%SKYPEDIR%%/lang/skype_ru.qm
+%%SKYPEDIR%%/lang/skype_ru.ts
+%%SKYPEDIR%%/lang/skype_th.qm
+%%SKYPEDIR%%/lang/skype_th.ts
+%%SKYPEDIR%%/lang/skype_tr.qm
+%%SKYPEDIR%%/lang/skype_tr.ts
+%%SKYPEDIR%%/lang/skype_zh_s.qm
+%%SKYPEDIR%%/lang/skype_zh_s.ts
+%%SKYPEDIR%%/lang/skype_zh_t.qm
+%%SKYPEDIR%%/lang/skype_zh_t.ts
+%%SKYPEDIR%%/sounds/CallBusy.wav
+%%SKYPEDIR%%/sounds/CallConnecting.wav
+%%SKYPEDIR%%/sounds/CallFailed.wav
+%%SKYPEDIR%%/sounds/CallHangup.wav
+%%SKYPEDIR%%/sounds/CallHold.wav
+%%SKYPEDIR%%/sounds/CallRemoteHangup.wav
+%%SKYPEDIR%%/sounds/CallResume.wav
+%%SKYPEDIR%%/sounds/CallRingingIn.wav
+%%SKYPEDIR%%/sounds/CallRingingOut.wav
+%%SKYPEDIR%%/sounds/ChatIncoming.wav
+%%SKYPEDIR%%/sounds/ChatIncomingInitial.wav
+%%SKYPEDIR%%/sounds/ChatOutgoing.wav
+%%SKYPEDIR%%/sounds/ContactAdded.wav
+%%SKYPEDIR%%/sounds/ContactAuthRequest.wav
+%%SKYPEDIR%%/sounds/ContactOffline.wav
+%%SKYPEDIR%%/sounds/ContactOnline.wav
+%%SKYPEDIR%%/sounds/SkypeLogin.wav
+%%SKYPEDIR%%/sounds/SkypeLogout.wav
+%%SKYPEDIR%%/sounds/TransferComplete.wav
+%%SKYPEDIR%%/sounds/TransferFailed.wav
+%%SKYPEDIR%%/sounds/TransferRequest.wav
+%%SKYPEDIR%%/sounds/VoicemailReceived.wav
+@dirrm %%SKYPEDIR%%/sounds
+@dirrm %%SKYPEDIR%%/lang
+@dirrm %%SKYPEDIR%%/icons
+@dirrm %%SKYPEDIR%%/avatars
+@dirrm %%SKYPEDIR%%
 @dirrmtry share/applications